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

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(){

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/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

sms_water/src/main/java/com/huaxu/service/impl/RankingServiceImpl.java

@@ -50,6 +50,7 @@ public class RankingServiceImpl implements RankingService {
             if (sceneDeviceDto.getAttributeId() == null) {
                 continue;
             }
+            // 根据设备code，从redis获取设备的数据
             cacheKey = String.format(SMS_WATER_CACHE_KEY, sceneDeviceDto.getDeviceCode());
             byte[] bytes = redisUtil.get(cacheKey.getBytes());
             if(bytes == null || bytes.length == 0) {
@@ -63,7 +64,7 @@ public class RankingServiceImpl implements RankingService {
             for (MonitorDataValueEntity monitorEntity:monitorList ) {
                 if (sceneDeviceDto.getAttributeId().equals(monitorEntity.getAttributeId())){
                     RankingDto rankingDto = new RankingDto();
-                    rankingDto.setName(monitorEntity.getAttributeName());
+                    rankingDto.setName(sceneDeviceDto.getDeviceName());
                     rankingDto.setScore(monitorEntity.getDataValue());
                     result.add(rankingDto);
                     break;

sms_water/src/main/java/com/huaxu/service/impl/RevenueServiceImpl.java

@@ -54,13 +54,17 @@ public class RevenueServiceImpl implements RevenueService {
         monthSellwaterDto.setPermissonType(loginUser.getPermissonType());
         List<MonthSellwaterDto> monthSell=revenueMapper.selectMonthSell(monthSellwaterDto);
         List<MonthSellwaterDto> result=new ArrayList<>();
-        Double othersUsage=0d;
+        Double othersUsage=null;
         if(monthSell.size()>4){
             for(int i=0;i<monthSell.size();i++){
                 if(i<3){
                     result.add(monthSell.get(i));
                 } else{
-                    othersUsage+=monthSell.get(i).getWaterUsage();
+                    if(monthSell.get(i).getWaterUsage()!=null&&othersUsage!=null){
+                        othersUsage+=monthSell.get(i).getWaterUsage();
+                    }else if(monthSell.get(i).getWaterUsage()!=null){
+                        othersUsage=monthSell.get(i).getWaterUsage();
+                    }
                 }
             }
             monthSellwaterDto.setPropertyName("其他用水");

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);
     }