修正bug

application-facade/src/main/java/com/factory/util/client/PushWxMessage.java

@@ -2,11 +2,14 @@ package com.factory.util.client;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.HashMap;
 import java.util.Map;
 
 public class PushWxMessage {
+    private final static Logger LOGGER = LoggerFactory.getLogger(PushWxMessage.class);
 
     public static String sendMessage(AppEntry appinfo, TemplateEntry template) {
         try {
@@ -24,6 +27,7 @@ public class PushWxMessage {
             String errCode = jsonObject.get("errcode").toString();
             String errMsg = jsonObject.get("errmsg").toString();
             System.out.println(errCode);
+            if (errCode != "0") LOGGER.error("下发微信消息错误code:{},errMsg{}", errCode, errMsg);
             return errCode;
         } catch (Throwable e) {
             e.printStackTrace();

application-facade/src/main/java/com/factory/web/service/impl/fa/FirstArticleServiceImpl.java

@@ -107,7 +107,7 @@ public class FirstArticleServiceImpl extends ServiceImpl<FirstArticleMapper, Ben
 
     @Autowired
     private PlanBindService planBindService;
-    
+
     @Autowired
     private FileService fileService;
 
@@ -200,7 +200,7 @@ public class FirstArticleServiceImpl extends ServiceImpl<FirstArticleMapper, Ben
                         .valFlag(firstArticleItemReq.getValFlag())
                         .valUp(firstArticleItemReq.getValUp())
                         .valDown(firstArticleItemReq.getValDown())
-                        .valUnit(firstArticleItemReq.getValUnit())                 
+                        .valUnit(firstArticleItemReq.getValUnit())
                         .valOk(firstArticleItemReq.getValOk())
                         .valDesc(firstArticleItemReq.getValDesc())
                         .levelInfo(firstArticleItemReq.getLevelInfo())
@@ -300,13 +300,13 @@ public class FirstArticleServiceImpl extends ServiceImpl<FirstArticleMapper, Ben
             FirstArticleTitleBlob firstArticleTitleBlob = firstArticleTitleBlobService.getOne(new LambdaQueryWrapper<FirstArticleTitleBlob>()
                     .eq(FirstArticleTitleBlob::getBentelerPlanId, req.getBentelerPlanId()));
             faPlanRes.setFirstArticleTitle((FirstArticleTitle) this.byteArrayToObject(firstArticleTitleBlob.getTitleContent()));
-            
+
             /* 取得文件信息 */
             FileEntry fileEntry = fileService.getById(faPlanRes.getFirstArticleTitle().getUploadAttachmentId());
             if (fileEntry != null) {
             	faPlanRes.setFileNm(fileEntry.getFileNm());
             }
-            
+
         } catch (Exception e) {
             // TODO Auto-generated catch block
             e.printStackTrace();
@@ -894,7 +894,7 @@ public class FirstArticleServiceImpl extends ServiceImpl<FirstArticleMapper, Ben
         /* 取得task下的所有条目检查结果 */
         List<FirstArticleItemResult> firstArticleItemResultList = firstArticleItemResultService.list(Wrappers.<FirstArticleItemResult>lambdaQuery()
                 .eq(FirstArticleItemResult::getFirstArticleTaskId, firstArticleTaskId));
-        
+
         /* task提交时，备份result到resultBak */
         for (FirstArticleItemResult firstArticleItemResult : firstArticleItemResultList) {
         	FirstArticleItemResult fair = FirstArticleItemResult.builder()
@@ -940,7 +940,17 @@ public class FirstArticleServiceImpl extends ServiceImpl<FirstArticleMapper, Ben
                         .approvalUserId(approvalUserRes.getUserId())
                         .status(0) // 0初始化
                         .build();
-                firstArticleApprovalTaskService.save(firstArticleApprovalTask);
+                boolean status = firstArticleApprovalTaskService.save(firstArticleApprovalTask);
+                // 下发微信消息
+                if (status) {
+                    //发送微信消息
+                    SendMsgReq sendMsgReq = new SendMsgReq();
+                    sendMsgReq.setToUserId(approvalUserRes.getUserId());
+                    sendMsgReq.setTitle("计划放行");
+                    sendMsgReq.setContent("您有待放行的计划审批，请登录小程序查看");
+                    sendMsgReq.setFromUserId(req.getUserId());
+                    wxService.sendWechatMessage(sendMsgReq);
+                }
             }
         }
 
@@ -977,7 +987,7 @@ public class FirstArticleServiceImpl extends ServiceImpl<FirstArticleMapper, Ben
             	faWorkshop.setAllCheckFlag(0);
             }
         }
-        
+
         return ResponseBeanBuilder.ok(faWorkshopNoGoList, Function.identity());
     }
 
