Merge remote-tracking branch 'origin/20210223' into 20210223

gateway/src/main/resources/application-prd.properties

@@ -1,50 +1,57 @@
 server.port=8320
 
 logging.level.root=info
-logging.path=/opt/sit/smartcity-gateway/logs
+logging.path=./logs/smart-city-v2-gateway
 logging.level.com.alibaba.nacos.client.naming=error
 #指定服务名
-spring.application.name=smart-city-v2-gateway
-
+spring.application.name=gateway
 
+spring.redis.host=10.0.0.136
+spring.redis.port=6379
+spring.redis.password=zoniot
+spring.redis.database=2
+spring.redis.timeout=36000
 #nacos
-spring.cloud.nacos.discovery.server-addr=10.0.0.136:8848
-
+spring.cloud.nacos.discovery.server-addr=127.0.0.1:8848
 
 spring.cloud.gateway.discovery.locator.enabled=true
 spring.cloud.gateway.discovery.locator.lowerCaseServiceId=true
 
-spring.cloud.gateway.routes[0].id=user
-spring.cloud.gateway.routes[0].uri=lb://smart-city-v2-user
-spring.cloud.gateway.routes[0].predicates[0]=Path=/user/**
+spring.cloud.gateway.routes[0].id=user-auth
+spring.cloud.gateway.routes[0].uri=lb://user-auth
+spring.cloud.gateway.routes[0].predicates[0]=Path=/user-auth/**
 spring.cloud.gateway.routes[0].filters[0]=StripPrefix=1
 
-spring.cloud.gateway.routes[1].id=admin
-spring.cloud.gateway.routes[1].uri=lb://smart-city-v2-admin
-spring.cloud.gateway.routes[1].predicates[0]=Path=/admin/**
+spring.cloud.gateway.routes[1].id=user-center
+spring.cloud.gateway.routes[1].uri=lb://user-center
+spring.cloud.gateway.routes[1].predicates[0]=Path=/user-center/**
 spring.cloud.gateway.routes[1].filters[0]=StripPrefix=1
 
-spring.cloud.gateway.routes[2].id=device
-spring.cloud.gateway.routes[2].uri=lb://smart-city-v2-device
-spring.cloud.gateway.routes[2].predicates[0]=Path=/device/**
+spring.cloud.gateway.routes[2].id=sms-water
+spring.cloud.gateway.routes[2].uri=lb://sms-water
+spring.cloud.gateway.routes[2].predicates[0]=Path=/sms-water/**
 spring.cloud.gateway.routes[2].filters[0]=StripPrefix=1
 
-spring.cloud.gateway.routes[3].id=workflow
-spring.cloud.gateway.routes[3].uri=lb://smart-city-v2-workflow
-spring.cloud.gateway.routes[3].predicates[0]=Path=/workflow/**
+spring.cloud.gateway.routes[3].id=uims-message
+spring.cloud.gateway.routes[3].uri=lb://uims-message
+spring.cloud.gateway.routes[3].predicates[0]=Path=/uims-message/**
 spring.cloud.gateway.routes[3].filters[0]=StripPrefix=1
 
-
-spring.cloud.gateway.routes[4].id=access
-spring.cloud.gateway.routes[4].uri=lb://smart-city-v2-iothub-access
-spring.cloud.gateway.routes[4].predicates[0]=Path=/access/**
+spring.cloud.gateway.routes[4].id=uims-message-socket
+spring.cloud.gateway.routes[4].uri=lb:ws://uims-message
+spring.cloud.gateway.routes[4].predicates[0]=Path=/uims-message/webSocket/**
 spring.cloud.gateway.routes[4].filters[0]=StripPrefix=1
 
-spring.cloud.gateway.routes[5].id=log
-spring.cloud.gateway.routes[5].uri=lb://smart-city-v2-log
-spring.cloud.gateway.routes[5].predicates[0]=Path=/log/**
+spring.cloud.gateway.routes[5].id=operation-manager
+spring.cloud.gateway.routes[5].uri=lb://operation-manager
+spring.cloud.gateway.routes[5].predicates[0]=Path=/operation-manager/**
 spring.cloud.gateway.routes[5].filters[0]=StripPrefix=1
 
+spring.cloud.gateway.routes[6].id=iot
+spring.cloud.gateway.routes[6].uri=http://114.135.61.188:58080
+spring.cloud.gateway.routes[6].predicates[0]=Path=/iot/api/**
+spring.cloud.gateway.routes[6].filters[0]=StripPrefix=1
+spring.cloud.gateway.routes[6].filters[1]=Auth
+
 spring.servlet.multipart.max-file-size=100MB
 spring.servlet.multipart.max-request-size=100MB
-

gateway/src/main/resources/application-sit.properties

@@ -1,50 +1,56 @@
-server.port=8320
+server.port=8081
 
 logging.level.root=info
-logging.path=/opt/sit/smartcity-gateway/logs
+logging.path=D:/logs/smart-city-v2-gateway
 logging.level.com.alibaba.nacos.client.naming=error
 #指定服务名
-spring.application.name=smart-city-v2-gateway
-
-
+spring.application.name=gateway
+spring.redis.host=114.135.61.188
+spring.redis.port=26379
+spring.redis.password=zoniot
+spring.redis.database=2
+spring.redis.timeout=36000
 #nacos
-spring.cloud.nacos.discovery.server-addr=10.0.0.153:8329
-
+spring.cloud.nacos.discovery.server-addr=127.0.0.1:8848
 
 spring.cloud.gateway.discovery.locator.enabled=true
 spring.cloud.gateway.discovery.locator.lowerCaseServiceId=true
 
-spring.cloud.gateway.routes[0].id=user
-spring.cloud.gateway.routes[0].uri=lb://smart-city-v2-user
-spring.cloud.gateway.routes[0].predicates[0]=Path=/user/**
+spring.cloud.gateway.routes[0].id=user-auth
+spring.cloud.gateway.routes[0].uri=lb://user-auth
+spring.cloud.gateway.routes[0].predicates[0]=Path=/user-auth/**
 spring.cloud.gateway.routes[0].filters[0]=StripPrefix=1
 
-spring.cloud.gateway.routes[1].id=admin
-spring.cloud.gateway.routes[1].uri=lb://smart-city-v2-admin
-spring.cloud.gateway.routes[1].predicates[0]=Path=/admin/**
+spring.cloud.gateway.routes[1].id=user-center
+spring.cloud.gateway.routes[1].uri=lb://user-center
+spring.cloud.gateway.routes[1].predicates[0]=Path=/user-center/**
 spring.cloud.gateway.routes[1].filters[0]=StripPrefix=1
 
-spring.cloud.gateway.routes[2].id=device
-spring.cloud.gateway.routes[2].uri=lb://smart-city-v2-device
-spring.cloud.gateway.routes[2].predicates[0]=Path=/device/**
+spring.cloud.gateway.routes[2].id=sms-water
+spring.cloud.gateway.routes[2].uri=lb://sms-water
+spring.cloud.gateway.routes[2].predicates[0]=Path=/sms-water/**
 spring.cloud.gateway.routes[2].filters[0]=StripPrefix=1
 
-spring.cloud.gateway.routes[3].id=workflow
-spring.cloud.gateway.routes[3].uri=lb://smart-city-v2-workflow
-spring.cloud.gateway.routes[3].predicates[0]=Path=/workflow/**
+spring.cloud.gateway.routes[3].id=uims-message
+spring.cloud.gateway.routes[3].uri=lb://uims-message
+spring.cloud.gateway.routes[3].predicates[0]=Path=/uims-message/**
 spring.cloud.gateway.routes[3].filters[0]=StripPrefix=1
 
-
-spring.cloud.gateway.routes[4].id=access
-spring.cloud.gateway.routes[4].uri=lb://smart-city-v2-iothub-access
-spring.cloud.gateway.routes[4].predicates[0]=Path=/access/**
+spring.cloud.gateway.routes[4].id=uims-message-socket
+spring.cloud.gateway.routes[4].uri=lb:ws://uims-message
+spring.cloud.gateway.routes[4].predicates[0]=Path=/uims-message/webSocket/**
 spring.cloud.gateway.routes[4].filters[0]=StripPrefix=1
 
-spring.cloud.gateway.routes[5].id=log
-spring.cloud.gateway.routes[5].uri=lb://smart-city-v2-log
-spring.cloud.gateway.routes[5].predicates[0]=Path=/log/**
+spring.cloud.gateway.routes[5].id=operation-manager
+spring.cloud.gateway.routes[5].uri=lb://operation-manager
+spring.cloud.gateway.routes[5].predicates[0]=Path=/operation-manager/**
 spring.cloud.gateway.routes[5].filters[0]=StripPrefix=1
 
+spring.cloud.gateway.routes[6].id=iot
+spring.cloud.gateway.routes[6].uri=http://114.135.61.188:58080
+spring.cloud.gateway.routes[6].predicates[0]=Path=/iot/api/**
+spring.cloud.gateway.routes[6].filters[0]=StripPrefix=1
+spring.cloud.gateway.routes[6].filters[1]=Auth
+
 spring.servlet.multipart.max-file-size=100MB
 spring.servlet.multipart.max-request-size=100MB
-

operation_manager/src/main/java/com/huaxu/order/controller/WorkOrderManageController.java

@@ -393,6 +393,7 @@ public class WorkOrderManageController {
         //1是公司，2是公司及以下，3部门，4部门及以下，5自定义
         workOrderManageDto.setPermissonType(loginUser.getPermissonType());
         List<WorkOrderManageDto> list = workOrderManageService.selectMaintainOrder(workOrderManageDto);
+        setName(list);
         return new AjaxMessage<>(ResultStatus.OK, list);
     }
 
@@ -855,6 +856,14 @@ public class WorkOrderManageController {
                     if(workOrder.getUpdateBy()!=null) {
                         idList.add(Long.valueOf(workOrder.getUpdateBy()));
                     }
+                    if(workOrder.getCurrentUsers() != null) {
+                        String[] currentUserIds = workOrder.getCurrentUsers().split(",");
+                        for(String currentUserId:currentUserIds){
+                            if(!StringUtils.isEmpty(currentUserId)) {
+                                idList.add(Long.valueOf(currentUserId));
+                            }
+                        }
+                    }
                 }
                 Long[] ids = idList.toArray(new Long[0]);
                 List<UserEntity> userEntityList=userCenterClient.findUserIdsByUserIds(ids);
@@ -864,6 +873,18 @@ public class WorkOrderManageController {
                 for(int i = 0; i < result.size(); i++) {
                     WorkOrderManageDto workOrder = result.get(i);
                     try {
+                        String currentUsersName = null;
+                        if(workOrder.getCurrentUsers() != null) {
+                            String[] currentUserIds = workOrder.getCurrentUsers().split(",");
+                            for (String currentUserId : currentUserIds) {
+                                if (currentUsersName == null) {
+                                    currentUsersName = userMap.get(Long.valueOf(currentUserId));
+                                } else {
+                                    currentUsersName = currentUsersName + "," + userMap.get(Long.valueOf(currentUserId));
+                                }
+                            }
+                        }
+                        workOrder.setCurrentUsersName(currentUsersName);
                         if (workOrder.getOrderTypeId() != null) {
                             workOrder.setTypeName(dictMap.get(workOrder.getOrderTypeId().toString()));
                         }

operation_manager/src/main/java/com/huaxu/order/entity/WorkOrderManage.java

@@ -95,6 +95,9 @@ public class WorkOrderManage implements Serializable {
     @ApiModelProperty(value = "当前处理人")
     private String currentUsers;
 
+    @ApiModelProperty(value = "当前处理人名称")
+    private String currentUsersName;
+
     @ApiModelProperty(value = "当前名称")
     private String currentTaskName;
 

operation_manager/src/main/resources/mapper/order/WorkOrderManageMapper.xml

@@ -666,7 +666,7 @@
         </if>
       </if>
       <if test="order.startDate == null and order.endDate == null">
-         order by t1.date_create desc
+         order by t1.send_time desc
       </if>
     </where>
   </select>
@@ -792,7 +792,7 @@
   </select>
   <!--维修列表-工单情况（未派单，处理中）-->
   <select id="selectMaintainOrder" resultMap="BaseResultMap" >
-    select t1.task_no,  t1.address,
+    select t1.task_no,  t1.address, t1.task_desc, t1.plan_finish_date, t1.date_create, t1.order_user_id,
     case when t1.order_status=0 then '未派单' when t1.order_status =1 or t1.order_status=4 then '处理中' end order_status_name,
     case when t1.event_type=1 then '运维上报' when t1.event_type=2 then '用户上报' when t1.event_type=3 then '设备告警' end  event_type_name,
     geo

readme

@@ -0,0 +1,5 @@
+2021.04.06 V1.0
+1、更新内容(数据库)
+(1) sms_monitor_info 添加字段type
+    ALTER TABLE sms_monitor_info ADD TYPE int
+

sms_water/src/main/resources/mapper/DeviceParmMapper.xml

@@ -319,7 +319,7 @@
         ) as tab
     </select>
     <select id="findAlarmCountTotalCount" resultType="com.huaxu.dto.ParmTypeCountDto">
-        select count(1) as "totalCount" ,sum(tab.nbnormalCount) as "nbnormalCount" from(
+        select count(1) as "totalCount" ,ifnull(sum(tab.nbnormalCount),0) as "nbnormalCount" from(
         select a.PARENT_SCENE_ID,case when count(c.id)>0 then 1 else 0 end  as "nbnormalCount"
         from sms_device_scene a
         INNER JOIN sms_device_parm b on a.DEVICE_ID=b.DEVICE_ID and b.PARM_TYPE in (15,8,9,11,18,19)

user_auth/src/main/java/com/huaxu/service/impl/UserServiceImpl.java

@@ -250,9 +250,7 @@ public class UserServiceImpl implements UserService {
         if (StringUtils.isEmpty(value)){
             throw new ServiceException(ResultStatus.USER_AUTH_UNIQID_OR_CODE_ISNULL);
         }
-        UserAuthDto dto = JSONObject.parseObject(value,UserAuthDto.class);
-        dto.setMessage(key);
-        return dto;
+        return JSONObject.parseObject(value,UserAuthDto.class);
     }