获取web访问令牌修改

hazard-admin/src/main/java/com/ozs/web/controller/accountmanagment/BaseCameraManagementController.java

@@ -322,11 +322,6 @@ public class BaseCameraManagementController extends BaseController {
                     baseCameraManagement.setEndMile(end.multiply(BigDecimal.valueOf(1000)).intValue());
                 }
             }
-            if (!ObjectUtils.isEmpty(baseCameraManagement.getEndMiles()) && !ObjectUtils.isEmpty(baseCameraManagement.getBeginMiles())) {
-                if (baseCameraManagement.getBeginMile() > baseCameraManagement.getEndMile()) {
-                    return error("监控范围开始里程位置不能大于监控范围结束里程位置");
-                }
-            }
             baseCameraManagement.setCreateBy(getUserId());
             baseCameraManagement.setUpdateBy(getUserId());
             BaseDeviceDynamicManagement baseDynamicManagement = new BaseDeviceDynamicManagement();
@@ -400,11 +395,6 @@ public class BaseCameraManagementController extends BaseController {
         }else {
             baseCameraManagement.setEndMile(null);
         }
-        if (!ObjectUtils.isEmpty(baseCameraManagement.getEndMiles())&&!ObjectUtils.isEmpty(baseCameraManagement.getBeginMiles())) {
-            if (baseCameraManagement.getBeginMile() > baseCameraManagement.getEndMile()) {
-                return error("监控范围开始里程位置不能大于监控范围结束里程位置");
-            }
-        }
         BaseCameraManagement management = baseCameraManagementService.getById(baseCameraManagement.getId());
         baseCameraManagement.setUpdateBy(getUserId());
         baseCameraManagement.setCreateBy(management.getCreateBy());

hazard-sdk/src/main/java/com/ozs/controller/upload/GeoHazardMonitorTokenController.java

@@ -88,8 +88,7 @@ public class GeoHazardMonitorTokenController {
         }
         SvcAddress serviceOne = svcAddressService.getOne(lw);
         if (!ObjectUtils.isEmpty(serviceOne)) {
-            String clientSecret = SM4Utils.decryptData_ECB(serviceOne.getClientSecret(), "4370780c9a8c43e5");
-            if (clientSecret.equals(svcAddress.getClientSecret())) {
+            if (serviceOne.getClientSecret().equals(svcAddress.getClientSecret())) {
                 ArrayList<String> objects = apiTokenUtils.createGeoHazardMonitorToken(svcAddress.getGrantType(), svcAddress.getClientId(), svcAddress.getClientSecret());
                 if (objects.size() > 0) {
                     RespGeoHazardMonitorVo respGeoHazardMonitorVo = new RespGeoHazardMonitorVo();