修改预警生成待办功能

src/main/java/com/unissoft/Swagger2Config.java

@@ -31,7 +31,7 @@ public class Swagger2Config {
     @Bean
     public Docket CreateRestApi() {
         return new Docket(DocumentationType.SWAGGER_2)
-                .host(swaggerHost)
+//                .host(swaggerHost)
                 .apiInfo(apiInfo())
                 .select()
                 .apis(RequestHandlerSelectors.basePackage("com.unissoft"))

src/main/java/com/unissoft/feign/MessageFeign.java

@@ -0,0 +1,31 @@
+package com.unissoft.feign;
+
+import com.unissoft.MyConstant;
+import com.unissoft.dto.MessageVO;
+import com.unissoft.dto.SendNoticeVO;
+import com.unissoft.result.ResultView;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+
+/**
+ * feign调用system-manage服务
+ */
+@FeignClient(value = MyConstant.CSC_SZLS_MESSAGE, fallback = MessageHystrix.class)
+@Component
+public interface MessageFeign {
+
+	@PostMapping("/sysNoticeUser/authority_button/sendNotice")
+	ResultView sendNotice(@RequestBody SendNoticeVO sendNoticeVO);
+
+	/**
+	 * 向用户发送信息
+	 * @param messageVO
+	 * @return
+	 */
+	@PostMapping("/sysMessage/authority/sendMessage")
+	ResultView sendMessage(@RequestBody MessageVO messageVO);
+
+}

src/main/java/com/unissoft/feign/MessageHystrix.java

@@ -0,0 +1,34 @@
+package com.unissoft.feign;
+
+import com.unissoft.dto.MessageVO;
+import com.unissoft.dto.SendNoticeVO;
+import com.unissoft.result.ResultView;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
+
+
+/**
+ * 熔断器
+ */
+@Component
+public class MessageHystrix implements MessageFeign {
+
+    private final Logger logger = LoggerFactory.getLogger(MessageHystrix.class);
+
+    @Override
+    public ResultView sendNotice(SendNoticeVO sendNoticeVO) {
+        // TODO Auto-generated method stub
+		System.err.println("调用csc-szls-message(sendNotice方法)服务发送通知失败!");
+        logger.error("调用csc-szls-message(sendNotice方法)服务发送通知失败!");
+        return null;
+    }
+
+    @Override
+    public ResultView sendMessage(MessageVO messageVO) {
+        System.err.println("调用csc-szls-message(sendMessage方法)服务向用户发送信息失败!");
+        logger.error("调用csc-szls-message(sendMessage方法)服务向用户发送信息失败!");
+        return null;
+    }
+
+}

src/main/java/com/unissoft/feign/SystemFeign.java

@@ -4,6 +4,7 @@ import com.unissoft.MyConstant;
 import com.unissoft.model.BasicsWarehouse;
 import com.unissoft.model.SysUserDTO;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -13,6 +14,7 @@ import org.springframework.web.bind.annotation.RequestParam;
  * feign调用system-manage服务
  */
 @FeignClient(value = MyConstant.CSC_SZLS_UPMS_SYSTEM_MANAGE, fallback = SystemHystrix.class)
+@Component
 public interface SystemFeign {
 
 	@GetMapping(value = "/basicsWarehouse/authority/getByIdHouse")

src/main/java/com/unissoft/mapper/ProcessAuditMapper.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.unissoft.model.ProcessAudit;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 /**
  * <p>
  *  Mapper 接口
@@ -15,4 +17,6 @@ import org.springframework.stereotype.Repository;
 @Repository
 public interface ProcessAuditMapper extends BaseMapper<ProcessAudit> {
 
+    List<ProcessAudit> getToBeDone(List<Integer> list);
+
 }

src/main/java/com/unissoft/mapper/ProcessAuditMapper.xml

@@ -32,4 +32,16 @@
         id, main_id, sub_id, sub_data, audit_state, operation_time, type, house_id, depot_id, from_people, to_people, result, apply_people, audit_time, process_id, ongoing_step, apply_time, work_name, start_date, end_date, to_page
     </sql>
 
+    <select id="getToBeDone" parameterType="list" resultType="com.unissoft.model.ProcessAudit">
+        select
+        <include refid="Base_Column_List"/>
+        from process_audit pa
+        <where>
+            pa.audit_state = 0 and
+            <foreach item="item" collection="list" separator=" or " open="(" close=")" index="">
+                pa.id=#{item, jdbcType=NUMERIC}
+            </foreach>
+        </where>
+    </select>
+
 </mapper>

src/main/java/com/unissoft/ventilation/controller/ProcessAuditController.java

@@ -3,6 +3,7 @@ package com.unissoft.ventilation.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.unissoft.dto.ProcessToBeDone;
+import com.unissoft.dto.ToBeDoneCallbackVO;
 import com.unissoft.feign.SystemFeign;
 import com.unissoft.model.ProcessAudit;
 import com.unissoft.model.SysUserDTO;
@@ -155,8 +156,9 @@ public class ProcessAuditController {
      */
     @ApiOperation(value = "粮情生成待办事项", notes = "")
     @PostMapping("/toBeDone")
-    public void toBeDone(@RequestBody ProcessToBeDone processToBeDone) {
-		processAuditService.toBeDone(processToBeDone);
+    public List<ToBeDoneCallbackVO> toBeDone(@RequestBody ProcessToBeDone processToBeDone) {
+        List<ToBeDoneCallbackVO> result = processAuditService.toBeDone(processToBeDone);
+        return result;
     }
     
     
@@ -176,7 +178,6 @@ public class ProcessAuditController {
     /**
      * 根据用户id、流程类型(如科长每2周粮情检查的类型：xxxx1)，按时间倒序查出待办流程，将最近日期的流程设成已办
        同时要存储具体办理时的时间，因为要计算该流程办理的周期(或计算逾期时间)
-     * @param id
      */
     @ApiOperation(value = "根据待办id，将流程设成已办", notes = "")
     @GetMapping("/haveDone/{userId}/{type}/{depotId}/{houseId}/{auditState}")
@@ -200,4 +201,15 @@ public class ProcessAuditController {
         SysUserDTO userById = systemFeign.getUserById(id);
         return ResultView.success(userById);
     }
+
+    /**
+     * 获取待办预警通知
+     */
+    @ApiOperation(value = "获取待办预警通知", notes = "")
+    @PostMapping("/getNotBeDoneNotice")
+    public List<Integer> getNotBeDoneNotice(String toBeDoneIds) {
+        List<Integer> result = processAuditService.getNotBeDoneNotice(toBeDoneIds);
+        return result;
+    }
+
 }

src/main/java/com/unissoft/ventilation/service/ProcessAuditService.java

@@ -3,6 +3,8 @@ package com.unissoft.ventilation.service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.unissoft.dto.ProcessToBeDone;
+import com.unissoft.dto.SendNoticeVO;
+import com.unissoft.dto.ToBeDoneCallbackVO;
 import com.unissoft.model.ProcessAudit;
 import com.unissoft.result.PageParam;
 import org.json.JSONException;
@@ -40,10 +42,11 @@ public interface ProcessAuditService extends IService<ProcessAudit> {
 
 	Page<ProcessAudit> completeList(PageParam pageParam) throws JSONException;
 
-	void toBeDone(ProcessToBeDone processToBeDone);
+	List<ToBeDoneCallbackVO> toBeDone(ProcessToBeDone processToBeDone);
 
 	void haveDone(Integer id,Integer auditState);
 
 	void haveDone(Integer userId, String type, Integer depotId, Integer houseId,Integer auditState);
 
+	List<Integer> getNotBeDoneNotice(String toBeDoneIds);
 }

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

@@ -9,6 +9,8 @@ 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.ToBeDoneCallbackVO;
+import com.unissoft.feign.MessageFeign;
 import com.unissoft.feign.SystemFeign;
 import com.unissoft.mapper.*;
 import com.unissoft.model.*;
@@ -59,6 +61,9 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
     private SystemFeign systemFeign;
 
     @Autowired
+    private MessageFeign messageFeign;
+
+    @Autowired
     private RestTemplate restTemplate;
 
 
@@ -154,15 +159,15 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
             }
 
             if (StringUtils.isNotBlank(object.optString("startTime")) || StringUtils.isNotBlank(object.optString("endTime"))) {
-                if(StringUtils.isNotBlank(object.optString("startTime")) && StringUtils.isNotBlank(object.optString("endTime")) &&
-                  object.optString("startTime").equals(object.optString("endTime"))){
-                     ew.apply("date_format(apply_time,'%Y-%m-%d')='"+object.optString("startTime")+"'" );
-                }else{
-                 ew.between("apply_time", object.optString("startTime"), object.optString("endTime"));
+                if (StringUtils.isNotBlank(object.optString("startTime")) && StringUtils.isNotBlank(object.optString("endTime")) &&
+                        object.optString("startTime").equals(object.optString("endTime"))) {
+                    ew.apply("date_format(apply_time,'%Y-%m-%d')='" + object.optString("startTime") + "'");
+                } else {
+                    ew.between("apply_time", object.optString("startTime"), object.optString("endTime"));
                 }
 
             }
-            
+
 
         }
 
@@ -329,7 +334,7 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
                 processAudit1.setApplyPeople(processAudit.getApplyPeople());
                 processAudit1.setProcessId(processAudit.getProcessId());
                 processAudit1.setApplyTime(processAudit.getApplyTime());
-                if(processAudit.getType().equals("tf")){
+                if (processAudit.getType().equals("tf")) {
                     processAudit1.setWorkName("机械通风申请");
                 }
                 processAuditMapper.insert(processAudit1);
@@ -518,7 +523,7 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
 
         if (pageInfo.getTotal() > 0) {
             for (ProcessAudit processAudit : pageInfo.getRecords()) {
-            	//根据仓房id获取仓房名称
+                //根据仓房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);
@@ -575,7 +580,7 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
         Page<ProcessAudit> pageInfo = processAuditMapper.selectPage(page, ew);
         if (pageInfo.getTotal() > 0) {
             for (ProcessAudit processAudit : pageInfo.getRecords()) {
-            	//根据仓房id获取仓房名称
+                //根据仓房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);
@@ -600,18 +605,24 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
     }
 
     @Override
-    public void toBeDone(ProcessToBeDone processToBeDone) {//systemFeign
+    public List<ToBeDoneCallbackVO> toBeDone(ProcessToBeDone processToBeDone) {
+        List<ToBeDoneCallbackVO> result = new ArrayList<>();
+
         String usersInfo = processToBeDone.getUsersInfo();
-        if(StringUtils.isNotEmpty(usersInfo)) {
+        if (StringUtils.isNotEmpty(usersInfo)) {
             String[] userInfoArr = usersInfo.split(",");
-            for(String userInfo : userInfoArr) {
+            for (String userInfo : userInfoArr) {
                 String[] temp = userInfo.split("\\|");
                 Integer userId = Integer.parseInt(temp[0]);
                 SysUserDTO user = systemFeign.getUserById(userId);
                 String storehouseIds = user.getStorehouseIds();
-                if(StringUtils.isNotEmpty(storehouseIds)) {
+                String storehouseNames = user.getStorehouseNames();
+                if (StringUtils.isNotEmpty(storehouseIds)) {
                     String[] houseIdArr = storehouseIds.split(",");
-                    for(String houseId : houseIdArr) {
+                    String[] houseNameArr = storehouseNames.split(",");
+                    for (int i = 0; i < houseIdArr.length; i++) {
+                        String houseId = houseIdArr[i];
+                        String houseName = houseNameArr[i];
                         ProcessToBeDoneVO toBeDoneVO = new ProcessToBeDoneVO();
                         toBeDoneVO.setTitle(processToBeDone.getTitle());
                         toBeDoneVO.setHouseId(Integer.parseInt(houseId));
@@ -622,15 +633,45 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
                         toBeDoneVO.setUserId(userId);
                         toBeDoneVO.setType(processToBeDone.getType());
                         //
-                        toBeDone(toBeDoneVO);
+                        ProcessAudit processAudit = toBeDone(toBeDoneVO);//生成待办数据
+                        //
+                        ToBeDoneCallbackVO toBeDoneCallbackVO = new ToBeDoneCallbackVO();
+                        toBeDoneCallbackVO.setToBeDoneId(processAudit.getId());
+                        toBeDoneCallbackVO.setUserId(userId);
+                        toBeDoneCallbackVO.setPersonnelName(user.getPersonnelName());
+                        toBeDoneCallbackVO.setDepotId(user.getDepotId());
+                        toBeDoneCallbackVO.setDepotName(user.getDepotName());
+                        toBeDoneCallbackVO.setHouseId(Integer.parseInt(houseId));
+                        toBeDoneCallbackVO.setHouseName(houseName);
+//                        toBeDoneCallbackVO.setTitle(processToBeDone.getTitle());
+
+                        result.add(toBeDoneCallbackVO);
                     }
                 }
             }
         }
-    }
 
+        return result;
+    }
 
-    private void toBeDone(ProcessToBeDoneVO processToBeDone) {
+//    private SendNoticeVO getSendNoticeVO(ProcessToBeDoneVO toBeDoneVO, SysUserDTO userDTO, String houseName) {
+//        SendNoticeVO vo = new SendNoticeVO();
+//        Map<Integer, String> users = new HashMap<>();
+//        users.put(userDTO.getUId(), userDTO.getUName());
+//        SysNoticeVO sysNoticeVO = new SysNoticeVO();
+//
+//        String content = toBeDoneVO.getTitle() + "-" + houseName + "-" + "待处理";
+//        sysNoticeVO.setContent(content);
+//        sysNoticeVO.setNoticeTime(new Date());
+//        sysNoticeVO.setNoticeType(10);
+//        sysNoticeVO.setOrgName(userDTO.getCompanyName());
+//
+//        vo.setUsers(users);
+//        vo.setSysNoticeVO(sysNoticeVO);
+//        return vo;
+//    }
+
+    private ProcessAudit toBeDone(ProcessToBeDoneVO processToBeDone) {
         // TODO Auto-generated method stub
         ProcessAudit processAudit = new ProcessAudit();
         if (null != processToBeDone) {
@@ -667,30 +708,31 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
             }
             processAuditMapper.insert(processAudit);
         }
+        return processAudit;
     }
 
 
     @Override
-    public void haveDone(Integer id,Integer auditState) {
+    public void haveDone(Integer id, Integer auditState) {
         // TODO Auto-generated method stub
         ProcessAudit processAudit = processAuditMapper.selectById(id);
-        if(null!=processAudit){
-        	if(processAudit.getAuditState().equals(4)){//已经处理完成 则不处理
-        		haveDone(processAudit.getApplyPeople(),processAudit.getType(),processAudit.getDepotId(),processAudit.getHouseId(),auditState);
-        	}else{
-        		processAudit.setAuditState(auditState);//设置状态
+        if (null != processAudit) {
+            if (processAudit.getAuditState().equals(4)) {//已经处理完成 则不处理
+                haveDone(processAudit.getApplyPeople(), processAudit.getType(), processAudit.getDepotId(), processAudit.getHouseId(), auditState);
+            } else {
+                processAudit.setAuditState(auditState);//设置状态
                 // 获得SimpleDateFormat类
                 SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
                 processAudit.setOperationTime(sf.format(new Date()));//具体办理时的时间
                 processAuditMapper.updateById(processAudit);
-        	}
+            }
         }
-        
+
     }
 
 
     @Override
-    public void haveDone(Integer userId, String type, Integer depotId, Integer houseId,Integer auditState) {
+    public void haveDone(Integer userId, String type, Integer depotId, Integer houseId, Integer auditState) {
         // TODO Auto-generated method stub
         //根据用户id、流程类型(如科长每2周粮情检查的类型：xxxx1)，按时间倒序查出待办流程，将最近日期的流程设成已办
         //同时要存储具体办理时的时间，因为要计算该流程办理的周期(或计算逾期时间)
@@ -701,14 +743,57 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
         ew.eq("house_id", houseId);
         ew.orderByDesc("start_date");//根据时间倒叙
         List<ProcessAudit> auditList = processAuditMapper.selectList(ew);
-        if(auditList.size()>0){
-        	 auditList.get(0).setAuditState(auditState);//设置状态
-             // 获得SimpleDateFormat类
-             SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
-             auditList.get(0).setOperationTime(sf.format(new Date()));//具体办理时的时间
-             processAuditMapper.updateById(auditList.get(0));
+        if (auditList.size() > 0) {
+            auditList.get(0).setAuditState(auditState);//设置状态
+            // 获得SimpleDateFormat类
+            SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+            auditList.get(0).setOperationTime(sf.format(new Date()));//具体办理时的时间
+            processAuditMapper.updateById(auditList.get(0));
+        }
+
+    }
+
+    @Override
+    public List<Integer> getNotBeDoneNotice(String toBeDoneIds) {
+        List<Integer> result = null;
+        if (StringUtils.isNotEmpty(toBeDoneIds)) {
+            String[] toBeDoneIdArr = toBeDoneIds.split(",");
+            List<ProcessAudit> toBeDone = processAuditMapper.getToBeDone(convertType(toBeDoneIdArr));
+            if (null != toBeDone && toBeDone.size() > 0) {
+                result = new ArrayList<>();
+                for(ProcessAudit processAudit : toBeDone) {
+                    result.add(processAudit.getId());
+                }
+            }
         }
+        return result;
+    }
 
+    private List<Integer> convertType(String[] stringArr) {
+        List<Integer> result = null;
+        if (null != stringArr && stringArr.length > 0) {
+            result = new ArrayList<>();
+            for (String str : stringArr) {
+                result.add(Integer.parseInt(str));
+            }
+        }
+        return result;
     }
 
+    private String getWarehouse(SysUserDTO user, Integer houseId) {
+        String storehouseIds = user.getStorehouseIds();
+        String storehouseNames = user.getStorehouseNames();
+        if (StringUtils.isNotEmpty(storehouseIds)) {
+            String[] storehouseIdArr = storehouseIds.split(",");
+            String[] storehouseNameArr = storehouseNames.split(",");
+            for (int i = 0; i < storehouseIdArr.length; i++) {
+                if (storehouseIdArr[i].equals(houseId + "")) {
+                    return storehouseNameArr[i];
+                }
+            }
+        }
+        return null;
+    }
+
+
 }

src/main/java/com/unissoft/vo/ProcessToBeDoneVO.java

@@ -33,86 +33,5 @@ public class ProcessToBeDoneVO{
     private Integer userId;//待办人员ID
 
     private String type;//流程类型
-
-	public Integer getId() {
-		return id;
-	}
-
-	public void setId(Integer id) {
-		this.id = id;
-	}
-
-	public String getTitle() {
-		return title;
-	}
-
-	public void setTitle(String title) {
-		this.title = title;
-	}
-
-	public Integer getHouseId() {
-		return houseId;
-	}
-
-	public void setHouseId(Integer houseId) {
-		this.houseId = houseId;
-	}
-
-	public Integer getDepotId() {
-		return depotId;
-	}
-
-	public void setDepotId(Integer depotId) {
-		this.depotId = depotId;
-	}
-
-	public Date getStartDate() {
-		return startDate;
-	}
-
-	public void setStartDate(Date startDate) {
-		this.startDate = startDate;
-	}
-
-	public Date getEndDate() {
-		return endDate;
-	}
-
-	public void setEndDate(Date endDate) {
-		this.endDate = endDate;
-	}
-
-	public String getToPage() {
-		return toPage;
-	}
-
-	public void setToPage(String toPage) {
-		this.toPage = toPage;
-	}
-
-	public Integer getUserId() {
-		return userId;
-	}
-
-	public void setUserId(Integer userId) {
-		this.userId = userId;
-	}
-
-	public String getType() {
-		return type;
-	}
-
-	public void setType(String type) {
-		this.type = type;
-	}
-
-	@Override
-	public String toString() {
-		return "ProcessToBeDoneVO [id=" + id + ", title=" + title + ", houseId=" + houseId + ", depotId=" + depotId
-				+ ", startDate=" + startDate + ", endDate=" + endDate + ", toPage=" + toPage + ", userId=" + userId
-				+ ", type=" + type + "]";
-	}
-    
-    
     
 }