fix(气象监听): 修改接口正常使用

src/main/java/com/macro/mall/tiny/PowerSystemApplication.java

@@ -2,8 +2,10 @@ package com.macro.mall.tiny;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.ComponentScan;
 
 @SpringBootApplication
+@ComponentScan(basePackages = {"com.keystar.eprdms.auth.client", "com.macro.mall.tiny"})
 public class PowerSystemApplication {
 
     public static void main(String[] args) {

src/main/java/com/macro/mall/tiny/common/util/EprdmsHttpUtils.java

@@ -1,9 +1,7 @@
 package com.macro.mall.tiny.common.util;
 
 import cn.hutool.json.JSONObject;
-import com.alibaba.fastjson.JSON;
 import com.keystar.eprdms.core.result.ResponseResult;
-import com.keystar.eprdms.core.shiro.entity.UserPermissionEntity;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpEntity;

src/main/java/com/macro/mall/tiny/modules/business/controller/KrBSensorController.java

@@ -71,10 +71,10 @@ public class KrBSensorController {
     }
 
     @ApiOperation("按照线路ID查询传感器列表列表")
-    @RequestMapping(value = "/findByLineId", method = RequestMethod.GET)
+    @RequestMapping(value = "/findByLine", method = RequestMethod.GET)
     @ResponseBody
-    public CommonResult<List<KrBSensor>> findSensorByLine(@RequestParam @PathParam(value = "lineId") Long lineId) {
-        List<KrBSensor> sensors = sensorService.findSensorByLine(lineId);
+    public CommonResult<List<KrBSensor>> findSensorByLine(@RequestParam @PathParam(value = "lineName") String lineName) {
+        List<KrBSensor> sensors = sensorService.findSensorByLine(lineName);
         return CommonResult.success(sensors);
     }
 

src/main/java/com/macro/mall/tiny/modules/business/dto/SensorListenParam.java

@@ -18,7 +18,7 @@ import java.util.List;
 public class SensorListenParam {
 
     @ApiModelProperty(value = "汇编系统识别码")
-    private final String client = "COLLECT_DATA";
+    private final String client = "MONITOR_CLIENT_COLLECT";
 
     @ApiModelProperty(value = "设备Mac列表")
     private List<String> deviceMacs;

src/main/java/com/macro/mall/tiny/modules/business/enums/DirectoryEnum.java

@@ -21,7 +21,7 @@ public enum DirectoryEnum implements IEnum<Integer> {
     SITE_INVEST(8, "8现场勘察"),
     LON_LAT_INFO(9, "9经纬度信息"),
     HARDWARE_DES(10, "10金具设计资料"),
-    ROBOT_CHECK_PIC(12,"12机器巡检图片")
+//    ROBOT_CHECK_PIC(12,"12机器巡检图片")
     ;
 
     private final Integer type;

src/main/java/com/macro/mall/tiny/modules/business/service/KrBSensorService.java

@@ -17,9 +17,9 @@ public interface KrBSensorService extends IService<KrBSensor> {
 
     List<KrBSensor> get(String lineName, String deviceMac);
 
-    List<KrBSensor> findSensorByLine(Long lineId);
+    List<KrBSensor> findSensorByLine(String lineName);
 
-    boolean openListenByLine(Long lineId);
+    boolean openListenByLine(String lineName);
 
-    boolean closeListenByLine(Long lineId);
+    boolean closeListenByLine(String lineName);
 }

src/main/java/com/macro/mall/tiny/modules/business/service/impl/FileServiceImpl.java

@@ -160,7 +160,7 @@ public class FileServiceImpl implements FileService {
 
         if (relativeCount > 2) {
             String dirType = filePath.getName(powerPathCount + 2).toString();
-            if (!dirType.equals(DirectoryEnum.TOWER_PIC.getName()) && !dirType.equals(DirectoryEnum.EARTH_WIRE_HARD_PIC.getName()) && !dirType.equals(DirectoryEnum.TEAM_CHECK_PIC.getName()) && !dirType.equals(DirectoryEnum.ROBOT_CHECK_PIC.getName())) {
+            if (!dirType.equals(DirectoryEnum.TOWER_PIC.getName()) && !dirType.equals(DirectoryEnum.EARTH_WIRE_HARD_PIC.getName()) && !dirType.equals(DirectoryEnum.TEAM_CHECK_PIC.getName())) {
                 return true;
             }
         }

src/main/java/com/macro/mall/tiny/modules/business/service/impl/KrBSensorServiceImpl.java

@@ -81,8 +81,8 @@ public class KrBSensorServiceImpl extends ServiceImpl<KrBSensorMapper, KrBSensor
     }
 
     @Override
-    public List<KrBSensor> findSensorByLine(Long lineId) {
-        List<KrBSensor> sensorList = findBaseSensorByLine(lineId);
+    public List<KrBSensor> findSensorByLine(String lineName) {
+        List<KrBSensor> sensorList = findBaseSensorByLine(lineName);
         List<String> sensorMacList = sensorList.stream().map(KrBSensor::getDeviceMac).filter(StringUtils::isNotBlank).collect(Collectors.toList());
         SensorListenParam sensorListenParam = new SensorListenParam(sensorMacList);
         JSONObject paramJsonObject = JSONUtil.parseObj(sensorListenParam);
@@ -94,14 +94,14 @@ public class KrBSensorServiceImpl extends ServiceImpl<KrBSensorMapper, KrBSensor
     }
 
     @Override
-    public boolean openListenByLine(Long lineId) {
-        List<KrBSensor> sensorList = findBaseSensorByLine(lineId);
+    public boolean openListenByLine(String lineName) {
+        List<KrBSensor> sensorList = findBaseSensorByLine(lineName);
         List<String> sensorMacList = sensorList.stream().map(KrBSensor::getDeviceMac).filter(StringUtils::isNotBlank).collect(Collectors.toList());
         SensorListenParam sensorListenParam = new SensorListenParam(sensorMacList);
         JSONObject paramJsonObject = JSONUtil.parseObj(sensorListenParam);
         JSONArray resultArray = EprdmsHttpUtils.PostForEprdms(eprdmsUrl + OPEN_LISTEN_URL, paramJsonObject, JSONArray.class);
         if (resultArray==null) return false;
-        StringBuilder logSb = new StringBuilder("开启监听,lineId:").append(lineId).append("\r\n");
+        StringBuilder logSb = new StringBuilder("开启监听,lineId:").append(lineName).append("\r\n");
         resultArray.jsonIter().forEach(jsonObject -> {
             logSb.append("deviceMac:")
                     .append(jsonObject.getStr("deviceMac"))
@@ -114,14 +114,14 @@ public class KrBSensorServiceImpl extends ServiceImpl<KrBSensorMapper, KrBSensor
     }
 
     @Override
-    public boolean closeListenByLine(Long lineId) {
-        List<KrBSensor> sensorList = findBaseSensorByLine(lineId);
+    public boolean closeListenByLine(String lineName) {
+        List<KrBSensor> sensorList = findBaseSensorByLine(lineName);
         List<String> sensorMacList = sensorList.stream().map(KrBSensor::getDeviceMac).filter(StringUtils::isNotBlank).collect(Collectors.toList());
         SensorListenParam sensorListenParam = new SensorListenParam(sensorMacList);
         JSONObject paramJsonObject = JSONUtil.parseObj(sensorListenParam);
         JSONArray resultArray = EprdmsHttpUtils.PostForEprdms(eprdmsUrl + CLOSE_LISTEN_URL, paramJsonObject, JSONArray.class);
         if (resultArray==null) return false;
-        StringBuilder logSb = new StringBuilder("关闭监听,lineId:").append(lineId).append("\r\n");
+        StringBuilder logSb = new StringBuilder("关闭监听,lineId:").append(lineName).append("\r\n");
         resultArray.jsonIter().forEach(jsonObject -> {
             logSb.append("deviceMac:")
                     .append(jsonObject.getStr("deviceMac"))
@@ -133,7 +133,10 @@ public class KrBSensorServiceImpl extends ServiceImpl<KrBSensorMapper, KrBSensor
         return true;
     }
 
-    private List<KrBSensor> findBaseSensorByLine(Long lineId) {
+    private List<KrBSensor> findBaseSensorByLine(String lineName) {
+        LambdaQueryWrapper<KrBLine> lineQueryWrapper = new QueryWrapper<KrBLine>().lambda().eq(KrBLine::getLineName, lineName);
+        KrBLine line = lineMapper.selectOne(lineQueryWrapper);
+        Long lineId = line.getId();
         LambdaQueryWrapper<KrBTower> towerQueryWrapper = new QueryWrapper<KrBTower>().lambda().eq(KrBTower::getLineId, lineId);
         List<KrBTower> towerList = towerMapper.selectList(towerQueryWrapper);
         List<Long> towerIdList = towerList.stream().map(KrBTower::getId).collect(Collectors.toList());

src/main/java/com/macro/mall/tiny/modules/business/service/impl/KrBTowerServiceImpl.java

@@ -108,11 +108,11 @@ public class KrBTowerServiceImpl extends ServiceImpl<KrBTowerMapper, KrBTower> i
         resultMap.put("teamCheckFileList", sonList);
 
         // 获取12机器巡检照片
-        secBasePath = MyFileUtils.getAuthFilePath(basePath, DirectoryEnum.ROBOT_CHECK_PIC.getName(), auth);
+        /*secBasePath = MyFileUtils.getAuthFilePath(basePath, DirectoryEnum.ROBOT_CHECK_PIC.getName(), auth);
         towerName = tower.getTowerName();
         thirdBasePath = MyFileUtils.getAuthFilePath(secBasePath, towerName, auth);
         sonList = MyFileUtils.getSubBFiles(thirdBasePath, auth);
-        resultMap.put("robotCheckFileList", sonList);
+        resultMap.put("robotCheckFileList", sonList);*/
 
         return resultMap;
     }
@@ -180,12 +180,12 @@ public class KrBTowerServiceImpl extends ServiceImpl<KrBTowerMapper, KrBTower> i
             }
 
             // 检验是否含有机器巡检照片
-            secBasePath = MyFileUtils.getAuthFilePath(basePath, DirectoryEnum.ROBOT_CHECK_PIC.getName(), access);
+            /*secBasePath = MyFileUtils.getAuthFilePath(basePath, DirectoryEnum.ROBOT_CHECK_PIC.getName(), access);
             thirdBasePath = MyFileUtils.getAuthFilePath(secBasePath, tower.getTowerName(), access);
             if (MyFileUtils.hasSonFile(thirdBasePath, access)) {
                 tower.setHasFile(1);
                 continue;
-            }
+            }*/
 
 
             tower.setHasFile(0);