设备列表添加mqtt连接状态属性

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/CsEquipmentDeliveryVO.java

@@ -86,6 +86,9 @@ public class CsEquipmentDeliveryVO extends BaseEntity {
     @ApiModelProperty(value="装置使用状态(0:停用 1:启用)")
     private Integer usageStatus ;
 
+    @ApiModelProperty(value="装置与MQTT服务器连接状态")
+    private String connectStatus ;
+
     private Integer sort;
 
 }

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/EquipmentDeliveryController.java

@@ -4,7 +4,9 @@ import cn.afterturn.easypoi.excel.ExcelExportUtil;
 import cn.afterturn.easypoi.excel.entity.ExportParams;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.njcn.access.utils.MqttUtil;
 import com.njcn.common.pojo.annotation.OperateInfo;
+import com.njcn.common.pojo.dto.DeviceLogDTO;
 import com.njcn.common.pojo.enums.common.LogEnum;
 import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.response.HttpResult;
@@ -63,10 +65,8 @@ import java.util.stream.Stream;
 public class EquipmentDeliveryController extends BaseController {
 
     private final CsEquipmentDeliveryService csEquipmentDeliveryService;
-
     private final IMqttUserService mqttUserService;
     private final CsDevModelRelationService csDevModelRelationService;
-
     private  final DictTreeFeignClient dictTreeFeignClient;
 
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
@@ -178,14 +178,6 @@ public class EquipmentDeliveryController extends BaseController {
     public HttpResult<Page<CsEquipmentDeliveryVO>> list(@RequestBody CsEquipmentDeliveryQueryParm param){
         String methodDescribe = getMethodDescribe("list");
         Page<CsEquipmentDeliveryVO> page = csEquipmentDeliveryService.list(param);
-        //新增逻辑(只针对便携式设备):修改设备中的未注册状态(status = 1)改为5(前端定义的字典也即未接入)
-        for(CsEquipmentDeliveryVO csEquipmentDeliveryVO : page.getRecords()){
-            if(DataParam.portableDevType.equals(csEquipmentDeliveryVO.getDevType()) && csEquipmentDeliveryVO.getStatus() == 1){
-                csEquipmentDeliveryVO.setStatus(5);
-            } else if (DataParam.portableDevType.equals(csEquipmentDeliveryVO.getDevType()) && csEquipmentDeliveryVO.getStatus() == 2) {
-                csEquipmentDeliveryVO.setStatus(6);
-            }
-        }
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, page, methodDescribe);
     }
 
@@ -257,7 +249,18 @@ public class EquipmentDeliveryController extends BaseController {
     @PostMapping(value = "importEquipment")
     public HttpResult<String> importEquipment(@ApiParam(value = "文件", required = true) @RequestPart("file") MultipartFile file, HttpServletResponse response) {
         String methodDescribe = getMethodDescribe("importEquipment");
-        csEquipmentDeliveryService.importEquipment(file, response);
+        List<CsEquipmentDeliveryPO> csEquipmentDeliveryPOS = csEquipmentDeliveryService.importEquipment(file, response);
+        if (!CollectionUtils.isEmpty(csEquipmentDeliveryPOS)){
+            csEquipmentDeliveryPOS.forEach(temp->{
+                //查询mqtt用户名和密码是否存在
+                boolean result = mqttUserService.findMqttUser(temp.getNdid());
+                if (result){
+                    //初始化装置mqtt连接信息(使用sha256加密)
+                    mqttUserService.insertMqttUser(temp.getNdid());
+                }
+            });
+
+        }
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
     }
     @ResponseBody

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsEquipmentDeliveryService.java

@@ -99,7 +99,7 @@ public interface CsEquipmentDeliveryService extends IService<CsEquipmentDelivery
      */
     CsEquipmentDeliveryPO findDevByNDid(String nDid);
 
-    void importEquipment(MultipartFile file, HttpServletResponse response);
+    List<CsEquipmentDeliveryPO> importEquipment(MultipartFile file, HttpServletResponse response);
 
     void delete(String devId);
 

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java

@@ -18,6 +18,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.njcn.access.api.AskDeviceDataFeignClient;
+import com.njcn.access.utils.MqttUtil;
 import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.csdevice.constant.DataParam;
 import com.njcn.csdevice.enums.AlgorithmResponseEnum;
@@ -93,7 +94,8 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
     private final AskDeviceDataFeignClient askDeviceDataFeignClient;
     private final RedisUtil redisUtil;
     private final CsSoftInfoMapper csSoftInfoMapper;
-
+    private final IMqttUserService mqttUserService;
+    private final MqttUtil mqttUtil;
     @Override
     public void refreshDeviceDataCache() {
         LambdaQueryWrapper<CsEquipmentDeliveryPO> queryWrapper = new LambdaQueryWrapper<>();
@@ -311,6 +313,22 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
                 item.setQrPath(item.getQrPath());
             }
         });
