1修改自动注入信息

ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/system/controller/SysUserController.java

@@ -172,9 +172,6 @@ public class SysUserController extends BaseController {
         if (StringUtils.isNotEmpty(user.getPhonenumber())
                 && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) {
             return AjaxResult.error("修改用户'" + user.getUserName() + "'失败，手机号码已存在");
-        } else if (StringUtils.isNotEmpty(user.getEmail())
-                && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user))) {
-            return AjaxResult.error("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在");
         }
         user.setUpdateBy(SecurityUtils.getUsername());
         return toAjax(userService.updateUser(user));

xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/aspect/DaoAspect.java

@@ -1,6 +1,7 @@
 package com.xhpc.order.aspect;
 
 
+import com.xhpc.common.core.utils.DateUtils;
 import com.xhpc.common.core.utils.SecurityUtils;
 import com.xhpc.common.core.utils.StringUtils;
 import com.xhpc.system.api.model.LoginUser;
@@ -15,7 +16,6 @@ import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 
 import javax.servlet.http.HttpServletRequest;
-import java.util.Date;
 
 /*
  * TODO AO切面，插入创建人，创建时间，修改人，修改时间
@@ -68,7 +68,7 @@ public class DaoAspect {
                             BeanUtils.setProperty(arg, UPDATE_USER, userName);
                         }
                         if (isProperty(arg, UPDATE_TIME) && StringUtils.isNull(BeanUtils.getProperty(arg, UPDATE_TIME))) {
-                            BeanUtils.setProperty(arg, UPDATE_TIME, new Date());
+                            BeanUtils.setProperty(arg, UPDATE_TIME, DateUtils.getTime());
                         }
                     }
                 }
@@ -104,7 +104,6 @@ public class DaoAspect {
                     if (StringUtils.isNull(userName)) {
                         userName = "admin";
                     }
-                    Date date = new Date();
                     if (isProperty(arg, CREATE_USER) && StringUtils.isNull(BeanUtils.getProperty(arg, CREATE_USER))) {
                         BeanUtils.setProperty(arg, CREATE_USER, userName);
                     }
@@ -113,10 +112,10 @@ public class DaoAspect {
                     }
 
                     if (isProperty(arg, CREATE_TIME) && StringUtils.isNull(BeanUtils.getProperty(arg, CREATE_TIME))) {
-                        BeanUtils.setProperty(arg, CREATE_TIME, date);
+                        BeanUtils.setProperty(arg, CREATE_TIME, DateUtils.getTime());
                     }
                     if (isProperty(arg, UPDATE_TIME) && StringUtils.isNull(BeanUtils.getProperty(arg, UPDATE_TIME))) {
-                        BeanUtils.setProperty(arg, UPDATE_TIME, date);
+                        BeanUtils.setProperty(arg, UPDATE_TIME, DateUtils.getTime());
                     }
                 }
             }

xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/aspect/DaoAspect.java

@@ -1,6 +1,7 @@
 package com.xhpc.payment.aspect;
 
 
+import com.xhpc.common.core.utils.DateUtils;
 import com.xhpc.common.core.utils.SecurityUtils;
 import com.xhpc.common.core.utils.StringUtils;
 import com.xhpc.system.api.model.LoginUser;
@@ -15,7 +16,6 @@ import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 
 import javax.servlet.http.HttpServletRequest;
-import java.util.Date;
 
 /*
  * TODO AO切面，插入创建人，创建时间，修改人，修改时间
@@ -68,7 +68,7 @@ public class DaoAspect {
                             BeanUtils.setProperty(arg, UPDATE_USER, userName);
                         }
                         if (isProperty(arg, UPDATE_TIME) && StringUtils.isNull(BeanUtils.getProperty(arg, UPDATE_TIME))) {
-                            BeanUtils.setProperty(arg, UPDATE_TIME, new Date());
+                            BeanUtils.setProperty(arg, UPDATE_TIME, DateUtils.getTime());
                         }
                     }
                 }
@@ -104,7 +104,6 @@ public class DaoAspect {
                     if (StringUtils.isNull(userName)) {
                         userName = "admin";
                     }
-                    Date date = new Date();
                     if (isProperty(arg, CREATE_USER) && StringUtils.isNull(BeanUtils.getProperty(arg, CREATE_USER))) {
                         BeanUtils.setProperty(arg, CREATE_USER, userName);
                     }
@@ -113,10 +112,10 @@ public class DaoAspect {
                     }
 
                     if (isProperty(arg, CREATE_TIME) && StringUtils.isNull(BeanUtils.getProperty(arg, CREATE_TIME))) {
-                        BeanUtils.setProperty(arg, CREATE_TIME, date);
+                        BeanUtils.setProperty(arg, CREATE_TIME, DateUtils.getTime());
                     }
                     if (isProperty(arg, UPDATE_TIME) && StringUtils.isNull(BeanUtils.getProperty(arg, UPDATE_TIME))) {
-                        BeanUtils.setProperty(arg, UPDATE_TIME, date);
+                        BeanUtils.setProperty(arg, UPDATE_TIME, DateUtils.getTime());
                     }
                 }
             }

xhpc-modules/xhpc-user/pom.xml

@@ -74,6 +74,13 @@
             <artifactId>alipay-sdk-java</artifactId>
             <version>${alipay.sdk}</version>
         </dependency>
+
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>xhpc-common</artifactId>
+            <version>3.0.0</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>

xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/aspect/DaoAspect.java

@@ -1,6 +1,7 @@
 package com.xhpc.user.aspect;
 
 
+import com.xhpc.common.core.utils.DateUtils;
 import com.xhpc.common.core.utils.SecurityUtils;
 import com.xhpc.common.core.utils.StringUtils;
 import com.xhpc.system.api.model.LoginUser;
@@ -26,9 +27,9 @@ import java.util.Date;
 @Component
 @Configuration
 public class DaoAspect {
-    private static final String CREATE_USER = "createUser";
+    private static final String CREATE_BY = "create_by";
     private static final String CREATE_TIME = "createTime";
-    private static final String UPDATE_USER = "updateUser";
+    private static final String UPDATE_BY = "update_by";
     private static final String UPDATE_TIME = "updateTime";
 
     @Pointcut("execution(* com.xhpc..*.update*(..))")
@@ -64,11 +65,11 @@ public class DaoAspect {
                 Object[] objects = point.getArgs();
                 if (objects != null && objects.length > 0) {
                     for (Object arg : objects) {
-                        if (isProperty(arg, UPDATE_USER) && StringUtils.isNull(BeanUtils.getProperty(arg, UPDATE_USER))) {
+                        if (isProperty(arg, UPDATE_BY) && StringUtils.isNull(BeanUtils.getProperty(arg, UPDATE_BY))) {
-                            BeanUtils.setProperty(arg, UPDATE_USER, userName);
+                            BeanUtils.setProperty(arg, UPDATE_BY, userName);
                         }
                         if (isProperty(arg, UPDATE_TIME) && StringUtils.isNull(BeanUtils.getProperty(arg, UPDATE_TIME))) {
-                            BeanUtils.setProperty(arg, UPDATE_TIME, new Date());
+                            BeanUtils.setProperty(arg, UPDATE_TIME, DateUtils.getTime());
                         }
                     }
                 }
@@ -105,18 +106,18 @@ public class DaoAspect {
                         userName = "admin";
                     }
                     Date date = new Date();
-                    if (isProperty(arg, CREATE_USER) && StringUtils.isNull(BeanUtils.getProperty(arg, CREATE_USER))) {
+                    if (isProperty(arg, CREATE_BY) && StringUtils.isNull(BeanUtils.getProperty(arg, CREATE_BY))) {
-                        BeanUtils.setProperty(arg, CREATE_USER, userName);
+                        BeanUtils.setProperty(arg, CREATE_BY, userName);
                     }
-                    if (isProperty(arg, UPDATE_USER) && StringUtils.isNull(BeanUtils.getProperty(arg, UPDATE_USER))) {
+                    if (isProperty(arg, UPDATE_BY) && StringUtils.isNull(BeanUtils.getProperty(arg, UPDATE_BY))) {
-                        BeanUtils.setProperty(arg, UPDATE_USER, userName);
+                        BeanUtils.setProperty(arg, UPDATE_BY, userName);
                     }
 
                     if (isProperty(arg, CREATE_TIME) && StringUtils.isNull(BeanUtils.getProperty(arg, CREATE_TIME))) {
-                        BeanUtils.setProperty(arg, CREATE_TIME, date);
+                        BeanUtils.setProperty(arg, CREATE_TIME, DateUtils.getTime());
                     }
                     if (isProperty(arg, UPDATE_TIME) && StringUtils.isNull(BeanUtils.getProperty(arg, UPDATE_TIME))) {
-                        BeanUtils.setProperty(arg, UPDATE_TIME, date);
+                        BeanUtils.setProperty(arg, UPDATE_TIME, DateUtils.getTime());
                     }
                 }
             }

xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcInternetUserController.java

@@ -56,6 +56,9 @@ public class XhpcInternetUserController extends BaseController {
         sysUser.setDataPowerType(StatusConstants.INTERNET_POWER_TYPE);
         sysUser.setCreateBy(SecurityUtils.getUsername());
         sysUser.setPassword(SecurityUtils.encryptPassword(xhpcInternetUser.getPhone()));
+        Long[] role = new Long[1];
+        role[0] = 4l;
+        sysUser.setRoleIds(role);
         AjaxResult ajaxResult = remoteSystemService.addUser(sysUser);
         if (StringUtils.isNotNull(ajaxResult) && !"200".equals(StringUtils.valueOf(ajaxResult.get("code")))) {
             return ajaxResult;

xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcOperatorInternetBlacklistController.java

@@ -3,7 +3,6 @@ package com.xhpc.user.controller;
 import com.xhpc.common.core.web.controller.BaseController;
 import com.xhpc.common.core.web.domain.AjaxResult;
 import com.xhpc.common.core.web.page.TableDataInfo;
-import com.xhpc.common.security.annotation.PreAuthorize;
 import com.xhpc.user.domain.XhpcOperatorInternetBlacklist;
 import com.xhpc.user.service.IXhpcOperatorInternetBlacklistService;
 import io.swagger.annotations.ApiOperation;
@@ -30,7 +29,7 @@ public class XhpcOperatorInternetBlacklistController extends BaseController {
      * 新增运营商设置流量方黑名单
      */
     @ApiOperation("新增运营商设置流量方黑名单")
