20240424_sun

ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java

@@ -25,6 +25,7 @@ import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 用户对象 sys_user
@@ -181,5 +182,14 @@ public class SysUser extends BaseEntity
     @TableField(exist = false)
     private String jsfs;
 
+    @TableField(exist = false)
+    private String mchnt;
+
+    @TableField(exist = false)
+    private String stbm;
+
+    @TableField(exist = false)
+    private List<Map<String, Object>> btbz;
+
     private String openid;
 }

ruoyi-modules/mz-lnst/src/main/java/com/ruoyi/lnst/controller/ZwywLrJbxxController.java

@@ -79,6 +79,11 @@ public class ZwywLrJbxxController extends BaseController {
         return AjaxResult.success(zwywLrJbxxService.getLrByZjhm(zwywLrJbxx));
     }
 
+    @GetMapping("/getLrByUserId")
+    public AjaxResult getLrByUserId(InLnstLrxx zwywLrJbxx) {
+        return AjaxResult.success(zwywLrJbxxService.getLrByUserId(zwywLrJbxx));
+    }
+
     @PostMapping("ocr")
     public String ocr(@RequestBody BaiduOcrVo vo) {
         return BaiduUtil.idcard(vo.getImgStr(), vo.getType());

ruoyi-modules/mz-lnst/src/main/java/com/ruoyi/lnst/domain/ZwywJclrYcxx.java

@@ -151,6 +151,10 @@ public class ZwywJclrYcxx extends BaseEntity
     @ApiModelProperty(value = "注销ip")
     private String zxip;
 
+    private String xb;
+
+    private String csrq;
+
     @TableField(exist = false)
     private String ssqhMc;
 

ruoyi-modules/mz-lnst/src/main/java/com/ruoyi/lnst/service/IZwywLrJbxxService.java

@@ -34,6 +34,8 @@ public interface IZwywLrJbxxService
 
     public InLnstLrxx getLrByZjhm(InLnstLrxx zwywLrJbxx);
 
+    public InLnstLrxx getLrByUserId(InLnstLrxx zwywLrJbxx);
+
     /**
      * 新增老人基本信息
      *

ruoyi-modules/mz-lnst/src/main/java/com/ruoyi/lnst/service/impl/ZwywJclrYcxxServiceImpl.java

@@ -93,9 +93,23 @@ public class ZwywJclrYcxxServiceImpl implements IZwywJclrYcxxService {
         if (StringUtils.equals(lrxx.getLzzt(), "99")) {
             throw new ServiceException("该账号已被停用");
         }
+        if (StringUtils.isNotEmpty(zwywJclrYcxx.getSfzh())) {
+            try {
+                zwywJclrYcxx.setXb(getXb(zwywJclrYcxx.getSfzh()));
+                zwywJclrYcxx.setCsrq(getCsrq(zwywJclrYcxx.getSfzh()));
+            } catch (Exception ignored) {}
+        }
         return zwywJclrYcxxMapper.insert(zwywJclrYcxx);
     }
 
+    private String getXb(String sfzh) {
+        return Integer.parseInt(String.valueOf(sfzh.charAt(sfzh.length() - 2))) % 2 == 1 ? "1" : "2";
+    }
+
+    private String getCsrq(String sfzh) {
+        return sfzh.substring(6, 14);
+    }
+
     /**
      * 修改养老食堂_用餐信息
      *

ruoyi-modules/mz-lnst/src/main/java/com/ruoyi/lnst/service/impl/ZwywLrJbxxServiceImpl.java

@@ -809,6 +809,19 @@ public class ZwywLrJbxxServiceImpl implements IZwywLrJbxxService {
         return lr;
     }
 
+    @Override
+    public InLnstLrxx getLrByUserId(InLnstLrxx zwywLrJbxx) {
+        if (StringUtils.isEmpty(zwywLrJbxx.getLrJmzjhm())) {
+            throw new ServiceException("lrJmzjhm不能为空");
+        }
+        InLnstLrxx lr = zwywLrJbxxMapper.selectOne(new LambdaQueryWrapper<>(zwywLrJbxx));
+        EncryptionUtils.decryptForPlaintext(lr);
+        if (ObjectUtils.isNotEmpty(lr)) {
+            lr.setHtCheck(StringUtils.isNotEmpty(lr.getLrHtzp()) ? "1" : "0");
+        }
+        return lr;
+    }
+
     private Map<String, String> BaiduMatch(String filePath, String base64Str) {
         int socre = 0;
         AjaxResult ajaxResult = remoteConfigService.getConfigKey("face.to.face.score",SecurityConstants.INNER);
@@ -928,7 +941,7 @@ public class ZwywLrJbxxServiceImpl implements IZwywLrJbxxService {
         Map<String, String> param = new LinkedHashMap<>();
         param.put("image", image);
         param.put("image_type", "BASE64");
-        param.put("group_id", lrjbxx.getLrHjdz().substring(0, 6));
+        param.put("group_id", lrjbxx.getMchnt());
         param.put("user_id", lrjbxx.getLrJmzjhm());
         param.put("action_type", "REPLACE");
         JSONObject uploadRes = httpsRequest("https://aip.baidubce.com/rest/2.0/face/v3/faceset/user/add" +

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java

@@ -5,6 +5,7 @@ import com.ruoyi.system.api.domain.SysUser;
 
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 用户表 数据层
@@ -47,6 +48,8 @@ public interface SysUserMapper extends BaseMapperPlus<SysUser>
 
     public SysUser selectLrUserByUserName(String userName);
 
+    public List<Map<String, Object>> selectBtbzBySsqh(String code);
+
     public SysUser selectLrUserByOpenId(String openId);
 
     public void updateOpenId(SysUser user);
@@ -171,4 +174,6 @@ public interface SysUserMapper extends BaseMapperPlus<SysUser>
     public void insertUserHistory(SysUser user);
 
     public List<SysUser> selectUserHistory(String userName);
+
+    public String getMchnt(String code);
 }

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

@@ -36,10 +36,7 @@ import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
 
 import javax.validation.Validator;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 /**
@@ -148,6 +145,8 @@ public class SysUserServiceImpl implements ISysUserService {
     public SysUser selectLrUserByUserName(String userName) {
         SysUser res = userMapper.selectLrUserByUserName(userName);
         if (!ObjectUtils.isEmpty(res)) {
+            res.setMchnt(getMchntCode(res.getDept().getLocationCode()));
+            res.setBtbz(userMapper.selectBtbzBySsqh(res.getDept().getLocationCode()));
             res.getDept().setDirectly("3");
             DBImpl dbs = DBFactory.getDBImpl("master");
             DBResult dbset = dbs.getDataBySql("select get_dept_directly("+res.getDept().getDeptId().toString()+") pid");
@@ -744,4 +743,8 @@ public class SysUserServiceImpl implements ISysUserService {
             userMapper.insertUserHistory(old);
         }
     }
+
+    private String getMchntCode(String lrHjdz) {
+        return userMapper.getMchnt(lrHjdz.substring(0, 6));
+    }
 }

ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -38,6 +38,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="updateUnitName"    column="update_unit_name"    />
 		<result property="level"    column="level"    />
 		<result property="openid"    column="openid"    />
+		<result property="stbm"    column="stbm"    />
+		<result property="jgName"    column="jgName"    />
         <association property="dept"    column="dept_id" javaType="SysDept" resultMap="deptResult" />
         <collection  property="roles"   javaType="java.util.List"           resultMap="RoleResult" />
     </resultMap>
@@ -182,10 +184,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</select>
 
 	<select id="selectLrUserByUserName" parameterType="String" resultMap="SysUserResult">
-		<include refid="selectLrUserVo"/>
+		select u.user_id, u.dept_id, u.user_name, u.user_type, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.remark, u.jg_id,
+			   d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status, d.location_code,d.directly,d.jsc as create_bmjsc,d.jsc as create_qhjsc,
+			   r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.power_rids, r.status as role_status, u.create_time_str as create_time_str,
+			   j.ylstbm as stbm, j.stmc as jgName
+		from lnst_user u
+				 left join sys_dept d on u.dept_id = d.dept_id
+				 left join lnst_jcxx j on j.id = u.jg_id
+				 left join lnst_user_role ur on u.user_id = ur.user_id
+				 left join sys_role r on r.role_id = ur.role_id
 		where u.user_name = #{userName} and u.del_flag = '0'
 	</select>
 
+	<select id="selectBtbzBySsqh" parameterType="String" resultType="java.util.HashMap">
+		select bzbm, bzms, btje, ssqh from lnst_btbz where ssqh = #{code} and zt = '0'
+	</select>
+
 	<select id="selectLrUserByOpenId" parameterType="String" resultMap="SysUserResult">
 		<include refid="selectLrUserVo"/>
 		where u.openid = #{openId} and u.del_flag = '0'
@@ -474,4 +488,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		where user_id = #{userId}
 	</update>
 
+	<select id="getMchnt" parameterType="String" resultType="String">
+		select mchnt from lnst_mchnt where ssqh like concat('%', #{code}, '%') limit 1
+	</select>
 </mapper>