相机所属工务段修改单位deptId

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

@@ -45,7 +45,7 @@ public class BaseCameraManagement extends BaseEntity implements Serializable {
      */
     @Excel(name = "相机编码")
     private String cameraCode;
-    
+
     /**
      * 通道编号
      */
@@ -56,7 +56,7 @@ public class BaseCameraManagement extends BaseEntity implements Serializable {
      * 所属工务段
      */
     @Excel(name = "所属工务段")
-    private String publicWorksSection;
+    private Long deptId;
 
     /**
      * 行别(1上行2下行）

business-service/src/main/java/com/ozs/service/entity/vo/BaseCameraManagementVo.java

@@ -16,18 +16,18 @@ import java.io.Serializable;
 public class BaseCameraManagementVo extends PageVo implements Serializable {
 
     private static final long serialVersionUID = 1L;
-    
+
     /**
      * 所属工务段
      */
-    private String publicWorksSection;
+    private Long deptId;
 
     /**
      * 行别
      */
     private String lineDir;
 
-  
+
     /**
      * 线路名称
      */

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

@@ -84,8 +84,8 @@ public class BaseCameraManagementController extends BaseController {
         if (!StringUtils.isBlank(baseCameraManagementVo.getRailwayName())) {
             lw.eq(BaseCameraManagement::getRailwayCode, baseCameraManagementVo.getRailwayName());
         }
-        if (!StringUtils.isBlank(baseCameraManagementVo.getPublicWorksSection())) {
-            lw.eq(BaseCameraManagement::getPublicWorksSection, baseCameraManagementVo.getPublicWorksSection());
+        if (!ObjectUtils.isEmpty(baseCameraManagementVo.getDeptId())) {
+            lw.eq(BaseCameraManagement::getDeptId, baseCameraManagementVo.getDeptId());
         }
         if (!ObjectUtils.isEmpty(baseCameraManagementVo.getBeginMile())) {
             lw.ge(BaseCameraManagement::getBeginMile, baseCameraManagementVo.getBeginMile());
@@ -184,8 +184,8 @@ public class BaseCameraManagementController extends BaseController {
         if (!StringUtils.isBlank(baseAccountManagementVo.getRailwayName())) {
             lw.eq(BaseCameraManagement::getRailwayCode, baseAccountManagementVo.getRailwayName());
         }
-        if (!StringUtils.isBlank(baseAccountManagementVo.getPublicWorksSection())) {
-            lw.eq(BaseCameraManagement::getPublicWorksSection, baseAccountManagementVo.getPublicWorksSection());
+        if (!ObjectUtils.isEmpty(baseAccountManagementVo.getDeptId())) {
+            lw.eq(BaseCameraManagement::getDeptId, baseAccountManagementVo.getDeptId());
         }
         if (!ObjectUtils.isEmpty(baseAccountManagementVo.getBeginMile())) {
             lw.ge(BaseCameraManagement::getBeginMile, baseAccountManagementVo.getBeginMile());

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

@@ -63,14 +63,12 @@ public class SysProfileController extends BaseController
         LoginUser loginUser = getLoginUser();
         SysUser sysUser = loginUser.getUser();
         user.setUserName(sysUser.getUserName());
-        if (StringUtils.isNotEmpty(user.getPhonenumber())
-                && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user)))
-        {
+        if (StringUtils.isNotEmpty(user.getPhoneNum())
+                && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) {
             return error("修改用户'" + user.getUserName() + "'失败，手机号码已存在");
         }
         if (StringUtils.isNotEmpty(user.getEmail())
-                && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user)))
-        {
+                && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user))) {
             return error("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在");
         }
         user.setUserId(sysUser.getUserId());
@@ -81,7 +79,7 @@ public class SysProfileController extends BaseController
         {
             // 更新缓存用户信息
             sysUser.setNickName(user.getNickName());
-            sysUser.setPhonenumber(user.getPhonenumber());
+            sysUser.setPhoneNum(user.getPhoneNum());
             sysUser.setEmail(user.getEmail());
             sysUser.setSex(user.getSex());
             tokenService.setLoginUser(loginUser);

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

@@ -118,7 +118,7 @@ public class SysUserController extends BaseController {
     public AjaxResult add(@Validated @RequestBody SysUser user) {
         if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(user))) {
             return error("新增用户'" + user.getUserName() + "'失败，登录账号已存在");
-        } else if (StringUtils.isNotEmpty(user.getPhonenumber())
+        } else if (StringUtils.isNotEmpty(user.getPhoneNum())
                 && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) {
             return error("新增用户'" + user.getUserName() + "'失败，手机号码已存在");
         }
@@ -135,10 +135,10 @@ public class SysUserController extends BaseController {
     @PutMapping
     public AjaxResult edit(@Validated @RequestBody SysUser user) {
         userService.checkUserAllowed(user);
-        userService.checkUserDataScope(user.getUserId());
+        userService.checkUserDataScope(user.getId());
         if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(user))) {
             return error("修改用户'" + user.getUserName() + "'失败，登录账号已存在");
-        } else if (StringUtils.isNotEmpty(user.getPhonenumber())
+        } else if (StringUtils.isNotEmpty(user.getPhoneNum())
                 && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) {
             return error("修改用户'" + user.getUserName() + "'失败，手机号码已存在");
         } else if (StringUtils.isNotEmpty(user.getEmail())
@@ -186,7 +186,7 @@ public class SysUserController extends BaseController {
     @PutMapping("/resetPwd")
     public AjaxResult resetPwd(@RequestBody SysUser user) {
         userService.checkUserAllowed(user);
-        userService.checkUserDataScope(user.getUserId());
+        userService.checkUserDataScope(user.getId());
         user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
         user.setUpdateBy(getUsername());
         return toAjax(userService.resetPwd(user));
@@ -200,7 +200,7 @@ public class SysUserController extends BaseController {
     @PutMapping("/changeStatus")
     public AjaxResult changeStatus(@RequestBody SysUser user) {
         userService.checkUserAllowed(user);
-        userService.checkUserDataScope(user.getUserId());
+        userService.checkUserDataScope(user.getId());
         user.setUpdateBy(getUsername());
         return toAjax(userService.updateUserStatus(user));
     }