Merge branch 'master' of http://124.70.58.209:3000/ytrd-project-management/GeoHazardMonitor

 Conflicts:

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

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

@@ -79,6 +79,7 @@ import java.util.stream.Stream;
 @RequestMapping("/service/baseCameraManagement")
 @Slf4j
 public class BaseCameraManagementController extends BaseController {
+    public static final String PATTERN = "^(\\d+.\\d{1,3}|\\d+)$";
     @Resource
     BaseCameraManagementService baseCameraManagementService;
     @Resource
@@ -282,9 +283,24 @@ public class BaseCameraManagementController extends BaseController {
             idempotenceUtils.deleteIdempotence(baseCameraManagement.getCameraCode());
             return error("设备动态管理表该相机编码已存在,不能重复添加");
         }
-        baseCameraManagement.setBeginMile(baseCameraManagement.getBeginMile() * 1000);
-        baseCameraManagement.setInstallMile(baseCameraManagement.getInstallMile() * 1000);
-        baseCameraManagement.setEndMile(baseCameraManagement.getEndMile() * 1000);
+        if (!baseCameraManagement.getBeginMiles().matches(PATTERN)) {
+            return error("监控范围开始里程位置填写格式不正确");
+        } else {
+            double begin= Double.parseDouble(baseCameraManagement.getBeginMiles());
+            baseCameraManagement.setBeginMile((int) (begin*1000));
+        }
+        if (!baseCameraManagement.getInstallMiles().matches(PATTERN)) {
+            return error("监控相机安装里程位置填写格式不正确");
+        } else {
+            double install= Double.parseDouble(baseCameraManagement.getInstallMiles());
+            baseCameraManagement.setInstallMile((int) (install * 1000));
+        }
+        if (!baseCameraManagement.getEndMiles().matches(PATTERN)) {
+            return error("监控范围结束里程位置填写格式不正确");
+        } else {
+            double end= Double.parseDouble(baseCameraManagement.getEndMiles());
+            baseCameraManagement.setEndMile((int) (end * 1000));
+        }
         if (baseCameraManagement.getBeginMile() > baseCameraManagement.getEndMile()) {
             return error("监控范围开始里程位置不能大于监控范围结束里程位置");
         }
@@ -327,9 +343,27 @@ public class BaseCameraManagementController extends BaseController {
         if (!ObjectUtils.isEmpty(cameraManagement) && !cameraManagement.getId().equals(baseCameraManagement.getId())) {
             return error("相机编码已存在,不能进行修改操作");
         }
-        baseCameraManagement.setBeginMile(baseCameraManagement.getBeginMile() * 1000);
-        baseCameraManagement.setInstallMile(baseCameraManagement.getInstallMile() * 1000);
-        baseCameraManagement.setEndMile(baseCameraManagement.getEndMile() * 1000);
+        if (!baseCameraManagement.getBeginMiles().matches(PATTERN)) {
+            return error("监控范围开始里程位置填写格式不正确");
+        } else {
+            double begin= Double.parseDouble(baseCameraManagement.getBeginMiles());
+            baseCameraManagement.setBeginMile((int) (begin*1000));
+        }
+        if (!baseCameraManagement.getInstallMiles().matches(PATTERN)) {
+            return error("监控相机安装里程位置填写格式不正确");
+        } else {
+            double install= Double.parseDouble(baseCameraManagement.getInstallMiles());
+            baseCameraManagement.setInstallMile((int) (install * 1000));
+        }
+        if (!baseCameraManagement.getEndMiles().matches(PATTERN)) {
+            return error("监控范围结束里程位置填写格式不正确");
+        } else {
+            double end= Double.parseDouble(baseCameraManagement.getEndMiles());
+            baseCameraManagement.setEndMile((int) (end * 1000));
+        }
+        if (baseCameraManagement.getBeginMile() > baseCameraManagement.getEndMile()) {
+            return error("监控范围开始里程位置不能大于监控范围结束里程位置");
+        }
         baseCameraManagement.setUpdateBy(getUserId());
         LambdaQueryWrapper<BaseDeviceDynamicManagement> queryWrapper = new LambdaQueryWrapper<BaseDeviceDynamicManagement>();
         BaseCameraManagement management = baseCameraManagementService.getById(baseCameraManagement.getId());
@@ -360,12 +394,31 @@ public class BaseCameraManagementController extends BaseController {
         SysDept sysDept = deptService.selectDeptById(baseCameraManagement.getDeptId());
         baseCameraManagement.setDeptName(sysDept.getDeptName());
         baseCameraManagement.setRailwayName(baseRailwayManagement.getRailwayName());
-        String mils = AppendUtils.stringAppend(baseCameraManagement.getInstallMile());
-        baseCameraManagement.setInstallMiles(mils);
-        String end = AppendUtils.stringAppend(baseCameraManagement.getEndMile());
-        baseCameraManagement.setEndMiles(end);
-        String begin = AppendUtils.stringAppend(baseCameraManagement.getBeginMile());
-        baseCameraManagement.setBeginMiles(begin);
+        
+        Double  install= (double) baseCameraManagement.getInstallMile() / 1000;
+        Double  end= (double) baseCameraManagement.getEndMile() / 1000;
+        Double  begin= (double) baseCameraManagement.getBeginMile() / 1000;
+        String[] split = install.toString().split("\\.");
+        int number = Integer.parseInt(split[1]);
+        if (number==0){
+            baseCameraManagement.setInstallMiles(split[0]);
+        }else {
+            baseCameraManagement.setInstallMiles(install.toString());
+        }
+        String[] ends = end.toString().split("\\.");
+        int numbers = Integer.parseInt(ends[1]);
+        if (numbers==0){
+            baseCameraManagement.setEndMiles(ends[0]);
+        }else {
+            baseCameraManagement.setEndMiles(end.toString());
+        }
+        String[] begins = begin.toString().split("\\.");
+        int numberss = Integer.parseInt(begins[1]);
+        if (numberss==0){
+            baseCameraManagement.setBeginMiles(begins[0]);
+        }else {
+            baseCameraManagement.setBeginMiles(begin.toString());
+        }
         return AjaxResult.success(baseCameraManagement);
     }
 

hazard-admin/src/main/java/com/ozs/web/controller/system/SysUserController.java

@@ -13,6 +13,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ozs.common.constant.CacheConstants;
+import com.ozs.common.core.domain.entity.SysDictData;
 import com.ozs.common.core.domain.entity.SysUserUpdate;
 import com.ozs.common.core.domain.entity.SysUsers;
 import com.ozs.common.core.domain.model.LoginUser;
@@ -27,6 +28,7 @@ import com.ozs.service.entity.MsgAlarm;
 import com.ozs.service.entity.vo.MsgAlarmVo;
 import com.ozs.service.service.BaseUserService;
 import com.ozs.system.service.DataScoreUtil;
+import com.ozs.system.service.ISysDictTypeService;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ArrayUtils;
@@ -80,12 +82,12 @@ public class SysUserController extends BaseController {
     private TokenService tokenService;
     @Autowired
     private ISysRoleService iSysRoleService;
-    @Value("${base.defaultPassword:yn5aq5Mt.106.tky}")
-    private String defaultPassword;
     @Autowired
     private DataScoreUtil dataScoreUtil;
     @Resource
     private BaseUserService baseUserService;
+    @Autowired
+    private ISysDictTypeService dictTypeService;
 //    /**
 //     * 获取用户列表
 //     */
@@ -177,7 +179,8 @@ public class SysUserController extends BaseController {
         ExcelUtil<SysUsers> util = new ExcelUtil<SysUsers>(SysUsers.class);
         List<SysUsers> userList = util.importExcel(file.getInputStream());
         String userId = getUserId();
-        String message = userService.importUser(userList, updateSupport, userId);
+        List<SysDictData> data = dictTypeService.selectDictDataByType("default_password");
+        String message = userService.importUser(userList, updateSupport, userId,data.get(0).getDictValue());
         return success(message);
     }
 
@@ -238,6 +241,8 @@ public class SysUserController extends BaseController {
         }
         user.setCreateBy(getUserId());
         user.setUpdateBy(getUserId());
+        List<SysDictData> data = dictTypeService.selectDictDataByType("default_password");
+        user.setPassword(SecurityUtils.encryptPassword(data.get(0).getDictValue()));
         return toAjax(userService.saveUser(user));
     }
 
@@ -338,7 +343,8 @@ public class SysUserController extends BaseController {
     public AjaxResult resetPwd(@PathVariable(value = "id") Long id) {
         SysUser user = new SysUser();
         user.setId(id);
-        user.setPassword(SecurityUtils.encryptPassword(defaultPassword));
+        List<SysDictData> data = dictTypeService.selectDictDataByType("default_password");
+        user.setPassword(SecurityUtils.encryptPassword(data.get(0).getDictValue()));
         user.setUpdateBy(getUsername());
         return toAjax(userService.resetPwd(user));
     }

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

@@ -74,7 +74,7 @@ public class GeoHazardMonitorTokenController {
         if (!ObjectUtils.isEmpty(svcAddress.getClientId())) {
             lw.eq(SvcAddress::getClientId, svcAddress.getClientId());
         }else {
-            jsonObject.put("resultCode", 2);
+            jsonObject.put("resultCode", 0);
             jsonObject.put("message", "失败");
             jsonObject.put("data", "客户端编号不能为空");
             return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
@@ -95,81 +95,25 @@ public class GeoHazardMonitorTokenController {
                     jsonObject.put("data", respGeoHazardMonitorVo);
                     return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
                 } else {
-                    jsonObject.put("resultCode", 2);
+                    jsonObject.put("resultCode", 0);
                     jsonObject.put("message", "失败");
                     jsonObject.put("data", "生成token失败");
                     return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
                 }
             }else {
-                jsonObject.put("resultCode", 2);
+                jsonObject.put("resultCode", 0);
                 jsonObject.put("message", "失败");
                 jsonObject.put("data", "客户端密钥错误");
                 return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
             }
         } else {
-            jsonObject.put("resultCode", 2);
+            jsonObject.put("resultCode", 0);
             jsonObject.put("message", "失败");
             jsonObject.put("data", "参数验证失败");
             return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
         }
     }
 
-    public static void main(String[] args) {
-//        String parameter = "rjW9XcaNdY1M2rtUj4rYsW+3nqcJUDBuE6Orqvd4vyMhOh3fQGPNava0aOcUA7h0wuxoQtHE3bUP5imxqbRd/iBT7QDkrqtdPP5QLEhQodT8v0l8YMMtb7yohAJfEThLJOJ8Odl0kuTJXEJBMD8pE//K9KpRGDY4eEKPdS26YywnIl6HwK9EweYxVGtfJOP3/N7lwum2ROv7iqYgefXd/IxGEG8eVqEUutGKpeCcM0dds/N3Uq5ri/k/BrpaKcV96GnlR4pWkBjWOW08eGJ78shuUJkC682294W4RUp3NPPR7OTErtVAh65or8pB+RGDZuZQlUJ/QVpWp2ZdCrN5Wjqsi1TIa00oGQbYmMixOF0=";
-//        String s = SM4Utils.decryptData_ECB(parameter, "4370780c9a8c43e5");
-//        ReqMsgAlarmVo reqMsgAlarmVo = JSON.parseObject(s, ReqMsgAlarmVo.class);
-//        System.out.println(reqMsgAlarmVo.toString());
-        System.out.println(new Date().getTime());
-    }
-
-    @PostMapping("/encryptionAlarm")
-    public String encryptionAlarm(@RequestBody ReqMsgAlarmVo vo) {
-        String s1 = JSONObject.toJSONString(vo);
-        return SM4Utils.encryptData_ECB(s1, "4370780c9a8c43e5");
-    }
-
-    /**
-     * 设备状态数据传输
-     *
-     * @return
-     */
-    @PostMapping("/device/state")
-    public String deviceState(@RequestParam("parameter") String parameter, HttpServletRequest request) throws ParseException {
-        JSONObject jsonObject = new JSONObject();
-        String token = apiTokenUtils.getGeoHazardMonitorToken(request);
-        log.info("token:{}", token);
-        log.info("parameter:{}", parameter);
-        if (StringUtils.isNotEmpty(token)) {
-            ReqDeviceVo reqDeviceVo = JSON.parseObject(SM4Utils.decryptData_ECB(parameter, "4370780c9a8c43e5"), ReqDeviceVo.class);
-            log.info("reqDeviceVo:{}", reqDeviceVo);
-            LambdaQueryWrapper<BaseDeviceDynamicManagement> lw = new LambdaQueryWrapper<BaseDeviceDynamicManagement>();
-            if (ObjectUtils.isEmpty(reqDeviceVo.getCameraCode())) {
-                jsonObject.put("resultCode", 2);
-                jsonObject.put("message", "信息编码为空！");
-                return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
-            }
-            BaseUser admin = baseUserService.getUserName("admin");
-            lw.eq(BaseDeviceDynamicManagement::getCameraCode, reqDeviceVo.getCameraCode());
-            BaseDeviceDynamicManagement baseDynamicManagement = baseDeviceDynamicManagementService.getOne(lw);
-            baseDynamicManagement.setElectricity(reqDeviceVo.getElectricity());
-            baseDynamicManagement.setUpdateTime(new Date(reqDeviceVo.getTime()));
-            baseDynamicManagement.setUpdateBy(admin.getUserId());
-            log.info("reqDeviceVo:{}", baseDynamicManagement);
-            if (baseDeviceDynamicManagementService.updateById(baseDynamicManagement)) {
-                jsonObject.put("resultCode", 1);
-                jsonObject.put("message", "成功");
-                return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
-            }
-            jsonObject.put("resultCode", 2);
-            jsonObject.put("message", "设备状态数据传输失败");
-            return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
-        } else {
-            jsonObject.put("resultCode", 2);
-            jsonObject.put("message", "token验证失败");
-            return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
-        }
-    }
-
     /**
      * 报警信息数据传输
      *
@@ -186,7 +130,7 @@ public class GeoHazardMonitorTokenController {
             String s = SM4Utils.decryptData_ECB(parameter, "4370780c9a8c43e5");
             ReqMsgAlarmVo reqMsgAlarmVo = JSON.parseObject(s, ReqMsgAlarmVo.class);
             if (!reqMsgAlarmVo.getAlarmAttr().matches(PATTERN)) {
-                jsonObject.put("resultCode", 2);
+                jsonObject.put("resultCode", 0);
                 jsonObject.put("message", "失败");
                 jsonObject.put("data", "你填写的报警病害属性不符合规则!!!");
                 return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
@@ -204,7 +148,7 @@ public class GeoHazardMonitorTokenController {
             BaseCameraManagement baseCameraManagement = baseCameraManagementService.getOne(wrapper);
             log.info("baseCameraManagement:{}", baseCameraManagement);
             if (ObjectUtils.isEmpty(baseCameraManagement)) {
-                jsonObject.put("resultCode", 2);
+                jsonObject.put("resultCode", 0);
                 jsonObject.put("message", "失败");
                 jsonObject.put("data", "你填写的相机编码不存在!!!");
                 return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
@@ -279,7 +223,7 @@ public class GeoHazardMonitorTokenController {
             } catch (Exception e) {
                 log.info(e.getMessage());
                 e.printStackTrace();
-                jsonObject.put("resultCode", 2);
+                jsonObject.put("resultCode", 0);
                 jsonObject.put("message", "失败");
                 jsonObject.put("data", "消息推送失败");
                 return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
@@ -295,4 +239,63 @@ public class GeoHazardMonitorTokenController {
             return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
         }
     }
+
+    @PostMapping("/encryptionAlarm")
+    public String encryptionAlarm(@RequestBody ReqMsgAlarmVo vo) {
+        String s1 = JSONObject.toJSONString(vo);
+        return SM4Utils.encryptData_ECB(s1, "4370780c9a8c43e5");
+    }
+
+    /**
+     * 设备状态数据传输
+     *
+     * @return
+     */
+    @PostMapping("/device/state")
+    public String deviceState(@RequestParam("parameter") String parameter, HttpServletRequest request) throws ParseException {
+        JSONObject jsonObject = new JSONObject();
+        String token = apiTokenUtils.getGeoHazardMonitorToken(request);
+        log.info("token:{}", token);
+        log.info("parameter:{}", parameter);
+        if (StringUtils.isNotEmpty(token)) {
+            ReqDeviceVo reqDeviceVo = JSON.parseObject(SM4Utils.decryptData_ECB(parameter, "4370780c9a8c43e5"), ReqDeviceVo.class);
+            log.info("reqDeviceVo:{}", reqDeviceVo);
+            LambdaQueryWrapper<BaseDeviceDynamicManagement> lw = new LambdaQueryWrapper<BaseDeviceDynamicManagement>();
+            if (ObjectUtils.isEmpty(reqDeviceVo.getCameraCode())) {
+                jsonObject.put("resultCode", 0);
+                jsonObject.put("message", "信息编码为空！");
+                return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
+            }
+            BaseUser admin = baseUserService.getUserName("admin");
+            lw.eq(BaseDeviceDynamicManagement::getCameraCode, reqDeviceVo.getCameraCode());
+            BaseDeviceDynamicManagement baseDynamicManagement = baseDeviceDynamicManagementService.getOne(lw);
+            baseDynamicManagement.setElectricity(reqDeviceVo.getElectricity());
+            if (reqDeviceVo.getTime().toString().length() == 10) {
+                reqDeviceVo.setTime(reqDeviceVo.getTime() * 1000);
+            }
+            baseDynamicManagement.setUpdateTime(new Date(reqDeviceVo.getTime()));
+            baseDynamicManagement.setUpdateBy(admin.getUserId());
+            log.info("reqDeviceVo:{}", baseDynamicManagement);
+            if (baseDeviceDynamicManagementService.updateById(baseDynamicManagement)) {
+                jsonObject.put("resultCode", 1);
+                jsonObject.put("message", "成功");
+                return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
+            }
+            jsonObject.put("resultCode", 0);
+            jsonObject.put("message", "设备状态数据传输失败");
+            return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
+        } else {
+            jsonObject.put("resultCode", 2);
+            jsonObject.put("message", "token验证失败");
+            return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
+        }
+    }
+
+    public static void main(String[] args) {
+//        String parameter = "rjW9XcaNdY1M2rtUj4rYsW+3nqcJUDBuE6Orqvd4vyMhOh3fQGPNava0aOcUA7h0wuxoQtHE3bUP5imxqbRd/iBT7QDkrqtdPP5QLEhQodT8v0l8YMMtb7yohAJfEThLJOJ8Odl0kuTJXEJBMD8pE//K9KpRGDY4eEKPdS26YywnIl6HwK9EweYxVGtfJOP3/N7lwum2ROv7iqYgefXd/IxGEG8eVqEUutGKpeCcM0dds/N3Uq5ri/k/BrpaKcV96GnlR4pWkBjWOW08eGJ78shuUJkC682294W4RUp3NPPR7OTErtVAh65or8pB+RGDZuZQlUJ/QVpWp2ZdCrN5Wjqsi1TIa00oGQbYmMixOF0=";
+//        String s = SM4Utils.decryptData_ECB(parameter, "4370780c9a8c43e5");
+//        ReqMsgAlarmVo reqMsgAlarmVo = JSON.parseObject(s, ReqMsgAlarmVo.class);
+//        System.out.println(reqMsgAlarmVo.toString());
+        System.out.println(new Date().getTime());
+    }
 }