9/4

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/userproject/UserProjectService.java

@@ -17,6 +17,7 @@ import org.springframework.stereotype.Service;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.UUID;
 
 /**
  * @author wangpengfei
@@ -47,7 +48,8 @@ public class UserProjectService extends MybatisBaseService<UserProjectMapper, Us
         for(String bankUser:dto.getBankUsers()){
             UserProject entity=new UserProject();
             BeanUtil.copyProperties(dto, entity, "id", "sid");
-            entity.setSid(bankUser);
+            entity.setSid(UUID.randomUUID().toString());
+            entity.setUserSid(bankUser);
             entity.setUserType("3");
             baseMapper.insert(entity);
         }
@@ -55,7 +57,8 @@ public class UserProjectService extends MybatisBaseService<UserProjectMapper, Us
         for(String user:dto.getUsers()){
             UserProject entity=new UserProject();
             BeanUtil.copyProperties(dto, entity, "id", "sid");
-            entity.setSid(user);
+            entity.setSid(UUID.randomUUID().toString());
+            entity.setUserSid(user);
             entity.setUserType("1");
             baseMapper.insert(entity);
         }

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/imgmessageslog/ImgMessagesLogMapper.java

@@ -20,6 +20,8 @@ public interface ImgMessagesLogMapper extends BaseMapper<ImgMessagesLog> {
     @Select("select count(o.id) from message_push_log l left join message_openid o on o.messageSid=l.sid  where o.openId=#{openid} and o.state=#{state}")
    int getAllByUserSid(@Param("openid") String openid,@Param("state")String state);
     IPage<ImgMessagesLogVo> selectPageVo(IPage<ImgMessagesLog> page, @Param(Constants.WRAPPER) Wrapper<ImgMessagesLog> qw);
-    @Select("select * from img_messages_log where sid =#{sid} order by messageTime desc limit 1")
+    @Select("select * from img_messages_log where riskSid =#{sid} order by messageTime desc limit 1")
     ImgMessagesLogVo getMessageBySid(@Param("sid") String sid);
+    @Select("select sid from img_messages_log  order by messageTime desc limit 1")
+    String getImgRiskByCode ();
 }

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/imgmessageslog/ImgMessagesLogService.java

@@ -56,8 +56,8 @@ public class ImgMessagesLogService extends MybatisBaseService<ImgMessagesLogMapp
     }
     public ResultBean getMessageBySid(String sid) {
         ResultBean rb=new ResultBean();
-        ImgMessagesLogVo vo= baseMapper.getMessageBySid(sid);
-        RiskAlarm riskAlarm=rmsMapper.getRiskByMessSid(vo.getRiskSid());
+        RiskAlarm riskAlarm=rmsMapper.getRiskByMessSid(sid);
+        ImgMessagesLogVo vo= baseMapper.getMessageBySid(riskAlarm.getSid());
         vo.setShName(riskAlarm.getPositionName());
         vo.setText(riskAlarm.getContent());
         return rb.success().setData(vo);

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/riskmessageslog/RiskMessagesLogMapper.java

@@ -20,6 +20,6 @@ public interface RiskMessagesLogMapper extends BaseMapper<RiskMessagesLog> {
     @Select("select count(o.id) from message_push_log l left join message_openid o on o.messageSid=l.sid  where o.openId=#{openid} and o.state=#{state}")
    int getAllByUserSid(@Param("openid") String openid,@Param("state")String state);
     IPage<RiskMessagesLogVo> selectPageVo(IPage<RiskMessagesLog> page, @Param(Constants.WRAPPER) Wrapper<RiskMessagesLog> qw);
-    @Select("select * from risk_messages_log where sid =#{sid} order by messageTime desc limit 1")
+    @Select("select * from risk_messages_log where riskSid =#{sid} order by messageTime desc limit 1")
     RiskMessagesLogVo getMessageBySid(@Param("sid") String sid);
 }

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/riskmessageslog/RiskMessagesLogService.java

@@ -56,8 +56,8 @@ public class RiskMessagesLogService extends MybatisBaseService<RiskMessagesLogMa
     }
     public ResultBean getMessageBySid(String sid) {
         ResultBean rb=new ResultBean();
-        RiskMessagesLogVo vo= baseMapper.getMessageBySid(sid);
-        RiskAlarm riskAlarm=rmsMapper.getRiskByMessSid(vo.getRiskSid());
+        RiskAlarm riskAlarm=rmsMapper.getRiskByMessSid(sid);
+        RiskMessagesLogVo vo= baseMapper.getMessageBySid(riskAlarm.getSid());
         vo.setShName(riskAlarm.getPositionName());
         vo.setText(riskAlarm.getContent());
         return rb.success().setData(vo);

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/wechat/WechatRest.java

@@ -14,10 +14,12 @@ import com.yxt.supervise.report.api.messagepushlog.MessagePushLogDto;
 import com.yxt.supervise.report.api.reportinventorydaygather.ReportInventoryDayGatherVo;
 import com.yxt.supervise.report.api.wechat.Template;
 import com.yxt.supervise.report.biz.csmcashreport.CsmCashReportMapper;
+import com.yxt.supervise.report.biz.imgmessageslog.ImgMessagesLogMapper;
 import com.yxt.supervise.report.biz.messagepushlog.MessagePushLogService;
 import com.yxt.supervise.report.biz.projectdaily.ProjectDaily;
 import com.yxt.supervise.report.biz.projectdaily.ProjectDailyService;
 import com.yxt.supervise.report.biz.reportinventory.ReportInventoryDayGatherMapper;
+import com.yxt.supervise.report.biz.riskmessageslog.RiskMessagesLogMapper;
 import com.yxt.supervise.report.biz.stock.ReportStockDay;
 import com.yxt.supervise.report.biz.stock.StockDayRest;
 import com.yxt.supervise.report.biz.util.WeixinCheckoutUtil;
@@ -94,6 +96,10 @@ public class WechatRest {
     WarehouseMapper warehouseMapper;
     @Autowired
     RmsMapper rmsMapper;
+    @Autowired
+    ImgMessagesLogMapper imgMessagesLogMapper;
+    @Autowired
+    RiskMessagesLogMapper riskMessagesLogMapper;
 
     @ApiOperation("token")
     @GetMapping(value = "token")
@@ -375,7 +381,7 @@ public class WechatRest {
     }
     @GetMapping("/shMessage")
     public void shMessage(@RequestParam("shSid") String shSid,@RequestParam("riskSid") String riskSid){
-        RiskAlarm riskAlarm=rmsMapper.getRiskByCode("030404");
+        //String messSid=riskMessagesLogMapper.getRiskByCode();
         RespMessReturn r=new RespMessReturn();
         List<UserProject> user= crmMapper.users(shSid);
         List<String> openIds=new ArrayList<>();
@@ -405,14 +411,14 @@ public class WechatRest {
         String name=warehouseMapper.getNameBySid(shSid);
         SimpleDateFormat ft = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
         // 公众号的模板id(也有相应的接口可以查询到)
-        sendVerificationCode(name,mobiles,"030404");
+        //sendVerificationCode(name,mobiles,"030404");
         System.out.println("推送中");
-        r= SuperviseWxMessSender.jkSend("赵丽晓",openIds,projectSid,riskSid,name,riskAlarm.getSid(),ft.format(new Date()));
+        r= SuperviseWxMessSender.jkSend("赵丽晓",openIds,projectSid,riskSid,name,riskSid,ft.format(new Date()));
         System.out.println(r);
     }
     @GetMapping("/shImgMessage")
     public void shImgMessage(@RequestParam("shSid") String shSid,@RequestParam("riskSid") String riskSid){
-        rmsMapper.getRiskByCode("030405");
+        //String messSid=imgMessagesLogMapper.getImgRiskByCode();
         RespMessReturn r=new RespMessReturn();
         List<UserProject> user= crmMapper.users(shSid);
         List<String> openIds=new ArrayList<>();
@@ -442,8 +448,8 @@ public class WechatRest {
         String name=warehouseMapper.getNameBySid(shSid);
         SimpleDateFormat ft = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
         // 公众号的模板id(也有相应的接口可以查询到)
-        sendVerificationCode(name,mobiles,"030405");
-        r= SuperviseWxMessSender.jkImgSend("赵丽晓",openIds,projectSid,riskSid,name,ft.format(new Date()));
+        //sendVerificationCode(name,mobiles,"030405");
+        r= SuperviseWxMessSender.jkImgSend("赵丽晓",openIds,projectSid,riskSid,name,riskSid,ft.format(new Date()));
         System.out.println(r);
     }
     public ResultBean sendVerificationCode(String shName, List<String> users,String type) {
@@ -477,6 +483,39 @@ public class WechatRest {
 //		String res = "1";
         return ResultBean.fireSuccess().setMsg("发送短信验证码成功");
     }
+    public ResultBean wwww(String shName, List<String> users,String type) {
+        String e="http://IP+Port/utf8/SingleCallByTts.aspx?CorpID=*&Pwd=*&Mobile=*&Content=*&TtsCode=*& ShowNumber=";
+        ResultBean rb = new ResultBean().fireFail();
+        Date date = new Date();
+        for (String mobile : users) {
+            String codeRedis = redisUtil.get(""+mobile);
+            if (com.yxt.common.base.utils.StringUtils.isNotEmpty(codeRedis)) {
+                //查看请求间隔,默认是一分钟,小于一分钟继续等待，超过一分钟发送短信
+                String sendTime = codeRedis.substring(4);
+                long diffSecond = (date.getTime() - Long.parseLong(sendTime)) / 1000;
+                if (diffSecond < 60) {
+                    return ResultBean.fireFail().setMsg("请等待一分钟后再次重试!");
+                }
+            }
+            String content="";
+            SimpleDateFormat ft = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+            if(type.equals("030404")){
+                content= "仓库异常提醒：" + shName + "仓库监控设备于" + ft.format(new Date()) + "发生异常，请及时处理。";
+            }else if(type.equals("030405")){
+                content = "仓库异常提醒：" + shName + "仓库货物于" + ft.format(new Date()) + "发生图片比对异常，请及时处理。";
+            }
+//		String res = "1";
+
+            String res = com.yxt.supervise.report.biz.util.MsgWs.SendWaitWorkMsg(mobile, content);
+            if (res.equals("1")) {
+                System.out.println("发送消息");
+                redisUtil.set(""+mobile,""+date.getTime(), APP_LOGIN_CODE_TIME_LIMIT);
+            }
+        }
+//		String res = "1";
+        return ResultBean.fireSuccess().setMsg("发送短信验证码成功");
+    }
+
     /**
      * 山海光伏库存推送
      * @param orderDate

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/rms/RmsMapper.java

@@ -16,8 +16,9 @@ import java.util.List;
 public interface RmsMapper extends BaseMapper<RiskAlarm> {
     @Select("select * from risk_alarm where sid =#{sid}")
     RiskAlarm getRiskByMessSid (@Param("sid")String sid );
-    @Select("select * from risk_alarm where indicatorCode=#{code} order by triggerTime desc limit 1")
-    RiskAlarm getRiskByCode (@Param("code")String code );
-
+    @Select("select * from risk_messages_log  order by messageTime desc limit 1")
+    RiskAlarm getRiskByCode ();
+    @Select("select * from img_messages_log  order by messageTime desc limit 1")
+    RiskAlarm getImgRiskByCode ();
 
 }

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/wx/SuperviseWxMessSender.java

@@ -75,7 +75,7 @@ public class SuperviseWxMessSender {
         String orderDate = reportTime.substring(0, 10);
 //        String pagepath = jgsjzl_pagepath.replace("ORDER_DATE", orderDate).replace("PROJECT_SID", projectSid);?
 //        String pagepath ="pages/index/DeviceException"+"?sid"+messSid;
-        String pagepath ="";
+        String pagepath ="pages/index/DeviceException"+"?sid="+messSid;
         HashMap<String, String> data = new HashMap<>();
         data.put("thing2", projectName);
         String thing2 = projectName +"监控设备异常";
@@ -109,10 +109,10 @@ public class SuperviseWxMessSender {
         });
         return respMessReturn;
     }
-    public static RespMessReturn jkImgSend(String sender, List<String> tousers, String projectSid,String riskSid, String projectName, String reportTime) {
+    public static RespMessReturn jkImgSend(String sender, List<String> tousers, String projectSid,String riskSid, String projectName, String messSid,String reportTime) {
         RespMessReturn respMessReturn=new RespMessReturn();
         String orderDate = reportTime.substring(0, 10);
-        String pagepath = "";
+        String pagepath ="pages/index/DeviceException"+"?sid="+messSid;
 //        String pagepath = "";
         HashMap<String, String> data = new HashMap<>();
         data.put("thing2", projectName);