添加缓存新增接口

acupuncture-admin/src/main/java/com/acupuncture/web/controller/monitor/CacheController.java

@@ -8,15 +8,13 @@ import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
 import java.util.TreeSet;
+
+import io.swagger.v3.oas.annotations.parameters.RequestBody;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisCallback;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 import com.acupuncture.common.constant.CacheConstants;
 import com.acupuncture.common.core.domain.AjaxResult;
 import com.acupuncture.common.utils.StringUtils;
@@ -118,4 +116,12 @@ public class CacheController
         redisTemplate.delete(cacheKeys);
         return AjaxResult.success();
     }
+
+    @PreAuthorize("@ss.hasPermi('monitor:cache:list')")
+    @GetMapping("/add")
+    public AjaxResult add(@RequestParam("key") String key, @RequestParam("value") String value)
+    {
+        redisTemplate.opsForValue().set(key, value);
+        return AjaxResult.success();
+    }
 }

acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/DmsLoginController.java

@@ -143,6 +143,7 @@ public class DmsLoginController {
         tokenService.refreshToken(loginUser);
         AjaxResult ajax = AjaxResult.success();
         ajax.put("user", user);
+        ajax.put("forceUpdPwdFlag" , tenantUser.getForceUpdPwdFlag());
         return ajax;
     }
 

acupuncture-framework/src/main/java/com/acupuncture/framework/web/service/WebDmsLoginService.java

