manager/my-worker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改

Browse Source
This commit is contained in:
gaoxq
2025-11-27 00:31:03 +08:00
parent 59b06d5bd2
commit ee5b38babc
18 changed files with 1495 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
web-api/src/main/java/com/jeesite/modules/biz/dao/BizListItemDao.java Normal file
View File

@@ -0,0 +1,15 @@
package com.jeesite.modules.biz.dao;
import com.jeesite.common.dao.CrudDao;
import com.jeesite.common.mybatis.annotation.MyBatisDao;
import com.jeesite.modules.biz.entity.BizListItem;
/**
* 通知列表项表DAO接口
* @author gaoxq
* @version 2025-11-26
*/
@MyBatisDao(dataSourceName="work")
public interface BizListItemDao extends CrudDao<BizListItem> {
}

251
web-api/src/main/java/com/jeesite/modules/biz/entity/BizListItem.java Normal file
View File

@@ -0,0 +1,251 @@
package com.jeesite.modules.biz.entity;
import java.util.Date;
import com.jeesite.common.mybatis.annotation.JoinTable;
import com.jeesite.common.mybatis.annotation.JoinTable.Type;
import com.fasterxml.jackson.annotation.JsonFormat;
import jakarta.validation.constraints.Size;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import com.jeesite.common.entity.DataEntity;
import com.jeesite.common.mybatis.annotation.Column;
import com.jeesite.common.mybatis.annotation.Table;
import com.jeesite.common.mybatis.mapper.query.QueryType;
import com.jeesite.common.utils.excel.annotation.ExcelField;
import com.jeesite.common.utils.excel.annotation.ExcelField.Align;
import com.jeesite.common.utils.excel.annotation.ExcelFields;
import java.io.Serial;
/**
* 通知列表项表Entity
* @author gaoxq
* @version 2025-11-26
*/
@Table(name="biz_list_item", alias="a", label="通知列表项表信息", columns={
@Column(name="create_time", attrName="createTime", label="创建时间", isUpdate=false, isUpdateForce=true),
@Column(name="id", attrName="id", label="唯一标识", isPK=true),
@Column(name="avatar", attrName="avatar", label="头像图标", isQuery=false),
@Column(name="title", attrName="title", label="通知标题", queryType=QueryType.LIKE),
@Column(name="title_delete", attrName="titleDelete", label="是否删除", isQuery=false),
@Column(name="datetime", attrName="datetime", label="发送时间", isQuery=false),
@Column(name="type", attrName="type", label="类型标识"),
@Column(name="read_flag", attrName="readFlag", label="是否已读"),
@Column(name="description", attrName="description", label="描述信息", isQuery=false),
@Column(name="click_close", attrName="clickClose", label="是否关闭"),
@Column(name="extra", attrName="extra", label="待办状态"),
@Column(name="color", attrName="color", label="颜色值", isQuery=false),
@Column(name="update_time", attrName="updateTime", label="更新时间", isQuery=false),
@Column(name="f_tenant_id", attrName="ftenantId", label="租户id", isUpdate=false, isQuery=false),
@Column(name="f_flow_id", attrName="fflowId", label="流程id", isUpdate=false, isQuery=false),
@Column(name="f_flow_task_id", attrName="fflowTaskId", label="流程任务主键", isUpdate=false, isQuery=false),
@Column(name="f_flow_state", attrName="fflowState", label="流程任务状态", isUpdate=false, isQuery=false, isUpdateForce=true),
}, orderBy="a.id DESC"
)
public class BizListItem extends DataEntity<BizListItem> {
@Serial
private static final long serialVersionUID = 1L;
private Date createTime; // 创建时间
private String avatar; // 头像图标
private String title; // 通知标题
private String titleDelete; // 是否删除
private String datetime; // 发送时间
private String type; // 类型标识
private String readFlag; // 是否已读
private String description; // 描述信息
private String clickClose; // 是否关闭
private String extra; // 待办状态
private String color; // 颜色值
private Date updateTime; // 更新时间
private String ftenantId; // 租户id
private String fflowId; // 流程id
private String fflowTaskId; // 流程任务主键
private Integer fflowState; // 流程任务状态
@ExcelFields({
@ExcelField(title="创建时间", attrName="createTime", align=Align.CENTER, sort=10, dataFormat="yyyy-MM-dd hh:mm"),
@ExcelField(title="唯一标识", attrName="id", align=Align.CENTER, sort=20),
@ExcelField(title="头像图标", attrName="avatar", align=Align.CENTER, sort=30),
@ExcelField(title="通知标题", attrName="title", align=Align.CENTER, sort=40),
@ExcelField(title="是否删除", attrName="titleDelete", align=Align.CENTER, sort=50),
@ExcelField(title="发送时间", attrName="datetime", align=Align.CENTER, sort=60, dataFormat="yyyy-MM-dd"),
@ExcelField(title="类型标识", attrName="type", align=Align.CENTER, sort=70),
@ExcelField(title="是否已读", attrName="readFlag", align=Align.CENTER, sort=80),
@ExcelField(title="描述信息", attrName="description", align=Align.CENTER, sort=90),
@ExcelField(title="是否关闭", attrName="clickClose", align=Align.CENTER, sort=100),
@ExcelField(title="待办状态", attrName="extra", align=Align.CENTER, sort=110),
@ExcelField(title="颜色值", attrName="color", align=Align.CENTER, sort=120),
})
public BizListItem() {
this(null);
}
public BizListItem(String id){
super(id);
}
@JsonFormat(pattern = "yyyy-MM-dd HH:mm")
public Date getCreateTime() {
return createTime;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
@Size(min=0, max=255, message="头像图标长度不能超过 255 个字符")
public String getAvatar() {
return avatar;
}
public void setAvatar(String avatar) {
this.avatar = avatar;
}
@NotBlank(message="通知标题不能为空")
@Size(min=0, max=512, message="通知标题长度不能超过 512 个字符")
public String getTitle() {
return title;
}
public void setTitle(String title) {
this.title = title;
}
@Size(min=0, max=12, message="是否删除长度不能超过 12 个字符")
public String getTitleDelete() {
return titleDelete;
}
public void setTitleDelete(String titleDelete) {
this.titleDelete = titleDelete;
}
@Size(min=0, max=32, message="发送时间长度不能超过 32 个字符")
public String getDatetime() {
return datetime;
}
public void setDatetime(String datetime) {
this.datetime = datetime;
}
@NotBlank(message="类型标识不能为空")
@Size(min=0, max=32, message="类型标识长度不能超过 32 个字符")
public String getType() {
return type;
}
public void setType(String type) {
this.type = type;
}
@Size(min=0, max=12, message="是否已读长度不能超过 12 个字符")
public String getReadFlag() {
return readFlag;
}
public void setReadFlag(String readFlag) {
this.readFlag = readFlag;
}
@NotBlank(message="描述信息不能为空")
public String getDescription() {
return description;
}
public void setDescription(String description) {
this.description = description;
}
@Size(min=0, max=12, message="是否关闭长度不能超过 12 个字符")
public String getClickClose() {
return clickClose;
}
public void setClickClose(String clickClose) {
this.clickClose = clickClose;
}
@Size(min=0, max=64, message="待办状态长度不能超过 64 个字符")
public String getExtra() {
return extra;
}
public void setExtra(String extra) {
this.extra = extra;
}
@Size(min=0, max=32, message="颜色值长度不能超过 32 个字符")
public String getColor() {
return color;
}
public void setColor(String color) {
this.color = color;
}
@JsonFormat(pattern = "yyyy-MM-dd HH:mm")
@NotNull(message="更新时间不能为空")
public Date getUpdateTime() {
return updateTime;
}
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
@Size(min=0, max=50, message="租户id长度不能超过 50 个字符")
public String getFtenantId() {
return ftenantId;
}
public void setFtenantId(String ftenantId) {
this.ftenantId = ftenantId;
}
@Size(min=0, max=50, message="流程id长度不能超过 50 个字符")
public String getFflowId() {
return fflowId;
}
public void setFflowId(String fflowId) {
this.fflowId = fflowId;
}
@Size(min=0, max=50, message="流程任务主键长度不能超过 50 个字符")
public String getFflowTaskId() {
return fflowTaskId;
}
public void setFflowTaskId(String fflowTaskId) {
this.fflowTaskId = fflowTaskId;
}
public Integer getFflowState() {
return fflowState;
}
public void setFflowState(Integer fflowState) {
this.fflowState = fflowState;
}
public Date getCreateTime_gte() {
return sqlMap.getWhere().getValue("create_time", QueryType.GTE);
}
public void setCreateTime_gte(Date createTime) {
sqlMap.getWhere().and("create_time", QueryType.GTE, createTime);
}
public Date getCreateTime_lte() {
return sqlMap.getWhere().getValue("create_time", QueryType.LTE);
}
public void setCreateTime_lte(Date createTime) {
sqlMap.getWhere().and("create_time", QueryType.LTE, createTime);
}
}

134
web-api/src/main/java/com/jeesite/modules/biz/service/BizListItemService.java Normal file
View File

@@ -0,0 +1,134 @@
package com.jeesite.modules.biz.service;
import java.util.List;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import com.jeesite.common.entity.Page;
import com.jeesite.common.service.CrudService;
import com.jeesite.modules.biz.entity.BizListItem;
import com.jeesite.modules.biz.dao.BizListItemDao;
import com.jeesite.common.service.ServiceException;
import com.jeesite.common.config.Global;
import com.jeesite.common.validator.ValidatorUtils;
import com.jeesite.common.utils.excel.ExcelImport;
import org.springframework.web.multipart.MultipartFile;
import jakarta.validation.ConstraintViolation;
import jakarta.validation.ConstraintViolationException;
/**
* 通知列表项表Service
* @author gaoxq
* @version 2025-11-26
*/
@Service
public class BizListItemService extends CrudService<BizListItemDao, BizListItem> {
/**
* 获取单条数据
* @param bizListItem 主键
*/
@Override
public BizListItem get(BizListItem bizListItem) {
return super.get(bizListItem);
}
/**
* 查询分页数据
* @param bizListItem 查询条件
* @param bizListItem page 分页对象
*/
@Override
public Page<BizListItem> findPage(BizListItem bizListItem) {
return super.findPage(bizListItem);
}
/**
* 查询列表数据
* @param bizListItem 查询条件
*/
@Override
public List<BizListItem> findList(BizListItem bizListItem) {
return super.findList(bizListItem);
}
/**
* 保存数据（插入或更新）
* @param bizListItem 数据对象
*/
@Override
@Transactional
public void save(BizListItem bizListItem) {
super.save(bizListItem);
}
/**
* 导入数据
* @param file 导入的数据文件
*/
@Transactional
public String importData(MultipartFile file) {
if (file == null){
throw new ServiceException(text("请选择导入的数据文件！"));
}
int successNum = 0; int failureNum = 0;
StringBuilder successMsg = new StringBuilder();
StringBuilder failureMsg = new StringBuilder();
try(ExcelImport ei = new ExcelImport(file, 2, 0)){
List<BizListItem> list = ei.getDataList(BizListItem.class);
for (BizListItem bizListItem : list) {
try{
ValidatorUtils.validateWithException(bizListItem);
this.save(bizListItem);
successNum++;
successMsg.append("<br/>" + successNum + "、编号 " + bizListItem.getId() + " 导入成功");
} catch (Exception e) {
failureNum++;
String msg = "<br/>" + failureNum + "、编号 " + bizListItem.getId() + " 导入失败：";
if (e instanceof ConstraintViolationException){
ConstraintViolationException cve = (ConstraintViolationException)e;
for (ConstraintViolation<?> violation : cve.getConstraintViolations()) {
msg += Global.getText(violation.getMessage()) + " ("+violation.getPropertyPath()+")";
}
}else{
msg += e.getMessage();
}
failureMsg.append(msg);
logger.error(msg, e);
}
}
} catch (Exception e) {
logger.error(e.getMessage(), e);
failureMsg.append(e.getMessage());
return failureMsg.toString();
}
if (failureNum > 0) {
failureMsg.insert(0, "很抱歉，导入失败！共 " + failureNum + " 条数据格式不正确，错误如下：");
throw new ServiceException(failureMsg.toString());
}else{
successMsg.insert(0, "恭喜您，数据已全部导入成功！共 " + successNum + " 条，数据如下：");
}
return successMsg.toString();
}
/**
* 更新状态
* @param bizListItem 数据对象
*/
@Override
@Transactional
public void updateStatus(BizListItem bizListItem) {
super.updateStatus(bizListItem);
}
/**
* 删除数据
* @param bizListItem 数据对象
*/
@Override
@Transactional
public void delete(BizListItem bizListItem) {
super.delete(bizListItem);
}
}

178
web-api/src/main/java/com/jeesite/modules/biz/web/BizListItemController.java Normal file
View File

@@ -0,0 +1,178 @@
package com.jeesite.modules.biz.web;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
import com.jeesite.modules.dao.TabItem;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import com.jeesite.common.config.Global;
import com.jeesite.common.collect.ListUtils;
import com.jeesite.common.entity.Page;
import com.jeesite.common.lang.DateUtils;
import com.jeesite.common.utils.excel.ExcelExport;
import com.jeesite.common.utils.excel.annotation.ExcelField.Type;
import org.springframework.web.multipart.MultipartFile;
import com.jeesite.common.web.BaseController;
import com.jeesite.modules.biz.entity.BizListItem;
import com.jeesite.modules.biz.service.BizListItemService;
/**
* 通知列表项表Controller
*
* @author gaoxq
* @version 2025-11-26
*/
@Controller
@RequestMapping(value = "${adminPath}/biz/listItem")
public class BizListItemController extends BaseController {
private final BizListItemService bizListItemService;
public BizListItemController(BizListItemService bizListItemService) {
this.bizListItemService = bizListItemService;
}
/**
* 获取数据
*/
@ModelAttribute
public BizListItem get(String id, boolean isNewRecord) {
return bizListItemService.get(id, isNewRecord);
}
/**
* 查询列表
*/
@RequiresPermissions("biz:listItem:view")
@RequestMapping(value = {"list", ""})
public String list(BizListItem bizListItem, Model model) {
model.addAttribute("bizListItem", bizListItem);
return "modules/biz/bizListItemList";
}
/**
* 查询列表数据
*/
@RequiresPermissions("biz:listItem:view")
@RequestMapping(value = "listData")
@ResponseBody
public Page<BizListItem> listData(BizListItem bizListItem, HttpServletRequest request, HttpServletResponse response) {
bizListItem.setPage(new Page<>(request, response));
Page<BizListItem> page = bizListItemService.findPage(bizListItem);
return page;
}
/**
* 查看编辑表单
*/
@RequiresPermissions("biz:listItem:view")
@RequestMapping(value = "form")
public String form(BizListItem bizListItem, Model model) {
model.addAttribute("bizListItem", bizListItem);
return "modules/biz/bizListItemForm";
}
/**
* 保存数据
*/
@RequiresPermissions("biz:listItem:edit")
@PostMapping(value = "save")
@ResponseBody
public String save(@Validated BizListItem bizListItem) {
bizListItemService.save(bizListItem);
return renderResult(Global.TRUE, text("保存通知列表项表成功！"));
}
/**
* 导出数据
*/
@RequiresPermissions("biz:listItem:view")
@RequestMapping(value = "exportData")
public void exportData(BizListItem bizListItem, HttpServletResponse response) {
List<BizListItem> list = bizListItemService.findList(bizListItem);
String fileName = "通知列表项表" + DateUtils.getDate("yyyyMMddHHmmss") + ".xlsx";
try (ExcelExport ee = new ExcelExport("通知列表项表", BizListItem.class)) {
ee.setDataList(list).write(response, fileName);
}
}
/**
* 下载模板
*/
@RequiresPermissions("biz:listItem:view")
@RequestMapping(value = "importTemplate")
public void importTemplate(HttpServletResponse response) {
BizListItem bizListItem = new BizListItem();
List<BizListItem> list = ListUtils.newArrayList(bizListItem);
String fileName = "通知列表项表模板.xlsx";
try (ExcelExport ee = new ExcelExport("通知列表项表", BizListItem.class, Type.IMPORT)) {
ee.setDataList(list).write(response, fileName);
}
}
/**
* 导入数据
*/
@ResponseBody
@RequiresPermissions("biz:listItem:edit")
@PostMapping(value = "importData")
public String importData(MultipartFile file) {
try {
String message = bizListItemService.importData(file);
return renderResult(Global.TRUE, "posfull:" + message);
} catch (Exception ex) {
return renderResult(Global.FALSE, "posfull:" + ex.getMessage());
}
}
/**
* 删除数据
*/
@RequiresPermissions("biz:listItem:edit")
@RequestMapping(value = "delete")
@ResponseBody
public String delete(BizListItem bizListItem) {
bizListItemService.delete(bizListItem);
return renderResult(Global.TRUE, text("删除通知列表项表成功！"));
}
@RequestMapping(value = "getTabListData")
@ResponseBody
public List<TabItem> getTabListData() {
enum NotifyType {
NOTIFICATION("1", "通知"),
MESSAGE("2", "消息"),
TODO("3", "待办");
private final String code;
private final String name;
NotifyType(String code, String name) {
this.code = code;
this.name = name;
}
}
return Arrays.stream(NotifyType.values())
.map(type -> {
BizListItem listItem = new BizListItem();
listItem.setType(type.code);
List<BizListItem> dataList = bizListItemService.findList(listItem);
return new TabItem(type.code, type.name, dataList.size(), dataList);
})
.collect(Collectors.toList());
}
}

33
web-api/src/main/java/com/jeesite/modules/dao/TabItem.java Normal file
View File

@@ -0,0 +1,33 @@
package com.jeesite.modules.dao;
import com.jeesite.modules.biz.entity.BizListItem;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
@Data
public class TabItem implements Serializable {
private String key;
private String name;
private Integer count;
private String btnHref;
private String btnText;
private List<BizListItem> list;
public TabItem() {
}
public TabItem(String key, String name, Integer count, List<BizListItem> list) {
this.key = key;
this.name = name;
this.count = count;
this.list = list;
}
}

2
web-api/src/main/resources/config/application-prod.yml
View File

@@ -13,7 +13,7 @@ jdbc:
# Mysql 数据库配置
type: mysql
driver: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://crontab.club:33069/worker?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
url: jdbc:mysql://192.168.31.189:33069/worker?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
username: dream
password: info_dream
testSql: SELECT 1

2
web-api/src/main/resources/config/application.yml
View File

@@ -57,7 +57,7 @@ jdbc:
# Mysql 数据库配置
type: mysql
driver: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://crontab.club:33069/worker?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
url: jdbc:mysql://192.168.31.189:33069/worker?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
username: dream
password: info_dream
testSql: SELECT 1

15
web-api/src/main/resources/mappings/modules/biz/BizListItemDao.xml Normal file
View File

@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.jeesite.modules.biz.dao.BizListItemDao">
<!-- 查询数据
<select id="findList" resultType="BizListItem">
SELECT ${sqlMap.column.toSql()}
FROM ${sqlMap.table.toSql()}
<where>
${sqlMap.where.toSql()}
</where>
ORDER BY ${sqlMap.order.toSql()}
</select> -->
</mapper>

69
web-vue/packages/biz/api/biz/listItem.ts Normal file
View File

@@ -0,0 +1,69 @@
/**
* Copyright (c) 2013-Now http://jeesite.com All rights reserved.
* No deletion without permission, or be held responsible to law.
* @author gaoxq
*/
import { defHttp } from '@jeesite/core/utils/http/axios';
import { useGlobSetting } from '@jeesite/core/hooks/setting';
import { BasicModel, Page } from '@jeesite/core/api/model/baseModel';
import { UploadApiResult } from '@jeesite/core/api/sys/upload';
import { UploadFileParams } from '@jeesite/types/axios';
import { AxiosProgressEvent } from 'axios';
const { ctxPath, adminPath } = useGlobSetting();
export interface BizListItem extends BasicModel<BizListItem> {
createTime?: string; // 创建时间
avatar?: string; // 头像图标
title: string; // 通知标题
titleDelete?: string; // 是否删除
datetime?: string; // 发送时间
type: string; // 类型标识
readFlag?: string; // 是否已读
description: string; // 描述信息
clickClose?: string; // 是否关闭
extra?: string; // 待办状态
color?: string; // 颜色值
updateTime: string; // 更新时间
ftenantId?: string; // 租户id
fflowId?: string; // 流程id
fflowTaskId?: string; // 流程任务主键
fflowState?: number; // 流程任务状态
}
export interface TabItem {
key: string;
name: string;
count: number;
list: BizListItem[];
}
export const tabListDataAll = () =>
defHttp.get<TabItem[]>({ url: adminPath + '/biz/listItem/getTabListData'});
export const bizListItemList = (params?: BizListItem | any) =>
defHttp.get<BizListItem>({ url: adminPath + '/biz/listItem/list', params });
export const bizListItemListData = (params?: BizListItem | any) =>
defHttp.post<Page<BizListItem>>({ url: adminPath + '/biz/listItem/listData', params });
export const bizListItemForm = (params?: BizListItem | any) =>
defHttp.get<BizListItem>({ url: adminPath + '/biz/listItem/form', params });
export const bizListItemSave = (params?: any, data?: BizListItem | any) =>
defHttp.postJson<BizListItem>({ url: adminPath + '/biz/listItem/save', params, data });
export const bizListItemImportData = (
params: UploadFileParams,
onUploadProgress: (progressEvent: AxiosProgressEvent) => void,
) =>
defHttp.uploadFile<UploadApiResult>(
{
url: ctxPath + adminPath + '/biz/listItem/importData',
onUploadProgress,
},
params,
);
export const bizListItemDelete = (params?: BizListItem | any) =>
defHttp.get<BizListItem>({ url: adminPath + '/biz/listItem/delete', params });

180
web-vue/packages/biz/views/biz/listItem/form.vue Normal file
View File

@@ -0,0 +1,180 @@
<!--
* Copyright (c) 2013-Now http://jeesite.com All rights reserved.
* No deletion without permission, or be held responsible to law.
* @author gaoxq
-->
<template>
<BasicDrawer
v-bind="$attrs"
:showFooter="true"
:okAuth="'biz:listItem:edit'"
@register="registerDrawer"
@ok="handleSubmit"
width="70%"
>
<template #title>
<Icon :icon="getTitle.icon" class="m-1 pr-1" />
<span> {{ getTitle.value }} </span>
</template>
<BasicForm @register="registerForm" />
</BasicDrawer>
</template>
<script lang="ts" setup name="ViewsBizListItemForm">
import { ref, unref, computed } from 'vue';
import { useI18n } from '@jeesite/core/hooks/web/useI18n';
import { useMessage } from '@jeesite/core/hooks/web/useMessage';
import { router } from '@jeesite/core/router';
import { Icon } from '@jeesite/core/components/Icon';
import { BasicForm, FormSchema, useForm } from '@jeesite/core/components/Form';
import { BasicDrawer, useDrawerInner } from '@jeesite/core/components/Drawer';
import { BizListItem, bizListItemSave, bizListItemForm } from '@jeesite/biz/api/biz/listItem';
const emit = defineEmits(['success', 'register']);
const { t } = useI18n('biz.listItem');
const { showMessage } = useMessage();
const { meta } = unref(router.currentRoute);
const record = ref<BizListItem>({} as BizListItem);
const getTitle = computed(() => ({
icon: meta.icon || 'i-ant-design:book-outlined',
value: record.value.isNewRecord ? t('新增通知列表项表') : t('编辑通知列表项表'),
}));
const inputFormSchemas: FormSchema<BizListItem>[] = [
{
label: t('头像图标'),
field: 'avatar',
component: 'Input',
componentProps: {
maxlength: 255,
},
},
{
label: t('通知标题'),
field: 'title',
component: 'Input',
componentProps: {
maxlength: 512,
},
required: true,
},
{
label: t('是否删除'),
field: 'titleDelete',
component: 'Select',
componentProps: {
dictType: '',
allowClear: true,
},
},
{
label: t('发送时间'),
field: 'datetime',
component: 'DatePicker',
componentProps: {
format: 'YYYY-MM-DD',
showTime: false,
},
},
{
label: t('类型标识'),
field: 'type',
component: 'Select',
componentProps: {
dictType: '',
allowClear: true,
},
required: true,
},
{
label: t('是否已读'),
field: 'readFlag',
component: 'Select',
componentProps: {
dictType: '',
allowClear: true,
},
},
{
label: t('描述信息'),
field: 'description',
component: 'InputTextArea',
required: true,
colProps: { md: 24, lg: 24 },
},
{
label: t('是否关闭'),
field: 'clickClose',
component: 'Input',
componentProps: {
maxlength: 12,
},
},
{
label: t('待办状态'),
field: 'extra',
component: 'Input',
componentProps: {
maxlength: 64,
},
},
{
label: t('颜色值'),
field: 'color',
component: 'Input',
componentProps: {
maxlength: 32,
},
},
{
label: t('更新时间'),
field: 'updateTime',
component: 'DatePicker',
componentProps: {
format: 'YYYY-MM-DD HH:mm',
showTime: { format: 'HH:mm' },
},
required: true,
},
];
const [registerForm, { resetFields, setFieldsValue, validate }] = useForm<BizListItem>({
labelWidth: 120,
schemas: inputFormSchemas,
baseColProps: { md: 24, lg: 12 },
});
const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
setDrawerProps({ loading: true });
await resetFields();
const res = await bizListItemForm(data);
record.value = (res.bizListItem || {}) as BizListItem;
record.value.__t = new Date().getTime();
await setFieldsValue(record.value);
setDrawerProps({ loading: false });
});
async function handleSubmit() {
try {
const data = await validate();
setDrawerProps({ confirmLoading: true });
const params: any = {
isNewRecord: record.value.isNewRecord,
id: record.value.id || data.id,
};
// console.log('submit', params, data, record);
const res = await bizListItemSave(params, data);
showMessage(res.message);
setTimeout(closeDrawer);
emit('success', data);
} catch (error: any) {
if (error && error.errorFields) {
showMessage(error.message || t('common.validateError'));
}
console.log('error', error);
} finally {
setDrawerProps({ confirmLoading: false });
}
}
</script>

