Browse Source

13和14接口,之前接口代码的修改

1229550909@qq.com 2 months ago
parent
commit
415d0a44a7
23 changed files with 1022 additions and 109 deletions
  1. 8 0
      js-common/src/main/java/com/rongwei/safecommon/utils/SaveConstans.java
  2. 18 0
      js-security/security-common/src/main/java/com/rongwei/sfcommon/sys/dao/AspEmergencyResponseDao.java
  3. 18 0
      js-security/security-common/src/main/java/com/rongwei/sfcommon/sys/dao/AspOverhaulRecordDao.java
  4. 18 0
      js-security/security-common/src/main/java/com/rongwei/sfcommon/sys/dao/AspRiskEventControlMeasuresDao.java
  5. 18 0
      js-security/security-common/src/main/java/com/rongwei/sfcommon/sys/dao/AspRiskUnitEventDao.java
  6. 13 0
      js-security/security-common/src/main/java/com/rongwei/sfcommon/sys/service/AspEmergencyResponseService.java
  7. 13 0
      js-security/security-common/src/main/java/com/rongwei/sfcommon/sys/service/AspOverhaulRecordService.java
  8. 13 0
      js-security/security-common/src/main/java/com/rongwei/sfcommon/sys/service/AspRiskEventControlMeasuresService.java
  9. 13 0
      js-security/security-common/src/main/java/com/rongwei/sfcommon/sys/service/AspRiskUnitEventService.java
  10. 9 0
      js-security/security-common/src/main/java/com/rongwei/sfcommon/sys/service/SynchronizationService.java
  11. 22 0
      js-security/security-common/src/main/java/com/rongwei/sfcommon/sys/service/impl/AspEmergencyResponseServiceImpl.java
  12. 22 0
      js-security/security-common/src/main/java/com/rongwei/sfcommon/sys/service/impl/AspOverhaulRecordServiceImpl.java
  13. 22 0
      js-security/security-common/src/main/java/com/rongwei/sfcommon/sys/service/impl/AspRiskEventControlMeasuresServiceImpl.java
  14. 22 0
      js-security/security-common/src/main/java/com/rongwei/sfcommon/sys/service/impl/AspRiskUnitEventServiceImpl.java
  15. 529 93
      js-security/security-common/src/main/java/com/rongwei/sfcommon/sys/service/impl/SynchronizationImpl.java
  16. 134 0
      js-security/security-entity/src/main/java/com/rongwe/scentity/domian/AspEmergencyResponseDo.java
  17. 14 3
      js-security/security-entity/src/main/java/com/rongwe/scentity/domian/AspMajorHazardSourcesDo.java
  18. 74 0
      js-security/security-entity/src/main/java/com/rongwe/scentity/domian/AspOverhaulRecordDo.java
  19. 13 1
      js-security/security-entity/src/main/java/com/rongwe/scentity/domian/AspRiskEventControlMeasuresDo.java
  20. 0 7
      js-security/security-entity/src/main/java/com/rongwe/scentity/domian/AspRiskEventDo.java
  21. 7 1
      js-security/security-entity/src/main/java/com/rongwe/scentity/domian/AspRiskUnitEventDo.java
  22. 1 3
      js-security/security-entity/src/main/java/com/rongwe/scentity/vo/DistributeVo.java
  23. 21 1
      js-security/security-server/src/main/java/com/rongwei/savecheck/controller/SynchronizationController.java

+ 8 - 0
js-common/src/main/java/com/rongwei/safecommon/utils/SaveConstans.java