@@ -62,7 +62,7 @@ public class WebDmsLoginService
     public String login(String username, String password, String code, String uuid)
     {
         // 验证码校验
-//        validateCaptcha(username, code, uuid);
+        validateCaptcha(username, code, uuid);
         // 登录前置校验
         loginPreCheck(username, password);
         // 用户验证

acupuncture-generator/src/main/resources/mbg.xml

@@ -87,8 +87,8 @@
 <!--        <table tableName="rms_report_type" domainObjectName="RmsReportType" enableDeleteByExample="false"/>-->
 <!--        <table tableName="rms_report_management" domainObjectName="RmsReportManagement" enableDeleteByExample="false"/>-->
 <!--        <table tableName="ums_data_source" domainObjectName="UmsDataSource" enableDeleteByExample="false"/>-->
-                <table tableName="sys_notice_user" domainObjectName="SysNoticeUser" enableDeleteByExample="false"/>
+<!--                <table tableName="sys_notice_user" domainObjectName="SysNoticeUser" enableDeleteByExample="false"/>-->
-
+        <table tableName="dms_user" domainObjectName="DmsUser" enableDeleteByExample="false"/>
 
         <!-- 有些表的字段需要指定java类型
          <table schema="" tableName="">

acupuncture-system/src/main/java/com/acupuncture/system/domain/po/DmsUser.java

@@ -36,6 +36,8 @@ public class DmsUser implements Serializable {
 
     private String remark;
 
+    private Byte forceUpdPwdFlag;
+
     private static final long serialVersionUID = 1L;
 
     public Long getId() {
@@ -166,6 +168,14 @@ public class DmsUser implements Serializable {
         this.remark = remark == null ? null : remark.trim();
     }
 
+    public Byte getForceUpdPwdFlag() {
+        return forceUpdPwdFlag;
+    }
+
+    public void setForceUpdPwdFlag(Byte forceUpdPwdFlag) {
+        this.forceUpdPwdFlag = forceUpdPwdFlag;
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -188,6 +198,7 @@ public class DmsUser implements Serializable {
         sb.append(", updateBy=").append(updateBy);
         sb.append(", updateTime=").append(updateTime);
         sb.append(", remark=").append(remark);
+        sb.append(", forceUpdPwdFlag=").append(forceUpdPwdFlag);
         sb.append("]");
         return sb.toString();
     }

acupuncture-system/src/main/java/com/acupuncture/system/domain/po/DmsUserExample.java

@@ -1164,6 +1164,66 @@ public class DmsUserExample {
             addCriterion("remark not between", value1, value2, "remark");
             return (Criteria) this;
         }
+
+        public Criteria andForceUpdPwdFlagIsNull() {
+            addCriterion("force_upd_pwd_flag is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andForceUpdPwdFlagIsNotNull() {
+            addCriterion("force_upd_pwd_flag is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andForceUpdPwdFlagEqualTo(Byte value) {
+            addCriterion("force_upd_pwd_flag =", value, "forceUpdPwdFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andForceUpdPwdFlagNotEqualTo(Byte value) {
+            addCriterion("force_upd_pwd_flag <>", value, "forceUpdPwdFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andForceUpdPwdFlagGreaterThan(Byte value) {
+            addCriterion("force_upd_pwd_flag >", value, "forceUpdPwdFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andForceUpdPwdFlagGreaterThanOrEqualTo(Byte value) {
+            addCriterion("force_upd_pwd_flag >=", value, "forceUpdPwdFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andForceUpdPwdFlagLessThan(Byte value) {
+            addCriterion("force_upd_pwd_flag <", value, "forceUpdPwdFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andForceUpdPwdFlagLessThanOrEqualTo(Byte value) {
+            addCriterion("force_upd_pwd_flag <=", value, "forceUpdPwdFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andForceUpdPwdFlagIn(List<Byte> values) {
+            addCriterion("force_upd_pwd_flag in", values, "forceUpdPwdFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andForceUpdPwdFlagNotIn(List<Byte> values) {
+            addCriterion("force_upd_pwd_flag not in", values, "forceUpdPwdFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andForceUpdPwdFlagBetween(Byte value1, Byte value2) {
+            addCriterion("force_upd_pwd_flag between", value1, value2, "forceUpdPwdFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andForceUpdPwdFlagNotBetween(Byte value1, Byte value2) {
+            addCriterion("force_upd_pwd_flag not between", value1, value2, "forceUpdPwdFlag");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

acupuncture-system/src/main/java/com/acupuncture/system/domain/vo/DmsLoginUserVo.java

@@ -42,6 +42,9 @@ public class DmsLoginUserVo {
         private String status;
         private String updateBy;
         private String remark;
+
+        @ApiModelProperty("强制更新密码标志，初始密码/重置密码需要强制修改密码 0不需要重置 1需要")
+        private Byte forceUpdPwdFlag;
     }
 
     @Data

acupuncture-system/src/main/java/com/acupuncture/system/service/impl/AdminTenantUserServiceImpl.java

@@ -68,6 +68,7 @@ public class AdminTenantUserServiceImpl implements AdminTenantUserService {
         DmsUser dmsUser = new DmsUser();
         dmsUser.setId(dto.getId());
         dmsUser.setPassword(SecurityUtils.encryptPassword(dto.getPassword()));
+        dmsUser.setForceUpdPwdFlag((byte) 1);
         return dmsUserMapper.updateByPrimaryKeySelective(dmsUser);
     }
 }

acupuncture-system/src/main/java/com/acupuncture/system/service/impl/DmsLoginServiceImpl.java

@@ -64,6 +64,7 @@ public class DmsLoginServiceImpl implements DmsLoginService {
         user.setId(userId);
         user.setUserName(username);
         user.setPassword(password);
+        user.setForceUpdPwdFlag(( byte) 0);
         return dmsUserDao.updateUser(user);
     }
 

acupuncture-system/src/main/resources/mapper/dao/DmsUserDao.xml

@@ -74,6 +74,7 @@
             <if test="status != null and status != ''">status = #{status},</if>
             <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
             <if test="remark != null">remark = #{remark},</if>
+            <if test="forceUpdPwdFlag != null">force_upd_pwd_flag = #{forceUpdPwdFlag},</if>
             update_time = sysdate()
         </set>
         where id = #{id}
@@ -97,7 +98,8 @@
             u.sex as sex,
             t.`name` as tenantName,
             t.contact_phone as tenantPhone,
-            u.slaver_admin as slaverAdmin
+            u.slaver_admin as slaverAdmin,
+            u.force_upd_pwd_flag as forceUpdPwdFlag
         from
             dms_user u join dms_tenant t on u.tenant_id = t.id
         WHERE

acupuncture-system/src/main/resources/mapper/system/DmsUserMapper.xml

@@ -18,6 +18,7 @@
     <result column="update_by" jdbcType="VARCHAR" property="updateBy" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
     <result column="remark" jdbcType="VARCHAR" property="remark" />
+    <result column="force_upd_pwd_flag" jdbcType="TINYINT" property="forceUpdPwdFlag" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -79,7 +80,7 @@
   </sql>
   <sql id="Base_Column_List">
     id, tenant_id, user_name, password, nick_name, email, phonenumber, sex, slaver_admin, 
-    status, del_flag, create_by, create_time, update_by, update_time, remark
+    status, del_flag, create_by, create_time, update_by, update_time, remark, force_upd_pwd_flag
   </sql>
   <select id="selectByExample" parameterType="com.acupuncture.system.domain.po.DmsUserExample" resultMap="BaseResultMap">
     select
@@ -111,13 +112,13 @@
       phonenumber, sex, slaver_admin, 
       status, del_flag, create_by, 
       create_time, update_by, update_time, 
-      remark)
+      remark, force_upd_pwd_flag)
     values (#{id,jdbcType=BIGINT}, #{tenantId,jdbcType=BIGINT}, #{userName,jdbcType=VARCHAR}, 
       #{password,jdbcType=VARCHAR}, #{nickName,jdbcType=VARCHAR}, #{email,jdbcType=VARCHAR}, 
       #{phonenumber,jdbcType=VARCHAR}, #{sex,jdbcType=CHAR}, #{slaverAdmin,jdbcType=TINYINT}, 
       #{status,jdbcType=CHAR}, #{delFlag,jdbcType=TINYINT}, #{createBy,jdbcType=VARCHAR}, 
       #{createTime,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, 
-      #{remark,jdbcType=VARCHAR})
+      #{remark,jdbcType=VARCHAR}, #{forceUpdPwdFlag,jdbcType=TINYINT})
   </insert>
   <insert id="insertSelective" parameterType="com.acupuncture.system.domain.po.DmsUser">
     insert into dms_user
@@ -170,6 +171,9 @@
       <if test="remark != null">
         remark,
       </if>
+      <if test="forceUpdPwdFlag != null">
+        force_upd_pwd_flag,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -220,6 +224,9 @@
       <if test="remark != null">
         #{remark,jdbcType=VARCHAR},
       </if>
+      <if test="forceUpdPwdFlag != null">
+        #{forceUpdPwdFlag,jdbcType=TINYINT},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.acupuncture.system.domain.po.DmsUserExample" resultType="java.lang.Long">
@@ -279,6 +286,9 @@
       <if test="record.remark != null">
         remark = #{record.remark,jdbcType=VARCHAR},
       </if>
+      <if test="record.forceUpdPwdFlag != null">
+        force_upd_pwd_flag = #{record.forceUpdPwdFlag,jdbcType=TINYINT},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -301,7 +311,8 @@
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
       update_by = #{record.updateBy,jdbcType=VARCHAR},
       update_time = #{record.updateTime,jdbcType=TIMESTAMP},
-      remark = #{record.remark,jdbcType=VARCHAR}
+      remark = #{record.remark,jdbcType=VARCHAR},
+      force_upd_pwd_flag = #{record.forceUpdPwdFlag,jdbcType=TINYINT}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -354,6 +365,9 @@
       <if test="remark != null">
         remark = #{remark,jdbcType=VARCHAR},
       </if>
+      <if test="forceUpdPwdFlag != null">
+        force_upd_pwd_flag = #{forceUpdPwdFlag,jdbcType=TINYINT},
+      </if>
     </set>
     where id = #{id,jdbcType=BIGINT}
   </update>
@@ -373,7 +387,8 @@
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_by = #{updateBy,jdbcType=VARCHAR},
       update_time = #{updateTime,jdbcType=TIMESTAMP},
-      remark = #{remark,jdbcType=VARCHAR}
+      remark = #{remark,jdbcType=VARCHAR},
+      force_upd_pwd_flag = #{forceUpdPwdFlag,jdbcType=TINYINT}
     where id = #{id,jdbcType=BIGINT}
   </update>
 </mapper>