103
web-vue/packages/biz/views/biz/listItem/formImport.vue Normal file
View File

@@ -0,0 +1,103 @@
<!--
* Copyright (c) 2013-Now http://jeesite.com All rights reserved.
* No deletion without permission, or be held responsible to law.
* @author gaoxq
-->
<template>
<BasicModal
v-bind="$attrs"
:title="t('导入通知列表项表')"
:okText="t('导入')"
@register="registerModal"
@ok="handleSubmit"
:minHeight="120"
:width="400"
>
<Upload accept=".xls,.xlsx" :file-list="fileList" :before-upload="beforeUpload" @remove="handleRemove">
<a-button> <Icon icon="ant-design:upload-outlined" /> {{ t('选择文件') }} </a-button>
<span class="ml-4">{{ uploadInfo }}</span>
</Upload>
<div class="ml-4 mt-4">
{{ t('提示：仅允许导入“xls”或“xlsx”格式文件！') }}
</div>
<div class="mt-4">
<a-button @click="handleDownloadTemplate()" type="text">
<Icon icon="i-fa:file-excel-o" />
{{ t('下载模板') }}
</a-button>
</div>
</BasicModal>
</template>
<script lang="ts" setup>
import { ref } from 'vue';
import { Upload } from 'ant-design-vue';
import { useI18n } from '@jeesite/core/hooks/web/useI18n';
import { useMessage } from '@jeesite/core/hooks/web/useMessage';
import { useGlobSetting } from '@jeesite/core/hooks/setting';
import { downloadByUrl } from '@jeesite/core/utils/file/download';
import { Icon } from '@jeesite/core/components/Icon';
import { BasicModal, useModalInner } from '@jeesite/core/components/Modal';
import { bizListItemImportData } from '@jeesite/biz/api/biz/listItem';
import { FileType } from 'ant-design-vue/es/upload/interface';
import { AxiosProgressEvent } from 'axios';
const emit = defineEmits(['success', 'register']);
const { t } = useI18n('biz.listItem');
const { showMessage, showMessageModal } = useMessage();
const fileList = ref<FileType[]>([]);
const uploadInfo = ref('');
const beforeUpload = (file: FileType) => {
fileList.value = [file];
return false;
};
const handleRemove = () => {
fileList.value = [];
};
const [registerModal, { setModalProps, closeModal }] = useModalInner(() => {
fileList.value = [];
uploadInfo.value = '';
});
async function handleDownloadTemplate() {
const { ctxAdminPath } = useGlobSetting();
downloadByUrl({ url: ctxAdminPath + '/biz/listItem/importTemplate' });
}
function onUploadProgress(progressEvent: AxiosProgressEvent) {
const complete = ((progressEvent.loaded / (progressEvent.total || 1)) * 100) | 0;
if (complete != 100) {
uploadInfo.value = t('正在导入，请稍候') + ' ' + complete + '%...';
} else {
uploadInfo.value = '';
}
}
async function handleSubmit() {
try {
if (fileList.value.length == 0) {
showMessage(t('请选择要导入的数据文件'));
return;
}
setModalProps({ confirmLoading: true });
const params = {
file: fileList.value[0],
};
const { data } = await bizListItemImportData(params, onUploadProgress);
showMessageModal({ content: data.message });
setTimeout(closeModal);
emit('success');
} catch (error: any) {
if (error && error.errorFields) {
showMessage(error.message || t('common.validateError'));
}
console.log('error', error);
} finally {
setModalProps({ confirmLoading: false });
}
}
</script>

