处理噪音文件获取失败问题

处理辅助派工查询为空的问题
处理scada负数获取异常为0的问题

hnls-gis/src/main/java/com/tofly/xrtygis/controller/hk/HkController.java

@@ -5,9 +5,11 @@ import com.tofly.common.core.entity.ResultRespone;
 
 import com.tofly.xrtygis.entity.vo.HkParmDto;
 import com.tofly.xrtygis.service.HkService;
+import com.tofly.xrtygis.service.NoiseJobService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 @RestController
@@ -17,6 +19,7 @@ import org.springframework.web.bind.annotation.*;
 public class HkController {
     private final HkService hkService;
 
+    private final NoiseJobService noiseJobService;
 
     @PostMapping("/getPreviewURLs")
     @ApiOperation(value = "获取监控点预览取流URLv2")
@@ -24,4 +27,11 @@ public class HkController {
        return ResultRespone.success(hkService.GetCameraPreviewURL(dto));
     }
 
+    @GetMapping("/testNoiseFile")
+    @ApiOperation(value = "测试噪音文件")
+    public ResultRespone testNoiseFile() {
+        noiseJobService.sendNoiseInfo();
+        return ResultRespone.success();
+    }
+
 }

hnls-gis/src/main/java/com/tofly/xrtygis/custom/util/service/impl/IFileInfoServiceImpl.java

@@ -48,7 +48,7 @@ public class IFileInfoServiceImpl extends ServiceImpl<IFileMapper, IFile> implem
                 localFile.setFileSize(file.getSize() + "KB");
                 this.save(localFile);
                 //获得文件ID
-                filePaths.append(localFile.getFilePath()).append(",");
+                filePaths.append(localFile.getId()).append(",");
             }
         });
         if (filePaths.length() > 0) {

hnls-gis/src/main/java/com/tofly/xrtygis/service/impl/IndicatorCorrectionServiceImpl.java

@@ -60,7 +60,7 @@ public class IndicatorCorrectionServiceImpl extends ServiceImpl<IndicatorCorrect
         Date startDate = DateTimeUtil.localDateToDate(DateTimeUtil.getFirstDayOfCurrentSpecifiedMonth(time));
         Date localDateToDate = DateTimeUtil.localDateToDate(DateTimeUtil.getLastDayOfCurrentSpecifiedMonth(time));
         Date endDate = DateTimeUtil.convertLDTToDate(DateTimeUtil.getAssignTodayEndTime(DateTimeUtil.fromLong2LocalDateTime(localDateToDate.getTime())));
-        Date totalUserDate = DateTimeUtil.convertLDTToDate(time.minusMonths(1));
+        Date totalUserDate = DateTimeUtil.convertLDTToDate(time.plusMinutes(1));
         Map<Long, BigDecimal> userWaterMap = baseMapper.getDmaUserWaterConsumption(DateTimeUtil.getLocalDate(totalUserDate,DateTimeUtil.MONTHS_YEARS_FORMAT)).stream().collect(Collectors.toMap(DmaCalculatePramVo::getDmaId, DmaCalculatePramVo::getUserWaterConsumption, (key1, key2) -> key2));
         // 获取当前月份
         String yearMonth = DateTimeUtil.getLocalDate(reviseDate, DateTimeUtil.MONTHS_FORMAT);
@@ -193,7 +193,7 @@ public class IndicatorCorrectionServiceImpl extends ServiceImpl<IndicatorCorrect
         LocalDateTime time = DateTimeUtil.fromLong2LocalDateTime(reviseDate.getTime());
         Date startDate = DateTimeUtil.localDateToDate(DateTimeUtil.getFirstDayOfCurrentSpecifiedMonth(time));
         Date localDateToDate = DateTimeUtil.localDateToDate(DateTimeUtil.getLastDayOfCurrentSpecifiedMonth(time));
-        Date totalUserDate = DateTimeUtil.convertLDTToDate(time.minusMonths(1));
+        Date totalUserDate = DateTimeUtil.convertLDTToDate(time.plusMinutes(1));
         Date endDate = DateTimeUtil.convertLDTToDate(DateTimeUtil.getAssignTodayEndTime(DateTimeUtil.fromLong2LocalDateTime(localDateToDate.getTime())));
         BigDecimal mapperTotalUserWaterConsumption = baseMapper.getTotalUserWaterConsumption(DateTimeUtil.getLocalDate(totalUserDate,DateTimeUtil.MONTHS_YEARS_FORMAT));
         BigDecimal totalUserWaterConsumption = mapperTotalUserWaterConsumption == null ? BigDecimal.ZERO : mapperTotalUserWaterConsumption;

hnls-gis/src/main/java/com/tofly/xrtygis/service/impl/NoiseJobServiceImpl.java

@@ -147,10 +147,16 @@ public class NoiseJobServiceImpl implements NoiseJobService {
             List<MultipartFile> multipartFileList = new ArrayList<>();
             multipartFileList.add(multipartFile);
             StringBuilder builder = iFileInfoService.saveFileList(multipartFileList, filePath, "TF_NOISE_LOGGER_INFO_D");
-            // 根据返回的file表中文件id 存入对应噪音记录最新数据中
-            NoiseLoggerInfo loggerInfo = noiseLoggerInfoService.getMaxLastValueDateVo(k);
-            loggerInfo.setFileId(builder.toString());
-            noiseLoggerInfoService.updateById(loggerInfo);
+            // 根据返回的file表中文件id 存入对应噪音记录最新数据中 每天一条
+            List<NoiseLoggerInfo> list = noiseLoggerInfoService.list(new QueryWrapper<NoiseLoggerInfo>().lambda().eq(NoiseLoggerInfo::getMobileNumber, k));
+            if(null!=list && list.size()>0){
+               // 获取最新数据
+                Optional<NoiseLoggerInfo> max = list.stream().max(Comparator.comparingDouble(i -> i.getLastValueDate().getTime()));
+                NoiseLoggerInfo noiseLoggerInfo = max.get();
+                noiseLoggerInfo.setFileId(builder.toString());
+                noiseLoggerInfoService.updateById(noiseLoggerInfo);
+            }
+
 
 
         });

