10/11

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

@@ -17,6 +17,7 @@ import com.yxt.supervise.report.api.messageopenid.MessageOpenid;
 import com.yxt.supervise.report.biz.imgmessageuser.ImgMessageUserService;
 import com.yxt.supervise.report.biz.messageopenid.MessageOpenidService;
 import com.yxt.supervise.report.biz.projectdaily.ProjectDailyRest;
+import com.yxt.supervise.report.biz.projectdaily.ProjectDailyService;
 import com.yxt.supervise.report.ds.rms.RiskAlarm;
 import com.yxt.supervise.report.ds.rms.RmsMapper;
 import com.yxt.supervise.report.ds.system.SysUser;
@@ -42,7 +43,7 @@ public class ImgMessagesLogService extends MybatisBaseService<ImgMessagesLogMapp
     @Autowired
     RmsMapper rmsMapper;
     @Autowired
-    ProjectDailyRest projectDailyRest;
+    ProjectDailyService projectDailyService;
     @Autowired
     ImgMessageUserService imgMessageUserService;
     @Autowired
@@ -82,7 +83,7 @@ public class ImgMessagesLogService extends MybatisBaseService<ImgMessagesLogMapp
 //        list.add(linkers);
 //        list.add(linkers1);
         vo.setLinkers(list);
-        ResultBean<JSONObject> rbJsonObject = projectDailyRest.wxLogin(wxCode, APP_ID, SECRET);
+        ResultBean<JSONObject> rbJsonObject = projectDailyService.wxLogin(wxCode, APP_ID, SECRET);
         JSONObject jsonObject = rbJsonObject.getData();
         String openid = jsonObject.get("openid").toString();
         if(null!=vo){

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/messagetype/MessageTypeService.java

@@ -34,6 +34,7 @@ import com.yxt.supervise.report.biz.imgmessageuser.ImgMessageUserService;
 import com.yxt.supervise.report.biz.messageopenid.MessageOpenidService;
 import com.yxt.supervise.report.biz.messagepushlog.MessagePushLogMapper;
 import com.yxt.supervise.report.biz.projectdaily.ProjectDailyRest;
+import com.yxt.supervise.report.biz.projectdaily.ProjectDailyService;
 import com.yxt.supervise.report.biz.riskmessageslog.RiskMessagesLogMapper;
 import com.yxt.supervise.report.biz.riskmessageslog.RiskMessagesLogService;
 import com.yxt.supervise.report.biz.riskmessageuser.RiskMessageUserService;
@@ -63,7 +64,7 @@ public class MessageTypeService extends MybatisBaseService<MessageTypeMapper, Me
     @Autowired
     com.yxt.supervise.report.ds.system.systemMapper systemMapper;
     @Autowired
-    ProjectDailyRest projectDailyRest;
+    ProjectDailyService projectDailyService;
     @Autowired
     RmsMapper rmsMapper;
 
@@ -85,7 +86,7 @@ public class MessageTypeService extends MybatisBaseService<MessageTypeMapper, Me
             SysUser sysUser = systemMapper.getAppletOpenidByUsersid(query.getUserSid());
             openId=sysUser.getAppletOpenid();
         } else if (org.apache.commons.lang3.StringUtils.isNoneBlank(query.getWxCode())) {
-            ResultBean<JSONObject> rbJsonObject = projectDailyRest.wxLogin(query.getWxCode(), "APP_ID", "SECRET");
+            ResultBean<JSONObject> rbJsonObject = projectDailyService.wxLogin(query.getWxCode(), "APP_ID", "SECRET");
             JSONObject jsonObject = rbJsonObject.getData();
             openId = jsonObject.get("openid").toString();
         }

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyRest.java