296
web-vue/packages/biz/views/biz/listItem/list.vue Normal file
View File

@@ -0,0 +1,296 @@
<!--
* Copyright (c) 2013-Now http://jeesite.com All rights reserved.
* No deletion without permission, or be held responsible to law.
* @author gaoxq
-->
<template>
<div>
<BasicTable @register="registerTable">
<template #tableTitle>
<Icon :icon="getTitle.icon" class="m-1 pr-1" />
<span> {{ getTitle.value }} </span>
</template>
<template #toolbar>
<a-button type="default" :loading="loading" @click="handleExport()">
<Icon icon="i-ant-design:download-outlined" /> {{ t('导出') }}
</a-button>
<a-button type="default" @click="handleImport()">
<Icon icon="i-ant-design:import-outlined" /> {{ t('导入') }}
</a-button>
<a-button type="primary" @click="handleForm({})" v-auth="'biz:listItem:edit'">
<Icon icon="i-fluent:add-12-filled" /> {{ t('新增') }}
</a-button>
</template>
<template #firstColumn="{ record }">
<a @click="handleForm({ id: record.id })" :title="record.createTime">
{{ record.createTime }}
</a>
</template>
</BasicTable>
<InputForm @register="registerDrawer" @success="handleSuccess" />
<FormImport @register="registerImportModal" @success="handleSuccess" />
</div>
</template>
<script lang="ts" setup name="ViewsBizListItemList">
import { onMounted, ref, unref } from 'vue';
import { useI18n } from '@jeesite/core/hooks/web/useI18n';
import { useMessage } from '@jeesite/core/hooks/web/useMessage';
import { useGlobSetting } from '@jeesite/core/hooks/setting';
import { downloadByUrl } from '@jeesite/core/utils/file/download';
import { router } from '@jeesite/core/router';
import { Icon } from '@jeesite/core/components/Icon';
import { BasicTable, BasicColumn, useTable } from '@jeesite/core/components/Table';
import { BizListItem, bizListItemList } from '@jeesite/biz/api/biz/listItem';
import { bizListItemDelete, bizListItemListData } from '@jeesite/biz/api/biz/listItem';
import { useDrawer } from '@jeesite/core/components/Drawer';
import { useModal } from '@jeesite/core/components/Modal';
import { FormProps } from '@jeesite/core/components/Form';
import InputForm from './form.vue';
import FormImport from './formImport.vue';
const { t } = useI18n('biz.listItem');
const { showMessage } = useMessage();
const { meta } = unref(router.currentRoute);
const record = ref<BizListItem>({} as BizListItem);
const getTitle = {
icon: meta.icon || 'i-ant-design:book-outlined',
value: meta.title || t('通知列表项表管理'),
};
const loading = ref(false);
const searchForm: FormProps<BizListItem> = {
baseColProps: { md: 8, lg: 6 },
labelWidth: 90,
schemas: [
{
label: t('创建时间起'),
field: 'createTime_gte',
component: 'DatePicker',
componentProps: {
format: 'YYYY-MM-DD HH:mm',
showTime: { format: 'HH:mm' },
},
},
{
label: t('创建时间止'),
field: 'createTime_lte',
component: 'DatePicker',
componentProps: {
format: 'YYYY-MM-DD HH:mm',
showTime: { format: 'HH:mm' },
},
},
{
label: t('通知标题'),
field: 'title',
component: 'Input',
},
{
label: t('类型标识'),
field: 'type',
component: 'Select',
componentProps: {
dictType: '',
allowClear: true,
},
},
{
label: t('是否已读'),
field: 'readFlag',
component: 'Select',
componentProps: {
dictType: '',
allowClear: true,
},
},
{
label: t('是否关闭'),
field: 'clickClose',
component: 'Input',
},
{
label: t('待办状态'),
field: 'extra',
component: 'Input',
},
],
};
const tableColumns: BasicColumn<BizListItem>[] = [
{
title: t('创建时间'),
dataIndex: 'createTime',
key: 'a.create_time',
sorter: true,
width: 230,
align: 'left',
slot: 'firstColumn',
},
{
title: t('头像图标'),
dataIndex: 'avatar',
key: 'a.avatar',
sorter: true,
width: 130,
align: 'left',
},
{
title: t('通知标题'),
dataIndex: 'title',
key: 'a.title',
sorter: true,
width: 130,
align: 'left',
},
{
title: t('是否删除'),
dataIndex: 'titleDelete',
key: 'a.title_delete',
sorter: true,
width: 130,
align: 'left',
dictType: '',
},
{
title: t('发送时间'),
dataIndex: 'datetime',
key: 'a.datetime',
sorter: true,
width: 130,
align: 'left',
},
{
title: t('类型标识'),
dataIndex: 'type',
key: 'a.type',
sorter: true,
width: 130,
align: 'left',
dictType: '',
},
{
title: t('是否已读'),
dataIndex: 'readFlag',
key: 'a.read_flag',
sorter: true,
width: 130,
align: 'left',
dictType: '',
},
{
title: t('描述信息'),
dataIndex: 'description',
key: 'a.description',
sorter: true,
width: 130,
align: 'left',
},
{
title: t('是否关闭'),
dataIndex: 'clickClose',
key: 'a.click_close',
sorter: true,
width: 130,
align: 'left',
},
{
title: t('待办状态'),
dataIndex: 'extra',
key: 'a.extra',
sorter: true,
width: 130,
align: 'left',
},
{
title: t('颜色值'),
dataIndex: 'color',
key: 'a.color',
sorter: true,
width: 130,
align: 'left',
},
{
title: t('更新时间'),
dataIndex: 'updateTime',
key: 'a.update_time',
sorter: true,
width: 130,
align: 'center',
},
];
const actionColumn: BasicColumn<BizListItem> = {
width: 160,
actions: (record: BizListItem) => [
{
icon: 'i-clarity:note-edit-line',
title: t('编辑通知列表项表'),
onClick: handleForm.bind(this, { id: record.id }),
auth: 'biz:listItem:edit',
},
{
icon: 'i-ant-design:delete-outlined',
color: 'error',
title: t('删除通知列表项表'),
popConfirm: {
title: t('是否确认删除通知列表项表'),
confirm: handleDelete.bind(this, record),
},
auth: 'biz:listItem:edit',
},
],
};
const [registerTable, { reload, getForm }] = useTable<BizListItem>({
api: bizListItemListData,
beforeFetch: (params) => {
return params;
},
columns: tableColumns,
actionColumn: actionColumn,
formConfig: searchForm,
showTableSetting: true,
useSearchForm: true,
canResize: true,
});
onMounted(async () => {
const res = await bizListItemList();
record.value = (res.bizListItem || {}) as BizListItem;
await getForm().setFieldsValue(record.value);
});
const [registerDrawer, { openDrawer }] = useDrawer();
function handleForm(record: Recordable) {
openDrawer(true, record);
}
async function handleExport() {
loading.value = true;
const { ctxAdminPath } = useGlobSetting();
await downloadByUrl({
url: ctxAdminPath + '/biz/listItem/exportData',
params: getForm().getFieldsValue(),
});
loading.value = false;
}
const [registerImportModal, { openModal: importModal }] = useModal();
function handleImport() {
importModal(true, {});
}
async function handleDelete(record: Recordable) {
const params = { id: record.id };
const res = await bizListItemDelete(params);
showMessage(res.message);
await handleSuccess(record);
}
async function handleSuccess(record: Recordable) {
await reload({ record });
}
</script>

