bug修改

application/src/main/java/org/thingsboard/server/config/ReceiveHandler.java

@@ -289,11 +289,11 @@ public class ReceiveHandler {
                                                 Random rd = new Random();
                                                 SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss");
                                                 DynSMSSendRequest sendRequest = new DynSMSSendRequest();
-                                                sendRequest.setTemplateId("2061012256561");
+                                                sendRequest.setTemplateId("2061012257233");
                                                 int seq = rd.nextInt(900000) + 100000;
                                                 //流水号,状态回执报告中一致.如果不需要状态回执报告请不要设置值
                                                 sendRequest.setSerialNumber(sdf.format(new Date()) + seq);
-                                                sendRequest.setSignCode("b5674c65-612b-49ad-9ca0-9d904b9fb8fb");
+//                                                sendRequest.setSignCode("b5674c65-612b-49ad-9ca0-9d904b9fb8fb");
                                                 String titles = "手机号码,yhxm,siteName,indexName,value";
                                                 String[] titleArr = titles.split(",");
                                                 NxMonitorIndexQuery query = new NxMonitorIndexQuery();
@@ -307,34 +307,40 @@ public class ReceiveHandler {
                                                         }
                                                     }
                                                     String datas = "";
-                                                    for (String s : nxMonitorSiteConfig.getSendRoles().split(",")) {
-                                                        //请求参数
-                                                        UserInfo user = commonService.getUserAreaCode(s);
-                                                        if (user != null && !StringUtils.isEmpty(user.getPhoneNumber())) {
-                                                            datas += (user.getPhoneNumber() + "," + user.getRealName() + "," + temp);
+                                                    List<UserInfo> tempUsers = new ArrayList<>();
+                                                    if(!StringUtils.isEmpty(nxMonitorSiteConfig.getSendRoles())){
+                                                        for (String s : nxMonitorSiteConfig.getSendRoles().split(",")) {
+                                                            //请求参数
+                                                            UserInfo user = commonService.getUserAreaCode(s);
+                                                            if (user != null && !StringUtils.isEmpty(user.getPhoneNumber())) {
+                                                                tempUsers.add(user);
+                                                                datas += (user.getPhoneNumber() + "," + user.getRealName() + "," + temp);
+                                                            }
                                                         }
                                                     }
-                                                    String[] rows = datas.split(";");
-                                                    String[][] dyns = new String[rows.length + 1][titleArr.length];
-                                                    dyns[0] = titleArr;
-                                                    int rowNum = 1;
-                                                    for (String row : rows) {
-                                                        String[] cols = row.split(",");
-                                                        dyns[rowNum++] = cols;
-                                                    }
-                                                    sendRequest.setDynData(dyns);
-                                                    ComResult<DynSMSSendDataResult> result = sdkApi.testDynSendMethod(sendRequest);
-
-                                                    TfYwpnRxsmsmessageW tfYwpnRxsmsmessageW = new TfYwpnRxsmsmessageW();
-                                                    if(result.getCode() == 0){
-                                                        tfYwpnRxsmsmessageW.setFszt("1");
-                                                    }else{
-                                                        tfYwpnRxsmsmessageW.setFszt("2");
+                                                    if(!CollectionUtils.isEmpty(tempUsers)){
+                                                        String[] rows = datas.split(";");
+                                                        String[][] dyns = new String[rows.length + 1][titleArr.length];
+                                                        dyns[0] = titleArr;
+                                                        int rowNum = 1;
+                                                        for (String row : rows) {
+                                                            String[] cols = row.split(",");
+                                                            dyns[rowNum++] = cols;
+                                                        }
+                                                        sendRequest.setDynData(dyns);
+                                                        ComResult<DynSMSSendDataResult> result = sdkApi.testDynSendMethod(sendRequest);
+
+                                                        TfYwpnRxsmsmessageW tfYwpnRxsmsmessageW = new TfYwpnRxsmsmessageW();
+                                                        if(result.getCode() == 0){
+                                                            tfYwpnRxsmsmessageW.setFszt("1");
+                                                        }else{
+                                                            tfYwpnRxsmsmessageW.setFszt("2");
+                                                        }
+                                                        tfYwpnRxsmsmessageW.setLsbh(sendRequest.getSerialNumber());
+                                                        tfYwpnRxsmsmessageW.setTxnr(datas);
+                                                        tfYwpnRxsmsmessageW.setIslock("0");
+                                                        ywpnRxsmsmessageWService.save(tfYwpnRxsmsmessageW);
                                                     }
-                                                    tfYwpnRxsmsmessageW.setLsbh(sendRequest.getSerialNumber());
-                                                    tfYwpnRxsmsmessageW.setTxnr(datas);
-                                                    tfYwpnRxsmsmessageW.setIslock("0");
-                                                    ywpnRxsmsmessageWService.save(tfYwpnRxsmsmessageW);
                                                 }
                                             }
                                         }