@@ -1530,8 +1540,8 @@ public class FirstArticleServiceImpl extends ServiceImpl<FirstArticleMapper, Ben
         List<FaCalendarRes> faCalendarList = firstArticleMapper.getFaCalendarList(req);
         return faCalendarList;
     }
-    
-    
+
+
     /**
      * task二级审批不通过的，即为重检，此时将点检结果item_result为不通过的1都改成成-1，这样重检时相当于重新开始，没有之前首次点检的结果
      *
@@ -1546,8 +1556,8 @@ public class FirstArticleServiceImpl extends ServiceImpl<FirstArticleMapper, Ben
                 .set(FirstArticleItemResult::getResult, -1);
         firstArticleItemResultService.update(lambdaUpdateWrapper);
     }
-    
-    
+
+
 
     /**
      * Object转成byte[]

application-facade/src/main/java/com/factory/web/service/impl/pm/PreventMistakeServiceImpl.java

@@ -1,21 +1,5 @@
 package com.factory.web.service.impl.pm;
 
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.function.Function;
-
-import com.factory.wx.entity.req.SendMsgReq;
-import com.factory.wx.service.WxService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -27,86 +11,30 @@ import com.factory.base.entity.aggregates.ResponseBean;
 import com.factory.base.entity.enumPo.PlanType;
 import com.factory.base.entity.po.benteler.BentelerPlan;
 import com.factory.base.util.res.ResponseBeanBuilder;
-import com.factory.web.entity.fa.FirstArticleItemResult;
 import com.factory.web.entity.fa.FirstArticleWorkshop;
-import com.factory.web.entity.fa.req.EditFaItemResultReq;
-import com.factory.web.entity.pm.OnsiteApprovalPlan;
-import com.factory.web.entity.pm.OnsiteApprovalTask;
-import com.factory.web.entity.pm.OnsiteCalendar;
-import com.factory.web.entity.pm.OnsiteItem;
-import com.factory.web.entity.pm.OnsiteItemResult;
-import com.factory.web.entity.pm.OnsitePlanHisBlob;
-import com.factory.web.entity.pm.OnsiteTask;
-import com.factory.web.entity.pm.OnsiteTaskHisBlob;
-import com.factory.web.entity.pm.OnsiteTitle;
-import com.factory.web.entity.pm.OnsiteTitleBlob;
-import com.factory.web.entity.pm.OnsiteWorkshop;
-import com.factory.web.entity.pm.PlanBind;
-import com.factory.web.entity.pm.req.AddItemResultListReq;
-import com.factory.web.entity.pm.req.AddItemResultReq;
-import com.factory.web.entity.pm.req.AddPmPlanReq;
-import com.factory.web.entity.pm.req.EditItemResultListReq;
-import com.factory.web.entity.pm.req.EditItemResultReq;
-import com.factory.web.entity.pm.req.EditPmPlanReq;
-import com.factory.web.entity.pm.req.OnsiteCalendarReq;
-import com.factory.web.entity.pm.req.OnsiteItemReq;
-import com.factory.web.entity.pm.req.OnsiteWorkshopReq;
-import com.factory.web.entity.pm.req.PmPlanPauseFlagReq;
-import com.factory.web.entity.pm.req.SearchAbnormalListReq;
-import com.factory.web.entity.pm.req.SearchAbnormalReq;
-import com.factory.web.entity.pm.req.SearchAllWorkshopReq;
-import com.factory.web.entity.pm.req.SearchApprovalUserReq;
-import com.factory.web.entity.pm.req.SearchCheckRecordReq;
-import com.factory.web.entity.pm.req.SearchItemListReq;
-import com.factory.web.entity.pm.req.SearchPmAllCheckFlagReq;
-import com.factory.web.entity.pm.req.SearchPmCheckRecordListReq;
-import com.factory.web.entity.pm.req.SearchPmItemNoGoListReq;
-import com.factory.web.entity.pm.req.SearchPmPlanCheckListReq;
-import com.factory.web.entity.pm.req.SearchPmPlanListForPadReq;
-import com.factory.web.entity.pm.req.SearchPmPlanListReq;
-import com.factory.web.entity.pm.req.SearchPmPlanReq;
-import com.factory.web.entity.pm.req.SearchPmWorkshopNoGoListReq;
-import com.factory.web.entity.pm.req.SearchPmWsAllCheckFlagReq;
-import com.factory.web.entity.pm.req.SearchTaskReq;
-import com.factory.web.entity.pm.req.SearchWorkshopReq;
-import com.factory.web.entity.pm.res.AbnormalItemRes;
-import com.factory.web.entity.pm.res.AbnormalItemResultRes;
-import com.factory.web.entity.pm.res.AbnormalTaskInfoRes;
-import com.factory.web.entity.pm.res.AbnormalWorkshopRes;
-import com.factory.web.entity.pm.res.ApprovalUserRes;
-import com.factory.web.entity.pm.res.PmAllCheckFlagRes;
-import com.factory.web.entity.pm.res.PmAllWorkshopListRes;
-import com.factory.web.entity.pm.res.PmCheckListRes;
-import com.factory.web.entity.pm.res.PmCheckRecordItemListRes;
-import com.factory.web.entity.pm.res.PmCheckRecordListRes;
-import com.factory.web.entity.pm.res.PmCheckRecordRes;
-import com.factory.web.entity.pm.res.PmItemNoGoListRes;
-import com.factory.web.entity.pm.res.PmNoGoTaskAapprovalRes;
-import com.factory.web.entity.pm.res.PmPlanCheckListRes;
-import com.factory.web.entity.pm.res.PmPlanListForPadRes;
-import com.factory.web.entity.pm.res.PmPlanListRes;
-import com.factory.web.entity.pm.res.PmPlanRes;
-import com.factory.web.entity.pm.res.PmTaskListRes;
-import com.factory.web.entity.pm.res.PmTaskRes;
-import com.factory.web.entity.pm.res.PmWorkshopNoGoListRes;
+import com.factory.web.entity.pm.*;
+import com.factory.web.entity.pm.req.*;
+import com.factory.web.entity.pm.res.*;
 import com.factory.web.mapper.pm.PreventMistakeMapper;
 import com.factory.web.service.BentelerPlanService;
 import com.factory.web.service.FileService;
 import com.factory.web.service.fa.FirstArticleService;
 import com.factory.web.service.fa.FirstArticleWorkshopService;
 import com.factory.web.service.impl.FileEntry;
-import com.factory.web.service.pm.OnsiteApprovalPlanService;
-import com.factory.web.service.pm.OnsiteApprovalTaskService;
-import com.factory.web.service.pm.OnsiteCalendarService;
-import com.factory.web.service.pm.OnsiteItemResultService;
-import com.factory.web.service.pm.OnsiteItemService;
-import com.factory.web.service.pm.OnsitePlanHisBlobService;
-import com.factory.web.service.pm.OnsiteTaskHisBlobService;
-import com.factory.web.service.pm.OnsiteTaskService;
-import com.factory.web.service.pm.OnsiteTitleBlobService;
-import com.factory.web.service.pm.OnsiteWorkshopService;
-import com.factory.web.service.pm.PlanBindService;
-import com.factory.web.service.pm.PreventMistakeService;
+import com.factory.web.service.pm.*;
+import com.factory.wx.entity.req.SendMsgReq;
+import com.factory.wx.service.WxService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.function.Function;
 
 
 /**
@@ -157,16 +85,16 @@ public class PreventMistakeServiceImpl extends ServiceImpl<PreventMistakeMapper,
 
 	@Autowired
 	private FirstArticleWorkshopService firstArticleWorkshopService;
-	
+
 	@Autowired
 	private FirstArticleService firstArticleService;
-	
+
 	@Autowired
 	private PlanBindService planBindService;
-	
+
 	@Autowired
     private FileService fileService;
-	
+
 
 	@Autowired
 	private WxService wxService;
@@ -423,7 +351,7 @@ public class PreventMistakeServiceImpl extends ServiceImpl<PreventMistakeMapper,
             if (fileEntry != null) {
             	pmPlanRes.setFileNm(fileEntry.getFileNm());
             }
-            
+
 		} catch (Exception e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
@@ -835,7 +763,7 @@ public class PreventMistakeServiceImpl extends ServiceImpl<PreventMistakeMapper,
     		searchPmWsAllCheckFlagReq = new SearchPmWsAllCheckFlagReq();
     		searchPmWsAllCheckFlagReq.setOnsiteTaskId(req.getOnsiteTaskId());
     		searchPmWsAllCheckFlagReq.setWorkshopId(onsiteWorkshop.getId());
-    		searchPmWsAllCheckFlagReq.setTypeFlag(req.getTypeFlag());   		
+    		searchPmWsAllCheckFlagReq.setTypeFlag(req.getTypeFlag());
 
     		int itemCount = preventMistakeMapper.getPmWsItemCount(searchPmWsAllCheckFlagReq);
     		int itemResultCount = preventMistakeMapper.getPmWsItemResultCount(searchPmWsAllCheckFlagReq);
@@ -881,7 +809,7 @@ public class PreventMistakeServiceImpl extends ServiceImpl<PreventMistakeMapper,
     @Override
 	public ResponseBean addItemResult(AddItemResultListReq req) {
         List<AddItemResultReq> addItemResultList = req.getAddItemResultList();
-        
+
         /* 删除上一次保存结果 */
         List<Long> onsiteItemIdList = new ArrayList<Long>();
         for (AddItemResultReq itemResult : addItemResultList) {
@@ -916,7 +844,7 @@ public class PreventMistakeServiceImpl extends ServiceImpl<PreventMistakeMapper,
 		/* 取得task下的所有条目检查结果 */
 		List<OnsiteItemResult> onsiteItemResultList = onsiteItemResultService.list(Wrappers.<OnsiteItemResult>lambdaQuery()
                 .eq(OnsiteItemResult::getOnsiteTaskId, req.getOnsiteTaskId()));
-		
+
 		/* task提交时，备份result到resultBak */
         for (OnsiteItemResult onsiteItemResult : onsiteItemResultList) {
         	OnsiteItemResult oir = OnsiteItemResult.builder()
@@ -925,7 +853,7 @@ public class PreventMistakeServiceImpl extends ServiceImpl<PreventMistakeMapper,
                     .build();
         	onsiteItemResultService.updateById(oir);
         }
-		
+
 		boolean flag = true; // true表示巡检项目都通过，false表示巡检项目有不通过的
 		for (OnsiteItemResult onsiteItemResult : onsiteItemResultList) {
 			if (onsiteItemResult.getResult() == 1) {
@@ -962,7 +890,19 @@ public class PreventMistakeServiceImpl extends ServiceImpl<PreventMistakeMapper,
 						.approvalUserId(approvalUserRes.getUserId())
 						.status(0) // 0初始化
 						.build();
-				onsiteApprovalTaskService.save(onsiteApprovalTask);
+			    boolean status = onsiteApprovalTaskService.save(onsiteApprovalTask);
+				// 下发微信消息
+				if (status) {
+					//发送微信消息
+					SendMsgReq sendMsgReq = new SendMsgReq();
+					sendMsgReq.setToUserId(approvalUserRes.getUserId());
+					sendMsgReq.setTitle("计划放行");
+					sendMsgReq.setContent("您有待放行的计划审批，请登录小程序查看");
+					if (null != onsiteItemResultList) {
+						sendMsgReq.setFromUserId(onsiteItemResultList.get(0).getCreatedUserId());
+					}
+					wxService.sendWechatMessage(sendMsgReq);
+				}
 			}
 		}
 
@@ -1016,13 +956,13 @@ public class PreventMistakeServiceImpl extends ServiceImpl<PreventMistakeMapper,
 	@Override
 	public ResponseBean<List<PmWorkshopNoGoListRes>> getPmWorkshopNoGoList(SearchPmWorkshopNoGoListReq req) {
 		List<PmWorkshopNoGoListRes> pmWorkshopNoGoList = preventMistakeMapper.getPmWorkshopNoGoList(req);
-		
+
 		SearchPmWsAllCheckFlagReq searchPmWsAllCheckFlagReq = null;
 		for (PmWorkshopNoGoListRes pmWorkshop : pmWorkshopNoGoList) {
 			searchPmWsAllCheckFlagReq = new SearchPmWsAllCheckFlagReq();
 			searchPmWsAllCheckFlagReq.setOnsiteTaskId(req.getOnsiteTaskId());
 			searchPmWsAllCheckFlagReq.setWorkshopId(pmWorkshop.getWorkshopId());
-			searchPmWsAllCheckFlagReq.setTypeFlag(req.getTypeFlag());   		
+			searchPmWsAllCheckFlagReq.setTypeFlag(req.getTypeFlag());
 
 			int itemResultCount = preventMistakeMapper.getPmRepeatItemResultCount(searchPmWsAllCheckFlagReq);
 			if (itemResultCount == 0) {
@@ -1321,8 +1261,8 @@ public class PreventMistakeServiceImpl extends ServiceImpl<PreventMistakeMapper,
 		List<AbnormalItemResultRes> abnormalItemResultList = preventMistakeMapper.getFaAbnormalItemResultList(searchReq);
 	    return abnormalItemResultList;
 	}
-	
-	
+
+
 	/**
      * task二级审批不通过的，即为重检，此时将点检结果item_result为不通过的1都改成成-1，这样重检时相当于重新开始，没有之前首次点检的结果
      *
@@ -1337,7 +1277,7 @@ public class PreventMistakeServiceImpl extends ServiceImpl<PreventMistakeMapper,
                 .set(OnsiteItemResult::getResult, -1);
         onsiteItemResultService.update(lambdaUpdateWrapper);
     }
-    
+
 
 
     /**

application-facade/src/main/java/com/factory/wx/service/impl/PlanPassFAServiceImpl.java

@@ -131,7 +131,7 @@ public class PlanPassFAServiceImpl implements PlanPassFAService {
                 }
                 planPassWorkshopList.get(i).setItemList(planPassItemList);
 
-                faInfo.setWorkshopList(planPassWorkshopList.stream().filter(workshop -> workshop.getItemList().size() > 0).collect(Collectors.toList()));
+                faInfo.setWorkshopList(planPassWorkshopList.stream().filter(workshop -> null != workshop.getItemList() && workshop.getItemList().size() > 0 ).collect(Collectors.toList()));
             }
         }
         return faList;
@@ -250,14 +250,11 @@ public class PlanPassFAServiceImpl implements PlanPassFAService {
                     .build());
 
             //向下一级别发送提醒
-            Date date = new Date();
-            SimpleDateFormat ft = new SimpleDateFormat("yyyy-MM-dd");
             //发送微信消息
             wxService.sendWechatMessage(SendMsgReq.builder()
                     .toUserId(approvalUserRes.getUserId())
-                    .title("计划放行提醒")
-                    .content("您有待放行的计划审批，请登录小程序查看【计划放行】")
-                    .endTime(ft.format(date))
+                    .title("计划放行")
+                    .content("您有待放行的计划审批，请登录小程序查看")
                     .fromUserId(planApprovalTaskReq.getUserId())
                     .build());
         } else {

application-facade/src/main/java/com/factory/wx/service/impl/PlanPassPMServiceImpl.java

@@ -234,13 +234,10 @@ public class PlanPassPMServiceImpl implements PlanPassPMService {
                     .status(0)
                     .build());
             //向下一级别发送提醒
-            Date date = new Date();
-            SimpleDateFormat ft = new SimpleDateFormat("yyyy-MM-dd");
             wxService.sendWechatMessage(SendMsgReq.builder()
                     .toUserId(approvalUserRes.getUserId())
-                    .title("计划放行提醒")
-                    .content("您有待放行的计划审批，请登录小程序查看【计划放行】")
-                    .endTime(ft.format(date))
+                    .title("计划放行")
+                    .content("您有待放行的计划审批，请登录小程序查看")
                     .fromUserId(planApprovalTaskReq.getUserId())
                     .build());
         } else {

application-facade/src/main/java/com/factory/wx/service/impl/WxServiceImpl.java

@@ -20,6 +20,8 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 
@@ -97,14 +99,28 @@ public class WxServiceImpl implements WxService {
     public void sendWechatMessage(SendMsgReq sendMsgReq) {
         try {
             String openId = wxMapper.selectOne(Wrappers.<UsUserWechat>lambdaQuery().eq(UsUserWechat::getUserId, sendMsgReq.getToUserId())).getOpenid();
-            if (!openId.isEmpty()) {
+            if (null != openId && !openId.isEmpty()) {
                 AppEntry appEntry = AppEntry.builder().appId(appid).secret(appsecret).build();
                 HashMap<String, ValEntry> dataMap = new HashMap();
+                //提醒内容
                 dataMap.put("thing1", ValEntry.builder().value(sendMsgReq.getContent()).build());
+                //作业名称
                 dataMap.put("thing2", ValEntry.builder().value(sendMsgReq.getTitle()).build());
-                dataMap.put("time3", ValEntry.builder().value(sendMsgReq.getEndTime()).build());
-                String fromUserName = wxPlanService.getUserNameById(sendMsgReq.getFromUserId());
-                dataMap.put("thing4", ValEntry.builder().value(fromUserName).build());
+                //截止日期
+                if (null != sendMsgReq.getEndTime()) {
+                    dataMap.put("time3", ValEntry.builder().value(sendMsgReq.getEndTime()).build());
+                } else {
+                    Date date = new Date();
+                    SimpleDateFormat ft = new SimpleDateFormat("yyyy-MM-dd");
+                    dataMap.put("time3", ValEntry.builder().value(ft.format(date)).build());
+                }
+                //发布人员
+                if (null != sendMsgReq.getFromUserId()) {
+                    String fromUserName = wxPlanService.getUserNameById(sendMsgReq.getFromUserId());
+                    dataMap.put("thing4", ValEntry.builder().value(fromUserName).build());
+                } else {
+                    dataMap.put("thing4", ValEntry.builder().value("智云工厂系统").build());
+                }
                 TemplateEntry tpl = TemplateEntry.builder()
                         .template_id(templateId)
                         .touser(openId)
@@ -113,6 +129,8 @@ public class WxServiceImpl implements WxService {
                         .data(dataMap)
                         .build();
                 PushWxMessage.sendMessage(appEntry, tpl);
+            } else {
+                LOGGER.error("下发微信消息，接收人userId:{}的openId为空", sendMsgReq.getToUserId());
             }
         } catch (Exception e) {
             e.printStackTrace();

application-task/src/main/java/com/jihengbel/intelligent/applicationtask/init/FirstRemindJob.java

@@ -215,14 +215,11 @@ public class FirstRemindJob implements Job {
                         firstTaskService.addRemindNowork(map);
 
                         //需要推动调用这个 todo
-                        Date date = new Date();
-                        SimpleDateFormat ft = new SimpleDateFormat("yyyy-MM-dd");
-                        //发送微信消息
+                       //发送微信消息
                         SendMsgReq sendMsgReq = new SendMsgReq();
                         sendMsgReq.setToUserId(userid);
-                        sendMsgReq.setTitle("提醒执行计划");
-                        sendMsgReq.setContent("您有待提醒的执行计划，请登录小程序查看【计划提醒】");
-                        sendMsgReq.setEndTime(ft.format(date));
+                        sendMsgReq.setTitle("计划提醒");
+                        sendMsgReq.setContent("您有待提醒的计划，请登录小程序查看");
                         msgService.sendWechatMessage(sendMsgReq);
                     }
                 }

application-task/src/main/java/com/jihengbel/intelligent/applicationtask/init/OnsiteRemindJob.java

@@ -252,14 +252,11 @@ public class OnsiteRemindJob implements Job {
 //                        onsiteTaskService.updateOnsiteRemindFlag(map);
 
                         //需要推动调用这个 todo
-                        Date date = new Date();
-                        SimpleDateFormat ft = new SimpleDateFormat("yyyy-MM-dd");
                         //发送微信消息
                         SendMsgReq sendMsgReq = new SendMsgReq();
                         sendMsgReq.setToUserId(userid);//351L
-                        sendMsgReq.setTitle("提醒执行计划");
-                        sendMsgReq.setContent("您有待提醒的执行计划，请登录小程序查看【计划提醒】");
-                        sendMsgReq.setEndTime(ft.format(date));
+                        sendMsgReq.setTitle("计划提醒");
+                        sendMsgReq.setContent("您有待提醒的计划，请登录小程序查看");
                         msgService.sendWechatMessage(sendMsgReq);
                     }
                 }

application-task/src/main/java/com/jihengbel/intelligent/applicationtask/service/impl/MsgServiceImpl.java

@@ -12,6 +12,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -51,7 +53,13 @@ public class MsgServiceImpl implements MsgService {
             HashMap<String, ValEntry> dataMap = new HashMap();
             dataMap.put("thing1", new ValEntry(sendMsgReq.getContent()));
             dataMap.put("thing2", new ValEntry(sendMsgReq.getTitle()));
-            dataMap.put("time3", new ValEntry(sendMsgReq.getEndTime()));
+            if (null == sendMsgReq.getEndTime()) {
+                Date date = new Date();
+                SimpleDateFormat ft = new SimpleDateFormat("yyyy-MM-dd");
+                dataMap.put("time3", new ValEntry(ft.format(date)));
+            } else {
+                dataMap.put("time3", new ValEntry(sendMsgReq.getEndTime()));
+            }
             dataMap.put("thing4",  new ValEntry("智云工厂系统"));
 
             String openId = userMapper.getOpenIdByUserId(sendMsgReq.getToUserId());