189
web-vue/packages/biz/views/biz/listItem/select.ts Normal file
View File

@@ -0,0 +1,189 @@
import { useI18n } from '@jeesite/core/hooks/web/useI18n';
import { BasicColumn, BasicTableProps, FormProps } from '@jeesite/core/components/Table';
import { bizListItemListData } from '@jeesite/biz/api/biz/listItem';
const { t } = useI18n('biz.listItem');
const modalProps = {
title: t('通知列表项表选择'),
};
const searchForm: FormProps<BizListItem> = {
baseColProps: { md: 8, lg: 6 },
labelWidth: 90,
schemas: [
{
label: t('创建时间起'),
field: 'createTime_gte',
component: 'DatePicker',
componentProps: {
format: 'YYYY-MM-DD HH:mm',
showTime: { format: 'HH:mm' },
},
},
{
label: t('创建时间止'),
field: 'createTime_lte',
component: 'DatePicker',
componentProps: {
format: 'YYYY-MM-DD HH:mm',
showTime: { format: 'HH:mm' },
},
},
{
label: t('通知标题'),
field: 'title',
component: 'Input',
},
{
label: t('类型标识'),
field: 'type',
component: 'Select',
componentProps: {
dictType: '',
allowClear: true,
},
},
{
label: t('是否已读'),
field: 'readFlag',
component: 'Select',
componentProps: {
dictType: '',
allowClear: true,
},
},
{
label: t('是否关闭'),
field: 'clickClose',
component: 'Input',
},
{
label: t('待办状态'),
field: 'extra',
component: 'Input',
},
],
};
const tableColumns: BasicColumn<BizListItem>[] = [
{
title: t('创建时间'),
dataIndex: 'createTime',
key: 'a.create_time',
sorter: true,
width: 230,
align: 'left',
slot: 'firstColumn',
},
{
title: t('头像图标'),
dataIndex: 'avatar',
key: 'a.avatar',
sorter: true,
width: 130,
align: 'left',
},
{
title: t('通知标题'),
dataIndex: 'title',
key: 'a.title',
sorter: true,
width: 130,
align: 'left',
},
{
title: t('是否删除'),
dataIndex: 'titleDelete',
key: 'a.title_delete',
sorter: true,
width: 130,
align: 'left',
dictType: '',
},
{
title: t('发送时间'),
dataIndex: 'datetime',
key: 'a.datetime',
sorter: true,
width: 130,
align: 'left',
},
{
title: t('类型标识'),
dataIndex: 'type',
key: 'a.type',
sorter: true,
width: 130,
align: 'left',
dictType: '',
},
{
title: t('是否已读'),
dataIndex: 'readFlag',
key: 'a.read_flag',
sorter: true,
width: 130,
align: 'left',
dictType: '',
},
{
title: t('描述信息'),
dataIndex: 'description',
key: 'a.description',
sorter: true,
width: 130,
align: 'left',
},
{
title: t('是否关闭'),
dataIndex: 'clickClose',
key: 'a.click_close',
sorter: true,
width: 130,
align: 'left',
},
{
title: t('待办状态'),
dataIndex: 'extra',
key: 'a.extra',
sorter: true,
width: 130,
align: 'left',
},
{
title: t('颜色值'),
dataIndex: 'color',
key: 'a.color',
sorter: true,
width: 130,
align: 'left',
},
{
title: t('更新时间'),
dataIndex: 'updateTime',
key: 'a.update_time',
sorter: true,
width: 130,
align: 'center',
},
];
const tableProps: BasicTableProps = {
api: bizListItemListData,
beforeFetch: (params) => {
params['isAll'] = true;
return params;
},
columns: tableColumns,
formConfig: searchForm,
rowKey: 'id',
};
export default {
modalProps,
tableProps,
itemCode: 'id',
itemName: 'id',
isShowCode: false,
};