hnls-gps/hnls-gps-boot/src/main/java/com/tofly/gpsboot/service/maintain/impl/RepairorderServiceImpl.java

@@ -695,10 +695,13 @@ public class RepairorderServiceImpl extends ServiceImpl<RepairorderMapper, Repai
                     .collect(Collectors.toSet());
             longList.forEach(i->{
                 List<User> result = departmentClient.getDeptUserList(i).getResult();
-                userDeptMap.putAll(result.stream().collect(Collectors.toMap(User::getId, User::getDepartmentId, (key1, key2) -> key2)));
-                deptMap.putAll(result.stream().collect(Collectors.toMap(User::getDepartmentId, User::getDepartmentName, (key1, key2) -> key2)));
-                userList.addAll(result.stream().map(User::getId).collect(Collectors.toList()));
-                userIdNameMap.putAll(result.stream().collect(Collectors.toMap(User::getId, User::getRealName, (key1, key2) -> key2)));
+                if(null!=result && result.size()>0){
+                    userDeptMap.putAll(result.stream().collect(Collectors.toMap(User::getId, User::getDepartmentId, (key1, key2) -> key2)));
+                    deptMap.putAll(result.stream().collect(Collectors.toMap(User::getDepartmentId, User::getDepartmentName, (key1, key2) -> key2)));
+                    userList.addAll(result.stream().map(User::getId).collect(Collectors.toList()));
+                    userIdNameMap.putAll(result.stream().collect(Collectors.toMap(User::getId, User::getRealName, (key1, key2) -> key2)));
+                }
+
             });
         }
         StringBuilder stringBuilder = new StringBuilder();
@@ -798,7 +801,13 @@ public class RepairorderServiceImpl extends ServiceImpl<RepairorderMapper, Repai
         RepairOrderBaseInfoVo repairOrderBaseInfo = repairorderMapper.getRepairOrderBaseInfo(orderId);
         String state = repairOrderBaseInfo.getState();
         // 节点(1工单登记2维修/保养处理3维修审核4归档)
