Merge branch 'master' of https://e.coding.net/chuanghaikeji/smartCampus/backend_code

src/main/java/com/template/api/SmartFaceDiscernControllerAPI.java

@@ -10,7 +10,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 public interface SmartFaceDiscernControllerAPI {
 
     @GetMapping(value = "/track")
-    @ApiOperation(value = "学生轨迹", notes = "学生轨迹", httpMethod = "GET")
+    @ApiOperation(value = "瀛︾敓杞ㄨ抗", notes = "瀛︾敓杞ㄨ抗", httpMethod = "GET")
     CommonResult track(@RequestParam Integer id, @RequestParam int dateTime);
 
 }

src/main/java/com/template/common/utils/SendSms.java

@@ -27,21 +27,26 @@ public class SendSms {
 
 
     //腾讯云上的签名
-    private static String secretID="AKIDDPo13qZCZqtgJsGQL7AyYu1wc7QVMyLl";
+//    private static String secretID="AKIDDPo13qZCZqtgJsGQL7AyYu1wc7QVMyLl";
+    private static String secretID="AKIDCPVZdcWIxgHpy5FYxVyPiqkZGrhdXUBg";
+
     //腾讯云上的密钥
+//    private static String secretKey="JPGrELFySiv0pOrKOPEwSnulOq9IPPDr";
+    private static String secretKey="NkyCN3cz97qKaeXLvHOGxOcdS8f184pL";
 
-    private static String secretKey="JPGrELFySiv0pOrKOPEwSnulOq9IPPDr";
     //短信应用id
+//    private static String sdkAppid="1400813506";
+    private static String sdkAppid="1400885930";
 
-    private static String sdkAppid="1400813506";
     //短信签名内容
+//    private static String signName="华仁享学教育";
+    private static String signName="江西省创海科技有限公司";
 
-    private static String signName="华仁享学教育";
     //模板Id
+//    private static String templateId="1770016";
+    private static String templateId="2060673";
 
-    private static String templateId="1770016";
     //验证码有效时长
-
     private static String smsMin="1";
 
 
@@ -169,7 +174,7 @@ public class SendSms {
         //这里定义一个存储电话号码的数组
 
         String tels="+8615779633758"; // 手机号前面记得带上国家区域编码
-        String test = sendSms("18679823739","123456");
+        String test = sendSms("+8615779633758","123456");
 
     }
 

src/main/java/com/template/config/smsConfig.java

@@ -15,22 +15,22 @@ import org.springframework.stereotype.Component;
 @ConfigurationProperties(prefix = "tencentcloud")
 @Data
 public class smsConfig {
-    //腾讯云上的签名
 
+    //腾讯云上的签名  AKIDCPVZdcWIxgHpy5FYxVyPiqkZGrhdXUBg
     private String secretID;
-    //腾讯云上的密钥
 
+    //腾讯云上的密钥   NkyCN3cz97qKaeXLvHOGxOcdS8f184pL
     private String secretKey;
-    //短信应用id
 
+    //短信应用id  1400885930
     private String sdkAppid;
-    //短信签名内容
 
+    //短信签名内容  	江西省创海科技有限公司
     private String signName;
-    //模板Id
 
+    //模板Id   2060673
     private String templateId;
-    //验证码有效时长
 
+    //验证码有效时长
     private String smsMin;
 }

src/main/java/com/template/controller/SmartWarningController.java

@@ -2,6 +2,7 @@ package com.template.controller;
 
 
 import cn.hutool.poi.excel.ExcelUtil;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -259,7 +260,7 @@ public class SmartWarningController implements SmartWarningControllerAPI {
 
     @Override
     public CommonResult warningPushList() {
-        List<SmartUser> names = smartUserService.warningPushList();
+        List<WarningUserDto> names = smartUserService.warningPushList();
 
         return CommonResult.ok(names);
     }
@@ -272,7 +273,34 @@ public class SmartWarningController implements SmartWarningControllerAPI {
             return CommonResult.fail(ResponseStatusEnum.PARAM_ERROR);
         }
 
-        List<SmartUser> smartUsers = smartUserService.getSmartUserByIds(ids);
+        //        获取所有可推送的人
+        LambdaQueryWrapper<SmartUser> wrapper=new LambdaQueryWrapper<>();
+        wrapper.eq(SmartUser::getIsCancel, 0)
+                .eq(SmartUser::getIsPush,1);
+        List<SmartUser> list = smartUserService.list(wrapper);
+
+//        需要删除的
+        ArrayList<Integer> pushDeleteIds = new ArrayList<>();
+//        不用修改的
+        ArrayList<Integer> pushIds = new ArrayList<>();
+        for (SmartUser smartUser : list) {
+            Integer id = smartUser.getId();
+            if (!ids.contains(id)) {
+                pushDeleteIds.add(id);
+            }else {
+                pushIds.add(id);
+            }
+        }
+//      获取需要添加的人
+        ArrayList<Integer> savePushIds = new ArrayList<>();
+        for (Integer id : ids) {
+            if (!pushIds.contains(id)) {
+                savePushIds.add(id);
+            }
+        }
+
+//        添加
+        List<SmartUser> smartUsers = smartUserService.getSmartUserByIds(savePushIds);
 
         for (SmartUser smartUser : smartUsers) {
             String gzhOpenId = smartUser.getGzhOpenId();
@@ -283,6 +311,15 @@ public class SmartWarningController implements SmartWarningControllerAPI {
             smartUserService.updateSmartUser(smartUser);
         }
 
+//        删除
+        List<SmartUser> smartUsersDelete = smartUserService.getSmartUserByIds(pushDeleteIds);
+        ArrayList<SmartUser> smartUsersUpdate = new ArrayList<>();
+        for (SmartUser smartUser : smartUsersDelete) {
+            smartUser.setIsPush(0);
+            smartUsersUpdate.add(smartUser);
+        }
+        smartUserService.updateBatchById(smartUsersUpdate);
+
         return CommonResult.ok();
     }
 
@@ -294,6 +331,7 @@ public class SmartWarningController implements SmartWarningControllerAPI {
             return CommonResult.fail();
         }
 
+
         List<SmartUser> smartUserList = smartUserService.getSmartUserList(ids);
 
         if (ObjectUtils.isEmpty(smartUserList)&&smartUserList.size()==0 ) {

src/main/java/com/template/mapper/SmartUserMapper.java

@@ -34,7 +34,7 @@ public interface SmartUserMapper extends BaseMapper<SmartUser> {
 
     IPage<WarningUserDto> warningUserList(Page<UserVo> page, @Param("name") String name);
 
-    List<SmartUser> warningPushList();
+    List<WarningUserDto> warningPushList();
 
     List<AffiliateParentVo> queryAffiliateParents(@Param("userId") Integer userId);
 

src/main/java/com/template/services/SmartUserService.java

@@ -54,7 +54,7 @@ public interface SmartUserService extends IService<SmartUser> {
 
     PageUtils<WarningUserDto> warningUserList(int currentPage, int pageCount, String name);
 
-    List<SmartUser> warningPushList();
+    List<WarningUserDto> warningPushList();
 
     List<AffiliateParentVo> queryAffiliateParents(Integer userId);
 

src/main/java/com/template/services/impl/SmartUserServiceImpl.java

@@ -178,7 +178,7 @@ public class SmartUserServiceImpl extends ServiceImpl<SmartUserMapper, SmartUser
     }
 
     @Override
-    public List<SmartUser> warningPushList() {
+    public List<WarningUserDto> warningPushList() {
         return smartUserMapper.warningPushList();
     }
 

src/main/resources/application-dev.yml

@@ -75,11 +75,11 @@ accesscontrol:
 
 #腾讯云
 tencentcloud:
-  secretID: AKIDDPo13qZCZqtgJsGQL7AyYu1wc7QVMyLl  #签名
-  secretKey: JPGrELFySiv0pOrKOPEwSnulOq9IPPDr     #密钥
-  sdkAppId: 1400813506   #短信应用ID
-  signName: 华仁享学教育   #短信签名内容
-  templateId: 1770016  #模板 ID
+  secretID: AKIDCPVZdcWIxgHpy5FYxVyPiqkZGrhdXUBg  #签名
+  secretKey: NkyCN3cz97qKaeXLvHOGxOcdS8f184pL     #密钥
+  sdkAppId: 1400885930  #短信应用ID
+  signName: 江西省创海科技有限公司   #短信签名内容
+  templateId: 2060673  #模板 ID
   smsMin: 1
 
 #是否开启定时

src/main/resources/application-prod.yml

@@ -48,11 +48,11 @@ mybatis-plus:
 
 #腾讯云
 tencentcloud:
-  secretID: AKIDDPo13qZCZqtgJsGQL7AyYu1wc7QVMyLl  #签名
-  secretKey: JPGrELFySiv0pOrKOPEwSnulOq9IPPDr     #密钥
-  sdkAppId: 1400813506   #短信应用ID
-  signName: 华仁享学教育   #短信签名内容
-  templateId: 1770016  #模板 ID
+  secretID: AKIDCPVZdcWIxgHpy5FYxVyPiqkZGrhdXUBg  #签名
+  secretKey: NkyCN3cz97qKaeXLvHOGxOcdS8f184pL     #密钥
+  sdkAppId: 1400885930  #短信应用ID
+  signName: 江西省创海科技有限公司   #短信签名内容
+  templateId: 2060673  #模板 ID
   smsMin: 1
 
 # 项目公钥私钥

src/main/resources/application.yml

@@ -45,11 +45,11 @@ mybatis-plus:
       logic-not-delete-value: 0
 #腾讯云
 tencentcloud:
-  secretID: AKIDDPo13qZCZqtgJsGQL7AyYu1wc7QVMyLl  #签名
-  secretKey: JPGrELFySiv0pOrKOPEwSnulOq9IPPDr     #密钥
-  sdkAppId: 1400813506   #短信应用ID
-  signName: 华仁享学教育   #短信签名内容
-  templateId: 1770016  #模板 ID
+  secretID: AKIDCPVZdcWIxgHpy5FYxVyPiqkZGrhdXUBg  #签名
+  secretKey: NkyCN3cz97qKaeXLvHOGxOcdS8f184pL     #密钥
+  sdkAppId: 1400885930  #短信应用ID
+  signName: 江西省创海科技有限公司   #短信签名内容
+  templateId: 2060673  #模板 ID
   smsMin: 1
 
 # 项目公钥私钥

src/main/resources/mapper/template/SmartUserMapper.xml

@@ -132,12 +132,16 @@
         </if>
     </select>
 
-    <select id="warningPushList" resultType="com.template.model.pojo.SmartUser">
-        SELECT *
-        FROM `smart_user`
-        WHERE is_push = 1
-          and is_cancel = 0
-          and deleted = 0
+    <select id="warningPushList" resultType="com.template.model.dto.WarningUserDto">
+        SELECT su.id      AS id,
+               su.`name`  AS `name`,
+               su.card_no AS cardNo,
+               sd.`name`  AS departmentName
+        FROM `smart_user` su
+                 LEFT JOIN smart_department sd ON sd.id = su.department_id and sd.deleted = 0
+        WHERE su.is_push = 1
+          and su.is_cancel = 0
+          and su.deleted = 0
     </select>
 
 
@@ -146,7 +150,8 @@
         <result property="name" column="name"/>
     </resultMap>
 
-    <select id="queryAffiliateParents" resultType="com.template.model.vo.AffiliateParentVo" resultMap="affiliateParentMap">
+    <select id="queryAffiliateParents" resultType="com.template.model.vo.AffiliateParentVo"
+            resultMap="affiliateParentMap">
         SELECT id,name FROM `smart_user`
         where deleted = 0 and is_cancel=0
         <if test="userId != null and userId != ''">