application/src/main/java/org/thingsboard/server/controller/nanxi/TestSDKApi.java

@@ -44,7 +44,7 @@ public class TestSDKApi {
         //请求参数
         SMSSendRequest sendRequest = new SMSSendRequest();
         sendRequest.setMessageContent(properties.getProperty("send.content"));
-        sendRequest.setTemplateId("2061012256561");
+        sendRequest.setTemplateId("2061012257233");
         sendRequest.setUserNumber("15828038422");
         int seq = rd.nextInt(900000) + 100000;
         //流水号,状态回执报告中一致.如果不需要状态回执报告请不要设置值
@@ -72,12 +72,12 @@ public class TestSDKApi {
         }
         //请求参数
         DynSMSSendRequest sendRequest = new DynSMSSendRequest();
-        sendRequest.setTemplateId("2061012256561");
+        sendRequest.setTemplateId("2061012257233");
         sendRequest.setDynData(dyns);
         int seq = rd.nextInt(900000) + 100000;
         //流水号,状态回执报告中一致.如果不需要状态回执报告请不要设置值
         sendRequest.setSerialNumber(sdf.format(new Date()) + seq);
-        sendRequest.setSignCode("b5674c65-612b-49ad-9ca0-9d904b9fb8fb");
+//        sendRequest.setSignCode("b5674c65-612b-49ad-9ca0-9d904b9fb8fb");
         ComResult<DynSMSSendDataResult> result = sdkApi.testDynSendMethod(sendRequest);
         System.err.println(result);
     }

application/src/main/java/org/thingsboard/server/controller/nanxi/YunTiController.java

@@ -213,11 +213,11 @@ public class YunTiController {
                             Random rd = new Random();
                             SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss");
                             DynSMSSendRequest sendRequest = new DynSMSSendRequest();
-                            sendRequest.setTemplateId("2061012256561");
+                            sendRequest.setTemplateId("2061012257233");
                             int seq = rd.nextInt(900000) + 100000;
                             //流水号,状态回执报告中一致.如果不需要状态回执报告请不要设置值
                             sendRequest.setSerialNumber(sdf.format(new Date()) + seq);
-                            sendRequest.setSignCode("b5674c65-612b-49ad-9ca0-9d904b9fb8fb");
+//                            sendRequest.setSignCode("b5674c65-612b-49ad-9ca0-9d904b9fb8fb");
                             String titles = "手机号码,yhxm,siteName,indexName,value";
                             String[] titleArr = titles.split(",");
                             NxMonitorIndexQuery query = new NxMonitorIndexQuery();
@@ -231,34 +231,40 @@ public class YunTiController {
                                     }
                                 }
                                 String datas = "";
-                                for (String s : nxMonitorSiteConfig.getSendRoles().split(",")) {
-                                    //请求参数
-                                    UserInfo user = commonService.getUserAreaCode(s);
-                                    if (user != null && !StringUtils.isEmpty(user.getPhoneNumber())) {
-                                        datas += (user.getPhoneNumber() + "," + user.getRealName() + "," + temp);
+                                List<UserInfo> tempUsers = new ArrayList<>();
+                                if(!StringUtils.isEmpty(nxMonitorSiteConfig.getSendRoles())){
+                                    for (String s : nxMonitorSiteConfig.getSendRoles().split(",")) {
+                                        //请求参数
+                                        UserInfo user = commonService.getUserAreaCode(s);
+                                        if (user != null && !StringUtils.isEmpty(user.getPhoneNumber())) {
+                                            tempUsers.add(user);
+                                            datas += (user.getPhoneNumber() + "," + user.getRealName() + "," + temp);
+                                        }
                                     }
                                 }
-                                String[] rows = datas.split(";");
-                                String[][] dyns = new String[rows.length + 1][titleArr.length];
-                                dyns[0] = titleArr;
-                                int rowNum = 1;
-                                for (String row : rows) {
-                                    String[] cols = row.split(",");
-                                    dyns[rowNum++] = cols;
-                                }
-                                sendRequest.setDynData(dyns);
-                                ComResult<DynSMSSendDataResult> result = sdkApi.testDynSendMethod(sendRequest);
+                                if(!CollectionUtils.isEmpty(tempUsers)){
+                                    String[] rows = datas.split(";");
+                                    String[][] dyns = new String[rows.length + 1][titleArr.length];
+                                    dyns[0] = titleArr;
+                                    int rowNum = 1;
+                                    for (String row : rows) {
+                                        String[] cols = row.split(",");
+                                        dyns[rowNum++] = cols;
+                                    }
+                                    sendRequest.setDynData(dyns);
+                                    ComResult<DynSMSSendDataResult> result = sdkApi.testDynSendMethod(sendRequest);
 
-                                TfYwpnRxsmsmessageW tfYwpnRxsmsmessageW = new TfYwpnRxsmsmessageW();
-                                if(result.getCode() == 0){
-                                    tfYwpnRxsmsmessageW.setFszt("1");
-                                }else{
-                                    tfYwpnRxsmsmessageW.setFszt("2");
+                                    TfYwpnRxsmsmessageW tfYwpnRxsmsmessageW = new TfYwpnRxsmsmessageW();
+                                    if(result.getCode() == 0){
+                                        tfYwpnRxsmsmessageW.setFszt("1");
+                                    }else{
+                                        tfYwpnRxsmsmessageW.setFszt("2");
+                                    }
+                                    tfYwpnRxsmsmessageW.setLsbh(sendRequest.getSerialNumber());
+                                    tfYwpnRxsmsmessageW.setTxnr(datas);
+                                    tfYwpnRxsmsmessageW.setIslock("0");
+                                    ywpnRxsmsmessageWService.save(tfYwpnRxsmsmessageW);
                                 }
-                                tfYwpnRxsmsmessageW.setLsbh(sendRequest.getSerialNumber());
-                                tfYwpnRxsmsmessageW.setTxnr(datas);
-                                tfYwpnRxsmsmessageW.setIslock("0");
-                                ywpnRxsmsmessageWService.save(tfYwpnRxsmsmessageW);
                             }
                         }
                     }

