#MOD 设备故障 售后

device-api-service/src/main/java/com/xy/entity/DeviceFaultInfo.java

@@ -68,5 +68,8 @@ public class DeviceFaultInfo implements Serializable {
     @ApiModelProperty(value = "故障级别-字典：device_fault_level")
     private Integer faultLevel;
 
+    @ApiModelProperty(value = "是否转售后")
+    private Boolean toAfterSale;
+
 
 }

device-api-service/src/main/java/com/xy/service/DeviceFaultInfoServiceImpl.java

@@ -1,14 +1,18 @@
 package com.xy.service;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xy.collections.list.JArrayList;
 import com.xy.collections.map.JMap;
+import com.xy.consts.CommConsts;
 import com.xy.dto.DeviceFaultInfoDto;
 import com.xy.dto.DeviceFaultInfoFlowDto;
+import com.xy.dto.SysWorkUser.ListDto;
+import com.xy.dto.SysWorkUser.SysWorkVo;
 import com.xy.dto.be.MercDto;
 import com.xy.entity.DeviceFaultInfo;
 import com.xy.entity.DeviceFaultLog;
@@ -16,10 +20,7 @@ import com.xy.entity.DeviceInfo;
 import com.xy.error.CommRuntimeException;
 import com.xy.mapper.DeviceFaultInfoMapper;
 import com.xy.service.be.MercService;
-import com.xy.utils.Emptys;
-import com.xy.utils.MybatisPlusQuery;
-import com.xy.utils.PageBean;
-import com.xy.utils.R;
+import com.xy.utils.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
@@ -55,6 +56,7 @@ public class DeviceFaultInfoServiceImpl extends ServiceImpl<DeviceFaultInfoMappe
     private final MercService mercService;
     private final DeviceInfoServiceImpl deviceInfoService;
     private final DeviceFaultInfoFlowServiceImpl deviceFaultInfoFlowService;
+    private final SysWorkUserService sysWorkUserService;
 
     @PostMapping("obj")
     @ApiOperation("对象查询")
@@ -85,6 +87,14 @@ public class DeviceFaultInfoServiceImpl extends ServiceImpl<DeviceFaultInfoMappe
                 .eqWrapper(page, DeviceFaultInfo.class).build()
                 .ge(beginTime != null, DeviceFaultInfo::getCreateTime, beginTime)
                 .le(endTime != null, DeviceFaultInfo::getCreateTime, endTime);
+
+        Long sysId = AuthorizeUtils.getSysId();
+        List<String> roleCodes = AuthorizeUtils.getRoleCodes(sysId);
+        //售后角色只看转售后的，其他角色看所有
+        if(roleCodes.contains(CommConsts.MERC_SH_ADMIN)){
+            lambdaQueryWrapper.eq(DeviceFaultInfo::getToAfterSale,true);
+        }
+
         IPage<DeviceFaultInfo> iPage = page(toIPage(pageBean), lambdaQueryWrapper);
         PageBean<DeviceFaultInfoDto.Vo> data = toPageBean(DeviceFaultInfoDto.Vo.class, iPage);
         List<DeviceFaultInfoDto.Vo> records = data.getRecords();

device-api-service/src/main/java/com/xy/service/DeviceMqttConsumerImpl.java

@@ -232,7 +232,7 @@ public class DeviceMqttConsumerImpl implements DeviceMqttConsumer {
                 Long minuteNum = config.getMinuteNum();
                 Integer faultLevel = config.getFaultLevel();
                 Long monitorId = config.getMonitorId();
-
+                Boolean toAfterSale = config.getToAfterSale();
                 // 获取当前时间
                 Date now = DateUtil.date();
 
@@ -261,6 +261,7 @@ public class DeviceMqttConsumerImpl implements DeviceMqttConsumer {
                         if (faultLevel1.intValue() < faultLevel) {
                             //小于，当前故障级别，更新
                             deviceFaultInfo.setFaultLevel(faultLevel);
+                            deviceFaultInfo.setToAfterSale(toAfterSale);
                             deviceInfoService.updateById(new DeviceInfo().setDeviceId(deviceId).setFaultLevel(faultLevel));
                         }
                         //累加次数
@@ -276,6 +277,7 @@ public class DeviceMqttConsumerImpl implements DeviceMqttConsumer {
                                 .setEventCode(code)
                                 .setEventNum(count.intValue())
                                 .setMonitorId(monitorId)
+                                .setToAfterSale(toAfterSale)
                         );
                         deviceInfoService.updateById(new DeviceInfo().setDeviceId(deviceId).setFaultLevel(faultLevel));
                     }

device-api/src/main/java/com/xy/dto/DeviceFaultInfoDto.java

@@ -99,6 +99,8 @@ public class DeviceFaultInfoDto {
         @ApiModelProperty(value = "监控ID")
         private Long monitorId;
 
+        @ApiModelProperty(value = "是否转售后")
+        private Boolean toAfterSale;
 
     }