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

# Conflicts:
#	gateway/src/main/resources/application-prd.properties

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

@@ -365,6 +365,22 @@ public class WorkOrderManageController {
         return new AjaxMessage<>(ResultStatus.OK, pages);
     }
 
+    @GetMapping("/order/selectByNo")
+    @ApiOperation(value = "查询事件隐患/所有工单")
+    public AjaxMessage<Pagination<WorkOrderManageDto>> selectByNo(
+            @ApiParam(value = "页数", required = true)@RequestParam Integer pageNum,
+            @ApiParam(value = "条数", required = true)@RequestParam Integer pageSize,
+            @ApiParam(value = "单号", required = true) @RequestParam(required = true) String taskNo){
+        WorkOrderManageDto workOrderManageDto = new WorkOrderManageDto();
+        //根据用户编号，获取用户的权限
+        workOrderManageDto.setTaskNo(taskNo);
+        IPage<WorkOrderManageDto> iPage = new Page<>(pageNum, pageSize);
+        iPage = workOrderManageService.selectByNo(iPage, workOrderManageDto);
+        Pagination<WorkOrderManageDto> pages = new Pagination<>(iPage);
+        setName(pages.getList());
+        return new AjaxMessage<>(ResultStatus.OK, pages);
+    }
+
     @GetMapping("/maintain/order")
     @ApiOperation(value = "维护列表/工单")
     public AjaxMessage<List<WorkOrderManageDto>> selectMaintainOrder(){
@@ -377,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);
     }
 
@@ -839,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);
@@ -848,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/dao/WorkOrderManageMapper.java

@@ -43,6 +43,8 @@ public interface WorkOrderManageMapper {
 
     Page<WorkOrderManageDto> findPage(IPage<WorkOrderManageDto> page, @Param("order") WorkOrderManageDto workOrderManageDto);
 
+    Page<WorkOrderManageDto> findByNo(IPage<WorkOrderManageDto> page, @Param("order") WorkOrderManageDto workOrderManageDto);
+
     List<WorkOrderManageDto> selectMaintainOrder(@Param("order") WorkOrderManageDto workOrderManageDto);
 
     List<WorkOrderManage> selectByPId(Map<String,Object> map);

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/java/com/huaxu/order/service/WorkOrderManageService.java

@@ -66,6 +66,9 @@ public interface WorkOrderManageService {
     Page<WorkOrderManageDto> selectPage(IPage<WorkOrderManageDto> page, @Param("order") WorkOrderManageDto workOrderManageDto);
 
 
+    Page<WorkOrderManageDto> selectByNo(IPage<WorkOrderManageDto> page,@Param("order") WorkOrderManageDto workOrderManageDto);
+
+
     /**
      * 根据orderPid查询
      */

operation_manager/src/main/java/com/huaxu/order/service/impl/WorkOrderManageServiceImpl.java

@@ -113,6 +113,11 @@ public class WorkOrderManageServiceImpl implements WorkOrderManageService {
         return workOrderManageMapper.findPage(page,workOrderManageDto);
     }
 
+    @Override
+    public Page<WorkOrderManageDto> selectByNo(IPage<WorkOrderManageDto> page,WorkOrderManageDto workOrderManageDto) {
+        return workOrderManageMapper.findByNo(page,workOrderManageDto);
+    }
+
     @Override
     public List<WorkOrderManage> selectByPId(Map<String, Object> map) {
         return workOrderManageMapper.selectByPId(map);

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

@@ -568,6 +568,25 @@
         update sc_work_order_manage set task_desc =#{workOrderManage.taskDesc} ,date_update = now() where id=#{workOrderManage.id}
   </update>
 
+  <select id="findByNo" resultMap="OrderResultMap">
+    select
+    t1.id, t1.task_no, t1.task_desc, t1.order_user_id, t1.send_time, t1.send_by, t1.plan_finish_date, t1.finish_date,
+    t1.date_limit, t1.urgency, t1.address, t1.contact_user, t1.contact_phone, t1.order_time, t1.company_org_id,
+    t1.department_org_id, t1.order_status, t1.event_type,case when t1.event_type=1 then '运维上报' when t1.event_type=2 then '用户上报' when t1.event_type=3 then '设备告警' end  event_type_name,
+    t1.order_type_id, t1.order_pid, t1.tenant_id,
+    t1.process_instance_id, t1.process_def_id, t1.current_task_id, t1.current_users, t1.current_task_name,
+    t1.create_by, t1.date_create, t1.update_by, t1.date_update, t1.geo,t1.videos,t1.pictures,
+    t1.device_id, t1.scenes_id, t1.device_name, t1.scenes_name,
+    t2.flow_detail,t2.create_by detail_create_by,t2.date_create detail_date_create,t2.update_by detail_update_by,t2.date_update detail_date_update
+    from sc_work_order_manage t1 left  join sc_work_flow_detail t2
+    on t1.id = t2.flow_id and t2.flow_type=2
+    <where>
+      <if test="order.taskNo != null and order.taskNo != ''">
+        and t1.task_no = #{order.taskNo}
+      </if>
+    </where>
+  </select>
+
   <!--分页查询-->
   <select id="findPage" resultMap="OrderResultMap">
     select
@@ -647,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>
@@ -773,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);
     }