@@ -31,9 +31,6 @@ import java.util.List;
 @RestController("com.yxt.supervise.report.biz.projectdaily.ProjectDailyRest")
 @RequestMapping("/projectdaily")
 public class ProjectDailyRest {
-    String APP_ID = "wx05604ce2a8bede05";
-    String SECRET = "3d36e8a61212cf773a2fa4e6c9a83334";
-    private static final String WX_URL_LOGIN = "https://api.weixin.qq.com/sns/jscode2session?appid=APPID&secret=SECRET&js_code=JSCODE&grant_type=authorization_code ";
 
     @Autowired
     private FileUploadComponent fileUploadComponent;
@@ -102,7 +99,7 @@ public class ProjectDailyRest {
                 }
             }
         } else if (StringUtils.isNoneBlank(ProjectDailys.getWxCode())) {
-            ResultBean<JSONObject> rbJsonObject = wxLogin(ProjectDailys.getWxCode(), APP_ID, SECRET);
+            ResultBean<JSONObject> rbJsonObject = projectDailyService.wxLogin(ProjectDailys.getWxCode(), "", "");
             JSONObject jsonObject = rbJsonObject.getData();
             String openid = jsonObject.get("openid").toString();
             String userSid = systemMapper.getUserSidByOpenid(openid);
@@ -129,7 +126,7 @@ public class ProjectDailyRest {
         return rb.success().setData(pv);
     }
     public boolean changState(String wxCode,String sid){
-        ResultBean<JSONObject> rbJsonObject = wxLogin(wxCode, APP_ID, SECRET);
+        ResultBean<JSONObject> rbJsonObject = projectDailyService.wxLogin(wxCode,"","");
         JSONObject jsonObject = rbJsonObject.getData();
         String openid = jsonObject.get("openid").toString();
         //String userSid = systemMapper.getUserSidByOpenid(openid);
@@ -162,13 +159,4 @@ public class ProjectDailyRest {
         return rb.success().setData(projectDailyVoPagerVo);
     }
 
-    public ResultBean<JSONObject> wxLogin(String jsCode, String appid, String secret) {
-        ResultBean rb = new ResultBean();
-        String url = WX_URL_LOGIN.replace("APPID", APP_ID).replace("SECRET", SECRET).replace("JSCODE", jsCode).replace("authorization_code", "authorization_code");
-        RestTemplate restTemplate = new RestTemplate();
-        ResponseEntity<String> forEntity = restTemplate.getForEntity(url, String.class);
-        JSONObject jsonObject = JSONObject.parseObject(forEntity.getBody());
-        System.out.println(jsonObject);
-        return rb.success().setData(jsonObject);
-    }
 }

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyService.java

@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateUtil;
 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.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -14,13 +15,19 @@ import com.yxt.common.core.vo.PagerVo;
 import com.yxt.supervise.report.biz.wechat.WechatRest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
+import org.springframework.web.client.RestTemplate;
 
 import java.util.Date;
 import java.util.List;
 
 @Service
 public class ProjectDailyService extends ServiceImpl<ProjectDailyMapper, ProjectDaily> {
+    String APP_ID = "wx05604ce2a8bede05";
+    String SECRET = "3d36e8a61212cf773a2fa4e6c9a83334";
+    private static final String WX_URL_LOGIN = "https://api.weixin.qq.com/sns/jscode2session?appid=APPID&secret=SECRET&js_code=JSCODE&grant_type=authorization_code ";
+
 
     @Value("${image.upload.path}")
     private String uploadPath;
@@ -121,4 +128,13 @@ public class ProjectDailyService extends ServiceImpl<ProjectDailyMapper, Project
             }
         });
     }
+    public ResultBean<JSONObject> wxLogin(String jsCode, String appid, String secret) {
+        ResultBean rb = new ResultBean();
+        String url = WX_URL_LOGIN.replace("APPID", APP_ID).replace("SECRET", SECRET).replace("JSCODE", jsCode).replace("authorization_code", "authorization_code");
+        RestTemplate restTemplate = new RestTemplate();
+        ResponseEntity<String> forEntity = restTemplate.getForEntity(url, String.class);
+        JSONObject jsonObject = JSONObject.parseObject(forEntity.getBody());
+        System.out.println(jsonObject);
+        return rb.success().setData(jsonObject);
+    }
 }

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportinventory/ReportInventoryService.java