application/src/main/java/org/thingsboard/server/domain/NxEventCar.java

@@ -1,5 +1,8 @@
 package org.thingsboard.server.domain;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -22,6 +25,8 @@ public class NxEventCar extends BaseEntityAdaptiveIsDelete{
         /**
      * 主键
      */
+        @JsonFormat(shape = JsonFormat.Shape.STRING)
+        @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
         /**
      * 事件id
@@ -30,7 +35,9 @@ public class NxEventCar extends BaseEntityAdaptiveIsDelete{
         /**
      * 抢险车辆id
      */
-    private String carTypeCode;
+        @JsonFormat(shape = JsonFormat.Shape.STRING)
+        @JsonSerialize(using = ToStringSerializer.class)
+    private Long carTypeCode;
     /**
      * 抢险车辆名称
      */

application/src/main/java/org/thingsboard/server/mapper/UserInfoMapper.java

@@ -39,4 +39,6 @@ public interface UserInfoMapper extends BaseMapper<UserInfo> {
     List<UserInfo> getUsersByOrgParent(String parentId);
 
     List<UserInfo> getUsersByOrg(String id);
+
+    List<UserInfo> listUsersByAreaCode(Long parentId);
 }

application/src/main/java/org/thingsboard/server/service/nanxi/ICommonService.java

@@ -9,6 +9,7 @@ import org.thingsboard.server.domain.SysAreaTreeInfo;
 import org.thingsboard.server.domain.UserInfo;
 import org.thingsboard.server.domain.vo.UserInfoViews;
 
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 
@@ -99,4 +100,6 @@ public interface ICommonService {
     List<UserInfo> getUsersByOrgParent(String parentId);
 
     List<UserInfo> getUsersByOrg(String id);
+
+    List<UserInfo> listUsersByAreaCode(Long parentId);
 }

application/src/main/java/org/thingsboard/server/service/nanxi/impl/CommonServiceImpl.java

@@ -214,6 +214,11 @@ public class CommonServiceImpl implements ICommonService {
         return userInfoMapper.getUsersByOrg(id);
     }
 
+    @Override
+    public List<UserInfo> listUsersByAreaCode(Long parentId) {
+        return userInfoMapper.listUsersByAreaCode(parentId);
+    }
+
 }
 
 

application/src/main/java/org/thingsboard/server/service/nanxi/impl/NxMonitorSiteConfigServiceImpl.java

@@ -10,8 +10,10 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 import org.thingsboard.server.common.data.exception.ThingsboardErrorCode;
+import org.thingsboard.server.common.data.yunteng.dto.SysAreaDTO;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.thingsboard.server.dao.yunteng.service.SysAreaService;
 import org.thingsboard.server.domain.*;
 import org.thingsboard.server.domain.query.NxMonitorSiteConfigQuery;
 import org.thingsboard.server.domain.vo.NxMonitorSiteConfigVo;