+        //新增逻辑(只针对便携式设备):修改设备中的未注册状态(status = 1)改为5(前端定义的字典也即未接入)
+        for(CsEquipmentDeliveryVO csEquipmentDeliveryVO : page.getRecords()){
+            if(DataParam.portableDevType.equals(csEquipmentDeliveryVO.getDevType()) && csEquipmentDeliveryVO.getStatus() == 1){
+                csEquipmentDeliveryVO.setStatus(5);
+            } else if (DataParam.portableDevType.equals(csEquipmentDeliveryVO.getDevType()) && csEquipmentDeliveryVO.getStatus() == 2) {
+                csEquipmentDeliveryVO.setStatus(6);
+            }
+            //判断装置是否已经连接上mqtt服务器
+            String clientName = "NJCN-" + csEquipmentDeliveryVO.getNdid().substring(csEquipmentDeliveryVO.getNdid().length() - 6);
+            boolean mqttClient = mqttUtil.judgeClientOnline(clientName);
+            if (mqttClient) {
+                csEquipmentDeliveryVO.setConnectStatus("已连接");
+            } else {
+                csEquipmentDeliveryVO.setConnectStatus("未连接");
+            }
+        }
         return page;
     }
 
@@ -446,7 +464,7 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void importEquipment(MultipartFile file, HttpServletResponse response) {
+    public List<CsEquipmentDeliveryPO> importEquipment(MultipartFile file, HttpServletResponse response) {
         ImportParams params = new ImportParams ( );
         params.setHeadRows(1);
         params.setTitleRows(1);
@@ -548,17 +566,20 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
                 }).collect (Collectors.toList ( ));
                 csEquipmentProcessPOService.saveBatch(collect1,500);
                 this.saveOrUpdateBatch (collect, 500);
+
+                return collect;
             }
             if (!CollectionUtils.isEmpty (falseCollect)) {
                 ExportParams exportExcel = new ExportParams ("批量导入模板（请严格按照模板标准填入数据）", "非法设备信息");
                 Workbook workbook = ExcelExportUtil.exportExcel (exportExcel, DeviceExcelTemplete.IllegalityDeviceExcelTemplete.class, falseCollect);
                 ExcelStyleUtil.exportFileByWorkbook (workbook, "非法设备信息.xlsx", response);
-
+                return null;
             }
 
         } catch (Exception e) {
             e.printStackTrace ( );
         }
+        return null;
     }
     /*
     * 物理删除设备相关数据

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsGroupServiceImpl.java

@@ -337,8 +337,8 @@ public class CsGroupServiceImpl extends ServiceImpl<CsGroupMapper, CsGroup> impl
                                 if (Objects.equals("Primary",commonStatisticalQueryParam.getDataLevel())) {
                                     if (Objects.equals("Primary",csDataSet.getDataLevel())) {
                                         if (HarmonicConstant.POWER_LIST.contains(epdPqd.getShowName())) {
-                                            re = Objects.isNull(temp.getValue()) ? 3.14159 : temp.getValue() / 1000;
+                                            re = Objects.isNull(temp.getValue()) ? 3.14159 : Double.parseDouble(df.format(temp.getValue() / 1000));
-                                            vo.setStatisticalData(Double.valueOf(df.format(re)));
+                                            vo.setStatisticalData(re);
                                             unit = "k" + epdPqd.getUnit();
                                         } else {
                                             vo.setStatisticalData(Objects.isNull(temp.getValue()) ? 3.14159 : Double.parseDouble(df.format(temp.getValue())));

cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/DataServiceImpl.java

@@ -220,8 +220,8 @@ public class DataServiceImpl implements IDataService {
         if (Objects.equals("Primary",dataLevel)) {
             if (Objects.equals("Primary",csDataSetLevel)) {
                 if (HarmonicConstant.POWER_LIST.contains(item2.getShowName())) {
-                    re = Objects.isNull(statisticalDataDTO) ? 3.14159 : statisticalDataDTO.getValue() / 1000;
+                    re = Objects.isNull(statisticalDataDTO) ? 3.14159 : Double.parseDouble(df.format(statisticalDataDTO.getValue() / 1000));
-                    vo.setAvgValue(Double.valueOf(df.format(re)));
+                    vo.setAvgValue(re);
                     unit = "k" + item2.getUnit();
                 } else {
                     vo.setAvgValue(Objects.isNull(statisticalDataDTO) ? 3.14159 : Double.parseDouble(df.format(statisticalDataDTO.getValue())));