diff --git a/src/main/java/com/zcloud/controller/eightwork/AppHotworkController.java b/src/main/java/com/zcloud/controller/eightwork/AppHotworkController.java index c342b15..1bb2e13 100644 --- a/src/main/java/com/zcloud/controller/eightwork/AppHotworkController.java +++ b/src/main/java/com/zcloud/controller/eightwork/AppHotworkController.java @@ -29,10 +29,8 @@ public class AppHotworkController extends BaseController { @Autowired private HotworkService hotworkService; - /** * 新增 - * * @param * @throws Exception */ @@ -51,4 +49,21 @@ public class AppHotworkController extends BaseController { map.put("result", errInfo); return map; } + + /** + * 删除 + * @throws Exception + */ + @RequestMapping(value = "/delete") + @ResponseBody + @LogAnno(menuType = "手机", menuServer = "动火作业", instructionsOperate = "动火作业", instructionsType = "删除") + public Object delete() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + hotworkService.delete(pd); + map.put("result", errInfo); //返回结果 + return map; + } } diff --git a/src/main/java/com/zcloud/controller/mq/EightWorkListener.java b/src/main/java/com/zcloud/controller/mq/EightWorkListener.java index aafa186..a758e75 100644 --- a/src/main/java/com/zcloud/controller/mq/EightWorkListener.java +++ b/src/main/java/com/zcloud/controller/mq/EightWorkListener.java @@ -4,9 +4,7 @@ import com.alibaba.fastjson.JSON; import com.zcloud.dto.TenCorpDto; import com.zcloud.entity.PageData; import com.zcloud.mapper.dsno2.mq.MqMessageLogMapper; -import com.zcloud.service.eightWork.ConfinedSpaceService; -import com.zcloud.service.eightWork.ElectricityService; -import com.zcloud.service.eightWork.HotworkService; +import com.zcloud.service.eightwork.HotworkService; import com.zcloud.service.mq.LogService; import com.zcloud.service.mq.SendMessageService; import com.zcloud.util.DateUtil; @@ -39,10 +37,6 @@ public class EightWorkListener implements RocketMQListener { @Resource private MqMessageLogMapper mqMessageLogMapper; @Autowired - private ConfinedSpaceService confinedSpaceService; - @Autowired - private ElectricityService electricityService; - @Autowired private HotworkService hotworkService; @Override @@ -61,14 +55,14 @@ public class EightWorkListener implements RocketMQListener { log.put("DIGESTION_FLAG","0"); } else { switch (data.getMessage()){ - case "confined-space": - System.out.println("受限空间模块消费"); - confinedSpaceService.cancel(data.getData()); - break; - case "electricity": - System.out.println("临时用电模块消费"); - electricityService.cancel(data.getData()); - break; +// case "confined-space": +// System.out.println("受限空间模块消费"); +// confinedSpaceService.cancel(data.getData()); +// break; +// case "electricity": +// System.out.println("临时用电模块消费"); +// electricityService.cancel(data.getData()); +// break; case "hot-work": System.out.println("动火模块消费"); hotworkService.cancel(data.getData()); diff --git a/src/main/java/com/zcloud/mapper/datasource/eightwork/EightWorkTaskFlowMapper.java b/src/main/java/com/zcloud/mapper/datasource/eightwork/EightWorkTaskFlowMapper.java index 807d672..1953851 100644 --- a/src/main/java/com/zcloud/mapper/datasource/eightwork/EightWorkTaskFlowMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/eightwork/EightWorkTaskFlowMapper.java @@ -12,4 +12,6 @@ public interface EightWorkTaskFlowMapper { * @throws Exception */ void save(PageData pd); + + PageData getStep(PageData flow); } diff --git a/src/main/java/com/zcloud/mapper/datasource/eightwork/HotworkMapper.java b/src/main/java/com/zcloud/mapper/datasource/eightwork/HotworkMapper.java index 85c10e6..a4de844 100644 --- a/src/main/java/com/zcloud/mapper/datasource/eightwork/HotworkMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/eightwork/HotworkMapper.java @@ -8,4 +8,7 @@ import com.zcloud.entity.PageData; */ public interface HotworkMapper { PageData getCode(PageData pd); + void save(PageData pd); + void delete(PageData pd); + } diff --git a/src/main/java/com/zcloud/mapper/datasource/eightwork/HotworkSignMapper.java b/src/main/java/com/zcloud/mapper/datasource/eightwork/HotworkSignMapper.java index 788ee87..b579305 100644 --- a/src/main/java/com/zcloud/mapper/datasource/eightwork/HotworkSignMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/eightwork/HotworkSignMapper.java @@ -16,6 +16,7 @@ public interface HotworkSignMapper { * @throws Exception */ void save(PageData pd); + void saveBatch(List signers); /**修改 * @param pd @@ -28,4 +29,5 @@ public interface HotworkSignMapper { * @throws Exception */ List listById(Page page); + } diff --git a/src/main/java/com/zcloud/service/eightwork/HotworkService.java b/src/main/java/com/zcloud/service/eightwork/HotworkService.java index d5f8b82..3099dd4 100644 --- a/src/main/java/com/zcloud/service/eightwork/HotworkService.java +++ b/src/main/java/com/zcloud/service/eightwork/HotworkService.java @@ -8,4 +8,8 @@ import com.zcloud.entity.PageData; */ public interface HotworkService { void save(PageData pd)throws Exception; + + void delete(PageData pd)throws Exception; + + void cancel(PageData pd)throws Exception; } diff --git a/src/main/java/com/zcloud/service/eightwork/impl/HotworkServiceImpl.java b/src/main/java/com/zcloud/service/eightwork/impl/HotworkServiceImpl.java index 383470c..feea65b 100644 --- a/src/main/java/com/zcloud/service/eightwork/impl/HotworkServiceImpl.java +++ b/src/main/java/com/zcloud/service/eightwork/impl/HotworkServiceImpl.java @@ -1,9 +1,14 @@ package com.zcloud.service.eightwork.impl; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import com.zcloud.dto.TenCorpConst; import com.zcloud.dto.TenCorpDto; import com.zcloud.entity.PageData; +import com.zcloud.mapper.datasource.eightwork.EightWorkFlowLogMapper; +import com.zcloud.mapper.datasource.eightwork.EightWorkTaskFlowMapper; import com.zcloud.mapper.datasource.eightwork.HotworkMapper; +import com.zcloud.mapper.datasource.eightwork.HotworkSignMapper; import com.zcloud.service.eightwork.HotworkService; import com.zcloud.service.mq.SendMessageService; import com.zcloud.util.DateUtil; @@ -13,8 +18,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.text.DecimalFormat; -import java.util.Calendar; -import java.util.Date; +import java.util.*; /** * @author fangjiakai @@ -28,8 +32,15 @@ public class HotworkServiceImpl implements HotworkService { private HotworkMapper hotworkMapper; @Autowired private SendMessageService sendMessageService; + @Autowired + private EightWorkTaskFlowMapper eightWorkTaskFlowMapper; + @Autowired + private EightWorkFlowLogMapper eightWorkFlowLogMapper; + @Autowired + private HotworkSignMapper hotworkSignMapper; @Override + @Transactional public void save(PageData pd) throws Exception { PageData pd2 = new PageData(); Calendar calendar = Calendar.getInstance(); @@ -46,7 +57,67 @@ public class HotworkServiceImpl implements HotworkService { pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 pd.put("ISDELETE", "0"); //是否删除 1-是 0-否 + hotworkMapper.save(pd); + List signers = new ArrayList<>(); + if (pd.get("PREPARERS") != null && !pd.get("PREPARERS").equals("")) { + List list = (List) JSON.parse(pd.get("PREPARERS").toString()); + Object STEP_ID = getStepId(1,"PREPARE_USER_ID"); + for (JSONObject json : list) { + if (json.get("DEPARTMENT_ID") != null && json.get("DEPARTMENT_ID") != "" && json.get("USER_ID") != null + && json.get("USER_ID") != "") { + PageData preparer = new PageData(); + preparer.put("HOTWORK_SIGN_ID", UuidUtil.get32UUID()); // 主键 + preparer.put("HOTWORK_ID", pd.get("HOTWORK_ID")); + preparer.put("CORPINFO_ID", pd.get("CORPINFO_ID")); + preparer.put("SIGN_USER_DEPARTMENT_ID", json.get("DEPARTMENT_ID")); + preparer.put("SIGN_USER_ID", json.get("USER_ID")); + preparer.put("STEP_ID", STEP_ID); + signers.add(preparer); + } + } + } + if(signers.size() > 0){ + hotworkSignMapper.saveBatch(signers); + } + + if (pd.get("APPLY_STATUS").equals("1")) { + saveLog(pd); + sendMq(pd); + } + } + + @Override + public void delete(PageData pd) throws Exception { + hotworkMapper.delete(pd); + } + + @Override + public void cancel(PageData pd)throws Exception{ + + } + + private Object getStepId(Integer TASK_ID, String ACTOR_FIELD) throws Exception { + PageData flow = new PageData(); + flow.put("TASK_ID", TASK_ID); + flow.put("ACTOR_FIELD", ACTOR_FIELD); + flow = eightWorkTaskFlowMapper.getStep(flow); + return flow.get("STEP_ID"); + } + + private void saveLog(PageData pd) throws Exception { + PageData log = new PageData(); + log.put("LOG_ID", UuidUtil.get32UUID()); + log.put("WORK_ID", pd.get("HOTWORK_ID")); + log.put("TASK_ID", pd.get("TASK_ID")); + log.put("STEP_ID", pd.get("STEP_ID")); + log.put("ACT_USER", pd.get("HOTWORK_ID")); + log.put("ACT_TIME", pd.get("CREATTIME")); + log.put("STATUS", "1"); + eightWorkFlowLogMapper.save(log); + } + + private void sendMq(PageData pd) throws Exception { TenCorpDto tenCorpDto = new TenCorpDto(); tenCorpDto.setMark(pd.getString("HOTWORK_ID")); tenCorpDto.setMark_name("HOTWORK_ID"); diff --git a/src/main/resources/mybatis/datasource/eightwork/EightWorkFlowLogMapper.xml b/src/main/resources/mybatis/datasource/eightwork/EightWorkFlowLogMapper.xml index 9dba605..5791e00 100644 --- a/src/main/resources/mybatis/datasource/eightwork/EightWorkFlowLogMapper.xml +++ b/src/main/resources/mybatis/datasource/eightwork/EightWorkFlowLogMapper.xml @@ -15,6 +15,7 @@ f.LOG_ID, + f.WORK_ID, f.TASK_ID, f.STEP_ID, f.ACT_USER, @@ -25,6 +26,7 @@ LOG_ID, + WORK_ID, TASK_ID, STEP_ID, ACT_USER, @@ -35,6 +37,7 @@ #{LOG_ID}, + #{WORK_ID}, #{TASK_ID}, #{STEP_ID}, #{ACT_USER}, diff --git a/src/main/resources/mybatis/datasource/eightwork/EightWorkMapper.xml b/src/main/resources/mybatis/datasource/eightwork/EightWorkMapper.xml deleted file mode 100644 index e69de29..0000000 diff --git a/src/main/resources/mybatis/datasource/eightwork/EightWorkTaskFlowMapper.xml b/src/main/resources/mybatis/datasource/eightwork/EightWorkTaskFlowMapper.xml index 2b8b9db..39c12ac 100644 --- a/src/main/resources/mybatis/datasource/eightwork/EightWorkTaskFlowMapper.xml +++ b/src/main/resources/mybatis/datasource/eightwork/EightWorkTaskFlowMapper.xml @@ -53,4 +53,15 @@ ) + + diff --git a/src/main/resources/mybatis/datasource/eightwork/HighWorkMapper.xml b/src/main/resources/mybatis/datasource/eightwork/HighWorkMapper.xml new file mode 100644 index 0000000..e4d4682 --- /dev/null +++ b/src/main/resources/mybatis/datasource/eightwork/HighWorkMapper.xml @@ -0,0 +1,219 @@ + + + + + + BUS_HIGHWORK + + + + + f.HOTWORK_ID, + f.CORPINFO_ID, + f.TASK_ID, + f.STEP_ID, + f.ISDELETE, + f.CREATTIME, + f.CREATOR, + f.OPERATTIME, + f.OPERATOR, + f.CHECK_NO, + f.WORK_CONTENT, + f.WORK_PLACE, + f.APPLY_DEPARTMENT_ID, + f.APPLY_USER_ID, + f.WORK_LEVEL, + f.WORK_FUNCTION, + f.WORK_START_DATE, + f.WORK_END_DATE, + f.WORK_USER, + f.SPECIAL_WORK, + f.RISK_IDENTIFICATION, + f.ANALYZE_DEPARTMENT_ID, + f.ANALYZE_USER_ID, + f.CONFESS_DEPARTMENT_ID, + f.CONFESS_USER_ID, + f.ACCEPT_CONFESS_DEPARTMENT_ID, + f.ACCEPT_CONFESS_USER_ID, + f.GUARDIAN_DEPARTMENT_ID, + f.GUARDIAN_USER_ID, + f.CONFIRM_DEPARTMENT_ID, + f.CONFIRM_USER_ID, + f.LEADER_DEPARTMENT_ID, + f.LEADER_USER_ID, + f.AUDIT_DEPARTMENT_ID, + f.AUDIT_USER_ID, + f.APPROVE_DEPARTMENT_ID, + f.APPROVE_USER_ID, + f.MONITOR_DEPARTMENT_ID, + f.MONITOR_USER_ID, + f.ACCEPT_DEPARTMENT_ID, + f.ACCEPT_USER_ID + + + + + HOTWORK_ID, + CORPINFO_ID, + TASK_ID, + STEP_ID, + ISDELETE, + CREATTIME, + CREATOR, + OPERATTIME, + OPERATOR, + CHECK_NO, + WORK_CONTENT, + WORK_PLACE, + APPLY_DEPARTMENT_ID, + APPLY_USER_ID, + WORK_LEVEL, + WORK_FUNCTION, + WORK_START_DATE, + WORK_END_DATE, + WORK_USER, + SPECIAL_WORK, + RISK_IDENTIFICATION, + ANALYZE_DEPARTMENT_ID, + ANALYZE_USER_ID, + CONFESS_DEPARTMENT_ID, + CONFESS_USER_ID, + ACCEPT_CONFESS_DEPARTMENT_ID, + ACCEPT_CONFESS_USER_ID, + GUARDIAN_DEPARTMENT_ID, + GUARDIAN_USER_ID, + CONFIRM_DEPARTMENT_ID, + CONFIRM_USER_ID, + LEADER_DEPARTMENT_ID, + LEADER_USER_ID, + AUDIT_DEPARTMENT_ID, + AUDIT_USER_ID, + APPROVE_DEPARTMENT_ID, + APPROVE_USER_ID, + MONITOR_DEPARTMENT_ID, + MONITOR_USER_ID, + ACCEPT_DEPARTMENT_ID, + ACCEPT_USER_ID + + + + + #{HOTWORK_ID}, + #{CORPINFO_ID}, + #{TASK_ID}, + #{STEP_ID}, + #{ISDELETE}, + #{CREATTIME}, + #{CREATOR}, + #{OPERATTIME}, + #{OPERATOR}, + #{CHECK_NO}, + #{WORK_CONTENT}, + #{WORK_PLACE}, + #{APPLY_DEPARTMENT_ID}, + #{APPLY_USER_ID}, + #{WORK_LEVEL}, + #{WORK_FUNCTION}, + #{WORK_START_DATE}, + #{WORK_END_DATE}, + #{WORK_USER}, + #{SPECIAL_WORK}, + #{RISK_IDENTIFICATION}, + #{ANALYZE_DEPARTMENT_ID}, + #{ANALYZE_USER_ID}, + #{CONFESS_DEPARTMENT_ID}, + #{CONFESS_USER_ID}, + #{ACCEPT_CONFESS_DEPARTMENT_ID}, + #{ACCEPT_CONFESS_USER_ID}, + #{GUARDIAN_DEPARTMENT_ID}, + #{GUARDIAN_USER_ID}, + #{CONFIRM_DEPARTMENT_ID}, + #{CONFIRM_USER_ID}, + #{LEADER_DEPARTMENT_ID}, + #{LEADER_USER_ID}, + #{AUDIT_DEPARTMENT_ID}, + #{AUDIT_USER_ID}, + #{APPROVE_DEPARTMENT_ID}, + #{APPROVE_USER_ID}, + #{MONITOR_DEPARTMENT_ID}, + #{MONITOR_USER_ID}, + #{ACCEPT_DEPARTMENT_ID}, + #{ACCEPT_USER_ID} + + + + + + + + insert into + + ( + + ) values ( + + ) + + + + + update + + set + ISDELETE = '1' + where + HIGHWORK_ID = #{HIGHWORK_ID} + + + + + update + + set + HOTWORK_ID = #{HOTWORK_ID}, + CORPINFO_ID = #{CORPINFO_ID}, + TASK_ID = #{TASK_ID}, + OPERATTIME = #{OPERATTIME}, + OPERATOR = #{OPERATOR}, + CHECK_NO = #{CHECK_NO}, + WORK_CONTENT = #{WORK_CONTENT}, + WORK_PLACE = #{WORK_PLACE}, + APPLY_DEPARTMENT_ID = #{APPLY_DEPARTMENT_ID}, + APPLY_USER_ID = #{APPLY_USER_ID}, + WORK_LEVEL = #{WORK_LEVEL}, + WORK_FUNCTION = #{WORK_FUNCTION}, + WORK_START_DATE = #{WORK_START_DATE}, + WORK_END_DATE = #{WORK_END_DATE}, + WORK_USER = #{WORK_USER}, + SPECIAL_WORK = #{SPECIAL_WORK}, + RISK_IDENTIFICATION = #{RISK_IDENTIFICATION}, + ANALYZE_DEPARTMENT_ID = #{ANALYZE_DEPARTMENT_ID}, + ANALYZE_USER_ID = #{ANALYZE_USER_ID}, + CONFESS_DEPARTMENT_ID = #{CONFESS_DEPARTMENT_ID}, + CONFESS_USER_ID = #{CONFESS_USER_ID}, + ACCEPT_CONFESS_DEPARTMENT_ID = #{ACCEPT_CONFESS_DEPARTMENT_ID}, + ACCEPT_CONFESS_USER_ID = #{ACCEPT_CONFESS_USER_ID}, + GUARDIAN_DEPARTMENT_ID = #{GUARDIAN_DEPARTMENT_ID}, + GUARDIAN_USER_ID = #{GUARDIAN_USER_ID}, + CONFIRM_DEPARTMENT_ID = #{CONFIRM_DEPARTMENT_ID}, + CONFIRM_USER_ID = #{CONFIRM_USER_ID}, + LEADER_DEPARTMENT_ID = #{LEADER_DEPARTMENT_ID}, + LEADER_USER_ID = #{LEADER_USER_ID}, + AUDIT_DEPARTMENT_ID = #{AUDIT_DEPARTMENT_ID}, + AUDIT_USER_ID = #{AUDIT_USER_ID}, + APPROVE_DEPARTMENT_ID = #{APPROVE_DEPARTMENT_ID}, + APPROVE_USER_ID = #{APPROVE_USER_ID}, + MONITOR_DEPARTMENT_ID = #{MONITOR_DEPARTMENT_ID}, + MONITOR_USER_ID = #{MONITOR_USER_ID}, + ACCEPT_DEPARTMENT_ID = #{ACCEPT_DEPARTMENT_ID}, + ACCEPT_USER_ID = #{ACCEPT_USER_ID} + where + HIGHWORK_ID = #{HIGHWORK_ID} + + diff --git a/src/main/resources/mybatis/datasource/eightwork/HotwokSignMapper.xml b/src/main/resources/mybatis/datasource/eightwork/HotworkSignMapper.xml similarity index 81% rename from src/main/resources/mybatis/datasource/eightwork/HotwokSignMapper.xml rename to src/main/resources/mybatis/datasource/eightwork/HotworkSignMapper.xml index 5ea11f3..72639ff 100644 --- a/src/main/resources/mybatis/datasource/eightwork/HotwokSignMapper.xml +++ b/src/main/resources/mybatis/datasource/eightwork/HotworkSignMapper.xml @@ -62,6 +62,23 @@ ) + + insert into + + ( + + ) values ( + + #{item.HOTWORK_SIGN_ID}, + #{item.HOTWORK_ID}, + #{item.CORPINFO_ID}, + #{item.SIGN_USER_DEPARTMENT_ID}, + #{item.SIGN_USER_ID}, + #{item.STEP_ID} + + ) + + update