@@ -58,6 +60,10 @@ public class NxMonitorSiteConfigServiceImpl extends ServiceImpl<NxMonitorSiteCon
     private INxMonitorSiteService monitorSiteService;
     @Autowired
     private ICommonService commonService;
+    @Autowired
+    private SysAreaService sysAreaService;
+    @Autowired
+    private UserInfoMapper userInfoMapper;
 
 
     @Override
@@ -198,15 +204,14 @@ public class NxMonitorSiteConfigServiceImpl extends ServiceImpl<NxMonitorSiteCon
     public BaseOutput<List<UserInfo>> getUsers(Long siteId) {
         NxMonitorSite site = monitorSiteService.getById(siteId);
         List<UserInfo> users = commonService.queryUserInfoByArea(site.getDistrictCode());
+        if(511503l != site.getDistrictCode()){
+            SysAreaDTO sysAreaInfoByCode = sysAreaService.getSysAreaInfoByCode(site.getDistrictCode());
+            users.addAll(commonService.listUsersByAreaCode(sysAreaInfoByCode.getParentId()));
+        }
         List<Map<String, String>> orgMap = commonService.getOrganizationByUser(UserTicketUtil.getCurrentUser().getCurrentUserId());
         if(!CollectionUtils.isEmpty(orgMap)){
-            if(StringUtils.isEmpty(orgMap.get(0).get("parent_id"))){
-                List<UserInfo> tempUsers = commonService.getUsersByOrgParent(orgMap.get(0).get("parent_id"));
-                users.addAll(tempUsers);
-            }else{
-                List<UserInfo> tempUsers = commonService.getUsersByOrg(orgMap.get(0).get("id"));
-                users.addAll(tempUsers);
-            }
+            users.addAll(commonService.getUsersByOrgParent(orgMap.get(0).get("id")));
+            users.addAll(commonService.getUsersByOrg(orgMap.get(0).get("id")));
         }
         return BaseOutput.success(users);
     }

application/src/main/resources/bootstrap-dev.yml

@@ -26,7 +26,7 @@ file:
 spring:
   datasource:
     driverClassName: "${SPRING_DRIVER_CLASS_NAME:org.postgresql.Driver}"
-    url: "${SPRING_DATASOURCE_URL:jdbc:postgresql://221.182.8.141:14100/thingskit}"
+    url: "${SPRING_DATASOURCE_URL:jdbc:postgresql://221.182.8.141:14100/sthjs}"
     username: "${SPRING_DATASOURCE_USERNAME:postgres}"
     password: "${SPRING_DATASOURCE_PASSWORD:tofly@028..}"
     hikari:

application/src/main/resources/bootstrap.yml

@@ -6,8 +6,8 @@ spring:
     nacos:
       discovery:
         namespace: nx-pro
-        server-addr: http://192.168.2.15:10081
-#        server-addr: http://182.139.38.101:20032
+#        server-addr: http://192.168.2.15:10081
+        server-addr: http://182.139.38.101:20032
       config:
         enabled: false
   profiles:
@@ -578,16 +578,16 @@ frp:
 
 hnls:
   hk:
-    host: 118.122.253.32:1443
-    appKey: 24982958
-    appSecret: usgcmsu8HToNTcSXuTjV
+    host: 118.122.6.242:11443
+    appKey: 21740225
+    appSecret: Dg5VvxqwsinfUKwr7ZH0
     previewURL: /api/video/v2/cameras/previewURLs
 sms:
   # account of spCode
-  spCode: 268454
+  spCode: 273719
   # account of appkey
-  appKey: cd_tfkj
+  appKey: cz_nxyj
   # account of appSecret
-  appSecret: efeb5706268faae835231f6de0c31187
+  appSecret: dd99f4fad3c593ab576da22b85db10b7
   # 是否开启
-  isEnable: false
+  isEnable: true

application/src/main/resources/mapper/UserInfoMapper.xml

@@ -116,6 +116,10 @@
         select * from sys_user where cast(area_code as varchar) like #{siteId} || '%'
     </select>
 
+    <select id="listUsersByAreaCode" resultType="org.thingsboard.server.domain.UserInfo">
+        select * from sys_user where area_code = #{parentId}
+    </select>
+
     <select id="getOrganizationByUser" resultType="java.util.Map">
         select t2.* from tk_user_organization_mapping t1
         left join tk_organization t2 on t1.organization_id = t2.id
@@ -127,7 +131,7 @@
         select t3.* from tk_organization t1
         left join tk_user_organization_mapping t2 on t1.id = t2.organization_id
         inner join sys_user t3 on t2.user_id = t3.id
-        where parent_id #{parentId}
+        where parent_id = #{parentId}
     </select>
 
     <select id="getUsersByOrg" resultType="org.thingsboard.server.domain.UserInfo">