通风增加推送

src/main/java/com/unissoft/ventilation/service/impl/ProcessAuditServiceImpl.java

@@ -9,12 +9,15 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.google.common.collect.Maps;
 import com.unissoft.MyConstant;
 import com.unissoft.dto.ProcessToBeDone;
+import com.unissoft.dto.SendNoticeVO;
+import com.unissoft.dto.SysNoticeVO;
 import com.unissoft.dto.ToBeDoneCallbackVO;
 import com.unissoft.feign.MessageFeign;
 import com.unissoft.feign.SystemFeign;
 import com.unissoft.mapper.*;
 import com.unissoft.model.*;
 import com.unissoft.result.PageParam;
+import com.unissoft.result.ResultView;
 import com.unissoft.ventilation.service.ProcessAuditService;
 import com.unissoft.ventilation.service.ProcessBasisService;
 import com.unissoft.vo.ProcessToBeDoneVO;
@@ -134,8 +137,47 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
             }
             processAuditMapper.insert(processAudit);
         }
-
-
+        
+        /*
+         * 推送通知数据
+         */
+        SendNoticeVO sendNoticeVO = new SendNoticeVO();
+        SysNoticeVO sysNoticeVO = new SysNoticeVO();
+        Map<Integer, String> users = new HashMap<Integer, String>();
+        sysNoticeVO.setNoticeType(20);//申请的时候推送  通知类型：10系统、20待办、30审批通过、40审批不通过、50警告
+        Date date = new Date();
+        sysNoticeVO.setNoticeTime(date);
+        if (type.equals("tf")) {
+        	sysNoticeVO.setTitle("机械通风申请");
+        	sysNoticeVO.setNoticeModule("tf");
+        }
+        //根据仓房id获取仓房名称
+        ResponseEntity<String> forEntity = restTemplate.getForEntity(MyConstant.SYSTEM_WAREHOUSE + houseId, String.class);
+        JSONObject jsonObject = JSON.parseObject(forEntity.getBody());
+        BasicsWarehouse ware = JSONObject.toJavaObject(jsonObject, BasicsWarehouse.class);
+        if (null != ware) {
+            sysNoticeVO.setWarehouse(ware.gethName());
+        }
+        //获取申请人的信息
+        ResponseEntity<String> userInfos = restTemplate.getForEntity(MyConstant.SYSTEM_USER + applyPeople, String.class);
+        JSONObject jsonObjectuser = JSON.parseObject(userInfos.getBody());
+        SysUserPO userInfo = JSONObject.toJavaObject(jsonObjectuser, SysUserPO.class);
+        //赋值
+        if (null != userInfo) {
+        	sysNoticeVO.setApplyName(userInfo.getPersonnelName());//公司
+            sysNoticeVO.setOrgName(userInfo.getDepotName());//申请人
+            sysNoticeVO.setApplyDept(userInfo.getDepartmentName());//申请部门
+            sysNoticeVO.setCreateBy(applyPeople);
+            sysNoticeVO.setContent(userInfo.getDepotName()+"-"+ware.gethName()+"-"+"请审批");
+        }
+       
+        sendNoticeVO.setSysNoticeVO(sysNoticeVO);
+        ResponseEntity<String> userInfos1 = restTemplate.getForEntity(MyConstant.SYSTEM_USER + toPeople, String.class);
+        JSONObject jsonObjectuser1 = JSON.parseObject(userInfos1.getBody());
+        SysUserPO userInfo1 = JSONObject.toJavaObject(jsonObjectuser1, SysUserPO.class);
+        users.put(toPeople, userInfo1.getuName());
+        sendNoticeVO.setUsers(users);
+        ResultView resultView = messageFeign.sendNotice(sendNoticeVO);
     }
 
 
