+ * 时间 util + *
+ * + * @Author: wangxiang4 + * @since: 2023/6/13 + */ +public class DateUtil extends cn.hutool.core.date.DateUtil { + + /** + * 获取服务器启动时间 + */ + public static Date getServerStartDate() { + long time = ManagementFactory.getRuntimeMXBean().getStartTime(); + return new Date(time); + } + + public static String formatDate(long dateTime, String pattern) { + return format(new Date(dateTime), pattern); + } + + /** + * 日期型字符串转化为日期 格式 + */ + public static Date parseDate(Object str) { + if (str == null) { + return null; + } + return parse(str.toString()); + } + + public static final String parseDateToStr(final String format, final Date date) { + return new SimpleDateFormat(format).format(date); + } + + public static final String formatUTC(final Date date, final String format) { + SimpleDateFormat simpleDateFormat = new SimpleDateFormat(format); + simpleDateFormat.setTimeZone(TimeZone.getTimeZone("UTC")); + return simpleDateFormat.format(date); + } + +} diff --git a/kicc-common/kicc-common-core/src/main/java/com/cloud/kicc/common/core/util/FileUtil.java b/kicc-common/kicc-common-core/src/main/java/com/cloud/kicc/common/core/util/FileUtil.java new file mode 100644 index 00000000..46478050 --- /dev/null +++ b/kicc-common/kicc-common-core/src/main/java/com/cloud/kicc/common/core/util/FileUtil.java @@ -0,0 +1,113 @@ +package com.cloud.kicc.common.core.util; + +import cn.hutool.core.io.IoUtil; + +import javax.servlet.http.HttpServletRequest; +import java.io.*; +import java.net.URLEncoder; +import java.text.DecimalFormat; + +/** + * @author yong + * @date 2020/3/22 + * @description 文件工具类 + */ +public class FileUtil extends cn.hutool.core.io.FileUtil { + public static String FILENAME_PATTERN = "[a-zA-Z0-9_\\-\\|\\.\\u4e00-\\u9fa5]+"; + + /** + * 转换文件大小 + * + * @param fileS + * @return + */ + public static String fileSize(long fileS) { + DecimalFormat df = new DecimalFormat("#.00"); + String fileSizeString = ""; + String wrongSize = "0B"; + if (fileS == 0) { + return wrongSize; + } + if (fileS < 1024) { + fileSizeString = df.format((double) fileS) + "B"; + } else if (fileS < 1048576) { + fileSizeString = df.format((double) fileS / 1024) + "KB"; + } else if (fileS < 1073741824) { + fileSizeString = df.format((double) fileS / 1048576) + "MB"; + } else { + fileSizeString = df.format((double) fileS / 1073741824) + "GB"; + } + return fileSizeString; + } + + public static void copyInputStreamToFile(InputStream source, File destination) throws IOException { + try { + copyToFile(source, destination); + } finally { + IoUtil.close(source); + } + + } + + public static void copyToFile(InputStream source, File destination) throws IOException { + FileOutputStream output = openOutputStream(destination); + + try { + IoUtil.copy(source, output); + output.close(); + } finally { + IoUtil.close(output); + } + + } + + public static FileOutputStream openOutputStream(File file) throws IOException { + return openOutputStream(file, false); + } + + public static FileOutputStream openOutputStream(File file, boolean append) throws IOException { + if (file.exists()) { + if (file.isDirectory()) { + throw new IOException("File '" + file + "' exists but is a directory"); + } + + if (!file.canWrite()) { + throw new IOException("File '" + file + "' cannot be written to"); + } + } else { + File parent = file.getParentFile(); + if (parent != null && !parent.mkdirs() && !parent.isDirectory()) { + throw new IOException("Directory '" + parent + "' could not be created"); + } + } + + return new FileOutputStream(file, append); + } + /** + * 下载文件名重新编码 + * + * @param request 请求对象 + * @param fileName 文件名 + * @return 编码后的文件名 + */ + public static String setFileDownloadHeader(HttpServletRequest request, String fileName) + throws UnsupportedEncodingException { + final String agent = request.getHeader("USER-AGENT"); + String filename = fileName; + if (agent.contains("MSIE")) { + // IE浏览器 + filename = URLEncoder.encode(filename, "utf-8"); + filename = filename.replace("+", " "); + } else if (agent.contains("Firefox")) { + // 火狐浏览器 + filename = new String(fileName.getBytes(), "ISO8859-1"); + } else if (agent.contains("Chrome")) { + // google浏览器 + filename = URLEncoder.encode(filename, "utf-8"); + } else { + // 其它浏览器 + filename = URLEncoder.encode(filename, "utf-8"); + } + return filename; + } +} diff --git a/kicc-common/kicc-common-core/src/main/java/com/cloud/kicc/common/core/util/TimeUtils.java b/kicc-common/kicc-common-core/src/main/java/com/cloud/kicc/common/core/util/TimeUtils.java new file mode 100644 index 00000000..d35494c9 --- /dev/null +++ b/kicc-common/kicc-common-core/src/main/java/com/cloud/kicc/common/core/util/TimeUtils.java @@ -0,0 +1,321 @@ +package com.cloud.kicc.common.core.util; + +import java.util.Arrays; +import java.util.Date; + +/** + *+ * 时间计算工具类 + *
+ * + * @Author: entfrm开发团队-王翔 + * @Date: 2022/1/15 + */ +public class TimeUtils { + + public static String toTimeString(long time) { + TimeUtils t = new TimeUtils(time); + int day = t.get(TimeUtils.DAY); + int hour = t.get(TimeUtils.HOUR); + int minute = t.get(TimeUtils.MINUTE); + int second = t.get(TimeUtils.SECOND); + StringBuilder sb = new StringBuilder(); + if (day > 0){ + sb.append(day).append("天"); + } + if (hour > 0){ + sb.append(hour).append("时"); + } + if (minute > 0){ + sb.append(minute).append("分"); + } + if (second > 0){ + sb.append(second).append("秒"); + } + return sb.toString(); + } + + /** + * 时间字段常量，表示“秒” + */ + public final static int SECOND = 0; + + /** + * 时间字段常量，表示“分” + */ + public final static int MINUTE = 1; + + /** + * 时间字段常量，表示“时” + */ + public final static int HOUR = 2; + + /** + * 时间字段常量，表示“天” + */ + public final static int DAY = 3; + + /** + * 各常量允许的最大值 + */ + private final int[] maxFields = { 59, 59, 23, Integer.MAX_VALUE - 1 }; + + /** + * 各常量允许的最小值 + */ + private final int[] minFields = { 0, 0, 0, Integer.MIN_VALUE }; + + /** + * 默认的字符串格式时间分隔符 + */ + private String timeSeparator = ":"; + + /** + * 时间数据容器 + */ + private int[] fields = new int[4]; + + /** + * 无参构造，将各字段置为 0 + */ + public TimeUtils() { + this(0, 0, 0, 0); + } + + /** + * 使用时、分构造一个时间 + * @param hour 小时 + * @param minute 分钟 + */ + public TimeUtils(int hour, int minute) { + this(0, hour, minute, 0); + } + + /** + * 使用时、分、秒构造一个时间 + * @param hour 小时 + * @param minute 分钟 + * @param second 秒 + */ + public TimeUtils(int hour, int minute, int second) { + this(0, hour, minute, second); + } + + /** + * 使用一个字符串构造时间- * 大屏管理 - *
- * - * @author entfrm开发团队-王翔 - * @since 2022-08-04 - */ -@Data -@Accessors(chain = true) -@TableName("common_datascreen") -@ApiModel(value = "Datascreen对象", description = "大屏管理") -public class DataScreen extends CommonEntity { - - @ApiModelProperty("主键") - private String id; - - @ApiModelProperty("名称") - private String name; - - @ApiModelProperty("分类ID") - private String categoryId; - - @ApiModelProperty("组件") - private Blob component; - - @ApiModelProperty("详情") - private Blob detail; - - @ApiModelProperty("状态") - private String status; - - @ApiModelProperty("缩略图") - private String screenshot; - - @ApiModelProperty("缩略图") - private String backgroundUrl; - -} diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/DataScreenCategory.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/DataScreenCategory.java deleted file mode 100644 index 422c5725..00000000 --- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/DataScreenCategory.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.cloud.kicc.commonbiz.api.entity; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.cloud.kicc.common.data.entity.CommonEntity; -import java.io.Serializable; - -import com.cloud.kicc.common.data.entity.TreeEntity; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.Getter; -import lombok.Setter; -import lombok.experimental.Accessors; - -/** - *- * 大屏分类 - *
- * - * @author entfrm开发团队-王翔 - * @since 2022-08-04 - */ -@Data -@Accessors(chain = true) -@TableName("common_datascreen_category") -@ApiModel(value = "DatascreenCategory对象", description = "大屏分类") -public class DataScreenCategory extends TreeEntity- * 地图 - *
- * - * @author entfrm开发团队-王翔 - * @since 2022-08-04 - */ -@Data -@Accessors(chain = true) -@TableName("common_datascreen_map") -@ApiModel(value = "DatascreenMap对象", description = "地图") -public class DatascreenMap extends CommonEntity { - - @ApiModelProperty("主键") - private String id; - - @ApiModelProperty("地图名称") - private String name; - - @ApiModelProperty("地图数据") - private Blob data; - -} diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/Doctor.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/Doctor.java index c2635beb..4eceeb5a 100644 --- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/Doctor.java +++ b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/Doctor.java @@ -1,6 +1,5 @@ package com.cloud.kicc.commonbiz.api.entity; -import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.cloud.kicc.common.data.entity.CommonEntity; diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/EquipBeeper.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/EquipBeeper.java deleted file mode 100644 index 2a10b9ec..00000000 --- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/EquipBeeper.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.cloud.kicc.commonbiz.api.entity; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.cloud.kicc.common.data.entity.CommonEntity; -import lombok.Data; - -import java.io.Serializable; - -/** - * 呼叫器设备信息(EquipBeeper)表实体类 - * - * @author Mak - * @since 2021-09-06 14:18:37 - */ -@Data -@TableName("equip_beeper") -public class EquipBeeper extends CommonEntity implements Serializable { - /**主键ID*/ - @TableId - private String id; - /**设备名称*/ - private String beeperName; - /**设备编号*/ - private String beeperCode; - /**设备类型*/ - private Integer beeperType; - /**wifi账号*/ - private String wifiName; - /**wifi密码*/ - private String wifiPwd; - /**医院id*/ - private String hospitalId; - /**科室id*/ - private String officeId; - /**医生id*/ - private String doctorId; - /**状态，默认0：启用 ,1：禁用*/ - private String status; - /**医院名称*/ - @TableField(exist = false) - private String hospitalName; - /**科室名称*/ - @TableField(exist = false) - private String officeName; - /**医生名称*/ - @TableField(exist = false) - private String doctorName; - -} diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/EquipBeeperRecord.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/EquipBeeperRecord.java deleted file mode 100644 index d81d2e2b..00000000 --- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/EquipBeeperRecord.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.cloud.kicc.commonbiz.api.entity; - -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.cloud.kicc.common.data.entity.CommonEntity; -import lombok.Data; - -import java.io.Serializable; - -/** - * 呼叫器设备呼叫记录(EquipBeeperRecord)表实体类 - * - * @author Mak - * @since 2021-09-06 14:20:39 - */ -@Data -@TableName("equip_beeper_record") -public class EquipBeeperRecord extends CommonEntity implements Serializable { - /** 主键ID */ - @TableId - private String id; - /** 设备编号 */ - private String beeperCode; - /** 呼叫类型（1.收样 2.更新密码) */ - private Integer recordType; - /** 状态：(0.启用 1.禁用) 默认为0启用 */ - private String status; - -} diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/EquipBox.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/EquipBox.java deleted file mode 100644 index d576b318..00000000 --- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/EquipBox.java +++ /dev/null @@ -1,97 +0,0 @@ -package com.cloud.kicc.commonbiz.api.entity; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.cloud.kicc.common.data.entity.CommonEntity; -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; - -import java.io.Serializable; -import java.time.LocalDateTime; - -/** - * 标本箱设备信息(EquipBox)表实体类 - * - * @author Mak - * @since 2021-09-14 19:07:07 - */ -@Data -@TableName("equip_box") -public class EquipBox extends CommonEntity implements Serializable { - - /**主键ID*/ - @TableId - private String boxId; - /**设备名称*/ - private String boxName; - /**设备编号*/ - private String boxCode; - /**设备类型*/ - private Integer boxType; - /**设备温度*/ - private String temp; - /**设备湿度*/ - private String damp; - /**经度*/ - private String lng; - /**纬度*/ - private String lat; - /**设备具体位置*/ - private String addr; - /**剩余电量*/ - private String power; - /**倾斜度(通过倾斜角度X/Y + 震动能量值分析计算出来的角度值)*/ - private String tilt; - /**倾斜角度（x轴）*/ - private String tiltX; - /**倾斜角度（y轴）*/ - private String tiltY; - /**震动能量值（值越大倾斜越大）*/ - private String energy; - //物联网卡号 - //private String ipCard; - /**物联网卡id*/ - private Integer cardId; - - /**收样员用户id*/ - private Integer syUserId; - /**温度最低警报值*/ - private Double tempMin; - /**温度最高警报值*/ - private Double tempMax; - /**rfid每隔多少分钟上报一次所有标签*/ - private Integer rfidMin; - /**每隔多少秒上报一次数据*/ - private Integer beat; - /**设备状态 (0.未连接 1.已连接 2.已断开 3.已休眠)*/ - private Integer boxStatus; - /**锁状态 (0.关 1.开)*/ - private Integer openStatus; - /**制冷状态（0.未制冷 1.已制冷）*/ - private Integer coldStatus; - /**报警状态（0.正常 1.低温报警 2.高温报警 3.倾斜报警 4.锁未关报警）*/ - private Integer warnStatus; - /**元件异常状态（0.正常 1.指纹锁 2.制冷片 3.温湿度 4.4G通讯 5.倾斜度 6.语音）*/ - private Integer errorStatus; - /**设备最新连接时间*/ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private LocalDateTime connectTime; - /**设备最新断开时间*/ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private LocalDateTime closeTime; - /**设备最新上报时间*/ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private LocalDateTime latestTime; - /**设备启用或警用：默认为0：启用，1禁用*/ - private String status; - - /**收样员名称*/ - @TableField(exist = false) - private String syUserName; - - /**物联网卡唯一标识号iccid*/ - @TableField(exist = false) - private String iccid; - -} diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/EquipBoxCard.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/EquipBoxCard.java deleted file mode 100644 index 314dddad..00000000 --- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/EquipBoxCard.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.cloud.kicc.commonbiz.api.entity; - -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.cloud.kicc.common.data.entity.CommonEntity; -import lombok.Data; - -import java.io.Serializable; - -/** - * 物联网卡管理(EquipBoxCard)表实体类 - * - * @author Mak - * @since 2022-02-13 12:06:29 - */ -@Data -@TableName("equip_box_card") -public class EquipBoxCard extends CommonEntity implements Serializable { - /**物联网卡ID*/ - @TableId - private String id; - - /**卡号*/ - private String iccid; - - /**厂家(1.中国移动,2.中国联通,3.中国电信)*/ - private String card; - - /**0:启用，1：禁用*/ - private String status; - /**网卡卡商 */ - private String company; - /**卡是否已使用在标本箱上（0.否 1.是）*/ - private Integer isUsed; - - -} diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/EquipBoxLog.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/EquipBoxLog.java deleted file mode 100644 index 2fb6838a..00000000 --- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/EquipBoxLog.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.cloud.kicc.commonbiz.api.entity; - -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.cloud.kicc.common.data.entity.CommonEntity; -import lombok.Data; - -import java.io.Serializable; - -/** - * 标本箱心跳日志记录(EquipBoxLog)表实体类 - * - * @author Mak - * @since 2021-09-17 10:25:07 - */ -@Data -@TableName("equip_box_log") -public class EquipBoxLog extends CommonEntity implements Serializable { - /**主键ID*/ - @TableId - private String boxLogId; - /**标本箱id*/ - private String boxId; - /**设备温度*/ - private String temp; - /**设备湿度*/ - private String damp; - /**经度*/ - private String lng; - /**纬度*/ - private String lat; - /**设备具体位置*/ - private String addr; - /**剩余电量*/ - private String power; - /**倾斜度*/ - private String tilt; - /**倾斜角度（x轴）*/ - private String tiltX; - /**倾斜角度（y轴）*/ - private String tiltY; - /**震动能量值（值越大倾斜越大）*/ - private String energy; - /**锁状态 (0.关 1.开)*/ - private Integer openStatus; - /**制冷状态（0.未制冷 1.已制冷）*/ - private Integer coldStatus; - /**报警状态（0. 正常 1.低温报警 2.高温报警 3.倾斜报警 4.锁未关报警）*/ - private Integer warnStatus; - /**元件异常状态（0. 正常 1.指纹锁 2.制冷片 3.温湿度 4.4G通讯 5.倾斜度 6.语音）*/ - private Integer errorStatus; - /**状态：(0.启用 1.禁用)*/ - private String status; - -} diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/EquipBoxRecord.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/EquipBoxRecord.java deleted file mode 100644 index 14569602..00000000 --- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/EquipBoxRecord.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.cloud.kicc.commonbiz.api.entity; - -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - * 标本箱操作记录(EquipBoxRecord)表实体类 - * - * @author Mak - * @since 2021-09-15 09:39:47 - */ -@Data -@TableName("equip_box_record") -public class EquipBoxRecord implements Serializable { - /**主键ID*/ - @TableId - private String id; - /**设备id*/ - private String boxId; - /**指令编号( - * 1.连接 - * 2.获取设备配置 - * 4.开锁 - * 5.关锁 - * 6.元件异常 - * 100.重置配置 - * 105.语音播报 - * 110.新增指纹 - * 111.删除指纹 - * 112.获取所有指纹 - * 113.删除所有指纹 - * 114.开锁 - * 118.开启制冷 - * 119.关闭制冷 - * 123.开启数据上报 - * 124.关闭数据上报)*/ - private Integer cmd; - /**数据内容json格式*/ - private String dataJson; - /**关联的业务主键id*/ - private String relationId; - /**指纹ID*/ - private String fid; - /**异常状态*/ - private Integer errorStatus; - /**指令响应状态（0.未响应 1.成功 2.失败）*/ - private Integer cmdStatus; - /**指令操作序号*/ - private String timestamp; - /**状态：(0.禁用 1.启用)*/ - private String status; - -} diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/EquipBoxRfidLog.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/EquipBoxRfidLog.java deleted file mode 100644 index f3f19667..00000000 --- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/EquipBoxRfidLog.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.cloud.kicc.commonbiz.api.entity; - -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.cloud.kicc.common.data.entity.CommonEntity; -import lombok.Data; - -import java.io.Serializable; - -/** - * 标本箱RFIDj记录信息(EquipBoxRfidLog)表实体类 - * - * @author Mak - * @since 2021-09-25 15:10:33 - */ -@Data -@TableName("equip_box_rfid_log") -public class EquipBoxRfidLog extends CommonEntity implements Serializable { - /**主键ID*/ - @TableId - private String id; - /**设备id*/ - private String boxId; - /**RFID标签*/ - private String rfids; - /**标签类型(1.变动 2.所有)*/ - private Integer rfidType; - /**状态：(0.启用 1.禁用)*/ - private String status; - -} diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/EquipBoxUser.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/EquipBoxUser.java deleted file mode 100644 index 37565bdd..00000000 --- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/EquipBoxUser.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.cloud.kicc.commonbiz.api.entity; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.cloud.kicc.common.data.entity.CommonEntity; -import lombok.Data; - -import java.io.Serializable; - -/** - * 标本箱指纹用户信息(EquipBoxUser)表实体类 - * - * @author Mak - * @since 2021-09-15 09:40:50 - */ -@Data -@TableName("equip_box_user") -public class EquipBoxUser extends CommonEntity implements Serializable { - /**主键ID*/ - @TableId - private String id; - /**设备id*/ - private String boxId; - /**系统用户id*/ - private String userId; - /**用户名称*/ - private String userName; - /**指纹ID*/ - private String fid; - /**指纹类型(1.主指纹（系统用户） 2.客户)*/ - private Integer fidType; - /**指纹状态(0.启用 1.禁用)*/ - private String status; - - @TableField(exist = false) - private String boxName; - -} diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/EquipSpecimen.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/EquipSpecimen.java deleted file mode 100644 index e098f8ed..00000000 --- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/EquipSpecimen.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.cloud.kicc.commonbiz.api.entity; - - -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.cloud.kicc.common.data.entity.CommonEntity; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("equip_specimen") -public class EquipSpecimen extends CommonEntity implements Serializable { - - /**ID*/ - @TableId - private String id; - /**设备编号*/ - private String boxCode; - /**设备名称*/ - private String boxName; - /**设备类型*/ - private String boxType; - /**温控设备id*/ - private String etId; - /**收样员用户id*/ - private String syUserId; - /**状态 0:启用，1:禁用*/ - private String status; - - -} diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/EquipTemperature.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/EquipTemperature.java deleted file mode 100644 index cc5fc9ea..00000000 --- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/EquipTemperature.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.cloud.kicc.commonbiz.api.entity; - - -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.cloud.kicc.common.data.entity.CommonEntity; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("equip_temperature") -public class EquipTemperature extends CommonEntity implements Serializable { - - /**ID*/ - @TableId - private String id; - /**设备编号*/ - private String equipCode; - /**设备名称*/ - private String equipName; - /**设备登录账号*/ - private String adminUser; - /**设备登录密码*/ - private String adminPwd; - /**电量最低警报值*/ - private String powerMinWarn; - /**温度最低警报值*/ - private Integer temperatureMinWarn; - /**温度最高警报值*/ - private Integer temperatureMaxWarn; - /**设备温度*/ - private String equipTemperature; - /**设备湿度*/ - private String equipHumidity; - /**经度*/ - private String longitude; - /**纬度*/ - private String latitude; - /**设备位置*/ - private String equipAddr; - /**剩余电量*/ - private String equipPower; - /**设备状态*/ - private String equipStatus; - /**设备类型*/ - private String equipType; - /**设备最新上报时间*/ - private String latestTime; - /**0：启用，1禁用*/ - private String status; - - - -} diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/EquipTemperatureRecord.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/EquipTemperatureRecord.java deleted file mode 100644 index 53adb1ff..00000000 --- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/EquipTemperatureRecord.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.cloud.kicc.commonbiz.api.entity; - - -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.cloud.kicc.common.data.entity.CommonEntity; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName("equip_temperature_record") -public class EquipTemperatureRecord extends CommonEntity implements Serializable { - - /**id*/ - @TableId - private String id; - /**et_id 温控设备id*/ - private String etId; - /**电量最低警报值*/ - private String powerMinWarn; - /**温度最低警报值*/ - private Integer temperatureMinWarn; - /**温度最高警报值*/ - private Integer temperatureMaxWarn; - /**设备温度*/ - private String equipTemperature; - /**设备湿度*/ - private String equipHumidity; - /**经度*/ - private String longitude; - /**纬度*/ - private String latitude; - /**设备位置*/ - private String equipAddr; - /**剩余电量*/ - private String equipPower; - /**设备状态*/ - private String equipStatus; - /**设备最新上报时间*/ - private String latestTime; - /**删除标记（0.启用 1.禁用*/ - private String status; - -} diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/Office.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/Office.java index b212af4d..964132fb 100644 --- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/Office.java +++ b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/Office.java @@ -1,6 +1,5 @@ package com.cloud.kicc.commonbiz.api.entity; -import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.cloud.kicc.common.data.entity.CommonEntity; @@ -8,8 +7,6 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; -import java.io.Serializable; - /** ** 科室 diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/enums/BoxStatusEnum.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/enums/BoxStatusEnum.java deleted file mode 100644 index 3ff09277..00000000 --- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/enums/BoxStatusEnum.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.cloud.kicc.commonbiz.api.enums; - -public enum BoxStatusEnum { - //设备状态 (0.未连接 1.已连接 2.已断开 3.已休眠) - - INIT(0,"未连接"), - - TELNET(1,"已连接"), - - CLOSE(2,"已断开"), - - SLEEP(3,"已休眠"), - - OTHER(100,""); - private int code; - private String value; - - private BoxStatusEnum(int code, String value) { - this.setCode(code); - this.setValue(value); - } - - public int getCode() { - return code; - } - public void setCode(int code) { - this.code = code; - } - public String getValue() { - return value; - } - public void setValue(String value) { - this.value = value; - } - - //根据key获取枚举 - public static BoxStatusEnum getEnumByKey(Integer key){ - for(BoxStatusEnum temp: BoxStatusEnum.values()){ - if(temp.getCode() == key.intValue()){ - return temp; - } - } - return null; - } - -} diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/enums/CmdEnum.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/enums/CmdEnum.java deleted file mode 100644 index 8f4d1362..00000000 --- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/enums/CmdEnum.java +++ /dev/null @@ -1,87 +0,0 @@ -package com.cloud.kicc.commonbiz.api.enums; - -public enum CmdEnum { - /** - * 上行指令 1.连接 2.获取设备配置 3.心跳上报数据 4.开锁 5.关锁 6.元件异常 7.上报变动RFID 8.上报所有RFID - * - * 下行指令 100.重置配置 105.语音播报 110.新增指纹 111.删除指纹 112.获取所有指纹 113.删除所有指纹 114.禁用指纹 115.启用指纹 - * 120.开启数据上报 121.关闭数据上报 122.开启制冷 123.关闭制冷 124.开锁 - */ - - TELNET_U(1,"连接"), - - CONFIG_U(2,"获取设备配置信息"), - - DATA_U(3,"心跳上报数据"), - - OPEN_U(4,"开锁"), - - CLOSE_U(5,"关锁"), - - ERROR_U(6,"元件异常"), - - RFID_CHANGE_U(7,"上报变动蓝牙"), - - RFID_ALL_U(8,"上报所有蓝牙"), - - - RESET_D(100,"更新配置信息"), - - VOICE_D(105,"语音播报"), - - ADD_FID_D(110,"新增指纹"), - - DEL_FID_D(111,"删除指纹"), - - ALL_FID_D(112,"获取所有指纹"), - - DEL_ALL_FID_D(113,"删除所有指纹"), - - DISABLE_FID_D(114,"禁用指纹"), - - ENABLE_FID_D(115,"启用指纹"), - - OPEN_DATA_D(120,"开启数据上报"), - - CLOSE_DATA_D(121,"关闭数据上报"), - - OPEN_COLD_D(122,"开启制冷"), - - CLOSE_COLD_D(123,"关闭制冷"), - - OPEN_D(124,"开锁"), - - - OTHER(1000,""); - private int code; - private String value; - - private CmdEnum(int code, String value) { - this.setCode(code); - this.setValue(value); - } - - public int getCode() { - return code; - } - public void setCode(int code) { - this.code = code; - } - public String getValue() { - return value; - } - public void setValue(String value) { - this.value = value; - } - - //根据key获取枚举 - public static CmdEnum getEnumByKey(Integer key){ - for(CmdEnum temp: CmdEnum.values()){ - if(temp.getCode() == key.intValue()){ - return temp; - } - } - return null; - } - -} diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/enums/CmdStatusEnum.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/enums/CmdStatusEnum.java deleted file mode 100644 index 897a8e85..00000000 --- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/enums/CmdStatusEnum.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.cloud.kicc.commonbiz.api.enums; - -public enum CmdStatusEnum { - //指令响应状态（0.未响应 1.成功 2.失败） - - NOT(0,"未响应"), - - SUCCESS(1,"成功"), - - FAIL(2,"失败"), - - OTHER(100,""); - private int code; - private String value; - - private CmdStatusEnum(int code, String value) { - this.setCode(code); - this.setValue(value); - } - - public int getCode() { - return code; - } - public void setCode(int code) { - this.code = code; - } - public String getValue() { - return value; - } - public void setValue(String value) { - this.value = value; - } - - //根据key获取枚举 - public static CmdStatusEnum getEnumByKey(Integer key){ - for(CmdStatusEnum temp: CmdStatusEnum.values()){ - if(temp.getCode() == key.intValue()){ - return temp; - } - } - return null; - } - -} diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/enums/MapTaskStatusEnum.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/enums/MapTaskStatusEnum.java deleted file mode 100644 index 47d75a75..00000000 --- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/enums/MapTaskStatusEnum.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.cloud.kicc.commonbiz.api.enums; - -/** - *
- * 地图任务状态枚举 - *
- * - * @Author: entfrm开发团队-王翔 - * @since: 2022/11/15 - */ -public enum MapTaskStatusEnum { - - RUNNING("0","正在运行中"), - - END("9","结束"); - - private String status; - - private String description; - - MapTaskStatusEnum(String status, String description) { - this.status = status; - this.description = description; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } -} diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/enums/WarnStatusEnum.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/enums/WarnStatusEnum.java deleted file mode 100644 index f53b116f..00000000 --- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/enums/WarnStatusEnum.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.cloud.kicc.commonbiz.api.enums; - -public enum WarnStatusEnum { - //报警状态（0. 正常 1.低温报警 2.高温报警 3.倾斜报警 4.锁未关报警） - - NORMAL(0,"正常"), - - TEMP_MIN(1,"低温报警"), - - TEMP_MAX(2,"高温报警"), - - TILT(3,"倾斜报警"), - - CLOSE(4,"锁未关报警"), - - OTHER(100,""); - private int code; - private String value; - - private WarnStatusEnum(int code, String value) { - this.setCode(code); - this.setValue(value); - } - - public int getCode() { - return code; - } - public void setCode(int code) { - this.code = code; - } - public String getValue() { - return value; - } - public void setValue(String value) { - this.value = value; - } - - //根据key获取枚举 - public static WarnStatusEnum getEnumByKey(Integer key){ - for(WarnStatusEnum temp: WarnStatusEnum.values()){ - if(temp.getCode() == key.intValue()){ - return temp; - } - } - return null; - } - -} diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/vo/DownCmdVo.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/vo/DownCmdVo.java deleted file mode 100644 index 80a88c4f..00000000 --- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/vo/DownCmdVo.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.cloud.kicc.commonbiz.api.vo; - - -import lombok.Data; - -import java.io.Serializable; - -@Data -public class DownCmdVo implements Serializable { - - // 时间戳 - 用于下行指令的唯一标识 - private String ts; - - // 下行指令代码 - private Integer cmd; - - // 指纹id - //private String fid; - - // 指纹id/语音播报内容 - private String data; - - //温度最低警报值 - private Double tempMin; - //温度最高警报值 - private Double tempMax; - //rfid每隔多少分钟上报一次所有标签 - private Integer rfidMin; - //每隔多少秒上报一次数据 - private Integer beat; - //设备状态 (1.已连接 2.已断开 3.已休眠) - -} diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/vo/EquipBoxCardVo.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/vo/EquipBoxCardVo.java deleted file mode 100644 index c442ba0b..00000000 --- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/vo/EquipBoxCardVo.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.cloud.kicc.commonbiz.api.vo; - -import lombok.Data; - -import java.io.Serializable; - -/** - * 物联网卡管理(EquipBoxCard)表实体类 - * - * @author Mak - * @since 2022-02-13 12:06:29 - */ -@Data -public class EquipBoxCardVo implements Serializable { - - private Integer cardId; - - private String iccid; - - private String card; - - -} diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/vo/EquipBoxConfigVo.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/vo/EquipBoxConfigVo.java deleted file mode 100644 index 6e19fe3b..00000000 --- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/vo/EquipBoxConfigVo.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.cloud.kicc.commonbiz.api.vo; - -import lombok.Data; - -import java.io.Serializable; - -/** - * 标本箱设备信息(EquipBox)表实体类 - * - * @author Mak - * @since 2021-09-14 19:07:07 - */ -@Data -public class EquipBoxConfigVo implements Serializable { - - //温度最低警报值 - private Double tempMin; - //温度最高警报值 - private Double tempMax; - //rfid每隔多少分钟上报一次所有标签 - private Integer rfidMin; - //每隔多少秒上报一次数据 - private Integer beat; - -} diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/vo/EquipSpecimenListVo.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/vo/EquipSpecimenListVo.java deleted file mode 100644 index 9e1a5a22..00000000 --- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/vo/EquipSpecimenListVo.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.cloud.kicc.commonbiz.api.vo; - - -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; - -import java.io.Serializable; -import java.time.LocalDateTime; - - -@Data -public class EquipSpecimenListVo implements Serializable { - - /**ID*/ - private String id; - /**设备编号*/ - private String boxCode; - /**设备名称*/ - private String boxName; - /**设备类型*/ - private String boxType; - /**温控设备id*/ - private String etId; - /**温控设备编号*/ - private String equipCode; - /**设备温度*/ - private Integer equipTemperature; - /**剩余电量*/ - private String equipPower; - /**温度最高警报值*/ - private Integer temperatureMaxWarn; - /**温度最低警报值*/ - private Integer temperatureMinWarn; - /**收样员用户id*/ - private String syUserId; - /**收样员用户名称*/ - private String syUserName; - /**标记（0.禁用 1.启用）*/ - private String status; - /**设备最新上报时间*/ - private String latestTime; - /**创建时间*/ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - protected LocalDateTime createTime; - -} diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/vo/EquipSpecimenUsageVo.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/vo/EquipSpecimenUsageVo.java deleted file mode 100644 index 80e2aa99..00000000 --- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/vo/EquipSpecimenUsageVo.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.cloud.kicc.commonbiz.api.vo; - - -import lombok.Data; - -import java.io.Serializable; - -@Data -public class EquipSpecimenUsageVo implements Serializable { - - /**ID*/ - private String id; - /**设备编号*/ - private String boxCode; - /**设备名称*/ - private String boxName; - /**温控设备ID*/ - private String etId; - /**标本箱用户ID*/ - private String syUserId; - /**设备编号*/ - private String equipCode; - /**设备名称*/ - private String equipName; - /**设备温度*/ - private String equipTemperature; - /**设备湿度*/ - private String equipHumidity; - /**经度*/ - private String longitude; - /**纬度*/ - private String latitude; - /**设备位置*/ - private String equipAddr; - /**剩余电量*/ - private String equipPower; - /**设备状态*/ - private String equipStatus; - /**设备类型*/ - private String equipType; - /**设备最新上报时间*/ - private String latestTime; - -} diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/vo/EquipTempSelectVo.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/vo/EquipTempSelectVo.java deleted file mode 100644 index 079db76a..00000000 --- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/vo/EquipTempSelectVo.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.cloud.kicc.commonbiz.api.vo; - - -import lombok.Data; - -import java.io.Serializable; - -@Data -public class EquipTempSelectVo implements Serializable { - - /**ID*/ - private String etId; - /**设备名称*/ - private String equipName; - /**设备编号*/ - private String equipCode; - -} diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/workflow/constant/SqlConstants.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/workflow/constant/SqlConstants.java new file mode 100644 index 00000000..65feaa8e --- /dev/null +++ b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/workflow/constant/SqlConstants.java @@ -0,0 +1,21 @@ +package com.cloud.kicc.commonbiz.api.workflow.constant; + +/** + *+ * sql脚本 + *
+ * + * @Author: entfrm开发团队-王翔 + * @Date: 2022/1/3 + */ +public interface SqlConstants { + + String QUERY_ACT_HI_COMMENT= "select * from ACT_HI_COMMENT where TYPE_ like ? and TASK_ID_ = ? order by TIME_ desc"; + + String QUERY_USER_BY_ID = "select id, user_name userName, nick_name nickName, password, dept_id deptId, status from sys_user where id = ?"; + + String QUERY_USER_BY_DEPT_ID = "select id, user_name userName, nick_name nickName, password, dept_id deptId, status from sys_user where dept_id = ?"; + + String QUERY_USER_BY_ROLE_ID = "select distinct id, user_name userName, nick_name nickName, password, dept_id deptId, status from sys_user a, sys_user_role b where a.id = b.user_id and b.role_id = ?"; + +} diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/workflow/constant/WorkflowConstant.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/workflow/constant/WorkflowConstant.java new file mode 100644 index 00000000..9467c8c5 --- /dev/null +++ b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/workflow/constant/WorkflowConstant.java @@ -0,0 +1,61 @@ +package com.cloud.kicc.commonbiz.api.workflow.constant; + +/** + *+ * 工作流常量 + *
+ * + * @Author: entfrm开发团队-王翔 + * @Date: 2021-05-12 + */ +public interface WorkflowConstant { + + /** 流程状态码 */ + String PROCESS_STATUS_CODE = "_process_status_code"; + + /** 流程发起人变量(用户ID) */ + String INITIATOR = "applyUserId"; + + /** 流程执行人 */ + String USERNAME = "userName"; + + /** 流程标题 */ + String TITLE = "title"; + + /** 扩展流程信息分割标识 */ + String EXTEND_MESSAGE = "_EXTEND_MESSAGE_"; + + /** 可以并行处理的网关开始定义后缀 */ + String SPECIAL_GATEWAY_BEGIN_SUFFIX = "_begin"; + + /** 可以并行处理的网关结束定义后缀 */ + String SPECIAL_GATEWAY_END_SUFFIX = "_end"; + + /** 开始事件标签 */ + String START_EVENT_LABEL = "开始"; + + /** 开始事件操作备注 */ + String START_EVENT_COMMENT = "发起流程"; + + /** 结束事件标签 */ + String END_EVENT_LABEL = "结束"; + + /** 结束事件操作备注 */ + String END_EVENT_COMMENT= "结束流程"; + + /** 系统操作备注 */ + String SYSTEM_EVENT_COMMENT= "系统执行"; + + /** 等待操作备注 */ + String WAITING_EVENT_COMMENT= "等待审核"; + + /** 后加签 */ + String AFTER_ADD_SIGN = "after"; + + /** 前加签 */ + String BEFORE_ADD_SIGN = "before"; + + /** 任务操作备注前缀 */ + String COMMENT_TYPE_PREFIX = "COMMENT_"; + +} diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/workflow/entity/Workflow.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/workflow/entity/Workflow.java new file mode 100644 index 00000000..8d2c6215 --- /dev/null +++ b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/workflow/entity/Workflow.java @@ -0,0 +1,106 @@ +package com.cloud.kicc.commonbiz.api.workflow.entity; + +import com.cloud.kicc.common.core.util.TimeUtils; +import com.cloud.kicc.commonbiz.api.workflow.vo.ActivityCommentInfoVo; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import org.flowable.engine.history.HistoricActivityInstance; +import org.flowable.engine.history.HistoricProcessInstance; +import org.flowable.engine.runtime.ProcessInstance; + +import java.io.Serializable; +import java.util.HashMap; +import java.util.Map; + +/** + *+ * 工作流核心 + *
+ * + * @Author: entfrm开发团队-王翔 + * @Date: 2022/1/4 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +public class Workflow implements Serializable { + + /** 反序列化密钥 */ + private static final long serialVersionUID = 1L; + + /** 流程任务ID */ + private String taskId; + /** 流程任务名称 */ + private String taskName; + /** 流程任务定义key */ + private String taskDefKey; + /** 任务处理人ID */ + private String assignee; + /** 任务处理人名称 */ + private String assigneeName; + + /** 流程表单key */ + private String formKey; + /** 表单类型(1:动态表单,2:外置表单) */ + private String formType; + /** 流程表单是否只读 */ + private boolean formReadOnly; + + /** 流程标题 */ + private String title; + /** 流程实例ID */ + private String processInsId; + /** 流程定义ID */ + private String processDefId; + /** 流程定义Key */ + private String processDefKey; + + /** 业务数据ID */ + private String businessId; + /** 业务数据表名 */ + private String businessTable; + + /** 流程变量 */ + private Map+ * 流程模型 + *
+ * + * @Author: entfrm开发团队-王翔 + * @Date: 2022/1/4 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@TableName("act_de_model") +public class WorkflowModel implements Serializable { + + /** 反序列密钥 */ + private static final long serialVersionUID = 1L; + + @TableId + private String id; + + /** 模型名称 */ + private String name; + + /** 模型key */ + private String modelKey; + + /** 描述 */ + private String description; + + /** 备注 */ + private String modelComment; + + /** 创建时间 */ + private LocalDateTime createTime; + + /** 创建人 */ + private String createById; + + /** 最后更新时间 */ + private LocalDateTime updateTime; + + /** 最后更新人 */ + private String updateById; + + /** 模型版本 */ + private int version; + + /** 模型设计器JSON */ + private String modelEditorJson; + + /** 模型流程图 */ + private byte[] thumbnail; + + /** + * 模型类型 + * 0:BPMN模型 + * 2:表单模型 + * 3:APP模型 + * 4:决策模型 + * 5:CMMN模型 + */ + private Integer modelType; + + /** 多租户ID */ + private String tenantId; + + /** 流程定义 */ + @TableField(exist = false) + private ProcessDefinitionInfoVo processDefinition; + +} diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/workflow/enums/ExtendMessage.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/workflow/enums/ExtendMessage.java new file mode 100644 index 00000000..c4543c31 --- /dev/null +++ b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/workflow/enums/ExtendMessage.java @@ -0,0 +1,89 @@ +package com.cloud.kicc.commonbiz.api.workflow.enums; + +import lombok.Getter; + +/** + *+ * 扩展流程信息 + * 通过评论存储自定义的流程字段 + *
+ * + * @Author: entfrm开发团队-王翔 + * @Date: 2021/5/13 + */ +public enum ExtendMessage { + + // 预设活动审核操作扩展信息 + ACTIVITY_BEGIN("开始", "_workflow_activity_start", "primary"), + ACTIVITY_END("结束", "_workflow_activity_end", "primary"), + ACTIVITY_SAVE("暂存", "_workflow_activity_save", "primary"), + ACTIVITY_AGREE("同意", "_workflow_activity_agree", "success"), + ACTIVITY_REJECT("驳回", "_workflow_activity_reject", "danger"), + ACTIVITY_ROLL_BACK("指定回退", "_workflow_activity_roll_back", "danger"), + ACTIVITY_ADD_MULTI_INSTANCE("加签", "_workflow_activity_add_multi_instance", "primary"), + ACTIVITY_DEL_MULTI_INSTANCE("减签", "_workflow_activity_del_multi_instance", "primary"), + ACTIVITY_TRANSFER("转办", "_workflow_activity_transfer", "primary"), + ACTIVITY_DELEGATE("委派", "_workflow_activity_delegate", "primary"), + ACTIVITY_STOP("终止", "_workflow_activity_stop", "info"), + ACTIVITY_PRINT("打印", "_workflow_activity_print", "primary"), + ACTIVITY_COMMIT("提交", "_workflow_activity_commit", "success"), + ACTIVITY_AUDIT("审批", "_workflow_activity_audit", "success"), + ACTIVITY_ADD_BEFORE_MULTI_INSTANCE("前加签", "_workflow_activity_before_add_multi_instance", "primary"), + ACTIVITY_ADD_AFTER_MULTI_INSTANCE("后加签", "_workflow_activity_after_add_multi_instance", "primary"), + + // 预设流程操作扩展信息 + PROCESS_SUSPENDED("已挂起", "_workflow_process_suspended", "danger"), + PROCESS_WAITING("等待审核", "_workflow_process_waiting", "primary"), + PROCESS_AGREE("审核通过", "_workflow_process_agree", "success"), + PROCESS_REVOKE("流程撤回", "_workflow_process_revoke", "warning"), + PROCESS_REJECT("审核驳回", "_workflow_process_reject", "danger"), + PROCESS_STOP("审核终止", "_workflow_process_stop", "info"), + PROCESS_DELETED("流程作废", "_workflow_process_deleted", "danger"), + PROCESS_RECOMMIT("重新提交", "_workflow_process_recommit", "warning"); + + /** 操作名称 */ + @Getter + private String mesName; + + /** 操作编码,用于控制在前台流程实例状态 */ + @Getter + private String mesCode; + + /** 操作级别,用于控制在前台显示的颜色 */ + @Getter + private String mesLevel; + + ExtendMessage(String mesName, String mesCode, String mesLevel) { + this.mesName = mesName; + this.mesCode = mesCode; + this.mesLevel = mesLevel; + } + + public static String getMesName(String mesCode) { + for (ExtendMessage extendMessage : ExtendMessage.values()) { + if (extendMessage.getMesCode().equals (mesCode)) { + return extendMessage.getMesName(); + } + } + return null; + } + + public static String getMesLevel(String mesCode) { + for (ExtendMessage extendMessage : ExtendMessage.values()) { + if (extendMessage.getMesCode().equals(mesCode)) { + return extendMessage.getMesLevel(); + } + } + // 如果不存在返回 primary + return "primary"; + } + + public static ExtendMessage getExtendMessage(String mesCode) { + for (ExtendMessage extendMessage : ExtendMessage.values()) { + if (extendMessage.getMesCode().equals(mesCode)) { + return extendMessage; + } + } + return null; + } +} diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/workflow/extension/entity/ActivityExtensionData.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/workflow/extension/entity/ActivityExtensionData.java new file mode 100644 index 00000000..455e97fd --- /dev/null +++ b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/workflow/extension/entity/ActivityExtensionData.java @@ -0,0 +1,46 @@ +package com.cloud.kicc.commonbiz.api.workflow.extension.entity; + +import cn.hutool.core.collection.CollectionUtil; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.cloud.kicc.common.data.entity.CommonEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.util.List; + +/** + *+ * 活动扩展数据 + *
+ * + * @Author: entfrm开发团队-王翔 + * @Date: 2022/1/2 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@TableName(value = "act_extension_activity_data", excludeProperty = "delFlag") +public class ActivityExtensionData extends CommonEntity { + + /** 反序列化密钥 */ + private static final long serialVersionUID = 1L; + + private String id; + + /** 流程定义id */ + private String processDefId; + + /** 活动定义id */ + private String activityDefId; + + /** 存储任务扩展数据 */ + @TableField(exist = false) + private List+ * 活动扩展属性 + *
+ * + * @Author: entfrm开发团队-王翔 + * @Date: 2022/1/2 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@TableName(value = "act_extension_activity_property", excludeProperty = "delFlag") +public class ActivityExtensionProperty extends CommonEntity { + + /** 反序列化密钥 */ + private static final long serialVersionUID = 1L; + + private String id; + + /** 流程定义id */ + private String processDefId; + + /** 活动定义id */ + private String activityDefId; + + /** 变量名 */ + @TableField("`key`") + private String key; + + /** 变量值 */ + private String value; + +} diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/workflow/extension/entity/Button.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/workflow/extension/entity/Button.java new file mode 100644 index 00000000..2343d90a --- /dev/null +++ b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/workflow/extension/entity/Button.java @@ -0,0 +1,39 @@ +package com.cloud.kicc.commonbiz.api.workflow.extension.entity; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.io.Serializable; + +/** + *+ * 常用按钮 + *
+ * + * @Author: entfrm开发团队-王翔 + * @Date: 2021/6/16 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@TableName("act_extension_button") +public class Button implements Serializable { + + /** 反序列化密钥 */ + private static final long serialVersionUID = 1L; + + private String id; + + /** 名称 */ + private String name; + + /** 编码 */ + private String code; + + /** 排序 */ + private String sort; + +} diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/workflow/extension/entity/Category.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/workflow/extension/entity/Category.java new file mode 100644 index 00000000..dc97e133 --- /dev/null +++ b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/workflow/extension/entity/Category.java @@ -0,0 +1,32 @@ +package com.cloud.kicc.commonbiz.api.workflow.extension.entity; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.cloud.kicc.common.data.entity.TreeEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + *+ * 流程分类管理 + * 开发经验: 树形结构功能一般不做分页处理,会破坏分页结构导致树形结构不完整 + * 要么采用数据库查询第一级数据分页,然后在根据第一级去匹配所有子级,但是数据库需要做递归sql操作比较消耗性能而且太过于复杂不好维护 + * 目前暂时没有一个比较好的处理树形结构分页的方案,后期数据量大可以打算实现数据库递归sql操作,但是目前数据量小没必要 + * 功能为树形结构功能,不推荐使用层级码做处理,原因:维护太过于复杂,需要管理一套层级码的操作 + * 后期维护推荐:后端处理简单的操作不到万不得已不要用递归,增加服务器的压力,推荐把递归等复杂逻辑放到客户端做 + *
+ * + * @Author: entfrm开发团队-王翔 + * @Date: 2021/6/21 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@TableName(value = "act_extension_category", excludeProperty = "delFlag" ) +public class Category extends TreeEntity+ * 流程表达式 + *
+ * + * @Author: entfrm开发团队-王翔 + * @Date: 2021/6/20 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@TableName("act_extension_condition") +public class Condition implements Serializable { + + /** 反序列化密钥 */ + private static final long serialVersionUID = 1L; + + private String id; + + /** 名称 */ + private String name; + + /** 表达式 */ + private String expression; + + /** 表达式 */ + private String remarks; + +} diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/workflow/extension/entity/FormCategory.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/workflow/extension/entity/FormCategory.java new file mode 100644 index 00000000..380c07f2 --- /dev/null +++ b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/workflow/extension/entity/FormCategory.java @@ -0,0 +1,32 @@ +package com.cloud.kicc.commonbiz.api.workflow.extension.entity; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.cloud.kicc.common.data.entity.TreeEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + *+ * 表单定义分类管理 + * 开发经验: 树形结构功能一般不做分页处理,会破坏分页结构导致树形结构不完整 + * 要么采用数据库查询第一级数据分页,然后在根据第一级去匹配所有子级,但是数据库需要做递归sql操作比较消耗性能而且太过于复杂不好维护 + * 目前暂时没有一个比较好的处理树形结构分页的方案,后期数据量大可以打算实现数据库递归sql操作,但是目前数据量小没必要 + * 功能为树形结构功能,不推荐使用层级码做处理,原因:维护太过于复杂,需要管理一套层级码的操作 + * 后期维护推荐:后端处理简单的操作不到万不得已不要用递归,增加服务器的压力,推荐把递归等复杂逻辑放到客户端做 + *
+ * + * @Author: entfrm开发团队-王翔 + * @Date: 2021/12/3 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@TableName(value = "act_extension_form_category") +public class FormCategory extends TreeEntity+ * 表单定义 + *
+ * + * @Author: entfrm开发团队-王翔 + * @Date: 2021/12/3 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@TableName(value = "act_extension_form_def", excludeProperty = { "formCategory", "formDefinitionJson" }) +public class FormDefinition extends CommonEntity { + + /** 反序列化密钥 */ + private static final long serialVersionUID = 1L; + + private String id; + + /** 表单定义分类管理id */ + private String categoryId; + + /** 表单定义名称 */ + private String name; + + /** 表单定义分类 */ + private FormCategory formCategory = new FormCategory(); + + /** 表单定义json */ + private FormDefinitionJson formDefinitionJson = new FormDefinitionJson(); + +} diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/workflow/extension/entity/FormDefinitionJson.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/workflow/extension/entity/FormDefinitionJson.java new file mode 100644 index 00000000..21a69a6d --- /dev/null +++ b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/workflow/extension/entity/FormDefinitionJson.java @@ -0,0 +1,44 @@ +package com.cloud.kicc.commonbiz.api.workflow.extension.entity; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.cloud.kicc.common.data.entity.CommonEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + *+ * 表单定义设计数据 + *
+ * + * @Author: entfrm开发团队-王翔 + * @Date: 2021/12/4 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@TableName(value = "act_extension_form_def_json", excludeProperty = "remarks") +public class FormDefinitionJson extends CommonEntity { + + /** 反序列化密钥 */ + private static final long serialVersionUID = 1L; + + private String id; + + /** 表单定义id */ + private String formDefinitionId; + + /** 表单设计json数据 */ + private String json; + + /** 版本号 */ + private Integer version; + + /** 状态 */ + private String status; + + /** 是否主版本 */ + private String isPrimary; + +} diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/workflow/extension/entity/Listener.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/workflow/extension/entity/Listener.java new file mode 100644 index 00000000..360c3ac0 --- /dev/null +++ b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/workflow/extension/entity/Listener.java @@ -0,0 +1,46 @@ +package com.cloud.kicc.commonbiz.api.workflow.extension.entity; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.io.Serializable; + +/** + *+ * 监听器 + * 任务监听器|执行监听器 + *
+ * + * @Author: entfrm开发团队-王翔 + * @Date: 2021/6/25 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@TableName("act_extension_listener") +public class Listener implements Serializable { + + /** 反序列化密钥 */ + private static final long serialVersionUID = 1L; + + private String id; + + /** 名称 */ + private String name; + + /** 监听器类型 */ + private Integer listenerType; + + /** 事件 */ + private String event; + + /** 值类型 */ + private Integer valueType; + + /** 值 */ + private String value; + +} diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/workflow/extension/entity/WorkflowAssignee.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/workflow/extension/entity/WorkflowAssignee.java new file mode 100644 index 00000000..9b66f766 --- /dev/null +++ b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/workflow/extension/entity/WorkflowAssignee.java @@ -0,0 +1,49 @@ +package com.cloud.kicc.commonbiz.api.workflow.extension.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.io.Serializable; + +/** + *+ * 工作流审核者 + *
+ * + * @Author: entfrm开发团队-王翔 + * @Date: 2022/1/2 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@TableName("act_extension_workflow_assignee") +public class WorkflowAssignee implements Serializable { + + /** 反序列化密钥 */ + private static final long serialVersionUID = 1L; + + private String id; + + /** 用户类型 */ + private String type; + + /** 用户来自 */ + private String value; + + /** 附加条件 */ + @TableField("`condition`") + private String condition; + + /** 运算类型 */ + private String operationType; + + /** 排序 */ + private Integer sort; + + /** 活动扩展数据id */ + private String activityExtensionDataId; + +} diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/workflow/extension/entity/WorkflowButton.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/workflow/extension/entity/WorkflowButton.java new file mode 100644 index 00000000..958d90cb --- /dev/null +++ b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/workflow/extension/entity/WorkflowButton.java @@ -0,0 +1,47 @@ +package com.cloud.kicc.commonbiz.api.workflow.extension.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.io.Serializable; + +/** + *+ * 工作流按钮 + *
+ * + * @Author: entfrm开发团队-王翔 + * @Date: 2022/1/2 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@TableName("act_extension_workflow_button") +public class WorkflowButton implements Serializable { + + /** 反序列化密钥 */ + private static final long serialVersionUID = 1L; + + private String id; + + /** 按钮名称 */ + private String name; + + /** 编码 */ + private String code; + + /** 是否隐藏 */ + private String isHide; + + /** 下一节点审核人 */ + private String next; + + /** 排序 */ + private Integer sort; + + /** 任务扩展数据id */ + private String activityExtensionDataId; + +} diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/workflow/extension/entity/WorkflowCondition.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/workflow/extension/entity/WorkflowCondition.java new file mode 100644 index 00000000..e35e4d4b --- /dev/null +++ b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/workflow/extension/entity/WorkflowCondition.java @@ -0,0 +1,48 @@ +package com.cloud.kicc.commonbiz.api.workflow.extension.entity; + + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.io.Serializable; + +/** + *+ * 工作流流程条件 + *
+ * + * @Author: entfrm开发团队-王翔 + * @Date: 2022/1/2 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@TableName("act_extension_workflow_condition") +public class WorkflowCondition implements Serializable { + + /** 反序列化密钥 */ + private static final long serialVersionUID = 1L; + + private String id; + + /** 变量名 */ + private String field; + + /** 比较类型 */ + private String compare; + + /** 比较值 */ + private String value; + + /** 运算类型 */ + private String logic; + + /** 排序 */ + private Integer sort; + + /** 任务扩展数据id */ + private String activityExtensionDataId; + +} diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/workflow/extension/entity/WorkflowCopy.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/workflow/extension/entity/WorkflowCopy.java new file mode 100644 index 00000000..ca0e32f0 --- /dev/null +++ b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/workflow/extension/entity/WorkflowCopy.java @@ -0,0 +1,46 @@ +package com.cloud.kicc.commonbiz.api.workflow.extension.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.cloud.kicc.common.data.entity.CommonEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + *+ * 流程抄送 + *
+ * + * @Author: entfrm开发团队-王翔 + * @Date: 2022/1/12 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@TableName(value = "act_extension_cc", excludeProperty = { "remarks", "delFlag", "updateTime", "updateBy" }) +public class WorkflowCopy extends CommonEntity { + + /** 反序列化密钥 */ + private static final long serialVersionUID = 1L; + + private String id; + + /** 抄送用户id */ + private String userId; + + /** 流程定义id */ + private String processDefId; + + /** 流程实例id */ + private String processInsId; + + /** 流程标题 */ + private String processDefName; + + /** 实例标题 */ + private String processInsName; + + /** 流程节点名称 */ + private String taskName; + +} diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/workflow/vo/ActivityCommentInfoVo.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/workflow/vo/ActivityCommentInfoVo.java new file mode 100644 index 00000000..c40c6cba --- /dev/null +++ b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/workflow/vo/ActivityCommentInfoVo.java @@ -0,0 +1,76 @@ +package com.cloud.kicc.commonbiz.api.workflow.vo; + +import cn.hutool.core.util.StrUtil; +import com.cloud.kicc.commonbiz.api.workflow.constant.WorkflowConstant; +import com.cloud.kicc.commonbiz.api.workflow.enums.ExtendMessage; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.Accessors; + +/** + *+ * 任务备注信息 + *
+ * + * @Author: entfrm开发团队-王翔 + * @Date: 2021-05-13 + */ +@Data +@Accessors(chain = true) +@AllArgsConstructor +@NoArgsConstructor +public class ActivityCommentInfoVo { + + /** 操作名称 */ + private String mesName; + + /** 操作编码 */ + private String mesCode; + + /** 操作级别 */ + private String mesLevel; + + /** 任务备注 */ + private String message; + + /** 获取组合备注 */ + public String getCombinationMessage(){ + return this.mesName + WorkflowConstant.EXTEND_MESSAGE + this.message; + } + + /** 设置组合备注 */ + public void setCombinationMessage(String message){ + if(StrUtil.isBlank(message) || !message.contains(WorkflowConstant.EXTEND_MESSAGE)){ + this.setMessage(message); + }else{ + String[] list=message.split(WorkflowConstant.EXTEND_MESSAGE); + if(list.length > 1){ + this.setMesName(list[0]); + this.setMessage(list[1]); + }else{ + this.setMesName(list[0]); + this.setMessage(""); + } + } + } + + public void setMesCode(String mesCode){ + this.mesCode = mesCode; + this.mesLevel = ExtendMessage.getMesLevel(mesCode); + } + + /** 设置扩展信息 */ + public void setExtendMessage(String extendMessage){ + if(extendMessage.startsWith(WorkflowConstant.COMMENT_TYPE_PREFIX)){ + this.mesCode = extendMessage.substring(WorkflowConstant.COMMENT_TYPE_PREFIX.length()); + this.mesLevel = ExtendMessage.getMesLevel(mesCode); + } + } + + /** 获取扩展信息 */ + public String getExtendMessage(){ + return WorkflowConstant.COMMENT_TYPE_PREFIX + this.mesCode; + } + +} diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/workflow/vo/HistoryTaskInfoVo.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/workflow/vo/HistoryTaskInfoVo.java new file mode 100644 index 00000000..56415775 --- /dev/null +++ b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/workflow/vo/HistoryTaskInfoVo.java @@ -0,0 +1,92 @@ +package com.cloud.kicc.commonbiz.api.workflow.vo; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.Accessors; +import org.flowable.task.api.history.HistoricTaskInstance; + +import java.util.Date; +import java.util.HashMap; +import java.util.Map; + +/** + *+ * 历史任务信息 + *
+ * + * @Author: entfrm开发团队-王翔 + * @Date: 2022/1/3 + */ +@Data +@Accessors(chain = true) +@AllArgsConstructor +@NoArgsConstructor +public class HistoryTaskInfoVo { + + /** 任务ID */ + private String id; + + /** 任务名称 */ + private String name; + + /** 任务处理人 */ + private String assignee; + + /** 当前任务流程执行分支ID */ + private String executionId; + + /** 任务定义key */ + private String taskDefKey; + + /** 流程定义ID */ + private String processDefId; + + /** 流程实例ID */ + private String processInsId; + + /** 流程定义名称 */ + private String processDefName; + + /** 流程是否可以回滚到该节点 */ + private boolean rollBack; + + /** 任务备注 */ + private String comment; + + /** 流程操作名称 */ + private String mesName; + + /** 流程操作编码 */ + private String mesCode; + + /** 流程操作级别 */ + private String mesLevel; + + /** 任务创建时间 */ + private Date createTime; + + /** 任务结束时间 */ + private Date endTime; + + /** 流程当前任务 */ + private TaskInfoVo taskInfo; + + /** 流程变量 */ + private Map+ * 流程定义信息 + *
+ * + * @Author: entfrm开发团队-王翔 + * @Date: 2021/5/12 + */ +@Data +@Accessors(chain = true) +@AllArgsConstructor +@NoArgsConstructor +public class ProcessDefinitionInfoVo { + + /** 流程定义ID */ + private String id; + + /** 流程定义分类 */ + private String category; + + /** 流程定义key */ + private String key; + + /** 流程定义名称 */ + private String name; + + /** 流程定义版本 */ + private String version; + + /** bpmn.xml名称 */ + private String resourceName; + + /** 流程图名称 */ + private String diagramResourceName; + + /** 流程部署ID */ + private String deploymentId; + + /** 是否暂停 */ + private boolean suspend; + + /** 流程部署时间 */ + private Date deploymentTime; + +} diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/workflow/vo/ProcessInstanceInfoVo.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/workflow/vo/ProcessInstanceInfoVo.java new file mode 100644 index 00000000..45460757 --- /dev/null +++ b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/workflow/vo/ProcessInstanceInfoVo.java @@ -0,0 +1,80 @@ +package com.cloud.kicc.commonbiz.api.workflow.vo; + +import com.cloud.kicc.commonbiz.api.workflow.enums.ExtendMessage; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.Accessors; + +import java.util.Date; +import java.util.HashMap; +import java.util.Map; +/** + *+ * 流程实例信息 + *
+ * + * @Author: entfrm开发团队-王翔 + * @Date: 2021/5/12 + */ +@Data +@Accessors(chain = true) +@AllArgsConstructor +@NoArgsConstructor +public class ProcessInstanceInfoVo { + + /** 流程实例ID */ + private String processInsId; + + /** 流程定义ID */ + private String processDefId; + + /** 流程定义key */ + private String processDefKey; + + /** 流程定义名称 */ + private String processDefName; + + /** 流程版本 */ + private int version; + + /** 流程开始时间 */ + private Date startTime; + + /** 流程结束时间 */ + private Date endTime; + + /** 流程当前任务ID */ + private String activityId; + + /** 流程当前任务名称 */ + private String taskName; + + /** 流程作废原因 */ + private String deleteReason; + + /** 流程当前任务信息 */ + private TaskInfoVo taskInfo; + + /** 流程操作名称 */ + private String mesName; + + /** 流程操作编码 */ + private String mesCode; + + /** 流程操作级别 */ + private String mesLevel; + + /** 历史最后结束流程任务信息 */ + private HistoryTaskInfoVo historyTaskInfo; + + /** 流程变量 */ + private Map+ * 任务信息 + *
+ * + * @Author: entfrm开发团队-王翔 + * @Date: 2021/5/12 + */ +@Data +@Accessors(chain = true) +@AllArgsConstructor +@NoArgsConstructor +public class TaskInfoVo { + + /** 任务ID */ + private String id; + + /** 任务名称 */ + private String name; + + /** 任务处理人 */ + private String assignee; + + /** 当前任务流程执行分支ID */ + private String executionId; + + /** 任务定义key */ + private String taskDefKey; + + /** 任务创建时间 */ + private Date createTime; + + /** 流程定义ID */ + private String processDefId; + + /** 流程实例ID */ + private String processInsId; + + /** 流程定义key */ + private String processDefKey; + + public TaskInfoVo(TaskInfo taskInfo){ + this.id = taskInfo.getId(); + this.name = taskInfo.getName(); + this.assignee = taskInfo.getAssignee(); + this.executionId = taskInfo.getExecutionId(); + this.taskDefKey = taskInfo.getTaskDefinitionKey(); + this.createTime = taskInfo.getCreateTime(); + this.processDefId = taskInfo.getProcessDefinitionId(); + this.processInsId = taskInfo.getProcessInstanceId(); + } + +} diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/pom.xml b/kicc-platform/kicc-platform-biz/kicc-common-biz/pom.xml index b709f8c7..f6ec3f7c 100644 --- a/kicc-platform/kicc-platform-biz/kicc-common-biz/pom.xml +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/pom.xml @@ -59,17 +59,13 @@- * 大屏分类 前端控制器 - *
- * - * @author entfrm开发团队-王翔 - * @since 2022-08-04 - */ -@Controller -@RequestMapping(AppConstants.APP_COMMON + "/datascreenCategory") -public class DatascreenCategoryController { - -} - diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/DatascreenController.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/DatascreenController.java deleted file mode 100644 index 73bd0d7b..00000000 --- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/DatascreenController.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.cloud.kicc.commonbiz.controller; - - -import com.cloud.kicc.common.core.constant.AppConstants; -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; - -/** - *- * 大屏管理 前端控制器 - *
- * - * @author entfrm开发团队-王翔 - * @since 2022-08-04 - */ -@Controller -@RequestMapping(AppConstants.APP_COMMON + "/datascreen") -@RequiredArgsConstructor -public class DatascreenController { - - /*private final IDatascreenService iDatascreenService; - - @ModelAttribute - public DataScreen get(@RequestParam(required=false) String id) { - DataScreen entity = null; - if (StringUtils.isNotBlank(id)){ - entity = dataScreenService.get(id); - } - if (entity == null){ - entity = new DataScreen(); - } - return entity; - } - - *//** - * 大屏设计列表数据 - *//* - @RequiresPermissions("datav:dataScreen:list") - @GetMapping("list") - public AjaxJson list(DataScreen dataScreen, HttpServletRequest request, HttpServletResponse response) { - Page- * 地图 前端控制器 - *
- * - * @author entfrm开发团队-王翔 - * @since 2022-08-04 - */ -@Controller -@RequestMapping(AppConstants.APP_COMMON + "/datascreenMap") -public class DatascreenMapController { - -} - diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/EquipBeeperController.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/EquipBeeperController.java deleted file mode 100644 index 777f60be..00000000 --- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/EquipBeeperController.java +++ /dev/null @@ -1,100 +0,0 @@ -package com.cloud.kicc.commonbiz.controller; - - -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.cloud.kicc.common.core.api.R; -import com.cloud.kicc.commonbiz.service.EquipBeeperRecordService; -import com.cloud.kicc.commonbiz.service.EquipBeeperService; -import com.cloud.kicc.commonbiz.api.entity.EquipBeeper; - -import lombok.RequiredArgsConstructor; -import org.springframework.web.bind.annotation.*; - -import java.util.Arrays; - -/** - * 呼叫器设备信息(EquipBeeper)表控制层 - * - * @author Mak - * @since 2021-09-06 14:18:38 - */ -@RestController -@RequiredArgsConstructor -@RequestMapping("/equip/beeper") -public class EquipBeeperController { - - private final EquipBeeperService equipBeeperService; - - - private final EquipBeeperRecordService equipBeeperRecordService; - - /** - * 获取呼叫器信息 - * @param id - * @return - */ - @GetMapping(value = "/getById") - public R getEquipBeeperInfo(@RequestParam("id") String id) { - return R.ok(equipBeeperService.getData(id)); - } - - /** - * 新增呼叫器信息 - * @param param - * @return - * @throws Exception - */ - @PostMapping(value = "/add") - public R add(@RequestBody EquipBeeper param) { - boolean save = equipBeeperService.save(param); - // 自定义code - param.setBeeperCode("H"+ param.getId()); - return R.ok(); - } - - /** - * 编辑呼叫器信息 - * @param param - * @return - */ - @PutMapping(value = "/update") - public R update(@RequestBody EquipBeeper param) { - equipBeeperService.updateById(param); - return R.ok(); - } - - /** - * 获取呼叫器列表 - * @return - * @throws Exception - */ - @GetMapping(value = "/list") - public R list(Page page, EquipBeeper equipBeeper) { - return R.ok(equipBeeperService.pageData(page, equipBeeper)); - } - - /** - * @Author: Mak - * @Description: 删除呼叫器 - * @Date: 2021/9/27 - * @Modified by: - */ - @DeleteMapping(value = "/remove/{id:[\\w,]+}") - public R remove(@PathVariable("id") String[] id) { - this.equipBeeperService.removeByIds(Arrays.asList(id)); - return R.ok(); - } - - /** - * @Author: Mak - * @Description: 查询呼叫器呼叫记录列表 - * @Date: 2021/9/26 - * @Modified by: - */ - @GetMapping(value = "/record/list") - public R listEquipBeeperRecord(@RequestParam("beeperCode") String beeperCode) { - return R.ok(equipBeeperRecordService.listBeeperRecord(beeperCode)); - } - - -} diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/EquipBoxCardController.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/EquipBoxCardController.java deleted file mode 100644 index eed534a0..00000000 --- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/EquipBoxCardController.java +++ /dev/null @@ -1,119 +0,0 @@ -package com.cloud.kicc.commonbiz.controller; - - - -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.cloud.kicc.common.core.api.R; -import com.cloud.kicc.commonbiz.service.EquipBoxCardService; -import com.cloud.kicc.commonbiz.api.entity.EquipBoxCard; - -import lombok.RequiredArgsConstructor; -import org.springframework.web.bind.annotation.*; - -import java.util.Arrays; -import java.util.List; - -/** - * 物联网卡管理(EquipBoxCard)表控制层 - * - * @author Mak - * @since 2022-02-13 12:06:30 - */ -@RestController -@RequiredArgsConstructor -@RequestMapping("/equip/boxcard") -public class EquipBoxCardController { - - - private final EquipBoxCardService equipBoxCardService; - - /** - * 分页查询所有数据 - * @return 所有数据 - */ - @GetMapping("/page") - public R page(Page page, EquipBoxCard equipBoxCard) { - LambdaQueryWrapper- * 大屏分类 Mapper 接口 - *
- * - * @author entfrm开发团队-王翔 - * @since 2022-08-04 - */ -public interface DatascreenCategoryMapper extends BaseMapper- * 地图 Mapper 接口 - *
- * - * @author entfrm开发团队-王翔 - * @since 2022-08-04 - */ -public interface DatascreenMapMapper extends BaseMapper- * 大屏管理 Mapper 接口 - *
- * - * @author entfrm开发团队-王翔 - * @since 2022-08-04 - */ -public interface DatascreenMapper extends BaseMapper- * 大屏分类 服务类 - *
- * - * @author entfrm开发团队-王翔 - * @since 2022-08-04 - */ -public interface IDatascreenCategoryService extends IService- * 地图 服务类 - *
- * - * @author entfrm开发团队-王翔 - * @since 2022-08-04 - */ -public interface IDatascreenMapService extends IService- * 大屏管理 服务类 - *
- * - * @author entfrm开发团队-王翔 - * @since 2022-08-04 - */ -public interface IDatascreenService extends IService- * 地图任务 - *
- * - * @Author: entfrm开发团队-王翔 - * @Date: 2022/6/6 - */ -public interface MapTaskService extends IService- * 大屏分类 服务实现类 - *
- * - * @author entfrm开发团队-王翔 - * @since 2022-08-04 - */ -@Service -public class DatascreenCategoryServiceImpl extends ServiceImpl- * 地图 服务实现类 - *
- * - * @author entfrm开发团队-王翔 - * @since 2022-08-04 - */ -@Service -public class DatascreenMapServiceImpl extends ServiceImpl- * 大屏管理 服务实现类 - *
- * - * @author entfrm开发团队-王翔 - * @since 2022-08-04 - */ -@Service -public class DatascreenServiceImpl extends ServiceImpl+ * 回滚任务命令 + *
+ * + * @Author: entfrm开发团队-王翔 + * @Date: 2022/1/4 + */ +public class RollBackUserTaskCmd implements Command+ * Flowable-6.4配置 + *
+ * + * @Author: entfrm开发团队-王翔 + * @Date: 2022/1/4 + */ +@Configuration +@ComponentScan({ "org.flowable.ui.modeler", "org.flowable.ui.common" }) +@EnableConfigurationProperties(FlowableProperties.class) +public class FlowableConfig implements EngineConfigurationConfigurer+ * 数据库重构工具配置 + *
+ * + * @Author: entfrm开发团队-王翔 + * @Date: 2022/1/4 + */ +@Configuration +public class LiquibaseConfig { + + private static final String LIQUIBASE_CHANGELOG_PREFIX = "ACT_DE_"; + + @Bean + public Liquibase liquibase(DataSource dataSource) { + try { + DatabaseConnection connection = new JdbcConnection(dataSource.getConnection()); + Database database = DatabaseFactory.getInstance().findCorrectDatabaseImplementation(connection); + database.setDatabaseChangeLogTableName(LIQUIBASE_CHANGELOG_PREFIX + database.getDatabaseChangeLogTableName()); + database.setDatabaseChangeLogLockTableName(LIQUIBASE_CHANGELOG_PREFIX + database.getDatabaseChangeLogLockTableName()); + Liquibase liquibase = new Liquibase("META-INF/liquibase/flowable-modeler-app-db-changelog.xml", new ClassLoaderResourceAccessor(), database); + liquibase.update("flowable"); + return liquibase; + } catch (Exception e) { + throw new RuntimeException("创建liquibase数据库错误", e); + } + } + +} diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/config/WebMvcConfig.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/config/WebMvcConfig.java new file mode 100644 index 00000000..dc0d02b8 --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/config/WebMvcConfig.java @@ -0,0 +1,24 @@ +package com.cloud.kicc.commonbiz.workflow.config; + +import com.cloud.kicc.commonbiz.workflow.interceptor.ModelHandlerInterceptor; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.servlet.config.annotation.InterceptorRegistry; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; +/** + *+ * MVC配置 + *
+ * + * @Author: entfrm开发团队-王翔 + * @Date: 2022/1/6 + */ +@Configuration +public class WebMvcConfig implements WebMvcConfigurer { + + @Override + public void addInterceptors(InterceptorRegistry registry) { + registry.addInterceptor(new ModelHandlerInterceptor()).addPathPatterns("/app/rest/models/**"); + } + +} + diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/controller/WorkflowFormController.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/controller/WorkflowFormController.java new file mode 100644 index 00000000..92871b58 --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/controller/WorkflowFormController.java @@ -0,0 +1,206 @@ +package com.cloud.kicc.commonbiz.workflow.controller; + +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.map.MapUtil; +import com.cloud.kicc.common.core.api.R; +import com.cloud.kicc.common.core.constant.AppConstants; +import com.cloud.kicc.common.security.util.SecurityUtils; +import com.cloud.kicc.commonbiz.api.workflow.constant.WorkflowConstant; +import com.cloud.kicc.commonbiz.api.workflow.entity.Workflow; +import com.cloud.kicc.commonbiz.workflow.service.WorkflowTaskService; +import com.google.common.collect.Lists; +import lombok.AllArgsConstructor; +import org.apache.commons.lang3.StringUtils; +import org.flowable.bpmn.model.FlowElement; +import org.flowable.bpmn.model.StartEvent; +import org.flowable.bpmn.model.UserTask; +import org.flowable.engine.*; +import org.flowable.engine.form.FormProperty; +import org.flowable.engine.form.StartFormData; +import org.flowable.engine.form.TaskFormData; +import org.flowable.task.api.Task; +import org.flowable.variable.api.history.HistoricVariableInstance; +import org.springframework.web.bind.annotation.*; + +import java.lang.reflect.Field; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + + +/** + *+ * 动态表单 controller + *
+ * + * @Author: entfrm开发团队-王翔 + * @Date: 2022/1/4 + */ +@RestController +@RequestMapping(AppConstants.APP_COMMON + "/workflow/form") +@AllArgsConstructor +public class WorkflowFormController { + + private final TaskService taskService; + + private final FormService formService; + + private final IdentityService identityService; + + private final WorkflowTaskService workflowTaskService; + + private final HistoryService historyService; + + private final RepositoryService repositoryService; + + /** 启动流程定义 */ + @PostMapping("/startProcessDefinition") + public R startProcessDefinition(@RequestBody Workflow workflow) { + String assignee = workflow.getAssignee(), + processDefId= workflow.getProcessDefId(), + title = workflow.getTitle(); + Map