-        vo.setNode("1");
+        // 热线工单默认为2 工单处理
+        if("2".equals(repairOrderBaseInfo.getOrderSource())){
+            vo.setNode("2");
+        }else {
+            vo.setNode("1");
+        }
+
         // 处理中/驳回状态
         if (OrderStateEnum.ORDER_STATE_BEING_PERFORMED.getCode().equals(state) || OrderStateEnum.ORDER_STATE_REJECTED.getCode().equals(state)) {
             vo.setNode("2");

hnls-mis/hnls-mis-boot/src/main/java/com/tofly/xrtymis/custom/controller/GdglinfoController.java

@@ -46,6 +46,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -66,6 +67,7 @@ import java.util.stream.Collectors;
 @RestController
 @RequestMapping("/gdglinfo")
 @Api(tags = "业务工单详情表接口")
+@Slf4j
 public class GdglinfoController {
 
     @Autowired
@@ -1329,6 +1331,8 @@ public class GdglinfoController {
             respone.setMessage(b.getMsgDes());
         } catch (Exception e) {
             e.printStackTrace();
+            log.error(e.getMessage());
+
         }
         return respone;
     }

hnls-mis/hnls-mis-boot/src/main/java/com/tofly/xrtymis/custom/service/impl/GdglinfoServiceImpl.java

@@ -3995,7 +3995,7 @@ public class GdglinfoServiceImpl extends ServiceImpl<GdglinfoMapper, Gdglinfo> i
         // 获取当前用户部门今天已签到的所有用户最新位置信息列表
         List<AuxiliaryDispatchingVo> auxiliaryDispatchingVos = new ArrayList<>();
         List<AuxiliarySingleVo> result = orderClient.getAuxiliarySingle(StringUtils.isEmpty(deptIds) ? SecurityUtils.getUserDeptId() + "" : deptIds).getResult();
-        log.info("获取当前用户部门今天已签到的所有用户最新位置信息列表:{}",JSON.toJSONString(result));
+        log.info("获取当前用户部门今天已签到的所有用户最新位置信息列表:{}", JSON.toJSONString(result));
         if (null != result && result.size() > 0) {
             // 获取用户列表
             Set<Long> userIdList = result.stream().map(AuxiliarySingleVo::getUserId).collect(Collectors.toSet());
@@ -4007,13 +4007,16 @@ public class GdglinfoServiceImpl extends ServiceImpl<GdglinfoMapper, Gdglinfo> i
                     .in(Dutyroster::getDutyUser, userIdList));
 
             auxiliaryDispatchingVos = JSONArray.parseArray(JSON.toJSONString(result), AuxiliaryDispatchingVo.class);
-            if (null != list && list.size() > 0) {
+            log.info("业务工单辅助派工列表{}", JSON.toJSONString(auxiliaryDispatchingVos));
+            if (null != list && list.size() > 0 && auxiliaryDispatchingVos.size() > 0) {
                 Map<Long, Dutyroster> collect = list.stream().collect(Collectors.toMap(Dutyroster::getDutyUser, a -> a, (k1, k2) -> k2));
                 auxiliaryDispatchingVos.forEach(info -> {
                     Long userId = info.getUserId();
                     Dutyroster dutyroster = collect.get(userId);
-                    info.setWorkTime(dutyroster.getWorkTime());
-                    info.setWorkTimeName(dutyroster.getWorkName());
+                    if(null!=dutyroster){
+                        info.setWorkTime(dutyroster.getWorkTime());
+                        info.setWorkTimeName(dutyroster.getWorkName());
+                    }
                 });
             }
 

hnls-scada/src/main/java/com/tofly/scada/entity/vo/StatisticsScadaVo.java

@@ -4,10 +4,12 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.KeySequence;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.tofly.scada.entity.ScadaReport;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -18,8 +20,6 @@ import java.util.List;
  * @TableName STATISTICS_SCADA
  */
 @Data
-@TableName(value = "STATISTICS_SCADA")
-@KeySequence("STATISTICS_SCADA")
 @EqualsAndHashCode
 public class StatisticsScadaVo implements Serializable {
     /**
@@ -44,16 +44,27 @@ public class StatisticsScadaVo implements Serializable {
     private Integer statisticsType;
 
     @ApiModelProperty(value = "指标采集时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date scadaTime;
 
+    @ApiModelProperty(value = "指标更新时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+
     /**
      * 统计开始时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date startTime;
 
     /**
      * 统计结束时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date endTime;
 
     /**

hnls-scada/src/main/java/com/tofly/scada/mapper/StatisticsScadaMapper.java

@@ -29,7 +29,7 @@ public interface StatisticsScadaMapper extends BaseMapper<StatisticsScada> {
      * @param queryWrapper 条件
      * @return
      */
-    @Select("SELECT scada.*,manage.NAME name,manage.MAKE_DATE makeDate,manage.TYPE type," +
+    @Select("SELECT scada.CODE code,scada.value value,scada.SCADA_TIME scadaTime,scada.UPDATE_TIME updateTime,manage.NAME name,manage.MAKE_DATE makeDate,manage.TYPE type," +
             "manage.MANUFACTURER manufacturer,manage.LEADER leader,manage.PHONE phone," +
             "allocation.DISPLAY_NAME displayName, allocation.VARIABLE_NAME variableName, " +
             "allocation.UNIT unit" +
@@ -63,7 +63,7 @@ public interface StatisticsScadaMapper extends BaseMapper<StatisticsScada> {
      * @param queryWrapper 条件
      * @return
      */
-    @Select("SELECT scada.*,manage.NAME name,manage.MAKE_DATE makeDate,manage.TYPE type," +
+    @Select("SELECT scada.CODE code,scada.value value,scada.SCADA_TIME scadaTime,scada.UPDATE_TIME updateTime,manage.NAME name,manage.MAKE_DATE makeDate,manage.TYPE type," +
             "manage.MANUFACTURER manufacturer,manage.LEADER leader,manage.PHONE phone," +
             "allocation.DISPLAY_NAME displayName, allocation.VARIABLE_NAME variableName, " +
             "allocation.UNIT unit" +
@@ -82,7 +82,7 @@ public interface StatisticsScadaMapper extends BaseMapper<StatisticsScada> {
      * @param queryWrapper 条件
      * @return
      */
-    @Select("SELECT scada.*,manage.NAME name,manage.MAKE_DATE makeDate,manage.TYPE type," +
+    @Select("SELECT scada.CODE code,scada.value value,scada.SCADA_TIME scadaTime,scada.UPDATE_TIME updateTime,manage.NAME name,manage.MAKE_DATE makeDate,manage.TYPE type," +
             "manage.MANUFACTURER manufacturer,manage.LEADER leader,manage.PHONE phone," +
             "allocation.DISPLAY_NAME displayName, allocation.VARIABLE_NAME variableName, " +
             "allocation.UNIT unit" +
@@ -105,7 +105,7 @@ public interface StatisticsScadaMapper extends BaseMapper<StatisticsScada> {
      * @param queryWrapper 条件
      * @return
      */
-    @Select("SELECT scada.*,manage.NAME name,manage.MAKE_DATE makeDate,manage.TYPE type," +
+    @Select("SELECT scada.CODE code,scada.value value,scada.SCADA_TIME scadaTime,scada.UPDATE_TIME updateTime,manage.NAME name,manage.MAKE_DATE makeDate,manage.TYPE type," +
             "manage.MANUFACTURER manufacturer,manage.LEADER leader,manage.PHONE phone," +
             "allocation.DISPLAY_NAME displayName, allocation.VARIABLE_NAME variableName, " +
             "allocation.UNIT unit" +

hnls-scada/src/main/resources/mapper/ScadaMapper.xml

@@ -80,7 +80,7 @@
         <foreach collection="mouthTables" item="item" separator="union all">
             SELECT scada.ID,
             scada.CODE,
-            case WHEN trim(translate(scada.VALUE,'0123456789.',' ')) is NULL THEN
+            case WHEN trim(translate(scada.VALUE,'-0123456789.',' ')) is NULL THEN
             ROUND(to_number(scada.VALUE),nvl(allocation.accuracy,0)) ELSE 0 END VALUE,
             scada.SCADA_TIME,
             scada.UPDATE_TIME,
@@ -107,7 +107,7 @@
         <foreach collection="mouthTables" item="item" separator="union all">
             SELECT scada.ID,
             scada.CODE,
-            case WHEN trim(translate(scada.VALUE,'0123456789.',' ')) is NULL THEN
+            case WHEN trim(translate(scada.VALUE,'-0123456789.',' ')) is NULL THEN
             ROUND(to_number(scada.VALUE),nvl(allocation.accuracy,0)) ELSE 0 END VALUE,
             scada.SCADA_TIME,
             scada.UPDATE_TIME,