From 6467a08b9f0124e7448d99619df59f18fb9e004f Mon Sep 17 00:00:00 2001 From: liwen Date: Wed, 28 Aug 2024 14:37:00 +0800 Subject: [PATCH 1/6] =?UTF-8?q?update:=20=E5=AE=89=E5=85=A8=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E9=99=84=E4=BB=B6=E8=B6=85=E9=93=BE=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/hnac/hzims/safeproduct/utils/BaseUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/utils/BaseUtil.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/utils/BaseUtil.java index 41fe56d..211d9a6 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/utils/BaseUtil.java +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/utils/BaseUtil.java @@ -240,7 +240,7 @@ public class BaseUtil { String encodeName = URLEncoder.encode(name, "UTF-8").replaceAll("\\+", "%20"); String prefixString = url.substring(0, url.lastIndexOf("/") + 1); String encodeUrl = prefixString + encodeName; - String id = paragraph.getDocument().getPackagePart().addExternalRelationship(encodeUrl, + String id = paragraph.getDocument().getPackagePart().addExternalRelationship(url, XWPFRelation.HYPERLINK.getRelation()).getId(); CTHyperlink cLink = paragraph.getCTP().addNewHyperlink(); cLink.setId(id); From 4368f6c53d93ed7e2b50ba42d8893cbb6efa7aab Mon Sep 17 00:00:00 2001 From: ty <1577900710@qq.com> Date: Thu, 29 Aug 2024 08:51:39 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E4=BF=AE=E6=AD=A3:=E5=B9=B3=E5=8F=B0?= =?UTF-8?q?=E7=BB=84emqx=E8=AE=A2=E9=98=85=E6=8E=A5=E5=8F=A3=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/hnac/hzims/alarm/mqtt/MqttConfigHzims.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/mqtt/MqttConfigHzims.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/mqtt/MqttConfigHzims.java index c7076c4..066b5bd 100644 --- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/mqtt/MqttConfigHzims.java +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/mqtt/MqttConfigHzims.java @@ -60,11 +60,11 @@ public class MqttConfigHzims { log.info(fdpClient.toString()+fdpClient.getClientId()); //drools DroolsSoeSubscribe droolsSoeSubscribe = new DroolsSoeSubscribe(); - MqttAsyncClient droolsClient = droolsSoeSubscribe.subscribe(mqttConfig, "#",Collections.singletonList("#"), droolsMqttConsumer); + MqttAsyncClient droolsClient = droolsSoeSubscribe.subscribe(mqttConfig, "+",Collections.singletonList("+"), droolsMqttConsumer); log.info(droolsClient.toString()+droolsClient.getClientId()); //Soe SoeSubscribe soeSubscribe = new SoeSubscribe(); - MqttAsyncClient soeClient = soeSubscribe.subscribe(mqttConfig,"#", Collections.singletonList("#"), soeMqttConsumer); + MqttAsyncClient soeClient = soeSubscribe.subscribe(mqttConfig,"+", Collections.singletonList("+"), soeMqttConsumer); log.info(soeClient.toString()+soeClient.getClientId()); //hz3000 HZ3000SoeSubscribe hz3000SoeSubscribe = new HZ3000SoeSubscribe(); @@ -72,7 +72,7 @@ public class MqttConfigHzims { log.info(hz3000Client.toString()+hz3000Client.getClientId()); //视频 SoeSubscribe subscribe = new SoeSubscribe(); - MqttAsyncClient videoClient = subscribe.subscribe(mqttConfig,"#" , Collections.singletonList("#"), videoMqttConsumer); + MqttAsyncClient videoClient = subscribe.subscribe(mqttConfig,"+" , Collections.singletonList("+"), videoMqttConsumer); log.info(videoClient.toString()+videoClient.getClientId()); }catch (Exception e){ log.error(e.toString()) ; From 2feff1fdc1145c00c3208d0f6f00dc79887cd9da Mon Sep 17 00:00:00 2001 From: liwen Date: Tue, 13 Aug 2024 09:08:00 +0800 Subject: [PATCH 3/6] =?UTF-8?q?fix:=20=E5=9F=B9=E8=AE=AD=E5=B9=B4=E5=BA=A6?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E7=AB=99=E7=82=B9=E9=87=8D=E5=A4=8D=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hzims/safeproduct/service/impl/TrainPlanServiceImpl.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/TrainPlanServiceImpl.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/TrainPlanServiceImpl.java index 40fb225..9987b46 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/TrainPlanServiceImpl.java +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/TrainPlanServiceImpl.java @@ -20,6 +20,7 @@ import com.hnac.hzims.safeproduct.service.ITrainPlanService; import com.hnac.hzims.safeproduct.service.ITrainRecordService; import com.hnac.hzims.safeproduct.vo.TrainMonthVO; import com.hnac.hzims.safeproduct.vo.TrainYearVO; +import org.apache.commons.collections4.map.HashedMap; import org.springblade.core.log.exception.ServiceException; import org.springblade.core.mp.support.Query; import org.springblade.core.tool.utils.DateUtil; @@ -34,10 +35,7 @@ import java.io.IOException; import java.math.BigDecimal; import java.math.RoundingMode; import java.net.URLEncoder; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Optional; +import java.util.*; import java.util.stream.Collectors; /** @@ -105,7 +103,7 @@ public class TrainPlanServiceImpl extends ServiceImpl unitMonthDataList = baseMapper.selectFinishedDataByUnit(unitList, year); // 将各单位每个月的培训计划数据写入统计列表 - List res = new ArrayList<>(); + HashedMap map = new HashedMap<>(); unitMonthDataList.forEach(data -> { TrainYearVO trainYearVO = records.stream().filter(x -> x.getUnit().equals(data.getUnit())) .collect(Collectors.toList()).get(0); @@ -161,9 +159,11 @@ public class TrainPlanServiceImpl extends ServiceImpl list = new ArrayList<>(map.values()); + List res = list.stream().sorted(Comparator.comparing(TrainYearVO::getUnit)).collect(Collectors.toList()); unitPage.setRecords(res); return unitPage; } From 359723e84726efe692d7ea586c79d89383203b7f Mon Sep 17 00:00:00 2001 From: ty <1577900710@qq.com> Date: Thu, 29 Aug 2024 11:27:14 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E4=BF=AE=E6=AD=A3:=E4=B8=8A=E7=BA=BF?= =?UTF-8?q?=E8=84=9A=E6=9C=AC=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hzims-service/operational/src/main/resources/db/3.0.1.sql | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/hzims-service/operational/src/main/resources/db/3.0.1.sql b/hzims-service/operational/src/main/resources/db/3.0.1.sql index 9ec9561..7c42ed0 100644 --- a/hzims-service/operational/src/main/resources/db/3.0.1.sql +++ b/hzims-service/operational/src/main/resources/db/3.0.1.sql @@ -20,3 +20,11 @@ ALTER TABLE `hzims_oper_access_plan` ADD COLUMN `remark` text NULL ; ALTER TABLE `hzims_oper_maintenance_task` ADD COLUMN `remark` text NULL ; + + +ALTER TABLE `hzims_oper_defect` + MODIFY COLUMN `TICKET_ID` varchar(255) NULL DEFAULT NULL COMMENT '工作票ID'; +ALTER TABLE `hzims_oper_defect_statistics` + MODIFY COLUMN `TICKET_ID` varchar(255) NULL DEFAULT NULL COMMENT '工作票ID'; +ALTER TABLE `hzims_oper_phenomenon` + MODIFY COLUMN `TICKET_ID` varchar(255) NULL DEFAULT NULL COMMENT '工作票ID'; \ No newline at end of file From 8ff12798f4982638e17e2fd7e9eba25e7eb18e39 Mon Sep 17 00:00:00 2001 From: yang_shj <1069818635@QQ.com> Date: Thu, 29 Aug 2024 14:09:35 +0800 Subject: [PATCH 5/6] =?UTF-8?q?#=E6=9B=B2=E7=BA=BF=E5=88=86=E6=9E=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hzims/history/vo/HistoryTabulationParamVo.java | 5 +- .../controller/HistoryTemplateController.java | 9 ++ .../service/impl/HistoryDeviceServiceImpl.java | 11 ++- .../safeproduct/src/main/resources/db/3.0.1.sql | 104 +++++++++++++++++++++ 4 files changed, 125 insertions(+), 4 deletions(-) create mode 100644 hzims-service/safeproduct/src/main/resources/db/3.0.1.sql diff --git a/hzims-service-api/equipment-api/src/main/java/com/hnac/hzims/history/vo/HistoryTabulationParamVo.java b/hzims-service-api/equipment-api/src/main/java/com/hnac/hzims/history/vo/HistoryTabulationParamVo.java index 6fdd90f..4f72acd 100644 --- a/hzims-service-api/equipment-api/src/main/java/com/hnac/hzims/history/vo/HistoryTabulationParamVo.java +++ b/hzims-service-api/equipment-api/src/main/java/com/hnac/hzims/history/vo/HistoryTabulationParamVo.java @@ -10,6 +10,7 @@ import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; import java.util.List; +import java.util.Map; /** * @author ysj @@ -21,8 +22,8 @@ public class HistoryTabulationParamVo { @ApiModelProperty(value = "站点Id") private String projectId; - @ApiModelProperty(value = "站点Id") - private List facDeivceAttrIds; + @ApiModelProperty(value = "查询点位") + private Map attrs; @ApiModelProperty(value = "开始时间") @DateTimeFormat(pattern = DateUtil.PATTERN_DATETIME) diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/history/controller/HistoryTemplateController.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/history/controller/HistoryTemplateController.java index 92c4589..f7b5132 100644 --- a/hzims-service/equipment/src/main/java/com/hnac/hzims/history/controller/HistoryTemplateController.java +++ b/hzims-service/equipment/src/main/java/com/hnac/hzims/history/controller/HistoryTemplateController.java @@ -9,11 +9,13 @@ import com.hnac.hzims.safeproduct.train.entity.InstitutionalEntity; import com.hnac.hzims.safeproduct.train.vo.InstitutionalParamVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.Func; import org.springframework.web.bind.annotation.*; /** @@ -34,6 +36,13 @@ public class HistoryTemplateController extends BladeController { return R.status(service.save(entity)); } + @PostMapping("/remove") + @ApiOperationSupport(order = 10) + @ApiOperation(value = "删除历史数据模板") + public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { + return R.status(service.removeByIds(Func.toLongList(ids))); + } + @GetMapping("/pages") @ApiOperationSupport(order = 5) @ApiOperation(value = "分页历史数据模板", notes = "查询条件：params、query") diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/history/service/impl/HistoryDeviceServiceImpl.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/history/service/impl/HistoryDeviceServiceImpl.java index 5c51965..319439b 100644 --- a/hzims-service/equipment/src/main/java/com/hnac/hzims/history/service/impl/HistoryDeviceServiceImpl.java +++ b/hzims-service/equipment/src/main/java/com/hnac/hzims/history/service/impl/HistoryDeviceServiceImpl.java @@ -272,7 +272,7 @@ public class HistoryDeviceServiceImpl implements IHistoryDeviceService { public List> historyTabulation(HistoryTabulationParamVo param) { HisFacSourceDataDTO source = new HisFacSourceDataDTO(); source.setProjectId(param.getProjectId()); - source.setFacDeivceAttrIds(param.getFacDeivceAttrIds()); + source.setFacDeivceAttrIds(new ArrayList<>(param.getAttrs().keySet())); source.setBeginTime(param.getStartTime()); source.setFinishTime(param.getEndTime()); source.setIsPage(true); @@ -282,7 +282,14 @@ public class HistoryDeviceServiceImpl implements IHistoryDeviceService { if(!tabulations.isSuccess() || CollectionUtil.isEmpty(tabulations.getData())){ return new ArrayList<>(); } - return tabulations.getData(); + return tabulations.getData().stream().map(tabulation->{ + Map map = JSONObject.parseObject(JSONObject.toJSONString(tabulation.get("attr")),Map.class); + String key = map.get("id").toString(); + String name = param.getAttrs().get(key); + map.put("name",name); + tabulation.put("attr",map); + return tabulation; + }).collect(Collectors.toList()); } diff --git a/hzims-service/safeproduct/src/main/resources/db/3.0.1.sql b/hzims-service/safeproduct/src/main/resources/db/3.0.1.sql new file mode 100644 index 0000000..aeaa677 --- /dev/null +++ b/hzims-service/safeproduct/src/main/resources/db/3.0.1.sql @@ -0,0 +1,104 @@ +CREATE TABLE `hzims_institutional_information` ( + `ID` bigint(20) NOT NULL COMMENT '主键ID', + `STATION_ID` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '站点编码', + `STATION_NAME` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '站点名称', + `DATA_TYPE` tinyint(4) NULL DEFAULT NULL COMMENT '资料类型 : 0-制度 1-资料', + `FILE_PURVIEW` tinyint(4) NULL DEFAULT NULL COMMENT '文档权限范围 : 0-厂站 1- 完全公开', + `FILE_NAME` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '文档名称', + `FILE_EXPLAIN` varchar(2048) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '文件说明', + `DATA_ATTACHMENT_PATH` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '附件上传地址', + `DATA_ATTACHMENT_NAME` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '附件名称', + `TENANT_ID` varchar(12) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '租户ID', + `CREATE_DEPT` bigint(20) NULL DEFAULT NULL COMMENT '创建部门ID', + `CREATE_TIME` datetime NULL DEFAULT NULL COMMENT '创建时间', + `UPDATE_TIME` datetime NULL DEFAULT NULL COMMENT '更新时间', + `CREATE_USER` bigint(20) NOT NULL COMMENT '创建人', + `CREATE_USER_ID` bigint(20) NULL DEFAULT NULL COMMENT '添加人ID', + `CREATE_USER_NAME` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人名称', + `UPDATE_USER` bigint(20) NOT NULL COMMENT '更新人', + `IS_DELETED` tinyint(4) NOT NULL DEFAULT 0 COMMENT '是否删除', + `STATUS` tinyint(4) NULL DEFAULT NULL COMMENT '状态', + PRIMARY KEY (`ID`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; + + +CREATE TABLE `hzims_rectification_supervision` ( + `ID` bigint(20) NOT NULL COMMENT '主键ID', + `STATION_ID` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '站点编码', + `STATION_NAME` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '站点名称', + `PERSON_LIABLE` bigint(20) NULL DEFAULT NULL COMMENT '责任人ID', + `PERSON_LIABLE_NAME` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '责任人名称', + `RECTIFICATION_TYPE` tinyint(4) NULL DEFAULT NULL COMMENT '整改类型: 0-整改闭环 1-会议督办', + `LIMIT_TIME` datetime NULL DEFAULT NULL COMMENT '限时日期', + `REMIND_TIME` datetime NULL DEFAULT NULL COMMENT '提醒日期', + `COMPLETE_TIME` datetime NULL DEFAULT NULL COMMENT '完成日期', + `PROBLEM_MATTERS` varchar(2048) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '问题事项', + `MEASURES` varchar(2048) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '措施', + `PROBLEM_ATTACHMENT_PATH` varchar(516) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '问题附件路径', + `PROBLEM_ATTACHMENT_NAME` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '问题附件名称', + `TENANT_ID` varchar(12) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '租户ID', + `CREATE_DEPT` bigint(20) NULL DEFAULT NULL COMMENT '创建部门ID', + `CREATE_TIME` datetime NULL DEFAULT NULL COMMENT '创建时间', + `UPDATE_TIME` datetime NULL DEFAULT NULL COMMENT '更新时间', + `CREATE_USER` bigint(20) NOT NULL COMMENT '创建人', + `CREATE_USER_NAME` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '添加人名称', + `CREATE_USER_ID` bigint(20) NULL DEFAULT NULL COMMENT '添加人ID', + `UPDATE_USER` bigint(20) NOT NULL COMMENT '更新人', + `IS_DELETED` tinyint(4) NOT NULL DEFAULT 0 COMMENT '是否删除', + `STATUS` tinyint(4) NULL DEFAULT NULL COMMENT '状态: 0-未整改 1-已整改', + PRIMARY KEY (`ID`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; + +CREATE TABLE `hzims_safety_train` ( + `ID` bigint(20) NOT NULL COMMENT '主键ID', + `STATION_ID` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '站点编码', + `STATION_NAME` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '站点名称', + `SPEAKER` bigint(20) NULL DEFAULT NULL COMMENT '主讲人ID', + `SPEAKER_NAME` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '主讲人名称', + `TRAIN_CONTENT` varchar(2048) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '培训内容', + `ANSWER_COUNT` tinyint(4) NULL DEFAULT NULL COMMENT '应到人数', + `ACTUAL_COUNT` tinyint(4) NULL DEFAULT NULL COMMENT '实到人数', + `LATE_REASON` varchar(2048) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '迟到/缺席人数及原因', + `TRAIN_ATTACHMENT_PATH` varchar(516) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '培训附件上次路径', + `TRAIN_ATTACHMENT_NAME` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '培训附件名称', + `TRAIN_START_TIME` datetime NULL DEFAULT NULL COMMENT '培训开始时间', + `TRAIN_END_TIME` datetime NULL DEFAULT NULL COMMENT '培训结束时间', + `TENANT_ID` varchar(12) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '租户ID', + `CREATE_DEPT` bigint(20) NULL DEFAULT NULL COMMENT '创建部门ID', + `CREATE_TIME` datetime NULL DEFAULT NULL COMMENT '创建时间', + `UPDATE_TIME` datetime NULL DEFAULT NULL COMMENT '更新时间', + `CREATE_USER` bigint(20) NOT NULL COMMENT '创建人', + `CREATE_USER_ID` bigint(20) NULL DEFAULT NULL COMMENT '添加人ID', + `CREATE_USER_NAME` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人名称', + `UPDATE_USER` bigint(20) NOT NULL COMMENT '更新人', + `IS_DELETED` tinyint(4) NOT NULL DEFAULT 0 COMMENT '是否删除', + `STATUS` tinyint(4) NULL DEFAULT NULL COMMENT '状态', + PRIMARY KEY (`ID`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; + +CREATE TABLE `hzims_violation_assessment` ( + `ID` bigint(20) NOT NULL COMMENT '主键ID', + `STATION_ID` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '站点编码', + `STATION_NAME` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '站点名称', + `DISCOVERER` bigint(20) NULL DEFAULT NULL COMMENT '发现人ID', + `DISCOVERER_NAME` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '发现人名称', + `ASSESSOR_COVER` bigint(20) NULL DEFAULT NULL COMMENT '被考核人ID', + `ASSESSOR_NAME` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '被考核人名称', + `DISCOVER_TIME` datetime NULL DEFAULT NULL COMMENT '发现时间', + `PROBLEM_MATTERS` varchar(2048) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '问题事项', + `VIOLATION_LEVEL` tinyint(4) NULL DEFAULT NULL COMMENT '违规级别 : 0-严重 1-一般', + `PROCESSING_RESULTS` varchar(516) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '处理结果', + `NOTICE_ATTACHMENT_PATH` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '通知单附件地址', + `NOTICE_ATTACHMENT_NAME` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '通知单附件名称', + `TENANT_ID` varchar(12) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '租户ID', + `CREATE_DEPT` bigint(20) NULL DEFAULT NULL COMMENT '创建部门ID', + `CREATE_TIME` datetime NULL DEFAULT NULL COMMENT '创建时间', + `UPDATE_TIME` datetime NULL DEFAULT NULL COMMENT '更新时间', + `CREATE_USER` bigint(20) NOT NULL COMMENT '创建人', + `CREATE_USER_ID` bigint(20) NULL DEFAULT NULL COMMENT '添加人ID', + `CREATE_USER_NAME` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人名称', + `UPDATE_USER` bigint(20) NOT NULL COMMENT '更新人', + `IS_DELETED` tinyint(4) NOT NULL DEFAULT 0 COMMENT '是否删除', + `STATUS` tinyint(4) NULL DEFAULT NULL COMMENT '状态', + PRIMARY KEY (`ID`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; \ No newline at end of file From be1f26494f10456b940b5e9e05a617b3484686ed Mon Sep 17 00:00:00 2001 From: ty <1577900710@qq.com> Date: Thu, 29 Aug 2024 15:13:42 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E4=BF=AE=E6=AD=A3:=E4=B8=8A=E7=BA=BFyml?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../equipment/src/main/resources/template/template.yml | 2 ++ .../hzims-basic/src/main/resources/template/template.yml | 6 ++++-- .../hzims-big-model/src/main/resources/template/template.yml | 2 ++ .../hzims-scheduled/src/main/resources/template/template.yml | 2 ++ .../inspect/src/main/resources/template/template.yml | 2 ++ .../operational/src/main/resources/template/template.yml | 12 +++++++----- .../safeproduct/src/main/resources/template/template.yml | 2 ++ .../ticket/src/main/resources/template/template.yml | 2 ++ .../weather/src/main/resources/template/template.yml | 2 ++ 9 files changed, 25 insertions(+), 7 deletions(-) diff --git a/hzims-service/equipment/src/main/resources/template/template.yml b/hzims-service/equipment/src/main/resources/template/template.yml index 959a4b4..03de46d 100644 --- a/hzims-service/equipment/src/main/resources/template/template.yml +++ b/hzims-service/equipment/src/main/resources/template/template.yml @@ -51,6 +51,8 @@ swagger: xxl: job: + auto: + registry: 0 accessToken: '' admin: addresses: http://${hzims.xxljob.ip}:${hzims.xxljob.port}/xxl-job-admin diff --git a/hzims-service/hzims-basic/src/main/resources/template/template.yml b/hzims-service/hzims-basic/src/main/resources/template/template.yml index e2a7624..9268e77 100644 --- a/hzims-service/hzims-basic/src/main/resources/template/template.yml +++ b/hzims-service/hzims-basic/src/main/resources/template/template.yml @@ -31,15 +31,17 @@ swagger: xxl: job: + auto: + registry: 0 accessToken: '' admin: addresses: "http://${hzims.xxljob.ip}:${hzims.xxljob.port}/xxl-job-admin" executor: - appname: hzims-safeproduct + appname: hzims-basic ip: ${hzims.server.ip} logpath: /data/applogs/xxl-job/jobhandler logretentiondays: 7 - port: 28200 + port: 28550 blade: data-scope: diff --git a/hzims-service/hzims-big-model/src/main/resources/template/template.yml b/hzims-service/hzims-big-model/src/main/resources/template/template.yml index 25ca6f6..ea6a966 100644 --- a/hzims-service/hzims-big-model/src/main/resources/template/template.yml +++ b/hzims-service/hzims-big-model/src/main/resources/template/template.yml @@ -69,6 +69,8 @@ swagger: xxl: job: + auto: + registry: 0 accessToken: '' admin: addresses: http://${hzims.server.ip}:${hzims.xxljob.port}/xxl-job-admin diff --git a/hzims-service/hzims-scheduled/src/main/resources/template/template.yml b/hzims-service/hzims-scheduled/src/main/resources/template/template.yml index fc8cd35..b55adf8 100644 --- a/hzims-service/hzims-scheduled/src/main/resources/template/template.yml +++ b/hzims-service/hzims-scheduled/src/main/resources/template/template.yml @@ -55,6 +55,8 @@ swagger: xxl: job: + auto: + registry: 0 accessToken: '' admin: addresses: "http://${hzims.xxljob.ip}:${hzims.xxljob.port}/xxl-job-admin" diff --git a/hzims-service/inspect/src/main/resources/template/template.yml b/hzims-service/inspect/src/main/resources/template/template.yml index 77f2f0d..d98efae 100644 --- a/hzims-service/inspect/src/main/resources/template/template.yml +++ b/hzims-service/inspect/src/main/resources/template/template.yml @@ -35,6 +35,8 @@ swagger: xxl: job: + auto: + registry: 0 accessToken: '' admin: addresses: http://${hzims.xxljob.ip}:${hzims.xxljob.port}/xxl-job-admin diff --git a/hzims-service/operational/src/main/resources/template/template.yml b/hzims-service/operational/src/main/resources/template/template.yml index abfef98..bdc5f22 100644 --- a/hzims-service/operational/src/main/resources/template/template.yml +++ b/hzims-service/operational/src/main/resources/template/template.yml @@ -30,6 +30,8 @@ swagger: xxl: job: + auto: + registry: 0 accessToken: '' admin: addresses: "http://${hzims.xxljob.ip}:${hzims.xxljob.port}/xxl-job-admin" @@ -72,11 +74,6 @@ hzims: task-key: hzims:operation:access:task alert: saveDefectIsOpen: true - save: - area: - url: http://49.234.126.72:8255/apiIntroduction/demo/saveHzimsArea - station: - url: http://49.234.126.72:8255/apiIntroduction/demo/saveHzimsStation defect: repair: /data/hzims/operational/defect/repair/应急抢修单.docx area: @@ -131,6 +128,11 @@ category: id: 1384429129110360065 feign: + compression: + request: + enabled: false + response: + enabled: false hystrix: enabled: true diff --git a/hzims-service/safeproduct/src/main/resources/template/template.yml b/hzims-service/safeproduct/src/main/resources/template/template.yml index c7db302..72bcb7b 100644 --- a/hzims-service/safeproduct/src/main/resources/template/template.yml +++ b/hzims-service/safeproduct/src/main/resources/template/template.yml @@ -40,6 +40,8 @@ swagger: xxl: job: + auto: + registry: 0 accessToken: '' admin: addresses: "http://${hzims.xxljob.ip}:${hzims.xxljob.port}/xxl-job-admin" diff --git a/hzims-service/ticket/src/main/resources/template/template.yml b/hzims-service/ticket/src/main/resources/template/template.yml index b50348e..df3d476 100644 --- a/hzims-service/ticket/src/main/resources/template/template.yml +++ b/hzims-service/ticket/src/main/resources/template/template.yml @@ -34,6 +34,8 @@ swagger: xxl: job: + auto: + registry: 0 accessToken: '' admin: addresses: "http://${hzims.xxljob.ip}:${hzims.xxljob.port}/xxl-job-admin" diff --git a/hzims-service/weather/src/main/resources/template/template.yml b/hzims-service/weather/src/main/resources/template/template.yml index a7d604f..07e71e7 100644 --- a/hzims-service/weather/src/main/resources/template/template.yml +++ b/hzims-service/weather/src/main/resources/template/template.yml @@ -29,6 +29,8 @@ mybatis-plus: xxl: job: + auto: + registry: 0 accessToken: '' admin: addresses: "http://${hzims.xxljob.ip}:${hzims.xxljob.port}/xxl-job-admin"