-    @PreAuthorize(hasPermi = "operator:internet:add")
+    //@PreAuthorize(hasPermi = "operator:internet:add")
     @PostMapping("/add")
     public AjaxResult add(@Valid @RequestBody List<XhpcOperatorInternetBlacklist> list) {
         if (null != list && list.size() > 0) {
@@ -47,7 +46,7 @@ public class XhpcOperatorInternetBlacklistController extends BaseController {
      * 通过运营商id查询流量方黑名单(包含已选择的黑名单)
      */
     @ApiOperation("通过运营商id查询流量方黑名单")
-    @PreAuthorize(hasPermi = "operator:internet:list")
+    //@PreAuthorize(hasPermi = "operator:internet:list")
     @GetMapping("/list")
     public TableDataInfo list(@RequestParam String operatorId) {
         List<Map<String, Object>> list = xhpcOperatorInternetBlacklistService.list(operatorId);

xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcStationInternetBlacklistController.java

@@ -3,7 +3,6 @@ package com.xhpc.user.controller;
 import com.xhpc.common.core.web.controller.BaseController;
 import com.xhpc.common.core.web.domain.AjaxResult;
 import com.xhpc.common.core.web.page.TableDataInfo;
-import com.xhpc.common.security.annotation.PreAuthorize;
 import com.xhpc.user.domain.XhpcStationInternetBlacklist;
 import com.xhpc.user.service.IXhpcStationInternetBlacklistService;
 import io.swagger.annotations.ApiOperation;
@@ -30,7 +29,7 @@ public class XhpcStationInternetBlacklistController extends BaseController {
      * 新增电站流量方黑名单
      */
     @ApiOperation("新增电站流量方黑名单")
-    @PreAuthorize(hasPermi = "station:internet:add")
+    // @PreAuthorize(hasPermi = "station:internet:add")
     @PostMapping("/add")
     public AjaxResult add(@Valid @RequestBody List<XhpcStationInternetBlacklist> list) {
         if (null != list && list.size() > 0) {
@@ -47,7 +46,7 @@ public class XhpcStationInternetBlacklistController extends BaseController {
      * 通过流量用户id查询电站流量方黑名单(包含已选择的黑名单)
      */
     @ApiOperation("通过运营商id查询流量方黑名单")
-    @PreAuthorize(hasPermi = "station:internet:list")
+    //@PreAuthorize(hasPermi = "station:internet:list")
     @GetMapping("/list")
     public TableDataInfo list(@RequestParam String internetUserId) {
         List<Map<String, Object>> list = iXhpcStationInternetBlacklistService.list(internetUserId);

xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcUserController.java

@@ -56,22 +56,27 @@ public class XhpcUserController extends BaseController {
     @PreAuthorize(hasPermi = "user:pc:add")
     @PostMapping("/pc/add")
     public AjaxResult pcAdd(@RequestBody SysUser sysUser) {
+        SysRole role = new SysRole();
+        role.setRoleName(sysUser.getUserName());
+        role.setRoleKey(sysUser.getUserName());
+        AjaxResult ajaxResult = remoteSystemService.addRole(role);
+        if (StringUtils.isNotNull(ajaxResult) && !"200".equals(StringUtils.valueOf(ajaxResult.get("code")))) {
+            return ajaxResult;
+        }
+        role = iXhpcUserService.selectUserByRoleName(sysUser.getUserName());
         sysUser.setPhonenumber(sysUser.getUserName());
         sysUser.setDeptId(103l);
         sysUser.setDataPowerType(StatusConstants.SON_POWER_TYPE);
         sysUser.setUserType(StatusConstants.SYSTEM_USER_TYPE);
         sysUser.setCreateBy(SecurityUtils.getUsername());
-        AjaxResult ajaxResult = remoteSystemService.addUser(sysUser);
+        Long[] roles = new Long[1];
-        if (StringUtils.isNotNull(ajaxResult) && !"200".equals(StringUtils.valueOf(ajaxResult.get("code")))) {
+        roles[0] = role.getRoleId();
-            return ajaxResult;
+        sysUser.setRoleIds(roles);
-        }
+        ajaxResult = remoteSystemService.addUser(sysUser);
-        SysRole role = new SysRole();
-        role.setRoleName(sysUser.getUserName());
-        role.setRoleKey(sysUser.getUserName());
-        ajaxResult = remoteSystemService.addRole(role);
         if (StringUtils.isNotNull(ajaxResult) && !"200".equals(StringUtils.valueOf(ajaxResult.get("code")))) {
             return ajaxResult;
         }
+
         return AjaxResult.success();
     }
 
@@ -125,22 +130,27 @@ public class XhpcUserController extends BaseController {
         if (null == sysUser.getOperatorId()) {
             return AjaxResult.error(HttpStatus.NOT_NULL, "所属运营商不能为空");
         }
+        SysRole role = new SysRole();
+        role.setRoleName(sysUser.getUserName());
+        role.setRoleKey(sysUser.getUserName());
+        AjaxResult ajaxResult = remoteSystemService.addRole(role);
+        if (StringUtils.isNotNull(ajaxResult) && !"200".equals(StringUtils.valueOf(ajaxResult.get("code")))) {
+            return ajaxResult;
+        }
+        role = iXhpcUserService.selectUserByRoleName(sysUser.getUserName());
         sysUser.setPhonenumber(sysUser.getUserName());
         sysUser.setDeptId(103l);
         sysUser.setDataPowerType(StatusConstants.SON_POWER_TYPE);
         sysUser.setUserType(StatusConstants.OPERATION_SON_USER_TYPE);
         sysUser.setCreateBy(SecurityUtils.getUsername());
-        AjaxResult ajaxResult = remoteSystemService.addUser(sysUser);
+        Long[] roles = new Long[1];
-        if (StringUtils.isNotNull(ajaxResult) && !"200".equals(StringUtils.valueOf(ajaxResult.get("code")))) {
+        roles[0] = role.getRoleId();
-            return ajaxResult;
+        sysUser.setRoleIds(roles);
-        }
+        ajaxResult = remoteSystemService.addUser(sysUser);
-        SysRole role = new SysRole();
-        role.setRoleName(sysUser.getUserName());
-        role.setRoleKey(sysUser.getUserName());
-        ajaxResult = remoteSystemService.addRole(role);
         if (StringUtils.isNotNull(ajaxResult) && !"200".equals(StringUtils.valueOf(ajaxResult.get("code")))) {
             return ajaxResult;
         }
+
         return AjaxResult.success();
     }
 

xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/mapper/XhpcUserMapper.java

@@ -1,5 +1,6 @@
 package com.xhpc.user.mapper;
 
+import com.xhpc.system.api.domain.SysRole;
 import com.xhpc.system.api.domain.SysUser;
 import org.apache.ibatis.annotations.Param;
 
@@ -86,4 +87,12 @@ public interface XhpcUserMapper {
      * @return 结果
      */
     public List<SysUser> selectUserByCreateBy(@Param("createBy") String createBy);
+
+    /**
+     * 通过用户账号查询用户详情
+     *
+     * @param userName 用户账号
+     * @return 结果
+     */
+    public SysRole selectUserByRoleName(@Param("userName") String userName);
 }

xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/IXhpcUserService.java

@@ -1,5 +1,6 @@
 package com.xhpc.user.service;
 
+import com.xhpc.system.api.domain.SysRole;
 import com.xhpc.system.api.domain.SysUser;
 
 import java.util.List;
@@ -68,8 +69,16 @@ public interface IXhpcUserService {
     /**
      * 通过用户账号查询用户详情
      *
-     * @param userName 用户张号
+     * @param userName 用户帐号
      * @return 结果
      */
     public SysUser selectUserByUserName(String userName);
+
+    /**
+     * 通过用户账号查询角色详情
+     *
+     * @param userName 用户帐号
+     * @return 结果
+     */
+    public SysRole selectUserByRoleName(String userName);
 }

xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcOperatorServiceImpl.java

@@ -57,8 +57,10 @@ public class XhpcOperatorServiceImpl implements IXhpcOperatorService {
     public void deleteByIds(String ids) {
         for (String id : ids.split(",")) {
             SysUser sysUser = xhpcOperatorMapper.getUserByOperatorId(Long.parseLong(id));
+            if (null != sysUser) {
                 removeUser(sysUser.getUserId());
             }
+        }
         xhpcOperatorMapper.deleteByIds(ids.split(","));
     }
 
@@ -86,6 +88,7 @@ public class XhpcOperatorServiceImpl implements IXhpcOperatorService {
      */
     @Override
     public Map<String, Object> info(Long operatorId) {
+        Map<String, Object> info = xhpcOperatorMapper.info(operatorId);
         return xhpcOperatorMapper.info(operatorId);
     }
 

xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcUserServiceImpl.java

@@ -3,6 +3,7 @@ package com.xhpc.user.service.impl;
 import com.xhpc.common.core.constant.StatusConstants;
 import com.xhpc.common.core.constant.UserConstants;
 import com.xhpc.common.core.utils.SecurityUtils;
+import com.xhpc.system.api.domain.SysRole;
 import com.xhpc.system.api.domain.SysUser;
 import com.xhpc.user.mapper.XhpcUserMapper;
 import com.xhpc.user.service.IXhpcUserService;
@@ -109,4 +110,15 @@ public class XhpcUserServiceImpl implements IXhpcUserService {
     public SysUser selectUserByUserName(String userName) {
         return xhpcUserMapper.selectUserByUserName(userName);
     }
+
+    /**
+     * 通过用户账号查询角色详情
+     *
+     * @param userName 用户帐号
+     * @return 结果
+     */
+    @Override
+    public SysRole selectUserByRoleName(String userName) {
+        return xhpcUserMapper.selectUserByRoleName(userName);
+    }
 }

xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcOperatorMapper.xml

@@ -358,8 +358,7 @@
 
 
     <delete id="deleteRoleByName" parameterType="java.lang.String">
-        update sys_role
+        delete from sys_role
-        set del_flag = '2'
+        where role_name = #{roleName}
-        where roleName = #{roleId}
     </delete>
 </mapper>

xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcUserMapper.xml

@@ -88,13 +88,13 @@
 
     <select id="pcInfo" parameterType="java.lang.Long" resultType="java.util.Map">
         select su.user_id userId,su.user_name userName,
-        su.nick_name nickName, su.email,status,
+        su.nick_name nickName, su.email,su.status,
         su.create_by createBy ,su.create_time createTime,su.`status` ,
-        CASE WHEN su.`status` = 0 THEN '正常' else  '禁用'  end statusName
+        CASE WHEN su.`status` = 0 THEN '正常' else  '禁用'  end statusName,
         sdd.dict_label sexName
         from sys_user su
         LEFT JOIN sys_dict_data sdd on sdd.`dict_type` = "sys_user_sex" and sdd.dict_code = su.sex
-        WHERE su.del_flag = 0 and user_id = #{userId}
+        WHERE su.del_flag = 0 and su.user_id = #{userId}
     </select>
 
     <select id="selectOperatorUserList" parameterType="java.lang.String" resultType="java.util.Map">
@@ -158,7 +158,7 @@
                update_time      updateTime,
                remark
         from sys_user
-        where user_name = #{userName}
+        where user_name = #{userName}  LIMIT 1
     </select>
     <select id="selectUserByCreateBy" parameterType="java.lang.String" resultType="com.xhpc.system.api.domain.SysUser">
         select user_id          userId,
@@ -187,4 +187,22 @@
         where create_by = #{createBy}
     </select>
 
+    <select id="selectUserByRoleName" parameterType="java.lang.String" resultType="com.xhpc.system.api.domain.SysRole">
+        select  role_id     roleId,
+                role_name roleName,
+                role_key  roleKey,
+                role_sort roleSort,
+                data_scope  dataScope,
+                menu_check_strictly menuCheckStrictly,
+                dept_check_strictly deptCheckStrictly,
+               status,
+               del_flag         delFlag,
+               create_by        createBy,
+               create_time      createTime,
+               update_by        updateBy,
+               update_time      updateTime,
+               remark
+        from sys_role
+        where role_name = #{userName} ORDER BY create_time DESC LIMIT 1
+    </select>
 </mapper>