8
web-vue/packages/core/layouts/default/header/components/notify/NoticeList.vue
View File

@@ -55,7 +55,7 @@
</template>
<script lang="ts">
import { computed, defineComponent, PropType, ref, watch, unref } from 'vue';
import { ListItem } from './data';
import { BizListItem } from '@jeesite/biz/api/biz/listItem';
import { useDesign } from '@jeesite/core/hooks/web/useDesign';
import { List, Avatar, Tag, Typography } from 'ant-design-vue';
import { Icon } from '@jeesite/core/components/Icon';
@@ -73,7 +73,7 @@
},
props: {
list: {
type: Array as PropType<ListItem[]>,
type: Array as PropType<BizListItem[]>,
default: () => [],
},
pageSize: {
@@ -100,7 +100,7 @@
setup(props, { emit }) {
const { prefixCls } = useDesign('header-notify-list');
const current = ref(props.currentPage || 1);
const getData = computed<ListItem[]>(() => {
const getData = computed<BizListItem[]>(() => {
const { pageSize, list } = props;
if (pageSize === false) return [];
let size = isNumber(pageSize) ? pageSize : 5;
@@ -131,7 +131,7 @@
}
});
function handleTitleClick(item: ListItem) {
function handleTitleClick(item: BizListItem) {
props.onTitleClick && props.onTitleClick(item);
}

26
web-vue/packages/core/layouts/default/header/components/notify/index.vue
View File

@@ -13,8 +13,7 @@
<span v-if="item.list.length !== 0">({{ item.list.length }})</span>
</template>
<!-- 绑定title-click事件的通知列表中标题是“可点击”的-->
<NoticeList :list="item.list" v-if="item.key === '1'" @title-click="onNoticeClick" />
<NoticeList :list="item.list" v-else />
<NoticeList :list="item.list" @title-click="onNoticeClick" />
</TabPane>
</template>
</Tabs>
@@ -23,33 +22,36 @@
</div>
</template>
<script lang="ts">
import { computed, defineComponent, ref } from 'vue';
import { computed, defineComponent, onMounted, ref } from 'vue';
import { Popover, Tabs, Badge } from 'ant-design-vue';
import { BellOutlined } from '@ant-design/icons-vue';
import { tabListData, ListItem } from './data';
import NoticeList from './NoticeList.vue';
import { useDesign } from '@jeesite/core/hooks/web/useDesign';
import { useMessage } from '@jeesite/core/hooks/web/useMessage';
import { tabListDataAll, TabItem, BizListItem } from '@jeesite/biz/api/biz/listItem';
export default defineComponent({
components: { Popover, BellOutlined, Tabs, TabPane: Tabs.TabPane, Badge, NoticeList },
setup() {
const { prefixCls } = useDesign('header-notify');
const { createMessage } = useMessage();
const listData = ref(tabListData);
const count = computed(() => {
const listData = ref<TabItem[]>([]);
onMounted(async () => {
const response = await tabListDataAll();
listData.value = response;
});
const count = computed(() => {
let count = 0;
for (let i = 0; i < tabListData.length; i++) {
count += tabListData[i].list.length;
for (let i = 0; i < listData.value.length; i++) {
count += listData.value[i].list.length;
}
return count;
});
function onNoticeClick(record: ListItem) {
function onNoticeClick(record: BizListItem) {
createMessage.success('你点击了通知，ID=' + record.id);
// 可以直接将其标记为已读（为标题添加删除线）,此处演示的代码会切换删除线状态
record.titleDelete = !record.titleDelete;
}
return {

8
web-vue/packages/core/layouts/views/desktop/workbench/index.vue Normal file
View File

@@ -0,0 +1,8 @@
<template>
</template>
<script>
</script>
<style>
</style>

6
web/src/main/resources/config/application-prod.yml
View File

@@ -13,9 +13,9 @@ jdbc:
# Mysql 数据库配置
type: mysql
driver: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://192.168.56.1:3306/jeesite?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai
username: jeesite
password: jeesite
url: jdbc:mysql://192.168.31.189:33069/worker?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
username: dream
password: info_dream
testSql: SELECT 1
# 数据库连接池配置

2
web/src/main/resources/config/application.yml
View File

@@ -58,7 +58,7 @@ jdbc:
# Mysql 数据库配置
type: mysql
driver: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://crontab.club:33069/worker?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
url: jdbc:mysql://192.168.31.189:33069/worker?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
username: dream
password: info_dream
testSql: SELECT 1