src/main/java/com/unissoft/job/ToBeDoneJob.java

@@ -11,6 +11,7 @@ import com.unissoft.service.QuartzService;
 import com.unissoft.service.SysMessageService;
 import com.unissoft.utils.DateUtil;
 import com.unissoft.vo.WarnScheduleVO;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.time.DateUtils;
 import org.quartz.*;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -51,6 +52,7 @@ public class ToBeDoneJob implements Job, Serializable {
         String usersInfo = dataMap.getString("usersInfo");
         String timePeriod = dataMap.getString("timePeriod");
         String aheadTime = dataMap.getString("aheadTime");//预警时间
+        Integer levelDepotHouse = dataMap.getInt("levelDepotHouse");
         String toPage = dataMap.getString("toPage");
         String type = dataMap.getString("type");
         //
@@ -61,6 +63,7 @@ public class ToBeDoneJob implements Job, Serializable {
         done.setStartDate(startDate);
         Date endDate = getEndDate(startDate, timePeriod);
         done.setEndDate(endDate);
+        done.setLevelDepotHouse(levelDepotHouse);
         done.setToPage(toPage);
         done.setType(type);
         //生成待办数据
@@ -72,7 +75,14 @@ public class ToBeDoneJob implements Job, Serializable {
             for(ToBeDoneCallbackVO vo : toBeDoneCallbackList) {
                 MessageVO messageVO = new MessageVO();
                 messageVO.setTitle(title);
-                String content = vo.getDepotName() + "-" + vo.getHouseName() + "-" + "待处理";
+                StringBuilder stringBuilder = new StringBuilder();
+                stringBuilder.append(vo.getDepotName()).append("-");
+                if(StringUtils.isNotBlank(vo.getHouseName())) {
+                    stringBuilder.append(vo.getHouseName()).append("-");
+                }
+                stringBuilder.append("待处理");
+
+                String content = stringBuilder.toString();
                 messageVO.setContent(content);
                 //
                 messageVO.setFromUserId(-1);//-1 代表系统推送

src/main/java/com/unissoft/job/ToBeDoneNoticeWarnJob.java

@@ -68,7 +68,16 @@ public class ToBeDoneNoticeWarnJob implements Job, Serializable {
                 sysNoticeVO.setNoticeType(NoticeTypeEnum.WARN.getCode());
                 sysNoticeVO.setNoticeTime(new Date());
                 sysNoticeVO.setTitle(title);
-                String content = warnNotice.getDepotName() + "-" + warnNotice.getHouseName() + "-" + "即将逾期";
+
+
+                StringBuilder stringBuilder = new StringBuilder();
+                stringBuilder.append(warnNotice.getDepotName()).append("-");
+                if(StringUtils.isNotBlank(warnNotice.getHouseName())) {
+                    stringBuilder.append(warnNotice.getHouseName()).append("-");
+                }
+                stringBuilder.append("即将逾期");
+
+                String content = stringBuilder.toString();
                 sysNoticeVO.setContent(content);
                 sysNoticeVO.setWarehouse(warnNotice.getHouseName());
                 sysNoticeVO.setOrgName(warnNotice.getDepotName());

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

@@ -13,6 +13,7 @@
         <result column="warn_target" property="warnTarget" />
         <result column="warn_target_names" property="warnTargetNames" />
         <result column="warn_status" property="warnStatus" />
+        <result column="level_depot_house" property="levelDepotHouse" />
         <result column="to_page" property="toPage" />
         <result column="create_by" property="createBy" />
         <result column="create_time" property="createTime" />
@@ -24,7 +25,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, warn_name, warn_code, inspect_cycle, warning_time, warn_target_type, warn_target, warn_target_names, warn_status, to_page, create_by, create_time, update_by, update_time, delete_by, delete_time
+        id, warn_name, warn_code, inspect_cycle, warning_time, warn_target_type, warn_target, warn_target_names, warn_status, level_depot_house, to_page, create_by, create_time, update_by, update_time, delete_by, delete_time
     </sql>
 
 </mapper>

src/main/java/com/unissoft/model/SysEarlyWarning.java

@@ -57,6 +57,10 @@ public class SysEarlyWarning extends BaseModel implements Serializable {
     @TableField("warn_status")
     private Boolean warnStatus;
 
+    @ApiModelProperty(value = "按库或仓房为单位进行预警：1库，2仓房")
+    @TableField("level_depot_house")
+    private Integer levelDepotHouse;
+
     @ApiModelProperty(value = "跳转页面")
     @TableField("to_page")
     private String toPage;

src/main/java/com/unissoft/service/impl/SysEarlyWarningServiceImpl.java

@@ -21,7 +21,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.text.SimpleDateFormat;
 import java.util.Date;
 
 import static org.quartz.CalendarIntervalScheduleBuilder.calendarIntervalSchedule;
@@ -285,12 +284,14 @@ public class SysEarlyWarningServiceImpl extends ServiceImpl<SysEarlyWarningMappe
         String usersInfo = earlyWarning.getWarnTarget();                //通知对象(用户ID|用户姓名)
         String timePeriod = earlyWarning.getInspectCycle();             //检查周期：每2周、每个月等
         String aheadTime = earlyWarning.getWarningTime();               //预警时间：提前几个小时或几天
+        Integer levelDepotHouse = earlyWarning.getLevelDepotHouse();    //按库或仓房为单位进行预警：1库，2仓房
 
         JobDetail toBeDoneJob = JobBuilder.newJob(ToBeDoneJob.class).withIdentity(jobName, GROUP).withDescription(title).build();
         toBeDoneJob.getJobDataMap().put("title", title);
         toBeDoneJob.getJobDataMap().put("usersInfo", usersInfo);
         toBeDoneJob.getJobDataMap().put("timePeriod", timePeriod);//检查周期
         toBeDoneJob.getJobDataMap().put("aheadTime", aheadTime);//预警时间
+        toBeDoneJob.getJobDataMap().put("levelDepotHouse", levelDepotHouse);
         toBeDoneJob.getJobDataMap().put("toPage", earlyWarning.getToPage());
         toBeDoneJob.getJobDataMap().put("type", earlyWarning.getWarnCode());//类型 用 预警Code
 

src/main/java/com/unissoft/service/impl/SysPolicySystemServiceImpl.java

@@ -141,9 +141,12 @@ public class SysPolicySystemServiceImpl extends ServiceImpl<SysPolicySystemMappe
         //
         save(model);
 
+        Map<Integer, String> users = getNoticeUserInfo(null, "10", null);//接收对象：recvType=10 全员
+        saveSysPolicySystemUsers(model.getId(), users);
+
         //如果需要通知
         if(model.getIsNotice()) {
-            saveSysPolicySystemUsersAndSendMessage(model, userPO);
+            sendMessage4PolicySystemUsers(model, userPO, users);
         }
 
         return true;
@@ -165,9 +168,10 @@ public class SysPolicySystemServiceImpl extends ServiceImpl<SysPolicySystemMappe
         //
         updateById(model);
 
+        Map<Integer, String> users = getNoticeUserInfo(null, "10", null);//接收对象：recvType=10 全员
         //如果需要通知
         if(model.getIsNotice()) {
-            saveSysPolicySystemUsersAndSendMessage(model, userPO);
+            sendMessage4PolicySystemUsers(model, userPO, users);
         }
 
         return true;
@@ -197,16 +201,14 @@ public class SysPolicySystemServiceImpl extends ServiceImpl<SysPolicySystemMappe
         return users;
     }
 
+
     /**
      *
      * @param model
      * @param userPO
      */
-    private void saveSysPolicySystemUsersAndSendMessage(SysPolicySystem model, SysUserPO userPO) {
-        Map<Integer, String> users = getNoticeUserInfo(null, "10", null);//接收对象：recvType=10 全员
+    private void sendMessage4PolicySystemUsers(SysPolicySystem model, SysUserPO userPO, Map<Integer, String> users) {
         if(null != users && users.isEmpty() == false) {
-            saveSysPolicySystemUsers(model.getId(), users);
-
             SendNoticeVO sendNoticeVO = new SendNoticeVO();
             sendNoticeVO.setUsers(users);