1修改账号相关接口

pom.xml

@@ -39,6 +39,7 @@
         <common-pool.version>2.6.2</common-pool.version>
         <commons-collections.version>3.2.2</commons-collections.version>
         <alipay.sdk>4.15.14.ALL</alipay.sdk>
+        <commons-beanutils.sdk>1.9.3</commons-beanutils.sdk>
     </properties>
 
     <!-- 依赖声明 -->
@@ -236,7 +237,11 @@
                 <artifactId>ruoyi-api-system</artifactId>
                 <version>${ruoyi.version}</version>
             </dependency>
-
+            <dependency>
+                <groupId>commons-beanutils</groupId>
+                <artifactId>commons-beanutils</artifactId>
+                <version>${commons-beanutils.sdk}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -258,6 +263,7 @@
             <artifactId>spring-cloud-starter-bootstrap</artifactId>
         </dependency>
     </dependencies>
+
     <build>
         <plugins>
             <plugin>

ruoyi-common/ruoyi-common-core/pom.xml

@@ -107,6 +107,12 @@
             <artifactId>swagger-annotations</artifactId>
         </dependency>
 
+        <!-- beanutils -->
+        <dependency>
+            <groupId>commons-beanutils</groupId>
+            <artifactId>commons-beanutils</artifactId>
+        </dependency>
+
     </dependencies>
 
 </project>

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/StringUtils.java

@@ -3,6 +3,7 @@ package com.ruoyi.common.core.utils;
 import com.ruoyi.common.core.text.StrFormatter;
 import org.springframework.util.AntPathMatcher;
 
+import java.beans.PropertyDescriptor;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
@@ -483,4 +484,27 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
             return String.valueOf(obj);
         }
     }
+
+    /**
+     * @param bean         对象
+     * @param propertyName 属性
+     * @return
+     * @Title: isProperty
+     * @Description: 判断对象是否存在某属性
+     * @return: boolean 有则反之true 反之false
+     */
+    public static boolean isProperty(Object bean, String propertyName) {
+        if (bean == null) {
+            return false;
+        }
+        Class<?> cls = bean.getClass();
+        PropertyDescriptor[] propertys = org.springframework.beans.BeanUtils.getPropertyDescriptors(cls);
+        for (PropertyDescriptor property : propertys) {
+            String fieldName = property.getName();
+            if (fieldName != null && propertyName != null && fieldName.equals(propertyName)) {
+                return true;
+            }
+        }
+        return false;
+    }
 }

xhpc-modules/xhpc-user/pom.xml

@@ -15,6 +15,11 @@
         账号服务
     </description>
 
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+    </properties>
+
     <dependencies>
 
         <!-- SpringCloud Alibaba Nacos -->

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

@@ -0,0 +1,108 @@
+package com.xhpc.user.aspect;
+
+
+import com.ruoyi.common.core.utils.SecurityUtils;
+import com.ruoyi.common.core.utils.StringUtils;
+import org.apache.commons.beanutils.BeanUtils;
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Pointcut;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.stereotype.Component;
+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切面，插入创建人，创建时间，修改人，修改时间
+ * @author fjd
+ * @date 2020-07-09 11:59
+ */
+@Aspect
+@Component
+@Configuration
+public class DaoAspect {
+	private static final String CREATE_USER = "createUser";
+	private static final String CREATE_TIME = "createTime";
+	private static final String UPDATE_USER = "updateUser";
+	private static final String UPDATE_TIME = "updateTime";
+
+	@Pointcut("execution(* com.xhpc..*.update*(..))")
+	public void daoUpdate() {
+	}
+
+	@Pointcut("execution(* com.xhpc..*.insert*(..))")
+	public void daoCreate() {
+	}
+
+	@Around("daoUpdate()")
+	public Object doAroundUpdate(ProceedingJoinPoint point) throws Throwable {
+		ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+		if (attributes == null) {
+			return point.proceed();
+		}
+		//String userName  = StringUtils.valueOf(SecurityUtils.getUsername());
+		String userName  = "";
+		if (StringUtils.isNull(userName)) {
+            userName = "admin";
+		}
+		if (userName != null){
+			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))) {
+						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());
+					}
+				}
+			}
+		}
+		Object object = point.proceed();
+		return object;
+
+	}
+
+	@Around("daoCreate()")
+	public Object doAroundCreate(ProceedingJoinPoint point) throws Throwable {
+		ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+		if (attributes == null) {
+			return point.proceed();
+		}
+		Object[] objects = point.getArgs();
+		if (objects != null && objects.length > 0) {
+			for (Object arg : objects) {
+				//String userName  = StringUtils.valueOf(SecurityUtils.getUsername());
+				String userName  = "";
+				Date date = new Date();
+				if (StringUtils.isNull(userName)) {
+                    userName = "admin";
+				}
+				if (isProperty(arg, CREATE_USER) && StringUtils.isNull(BeanUtils.getProperty(arg, CREATE_USER))) {
+					BeanUtils.setProperty(arg, CREATE_USER, userName);
+				}
+				if (isProperty(arg, UPDATE_USER) && StringUtils.isNull(BeanUtils.getProperty(arg, UPDATE_USER))) {
+					BeanUtils.setProperty(arg, UPDATE_USER, userName);
+				}
+
+				if (isProperty(arg, CREATE_TIME) && StringUtils.isNull(BeanUtils.getProperty(arg, CREATE_TIME))) {
+					BeanUtils.setProperty(arg, CREATE_TIME, date);
+				}
+				if (isProperty(arg, UPDATE_TIME) && StringUtils.isNull(BeanUtils.getProperty(arg, UPDATE_TIME))) {
+					BeanUtils.setProperty(arg, UPDATE_TIME, date);
+				}
+			}
+		}
+		Object object = point.proceed();
+		return object;
+	}
+
+	public static boolean isProperty(Object bean, String field){
+		return StringUtils.isProperty(bean, field);
+	}
+
+}

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

