From 5f0700ec47cdd150cc146cb96b365eea83578a00 Mon Sep 17 00:00:00 2001 From: wangpengfei <1928057482@qq.com> Date: Mon, 9 Oct 2023 17:06:15 +0800 Subject: [PATCH] 10/9 --- .../report/biz/wechat/WechatRest.java | 131 +++++++----------- 1 file changed, 48 insertions(+), 83 deletions(-) diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/wechat/WechatRest.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/wechat/WechatRest.java index ae40ad89..d7bd2560 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/wechat/WechatRest.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/wechat/WechatRest.java @@ -294,7 +294,8 @@ public class WechatRest { @PostMapping("/SendMessage/{projectSid}/{orderDate}") public void sendMessage(@PathVariable("projectSid") String projectSid,@PathVariable("orderDate") String orderDate){ RespMessReturn r=new RespMessReturn(); - List user= crmMapper.suerList(projectSid); +// List user= crmMapper.suerList(projectSid); + List user= getUser(projectSid,"1"); List openIds=new ArrayList<>(); for(String u:user){ String sysUser=systemMapper.getOpenId(u); @@ -321,35 +322,19 @@ public class WechatRest { public void shMessage(@RequestParam("shSid") String shSid,@RequestParam("riskSid") String riskSid){ //String messSid=riskMessagesLogMapper.getRiskByCode(); RespMessReturn r=new RespMessReturn(); - List user= crmMapper.users(shSid); + String projectSid=crmMapper.ProjectSidByshSid(shSid); + List user= getUser(projectSid,"2"); List openIds=new ArrayList<>(); List mobiles=new ArrayList<>(); - openIds.add("oGdho60xVtWEXUks7nYEAn0tGlDE"); - mobiles.add("15932270269"); - openIds.add("oGdho66394A-4-NyumcJ1MEaT8Lo"); - mobiles.add("18603312020"); - openIds.add("oGdho615_xBMYYwftEjjBlC6p2uE"); - mobiles.add("13513219196"); - openIds.add("oGdho6yYB47f52HVk2NqirrFbRRk"); - mobiles.add("13513211777"); - openIds.add("oGdho668Hew45t0xfBJC84TNGVzI"); - mobiles.add("13623307393"); - openIds.add("oGdho68CArVhC_-7ELkG-jX21ruk"); - mobiles.add("13131170271"); - openIds.add("oGdho69VxJil_NRxv9StYVpQg58U"); - mobiles.add("13333113292"); - openIds.add("oGdho66Wy-Or1UeqoNHU1YL5yAEM"); - mobiles.add("19933133338"); -// for(UserProject u:user){ -// SysUser sysUser=systemMapper.getAppletOpenidByUsersid(u.getUserSid()); -// if(null!=sysUser) { -// if (com.yxt.common.base.utils.StringUtils.isNotNull(sysUser.getAppletOpenid())) { -// openIds.add(sysUser.getAppletOpenid()); -// mobiles.add(sysUser.getMobile()); -// } -// } -// } - String projectSid=crmMapper.ProjectSidByshSid(shSid); + for(String u:user){ + SysUser sysUser=systemMapper.getAppletOpenidByUsersid(u); + if(null!=sysUser) { + if (com.yxt.common.base.utils.StringUtils.isNotNull(sysUser.getOpenId())) { + openIds.add(sysUser.getOpenId()); + mobiles.add(sysUser.getMobile()); + } + } + } String shName=warehouseMapper.getNameBySid(shSid); SimpleDateFormat ft = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); RiskAlarm riskAlarm=rmsMapper.getRiskByMessSid(riskSid); @@ -370,35 +355,20 @@ public class WechatRest { public void secureMessage(@RequestParam("shSid") String shSid,@RequestParam("riskSid") String riskSid){ //String messSid=riskMessagesLogMapper.getRiskByCode(); RespMessReturn r=new RespMessReturn(); - List user= crmMapper.users(shSid); +// List user= crmMapper.users(shSid); + String projectSid=crmMapper.ProjectSidByshSid(shSid); + List user= getUser(projectSid,"3"); List openIds=new ArrayList<>(); List mobiles=new ArrayList<>(); - openIds.add("oGdho60xVtWEXUks7nYEAn0tGlDE"); - mobiles.add("15932270269"); - openIds.add("oGdho66394A-4-NyumcJ1MEaT8Lo"); - mobiles.add("18603312020"); - openIds.add("oGdho615_xBMYYwftEjjBlC6p2uE"); - mobiles.add("13513219196"); - openIds.add("oGdho6yYB47f52HVk2NqirrFbRRk"); - mobiles.add("13513211777"); - openIds.add("oGdho668Hew45t0xfBJC84TNGVzI"); - mobiles.add("13623307393"); - openIds.add("oGdho68CArVhC_-7ELkG-jX21ruk"); - mobiles.add("13131170271"); - openIds.add("oGdho69VxJil_NRxv9StYVpQg58U"); - mobiles.add("13333113292"); - openIds.add("oGdho66Wy-Or1UeqoNHU1YL5yAEM"); - mobiles.add("19933133338"); -// for(UserProject u:user){ -// SysUser sysUser=systemMapper.getAppletOpenidByUsersid(u.getUserSid()); -// if(null!=sysUser) { -// if (com.yxt.common.base.utils.StringUtils.isNotNull(sysUser.getAppletOpenid())) { -// openIds.add(sysUser.getAppletOpenid()); -// mobiles.add(sysUser.getMobile()); -// } -// } -// } - String projectSid=crmMapper.ProjectSidByshSid(shSid); + for(String u:user){ + SysUser sysUser=systemMapper.getAppletOpenidByUsersid(u); + if(null!=sysUser) { + if (com.yxt.common.base.utils.StringUtils.isNotNull(sysUser.getOpenId())) { + openIds.add(sysUser.getOpenId()); + mobiles.add(sysUser.getMobile()); + } + } + } String shName=warehouseMapper.getNameBySid(shSid); SimpleDateFormat ft = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); RiskAlarm riskAlarm=rmsMapper.getRiskByMessSid(riskSid); @@ -445,35 +415,19 @@ public class WechatRest { public void shImgMessage(@RequestParam("shSid") String shSid,@RequestParam("riskSid") String riskSid){ //String messSid=imgMessagesLogMapper.getImgRiskByCode(); RespMessReturn r=new RespMessReturn(); - List user= crmMapper.users(shSid); + String projectSid=crmMapper.ProjectSidByshSid(shSid); + List user= getUser(projectSid,"4"); List openIds=new ArrayList<>(); List mobiles=new ArrayList<>(); - openIds.add("oGdho60xVtWEXUks7nYEAn0tGlDE"); - mobiles.add("15932270269"); - openIds.add("oGdho66394A-4-NyumcJ1MEaT8Lo"); - mobiles.add("18603312020"); - openIds.add("oGdho615_xBMYYwftEjjBlC6p2uE"); - mobiles.add("13513219196"); - openIds.add("oGdho6yYB47f52HVk2NqirrFbRRk"); - mobiles.add("13513211777"); - openIds.add("oGdho668Hew45t0xfBJC84TNGVzI"); - mobiles.add("13623307393"); - openIds.add("oGdho68CArVhC_-7ELkG-jX21ruk"); - mobiles.add("13131170271"); - openIds.add("oGdho69VxJil_NRxv9StYVpQg58U"); - mobiles.add("13333113292"); - openIds.add("oGdho66Wy-Or1UeqoNHU1YL5yAEM"); - mobiles.add("19933133338"); -// for(UserProject u:user){ -// SysUser sysUser=systemMapper.getAppletOpenidByUsersid(u.getUserSid()); -// if(null!=sysUser) { -// if (com.yxt.common.base.utils.StringUtils.isNotNull(sysUser.getAppletOpenid())) { -// openIds.add(sysUser.getAppletOpenid()); -// mobiles.add(sysUser.getMobile()); -// } -// } -// } - String projectSid=crmMapper.ProjectSidByshSid(shSid); + for(String u:user){ + SysUser sysUser=systemMapper.getAppletOpenidByUsersid(u); + if(null!=sysUser) { + if (com.yxt.common.base.utils.StringUtils.isNotNull(sysUser.getOpenId())) { + openIds.add(sysUser.getOpenId()); + mobiles.add(sysUser.getMobile()); + } + } + } String name=warehouseMapper.getNameBySid(shSid); SimpleDateFormat ft = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); // 公众号的模板id(也有相应的接口可以查询到) @@ -485,7 +439,7 @@ public class WechatRest { public void sysErrMessage(@RequestParam("shSid")String shSid,@RequestParam("riskSid") String riskSid){ //String messSid=imgMessagesLogMapper.getImgRiskByCode(); RespMessReturn r=new RespMessReturn(); - //List user= crmMapper.users(shSid); +// List user= getUser(shSid); List openIds=new ArrayList<>(); List mobiles=new ArrayList<>(); openIds.add("oGdho60xVtWEXUks7nYEAn0tGlDE"); @@ -521,6 +475,17 @@ public class WechatRest { r= SuperviseWxMessSender.sysErrSend(openIds,riskSid,name,shSid,riskSid,ft.format(new Date())); System.out.println(r); } + public List getUser(String projectSid,String templateSid){ + Listlist=crmMapper.getAllByProjectSid(projectSid); + List users=new ArrayList<>(); + for (UserProject userProject:list){ + int count=crmMapper.countByUserProjectSid(userProject.getSid(),templateSid); + if(count>0){ + users.add(userProject.getUserSid()); + } + } + return users; + } public ResultBean sendVerificationCode(String shName, List users,String type) { ResultBean rb = new ResultBean().fireFail(); Date date = new Date();