@@ -694,6 +694,14 @@ public class SaveConstans {
          * 危害特性应知卡
          */
         public static final String DANGERCARDCONSTANT = "/api/wwyt/t_zycswxyshwpwxwhtxyzkxx_List";
+        /**
+         * 应急处置卡
+         */
+        public static final String URGENCYHANDLECARDCONSTANT = "/api/wwyt/t_yjczkxx_List";
+        /**
+         * 装置停用/检维修记录
+         */
+        public static final String DEVICESTOPCONSTANT = "/api/wwyt/t_zztyjwx_List";
     }
 
     public static final class AsyncStatus{

+ 18 - 0
js-security/security-common/src/main/java/com/rongwei/sfcommon/sys/dao/AspEmergencyResponseDao.java

@@ -0,0 +1,18 @@
+package com.rongwei.sfcommon.sys.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.rongwe.scentity.domian.AspEmergencyResponseDo;
+
+/**
+* @author Admin
+* @description 针对表【asp_emergency_response(应急处置卡)】的数据库操作Mapper
+* @createDate 2025-06-05 11:19:56
+* @Entity generator.domain.AspEmergencyResponse
+*/
+public interface AspEmergencyResponseDao extends BaseMapper<AspEmergencyResponseDo> {
+
+}
+
+
+
+

+ 18 - 0
js-security/security-common/src/main/java/com/rongwei/sfcommon/sys/dao/AspOverhaulRecordDao.java

@@ -0,0 +1,18 @@
+package com.rongwei.sfcommon.sys.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.rongwe.scentity.domian.AspOverhaulRecordDo;
+
+/**
+* @author Admin
+* @description 针对表【asp_overhaul_record(风险分析单元-检维修记录)】的数据库操作Mapper
+* @createDate 2025-06-05 16:23:45
+* @Entity generator.domain.AspOverhaulRecord
+*/
+public interface AspOverhaulRecordDao extends BaseMapper<AspOverhaulRecordDo> {
+
+}
+
+
+
+

+ 18 - 0
js-security/security-common/src/main/java/com/rongwei/sfcommon/sys/dao/AspRiskEventControlMeasuresDao.java

@@ -0,0 +1,18 @@
+package com.rongwei.sfcommon.sys.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.rongwe.scentity.domian.AspRiskEventControlMeasuresDo;
+
+/**
+* @author Admin
+* @description 针对表【asp_risk_event_control_measures(安全风险事件所属管控措施)】的数据库操作Mapper
+* @createDate 2025-06-06 14:25:07
+* @Entity generator.domain.AspRiskEventControlMeasures
+*/
+public interface AspRiskEventControlMeasuresDao extends BaseMapper<AspRiskEventControlMeasuresDo> {
+
+}
+
+
+
+

+ 18 - 0
js-security/security-common/src/main/java/com/rongwei/sfcommon/sys/dao/AspRiskUnitEventDao.java

@@ -0,0 +1,18 @@
+package com.rongwei.sfcommon.sys.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.rongwe.scentity.domian.AspRiskUnitEventDo;
+
+/**
+* @author Admin
+* @description 针对表【asp_risk_unit_event(安全风险单元风险事件)】的数据库操作Mapper
+* @createDate 2025-06-06 14:19:48
+* @Entity generator.domain.AspRiskUnitEvent
+*/
+public interface AspRiskUnitEventDao extends BaseMapper<AspRiskUnitEventDo> {
+
+}
+
+
+
+

+ 13 - 0
js-security/security-common/src/main/java/com/rongwei/sfcommon/sys/service/AspEmergencyResponseService.java

@@ -0,0 +1,13 @@
+package com.rongwei.sfcommon.sys.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.rongwe.scentity.domian.AspEmergencyResponseDo;
+
+/**
+* @author Admin
+* @description 针对表【asp_emergency_response(应急处置卡)】的数据库操作Service
+* @createDate 2025-06-05 11:19:56
+*/
+public interface AspEmergencyResponseService extends IService<AspEmergencyResponseDo> {
+
+}

+ 13 - 0
js-security/security-common/src/main/java/com/rongwei/sfcommon/sys/service/AspOverhaulRecordService.java

@@ -0,0 +1,13 @@
+package com.rongwei.sfcommon.sys.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.rongwe.scentity.domian.AspOverhaulRecordDo;
+
+/**
+* @author Admin
+* @description 针对表【asp_overhaul_record(风险分析单元-检维修记录)】的数据库操作Service
+* @createDate 2025-06-05 16:23:45
+*/
+public interface AspOverhaulRecordService extends IService<AspOverhaulRecordDo> {
+
+}

+ 13 - 0
js-security/security-common/src/main/java/com/rongwei/sfcommon/sys/service/AspRiskEventControlMeasuresService.java

@@ -0,0 +1,13 @@
+package com.rongwei.sfcommon.sys.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.rongwe.scentity.domian.AspRiskEventControlMeasuresDo;
+
+/**
+* @author Admin
+* @description 针对表【asp_risk_event_control_measures(安全风险事件所属管控措施)】的数据库操作Service
+* @createDate 2025-06-06 14:25:07
+*/
+public interface AspRiskEventControlMeasuresService extends IService<AspRiskEventControlMeasuresDo> {
+
+}

+ 13 - 0
js-security/security-common/src/main/java/com/rongwei/sfcommon/sys/service/AspRiskUnitEventService.java

@@ -0,0 +1,13 @@
+package com.rongwei.sfcommon.sys.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.rongwe.scentity.domian.AspRiskUnitEventDo;
+
+/**
+* @author Admin
+* @description 针对表【asp_risk_unit_event(安全风险单元风险事件)】的数据库操作Service
+* @createDate 2025-06-06 14:19:48
+*/
+public interface AspRiskUnitEventService extends IService<AspRiskUnitEventDo> {
+
+}

+ 9 - 0
js-security/security-common/src/main/java/com/rongwei/sfcommon/sys/service/SynchronizationService.java

@@ -70,6 +70,15 @@ public interface SynchronizationService {
      **/
     void urgencyHandleCardSynchronizationList(List<String> ids);
 
+    /**
+     * @Description 1.1.14 装置停用/检维修记录信息
+     * @Author qkj
+     * @Date 15:31 2025/6/5
+     * @Param [ids]
+     * @return com.rongwei.rwcommon.base.R
+     **/
+    void deviceStopSynchronizationList(List<String> ids);
+
     default Result dataPush(String ip, String address, List<Map<String, Object>> syncDataMapList,String token) {
         StringBuilder failureReason = new StringBuilder();
         try {

+ 22 - 0
js-security/security-common/src/main/java/com/rongwei/sfcommon/sys/service/impl/AspEmergencyResponseServiceImpl.java

@@ -0,0 +1,22 @@
+package com.rongwei.sfcommon.sys.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.rongwe.scentity.domian.AspEmergencyResponseDo;
+import com.rongwei.sfcommon.sys.dao.AspEmergencyResponseDao;
+import com.rongwei.sfcommon.sys.service.AspEmergencyResponseService;
+import org.springframework.stereotype.Service;
+
+/**
+* @author Admin
+* @description 针对表【asp_emergency_response(应急处置卡)】的数据库操作Service实现
+* @createDate 2025-06-05 11:19:56
+*/
+@Service
+public class AspEmergencyResponseServiceImpl extends ServiceImpl<AspEmergencyResponseDao, AspEmergencyResponseDo>
+    implements AspEmergencyResponseService {
+
+}
+
+
+
+

+ 22 - 0
js-security/security-common/src/main/java/com/rongwei/sfcommon/sys/service/impl/AspOverhaulRecordServiceImpl.java

@@ -0,0 +1,22 @@
+package com.rongwei.sfcommon.sys.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.rongwe.scentity.domian.AspOverhaulRecordDo;
+import com.rongwei.sfcommon.sys.dao.AspOverhaulRecordDao;
+import com.rongwei.sfcommon.sys.service.AspOverhaulRecordService;
+import org.springframework.stereotype.Service;
+
+/**
+* @author Admin
+* @description 针对表【asp_overhaul_record(风险分析单元-检维修记录)】的数据库操作Service实现
+* @createDate 2025-06-05 16:23:45
+*/
+@Service
+public class AspOverhaulRecordServiceImpl extends ServiceImpl<AspOverhaulRecordDao, AspOverhaulRecordDo>
+    implements AspOverhaulRecordService {
+
+}
+
+
+
+

+ 22 - 0
js-security/security-common/src/main/java/com/rongwei/sfcommon/sys/service/impl/AspRiskEventControlMeasuresServiceImpl.java

@@ -0,0 +1,22 @@
+package com.rongwei.sfcommon.sys.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.rongwe.scentity.domian.AspRiskEventControlMeasuresDo;
+import com.rongwei.sfcommon.sys.dao.AspRiskEventControlMeasuresDao;
+import com.rongwei.sfcommon.sys.service.AspRiskEventControlMeasuresService;
+import org.springframework.stereotype.Service;
+
+/**
+* @author Admin
+* @description 针对表【asp_risk_event_control_measures(安全风险事件所属管控措施)】的数据库操作Service实现
+* @createDate 2025-06-06 14:25:07
+*/
+@Service
+public class AspRiskEventControlMeasuresServiceImpl extends ServiceImpl<AspRiskEventControlMeasuresDao, AspRiskEventControlMeasuresDo>
+    implements AspRiskEventControlMeasuresService {
+
+}
+
+
+
+

+ 22 - 0
js-security/security-common/src/main/java/com/rongwei/sfcommon/sys/service/impl/AspRiskUnitEventServiceImpl.java

@@ -0,0 +1,22 @@
+package com.rongwei.sfcommon.sys.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.rongwe.scentity.domian.AspRiskUnitEventDo;
+import com.rongwei.sfcommon.sys.dao.AspRiskUnitEventDao;
+import com.rongwei.sfcommon.sys.service.AspRiskUnitEventService;
+import org.springframework.stereotype.Service;
+
+/**
+* @author Admin
+* @description 针对表【asp_risk_unit_event(安全风险单元风险事件)】的数据库操作Service实现
+* @createDate 2025-06-06 14:19:48
+*/
+@Service
+public class AspRiskUnitEventServiceImpl extends ServiceImpl<AspRiskUnitEventDao, AspRiskUnitEventDo>
+    implements AspRiskUnitEventService {
+
+}
+
+
+
+

File diff suppressed because it is too large
+ 529 - 93
js-security/security-common/src/main/java/com/rongwei/sfcommon/sys/service/impl/SynchronizationImpl.java


+ 134 - 0
js-security/security-entity/src/main/java/com/rongwe/scentity/domian/AspEmergencyResponseDo.java

@@ -0,0 +1,134 @@
+package com.rongwe.scentity.domian;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.rongwei.rwcommon.base.BaseDo;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 应急处置卡
+ * @TableName asp_emergency_response
+ */
+@TableName(value ="asp_emergency_response")
+@Data
+public class AspEmergencyResponseDo extends BaseDo implements Serializable {
+    /**
+     * 主键
+     */
+    @TableId
+    private String id;
+
+    /**
+     * 
+     */
+    private String tenantid;
+
+    /**
+     * 扩展json格式配置
+     */
+    private String roption;
+
+    /**
+     * 岗应急卡名称
+     */
+    private String postyjname;
+
+    /**
+     * 关联岗位名称
+     */
+    private String postname;
+
+    /**
+     * 处置卡编号
+     */
+    private String serialnumber;
+
+    /**
+     * 事故风险
+     */
+    private String risk;
+
+    /**
+     * 发生场所
+     */
+    private String scene;
+
+    /**
+     * 工艺说明(图片)
+     */
+    private String processdesc;
+
+    /**
+     * 事故特征
+     */
+    private String characteristic;
+
+    /**
+     * 危害描述
+     */
+    private String hazarddesc;
+
+    /**
+     * 处置措施
+     */
+    private String measure;
+
+    /**
+     * 责任人
+     */
+    private String personresponsible;
+
+    /**
+     * 责任人ID
+     */
+    private String personresponsibleid;
+
+    /**
+     * 注意事项
+     */
+    private String note;
+
+    /**
+     * 内部应急电话
+     */
+    private String internalemergencyphonenumber;
+
+    /**
+     * 外部应急电话
+     */
+    private String externalemergencyphonenumber;
+
+    /**
+     * 附件(png,jpege不超过5张)
+     */
+    private String annex;
+
+    /**
+     * 企业编码
+     */
+    private Integer enterprisecode;
+
+    /**
+     * 上次同步时间
+     */
+    private Date synctime;
+
+    /**
+     * 步骤说明
+     */
+    private String bzsm;
+
+    @TableField(exist = false)
+    private static final long serialVersionUID = 1L;
+
+    // 同步状态(1、待同步、2、已同步、3、同步失败 4、同步中)
+    private String syncstatus;
+
+    // 同步日志
+    private String synclog;
+
+}

+ 14 - 3
js-security/security-entity/src/main/java/com/rongwe/scentity/domian/AspMajorHazardSourcesDo.java

@@ -3,12 +3,12 @@ package com.rongwe.scentity.domian;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-import java.util.Date;
-
 import com.rongwei.rwcommon.base.BaseDo;
 import lombok.Data;
 
+import java.io.Serializable;
+import java.util.Date;
+
 /**
  * 重大危险源
  * @TableName asp_major_hazard_sources
@@ -89,4 +89,15 @@ public class AspMajorHazardSourcesDo extends BaseDo implements Serializable {
 
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;
+
+    /**
+     * 上次同步时间
+     */
+    private Date synctime;
+
+    // 同步状态(1、待同步、2、已同步、3、同步失败 4、同步中)
+    private String syncstatus;
+
+    // 同步日志
+    private String synclog;
 }

+ 74 - 0
js-security/security-entity/src/main/java/com/rongwe/scentity/domian/AspOverhaulRecordDo.java

@@ -0,0 +1,74 @@
+package com.rongwe.scentity.domian;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.rongwei.rwcommon.base.BaseDo;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 风险分析单元-检维修记录
+ * @TableName asp_overhaul_record
+ */
+@TableName(value ="asp_overhaul_record")
+@Data
+public class AspOverhaulRecordDo extends BaseDo implements Serializable {
+    /**
+     * 主键
+     */
+    @TableId
+    private String id;
+
+    /**
+     * 
+     */
+    private String tenantid;
+
+    /**
+     * 扩展json格式配置
+     */
+    private String roption;
+
+    /**
+     * 检维修开始时间
+     */
+    private Date starttime;
+
+    /**
+     * 检维修结束时间
+     */
+    private Date endtime;
+
+    /**
+     * 风险单元ID
+     */
+    private String riskunitid;
+
+    /**
+     * 停用原因
+     */
+    private String reason;
+
+    /**
+     * 重大危险源ID
+     */
+    private String majorhazardid;
+
+    @TableField(exist = false)
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 企业编码
+     */
+    @TableField(exist = false)
+    private Integer enterpriseCode;
+
+    /**
+     * 安全风险分析对象编码
+     */
+    @TableField(exist = false)
+    private String majorhazardsourcecode;
+}

+ 13 - 1
js-security/security-entity/src/main/java/com/rongwe/scentity/domian/AspRiskEventControlMeasuresDo.java

@@ -7,7 +7,6 @@ import com.rongwei.rwcommon.base.BaseDo;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.Date;
 
 /**
@@ -120,4 +119,17 @@ public class AspRiskEventControlMeasuresDo extends BaseDo implements Serializabl
      * 管控措施ID
      */
     private String controlmeasuresid;
+
+    /**
+     * 企业编码
+     */
+    @TableField(exist = false)
+    private String enterprisecode;
+
+    /**
+     * 上次同步时间
+     */
+    private Date synctime;
+
+
 }

+ 0 - 7
js-security/security-entity/src/main/java/com/rongwe/scentity/domian/AspRiskEventDo.java

@@ -1,7 +1,5 @@
 package com.rongwe.scentity.domian;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.rongwei.rwcommon.base.BaseDo;
@@ -62,9 +60,4 @@ public class AspRiskEventDo extends BaseDo implements Serializable {
 
     private String riskEventNumber;
 
-    /**
-     * 企业编码
-     */
-    @TableField(exist = false)
-    private String enterprisecode;
 }

+ 7 - 1
js-security/security-entity/src/main/java/com/rongwe/scentity/domian/AspRiskUnitEventDo.java

@@ -7,7 +7,6 @@ import com.rongwei.rwcommon.base.BaseDo;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.Date;
 
 /**
@@ -99,4 +98,11 @@ public class AspRiskUnitEventDo extends BaseDo implements Serializable {
      * 风险事件ID
      */
     private String riskeventid;
+
+    /**
+     * 企业编码
+     */
+    @TableField(exist = false)
+    private String enterprisecode;
+
 }

+ 1 - 3
js-security/security-entity/src/main/java/com/rongwe/scentity/vo/DistributeVo.java

@@ -1,11 +1,9 @@
 package com.rongwe.scentity.vo;
 
-import com.rongwe.scentity.domian.AccidentDo;
 import com.rongwei.rwcommon.base.BaseDo;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.List;
 
 @Data
 public class DistributeVo extends BaseDo implements Serializable {
@@ -13,7 +11,7 @@ public class DistributeVo extends BaseDo implements Serializable {
     /**
      * 分布id
      */
-    private List<String> distributeId;
+    private String distributeId;
 
     /**
      * 四色图id

+ 21 - 1
js-security/security-server/src/main/java/com/rongwei/savecheck/controller/SynchronizationController.java

@@ -167,7 +167,7 @@ public class SynchronizationController {
     }
     
     /**
-     * @Description 5.3.13应急处置卡信息
+     * @Description 1.1.13应急处置卡信息
      * @Author qkj
      * @Date 9:19 2025/6/5
      * @Param [ids]
@@ -186,5 +186,25 @@ public class SynchronizationController {
         }
     }
 
+    /**
+     * @Description 1.1.14 装置停用/检维修记录信息
+     * @Author qkj
+     * @Date 15:31 2025/6/5
+     * @Param [ids]
+     * @return com.rongwei.rwcommon.base.R
+     **/
+    @PostMapping("/deviceStop/upload")
+    public R deviceStopSynchronizationList(@RequestBody List<String> ids) {
+        try {
+            log.info("开始执行装置停用/检维修记录信息推送,需要推送的数据为:{}",ids);
+            riskSynchronizationList.deviceStopSynchronizationList(ids);
+            return R.ok();
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.error(StringUtils.spliceErrorMsg(e), e.fillInStackTrace());
+            return R.error();
+        }
+    }
+
 
 }