代码调整

iot-access/access-boot/src/main/java/com/njcn/access/controller/CsDeviceController.java

@@ -35,7 +35,7 @@ public class CsDeviceController extends BaseController {
 
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @PostMapping("/register")
-    @ApiOperation("直连设备注册")
+    @ApiOperation("直连设备状态判断")
     @ApiImplicitParam(name = "nDid", value = "设备识别码", required = true)
     public HttpResult<String> devRegister(@RequestParam String nDid){
         csDeviceService.devRegister(nDid);
@@ -54,7 +54,7 @@ public class CsDeviceController extends BaseController {
 
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @PostMapping("/access")
-    @ApiOperation("直连设备接入")
+    @ApiOperation("直连设备注册")
     @ApiImplicitParam(name = "devAccessParam", value = "接入参数", required = true)
     public HttpResult<String> devAccess(@RequestBody @Validated DevAccessParam devAccessParam){
         String methodDescribe = getMethodDescribe("getModel");

iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsDevModelServiceImpl.java

@@ -8,6 +8,7 @@ import com.njcn.access.enums.DataModel;
 import com.njcn.access.mapper.CsDevModelMapper;
 import com.njcn.access.pojo.dto.data.*;
 import com.njcn.access.pojo.dto.devModel.*;
+import com.njcn.access.pojo.param.DevModelParam;
 import com.njcn.access.pojo.po.CsDataArrayPO;
 import com.njcn.access.pojo.po.CsDataSetPO;
 import com.njcn.access.pojo.po.CsLineModel;
@@ -18,6 +19,7 @@ import com.njcn.csdevice.api.DevModelFeignClient;
 import com.njcn.csdevice.pojo.po.CsDevModelPO;
 import com.njcn.csdevice.pojo.po.CsGroArr;
 import com.njcn.csdevice.pojo.po.CsGroup;
+import com.njcn.oss.constant.OssPath;
 import com.njcn.oss.utils.FileStorageUtil;
 import com.njcn.system.api.DicDataFeignClient;
 import com.njcn.system.api.EleEvtFeignClient;
@@ -81,8 +83,7 @@ public class CsDevModelServiceImpl implements ICsDevModelService {
             Gson gson = new Gson();
             TemplateDto templateDto = gson.fromJson(json, TemplateDto.class);
             //模板文件存入文件服务器
-            //String filePath = fileStorageUtil.uploadMultipart(devModelParam.getFile(), OssPath.DEV_MODEL + devModelParam.getDevType() + "_");
+            String filePath = fileStorageUtil.uploadMultipart(file, OssPath.DEV_MODEL + templateDto.getDevType() + "_");
-            String filePath = "";
             //1.录入cs_dev_model表，记录装置型号和模板记录
             CsDevModelPO csDevModelPo = addCsDevModel(templateDto,filePath);
             //2.录入数据集、详细数据(主设备、模块、监测设备)
@@ -551,12 +552,13 @@ public class CsDevModelServiceImpl implements ICsDevModelService {
                 csDataSetPo.setId(id);
                 csDataSetPo.setPid(pId);
                 csDataSetPo.setName(item1.getName());
-                csDataSetPo.setAnotherName(item1.getName());
+                csDataSetPo.setAnotherName(dataSetName(item1.getName()));
                 csDataSetPo.setIdx(item1.getIdx());
                 csDataSetPo.setPeriod(item1.getPeriod());
                 csDataSetPo.setStoreFlag(item1.getStoreFlag());
                 csDataSetPo.setDataList(String.join(",",templateDto.getDataList()));
                 csDataSetPo.setType(0);
+                csDataSetPo.setClDev(0);
                 setList.add(csDataSetPo);
                 List<DataArrayDto> list = item1.getDataArrayDtoList();
                 if(CollectionUtil.isNotEmpty(list)) {
@@ -585,7 +587,7 @@ public class CsDevModelServiceImpl implements ICsDevModelService {
                         csDataSetPo.setId(id);
                         csDataSetPo.setPid(pId);
                         csDataSetPo.setName(item4.getName());
-                        csDataSetPo.setAnotherName(item4.getName());
+                        csDataSetPo.setAnotherName(dataSetName(item4.getName()));
                         csDataSetPo.setIdx(item4.getIdx());
                         csDataSetPo.setPeriod(item4.getPeriod());
                         csDataSetPo.setStoreFlag(item4.getStoreFlag());
@@ -883,4 +885,38 @@ public class CsDevModelServiceImpl implements ICsDevModelService {
             csLineModelService.addList(result);
         }
     }
+
+    /**
+     * 数据集名称调整
+     */
+    public String dataSetName(String name){
+        String showName = null;
+        switch (name) {
+            case "Ds$Apf$Master$01":
+                showName = "主模块数据";
+                break;
+            case "Ds$Apf$module$01":
+                showName = "模块1数据";
+                break;
+            case "Ds$Apf$module$02":
+                showName = "模块2数据";
+                break;
+            case "Ds$Apf$module$03":
+                showName = "模块3数据";
+                break;
+            case "Ds$Apf$module$04":
+                showName = "模块4数据";
+                break;
+            case "Ds$Pqd$Stat$01":
+                showName = "负载侧数据";
+                break;
+            case "Ds$Pqd$Stat$02":
+                showName = "电网侧数据";
+                break;
+            default:
+                break;
+        }
+        return showName;
+    }
+
 }