Merge remote-tracking branch 'origin/master'

business-service/src/main/java/com/ozs/service/entity/BaseCameraManagement.java

@@ -126,6 +126,21 @@ public class BaseCameraManagement extends BaseEntity implements Serializable {
     @Excel(name = "监控范围开始里程位置")
     private String beginMiles;
 
+
+    /**
+     * 详情监控相机安装里程位置字符串形式
+     */
+    @TableField(exist = false)
+    @Excel(name = "监控相机安装里程位置")
+    private String installs;
+
+    /**
+     * 详情监控范围开始里程位置字符串形式
+     */
+    @TableField(exist = false)
+    @Excel(name = "监控范围开始里程位置")
+    private String begins;
+
     /**
      * 监控范围结束里程位置字符串形式
      */

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
@@ -180,10 +181,10 @@ public class BaseCameraManagementController extends BaseController {
     public AjaxResult selectBaseAccountManagement(@RequestBody BaseCameraManagementVo baseCameraManagementVo) {
         baseCameraManagementVo = (BaseCameraManagementVo) dataScoreUtil.setDataScore(getUserId(), baseCameraManagementVo);
         if (!ObjectUtils.isEmpty(baseCameraManagementVo.getBeginMile())) {
-                baseCameraManagementVo.setBeginMile(baseCameraManagementVo.getBeginMile() * 1000);
+            baseCameraManagementVo.setBeginMile(baseCameraManagementVo.getBeginMile() * 1000);
         }
         if (!ObjectUtils.isEmpty(baseCameraManagementVo.getEndMile())) {
-                baseCameraManagementVo.setEndMile(baseCameraManagementVo.getEndMile() * 1000);
+            baseCameraManagementVo.setEndMile(baseCameraManagementVo.getEndMile() * 1000);
         }
         IPage<BaseCameraManagement> page = baseCameraManagementService.queryPage(baseCameraManagementVo);
         page.setTotal(page.getTotal());
@@ -207,9 +208,6 @@ public class BaseCameraManagementController extends BaseController {
                 o.setEndMiles(end);
                 String begin = AppendUtils.stringAppend(o.getBeginMile());
                 o.setBeginMiles(begin);
-                o.setInstallMile(o.getInstallMile()/1000);
-                o.setEndMile(o.getEndMile()/1000);
-                o.setBeginMile(o.getBeginMile()/1000);
                 if (roleKey.size() > 0 || "admin".equals(baseUser.getUserName())) {
                     o.setIsStartRecording(1);
                     for (String s : roleKey) {
@@ -262,54 +260,73 @@ public class BaseCameraManagementController extends BaseController {
     @Transactional
     @Log(title = "相机台账管理", businessType = BusinessType.INSERT)
     public AjaxResult saveAccountManagement(@RequestBody BaseCameraManagement baseCameraManagement) {
-        String idempotence = idempotenceUtils.getIdempotence(baseCameraManagement.getCameraCode());
-        if (StringUtils.isNotEmpty(idempotence)) {
-            return error("你的网络卡顿,请不要一直添加!!!");
-        }
-        idempotenceUtils.createIdempotence(baseCameraManagement.getCameraCode());
-        LambdaQueryWrapper<BaseCameraManagement> lw = new LambdaQueryWrapper<BaseCameraManagement>();
-        if (!ObjectUtils.isEmpty(baseCameraManagement.getCameraCode())) {
-            lw.eq(BaseCameraManagement::getCameraCode, baseCameraManagement.getCameraCode());
-        }
-        BaseCameraManagement cameraManagement = baseCameraManagementService.getOne(lw);
-        if (!ObjectUtils.isEmpty(cameraManagement)) {
-            idempotenceUtils.deleteIdempotence(baseCameraManagement.getCameraCode());
-            return error("相机台账管理信息相机编码已存在,不能重复添加");
-        }
-        LambdaQueryWrapper<BaseDeviceDynamicManagement> queryWrapper = new LambdaQueryWrapper<BaseDeviceDynamicManagement>();
-        if (!ObjectUtils.isEmpty(baseCameraManagement.getCameraCode())) {
-            queryWrapper.eq(BaseDeviceDynamicManagement::getCameraCode, baseCameraManagement.getCameraCode());
-        }
-        BaseDeviceDynamicManagement one = baseDeviceDynamicManagementService.getOne(queryWrapper);
-        if (!ObjectUtils.isEmpty(one)) {
-            idempotenceUtils.deleteIdempotence(baseCameraManagement.getCameraCode());
-            return error("设备动态管理表该相机编码已存在,不能重复添加");
-        }
-        baseCameraManagement.setBeginMile(baseCameraManagement.getBeginMile() * 1000);
-        baseCameraManagement.setInstallMile(baseCameraManagement.getInstallMile() * 1000);
-        baseCameraManagement.setEndMile(baseCameraManagement.getEndMile() * 1000);
-        if (baseCameraManagement.getBeginMile() > baseCameraManagement.getEndMile()) {
-            return error("监控范围开始里程位置不能大于监控范围结束里程位置");
-        }
-        baseCameraManagement.setCreateBy(getUserId());
-        baseCameraManagement.setUpdateBy(getUserId());
-        BaseDeviceDynamicManagement baseDynamicManagement = new BaseDeviceDynamicManagement();
-        baseDynamicManagement.setCameraCode(baseCameraManagement.getCameraCode());
-        baseDynamicManagement.setUpdateBy(getUserId());
-        baseDynamicManagement.setCreateBy(getUserId());
-        String start = HttpUtils.sendGet(CameraUtil.startRecording(baseCameraManagement.getCameraCode(), baseCameraManagement.getChannel()));
-        if (start.startsWith(baseCameraManagement.getCameraCode() + "/" + baseCameraManagement.getChannel())) {
-            baseCameraManagement.setStartRecording(1);
-            baseCameraManagement.setTaskId(start);
-        } else {
-            baseCameraManagement.setStartRecording(2);
-        }
-        if (baseCameraManagementService.save(baseCameraManagement) && baseDeviceDynamicManagementService.save(baseDynamicManagement)) {
+        try {
+            String idempotence = idempotenceUtils.getIdempotence(baseCameraManagement.getCameraCode());
+            if (StringUtils.isNotEmpty(idempotence)) {
+                return error("正在执行,请稍等");
+            }
+            idempotenceUtils.createIdempotence(baseCameraManagement.getCameraCode());
+            LambdaQueryWrapper<BaseCameraManagement> lw = new LambdaQueryWrapper<BaseCameraManagement>();
+            if (!ObjectUtils.isEmpty(baseCameraManagement.getCameraCode())) {
+                lw.eq(BaseCameraManagement::getCameraCode, baseCameraManagement.getCameraCode());
+            }
+            BaseCameraManagement cameraManagement = baseCameraManagementService.getOne(lw);
+            if (!ObjectUtils.isEmpty(cameraManagement)) {
+                return error("相机台账管理信息相机编码已存在,不能重复添加");
+            }
+            LambdaQueryWrapper<BaseDeviceDynamicManagement> queryWrapper = new LambdaQueryWrapper<BaseDeviceDynamicManagement>();
+            if (!ObjectUtils.isEmpty(baseCameraManagement.getCameraCode())) {
+                queryWrapper.eq(BaseDeviceDynamicManagement::getCameraCode, baseCameraManagement.getCameraCode());
+            }
+            BaseDeviceDynamicManagement one = baseDeviceDynamicManagementService.getOne(queryWrapper);
+            if (!ObjectUtils.isEmpty(one)) {
+                return error("设备动态管理表该相机编码已存在,不能重复添加");
+            }
+            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.setCreateBy(getUserId());
+            baseCameraManagement.setUpdateBy(getUserId());
+            BaseDeviceDynamicManagement baseDynamicManagement = new BaseDeviceDynamicManagement();
+            baseDynamicManagement.setCameraCode(baseCameraManagement.getCameraCode());
+            baseDynamicManagement.setUpdateBy(getUserId());
+            baseDynamicManagement.setCreateBy(getUserId());
+            String start = HttpUtils.sendGet(CameraUtil.startRecording(baseCameraManagement.getCameraCode(), baseCameraManagement.getChannel()));
+            if (start.startsWith(baseCameraManagement.getCameraCode() + "/" + baseCameraManagement.getChannel())) {
+                baseCameraManagement.setStartRecording(1);
+                baseCameraManagement.setTaskId(start);
+            } else {
+                baseCameraManagement.setStartRecording(2);
+            }
+            if (baseCameraManagementService.save(baseCameraManagement) && baseDeviceDynamicManagementService.save(baseDynamicManagement)) {
+                return AjaxResult.success();
+            } else {
+                return AjaxResult.error();
+            }
+        } catch (Exception e) {
+            log.error(e.getMessage());
+            return AjaxResult.error();
+        } finally {
             idempotenceUtils.deleteIdempotence(baseCameraManagement.getCameraCode());
-            return AjaxResult.success();
         }
-        idempotenceUtils.deleteIdempotence(baseCameraManagement.getCameraCode());
-        return AjaxResult.error();
     }
 
     /**
@@ -330,9 +347,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());
@@ -363,15 +398,36 @@ public class BaseCameraManagementController extends BaseController {
         SysDept sysDept = deptService.selectDeptById(baseCameraManagement.getDeptId());
         baseCameraManagement.setDeptName(sysDept.getDeptName());
         baseCameraManagement.setRailwayName(baseRailwayManagement.getRailwayName());
+
+        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());
+        }
         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);
-        baseCameraManagement.setInstallMile(baseCameraManagement.getInstallMile()/1000);
-        baseCameraManagement.setEndMile(baseCameraManagement.getEndMile()/1000);
-        baseCameraManagement.setBeginMile(baseCameraManagement.getBeginMile()/1000);
+        baseCameraManagement.setInstalls(mils);
+        String en = AppendUtils.stringAppend(baseCameraManagement.getEndMile());
+        String beg= AppendUtils.stringAppend(baseCameraManagement.getBeginMile());
+        baseCameraManagement.setBegins(beg+"~"+en);
         return AjaxResult.success(baseCameraManagement);
     }
 
@@ -450,10 +506,10 @@ public class BaseCameraManagementController extends BaseController {
     public void exportBaseAccountManagement(HttpServletResponse response, @RequestBody BaseCameraManagementVo baseCameraManagementVo) {
         baseCameraManagementVo = (BaseCameraManagementVo) dataScoreUtil.setDataScore(getUserId(), baseCameraManagementVo);
         if (!ObjectUtils.isEmpty(baseCameraManagementVo.getBeginMile())) {
-                baseCameraManagementVo.setBeginMile(baseCameraManagementVo.getBeginMile() * 1000);
+            baseCameraManagementVo.setBeginMile(baseCameraManagementVo.getBeginMile() * 1000);
         }
         if (!ObjectUtils.isEmpty(baseCameraManagementVo.getEndMile())) {
-                baseCameraManagementVo.setEndMile(baseCameraManagementVo.getEndMile() * 1000);
+            baseCameraManagementVo.setEndMile(baseCameraManagementVo.getEndMile() * 1000);
         }
         List<BaseCameraManagement> baseCameraManagementList = baseCameraManagementService.baseCameraManagementList(baseCameraManagementVo);
         for (BaseCameraManagement baseCameraManagement : baseCameraManagementList) {
@@ -599,7 +655,7 @@ public class BaseCameraManagementController extends BaseController {
         cameraTreeVo = (CameraTreeVo) dataScoreUtil.setDataScore(getUserId(), cameraTreeVo);
         int count = 0;
         if (!ObjectUtils.isEmpty(cameraTreeVo.getMils())) {
-            cameraTreeVo.setMils(cameraTreeVo.getMils()*1000);
+            cameraTreeVo.setMils(cameraTreeVo.getMils() * 1000);
         }
         CameraTree cameraTree = baseDeviceDynamicManagementService.cameraTree(cameraTreeVo);
         List<CameraTree> children = cameraTree.getChildren();

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

@@ -135,38 +135,42 @@ public class BaseRailwayManagementController extends BaseController {
     @ApiOperation("新增线路管理表信息")
     @Log(title = "线路台账管理", businessType = BusinessType.INSERT)
     public AjaxResult saveLineManagement(@RequestBody BaseRailwayManagement baseRailwayManagement) {
-        String idempotence = idempotenceUtils.getIdempotence(baseRailwayManagement.getRailwayCode());
-        if (StringUtils.isNotEmpty(idempotence)) {
-            return error("你的网络卡顿,请不要一直添加!!!");
-        }
-        idempotenceUtils.createIdempotence(baseRailwayManagement.getRailwayCode());
+        try {
+            String idempotence = idempotenceUtils.getIdempotence(baseRailwayManagement.getRailwayCode());
+            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());
-            BaseRailwayManagement railwayManagement = baseRailwayManagementService.getOne(lw);
-            if (!ObjectUtils.isEmpty(railwayManagement)) {
-                idempotenceUtils.deleteIdempotence(baseRailwayManagement.getRailwayCode());
-                return error("线路编码已存在,不能重复添加");
+            LambdaQueryWrapper<BaseRailwayManagement> lw = new LambdaQueryWrapper<BaseRailwayManagement>();
+            if (!ObjectUtils.isEmpty(baseRailwayManagement.getRailwayCode())) {
+                lw.eq(BaseRailwayManagement::getRailwayCode, baseRailwayManagement.getRailwayCode());
+                BaseRailwayManagement railwayManagement = baseRailwayManagementService.getOne(lw);
+                if (!ObjectUtils.isEmpty(railwayManagement)) {
+                    return error("线路编码已存在,不能重复添加");
+                }
             }
-        }
-        if (!ObjectUtils.isEmpty(baseRailwayManagement.getRailwayName())) {
-            lw.eq(BaseRailwayManagement::getRailwayName, baseRailwayManagement.getRailwayName());
-            BaseRailwayManagement railwayManagement = baseRailwayManagementService.getOne(lw);
-            if (!ObjectUtils.isEmpty(railwayManagement)) {
-                idempotenceUtils.deleteIdempotence(baseRailwayManagement.getRailwayCode());
-                return error("线路名称已存在,不能重复添加");
+            if (!ObjectUtils.isEmpty(baseRailwayManagement.getRailwayName())) {
+                lw.eq(BaseRailwayManagement::getRailwayName, baseRailwayManagement.getRailwayName());
+                BaseRailwayManagement railwayManagement = baseRailwayManagementService.getOne(lw);
+                if (!ObjectUtils.isEmpty(railwayManagement)) {
+                    return error("线路名称已存在,不能重复添加");
+                }
             }
-        }
 
-        baseRailwayManagement.setCreateBy(getUserId());
-        baseRailwayManagement.setUpdateBy(getUserId());
-        if (baseRailwayManagementService.save(baseRailwayManagement)) {
+            baseRailwayManagement.setCreateBy(getUserId());
+            baseRailwayManagement.setUpdateBy(getUserId());
+            if (baseRailwayManagementService.save(baseRailwayManagement)) {
+                return AjaxResult.success();
+            } else {
+                return AjaxResult.error();
+            }
+        } catch (Exception e) {
+            log.error(e.getMessage());
+            return AjaxResult.error();
+        } finally {
             idempotenceUtils.deleteIdempotence(baseRailwayManagement.getRailwayCode());
-            return AjaxResult.success();
         }
-        idempotenceUtils.deleteIdempotence(baseRailwayManagement.getRailwayCode());
-        return AjaxResult.error();
     }
 
     /**

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,14 @@ 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;
+    @Value("${base.defaultPassword:yn5aq5Mt.106.tky}")
+    private String defaultPassword;
 //    /**
 //     * 获取用户列表
 //     */
@@ -174,10 +178,17 @@ public class SysUserController extends BaseController {
     @PreAuthorize("@ss.hasPermi('system:user:import')")
     @PostMapping("/importData")
     public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception {
+        String password=null;
         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");
+        if(!ObjectUtils.isEmpty(data.get(0).getDictValue())){
+            password=data.get(0).getDictValue();
+        }else {
+            password=defaultPassword;
+        }
+        String message = userService.importUser(userList, updateSupport, userId,password);
         return success(message);
     }
 
@@ -233,11 +244,19 @@ public class SysUserController extends BaseController {
     @Log(title = "用户管理", businessType = BusinessType.INSERT)
     @PostMapping("/add")
     public AjaxResult add(@Validated @RequestBody SysUser user) {
+        String password=null;
         if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(user))) {
             return error("新增用户'" + user.getUserName() + "'失败，登录账号已存在");
         }
         user.setCreateBy(getUserId());
         user.setUpdateBy(getUserId());
+        List<SysDictData> data = dictTypeService.selectDictDataByType("default_password");
+        if(!ObjectUtils.isEmpty(data.get(0).getDictValue())){
+            password=data.get(0).getDictValue();
+        }else {
+            password=defaultPassword;
+        }
+        user.setPassword(SecurityUtils.encryptPassword(password));
         return toAjax(userService.saveUser(user));
     }
 
@@ -336,9 +355,16 @@ public class SysUserController extends BaseController {
     @Log(title = "用户管理", businessType = BusinessType.UPDATE)
     @GetMapping("/resetPwd/{id}")
     public AjaxResult resetPwd(@PathVariable(value = "id") Long id) {
+        String password=null;
         SysUser user = new SysUser();
         user.setId(id);
-        user.setPassword(SecurityUtils.encryptPassword(defaultPassword));
+        List<SysDictData> data = dictTypeService.selectDictDataByType("default_password");
+        if(!ObjectUtils.isEmpty(data.get(0).getDictValue())){
+            password=data.get(0).getDictValue();
+        }else {
+            password=defaultPassword;
+        }
+        user.setPassword(SecurityUtils.encryptPassword(password));
         user.setUpdateBy(getUsername());
         return toAjax(userService.resetPwd(user));
     }

hazard-admin/src/main/java/com/ozs/web/controller/tool/TestController.java

@@ -6,6 +6,7 @@ import java.util.List;
 import java.util.Map;
 
 import com.ozs.common.utils.SecurityUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -34,7 +35,8 @@ import io.swagger.annotations.ApiOperation;
 @RequestMapping("/test")
 public class TestController extends BaseController {
 
-
+    @Autowired
+    private com.ozs.web.core.util.CameraUtil cameraUtil;
 
     private final static Map<Integer, UserEntity> users = new LinkedHashMap<Integer, UserEntity>();
 
@@ -43,6 +45,16 @@ public class TestController extends BaseController {
         users.put(2, new UserEntity(2, "ry", "admin123", "15666666666"));
     }
 
+    @GetMapping("/deleteFlv")
+    public R<String> deleteFlv() {
+        try {
+            cameraUtil.deleteFlv();
+        } catch (Exception e) {
+            return R.ok(e.getMessage().toString());
+        }
+        return R.ok();
+    }
+
     @ApiOperation("获取用户列表")
     @GetMapping("/list")
     public R<List<UserEntity>> userList() {

hazard-admin/src/main/java/com/ozs/web/core/util/CameraUtil.java

@@ -41,6 +41,7 @@ import java.util.stream.Collectors;
 
 @Configuration
 @Slf4j
+@Component
 public class CameraUtil {
 
     private static String historyUrl;

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

@@ -31,6 +31,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+import java.nio.charset.StandardCharsets;
 import java.text.ParseException;
 import java.util.*;