更改bug

src/main/java/org/rcisoft/business/manage/controller/TopologyNodeController.java

@@ -17,7 +17,7 @@ import org.springframework.web.multipart.MultipartFile;
 * Created by  on 2018-6-5 9:01:15.
 */
 @RestController
-@RequestMapping("manage/topologynode")
+@RequestMapping("manage/topologiesnode")
 public class TopologyNodeController extends PaginationController<TopologyNode> {
 
     @Autowired

src/main/java/org/rcisoft/business/manage/service/impl/BusProjectServiceImpl.java

@@ -2,8 +2,7 @@ package org.rcisoft.business.manage.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.beust.jcommander.internal.Lists;
-import com.beust.jcommander.internal.Maps;
+
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.hssf.usermodel.HSSFRow;
@@ -446,7 +445,7 @@ public class BusProjectServiceImpl implements BusProjectService {
      * @return
      */
     private Map<String, String> getNm(Integer type, String proId) {
-        Map<String, String> resultMap = Maps.newHashMap();
+        Map<String, String> resultMap = new HashMap<>();
         List<Map<String, Object>> list = null;
         if (type == 1) {
             list = busDeviceMeterRepository.queryNm(proId);

src/main/java/org/rcisoft/business/system/service/impl/SystemServiceImpl.java

@@ -157,13 +157,13 @@ public class SystemServiceImpl implements SystemService {
         // 电量的键
         String devParam = "";
         // proId
-        String proId = "";
+        String proId = devNum.split("_")[0];
         // 根据devNum查询
         Map<String, String> deviceMap = deviceParamRepository.selectPower(devNum);
         if (deviceMap != null) {
             devCode = deviceMap.get("devCode");
             devParam = deviceMap.get("devParam");
-            proId = deviceMap.get("proId");
+//            proId = deviceMap.get("proId");
         }
         List<BusFixedParam> fixedList = busFixedParamServiceImpl.queryBusFixedParamList(devNum, proId);
         List<DeviceParam> list = deviceParamRepository.selectDeviceParamList(devNum, proId);