diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportinventory/ReportInventoryService.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportinventory/ReportInventoryService.java index c5d0165b..0864cf5a 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportinventory/ReportInventoryService.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportinventory/ReportInventoryService.java @@ -51,7 +51,7 @@ public class ReportInventoryService { } public void sendMessage(String orderDate) throws Exception { - wechatRest.inventorySendMessage(orderDate); + //wechatRest.inventorySendMessage(orderDate); } public String buildsExcelById(String orderDate) { 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 4e01eb4f..ae40ad89 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 @@ -4,6 +4,7 @@ import cn.hutool.Hutool; import cn.hutool.core.thread.ThreadUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.yxt.common.base.config.RedisUtil; import com.yxt.common.core.result.ResultBean; import com.yxt.supervise.report.aes.AesException; @@ -24,6 +25,7 @@ import com.yxt.supervise.report.biz.stock.ReportStockDay; import com.yxt.supervise.report.biz.stock.StockDayRest; import com.yxt.supervise.report.biz.util.WeixinCheckoutUtil; import com.yxt.supervise.report.ds.crm.CrmMapper; +import com.yxt.supervise.report.ds.crm.ProjectInfo; import com.yxt.supervise.report.ds.crm.UserProject; import com.yxt.supervise.report.ds.rms.Device; import com.yxt.supervise.report.ds.rms.RiskAlarm; @@ -295,16 +297,18 @@ public class WechatRest { List user= crmMapper.suerList(projectSid); List openIds=new ArrayList<>(); for(String u:user){ - SysUser sysUser=systemMapper.getAppletOpenidByUsersid(u); + String sysUser=systemMapper.getOpenId(u); if(null!=sysUser) { - if (com.yxt.common.base.utils.StringUtils.isNotNull(sysUser.getAppletOpenid())) { - openIds.add(sysUser.getAppletOpenid()); + if (com.yxt.common.base.utils.StringUtils.isNotNull(sysUser)) { + openIds.add(sysUser); } } } ProjectDaily projectDaily=projectDailyService.fetchByProjectAndDay(projectSid,orderDate); +// ProjectInfo projectInfo =crmMapper.getProjectNameBySid(projectSid); + ProjectInfo projectInfo=crmMapper.selectOne(new QueryWrapper().eq("sid",projectSid)); // 公众号的模板id(也有相应的接口可以查询到) - r= SuperviseWxMessSender.jgsjzlSend("赵丽晓",openIds,projectSid,projectDaily.getProjectName(),projectDaily.getReportTime()); + r= SuperviseWxMessSender.jgsjzlSend(projectInfo.getRegulatoryLeader(),openIds,projectSid,projectDaily.getProjectName(),projectDaily.getReportTime()); System.out.println(r); } @@ -320,21 +324,21 @@ public class WechatRest { List user= crmMapper.users(shSid); List openIds=new ArrayList<>(); List mobiles=new ArrayList<>(); - openIds.add("oA-GE69cBwiWG5Tx5R3vvy60o8qk"); + openIds.add("oGdho60xVtWEXUks7nYEAn0tGlDE"); mobiles.add("15932270269"); - openIds.add("oA-GE68JFODQucAXkJQYHPoFOAgs"); + openIds.add("oGdho66394A-4-NyumcJ1MEaT8Lo"); mobiles.add("18603312020"); - openIds.add("oA-GE68gus7lbb-oy4iqCF0ZhNgo"); + openIds.add("oGdho615_xBMYYwftEjjBlC6p2uE"); mobiles.add("13513219196"); - openIds.add("oA-GE67j581HgEsim_waItx2KOzE"); + openIds.add("oGdho6yYB47f52HVk2NqirrFbRRk"); mobiles.add("13513211777"); - openIds.add("oA-GE67P_1xD1uKBcexK3wWtFO5Y"); + openIds.add("oGdho668Hew45t0xfBJC84TNGVzI"); mobiles.add("13623307393"); - openIds.add("oA-GE6zKB_5wQsVX6USlRQYV39vE"); + openIds.add("oGdho68CArVhC_-7ELkG-jX21ruk"); mobiles.add("13131170271"); - openIds.add("oA-GE668qWFcn4O-HpeiPe1FOecE"); + openIds.add("oGdho69VxJil_NRxv9StYVpQg58U"); mobiles.add("13333113292"); - openIds.add("oA-GE65ExG9RVkqPhOc4e2ctdh0c"); + openIds.add("oGdho66Wy-Or1UeqoNHU1YL5yAEM"); mobiles.add("19933133338"); // for(UserProject u:user){ // SysUser sysUser=systemMapper.getAppletOpenidByUsersid(u.getUserSid()); @@ -369,21 +373,21 @@ public class WechatRest { List user= crmMapper.users(shSid); List openIds=new ArrayList<>(); List mobiles=new ArrayList<>(); - openIds.add("oA-GE69cBwiWG5Tx5R3vvy60o8qk"); + openIds.add("oGdho60xVtWEXUks7nYEAn0tGlDE"); mobiles.add("15932270269"); - openIds.add("oA-GE68JFODQucAXkJQYHPoFOAgs"); + openIds.add("oGdho66394A-4-NyumcJ1MEaT8Lo"); mobiles.add("18603312020"); - openIds.add("oA-GE68gus7lbb-oy4iqCF0ZhNgo"); + openIds.add("oGdho615_xBMYYwftEjjBlC6p2uE"); mobiles.add("13513219196"); - openIds.add("oA-GE67j581HgEsim_waItx2KOzE"); + openIds.add("oGdho6yYB47f52HVk2NqirrFbRRk"); mobiles.add("13513211777"); - openIds.add("oA-GE67P_1xD1uKBcexK3wWtFO5Y"); + openIds.add("oGdho668Hew45t0xfBJC84TNGVzI"); mobiles.add("13623307393"); - openIds.add("oA-GE6zKB_5wQsVX6USlRQYV39vE"); + openIds.add("oGdho68CArVhC_-7ELkG-jX21ruk"); mobiles.add("13131170271"); - openIds.add("oA-GE668qWFcn4O-HpeiPe1FOecE"); + openIds.add("oGdho69VxJil_NRxv9StYVpQg58U"); mobiles.add("13333113292"); - openIds.add("oA-GE65ExG9RVkqPhOc4e2ctdh0c"); + openIds.add("oGdho66Wy-Or1UeqoNHU1YL5yAEM"); mobiles.add("19933133338"); // for(UserProject u:user){ // SysUser sysUser=systemMapper.getAppletOpenidByUsersid(u.getUserSid()); @@ -444,21 +448,21 @@ public class WechatRest { List user= crmMapper.users(shSid); List openIds=new ArrayList<>(); List mobiles=new ArrayList<>(); - openIds.add("oA-GE69cBwiWG5Tx5R3vvy60o8qk"); + openIds.add("oGdho60xVtWEXUks7nYEAn0tGlDE"); mobiles.add("15932270269"); - openIds.add("oA-GE68JFODQucAXkJQYHPoFOAgs"); + openIds.add("oGdho66394A-4-NyumcJ1MEaT8Lo"); mobiles.add("18603312020"); - openIds.add("oA-GE68gus7lbb-oy4iqCF0ZhNgo"); + openIds.add("oGdho615_xBMYYwftEjjBlC6p2uE"); mobiles.add("13513219196"); - openIds.add("oA-GE67j581HgEsim_waItx2KOzE"); + openIds.add("oGdho6yYB47f52HVk2NqirrFbRRk"); mobiles.add("13513211777"); - openIds.add("oA-GE67P_1xD1uKBcexK3wWtFO5Y"); + openIds.add("oGdho668Hew45t0xfBJC84TNGVzI"); mobiles.add("13623307393"); - openIds.add("oA-GE6zKB_5wQsVX6USlRQYV39vE"); + openIds.add("oGdho68CArVhC_-7ELkG-jX21ruk"); mobiles.add("13131170271"); - openIds.add("oA-GE668qWFcn4O-HpeiPe1FOecE"); + openIds.add("oGdho69VxJil_NRxv9StYVpQg58U"); mobiles.add("13333113292"); - openIds.add("oA-GE65ExG9RVkqPhOc4e2ctdh0c"); + openIds.add("oGdho66Wy-Or1UeqoNHU1YL5yAEM"); mobiles.add("19933133338"); // for(UserProject u:user){ // SysUser sysUser=systemMapper.getAppletOpenidByUsersid(u.getUserSid()); @@ -484,21 +488,21 @@ public class WechatRest { //List user= crmMapper.users(shSid); List openIds=new ArrayList<>(); List mobiles=new ArrayList<>(); - openIds.add("oA-GE69cBwiWG5Tx5R3vvy60o8qk"); + openIds.add("oGdho60xVtWEXUks7nYEAn0tGlDE"); mobiles.add("15932270269"); - openIds.add("oA-GE68JFODQucAXkJQYHPoFOAgs"); + openIds.add("oGdho66394A-4-NyumcJ1MEaT8Lo"); mobiles.add("18603312020"); - openIds.add("oA-GE68gus7lbb-oy4iqCF0ZhNgo"); + openIds.add("oGdho615_xBMYYwftEjjBlC6p2uE"); mobiles.add("13513219196"); - openIds.add("oA-GE67j581HgEsim_waItx2KOzE"); + openIds.add("oGdho6yYB47f52HVk2NqirrFbRRk"); mobiles.add("13513211777"); - openIds.add("oA-GE67P_1xD1uKBcexK3wWtFO5Y"); + openIds.add("oGdho668Hew45t0xfBJC84TNGVzI"); mobiles.add("13623307393"); - openIds.add("oA-GE6zKB_5wQsVX6USlRQYV39vE"); + openIds.add("oGdho68CArVhC_-7ELkG-jX21ruk"); mobiles.add("13131170271"); - openIds.add("oA-GE668qWFcn4O-HpeiPe1FOecE"); + openIds.add("oGdho69VxJil_NRxv9StYVpQg58U"); mobiles.add("13333113292"); - openIds.add("oA-GE65ExG9RVkqPhOc4e2ctdh0c"); + openIds.add("oGdho66Wy-Or1UeqoNHU1YL5yAEM"); mobiles.add("19933133338"); // for(UserProject u:user){ // SysUser sysUser=systemMapper.getAppletOpenidByUsersid(u.getUserSid()); diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/CrmMapper.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/CrmMapper.java index 0d8be216..6c287a32 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/CrmMapper.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/CrmMapper.java @@ -28,4 +28,6 @@ public interface CrmMapper extends BaseMapper { int getCountByUserSidAndProjectSid(@Param("projectSid") String projectSid,@Param("userSid")String userSid); @Select("select * from storehouse_project where projectSid = #{projectSid} ") List listStoreHouseByProjectSid(@Param("projectSid") String projectSid); + @Select("select * from project_information where sid = #{sid}") + ProjectInfo getProjectNameBySid(@Param("sid") String sid); } diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/ProjectInfo.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/ProjectInfo.java index f499dea9..deaea714 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/ProjectInfo.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/ProjectInfo.java @@ -8,4 +8,5 @@ import lombok.Data; public class ProjectInfo { private String sid; private String entryName; + private String regulatoryLeader; } diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/system/systemMapper.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/system/systemMapper.java index 24d812c0..7c4287c6 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/system/systemMapper.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/system/systemMapper.java @@ -14,7 +14,7 @@ import java.util.List; @Mapper public interface systemMapper extends BaseMapper { - @Select("select openid from sys_user where sid=#{userSid}") + @Select("select openid from sys_user where sid=#{userSid} and appletOpenid is not null") String getOpenId(@Param("userSid") String userSid); @Select("select openid from sys_user where sid=#{userSid} and subscriptionStatus='1'") String getOpenIdByStatus(@Param("userSid") String userSid);