1.移植程序软件接口；

2.返回文件上传、下载进度信息
2024-09-19 14:26:29 +08:00
parent 32520907d2
commit b59c85e791
11 changed files with 57 additions and 233 deletions
--- a/iot-access/access-boot/src/main/java/com/njcn/access/controller/CsSoftInfoController.java
+++ b/iot-access/access-boot/src/main/java/com/njcn/access/controller/CsSoftInfoController.java
@@ -1,52 +0,0 @@
-package com.njcn.access.controller;
-
-
-import com.njcn.access.mapper.CsSoftInfoMapper;
-import com.njcn.access.pojo.po.CsSoftInfoPO;
-import com.njcn.common.pojo.annotation.OperateInfo;
-import com.njcn.common.pojo.enums.common.LogEnum;
-import com.njcn.common.pojo.enums.response.CommonResponseEnum;
-import com.njcn.common.pojo.response.HttpResult;
-import com.njcn.common.utils.HttpResultUtil;
-import com.njcn.web.controller.BaseController;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiOperation;
-import lombok.AllArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 系统软件表 前端控制器
- * </p>
- *
- * @author xuyang
- * @since 2023-08-09
- */
-@Slf4j
-@RestController
-@RequestMapping("/csSoftInfo")
-@Api(tags = "装置程序信息")
-@AllArgsConstructor
-@Validated
-public class CsSoftInfoController extends BaseController {
-
-    private final CsSoftInfoMapper csSoftInfoMapper;
-
-    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
-    @PostMapping("/findSoftInfo")
-    @ApiOperation("获取程序软件信息")
-    @ApiImplicitParam(name = "id", value = "id", required = true)
-    public HttpResult<CsSoftInfoPO> findSoftInfo(@RequestParam String id){
-        String methodDescribe = getMethodDescribe("findSoftInfo");
-        CsSoftInfoPO po = csSoftInfoMapper.selectById(id);
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, po, methodDescribe);
-    }
-
-}
-
--- a/iot-access/access-boot/src/main/java/com/njcn/access/handler/MqttMessageHandler.java
+++ b/iot-access/access-boot/src/main/java/com/njcn/access/handler/MqttMessageHandler.java
@@ -21,17 +21,16 @@ import com.njcn.access.pojo.dto.file.FileRedisDto;
 import com.njcn.access.pojo.param.ReqAndResParam;
 import com.njcn.access.pojo.po.CsDeviceOnlineLogs;
 import com.njcn.access.pojo.po.CsLineModel;
-import com.njcn.access.pojo.po.CsSoftInfoPO;
 import com.njcn.access.pojo.po.CsTopic;
-import com.njcn.access.service.*;
+import com.njcn.access.service.ICsDeviceOnlineLogsService;
+import com.njcn.access.service.ICsEquipmentDeliveryService;
+import com.njcn.access.service.ICsLineModelService;
+import com.njcn.access.service.ICsTopicService;
 import com.njcn.common.pojo.dto.DeviceLogDTO;
 import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.csdevice.api.*;
 import com.njcn.csdevice.pojo.param.CsLineParam;
-import com.njcn.csdevice.pojo.po.CsDataSet;
-import com.njcn.csdevice.pojo.po.CsDevCapacityPO;
-import com.njcn.csdevice.pojo.po.CsDevModelPO;
-import com.njcn.csdevice.pojo.po.CsEquipmentDeliveryPO;
+import com.njcn.csdevice.pojo.po.*;
 import com.njcn.mq.message.AppAutoDataMessage;
 import com.njcn.mq.message.AppEventMessage;
 import com.njcn.mq.message.AppFileMessage;
@@ -53,8 +52,6 @@ import org.springframework.transaction.annotation.Transactional;
 import javax.validation.ConstraintViolation;
 import javax.validation.Validator;
 import java.nio.charset.StandardCharsets;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
 import java.time.Instant;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