@@ -6,6 +6,7 @@ import com.ruoyi.common.core.web.controller.BaseController;
 import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.core.web.page.TableDataInfo;
 import com.ruoyi.common.security.annotation.PreAuthorize;
+import com.ruoyi.system.api.domain.SysRole;
 import com.ruoyi.system.api.domain.SysUser;
 import com.xhpc.user.openfeign.RemoteSystemService;
 import com.xhpc.user.service.IXhpcOperatorService;
@@ -62,6 +63,13 @@ public class XhpcUserController extends BaseController {
         if (null != ajaxResult && !"200".equals(StringUtils.valueOf(ajaxResult.get("code")))) {
             return ajaxResult;
         }
+        SysRole role = new SysRole();
+        role.setRoleName(sysUser.getUserName());
+        role.setRoleKey(sysUser.getUserName());
+        ajaxResult = remoteSystemService.addRole(role);
+        if (null != ajaxResult && !"200".equals(StringUtils.valueOf(ajaxResult.get("code")))) {
+            return ajaxResult;
+        }
         return AjaxResult.success();
     }
 
@@ -124,6 +132,13 @@ public class XhpcUserController extends BaseController {
         if (null != ajaxResult && !"200".equals(StringUtils.valueOf(ajaxResult.get("code")))) {
             return ajaxResult;
         }
+        SysRole role = new SysRole();
+        role.setRoleName(sysUser.getUserName());
+        role.setRoleKey(sysUser.getUserName());
+        ajaxResult = remoteSystemService.addRole(role);
+        if (null != ajaxResult && !"200".equals(StringUtils.valueOf(ajaxResult.get("code")))) {
+            return ajaxResult;
+        }
         return AjaxResult.success();
     }
 

xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/domain/XhpcOperatorInternetBlacklist.java

@@ -2,6 +2,7 @@ package com.xhpc.user.domain;
 
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * 运营商设置流量方黑名单 xhpc_operator_internet_blacklist
@@ -12,6 +13,11 @@ public class XhpcOperatorInternetBlacklist implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    /**
+     * 运营商设置流量方黑名单id
+     */
+    private Long xhpcOperatorInternetBlacklistId;
+
     /**
      * 运营商id
      */
