修改数字换流站默认用户登录

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/controller/LoginController.java

@@ -79,7 +79,8 @@ public class LoginController {
         }
         HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder
                 .getRequestAttributes()).getRequest();
-        String token = ObjectUtils.isEmpty(request.getHeader("token"))?"szhlz":request.getHeader("token").toString() ;
+        String token = "szhlz";
+        		//ObjectUtils.isEmpty(request.getHeader("token"))?"szhlz":request.getHeader("token").toString() ;
         ReginParams reginParams;
         reginParams = JSON.parseObject(redisTemplate.opsForValue().get(buildKey(userId, token)), ReginParams.class);
         if(reginParams == null){

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/ContingencyPlanServiceImpl.java

@@ -65,8 +65,7 @@ public class ContingencyPlanServiceImpl implements IContingencyPlanService {
     @Qualifier("contingencyAction")
     @Autowired
     private CustomerAction customerAction;
-    @Value("${now.gateway.address}")
-    private String gateWayAddress;
+ 
 
     @Value("${systemctl.sync.switch}")
     private Boolean dataSyncSwitch;
@@ -647,13 +646,6 @@ public class ContingencyPlanServiceImpl implements IContingencyPlanService {
         if (ValidationUtil.isEmpty(planList)) {
             return;
         }
-//        planList.forEach(x -> {
-//            String picture = x.getPicture();
-//            if (StringUtils.isNotEmpty(picture)) {
-//                x.setPicture(gateWayAddress + picture);
-//            }
-//
-//        });
         List<Long> idList = new ArrayList<>();
         planList.forEach(e -> idList.add(e.getId()));
         Map<Object, List<PlanDoc>> docMapList = null;

YeeAmosFireAutoSysStart/src/main/resources/application.properties

@@ -110,8 +110,5 @@ outSystem.fegin.name=unKnow
 outSystem.user.password=a1234560
 privilege.fegin.name=AMOS-API-PRIVILEGE
 
-#当前gateway的IP地址
-now.gateway.address=http://172.16.11.201:10005/
-
 #预案指标配置
 plan.index =ONL_OilDischargeDeviceOilPillowDischargeOpen,CAFS_CAFSFireGunEquipmentValveStatus,DCCP_DCCPStreamTransformerCharged,WSS_DelugeValve_Start,ONL_OilDischargeDeviceOilyPillowDischargeOpen
\ No newline at end of file

YeeAmosFireAutoSysStart/src/main/resources/db/mapper/dbTemplate_view3d.xml

@@ -231,8 +231,7 @@
 		LEFT JOIN wl_stock_detail sd ON sd.equipment_specific_id = wles.id
 		LEFT JOIN wl_warehouse_structure ws ON ws.id = sd.warehouse_structure_id
 		WHERE
-			wles.org_code = '10'
-		AND wlei.type_code != 'BREAKDOWN'
+		 wlei.type_code != 'BREAKDOWN'
 		AND wlei.type_code != 'FIREALARM'
 		AND (
 			wlesi.`value` = 'true'