@@ -32,8 +32,6 @@ public class ReportInventoryService {
     private ReportInventoryDayStoreService reportInventoryDayStoreService;
     @Autowired
     private ReportInventoryDayTobaccoStoreService reportInventoryDayTobaccoStoreService;
-    @Autowired
-    private WechatRest wechatRest;
 
 
     public void buildInventoryReportByDay(String orderDate) {

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

@@ -18,6 +18,7 @@ import com.yxt.supervise.report.api.riskmessageslog.*;
 import com.yxt.supervise.report.api.riskmessageuser.RiskMessageUser;
 import com.yxt.supervise.report.biz.messageopenid.MessageOpenidService;
 import com.yxt.supervise.report.biz.projectdaily.ProjectDailyRest;
+import com.yxt.supervise.report.biz.projectdaily.ProjectDailyService;
 import com.yxt.supervise.report.biz.riskmessageuser.RiskMessageUserService;
 import com.yxt.supervise.report.ds.rms.RiskAlarm;
 import com.yxt.supervise.report.ds.rms.RmsMapper;
@@ -43,7 +44,7 @@ public class RiskMessagesLogService extends MybatisBaseService<RiskMessagesLogMa
     @Autowired
     RmsMapper rmsMapper;
     @Autowired
-    ProjectDailyRest projectDailyRest;
+    ProjectDailyService projectDailyService;
     @Autowired
     RiskMessageUserService riskMessageUserService;
     @Autowired
@@ -82,7 +83,7 @@ public class RiskMessagesLogService extends MybatisBaseService<RiskMessagesLogMa
 ////        list.add(linkers);
 ////        list.add(linkers1);
         vo.setLinkers(list);
-        ResultBean<JSONObject> rbJsonObject = projectDailyRest.wxLogin(wxCode, APP_ID, SECRET);
+        ResultBean<JSONObject> rbJsonObject = projectDailyService.wxLogin(wxCode, APP_ID, SECRET);
         JSONObject jsonObject = rbJsonObject.getData();
         String openid = jsonObject.get("openid").toString();
         if(null!=vo){

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/systemriskmessageslog/SystemRiskMessagesLogService.java

@@ -19,6 +19,7 @@ import com.yxt.supervise.report.api.systemriskmessageslog.SystemRiskMessagesLogV
 import com.yxt.supervise.report.api.systemriskmessageuser.SystemRiskMessageUser;
 import com.yxt.supervise.report.biz.messageopenid.MessageOpenidService;
 import com.yxt.supervise.report.biz.projectdaily.ProjectDailyRest;
+import com.yxt.supervise.report.biz.projectdaily.ProjectDailyService;
 import com.yxt.supervise.report.biz.riskmessageuser.RiskMessageUserService;
 import com.yxt.supervise.report.biz.systemriskmessageuser.SystemRiskMessageUserService;
 import com.yxt.supervise.report.ds.rms.RiskAlarm;
@@ -44,7 +45,7 @@ public class SystemRiskMessagesLogService extends MybatisBaseService<SystemRiskM
     @Autowired
     RmsMapper rmsMapper;
     @Autowired
-    ProjectDailyRest projectDailyRest;
+    ProjectDailyService projectDailyService;
     @Autowired
     SystemRiskMessageUserService systemRiskMessageUserService;
     public ResultBean save(SystemRiskMessagesLogDto dto) {
@@ -71,7 +72,7 @@ public class SystemRiskMessagesLogService extends MybatisBaseService<SystemRiskM
         SystemRiskMessagesLogVo vo= baseMapper.getMessageBySid(riskAlarm.getSid());
         vo.setShName(riskAlarm.getPositionName());
         vo.setText(riskAlarm.getContent());
-        ResultBean<JSONObject> rbJsonObject = projectDailyRest.wxLogin(wxCode, APP_ID, SECRET);
+        ResultBean<JSONObject> rbJsonObject = projectDailyService.wxLogin(wxCode, APP_ID, SECRET);
         JSONObject jsonObject = rbJsonObject.getData();
         String openid = jsonObject.get("openid").toString();
         if(null!=vo){