获取web访问令牌修改

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

@@ -106,13 +106,13 @@ public class BaseRailwayManagementController extends BaseController {
         for (Long lineId : lineIds) {
             BaseRailwayManagement baseRailwayManagement1 = baseRailwayManagementService.getById(lineId);
             if (ObjectUtils.isEmpty(baseRailwayManagement1)) {
-                return error("主键"+lineId+":不存在");
+                return error("主键" + lineId + ":不存在");
             }
             LambdaQueryWrapper<BaseCameraManagement> wrapper = new LambdaQueryWrapper();
             wrapper.eq(BaseCameraManagement::getRailwayCode, baseRailwayManagement1.getRailwayCode());
             List<BaseCameraManagement> list = baseCameraManagementService.list(wrapper);
             if (list.size() > 0) {
-                return error("主键"+lineId+"已绑定相机，不能删除");
+                return error("主键" + lineId + "已绑定相机，不能删除");
             }
         }
         if (baseRailwayManagementService.removeByIds(lineIds)) {
@@ -131,11 +131,11 @@ public class BaseRailwayManagementController extends BaseController {
     @ApiOperation("新增线路管理表信息")
     public AjaxResult saveLineManagement(@RequestBody BaseRailwayManagement baseRailwayManagement) {
         String idempotence = idempotenceUtils.getIdempotence(baseRailwayManagement.getRailwayCode());
-        if (StringUtils.isNotEmpty(idempotence)){
-            return  error("你的网络卡顿,请不要一直添加!!!");
+        if (StringUtils.isNotEmpty(idempotence)) {
+            return error("你的网络卡顿,请不要一直添加!!!");
         }
         idempotenceUtils.createIdempotence(baseRailwayManagement.getRailwayCode());
-        
+
         LambdaQueryWrapper<BaseRailwayManagement> lw = new LambdaQueryWrapper<BaseRailwayManagement>();
         if (!ObjectUtils.isEmpty(baseRailwayManagement.getRailwayCode())) {
             lw.eq(BaseRailwayManagement::getRailwayCode, baseRailwayManagement.getRailwayCode());
@@ -151,7 +151,7 @@ public class BaseRailwayManagementController extends BaseController {
                 return error("线路名称已存在,不能重复添加");
             }
         }
-        
+
         baseRailwayManagement.setCreateBy(getUserId());
         baseRailwayManagement.setUpdateBy(getUserId());
         if (baseRailwayManagementService.save(baseRailwayManagement)) {
@@ -230,16 +230,11 @@ public class BaseRailwayManagementController extends BaseController {
     @PostMapping("/importBaseLineManagement")
     public AjaxResult importBaseLineManagement(MultipartFile file, boolean updateSupport) throws Exception {
         String message = null;
-        try {
-            ExcelUtil<BaseRailwayManagement> util = new ExcelUtil<BaseRailwayManagement>(BaseRailwayManagement.class);
-            List<BaseRailwayManagement> accountManageList = util.importExcel(file.getInputStream());
-            log.info("importBaseLineManagement----accountManageList"+accountManageList);
-            message = baseRailwayManagementService.importBaseLineManagement(accountManageList, updateSupport,getUserId());
-            log.info("importBaseLineManagement----message"+message);
-        } catch (Exception e) {
-            e.printStackTrace();
-            error(e.getMessage());
-        }
+        ExcelUtil<BaseRailwayManagement> util = new ExcelUtil<BaseRailwayManagement>(BaseRailwayManagement.class);
+        List<BaseRailwayManagement> accountManageList = util.importExcel(file.getInputStream());
+        log.info("importBaseLineManagement----accountManageList" + accountManageList);
+        message = baseRailwayManagementService.importBaseLineManagement(accountManageList, updateSupport, getUserId());
+        log.info("importBaseLineManagement----message" + message);
         return AjaxResult.success(message);
     }
 

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

@@ -70,32 +70,39 @@ public class GeoHazardMonitorTokenController {
         // 生成令牌
         JSONObject jsonObject = new JSONObject();
         LambdaQueryWrapper<SvcAddress> lw = new LambdaQueryWrapper<SvcAddress>();
-        if (!ObjectUtils.isEmpty(svcAddress.getGrantType())) {
-            lw.eq(SvcAddress::getGrantType, svcAddress.getGrantType());
-        }
         if (!ObjectUtils.isEmpty(svcAddress.getClientId())) {
             lw.eq(SvcAddress::getClientId, svcAddress.getClientId());
+        }else {
+            jsonObject.put("resultCode", 2);
+            jsonObject.put("message", "失败");
+            jsonObject.put("data", "客户端编号不能为空");
+            return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
         }
-        if (!ObjectUtils.isEmpty(svcAddress.getClientSecret())) {
-            lw.eq(SvcAddress::getClientSecret, svcAddress.getClientSecret());
-        }
-        List<SvcAddress> list = svcAddressService.list(lw);
-        if (list.size() > 0) {
-            ArrayList<String> objects = apiTokenUtils.createGeoHazardMonitorToken(svcAddress.getGrantType(), svcAddress.getClientId(), svcAddress.getClientSecret());
-            if (objects.size() > 0) {
-                RespGeoHazardMonitorVo respGeoHazardMonitorVo = new RespGeoHazardMonitorVo();
-                respGeoHazardMonitorVo.setAccessToken(objects.get(1));
-                Long l = Long.valueOf(objects.get(0));
-                respGeoHazardMonitorVo.setExpiresIn(l / 1000);
-                respGeoHazardMonitorVo.setTokenType("令牌类型");
-                jsonObject.put("resultCode", 1);
-                jsonObject.put("message", "成功");
-                jsonObject.put("data", respGeoHazardMonitorVo);
-                return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
-            } else {
+        SvcAddress serviceOne = svcAddressService.getOne(lw);
+        if (!ObjectUtils.isEmpty(serviceOne)) {
+            String clientSecret = SM4Utils.decryptData_ECB(serviceOne.getClientSecret(), "4370780c9a8c43e5");
+            if (clientSecret.equals(svcAddress.getClientSecret())) {
+                ArrayList<String> objects = apiTokenUtils.createGeoHazardMonitorToken(svcAddress.getGrantType(), svcAddress.getClientId(), svcAddress.getClientSecret());
+                if (objects.size() > 0) {
+                    RespGeoHazardMonitorVo respGeoHazardMonitorVo = new RespGeoHazardMonitorVo();
+                    respGeoHazardMonitorVo.setAccessToken(objects.get(1));
+                    Long l = Long.valueOf(objects.get(0));
+                    respGeoHazardMonitorVo.setExpiresIn(l / 1000);
+                    respGeoHazardMonitorVo.setTokenType("令牌类型");
+                    jsonObject.put("resultCode", 1);
+                    jsonObject.put("message", "成功");
+                    jsonObject.put("data", respGeoHazardMonitorVo);
+                    return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
+                } else {
+                    jsonObject.put("resultCode", 2);
+                    jsonObject.put("message", "失败");
+                    jsonObject.put("data", "生成token失败");
+                    return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
+                }
+            }else {
                 jsonObject.put("resultCode", 2);
                 jsonObject.put("message", "失败");
-                jsonObject.put("data", "生成token失败");
+                jsonObject.put("data", "客户端密钥错误");
                 return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
             }
         } else {