机台账管理信息修改

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
@@ -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) {
@@ -285,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("监控范围开始里程位置不能大于监控范围结束里程位置");
         }
@@ -330,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());
@@ -363,15 +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);
-        baseCameraManagement.setInstallMile(baseCameraManagement.getInstallMile()/1000);
-        baseCameraManagement.setEndMile(baseCameraManagement.getEndMile()/1000);
-        baseCameraManagement.setBeginMile(baseCameraManagement.getBeginMile()/1000);
+        
+        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));
     }