@@ -24,6 +30,35 @@ public class XhpcOperatorInternetBlacklist implements Serializable {
     @NotNull(message = "流量用户id不能为空")
     private Long internetUserId;
 
+    /**
+     * 状态（0正常 1停用）
+     */
+    private Integer status;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 创建者
+     */
+    private String createBy;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    /**
+     * 更新者
+     */
+    private String updateBy;
+
+    /**
+     * 备注
+     */
+    private String remark;
 
     public XhpcOperatorInternetBlacklist() {
     }
@@ -44,4 +79,59 @@ public class XhpcOperatorInternetBlacklist implements Serializable {
         this.internetUserId = internetUserId;
     }
 
+    public Long getXhpcOperatorInternetBlacklistId() {
+        return xhpcOperatorInternetBlacklistId;
+    }
+
+    public void setXhpcOperatorInternetBlacklistId(Long xhpcOperatorInternetBlacklistId) {
+        this.xhpcOperatorInternetBlacklistId = xhpcOperatorInternetBlacklistId;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getCreateBy() {
+        return createBy;
+    }
+
+    public void setCreateBy(String createBy) {
+        this.createBy = createBy;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getUpdateBy() {
+        return updateBy;
+    }
+
+    public void setUpdateBy(String updateBy) {
+        this.updateBy = updateBy;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
 }

xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/domain/XhpcStationInternetBlacklist.java

@@ -2,6 +2,7 @@ package com.xhpc.user.domain;
 
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * 流量用户设置流量方黑名单 xhpc_operator_internet_blacklist
@@ -12,6 +13,13 @@ public class XhpcStationInternetBlacklist implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+
+
+    /**
+     * 运营者子账号权限id
+     */
+    private Long xhpcUserPrivilegeId;
+
     /**
      * 流量用户id
      */
@@ -24,6 +32,35 @@ public class XhpcStationInternetBlacklist implements Serializable {
     @NotNull(message = "电站id不能为空")
     private Long chargingStationId;
 
+    /**
+     * 状态（0正常 1停用）
+     */
+    private Integer status;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 创建者
+     */
+    private String createBy;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    /**
+     * 更新者
+     */
+    private String updateBy;
+
+    /**
+     * 备注
+     */
+    private String remark;
 
     public XhpcStationInternetBlacklist() {
     }
@@ -44,4 +81,59 @@ public class XhpcStationInternetBlacklist implements Serializable {
         this.chargingStationId = chargingStationId;
     }
 
+    public Long getXhpcUserPrivilegeId() {
+        return xhpcUserPrivilegeId;
+    }
+
+    public void setXhpcUserPrivilegeId(Long xhpcUserPrivilegeId) {
+        this.xhpcUserPrivilegeId = xhpcUserPrivilegeId;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getCreateBy() {
+        return createBy;
+    }
+
+    public void setCreateBy(String createBy) {
+        this.createBy = createBy;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getUpdateBy() {
+        return updateBy;
+    }
+
+    public void setUpdateBy(String updateBy) {
+        this.updateBy = updateBy;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
 }

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

@@ -80,6 +80,14 @@ public interface XhpcOperatorMapper {
      */
     public int deleteUserPostByUserId(@Param("userId") Long userId);
 
+    /**
+     * 删除角色信息
+     *
+     * @param roleName 角色名称
+     * @return 结果
+     */
+    public int deleteRoleByName(@Param("roleName") String roleName);
+
     /**
      * 通过用户ID删除用户
      *

xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/openfeign/RemoteSystemFallbackFactory.java

@@ -1,11 +1,14 @@
 package com.xhpc.user.openfeign;
 
 import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.system.api.domain.SysRole;
 import com.ruoyi.system.api.domain.SysUser;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.cloud.openfeign.FallbackFactory;
 import org.springframework.stereotype.Component;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.RequestBody;
 
 /**
  * 用户服务降级处理
@@ -29,6 +32,10 @@ public class RemoteSystemFallbackFactory implements FallbackFactory<RemoteSystem
             public AjaxResult editUser(SysUser sysUser) {
                 return AjaxResult.error(throwable.getMessage());
             }
+            @Override
+            public AjaxResult addRole(SysRole role) {
+                return AjaxResult.error(throwable.getMessage());
+            }
         };
     }
 }

xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/openfeign/RemoteSystemService.java

@@ -2,6 +2,7 @@ package com.xhpc.user.openfeign;
 
 import com.ruoyi.common.core.constant.ServiceNameConstants;
 import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.system.api.domain.SysRole;
 import com.ruoyi.system.api.domain.SysUser;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.validation.annotation.Validated;
@@ -34,4 +35,12 @@ public interface RemoteSystemService {
     @PutMapping(value = "/user")
     public AjaxResult editUser(@Validated @RequestBody SysUser sysUser);
 
+    /**
+     * 新增角色
+     *
+     * @param role 角色信息
+     * @return 结果
+     */
+    @PostMapping(value = "/role")
+    public AjaxResult addRole(@Validated @RequestBody SysRole role);
 }

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

@@ -114,6 +114,12 @@ public class XhpcOperatorServiceImpl implements IXhpcOperatorService {
         xhpcOperatorMapper.deleteUserRoleByUserId(userId);
         // 删除用户与岗位表
         xhpcOperatorMapper.deleteUserPostByUserId(userId);
+        Map<String, Object> map = xhpcUserMapper.pcInfo(userId);
+        if (StringUtils.isNotNull(map)) {
+            String userName = StringUtils.valueOf(map.get("userName"));
+            // 删除用户与岗位表
+            xhpcOperatorMapper.deleteRoleByName(userName);
+        }
         return xhpcOperatorMapper.deleteUserById(userId, "2");
     }
 

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

@@ -62,13 +62,13 @@
             <if test="null != createBy and '' != createBy">
                 create_by,
             </if>
-            <if test="null != createTime and '' != createTime">
+            <if test="null != createTime ">
                 create_time,
             </if>
             <if test="null != updateBy and '' != updateBy">
                 update_by,
             </if>
-            <if test="null != updateTime and '' != updateTime">
+            <if test="null != updateTime ">
                 update_time,
             </if>
             <if test="null != remark and '' != remark">
@@ -112,13 +112,13 @@
             <if test="null != createBy and '' != createBy">
                 #{createBy},
             </if>
-            <if test="null != createTime and '' != createTime">
+            <if test="null != createTime ">
                 #{createTime},
             </if>
             <if test="null != updateBy and '' != updateBy">
                 #{updateBy},
             </if>
-            <if test="null != updateTime and '' != updateTime">
+            <if test="null != updateTime ">
                 #{updateTime},
             </if>
             <if test="null != remark and '' != remark">
@@ -141,9 +141,9 @@
             <if test="null != status and '' != status">status = #{status},</if>
             <if test="null != delFlag and '' != delFlag">del_flag = #{delFlag},</if>
             <if test="null != createBy and '' != createBy">create_by = #{createBy},</if>
-            <if test="null != createTime and '' != createTime">create_time = #{createTime},</if>
+            <if test="null != createTime ">create_time = #{createTime},</if>
             <if test="null != updateBy and '' != updateBy">update_by = #{updateBy},</if>
-            <if test="null != updateTime and '' != updateTime">update_time = #{updateTime},</if>
+            <if test="null != updateTime ">update_time = #{updateTime},</if>
             <if test="null != remark and '' != remark">remark = #{remark}</if>
         </set>
         WHERE app_user_id = #{appUserId}

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

@@ -95,13 +95,13 @@
             <if test="null != createBy and '' != createBy">
                 create_by,
             </if>
-            <if test="null != createTime and '' != createTime">
+            <if test="null != createTime ">
                 create_time,
             </if>
             <if test="null != updateBy and '' != updateBy">
                 update_by,
             </if>
-            <if test="null != updateTime and '' != updateTime">
+            <if test="null != updateTime ">
                 update_time,
             </if>
             <if test="null != remark and '' != remark">
@@ -169,13 +169,13 @@
             <if test="null != createBy and '' != createBy">
                 #{createBy},
             </if>
-            <if test="null != createTime and '' != createTime">
+            <if test="null != createTime ">
                 #{createTime},
             </if>
             <if test="null != updateBy and '' != updateBy">
                 #{updateBy},
             </if>
-            <if test="null != updateTime and '' != updateTime">
+            <if test="null != updateTime ">
                 #{updateTime},
             </if>
             <if test="null != remark and '' != remark">
@@ -210,9 +210,9 @@
             <if test="null != status and '' != status">status = #{status},</if>
             <if test="null != delFlag and '' != delFlag">del_flag = #{delFlag},</if>
             <if test="null != createBy and '' != createBy">create_by = #{createBy},</if>
-            <if test="null != createTime and '' != createTime">create_time = #{createTime},</if>
+            <if test="null != createTime ">create_time = #{createTime},</if>
             <if test="null != updateBy and '' != updateBy">update_by = #{updateBy},</if>
-            <if test="null != updateTime and '' != updateTime">update_time = #{updateTime},</if>
+            <if test="null != updateTime">update_time = #{updateTime},</if>
             <if test="null != remark and '' != remark">remark = #{remark}</if>
         </set>
         WHERE internet_user_id = #{internetUserId}

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

@@ -5,26 +5,78 @@
 <mapper namespace="com.xhpc.user.mapper.XhpcOperatorInternetBlacklistMapper">
 
     <resultMap type="com.xhpc.user.domain.XhpcOperatorInternetBlacklist" id="XhpcOperatorInternetBlacklistResult">
-        <result column="operator_id" property="operatorId"/>
+        <result column="xhpc_operator_internet_blacklist_id" property="xhpcOperatorInternetBlacklistId" />
-        <result column="internet_user_id" property="internetUserId"/>
+        <result column="operator_id" property="operatorId" />
+        <result column="internet_user_id" property="internetUserId" />
+        <result column="status" property="status" />
+        <result column="create_time" property="createTime" />
+        <result column="create_by" property="createBy" />
+        <result column="update_time" property="updateTime" />
+        <result column="update_by" property="updateBy" />
+        <result column="remark" property="remark" />
     </resultMap>
 
 
     <insert id="insert" parameterType="com.xhpc.user.domain.XhpcInternetUser">
-        insert into xhpc_operator_internet_blacklist(
+        insert into xhpc_operator_internet_blacklist
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+        <if test="null != xhpcOperatorInternetBlacklistId and '' != xhpcOperatorInternetBlacklistId">
+            xhpc_operator_internet_blacklist_id,
+        </if>
         <if test="null != operatorId and '' != operatorId">
             operator_id,
         </if>
         <if test="null != internetUserId and '' != internetUserId">
-            internet_user_id
+            internet_user_id,
+        </if>
+        <if test="null != status and '' != status">
+            status,
+        </if>
+        <if test="null != createTime ">
+            create_time,
+        </if>
+        <if test="null != createBy and '' != createBy">
+            create_by,
+        </if>
+        <if test="null != updateTime ">
+            update_time,
+        </if>
+        <if test="null != updateBy and '' != updateBy">
+            update_by,
+        </if>
+        <if test="null != remark and '' != remark">
+            remark
+        </if>
+    </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="null != xhpcOperatorInternetBlacklistId and '' != xhpcOperatorInternetBlacklistId">
+                #{xhpcOperatorInternetBlacklistId},
             </if>
-        )values(
             <if test="null != operatorId and '' != operatorId">
                 #{operatorId},
             </if>
             <if test="null != internetUserId and '' != internetUserId">
-            #{internetUserId}
+                #{internetUserId},
             </if>
+            <if test="null != status and '' != status">
+                #{status},
+            </if>
+            <if test="null != createTime ">
+                #{createTime},
+            </if>
+            <if test="null != createBy and '' != createBy">
+                #{createBy},
+            </if>
+            <if test="null != updateTime ">
+                #{updateTime},
+            </if>
+            <if test="null != updateBy and '' != updateBy">
+                #{updateBy},
+            </if>
+            <if test="null != remark and '' != remark">
+                #{remark}
+            </if>
+        </trim>
     </insert>
 
     <delete id="deleteByIds" parameterType="java.lang.Long">

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

@@ -102,13 +102,13 @@
         <if test="null != delFlag and '' != delFlag">
             del_flag,
         </if>
-        <if test="null != createTime and '' != createTime">
+        <if test="null != createTime ">
             create_time,
         </if>
         <if test="null != createBy and '' != createBy">
             create_by,
         </if>
-        <if test="null != updateTime and '' != updateTime">
+        <if test="null != updateTime ">
             update_time,
         </if>
         <if test="null != updateBy and '' != updateBy">
@@ -177,13 +177,13 @@
         <if test="null != delFlag and '' != delFlag">
             #{delFlag},
         </if>
-        <if test="null != createTime and '' != createTime">
+        <if test="null != createTime ">
             #{createTime},
         </if>
         <if test="null != createBy and '' != createBy">
             #{createBy},
         </if>
-        <if test="null != updateTime and '' != updateTime">
+        <if test="null != updateTime ">
             #{updateTime},
         </if>
         <if test="null != updateBy and '' != updateBy">
@@ -223,9 +223,9 @@
             <if test="null != soc and '' != soc">soc = #{soc},</if>
             <if test="null != status and '' != status">status = #{status},</if>
             <if test="null != delFlag and '' != delFlag">del_flag = #{delFlag},</if>
-            <if test="null != createTime and '' != createTime">create_time = #{createTime},</if>
+            <if test="null != createTime ">create_time = #{createTime},</if>
             <if test="null != createBy and '' != createBy">create_by = #{createBy},</if>
-            <if test="null != updateTime and '' != updateTime">update_time = #{updateTime},</if>
+            <if test="null != updateTime a">update_time = #{updateTime},</if>
             <if test="null != updateBy and '' != updateBy">update_by = #{updateBy},</if>
             <if test="null != remark and '' != remark">remark = #{remark}</if>
         </set>
@@ -301,4 +301,9 @@
 		where xo.del_flag = 0
         ORDER BY xo.create_time DESC
 	</select>
+
+
+    <delete id="deleteRoleByName" parameterType="java.lang.String">
+        update sys_role set del_flag = '2' where roleName = #{roleId}
+    </delete>
 </mapper> 

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

@@ -5,26 +5,78 @@
 <mapper namespace="com.xhpc.user.mapper.XhpcStationInternetBlacklistMapper">
 
     <resultMap type="com.xhpc.user.domain.XhpcStationInternetBlacklist" id="XhpcStationInternetBlacklistResult">
-        <result column="internet_user_id" property="internetUserId"/>
+        <result column="xhpc_user_privilege_id" property="xhpcUserPrivilegeId" />
-        <result column="charging_station_id" property="chargingStationId"/>
+        <result column="user_id" property="userId" />
+        <result column="charging_station_id" property="chargingStationId" />
+        <result column="status" property="status" />
+        <result column="create_time" property="createTime" />
+        <result column="create_by" property="createBy" />
+        <result column="update_time" property="updateTime" />
+        <result column="update_by" property="updateBy" />
+        <result column="remark" property="remark" />
     </resultMap>
 
 
     <insert id="insert" parameterType="com.xhpc.user.domain.XhpcInternetUser">
-        insert into xhpc_operator_internet_blacklist(
+        insert into xhpc_operator_internet_blacklist
-        <if test="null != internetUserId and '' != internetUserId">
+        <trim prefix="(" suffix=")" suffixOverrides=",">
-            internet_user_id,
+        <if test="null != xhpcUserPrivilegeId and '' != xhpcUserPrivilegeId">
+            xhpc_user_privilege_id,
+        </if>
+        <if test="null != userId and '' != userId">
+            user_id,
         </if>
         <if test="null != chargingStationId and '' != chargingStationId">
-            charging_station_id
+            charging_station_id,
         </if>
-        )values(
+        <if test="null != status and '' != status">
-        <if test="null != internetUserId and '' != internetUserId">
+            status,
-            #{internetUserId},
+        </if>
+        <if test="null != createTime ">
+            create_time,
+        </if>
+        <if test="null != createBy and '' != createBy">
+            create_by,
+        </if>
+        <if test="null != updateTime ">
+            update_time,
+        </if>
+        <if test="null != updateBy and '' != updateBy">
+            update_by,
+        </if>
+        <if test="null != remark and '' != remark">
+            remark
+        </if>
+    </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="null != xhpcUserPrivilegeId and '' != xhpcUserPrivilegeId">
+                #{xhpcUserPrivilegeId},
+            </if>
+            <if test="null != userId and '' != userId">
+                #{userId},
             </if>
             <if test="null != chargingStationId and '' != chargingStationId">
-            #{chargingStationId}
+                #{chargingStationId},
             </if>
+            <if test="null != status and '' != status">
+                #{status},
+            </if>
+            <if test="null != createTime ">
+                #{createTime},
+            </if>
+            <if test="null != createBy and '' != createBy">
+                #{createBy},
+            </if>
+            <if test="null != updateTime ">
+                #{updateTime},
+            </if>
+            <if test="null != updateBy and '' != updateBy">
+                #{updateBy},
+            </if>
+            <if test="null != remark and '' != remark">
+                #{remark}
+            </if>
+        </trim>
     </insert>
 
     <delete id="deleteByIds" parameterType="java.lang.Long">

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

@@ -48,9 +48,9 @@
             <if test="null != loginIp and '' != loginIp">login_ip = #{loginIp},</if>
             <if test="null != loginDate and '' != loginDate">login_date = #{loginDate},</if>
             <if test="null != createBy and '' != createBy">create_by = #{createBy},</if>
-            <if test="null != createTime and '' != createTime">create_time = #{createTime},</if>
+            <if test="null != createTime ">create_time = #{createTime},</if>
             <if test="null != updateBy and '' != updateBy">update_by = #{updateBy},</if>
-            <if test="null != updateTime and '' != updateTime">update_time = #{updateTime},</if>
+            <if test="null != updateTime ">update_time = #{updateTime},</if>
             <if test="null != remark and '' != remark">remark = #{remark}</if>
         </set>
         WHERE user_id = #{userId}