@@ -279,88 +321,145 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
 
     @Override
     public void audit(String parameter) {
-        // TODO Auto-generated method stub
-
-        JSONObject jsStr = JSONObject.parseObject(parameter);
-        String id = jsStr.getString("id");//audit表的每一条数据的id
-        Integer auditState = jsStr.getInteger("auditState");//审批的状态（1通过，2不通过）
-        //Integer toPeople = jsStr.getInteger("toPeople"); //下一个审批人的id
-        String auditTime = jsStr.getString("auditTime");
-        String ongoingStep = jsStr.getString("ongoingStep");
-        //判断是第一个人审批还是第二个人审批
-		/*QueryWrapper<ProcessAudit> ew = new QueryWrapper<>(); 
-        ew.eq("id", id);*/
-        ProcessAudit processAudit = processAuditMapper.selectById(id);
-
-
-        if (processAudit.getResult().equals(1) && processAudit.getAuditState().equals(0)) { //审批状态 是0 而且是第一条数据  就是第一次审批
-            //第一个人审批
-
-            //获取审批人
-            QueryWrapper<ProcessBasis> ew = new QueryWrapper<>();
-            ew.eq("type", processAudit.getType());
-            List<ProcessBasis> list = processBasisMapper.selectList(ew);
-            List<Integer> idList = new ArrayList<>();
-            for (ProcessBasis processBasis : list) {
-                idList.add(processBasis.getId());
-            }
-            QueryWrapper<ProcessBasisSon> ew1 = new QueryWrapper<>();
-            ew1.eq("depot_id", processAudit.getDepotId());
-            ew1.in("zid", idList);
-            List<ProcessBasisSon> sonList = processBasisSonMapper.selectList(ew1);
-            Integer toPeople = 0;
-            for (int i = 0; i < sonList.size(); i++) {
-                if (sonList.get(i).getContent().equals(processAudit.getToPeople())) {
-                    toPeople = sonList.get(i + 1).getContent();//下一个审批人的id
-                    break;
-                }
-            }
-
-            processAudit.setAuditState(auditState);
-            processAudit.setAuditTime(auditTime);
-            processAuditMapper.updateById(processAudit); //更改此条数据的审批状态
-            if (auditState.equals(1)) {//1审批通过:,2:审批不通过
-                ProcessAudit processAudit1 = new ProcessAudit();
-                processAudit1.setMainId(processAudit.getMainId());
-                //processAudit1.setAuditState(auditState);
-                //processAudit1.setOperationTime(processAudit.getOperationTime());
-                processAudit1.setType(processAudit.getType());
-                processAudit1.setHouseId(processAudit.getHouseId());
-                processAudit1.setDepotId(processAudit.getDepotId());
-                processAudit1.setFromPeople(processAudit.getToPeople());//当前审批人是下一个审批的提交人
-                processAudit1.setToPeople(toPeople);
-                processAudit1.setResult(0);
-                processAudit1.setAuditState(0);//已提交待审批
-                processAudit1.setApplyPeople(processAudit.getApplyPeople());
-                processAudit1.setProcessId(processAudit.getProcessId());
-                processAudit1.setApplyTime(processAudit.getApplyTime());
-                if (processAudit.getType().equals("tf")) {
-                    processAudit1.setWorkName("机械通风申请");
-                }
-                processAuditMapper.insert(processAudit1);
-            }
-        } else {
-            //第二个人审批
-            //修改第一条数据的状态(历史数据的状态)
-            if ((int) auditState >= 3) {
-                processAudit.setAuditState(1);
-            } else {
-                processAudit.setAuditState(auditState);
-            }
-            processAudit.setAuditTime(auditTime);
-            processAuditMapper.updateById(processAudit);
-            //修改第二条数据的状态、进行到哪一步、审批时间(最新的数据)
-            QueryWrapper<ProcessAudit> ew2 = new QueryWrapper<>();
-            ew2.eq("process_id", processAudit.getProcessId());
-            ew2.eq("type", processAudit.getType());
-            ew2.eq("result", 1);//是第一条记录
-            List<ProcessAudit> paList = processAuditMapper.selectList(ew2);
-            paList.get(0).setAuditState(auditState);
-            paList.get(0).setOngoingStep(ongoingStep);
-            processAuditMapper.updateById(paList.get(0));
-
-        }
-
+    	 JSONObject jsStr = JSONObject.parseObject(parameter);
+         String id = jsStr.getString("id");//audit表的每一条数据的id
+         Integer auditState = jsStr.getInteger("auditState");//审批的状态（1通过，2不通过）
+         //Integer toPeople = jsStr.getInteger("toPeople"); //下一个审批人的id
+         String auditTime = jsStr.getString("auditTime");
+         String ongoingStep = jsStr.getString("ongoingStep");
+         
+         //判断是第一个人审批还是第二个人审批
+         ProcessAudit processAudit = processAuditMapper.selectById(id);
+
+         /**
+          * 定义 推送
+          */
+         SendNoticeVO sendNoticeVO = new SendNoticeVO();
+         SysNoticeVO sysNoticeVO = new SysNoticeVO();
+         Map<Integer, String> users = new HashMap<Integer, String>();
+         Date date = new Date();
+         sysNoticeVO.setNoticeTime(date);
+         if (processAudit.getType().equals("tf")) {
+         	sysNoticeVO.setTitle("机械通风申请");
+         	sysNoticeVO.setNoticeModule("tf");
+         }
+         //根据仓房id获取仓房名称
+         ResponseEntity<String> forEntity = restTemplate.getForEntity(MyConstant.SYSTEM_WAREHOUSE + processAudit.getHouseId(), String.class);
+         JSONObject jsonObject = JSON.parseObject(forEntity.getBody());
+         BasicsWarehouse ware = JSONObject.toJavaObject(jsonObject, BasicsWarehouse.class);
+         if (null != ware) {
+             sysNoticeVO.setWarehouse(ware.gethName());
+         }
+         //获取申请人的信息
+         ResponseEntity<String> userInfos = restTemplate.getForEntity(MyConstant.SYSTEM_USER + processAudit.getApplyPeople(), String.class);
+         JSONObject jsonObjectuser = JSON.parseObject(userInfos.getBody());
+         SysUserPO userInfo = JSONObject.toJavaObject(jsonObjectuser, SysUserPO.class);
+         //赋值
+         if (null != userInfo) {
+         	sysNoticeVO.setApplyName(userInfo.getPersonnelName());//公司
+             sysNoticeVO.setOrgName(userInfo.getDepotName());//申请人
+             sysNoticeVO.setApplyDept(userInfo.getDepartmentName());//申请部门
+             sysNoticeVO.setCreateBy(processAudit.getApplyPeople());
+         }
+         
+         if (processAudit.getResult().equals(1) && processAudit.getAuditState().equals(0)) { //审批状态 是0 而且是第一条数据  就是第一次审批
+             //第一个人审批
+
+             //获取审批人
+             QueryWrapper<ProcessBasis> ew = new QueryWrapper<>();
+             ew.eq("type", processAudit.getType());
+             List<ProcessBasis> list = processBasisMapper.selectList(ew);
+             List<Integer> idList = new ArrayList<>();
+             for (ProcessBasis processBasis : list) {
+                 idList.add(processBasis.getId());
+             }
+             QueryWrapper<ProcessBasisSon> ew1 = new QueryWrapper<>();
+             ew1.eq("depot_id", processAudit.getDepotId());
+             ew1.in("zid", idList);
+             List<ProcessBasisSon> sonList = processBasisSonMapper.selectList(ew1);
+             Integer toPeople = 0;
+             for (int i = 0; i < sonList.size(); i++) {
+                 if (sonList.get(i).getContent().equals(processAudit.getToPeople())) {
+                     toPeople = sonList.get(i + 1).getContent();//下一个审批人的id
+                     break;
+                 }
+             }
+
+             processAudit.setAuditState(auditState);
+             processAudit.setAuditTime(auditTime);
+             processAuditMapper.updateById(processAudit); //更改此条数据的审批状态
+             if (auditState.equals(1)) {//1审批通过:,2:审批不通过
+                 ProcessAudit processAudit1 = new ProcessAudit();
+                 processAudit1.setMainId(processAudit.getMainId());
+                 //processAudit1.setAuditState(auditState);
+                 //processAudit1.setOperationTime(processAudit.getOperationTime());
+                 processAudit1.setType(processAudit.getType());
+                 processAudit1.setHouseId(processAudit.getHouseId());
+                 processAudit1.setDepotId(processAudit.getDepotId());
+                 processAudit1.setFromPeople(processAudit.getToPeople());//当前审批人是下一个审批的提交人
+                 processAudit1.setToPeople(toPeople);
+                 processAudit1.setResult(0);
+                 processAudit1.setAuditState(0);//已提交待审批
+                 processAudit1.setApplyPeople(processAudit.getApplyPeople());
+                 processAudit1.setProcessId(processAudit.getProcessId());
+                 processAudit1.setApplyTime(processAudit.getApplyTime());
+                 if (processAudit.getType().equals("tf")) {
+                     processAudit1.setWorkName("机械通风申请");
+                 }
+                 processAuditMapper.insert(processAudit1);
+                 
+                 /**
+                  * 发送通知数据给下一审批人
+                  */
+                 sysNoticeVO.setContent(userInfo.getDepotName()+"-"+ware.gethName()+"-"+"审批通过");
+                 sysNoticeVO.setNoticeType(30);//申请的时候推送  通知类型：10系统、20待办、30审批通过、40审批不通过、50警告
+                //获取下一审批人的信息
+                 ResponseEntity<String> userInfos1 = restTemplate.getForEntity(MyConstant.SYSTEM_USER + processAudit.getApplyPeople(), String.class);
+                 JSONObject jsonObjectuser1 = JSON.parseObject(userInfos1.getBody());
+                 SysUserPO userInfo1 = JSONObject.toJavaObject(jsonObjectuser1, SysUserPO.class);
+                 users.put(processAudit.getToPeople(), userInfo1.getuName());
+                 
+             }else{//不通过 发送数据给申请人
+             	sysNoticeVO.setContent(userInfo.getDepotName()+"-"+ware.gethName()+"-"+"审批不通过");
+                 sysNoticeVO.setNoticeType(40);//申请的时候推送  通知类型：10系统、20待办、30审批通过、40审批不通过、50警告
+                 users.put(processAudit.getApplyPeople(), userInfo.getuName());
+             }
+         } else {
+             //第二个人审批
+             //修改第一条数据的状态(历史数据的状态)
+             if ((int) auditState >= 3) {
+                 processAudit.setAuditState(1);
+             } else {
+                 processAudit.setAuditState(auditState);
+             }
+             processAudit.setAuditTime(auditTime);
+             processAuditMapper.updateById(processAudit);
+             //修改第二条数据的状态、进行到哪一步、审批时间(最新的数据)
+             QueryWrapper<ProcessAudit> ew2 = new QueryWrapper<>();
+             ew2.eq("process_id", processAudit.getProcessId());
+             ew2.eq("type", processAudit.getType());
+             ew2.eq("result", 1);//是第一条记录
+             List<ProcessAudit> paList = processAuditMapper.selectList(ew2);
+             paList.get(0).setAuditState(auditState);
+             paList.get(0).setOngoingStep(ongoingStep);
+             processAuditMapper.updateById(paList.get(0));
+             
+             /**
+              * 发送通知数据给申请人
+              */
+
+             if((int) auditState >= 3 || (int) auditState ==1){
+             	sysNoticeVO.setNoticeType(30);//申请的时候推送  通知类型：10系统、20待办、30审批通过、40审批不通过、50警告
+             	sysNoticeVO.setContent(userInfo.getDepotName()+"-"+ware.gethName()+"-"+"审批通过");
+             }else if((int) auditState == 2){
+             	sysNoticeVO.setNoticeType(40);//申请的时候推送  通知类型：10系统、20待办、30审批通过、40审批不通过、50警告
+             	sysNoticeVO.setContent(userInfo.getDepotName()+"-"+ware.gethName()+"-"+"审批不通过");
+             }
+             users.put(processAudit.getApplyPeople(), userInfo.getuName());
+         }
+         sendNoticeVO.setUsers(users);
+         sendNoticeVO.setSysNoticeVO(sysNoticeVO);
+         ResultView resultView = messageFeign.sendNotice(sendNoticeVO);
     }