xiugai

whepi-ui/templates/yeweihui/home.ftl

@@ -94,14 +94,14 @@
 
                 console.log("uptownId:"+ $('#uptownId').val());
                 if ($('#uptownId').val() == '1238790987234') {
-                    $("#exportRiBao").attr('href', "/whepi/lun/exportRiBao?userId=" + $('#userId').val() + "&date=" + reportDate);
+                    $("#exportRiBao").attr('href', "/whepi/lun/exportRiBao?uptownId=" + $('#uptownId').val() + "&date=" + reportDate);
                     $("#doorplateMsg").attr("style", "display: none");
                 } else {
-                    $("#exportRiBao").attr('href', "/whepi/yeweihui/exportRiBao?userId=" + $('#userId').val() + "&date=" + reportDate);
+                    $("#exportRiBao").attr('href', "/whepi/yeweihui/exportRiBao?uptownId=" + $('#uptownId').val() + "&date=" + reportDate);
                     $("#doorplateMsg").attr("style", "");
                 }
                 // $("#doorplateMsg").attr("style", "");
-                $("#exportRiBaoLink").val(window.location.hostname + "/whepi/yeweihui/exportRiBao?userId=" + $('#userId').val() + "&date=" + reportDate);
+                $("#exportRiBaoLink").val(window.location.hostname + "/whepi/yeweihui/exportRiBao?uptownId=" + $('#uptownId').val() + "&date=" + reportDate);
                 var userId = $("#userId").val();
                 $.ajax({
                     url: '/whepi/yeweihui/ribaohuiz',

whepi-web/src/main/java/com/bofeng/service/EpiTemplateMessageService.java

@@ -47,4 +47,23 @@ public class EpiTemplateMessageService {
 
         return 1;
     }
+    //    {{first.DATA}}
+//    项目名称：{{keyword1.DATA}}
+//    任务名称：{{keyword2.DATA}}
+//    完成日期：{{keyword3.DATA}}
+//    指引与文档模版：{{keyword4.DATA}}
+//    指派人：{{keyword5.DATA}}
+//    {{remark.DATA}}
+    public int systemSendRemindMessage(Long userId) {
+
+        UserOpen userOpen = userOpenMapper.selectByUserId(userId);
+        Map<String, String> map = Maps.newHashMap();
+        List<Uptown> uptownList = rbMapper.selectUptown(userId);
+
+        map.put("uptownName", uptownList.get(0).getUptownName());
+        map.put("tagName", "家人");
+//        templateMessageService.sendSysRemindMessage();
+        return 1;
+    }
+
 }

whepi-web/src/main/java/com/bofeng/service/TemplateMessageService.java

@@ -55,9 +55,18 @@ public class TemplateMessageService {
      * 截止时间:{{endTime.DATA}}
      * */
 
+//    {{first.DATA}}
+//    项目名称：{{keyword1.DATA}}
+//    任务名称：{{keyword2.DATA}}
+//    完成日期：{{keyword3.DATA}}
+//    指引与文档模版：{{keyword4.DATA}}
+//    指派人：{{keyword5.DATA}}
+//    {{remark.DATA}}
     @Value("${yvan.wechat.templates.每日提醒}")
     private String newRemindMessageId;
 
+    @Value("${yvan.wechat.templates.系统提醒}")
+    private String sysRemindMessageId;
 
     @Autowired
     private WxMpService wxMpService;
@@ -68,6 +77,11 @@ public class TemplateMessageService {
         sendTemplateMessage(openId, newRemindMessageId, url, data);
     }
 
+    public void sendSysRemindMessage(String openId, String url, Map<String, String> data) {
+
+        sendTemplateMessage(openId, sysRemindMessageId, url, data);
+    }
+
 
     public void sendNewMarkMessage(String openId, String url, Map<String, String> data) {
 

whepi-web/src/main/java/com/bofeng/wx/controller/YeWeiHuiController.java

@@ -240,15 +240,14 @@ public class YeWeiHuiController {
     public void lunExportRiBao(@Pd(name = "date") String date,
                             HttpServletResponse resp) {
 
-        List<Uptown> uptowns = rbMapper.selectUptownByName("金湖家园");
-        if (uptowns!=null && uptowns.size()>0) {
-            Long upId = uptowns.get(0).getUptownId();
-            String fileName = uptowns.get(0).getUptownName();
-            fileName += "上报信息-";
-            fileName += date;
-            List<ExcelRiBaoLY> list = rbMapper.selectExcelRiBaoLY(upId,date);
-            ExcelUtils.writeSheet(ExcelRiBaoLY.class, list).export(resp, fileName);
-        }
+        Uptown uptown = uptownMapper.selectById("1238790987234");
+        Long upId = uptown.getUptownId();
+        String fileName = uptown.getUptownName();
+        fileName += "上报信息-";
+        fileName += date;
+        List<ExcelRiBaoLY> list = rbMapper.selectExcelRiBaoLY(upId, date);
+        ExcelUtils.writeSheet(ExcelRiBaoLY.class, list).export(resp, fileName);
+
     }
 
     @ApiOperation("导出小区家庭上报明细")

whepi-web/src/main/resources/application-dev.yml

@@ -54,6 +54,8 @@ yvan:
       修改预定信息: 'FsPj2Syigep3ctUd0aBmE4JMsuxjW-U0JgmoLAXjJtc'
       结账信息: '5t4LSW4cb7j4mcHxoYyzTvLHnp2gehpxn1faf7G4ABs'
       结算信息: 'GoZBKvyqAfP8uM3xrJk40YHhMoM_E44aPLEoKV_1-pQ'
+      每日提醒: 'yJDr5rSc9q9OkX-wuchH4N_msKcnA1zXgjEA3XXxKbs'
+      系统提醒: 'jZknynqXHF2lOuUKQtXwMsbLE3wvLCyM10sikJ957LY'
     #  round_out_template_id: 'xpQJsBwlhZ5r7P7Glur8hiNl1IgjQxtMGTVwdVOfGKg'
     #  round_in_template_id: 'oobiXKFatguG1H7K-HPi2lipzF-Qv0pMY12e1JaQxdA'
 

whepi-web/src/main/resources/application-guojing.yml

@@ -54,6 +54,8 @@ yvan:
       修改预定信息: 'FsPj2Syigep3ctUd0aBmE4JMsuxjW-U0JgmoLAXjJtc'
       结账信息: '5t4LSW4cb7j4mcHxoYyzTvLHnp2gehpxn1faf7G4ABs'
       结算信息: 'GoZBKvyqAfP8uM3xrJk40YHhMoM_E44aPLEoKV_1-pQ'
+      每日提醒: 'yJDr5rSc9q9OkX-wuchH4N_msKcnA1zXgjEA3XXxKbs'
+      系统提醒: 'jZknynqXHF2lOuUKQtXwMsbLE3wvLCyM10sikJ957LY'
     #  round_out_template_id: 'xpQJsBwlhZ5r7P7Glur8hiNl1IgjQxtMGTVwdVOfGKg'
     #  round_in_template_id: 'oobiXKFatguG1H7K-HPi2lipzF-Qv0pMY12e1JaQxdA'
 

whepi-web/src/main/resources/application-hudingbo.yml

@@ -54,6 +54,8 @@ yvan:
       修改预定信息: 'FsPj2Syigep3ctUd0aBmE4JMsuxjW-U0JgmoLAXjJtc'
       结账信息: '5t4LSW4cb7j4mcHxoYyzTvLHnp2gehpxn1faf7G4ABs'
       结算信息: 'GoZBKvyqAfP8uM3xrJk40YHhMoM_E44aPLEoKV_1-pQ'
+      每日提醒: 'yJDr5rSc9q9OkX-wuchH4N_msKcnA1zXgjEA3XXxKbs'
+      系统提醒: 'jZknynqXHF2lOuUKQtXwMsbLE3wvLCyM10sikJ957LY'
     #  round_out_template_id: 'xpQJsBwlhZ5r7P7Glur8hiNl1IgjQxtMGTVwdVOfGKg'
     #  round_in_template_id: 'oobiXKFatguG1H7K-HPi2lipzF-Qv0pMY12e1JaQxdA'
 

whepi-web/src/main/resources/application-lll.yml

@@ -56,6 +56,8 @@ yvan:
       修改预定信息: 'FsPj2Syigep3ctUd0aBmE4JMsuxjW-U0JgmoLAXjJtc'
       结账信息: '5t4LSW4cb7j4mcHxoYyzTvLHnp2gehpxn1faf7G4ABs'
       结算信息: 'GoZBKvyqAfP8uM3xrJk40YHhMoM_E44aPLEoKV_1-pQ'
+      每日提醒: 'yJDr5rSc9q9OkX-wuchH4N_msKcnA1zXgjEA3XXxKbs'
+      系统提醒: 'jZknynqXHF2lOuUKQtXwMsbLE3wvLCyM10sikJ957LY'
     #  round_out_template_id: 'xpQJsBwlhZ5r7P7Glur8hiNl1IgjQxtMGTVwdVOfGKg'
     #  round_in_template_id: 'oobiXKFatguG1H7K-HPi2lipzF-Qv0pMY12e1JaQxdA'
 

whepi-web/src/main/resources/application-maoyunfeng.yml

@@ -54,6 +54,8 @@ yvan:
       修改预定信息: 'FsPj2Syigep3ctUd0aBmE4JMsuxjW-U0JgmoLAXjJtc'
       结账信息: '5t4LSW4cb7j4mcHxoYyzTvLHnp2gehpxn1faf7G4ABs'
       结算信息: 'GoZBKvyqAfP8uM3xrJk40YHhMoM_E44aPLEoKV_1-pQ'
+      每日提醒: 'yJDr5rSc9q9OkX-wuchH4N_msKcnA1zXgjEA3XXxKbs'
+      系统提醒: 'jZknynqXHF2lOuUKQtXwMsbLE3wvLCyM10sikJ957LY'
     #  round_out_template_id: 'xpQJsBwlhZ5r7P7Glur8hiNl1IgjQxtMGTVwdVOfGKg'
     #  round_in_template_id: 'oobiXKFatguG1H7K-HPi2lipzF-Qv0pMY12e1JaQxdA'
 

whepi-web/src/main/resources/application-peig.yml

@@ -54,6 +54,8 @@ yvan:
       修改预定信息: 'FsPj2Syigep3ctUd0aBmE4JMsuxjW-U0JgmoLAXjJtc'
       结账信息: '5t4LSW4cb7j4mcHxoYyzTvLHnp2gehpxn1faf7G4ABs'
       结算信息: 'GoZBKvyqAfP8uM3xrJk40YHhMoM_E44aPLEoKV_1-pQ'
+      每日提醒: 'yJDr5rSc9q9OkX-wuchH4N_msKcnA1zXgjEA3XXxKbs'
+      系统提醒: 'jZknynqXHF2lOuUKQtXwMsbLE3wvLCyM10sikJ957LY'
     #  round_out_template_id: 'xpQJsBwlhZ5r7P7Glur8hiNl1IgjQxtMGTVwdVOfGKg'
     #  round_in_template_id: 'oobiXKFatguG1H7K-HPi2lipzF-Qv0pMY12e1JaQxdA'
 

whepi-web/src/main/resources/application-prod.yml

@@ -49,6 +49,7 @@ yvan:
       结账信息: '5t4LSW4cb7j4mcHxoYyzTvLHnp2gehpxn1faf7G4ABs'
       结算信息: 'GoZBKvyqAfP8uM3xrJk40YHhMoM_E44aPLEoKV_1-pQ'
       每日提醒: 'yJDr5rSc9q9OkX-wuchH4N_msKcnA1zXgjEA3XXxKbs'
+      系统提醒: '62x92fgWSbn6OoHVC2MwOkzzzss56AXHYVn_tQW1d6c'
 
 
 spring:

whepi-web/src/main/resources/application-songjiaqing.yml

@@ -57,6 +57,8 @@ yvan:
       修改预定信息: 'FsPj2Syigep3ctUd0aBmE4JMsuxjW-U0JgmoLAXjJtc'
       结账信息: '5t4LSW4cb7j4mcHxoYyzTvLHnp2gehpxn1faf7G4ABs'
       结算信息: 'GoZBKvyqAfP8uM3xrJk40YHhMoM_E44aPLEoKV_1-pQ'
+      每日提醒: 'yJDr5rSc9q9OkX-wuchH4N_msKcnA1zXgjEA3XXxKbs'
+      系统提醒: 'jZknynqXHF2lOuUKQtXwMsbLE3wvLCyM10sikJ957LY'
     #  round_out_template_id: 'xpQJsBwlhZ5r7P7Glur8hiNl1IgjQxtMGTVwdVOfGKg'
     #  round_in_template_id: 'oobiXKFatguG1H7K-HPi2lipzF-Qv0pMY12e1JaQxdA'
 

whepi-web/src/main/resources/application-xielianghe.yml

@@ -54,6 +54,8 @@ yvan:
       修改预定信息: 'FsPj2Syigep3ctUd0aBmE4JMsuxjW-U0JgmoLAXjJtc'
       结账信息: '5t4LSW4cb7j4mcHxoYyzTvLHnp2gehpxn1faf7G4ABs'
       结算信息: 'GoZBKvyqAfP8uM3xrJk40YHhMoM_E44aPLEoKV_1-pQ'
+      每日提醒: 'yJDr5rSc9q9OkX-wuchH4N_msKcnA1zXgjEA3XXxKbs'
+      系统提醒: 'jZknynqXHF2lOuUKQtXwMsbLE3wvLCyM10sikJ957LY'
     #  round_out_template_id: 'xpQJsBwlhZ5r7P7Glur8hiNl1IgjQxtMGTVwdVOfGKg'
     #  round_in_template_id: 'oobiXKFatguG1H7K-HPi2lipzF-Qv0pMY12e1JaQxdA'
 

whepi-web/src/main/resources/application.yml

@@ -43,7 +43,7 @@ endpoints:
 #  whitelabel.enabled: false
 
 spring:
-  profiles.active: peig
+  profiles.active: dev
 
   application:
     name: bofeng-web