@@ -101,7 +98,8 @@ public class MqttMessageHandler {

    private final ICsDeviceOnlineLogsService onlineLogsService;

-    private final ICsSoftInfoService csSoftInfoService;
+    @Autowired
+    private final CsSoftInfoFeignClient csSoftInfoFeignClient;

    private final CsLineFeignClient csLineFeignClient;

@@ -394,12 +392,12 @@ public class MqttMessageHandler {
                            LocalDateTime localDateTime = LocalDateTime.parse(softInfo.getAppDate(), formatter);
                            assertThat(localDateTime).isNotNull();
                            csSoftInfoPo.setAppDate(localDateTime);
-                            csSoftInfoService.save(csSoftInfoPo);
+                            csSoftInfoFeignClient.saveSoftInfo(csSoftInfoPo);
                            //更新设备软件id  先看是否存在软件信息,删除 然后在录入
                            CsEquipmentDeliveryPO po = equipmentFeignClient.findDevByNDid(nDid).getData();
                            String soft = po.getSoftinfoId();
                            if (StringUtil.isNotBlank(soft)){
-                                csSoftInfoService.removeById(soft);
+                                csSoftInfoFeignClient.removeSoftInfo(soft);
                            }
                            equipmentFeignClient.updateSoftInfo(nDid,csSoftInfoPo.getId());
                            //询问设备容量信息
--- a/iot-access/access-boot/src/main/java/com/njcn/access/mapper/CsSoftInfoMapper.java
+++ b/iot-access/access-boot/src/main/java/com/njcn/access/mapper/CsSoftInfoMapper.java
@@ -1,16 +0,0 @@
-package com.njcn.access.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.njcn.access.pojo.po.CsSoftInfoPO;
-
-/**
- * <p>
- * 系统软件表 Mapper 接口
- * </p>
- *
- * @author xuyang
- * @since 2023-08-09
- */
-public interface CsSoftInfoMapper extends BaseMapper<CsSoftInfoPO> {
-
-}
--- a/iot-access/access-boot/src/main/java/com/njcn/access/service/ICsSoftInfoService.java
+++ b/iot-access/access-boot/src/main/java/com/njcn/access/service/ICsSoftInfoService.java
@@ -1,16 +0,0 @@
-package com.njcn.access.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.njcn.access.pojo.po.CsSoftInfoPO;
-
-/**
- * <p>
- * 系统软件表 服务类
- * </p>
- *
- * @author xuyang
- * @since 2023-08-09
- */
-public interface ICsSoftInfoService extends IService<CsSoftInfoPO> {
-
-}
--- a/iot-access/access-boot/src/main/java/com/njcn/access/service/impl/AskDeviceDataServiceImpl.java
+++ b/iot-access/access-boot/src/main/java/com/njcn/access/service/impl/AskDeviceDataServiceImpl.java
@@ -1,5 +1,7 @@
 package com.njcn.access.service.impl;

+import cn.hutool.core.collection.CollectionUtil;
+import com.alibaba.fastjson.JSON;
 import com.alibaba.nacos.shaded.com.google.gson.Gson;
 import com.github.tocrhz.mqtt.publisher.MqttPublisher;
 import com.njcn.access.api.CsTopicFeignClient;
@@ -14,6 +16,7 @@ import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.csdevice.enums.AlgorithmResponseEnum;
 import com.njcn.redis.pojo.enums.AppRedisKey;
 import com.njcn.redis.utils.RedisUtil;
+import com.njcn.zlevent.pojo.dto.FileStreamDto;
 import com.njcn.zlevent.pojo.dto.NoticeUserDto;
 import lombok.RequiredArgsConstructor;
 import net.sf.json.JSONObject;
@@ -106,6 +109,13 @@ public class AskDeviceDataServiceImpl implements AskDeviceDataService {
                if (!Objects.isNull(object2)) {
                    result = true;
                    break;
+                } else {
+                    Object object3 = redisUtil.getObjectByKey(AppRedisKey.FILE_PART.concat(name));
+                    if (!Objects.isNull(object3)) {
+                        FileStreamDto dto = JSON.parseObject(JSON.toJSONString(object3), FileStreamDto.class);
+                        String json = "{allStep:"+dto.getTotal()+",nowStep:"+ (CollectionUtil.isEmpty(dto.getList())?0:dto.getList().size())+"}";
+                        publisher.send("/Web/Progress/" + nDid, new Gson().toJson(json), 1, false);
+                    }
                }
            }
            mid = mid + 1;
--- a/iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsDevModelServiceImpl.java
+++ b/iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsDevModelServiceImpl.java
@@ -191,8 +191,8 @@ public class CsDevModelServiceImpl implements ICsDevModelService {
                int times = bytes.length / cap + 1;
                for (int i = 1; i <= times; i++) {
                    //发送数据给前端
-                    String json = "{allStep:\""+times+"\",nowStep:"+i+"}";
-                    publisher.send("/Web/Progress", new Gson().toJson(json), 1, false);
+                    String json = "{allStep:"+times+",nowStep:"+i+"}";
+                    publisher.send("/Web/Progress/" + id, new Gson().toJson(json), 1, false);
                    DeviceLogDTO logDto = new DeviceLogDTO();
                    byte[] lsBytes;
                    if (length > 50*1024) {
--- a/iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsSoftInfoServiceImpl.java
+++ b/iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsSoftInfoServiceImpl.java
@@ -1,20 +0,0 @@
-package com.njcn.access.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.njcn.access.mapper.CsSoftInfoMapper;
-import com.njcn.access.pojo.po.CsSoftInfoPO;
-import com.njcn.access.service.ICsSoftInfoService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 系统软件表 服务实现类
- * </p>
- *
- * @author xuyang
- * @since 2023-08-09
- */
-@Service
-public class CsSoftInfoServiceImpl extends ServiceImpl<CsSoftInfoMapper, CsSoftInfoPO> implements ICsSoftInfoService {
-
-}