Prechádzať zdrojové kódy

1.微信通知未考勤人改为调用页面。

zhengqiang 5 rokov pred
rodič
commit
28d9ac632b

+ 8 - 3
web/src/main/java/com/jpsoft/smart/modules/mobile/controller/PersonDeviceFilterLogController.java

@@ -171,13 +171,14 @@ public class PersonDeviceFilterLogController {
             @ApiImplicitParam(name="token",value = "令牌",required = true,paramType = "form"),
             @ApiImplicitParam(name="subject",value = "目标(不传)",paramType = "form")
     })
-    public MessageResult<List> queryUnmeasureGroupList(
+    public MessageResult<Map> queryUnmeasureGroupList(
             String companyId,
             @DateTimeFormat(pattern = "yyyy-MM-dd") Date queryDate,
             String alarmConfigId,
             @RequestAttribute String subject,
             String token){
-        MessageResult<List> msgResult = new MessageResult<>();
+        MessageResult<Map> msgResult = new MessageResult<>();
+        Map<String,Object> dataMap = new HashMap<>();
 
         try{
             PersonInfo personInfo = personInfoService.get(Long.valueOf(subject));
@@ -188,6 +189,8 @@ public class PersonDeviceFilterLogController {
 
             CompanyInfo companyInfo = companyInfoService.get(companyId);
 
+            dataMap.put("companyName",companyInfo.getName());
+
             String[] arr = companyInfo.getCode().split(",");
 
             List<AlarmConfig> configList = null;
@@ -227,7 +230,9 @@ public class PersonDeviceFilterLogController {
                 }
             }
 
-            msgResult.setData(mapList);
+            dataMap.put("list",mapList);
+
+            msgResult.setData(dataMap);
             msgResult.setResult(true);
         }
         catch(Exception ex){

+ 4 - 1
web/src/main/resources/application-production.yml

@@ -58,4 +58,7 @@ wx:
     tokenUrl: "https://api.weixin.qq.com/cgi-bin/token"
     refreshOAuth2TokenUrl: "https://api.weixin.qq.com/sns/oauth2/refresh_token"
     createQrCodeUrl: "https://api.weixin.qq.com/cgi-bin/qrcode/create"
-    showQrCodeUrl: "https://mp.weixin.qq.com/cgi-bin/showqrcode"
+    showQrCodeUrl: "https://mp.weixin.qq.com/cgi-bin/showqrcode"
+
+mobile:
+  unMeasureUrl: http://wisdomhousewechat.sudaonline.net/prevention/adundetect_wx_message.html