Merge remote-tracking branch 'origin/master'

base-manager/pom.xml

@@ -32,7 +32,7 @@
 				<profiles.rabbitmq.port>5672</profiles.rabbitmq.port>
 				<profiles.nacos.server-addr>192.168.0.252:8848</profiles.nacos.server-addr>
 				<profiles.nacos.group>DEFAULT_GROUP</profiles.nacos.group>
-				<profiles.nacos.namespace>smart-gov</profiles.nacos.namespace>
+				<profiles.nacos.namespace>smart-gov-dev</profiles.nacos.namespace>
 				<profiles.log.path>/mortals/app/logs</profiles.log.path>
 			</properties>
 		</profile>
@@ -73,6 +73,12 @@
 		<dependency>
 			<groupId>com.mortals.xhx</groupId>
 			<artifactId>common-lib</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>org.bouncycastle</groupId>
+					<artifactId>bcprov-jdk16</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 
 		<!-- 引入 SpringMVC 相关依赖，并实现对其的自动配置 -->
@@ -118,6 +124,23 @@
 			<artifactId>jjwt</artifactId>
 		</dependency>
 
+		<dependency>
+			<groupId>org.bouncycastle</groupId>
+			<artifactId>bcprov-jdk15on</artifactId>
+			<version>1.64</version>
+		</dependency>
+		<!-- 虹软人脸解析 -->
+		<dependency>
+			<groupId>com.arcsoft.face</groupId>
+			<artifactId>arcsoft-sdk-face</artifactId>
+			<version>3.0.0.0</version>
+		</dependency>
+		<dependency>
+			<groupId>net.coobird</groupId>
+			<artifactId>thumbnailator</artifactId>
+			<version>0.4.5</version>
+		</dependency>
+
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-test</artifactId>

base-manager/src/main/java/com/mortals/xhx/common/key/Constant.java

@@ -68,6 +68,9 @@ public final class Constant {
 	 */
 	public final static String PARAM_SERVER_HTTP_IMAGE_URL = "server_http_image_url";
 
-
+	/**
+	 * 身份证加密key
+	 */
+	public static final String MYSQL_KEY = "xhx-85435158";
 
 }

base-manager/src/main/java/com/mortals/xhx/common/utils/FaceUtil.java

+package com.mortals.xhx.common.utils;
+
+import com.arcsoft.face.*;
+import com.arcsoft.face.enums.DetectMode;
+import com.arcsoft.face.enums.DetectOrient;
+import com.arcsoft.face.enums.ErrorInfo;
+import com.arcsoft.face.toolkit.ImageInfo;
+import com.mortals.framework.exception.AppException;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static com.arcsoft.face.toolkit.ImageFactory.getRGBData;
+
+@Slf4j
+@Component
+public class FaceUtil {
+
+    public FaceEngine initFace(String appId, String sdkKey) {
+        FaceEngine faceEngine = new FaceEngine(getClass().getResource(getOsName()).getPath());
+        //激活引擎
+        int errorCode = faceEngine.activeOnline(appId, sdkKey);
+        isTrue(!(errorCode != ErrorInfo.MOK.getValue() && errorCode != ErrorInfo.MERR_ASF_ALREADY_ACTIVATED.getValue()), "引擎激活失败");
+        ActiveFileInfo activeFileInfo = new ActiveFileInfo();
+        errorCode = faceEngine.getActiveFileInfo(activeFileInfo);
+        isTrue(!(errorCode != ErrorInfo.MOK.getValue() && errorCode != ErrorInfo.MERR_ASF_ALREADY_ACTIVATED.getValue()), "获取激活文件信息失败");
+        //引擎配置
+        EngineConfiguration engineConfiguration = new EngineConfiguration();
+        engineConfiguration.setDetectMode(DetectMode.ASF_DETECT_MODE_IMAGE);
+        engineConfiguration.setDetectFaceOrientPriority(DetectOrient.ASF_OP_ALL_OUT);
+        engineConfiguration.setDetectFaceMaxNum(10);
+        engineConfiguration.setDetectFaceScaleVal(16);
+        //功能配置
+        FunctionConfiguration functionConfiguration = new FunctionConfiguration();
+        functionConfiguration.setSupportAge(true);
+        functionConfiguration.setSupportFace3dAngle(true);
+        functionConfiguration.setSupportFaceDetect(true);
+        functionConfiguration.setSupportFaceRecognition(true);
+        functionConfiguration.setSupportGender(true);
+        functionConfiguration.setSupportLiveness(true);
+        functionConfiguration.setSupportIRLiveness(true);
+        engineConfiguration.setFunctionConfiguration(functionConfiguration);
+        //初始化引擎
+        errorCode = faceEngine.init(engineConfiguration);
+        isTrue(errorCode == ErrorInfo.MOK.getValue(), "初始化引擎失败");
+        return faceEngine;
+    }
+
+
+    /**
+     * 人脸检测、特征提取
+     *
+     * @param faceEngine
+     * @param bytes
+     * @return
+     */
+    public byte[] featureData(FaceEngine faceEngine, byte[] bytes) {
+        //人脸检测
+        ImageInfo imageInfo = getRGBData(bytes);
+        List<FaceInfo> faceInfoList = new ArrayList<FaceInfo>();
+        faceEngine.detectFaces(imageInfo.getImageData(), imageInfo.getWidth(), imageInfo.getHeight(), imageInfo.getImageFormat(), faceInfoList);
+        //特征提取
+        FaceFeature faceFeature = new FaceFeature();
+        faceEngine.extractFaceFeature(imageInfo.getImageData(), imageInfo.getWidth(), imageInfo.getHeight(), imageInfo.getImageFormat(), faceInfoList.get(0), faceFeature);
+        return faceFeature.getFeatureData();
+    }
+
+
+    /**
+     * 特征比对
+     *
+     * @param targeFace
+     * @param sourceFace
+     * @return
+     */
+    public boolean featureComparison(FaceEngine faceEngine, byte[] targeFace, byte[] sourceFace) {
+        //特征比对
+        FaceFeature targetFaceFeature = new FaceFeature();
+        targetFaceFeature.setFeatureData(targeFace);
+        FaceFeature sourceFaceFeature = new FaceFeature();
+        sourceFaceFeature.setFeatureData(sourceFace);
+        FaceSimilar faceSimilar = new FaceSimilar();
+        faceEngine.compareFaceFeature(targetFaceFeature, sourceFaceFeature, faceSimilar);
+        float score = faceSimilar.getScore();
+        if (score > 0.8) {
+            return true;
+        }
+        return false;
+    }
+
+    public void unInit(FaceEngine faceEngine) {
+        faceEngine.unInit();
+    }
+
+    public String getOsName() {
+        String os = System.getProperty("os.name");
+        String osName = os.toLowerCase().startsWith("win") ? "/face_lib/win64" : "/face_lib/linux";
+        return osName;
+    }
+
+
+    private void isTrue(boolean b, String errorMsg) {
+        if (!b) {
+            throw new AppException(errorMsg);
+        }
+    }
+
+}

base-manager/src/main/java/com/mortals/xhx/common/utils/RioUtil.java

+package com.mortals.xhx.common.utils;
+
+import cn.hutool.core.util.HexUtil;
+import org.bouncycastle.jce.provider.BouncyCastleProvider;
+import org.bouncycastle.util.encoders.Base64;
+
+import javax.crypto.Cipher;
+import javax.crypto.spec.SecretKeySpec;
+import java.nio.charset.Charset;
+import java.security.Security;
+
+/**
+ * @Description 平台请求天府健康通接口demo
+ * demo 依赖于 hutool-all 5.5.7 以及 bcprov-jdk15to18 1.64
+ * @ClassName RioDemo
+ * @Author ScarletDrop
+ * @Version 1.0
+ **/
+public class RioUtil {
+    static {
+        Security.addProvider(new BouncyCastleProvider());
+    }
+
+
+    /**
+     * 加密
+     *
+     * @param content 内容
+     * @param sm4     sm4密钥
+     * @return 加密字符串
+     */
+    public static String encryptHex(String content, String sm4) {
+        String inputHex = HexUtil.encodeHexStr(content.getBytes());
+        byte[] encryptRet = new byte[0];
+        try {
+            SecretKeySpec sm4Key = new SecretKeySpec(HexUtil.decodeHex(sm4.toCharArray()), "SM4");
+            Cipher cipher = Cipher.getInstance("SM4/ECB/PKCS7Padding", BouncyCastleProvider.PROVIDER_NAME);
+            cipher.init(Cipher.ENCRYPT_MODE, sm4Key);
+            encryptRet = cipher.doFinal(HexUtil.decodeHex(inputHex.toCharArray()));
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return Base64.toBase64String(encryptRet);
+    }
+
+
+    /**
+     * 解密
+     *
+     * @param content 内容
+     * @param sm4     sm4密钥
+     * @return 解密字符串
+     */
+    public static String decrypt(String content, String sm4) {
+        byte[] decoded = Base64.decode(content);
+        byte[] encryptRet = new byte[0];
+        try {
+            SecretKeySpec sm4Key = new SecretKeySpec(HexUtil.decodeHex(sm4.toCharArray()), "SM4");
+            Cipher cipher = Cipher.getInstance("SM4/ECB/PKCS7Padding", BouncyCastleProvider.PROVIDER_NAME);
+            cipher.init(Cipher.DECRYPT_MODE, sm4Key);
+            encryptRet = cipher.doFinal(decoded);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return new String(encryptRet, Charset.forName("UTF-8"));
+    }
+
+//    public static void main(String[] args) {
+//       String a =  encryptHex("scdsjzx","b4a8af568f71136a6b1f8e8a4c9ebc2d");
+//       log.info("a===={}",a);
+//        String B =  decrypt(a,"b4a8af568f71136a6b1f8e8a4c9ebc2d");
+//        log.info("B===={}",B);
+//    }
+}

base-manager/src/main/java/com/mortals/xhx/module/identity/dao/SysFaceDao.java

+package com.mortals.xhx.module.identity.dao;
+
+import com.mortals.framework.dao.ICRUDDao;
+import com.mortals.xhx.module.identity.model.SysFaceEntity;
+import java.util.List;
+/**
+* 人脸识别信息Dao
+* 人脸识别信息 DAO接口
+*
+* @author zxfei
+* @date 2022-08-03
+*/
+public interface  SysFaceDao extends ICRUDDao<SysFaceEntity,String>{
+
+
+}

base-manager/src/main/java/com/mortals/xhx/module/identity/dao/SysIdentityDao.java

+package com.mortals.xhx.module.identity.dao;
+
+import com.mortals.framework.dao.ICRUDDao;
+import com.mortals.xhx.module.identity.model.SysIdentityEntity;
+import java.util.List;
+/**
+* 人员身份信息Dao
+* 人员身份信息 DAO接口
+*
+* @author zxfei
+* @date 2022-08-03
+*/
+public interface  SysIdentityDao extends ICRUDDao<SysIdentityEntity,String>{
+
+    /**
+     * 身份证号查询
+     * @param region
+     * @param birthday
+     * @param ase
+     * @param name
+     * @param id
+     * @return
+     */
+    SysIdentityEntity findIdentity(Long region,Long birthday,String ase, String name, String id);
+}

base-manager/src/main/java/com/mortals/xhx/module/identity/dao/ibatis/SysFaceDaoImpl.java

+package com.mortals.xhx.module.identity.dao.ibatis;
+
+
+import org.springframework.stereotype.Repository;
+import com.mortals.xhx.module.identity.dao.SysFaceDao;
+import com.mortals.xhx.module.identity.model.SysFaceEntity;
+import java.util.Date;
+import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
+import java.util.List;
+/**
+* 人脸识别信息DaoImpl DAO接口
+*
+* @author zxfei
+* @date 2022-08-03
+*/
+@Repository("sysFaceDao")
+public class SysFaceDaoImpl extends BaseCRUDDaoMybatis<SysFaceEntity,String> implements SysFaceDao {
+
+
+
+}

base-manager/src/main/java/com/mortals/xhx/module/identity/dao/ibatis/SysIdentityDaoImpl.java

+package com.mortals.xhx.module.identity.dao.ibatis;
+
+
+import com.mortals.framework.model.BaseEntity;
+import com.mortals.framework.model.ParamDto;
+import org.springframework.stereotype.Repository;
+import com.mortals.xhx.module.identity.dao.SysIdentityDao;
+import com.mortals.xhx.module.identity.model.SysIdentityEntity;
+import java.util.Date;
+import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+* 人员身份信息DaoImpl DAO接口
+*
+* @author zxfei
+* @date 2022-08-03
+*/
+@Repository("sysIdentityDao")
+public class SysIdentityDaoImpl extends BaseCRUDDaoMybatis<SysIdentityEntity,String> implements SysIdentityDao {
+
+
+    @Override
+    public SysIdentityEntity findIdentity(Long region, Long birthday, String ase, String name, String id) {
+        Map<String,Object> condition = new HashMap<>();
+        condition.put("region",region);
+        condition.put("birthday",birthday);
+        condition.put("ase",ase);
+        condition.put("name",name);
+        condition.put("id",id);
+        return (SysIdentityEntity)this.getSqlSession().selectOne(this.getSqlId("findIdentity"), condition);
+    }
+}

base-manager/src/main/java/com/mortals/xhx/module/identity/model/SysFaceEntity.java

+package com.mortals.xhx.module.identity.model;
+
+import java.util.List;
+import java.util.ArrayList;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mortals.framework.annotation.Excel;
+import com.mortals.framework.model.BaseEntityStr;
+import com.mortals.xhx.module.identity.model.vo.SysFaceVo;
+/**
+* 人脸识别信息实体对象
+*
+* @author zxfei
+* @date 2022-08-03
+*/
+
+public class SysFaceEntity extends SysFaceVo {
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 场所名称
+    */
+    private String placeName;
+    /**
+    * 场所ID
+    */
+    private String placeId;
+    /**
+    * 人脸缩略图
+    */
+    private byte[] face;
+    /**
+    * 人脸特征
+    */
+    private byte[] faceFeature;
+    /**
+    * 身份ID
+    */
+    private String idCard;
+    /**
+    * 删除标识
+    */
+    private Integer deleted;
+
+
+
+    public SysFaceEntity(){}
+    /**
+    * 获取 场所名称
+    * @return String
+    */
+    public String getPlaceName(){
+        return placeName;
+    }
+    /**
+    * 设置 场所名称
+    * @param placeName
+    */
+    public void setPlaceName(String placeName){
+        this.placeName = placeName;
+    }
+    /**
+    * 获取 场所ID
+    * @return String
+    */
+    public String getPlaceId(){
+        return placeId;
+    }
+    /**
+    * 设置 场所ID
+    * @param placeId
+    */
+    public void setPlaceId(String placeId){
+        this.placeId = placeId;
+    }
+    /**
+    * 获取 人脸缩略图
+    * @return String
+    */
+    public byte[] getFace(){
+        return face;
+    }
+    /**
+    * 设置 人脸缩略图
+    * @param face
+    */
+    public void setFace(byte[] face){
+        this.face = face;
+    }
+    /**
+    * 获取 人脸特征
+    * @return String
+    */
+    public byte[] getFaceFeature(){
+        return faceFeature;
+    }
+    /**
+    * 设置 人脸特征
+    * @param faceFeature
+    */
+    public void setFaceFeature(byte[] faceFeature){
+        this.faceFeature = faceFeature;
+    }
+    /**
+    * 获取 身份ID
+    * @return String
+    */
+    public String getIdCard(){
+        return idCard;
+    }
+    /**
+    * 设置 身份ID
+    * @param idCard
+    */
+    public void setIdCard(String idCard){
+        this.idCard = idCard;
+    }
+    /**
+    * 获取 删除标识
+    * @return Integer
+    */
+    public Integer getDeleted(){
+        return deleted;
+    }
+    /**
+    * 设置 删除标识
+    * @param deleted
+    */
+    public void setDeleted(Integer deleted){
+        this.deleted = deleted;
+    }
+
+
+
+
+    @Override
+    public int hashCode() {
+         return this.getId().hashCode();
+    }
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null) return false;
+        if (obj instanceof SysFaceEntity) {
+            SysFaceEntity tmp = (SysFaceEntity) obj;
+            if (this.getId() == tmp.getId()) {
+                 return true;
+            }
+        }
+        return false;
+    }
+
+    public String toString(){
+        StringBuilder sb = new StringBuilder("");
+        sb.append(",placeName:").append(getPlaceName());
+        sb.append(",placeId:").append(getPlaceId());
+        sb.append(",face:").append(getFace());
+        sb.append(",faceFeature:").append(getFaceFeature());
+        sb.append(",idCard:").append(getIdCard());
+        sb.append(",deleted:").append(getDeleted());
+        return sb.toString();
+    }
+
+    public void initAttrValue(){
+
+            this.placeName = "";
+
+            this.placeId = "";
+
+            this.face = null;
+
+            this.faceFeature = null;
+
+            this.idCard = "0";
+
+            this.deleted = 0;
+    }
+}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/identity/model/SysFaceQuery.java

+package com.mortals.xhx.module.identity.model;
+
+import java.util.List;
+import com.mortals.xhx.module.identity.model.SysFaceEntity;
+/**
+* 人脸识别信息查询对象
+*
+* @author zxfei
+* @date 2022-08-03
+*/
+public class SysFaceQuery extends SysFaceEntity {
+    /** 序号，主键 */
+    private List<String> idList;
+
+    /** 场所名称 */
+    private List<String> placeNameList;
+
+    /** 场所ID */
+    private List<String> placeIdList;
+
+    /** 人脸缩略图 */
+    private List<String> faceList;
+
+    /** 人脸特征 */
+    private List<String> faceFeatureList;
+
+    /** 身份ID */
+    private List<String> idCardList;
+
+    /** 开始 创建时间 */
+    private String createTimeStart;
+
+    /** 结束 创建时间 */
+    private String createTimeEnd;
+
+    /** 开始 修改时间 */
+    private String updateTimeStart;
+
+    /** 结束 修改时间 */
+    private String updateTimeEnd;
+
+    /** 开始 删除标识 */
+    private Integer deletedStart;
+
+    /** 结束 删除标识 */
+    private Integer deletedEnd;
+
+    /** 增加 删除标识 */
+    private Integer deletedIncrement;
+
+    /** 删除标识列表 */
+    private List <Integer> deletedList;
+
+    /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
+    private List<SysFaceQuery> orConditionList;
+
+    /** AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4) */
+    private List<SysFaceQuery> andConditionList;
+
+    public SysFaceQuery(){}
+
+    /**
+    * 获取 序号，主键
+    * @return idList
+    */
+    public List<String> getIdList(){
+        return this.idList;
+    }
+
+    /**
+    * 设置 序号，主键
+    * @param idList
+    */
+    public void setIdList(List<String> idList){
+        this.idList = idList;
+    }
+    /**
+    * 获取 场所名称
+    * @return placeNameList
+    */
+    public List<String> getPlaceNameList(){
+        return this.placeNameList;
+    }
+
+    /**
+    * 设置 场所名称
+    * @param placeNameList
+    */
+    public void setPlaceNameList(List<String> placeNameList){
+        this.placeNameList = placeNameList;
+    }
+    /**
+    * 获取 场所ID
+    * @return placeIdList
+    */
+    public List<String> getPlaceIdList(){
+        return this.placeIdList;
+    }
+
+    /**
+    * 设置 场所ID
+    * @param placeIdList
+    */
+    public void setPlaceIdList(List<String> placeIdList){
+        this.placeIdList = placeIdList;
+    }
+    /**
+    * 获取 人脸缩略图
+    * @return faceList
+    */
+    public List<String> getFaceList(){
+        return this.faceList;
+    }
+
+    /**
+    * 设置 人脸缩略图
+    * @param faceList
+    */
+    public void setFaceList(List<String> faceList){
+        this.faceList = faceList;
+    }
+    /**
+    * 获取 人脸特征
+    * @return faceFeatureList
+    */
+    public List<String> getFaceFeatureList(){
+        return this.faceFeatureList;
+    }
+
+    /**
+    * 设置 人脸特征
+    * @param faceFeatureList
+    */
+    public void setFaceFeatureList(List<String> faceFeatureList){
+        this.faceFeatureList = faceFeatureList;
+    }
+    /**
+    * 获取 身份ID
+    * @return idCardList
+    */
+    public List<String> getIdCardList(){
+        return this.idCardList;
+    }
+
+    /**
+    * 设置 身份ID
+    * @param idCardList
+    */
+    public void setIdCardList(List<String> idCardList){
+        this.idCardList = idCardList;
+    }
+    /**
+    * 获取 开始 创建时间
+    * @return createTimeStart
+    */
+    public String getCreateTimeStart(){
+        return this.createTimeStart;
+    }
+
+    /**
+    * 设置 开始 创建时间
+    * @param createTimeStart
+    */
+    public void setCreateTimeStart(String createTimeStart){
+        this.createTimeStart = createTimeStart;
+    }
+
+    /**
+    * 获取 结束 创建时间
+    * @return createTimeEnd
+    */
+    public String getCreateTimeEnd(){
+        return this.createTimeEnd;
+    }
+
+    /**
+    * 设置 结束 创建时间
+    * @param createTimeEnd
+    */
+    public void setCreateTimeEnd(String createTimeEnd){
+        this.createTimeEnd = createTimeEnd;
+    }
+
+    /**
+    * 获取 开始 修改时间
+    * @return updateTimeStart
+    */
+    public String getUpdateTimeStart(){
+        return this.updateTimeStart;
+    }
+
+    /**
+    * 设置 开始 修改时间
+    * @param updateTimeStart
+    */
+    public void setUpdateTimeStart(String updateTimeStart){
+        this.updateTimeStart = updateTimeStart;
+    }
+
+    /**
+    * 获取 结束 修改时间
+    * @return updateTimeEnd
+    */
+    public String getUpdateTimeEnd(){
+        return this.updateTimeEnd;
+    }
+
+    /**
+    * 设置 结束 修改时间
+    * @param updateTimeEnd
+    */
+    public void setUpdateTimeEnd(String updateTimeEnd){
+        this.updateTimeEnd = updateTimeEnd;
+    }
+
+    /**
+    * 获取 开始 删除标识
+    * @return deletedStart
+    */
+    public Integer getDeletedStart(){
+        return this.deletedStart;
+    }
+
+    /**
+    * 设置 开始 删除标识
+    * @param deletedStart
+    */
+    public void setDeletedStart(Integer deletedStart){
+        this.deletedStart = deletedStart;
+    }
+
+    /**
+    * 获取 结束 删除标识
+    * @return $deletedEnd
+    */
+    public Integer getDeletedEnd(){
+        return this.deletedEnd;
+    }
+
+    /**
+    * 设置 结束 删除标识
+    * @param deletedEnd
+    */
+    public void setDeletedEnd(Integer deletedEnd){
+        this.deletedEnd = deletedEnd;
+    }
+
+    /**
+    * 获取 增加 删除标识
+    * @return deletedIncrement
+    */
+    public Integer getDeletedIncrement(){
+        return this.deletedIncrement;
+    }
+
+    /**
+    * 设置 增加 删除标识
+    * @param deletedIncrement
+    */
+    public void setDeletedIncrement(Integer deletedIncrement){
+        this.deletedIncrement = deletedIncrement;
+    }
+
+    /**
+    * 获取 删除标识
+    * @return deletedList
+    */
+    public List<Integer> getDeletedList(){
+        return this.deletedList;
+    }
+
+    /**
+    * 设置 删除标识
+    * @param deletedList
+    */
+    public void setDeletedList(List<Integer> deletedList){
+        this.deletedList = deletedList;
+    }
+
+
+	/**
+    * 设置 序号，主键
+    * @param id
+    */
+    public SysFaceQuery id(String id){
+        setId(id);
+		return this;
+    }
+
+    /**
+    * 设置 序号，主键
+    * @param idList
+    */
+    public SysFaceQuery idList(List<String> idList){
+        this.idList = idList;
+		return this;
+    }
+
+
+	/**
+    * 设置 场所名称
+    * @param placeName
+    */
+    public SysFaceQuery placeName(String placeName){
+        setPlaceName(placeName);
+		return this;
+    }
+
+    /**
+    * 设置 场所名称
+    * @param placeNameList
+    */
+    public SysFaceQuery placeNameList(List<String> placeNameList){
+        this.placeNameList = placeNameList;
+		return this;
+    }
+
+
+	/**
+    * 设置 场所ID
+    * @param placeId
+    */
+    public SysFaceQuery placeId(String placeId){
+        setPlaceId(placeId);
+		return this;
+    }
+
+    /**
+    * 设置 场所ID
+    * @param placeIdList
+    */
+    public SysFaceQuery placeIdList(List<String> placeIdList){
+        this.placeIdList = placeIdList;
+		return this;
+    }
+
+
+	/**
+    * 设置 人脸缩略图
+    * @param face
+    */
+    public SysFaceQuery face(byte[] face){
+        setFace(face);
+		return this;
+    }
+
+    /**
+    * 设置 人脸缩略图
+    * @param faceList
+    */
+    public SysFaceQuery faceList(List<String> faceList){
+        this.faceList = faceList;
+		return this;
+    }
+
+
+	/**
+    * 设置 人脸特征
+    * @param faceFeature
+    */
+    public SysFaceQuery faceFeature(byte[] faceFeature){
+        setFaceFeature(faceFeature);
+		return this;
+    }
+
+    /**
+    * 设置 人脸特征
+    * @param faceFeatureList
+    */
+    public SysFaceQuery faceFeatureList(List<String> faceFeatureList){
+        this.faceFeatureList = faceFeatureList;
+		return this;
+    }
+
+
+	/**
+    * 设置 身份ID
+    * @param idCard
+    */
+    public SysFaceQuery idCard(String idCard){
+        setIdCard(idCard);
+		return this;
+    }
+
+    /**
+    * 设置 身份ID
+    * @param idCardList
+    */
+    public SysFaceQuery idCardList(List<String> idCardList){
+        this.idCardList = idCardList;
+		return this;
+    }
+
+
+
+    /**
+    * 设置  删除标识
+    * @param deleted
+    */
+    public SysFaceQuery deleted(Integer deleted){
+	    setDeleted(deleted);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 删除标识
+    * @param deletedStart
+    */
+    public SysFaceQuery deletedStart(Integer deletedStart){
+		this.deletedStart = deletedStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 删除标识
+    * @param deletedEnd
+    */
+    public SysFaceQuery deletedEnd(Integer deletedEnd){
+		this.deletedEnd = deletedEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 删除标识
+    * @param deletedIncrement
+    */
+    public SysFaceQuery deletedIncrement(Integer deletedIncrement){
+		this.deletedIncrement = deletedIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 删除标识
+    * @param deletedList
+    */
+    public SysFaceQuery deletedList(List<Integer> deletedList){
+        this.deletedList = deletedList;
+		return this;
+        }
+
+    /**
+    * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
+    * @return orConditionList
+    */
+    public List<SysFaceQuery> getOrConditionList(){
+    return this.orConditionList;
+    }
+
+    /**
+    * 设置 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
+    * @param orConditionList
+    */
+    public void setOrConditionList(List<SysFaceQuery> orConditionList){
+        this.orConditionList = orConditionList;
+    }
+
+    /**
+    * 获取 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
+    * @return andConditionList
+    */
+    public List<SysFaceQuery> getAndConditionList(){
+        return this.andConditionList;
+    }
+
+    /**
+    * 设置 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
+    * @param andConditionList
+    */
+    public void setAndConditionList(List<SysFaceQuery> andConditionList){
+        this.andConditionList = andConditionList;
+    }
+
+}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/identity/model/SysIdentityEntity.java

+package com.mortals.xhx.module.identity.model;
+
+import com.mortals.xhx.module.identity.model.vo.SysIdentityVo;
+/**
+* 人员身份信息实体对象
+*
+* @author zxfei
+* @date 2022-08-03
+*/
+
+public class SysIdentityEntity extends SysIdentityVo {
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 区域
+    */
+    private Long region;
+    /**
+    * 生日
+    */
+    private Long birthday;
+    /**
+    * 序列号
+    */
+    private String ase;
+    /**
+    * 姓名
+    */
+    private String name;
+    /**
+    * 电话
+    */
+    private String phone;
+    /**
+    * 删除标识
+    */
+    private Integer deleted;
+
+
+
+    public SysIdentityEntity(){}
+    /**
+    * 获取 区域
+    * @return Long
+    */
+    public Long getRegion(){
+        return region;
+    }
+    /**
+    * 设置 区域
+    * @param region
+    */
+    public void setRegion(Long region){
+        this.region = region;
+    }
+    /**
+    * 获取 生日
+    * @return Long
+    */
+    public Long getBirthday(){
+        return birthday;
+    }
+    /**
+    * 设置 生日
+    * @param birthday
+    */
+    public void setBirthday(Long birthday){
+        this.birthday = birthday;
+    }
+    /**
+    * 获取 序列号
+    * @return String
+    */
+    public String getAse(){
+        return ase;
+    }
+    /**
+    * 设置 序列号
+    * @param ase
+    */
+    public void setAse(String ase){
+        this.ase = ase;
+    }
+    /**
+    * 获取 姓名
+    * @return String
+    */
+    public String getName(){
+        return name;
+    }
+    /**
+    * 设置 姓名
+    * @param name
+    */
+    public void setName(String name){
+        this.name = name;
+    }
+    /**
+    * 获取 电话
+    * @return String
+    */
+    public String getPhone(){
+        return phone;
+    }
+    /**
+    * 设置 电话
+    * @param phone
+    */
+    public void setPhone(String phone){
+        this.phone = phone;
+    }
+    /**
+    * 获取 删除标识
+    * @return Integer
+    */
+    public Integer getDeleted(){
+        return deleted;
+    }
+    /**
+    * 设置 删除标识
+    * @param deleted
+    */
+    public void setDeleted(Integer deleted){
+        this.deleted = deleted;
+    }
+
+
+
+
+    @Override
+    public int hashCode() {
+         return this.getId().hashCode();
+    }
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null) return false;
+        if (obj instanceof SysIdentityEntity) {
+            SysIdentityEntity tmp = (SysIdentityEntity) obj;
+            if (this.getId() == tmp.getId()) {
+                 return true;
+            }
+        }
+        return false;
+    }
+
+    public String toString(){
+        StringBuilder sb = new StringBuilder("");
+        sb.append(",region:").append(getRegion());
+        sb.append(",birthday:").append(getBirthday());
+        sb.append(",ase:").append(getAse());
+        sb.append(",name:").append(getName());
+        sb.append(",phone:").append(getPhone());
+        sb.append(",deleted:").append(getDeleted());
+        return sb.toString();
+    }
+
+    public void initAttrValue(){
+
+            this.region = null;
+
+            this.birthday = null;
+
+            this.ase = "";
+
+            this.name = "0";
+
+            this.phone = "";
+
+            this.deleted = 0;
+    }
+}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/identity/model/SysIdentityQuery.java

+package com.mortals.xhx.module.identity.model;
+
+import java.util.List;
+import com.mortals.xhx.module.identity.model.SysIdentityEntity;
+/**
+* 人员身份信息查询对象
+*
+* @author zxfei
+* @date 2022-08-03
+*/
+public class SysIdentityQuery extends SysIdentityEntity {
+    /** 序号，主键 */
+    private List<String> idList;
+
+    /** 开始 区域 */
+    private Long regionStart;
+
+    /** 结束 区域 */
+    private Long regionEnd;
+
+    /** 增加 区域 */
+    private Long regionIncrement;
+
+    /** 区域列表 */
+    private List <Long> regionList;
+
+    /** 开始 生日 */
+    private Long birthdayStart;
+
+    /** 结束 生日 */
+    private Long birthdayEnd;
+
+    /** 增加 生日 */
+    private Long birthdayIncrement;
+
+    /** 生日列表 */
+    private List <Long> birthdayList;
+
+    /** 序列号 */
+    private List<String> aseList;
+
+    /** 姓名 */
+    private List<String> nameList;
+
+    /** 电话 */
+    private List<String> phoneList;
+
+    /** 开始 创建时间 */
+    private String createTimeStart;
+
+    /** 结束 创建时间 */
+    private String createTimeEnd;
+
+    /** 开始 修改时间 */
+    private String updateTimeStart;
+
+    /** 结束 修改时间 */
+    private String updateTimeEnd;
+
+    /** 开始 删除标识 */
+    private Integer deletedStart;
+
+    /** 结束 删除标识 */
+    private Integer deletedEnd;
+
+    /** 增加 删除标识 */
+    private Integer deletedIncrement;
+
+    /** 删除标识列表 */
+    private List <Integer> deletedList;
+
+    /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
+    private List<SysIdentityQuery> orConditionList;
+
+    /** AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4) */
+    private List<SysIdentityQuery> andConditionList;
+
+    public SysIdentityQuery(){}
+
+    /**
+    * 获取 序号，主键
+    * @return idList
+    */
+    public List<String> getIdList(){
+        return this.idList;
+    }
+
+    /**
+    * 设置 序号，主键
+    * @param idList
+    */
+    public void setIdList(List<String> idList){
+        this.idList = idList;
+    }
+    /**
+    * 获取 开始 区域
+    * @return regionStart
+    */
+    public Long getRegionStart(){
+        return this.regionStart;
+    }
+
+    /**
+    * 设置 开始 区域
+    * @param regionStart
+    */
+    public void setRegionStart(Long regionStart){
+        this.regionStart = regionStart;
+    }
+
+    /**
+    * 获取 结束 区域
+    * @return $regionEnd
+    */
+    public Long getRegionEnd(){
+        return this.regionEnd;
+    }
+
+    /**
+    * 设置 结束 区域
+    * @param regionEnd
+    */
+    public void setRegionEnd(Long regionEnd){
+        this.regionEnd = regionEnd;
+    }
+
+    /**
+    * 获取 增加 区域
+    * @return regionIncrement
+    */
+    public Long getRegionIncrement(){
+        return this.regionIncrement;
+    }
+
+    /**
+    * 设置 增加 区域
+    * @param regionIncrement
+    */
+    public void setRegionIncrement(Long regionIncrement){
+        this.regionIncrement = regionIncrement;
+    }
+
+    /**
+    * 获取 区域
+    * @return regionList
+    */
+    public List<Long> getRegionList(){
+        return this.regionList;
+    }
+
+    /**
+    * 设置 区域
+    * @param regionList
+    */
+    public void setRegionList(List<Long> regionList){
+        this.regionList = regionList;
+    }
+
+    /**
+    * 获取 开始 生日
+    * @return birthdayStart
+    */
+    public Long getBirthdayStart(){
+        return this.birthdayStart;
+    }
+
+    /**
+    * 设置 开始 生日
+    * @param birthdayStart
+    */
+    public void setBirthdayStart(Long birthdayStart){
+        this.birthdayStart = birthdayStart;
+    }
+
+    /**
+    * 获取 结束 生日
+    * @return $birthdayEnd
+    */
+    public Long getBirthdayEnd(){
+        return this.birthdayEnd;
+    }
+
+    /**
+    * 设置 结束 生日
+    * @param birthdayEnd
+    */
+    public void setBirthdayEnd(Long birthdayEnd){
+        this.birthdayEnd = birthdayEnd;
+    }
+
+    /**
+    * 获取 增加 生日
+    * @return birthdayIncrement
+    */
+    public Long getBirthdayIncrement(){
+        return this.birthdayIncrement;
+    }
+
+    /**
+    * 设置 增加 生日
+    * @param birthdayIncrement
+    */
+    public void setBirthdayIncrement(Long birthdayIncrement){
+        this.birthdayIncrement = birthdayIncrement;
+    }
+
+    /**
+    * 获取 生日
+    * @return birthdayList
+    */
+    public List<Long> getBirthdayList(){
+        return this.birthdayList;
+    }
+
+    /**
+    * 设置 生日
+    * @param birthdayList
+    */
+    public void setBirthdayList(List<Long> birthdayList){
+        this.birthdayList = birthdayList;
+    }
+
+    /**
+    * 获取 序列号
+    * @return aseList
+    */
+    public List<String> getAseList(){
+        return this.aseList;
+    }
+
+    /**
+    * 设置 序列号
+    * @param aseList
+    */
+    public void setAseList(List<String> aseList){
+        this.aseList = aseList;
+    }
+    /**
+    * 获取 姓名
+    * @return nameList
+    */
+    public List<String> getNameList(){
+        return this.nameList;
+    }
+
+    /**
+    * 设置 姓名
+    * @param nameList
+    */
+    public void setNameList(List<String> nameList){
+        this.nameList = nameList;
+    }
+    /**
+    * 获取 电话
+    * @return phoneList
+    */
+    public List<String> getPhoneList(){
+        return this.phoneList;
+    }
+
+    /**
+    * 设置 电话
+    * @param phoneList
+    */
+    public void setPhoneList(List<String> phoneList){
+        this.phoneList = phoneList;
+    }
+    /**
+    * 获取 开始 创建时间
+    * @return createTimeStart
+    */
+    public String getCreateTimeStart(){
+        return this.createTimeStart;
+    }
+
+    /**
+    * 设置 开始 创建时间
+    * @param createTimeStart
+    */
+    public void setCreateTimeStart(String createTimeStart){
+        this.createTimeStart = createTimeStart;
+    }
+
+    /**
+    * 获取 结束 创建时间
+    * @return createTimeEnd
+    */
+    public String getCreateTimeEnd(){
+        return this.createTimeEnd;
+    }
+
+    /**
+    * 设置 结束 创建时间
+    * @param createTimeEnd
+    */
+    public void setCreateTimeEnd(String createTimeEnd){
+        this.createTimeEnd = createTimeEnd;
+    }
+
+    /**
+    * 获取 开始 修改时间
+    * @return updateTimeStart
+    */
+    public String getUpdateTimeStart(){
+        return this.updateTimeStart;
+    }
+
+    /**
+    * 设置 开始 修改时间
+    * @param updateTimeStart
+    */
+    public void setUpdateTimeStart(String updateTimeStart){
+        this.updateTimeStart = updateTimeStart;
+    }
+
+    /**
+    * 获取 结束 修改时间
+    * @return updateTimeEnd
+    */
+    public String getUpdateTimeEnd(){
+        return this.updateTimeEnd;
+    }
+
+    /**
+    * 设置 结束 修改时间
+    * @param updateTimeEnd
+    */
+    public void setUpdateTimeEnd(String updateTimeEnd){
+        this.updateTimeEnd = updateTimeEnd;
+    }
+
+    /**
+    * 获取 开始 删除标识
+    * @return deletedStart
+    */
+    public Integer getDeletedStart(){
+        return this.deletedStart;
+    }
+
+    /**
+    * 设置 开始 删除标识
+    * @param deletedStart
+    */
+    public void setDeletedStart(Integer deletedStart){
+        this.deletedStart = deletedStart;
+    }
+
+    /**
+    * 获取 结束 删除标识
+    * @return $deletedEnd
+    */
+    public Integer getDeletedEnd(){
+        return this.deletedEnd;
+    }
+
+    /**
+    * 设置 结束 删除标识
+    * @param deletedEnd
+    */
+    public void setDeletedEnd(Integer deletedEnd){
+        this.deletedEnd = deletedEnd;
+    }
+
+    /**
+    * 获取 增加 删除标识
+    * @return deletedIncrement
+    */
+    public Integer getDeletedIncrement(){
+        return this.deletedIncrement;
+    }
+
+    /**
+    * 设置 增加 删除标识
+    * @param deletedIncrement
+    */
+    public void setDeletedIncrement(Integer deletedIncrement){
+        this.deletedIncrement = deletedIncrement;
+    }
+
+    /**
+    * 获取 删除标识
+    * @return deletedList
+    */
+    public List<Integer> getDeletedList(){
+        return this.deletedList;
+    }
+
+    /**
+    * 设置 删除标识
+    * @param deletedList
+    */
+    public void setDeletedList(List<Integer> deletedList){
+        this.deletedList = deletedList;
+    }
+
+
+	/**
+    * 设置 序号，主键
+    * @param id
+    */
+    public SysIdentityQuery id(String id){
+        setId(id);
+		return this;
+    }
+
+    /**
+    * 设置 序号，主键
+    * @param idList
+    */
+    public SysIdentityQuery idList(List<String> idList){
+        this.idList = idList;
+		return this;
+    }
+
+    /**
+    * 设置  区域
+    * @param region
+    */
+    public SysIdentityQuery region(Long region){
+	    setRegion(region);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 区域
+    * @param regionStart
+    */
+    public SysIdentityQuery regionStart(Long regionStart){
+		this.regionStart = regionStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 区域
+    * @param regionEnd
+    */
+    public SysIdentityQuery regionEnd(Long regionEnd){
+		this.regionEnd = regionEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 区域
+    * @param regionIncrement
+    */
+    public SysIdentityQuery regionIncrement(Long regionIncrement){
+		this.regionIncrement = regionIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 区域
+    * @param regionList
+    */
+    public SysIdentityQuery regionList(List<Long> regionList){
+        this.regionList = regionList;
+		return this;
+        }
+
+    /**
+    * 设置  生日
+    * @param birthday
+    */
+    public SysIdentityQuery birthday(Long birthday){
+	    setBirthday(birthday);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 生日
+    * @param birthdayStart
+    */
+    public SysIdentityQuery birthdayStart(Long birthdayStart){
+		this.birthdayStart = birthdayStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 生日
+    * @param birthdayEnd
+    */
+    public SysIdentityQuery birthdayEnd(Long birthdayEnd){
+		this.birthdayEnd = birthdayEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 生日
+    * @param birthdayIncrement
+    */
+    public SysIdentityQuery birthdayIncrement(Long birthdayIncrement){
+		this.birthdayIncrement = birthdayIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 生日
+    * @param birthdayList
+    */
+    public SysIdentityQuery birthdayList(List<Long> birthdayList){
+        this.birthdayList = birthdayList;
+		return this;
+        }
+
+
+	/**
+    * 设置 序列号
+    * @param ase
+    */
+    public SysIdentityQuery ase(String ase){
+        setAse(ase);
+		return this;
+    }
+
+    /**
+    * 设置 序列号
+    * @param aseList
+    */
+    public SysIdentityQuery aseList(List<String> aseList){
+        this.aseList = aseList;
+		return this;
+    }
+
+
+	/**
+    * 设置 姓名
+    * @param name
+    */
+    public SysIdentityQuery name(String name){
+        setName(name);
+		return this;
+    }
+
+    /**
+    * 设置 姓名
+    * @param nameList
+    */
+    public SysIdentityQuery nameList(List<String> nameList){
+        this.nameList = nameList;
+		return this;
+    }
+
+
+	/**
+    * 设置 电话
+    * @param phone
+    */
+    public SysIdentityQuery phone(String phone){
+        setPhone(phone);
+		return this;
+    }
+
+    /**
+    * 设置 电话
+    * @param phoneList
+    */
+    public SysIdentityQuery phoneList(List<String> phoneList){
+        this.phoneList = phoneList;
+		return this;
+    }
+
+
+
+    /**
+    * 设置  删除标识
+    * @param deleted
+    */
+    public SysIdentityQuery deleted(Integer deleted){
+	    setDeleted(deleted);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 删除标识
+    * @param deletedStart
+    */
+    public SysIdentityQuery deletedStart(Integer deletedStart){
+		this.deletedStart = deletedStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 删除标识
+    * @param deletedEnd
+    */
+    public SysIdentityQuery deletedEnd(Integer deletedEnd){
+		this.deletedEnd = deletedEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 删除标识
+    * @param deletedIncrement
+    */
+    public SysIdentityQuery deletedIncrement(Integer deletedIncrement){
+		this.deletedIncrement = deletedIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 删除标识
+    * @param deletedList
+    */
+    public SysIdentityQuery deletedList(List<Integer> deletedList){
+        this.deletedList = deletedList;
+		return this;
+        }
+
+    /**
+    * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
+    * @return orConditionList
+    */
+    public List<SysIdentityQuery> getOrConditionList(){
+    return this.orConditionList;
+    }
+
+    /**
+    * 设置 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
+    * @param orConditionList
+    */
+    public void setOrConditionList(List<SysIdentityQuery> orConditionList){
+        this.orConditionList = orConditionList;
+    }
+
+    /**
+    * 获取 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
+    * @return andConditionList
+    */
+    public List<SysIdentityQuery> getAndConditionList(){
+        return this.andConditionList;
+    }
+
+    /**
+    * 设置 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
+    * @param andConditionList
+    */
+    public void setAndConditionList(List<SysIdentityQuery> andConditionList){
+        this.andConditionList = andConditionList;
+    }
+
+}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/identity/model/vo/FaceInfoResVO.java

+package com.mortals.xhx.module.identity.model.vo;
+
+import lombok.Data;
+
+@Data
+public class FaceInfoResVO {
+
+    /** id */
+    private String id;
+    /** 场所ID */
+    private String placeId;
+    /** 场所名称 */
+    private String placeName;
+    /** 人脸缩略图 */
+    private String face;
+    /** 人脸特征 */
+    private String faceFeature;
+    /** 身份信息ID */
+    private String cardId;
+    /** 身份证ID */
+    private String idCard;
+    /** 身份证名称 */
+    private String name;
+    /** 手机号 */
+    private String phone;
+}

base-manager/src/main/java/com/mortals/xhx/module/identity/model/vo/SysFaceVo.java

+package com.mortals.xhx.module.identity.model.vo;
+import com.mortals.framework.model.BaseEntityStr;
+import com.mortals.xhx.module.identity.model.SysFaceEntity;
+import java.util.ArrayList;
+import java.util.List;
+/**
+* 人脸识别信息视图对象
+*
+* @author zxfei
+* @date 2022-08-03
+*/
+public class SysFaceVo extends BaseEntityStr {
+
+}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/identity/model/vo/SysIdentityVo.java

+package com.mortals.xhx.module.identity.model.vo;
+import com.mortals.framework.model.BaseEntityStr;
+import com.mortals.xhx.module.identity.model.SysIdentityEntity;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+/**
+* 人员身份信息视图对象
+*
+* @author zxfei
+* @date 2022-08-03
+*/
+@Data
+public class SysIdentityVo extends BaseEntityStr {
+
+    /**
+     * 身份证编码
+     */
+    private String idCard;
+}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/identity/service/SysFaceService.java

+package com.mortals.xhx.module.identity.service;
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.service.ICRUDService;
+import com.mortals.xhx.module.identity.model.SysFaceEntity;
+import com.mortals.xhx.module.identity.model.vo.FaceInfoResVO;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
+
+/**
+* SysFaceService
+*
+* 人脸识别信息 service接口
+*
+* @author zxfei
+* @date 2022-08-03
+*/
+public interface SysFaceService extends ICRUDService<SysFaceEntity,String>{
+
+    /**
+     * 注册人脸
+     */
+    FaceInfoResVO uploadImage(MultipartFile multipartFile, String name, String idCard, String placeId, String placeName) throws AppException;
+
+
+    /**
+     * 下发人脸列表
+     *
+     * @param placeId
+     * @return
+     */
+    List<FaceInfoResVO> findFaceList(String placeId) throws AppException;
+
+
+    /**
+     * 批量录入人脸
+     *
+     * @param
+     * @return
+     */
+    void batchAddFace( List<MultipartFile> files,String placeId,String placeName);
+}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/identity/service/SysIdentityService.java

+package com.mortals.xhx.module.identity.service;
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.Context;
+import com.mortals.framework.service.ICRUDService;
+import com.mortals.xhx.module.identity.model.SysIdentityEntity;
+/**
+* SysIdentityService
+*
+* 人员身份信息 service接口
+*
+* @author zxfei
+* @date 2022-08-03
+*/
+public interface SysIdentityService extends ICRUDService<SysIdentityEntity,String>{
+
+    /**
+     * 添加身份数据
+     *
+     * @param reqVO
+     * @return
+     */
+    SysIdentityEntity saveIdEntity(SysIdentityEntity reqVO) throws AppException;
+
+    /**
+     * 获取身份ID
+     *
+     * @param reqVO
+     * @return
+     */
+    String findIdEntity(SysIdentityEntity reqVO) throws AppException;
+
+    /**
+     * 获取身份详细数据
+     *
+     * @param id
+     * @param type  系统内部使用 1
+     * @return
+     */
+    SysIdentityEntity findIdEntityDetail(String id,int type) throws AppException;
+}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/identity/service/impl/SysFaceServiceImpl.java

+package com.mortals.xhx.module.identity.service.impl;
+
+import cn.hutool.core.img.Img;
+import cn.hutool.core.util.IdUtil;
+import com.arcsoft.face.FaceEngine;
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.Context;
+import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
+import com.mortals.framework.util.StringUtils;
+import com.mortals.xhx.common.utils.FaceUtil;
+import com.mortals.xhx.module.identity.dao.SysFaceDao;
+import com.mortals.xhx.module.identity.model.SysFaceEntity;
+import com.mortals.xhx.module.identity.model.SysIdentityEntity;
+import com.mortals.xhx.module.identity.model.vo.FaceInfoResVO;
+import com.mortals.xhx.module.identity.service.SysFaceService;
+import com.mortals.xhx.module.identity.service.SysIdentityService;
+import net.coobird.thumbnailator.Thumbnails;
+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.awt.image.BufferedImage;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.Base64;
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+* SysFaceService
+* 人脸识别信息 service实现
+*
+* @author zxfei
+* @date 2022-08-03
+*/
+@Service("sysFaceService")
+public class SysFaceServiceImpl extends AbstractCRUDServiceImpl<SysFaceDao, SysFaceEntity, String> implements SysFaceService {
+
+    public static final int WIDTH = 100;
+    public static final int HEIGHT = 100;
+
+    @Value(value = "${faceAppId}")
+    private String appId;
+
+    @Value(value = "${winSdkKey}")
+    private String winSdkKey;
+
+    @Value(value = "${linuxSdkkey}")
+    private String linuxSdkKey;
+
+    @Autowired
+    private FaceUtil faceUtil;
+
+    @Autowired
+    private SysIdentityService sysIdentityService;
+
+    @Override
+    protected void saveBefore(SysFaceEntity entity, Context context) throws AppException {
+        //非系统自增，需这里设置主键
+        entity.setId(IdUtil.fastSimpleUUID());
+        super.saveBefore(entity, context);
+    }
+
+    @Override
+    public FaceInfoResVO uploadImage(MultipartFile multipartFile, String name, String idCard, String placeId, String placeName) throws AppException {
+        String clientName = multipartFile.getOriginalFilename();
+        if(!(clientName.endsWith(".png") || clientName.endsWith(".jpg") || clientName.endsWith(".jpeg"))){
+            throw new AppException("请上传图片格式(" + clientName + ")");
+        }
+        FaceInfoResVO resVO = new FaceInfoResVO();
+        SysIdentityEntity idEntityReqVO = new SysIdentityEntity();
+        idEntityReqVO.setName(name);
+        idEntityReqVO.setIdCard(idCard);
+        String entityId = sysIdentityService.saveIdEntity(idEntityReqVO).getId();
+        SysFaceEntity query = new SysFaceEntity();
+        query.setIdCard(entityId);
+        List<SysFaceEntity> sysFaceList = dao.getList(query);
+        if(CollectionUtils.isNotEmpty(sysFaceList)){
+            throw new AppException("该用户(" + idEntityReqVO.getName() + "_" + idEntityReqVO.getIdCard() + ")人脸数据已存在");
+        }
+
+        try {
+            byte[] file = multipartFile.getBytes();
+            //激活引擎
+            FaceEngine faceEngine = faceUtil.initFace(appId, getSdkKey());
+            byte[] featureData = faceUtil.featureData(faceEngine, file);
+            //创建缩略图
+            BufferedImage image = Thumbnails.of(multipartFile.getInputStream()).size(WIDTH, HEIGHT).asBufferedImage();
+            ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
+            //此方法会造成png图片有阴影
+//            ImageIO.write(image, "jpg", byteArrayOutputStream);
+            Img.from(image).write(byteArrayOutputStream);
+            byteArrayOutputStream.flush();
+            SysFaceEntity sysFace = new SysFaceEntity();
+            sysFace.setId(IdUtil.fastSimpleUUID());
+            sysFace.setFace(byteArrayOutputStream.toByteArray());
+            sysFace.setFaceFeature(featureData);
+            sysFace.setIdCard(entityId);
+            sysFace.setPlaceId(placeId);
+            sysFace.setPlaceName(placeName);
+            sysFace.setCreateTime(new Date());
+            sysFace.setUpdateTime(sysFace.getCreateTime());
+            sysFace.setDeleted(0);
+            dao.insert(sysFace);
+            resVO.setFace(Base64.getEncoder().encodeToString(file));
+            resVO.setFaceFeature(Base64.getEncoder().encodeToString(featureData));
+            resVO.setIdCard(idCard);
+            resVO.setName(name);
+            resVO.setPhone("");
+            resVO.setId(sysFace.getId());
+        } catch (IOException e) {
+            log.error("提取特征失败:", e);
+        }
+        return resVO;
+    }
+
+    @Override
+    public List<FaceInfoResVO> findFaceList(String placeId) throws AppException {
+        SysFaceEntity query = new SysFaceEntity();
+        query.setPlaceId(placeId);
+        List<SysFaceEntity> sysFaceList = dao.getList(query);
+        if(CollectionUtils.isEmpty(sysFaceList)){
+            throw new AppException("该场所无人脸数据");
+        }
+        return sysFaceList.stream().map(o -> {
+            FaceInfoResVO resVO = new FaceInfoResVO();
+            SysIdentityEntity resVO1 = sysIdentityService.findIdEntityDetail(o.getIdCard(), 1);
+            resVO.setId(o.getId());
+            resVO.setPlaceId(o.getPlaceId());
+            resVO.setPlaceName(o.getPlaceName());
+            resVO.setCardId(resVO1.getId());
+            resVO.setName(resVO1.getName());
+            resVO.setPhone(resVO1.getPhone());
+            resVO.setFace(Base64.getEncoder().encodeToString(o.getFace()));
+            resVO.setFaceFeature(Base64.getEncoder().encodeToString(o.getFaceFeature()));
+            return resVO;
+        }).collect(Collectors.toList());
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void batchAddFace(List<MultipartFile> files, String placeId, String placeName) {
+        for (int j = 0; j < files.size(); j++) {
+            String fileName = files.get(j).getOriginalFilename();
+            if(StringUtils.isEmpty(fileName)){
+                throw new AppException("文件名称(" + fileName + ")不能为空！");
+            }
+            String[] info = fileName.split("/");
+            if(info.length != 2){
+                throw new AppException("(" + fileName + ")文件命名错误，请按照规定文件模版上传！");
+            }
+            String[] infos = info[1].split("\\.");
+            if(infos.length != 2){
+                throw new AppException("(" + fileName + ")文件命名错误，请按照规定文件模版上传！");
+            }
+            String[] strings = infos[0].split("_");
+            if(strings.length != 2){
+                throw new AppException("(" + fileName + ")文件命名错误，请按照规定文件模版上传！");
+            }
+            uploadImage(files.get(j), strings[0], strings[1], placeId, placeName);
+        }
+    }
+
+    private String getSdkKey() {
+        return faceUtil.getOsName().equals("/win") ? winSdkKey : linuxSdkKey;
+    }
+}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/identity/service/impl/SysIdentityServiceImpl.java

+package com.mortals.xhx.module.identity.service.impl;
+import cn.hutool.core.util.IdcardUtil;
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.Context;
+import com.mortals.framework.util.StringUtils;
+import com.mortals.xhx.common.utils.RioUtil;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
+import com.mortals.xhx.module.identity.dao.SysIdentityDao;
+import com.mortals.xhx.module.identity.model.SysIdentityEntity;
+import com.mortals.xhx.module.identity.service.SysIdentityService;
+import cn.hutool.core.util.IdUtil;
+
+import java.util.Date;
+
+/**
+* SysIdentityService
+* 人员身份信息 service实现
+*
+* @author zxfei
+* @date 2022-08-03
+*/
+@Service("sysIdentityService")
+public class SysIdentityServiceImpl extends AbstractCRUDServiceImpl<SysIdentityDao, SysIdentityEntity, String> implements SysIdentityService {
+
+    @Value(value = "${sm4key}")
+    private String sm4key;
+
+    @Override
+    protected void saveBefore(SysIdentityEntity entity, Context context) throws AppException {
+        //非系统自增，需这里设置主键
+        entity.setId(IdUtil.fastSimpleUUID());
+        super.saveBefore(entity, context);
+    }
+
+    @Override
+    public SysIdentityEntity saveIdEntity(SysIdentityEntity entity) throws AppException {
+        if(StringUtils.isEmpty(entity.getIdCard())){
+            throw new AppException("身份证号不能为空");
+        }
+        if(StringUtils.isEmpty(entity.getName())){
+            throw new AppException("身份证姓名不能为空");
+        }
+        if(!IdcardUtil.isValidCard18(entity.getIdCard())){
+            throw new AppException("身份证号码格式不正确");
+        }
+        //获取区域
+        String region = StringUtils.substring(entity.getIdCard(), 0, 6);
+        //获取生日
+        String birthday = StringUtils.substring(entity.getIdCard(), 6, 14);
+        //获取序列号
+        String serial = StringUtils.substring(entity.getIdCard(), 14, 18);
+
+        SysIdentityEntity sysIdentity = dao.findIdentity(Long.parseLong(region), Long.parseLong(birthday), serial, entity.getName(), "");
+        if (sysIdentity == null) {
+            sysIdentity = new SysIdentityEntity();
+            sysIdentity.setId(IdUtil.fastSimpleUUID());
+            sysIdentity.setPhone(entity.getPhone());
+            sysIdentity.setName(entity.getName());
+            sysIdentity.setRegion(Long.parseLong(region));
+            sysIdentity.setBirthday(Long.parseLong(birthday));
+            sysIdentity.setAse(serial);
+            sysIdentity.setCreateTime(new Date());
+            sysIdentity.setDeleted(0);
+            dao.insert(sysIdentity);
+        }else {
+            if(StringUtils.isNotEmpty(entity.getPhone())){
+                SysIdentityEntity update = new SysIdentityEntity();
+                update.setId(sysIdentity.getId());
+                update.setPhone(entity.getPhone());
+                dao.update(update);
+                sysIdentity.setPhone(entity.getPhone());
+            }
+        }
+        return sysIdentity;
+    }
+
+    @Override
+    public String findIdEntity(SysIdentityEntity reqVO) throws AppException {
+        if(StringUtils.isEmpty(reqVO.getIdCard())){
+            throw new AppException("身份证号不能为空");
+        }
+        if(!IdcardUtil.isValidCard18(reqVO.getIdCard())){
+            throw new AppException("身份证号码格式不正确");
+        }
+        //获取区域
+        String region = StringUtils.substring(reqVO.getIdCard(), 0, 6);
+        //获取生日
+        String birthday = StringUtils.substring(reqVO.getIdCard(), 6, 14);
+        //获取序列号
+        String serial = StringUtils.substring(reqVO.getIdCard(), 14, 18);
+        SysIdentityEntity sysIdentity = dao.findIdentity(Long.parseLong(region), Long.parseLong(birthday), serial, reqVO.getName(), "");
+        if (sysIdentity == null) {
+            throw new AppException("无身份数据");
+        }
+        return sysIdentity.getId();
+    }
+
+    @Override
+    public SysIdentityEntity findIdEntityDetail(String id, int type) throws AppException {
+        SysIdentityEntity sysIdentity = dao.findIdentity(null, null, "", "", id);
+        if (sysIdentity == null) {
+            throw new AppException("无身份数据");
+        }
+        String idCard = sysIdentity.getRegion() + sysIdentity.getBirthday() + sysIdentity.getAse();
+        SysIdentityEntity resVO = new SysIdentityEntity();
+        if (type == 0) {
+            resVO.setIdCard(RioUtil.encryptHex(idCard, sm4key));
+            resVO.setName(RioUtil.encryptHex(sysIdentity.getName(), sm4key));
+            resVO.setPhone(RioUtil.encryptHex(sysIdentity.getPhone(), sm4key));
+        } else {
+            resVO.setIdCard(idCard);
+            resVO.setName(sysIdentity.getName());
+            resVO.setPhone(sysIdentity.getPhone());
+        }
+        return resVO;
+    }
+}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/identity/web/SysFaceController.java

+package com.mortals.xhx.module.identity.web;
+
+import com.alibaba.fastjson.JSONObject;
+import com.mortals.framework.annotation.UnAuth;
+import com.mortals.framework.model.Context;
+import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
+import com.mortals.xhx.module.identity.model.SysFaceEntity;
+import com.mortals.xhx.module.identity.model.vo.FaceInfoResVO;
+import com.mortals.xhx.module.identity.service.SysFaceService;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+/**
+*
+* 人脸识别信息
+*
+* @author zxfei
+* @date 2022-08-03
+*/
+@RestController
+@RequestMapping("face")
+public class SysFaceController extends BaseCRUDJsonBodyMappingController<SysFaceService,SysFaceEntity,String> {
+
+    public SysFaceController(){
+        super.setModuleDesc( "人脸识别信息");
+    }
+
+    @Override
+    protected void init(Map<String, Object> model, Context context) {
+        super.init(model, context);
+    }
+
+
+
+    @PostMapping({"uploadImage"})
+    @UnAuth
+    public String uploadImage(@RequestPart("file") MultipartFile file,
+                              @RequestParam("name") String name,
+                              @RequestParam("idCard") String idCard,
+                              @RequestParam(value = "placeId") String placeId,
+                              @RequestParam(value = "placeName") String placeName) {
+        Map<String, Object> model = new HashMap();
+        JSONObject ret = new JSONObject();
+        String busiDesc = "人脸特征解析";
+        Context context = this.getContext();
+
+        try {
+            FaceInfoResVO resVO = service.uploadImage(file, name, idCard, placeId, placeName);
+            model.put("data",resVO);
+            this.recordSysLog(this.request, busiDesc + " 【成功】");
+        } catch (Exception var8) {
+            this.doException(this.request, busiDesc, model, var8);
+            Object msg = model.get("message_info");
+            return this.createFailJsonResp(msg == null ? "系统异常" : msg.toString());
+        }
+
+        this.init(model, context);
+        ret.put("data", model.get("data"));
+        ret.put("code", 1);
+        ret.put("msg", model.remove("message_info"));
+        return ret.toJSONString();
+    }
+
+    @GetMapping({"findFaceList"})
+    @UnAuth
+    public String findFaceList(@RequestParam("placeId") String placeId) {
+        Map<String, Object> model = new HashMap();
+        JSONObject ret = new JSONObject();
+        String busiDesc = "下发人脸列表";
+        Context context = this.getContext();
+        try {
+            List<FaceInfoResVO> list = service.findFaceList(placeId);
+            model.put("data",list);
+            this.recordSysLog(this.request, busiDesc + " 【成功】");
+        } catch (Exception var8) {
+            this.doException(this.request, busiDesc, model, var8);
+            Object msg = model.get("message_info");
+            return this.createFailJsonResp(msg == null ? "系统异常" : msg.toString());
+        }
+
+        this.init(model, context);
+        ret.put("data", model.get("data"));
+        ret.put("code", 1);
+        ret.put("msg", model.remove("message_info"));
+        return ret.toJSONString();
+    }
+
+    @PostMapping({"batchAddFace"})
+    @UnAuth
+    public String batchAddFace(@RequestPart("files") List<MultipartFile> files,
+                               @RequestParam("placeId") String placeId,
+                               @RequestParam("placeName") String placeName) {
+        Map<String, Object> model = new HashMap();
+        JSONObject ret = new JSONObject();
+        String busiDesc = "批量上传人脸";
+        Context context = this.getContext();
+
+        try {
+            service.batchAddFace(files, placeId, placeName);
+            this.recordSysLog(this.request, busiDesc + " 【成功】");
+        } catch (Exception var8) {
+            this.doException(this.request, busiDesc, model, var8);
+            Object msg = model.get("message_info");
+            return this.createFailJsonResp(msg == null ? "系统异常" : msg.toString());
+        }
+
+        this.init(model, context);
+        ret.put("data", null);
+        ret.put("code", 1);
+        ret.put("msg", model.remove("message_info"));
+        return ret.toJSONString();
+    }
+}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/identity/web/SysIdentityController.java

+package com.mortals.xhx.module.identity.web;
+
+import com.alibaba.fastjson.JSONObject;
+import com.mortals.framework.annotation.RepeatSubmit;
+import com.mortals.framework.annotation.UnAuth;
+import com.mortals.framework.model.Context;
+import com.mortals.framework.util.StringUtils;
+import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
+import com.mortals.xhx.module.identity.model.SysIdentityEntity;
+import com.mortals.xhx.module.identity.service.SysIdentityService;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.HashMap;
+import java.util.Map;
+/**
+*
+* 人员身份信息
+*
+* @author zxfei
+* @date 2022-08-03
+*/
+@RestController
+@RequestMapping("identity")
+public class SysIdentityController extends BaseCRUDJsonBodyMappingController<SysIdentityService,SysIdentityEntity,String> {
+
+    public SysIdentityController(){
+        super.setModuleDesc( "人员身份信息");
+    }
+
+    @Override
+    protected void init(Map<String, Object> model, Context context) {
+        super.init(model, context);
+    }
+
+    @PostMapping({"saveIdEntity"})
+    @RepeatSubmit
+    @UnAuth
+    public String save(@RequestBody SysIdentityEntity entity) {
+        Map<String, Object> model = new HashMap();
+        Context context = this.getContext();
+        int code = 1;
+        String busiDesc = "保存人员身份信息";
+        try {
+            entity = this.service.saveIdEntity(entity);
+            model.put("id", entity.getId());
+            code = this.saveAfter(entity, model, context);
+            model.put("entity", entity);
+            model.put("message_info", busiDesc + "成功");
+            this.recordSysLog(this.request, busiDesc + " 【成功】 [id:" + entity.getId() + "]");
+        } catch (Exception var7) {
+            this.doException(this.request, busiDesc, model, var7);
+            model.put("entity", entity);
+            this.init(model, context);
+            code = this.saveException(entity, model, context, var7);
+        }
+
+        this.init(model, context);
+        JSONObject ret = new JSONObject();
+        ret.put("code", code);
+        ret.put("msg", model.remove("message_info"));
+        ret.put("data", model);
+        return ret.toJSONString();
+    }
+
+    @PostMapping({"findIdEntity"})
+    @UnAuth
+    public String findIdEntity(@RequestBody SysIdentityEntity entity) {
+        Map<String, Object> model = new HashMap();
+        JSONObject ret = new JSONObject();
+        String busiDesc = "获取基础信息唯一ID";
+        Context context = this.getContext();
+
+        try {
+            String id = service.findIdEntity(entity);
+            model.put("data",id);
+            model.put("message_info", busiDesc + "成功");
+            this.recordSysLog(this.request, busiDesc + " 【成功】");
+        } catch (Exception var8) {
+            this.doException(this.request, busiDesc, model, var8);
+            Object msg = model.get("message_info");
+            return this.createFailJsonResp(msg == null ? "系统异常" : msg.toString());
+        }
+
+        this.init(model, context);
+        ret.put("data", model.get("data"));
+        ret.put("code", 1);
+        ret.put("msg", model.remove("message_info"));
+        return ret.toJSONString();
+    }
+
+    @RequestMapping(value = {"findIdEntityDetail"},method = {RequestMethod.POST, RequestMethod.GET})
+    @UnAuth
+    public String findIdEntityDetail(@RequestParam("id") String id) {
+        Map<String, Object> model = new HashMap();
+        if (StringUtils.isEmpty(id)) {
+            return this.createFailJsonResp("请选择待查看人员身份信息");
+        } else {
+            JSONObject ret = new JSONObject();
+            String busiDesc = "获取身份证详细信息";
+            Context context = this.getContext();
+            try {
+
+                SysIdentityEntity entity = this.service.findIdEntityDetail(id, 1);
+                if (entity == null) {
+                    throw new Exception(busiDesc + "，不存在或已被删除");
+                }
+
+                model.putAll(model);
+                model.put("entity", entity);
+                model.put("message_info", busiDesc + "成功");
+                this.recordSysLog(this.request, busiDesc + " 【成功】");
+            } catch (Exception var8) {
+                this.doException(this.request, busiDesc, model, var8);
+                Object msg = model.get("message_info");
+                return this.createFailJsonResp(msg == null ? "系统异常" : msg.toString());
+            }
+
+            this.init(model, context);
+            ret.put("data", model);
+            ret.put("code", 1);
+            ret.put("msg", model.remove("message_info"));
+            return ret.toJSONString();
+        }
+    }
+}
\ No newline at end of file

base-manager/src/main/resources/sqlmap/module/identity/SysFaceMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"mybatis-3-mapper.dtd">
+<mapper namespace="com.mortals.xhx.module.identity.dao.ibatis.SysFaceDaoImpl">
+
+    <!-- 字段和属性映射 -->
+    <resultMap type="SysFaceEntity" id="SysFaceEntity-Map">
+            <id  property="id" column="id" />
+            <result property="placeName" column="place_name" />
+            <result property="placeId" column="place_id" />
+            <result property="face" column="face" />
+            <result property="faceFeature" column="face_feature" />
+            <result property="idCard" column="id_card" />
+            <result property="createTime" column="create_time" />
+            <result property="updateTime" column="update_time" />
+            <result property="deleted" column="deleted" />
+            
+    </resultMap>
+
+
+    <!-- 表所有列 -->
+    <sql id="_columns">
+        <trim suffixOverrides="," suffix="">
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('id') or colPickMode == 1 and data.containsKey('id')))">
+                    a.id,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('placeName') or colPickMode == 1 and data.containsKey('placeName')))">
+                    a.place_name,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('placeId') or colPickMode == 1 and data.containsKey('placeId')))">
+                    a.place_id,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('face') or colPickMode == 1 and data.containsKey('face')))">
+                    a.face,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('faceFeature') or colPickMode == 1 and data.containsKey('faceFeature')))">
+                    a.face_feature,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('idCard') or colPickMode == 1 and data.containsKey('idCard')))">
+                    a.id_card,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))">
+                    a.create_time,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
+                    a.update_time,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deleted') or colPickMode == 1 and data.containsKey('deleted')))">
+                    a.deleted,
+                </if>
+        </trim>
+    </sql>
+    <!-- 新增 区分主键自增加还是业务插入 -->
+    <insert id="insert" parameterType="SysFaceEntity" >
+        insert into mortals_sys_face
+        (id,place_name,place_id,face,face_feature,id_card,create_time,update_time,deleted)
+        VALUES
+        (#{id},#{placeName},#{placeId},#{face},#{faceFeature},#{idCard},#{createTime},#{updateTime},#{deleted})
+    </insert>
+
+    <!-- 批量新增 -->
+    <insert id="insertBatch" parameterType="paramDto">
+        insert into mortals_sys_face
+        (id,place_name,place_id,face,face_feature,id_card,create_time,update_time,deleted)
+        VALUES
+        <foreach collection="data.dataList" item="item" index="index" separator="," >
+            (#{item.id},#{item.placeName},#{item.placeId},#{item.face},#{item.faceFeature},#{item.idCard},#{item.createTime},#{item.updateTime},#{item.deleted})
+        </foreach>
+    </insert>
+
+
+    <!-- 根据ParamDto更新 -->
+    <update id="update" parameterType="paramDto">
+        update mortals_sys_face as a
+        set
+        <trim suffixOverrides="," suffix="">
+            <if test="(colPickMode==0 and data.containsKey('placeName')) or (colPickMode==1 and !data.containsKey('placeName'))">
+                a.place_name=#{data.placeName},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('placeId')) or (colPickMode==1 and !data.containsKey('placeId'))">
+                a.place_id=#{data.placeId},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('face')) or (colPickMode==1 and !data.containsKey('face'))">
+                a.face=#{data.face},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('faceFeature')) or (colPickMode==1 and !data.containsKey('faceFeature'))">
+                a.face_feature=#{data.faceFeature},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('idCard')) or (colPickMode==1 and !data.containsKey('idCard'))">
+                a.id_card=#{data.idCard},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('createTime')) or (colPickMode==1 and !data.containsKey('createTime'))">
+                a.create_time=#{data.createTime},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
+                a.update_time=#{data.updateTime},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('deleted')) or (colPickMode==1 and !data.containsKey('deleted'))">
+                a.deleted=#{data.deleted},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('deletedIncrement')) or (colPickMode==1 and !data.containsKey('deletedIncrement'))">
+                a.deleted=ifnull(a.deleted,0) + #{data.deletedIncrement},
+            </if>
+        </trim>
+        <trim suffixOverrides="where" suffix="">
+            where
+            <trim prefixOverrides="and" prefix="">
+                <include refid="_condition_"/>
+            </trim>
+        </trim>
+    </update>
+    <!-- 批量更新 -->
+    <update id="updateBatch" parameterType="paramDto">
+        update mortals_sys_face as a
+        <trim prefix="set" suffixOverrides=",">
+                <trim prefix="place_name=(case" suffix="ELSE place_name end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('placeName')) or (colPickMode==1 and !item.containsKey('placeName'))">
+                            when a.id=#{item.id} then #{item.placeName}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="place_id=(case" suffix="ELSE place_id end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('placeId')) or (colPickMode==1 and !item.containsKey('placeId'))">
+                            when a.id=#{item.id} then #{item.placeId}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="face=(case" suffix="ELSE face end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('face')) or (colPickMode==1 and !item.containsKey('face'))">
+                            when a.id=#{item.id} then #{item.face}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="face_feature=(case" suffix="ELSE face_feature end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('faceFeature')) or (colPickMode==1 and !item.containsKey('faceFeature'))">
+                            when a.id=#{item.id} then #{item.faceFeature}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="id_card=(case" suffix="ELSE id_card end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('idCard')) or (colPickMode==1 and !item.containsKey('idCard'))">
+                            when a.id=#{item.id} then #{item.idCard}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="create_time=(case" suffix="ELSE create_time end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))">
+                            when a.id=#{item.id} then #{item.createTime}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="update_time=(case" suffix="ELSE update_time end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('updateTime')) or (colPickMode==1 and !item.containsKey('updateTime'))">
+                            when a.id=#{item.id} then #{item.updateTime}
+                        </if>
+                    </foreach>
+                </trim>
+                        <trim prefix="deleted=(case" suffix="ELSE deleted end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('deleted')) or (colPickMode==1 and !item.containsKey('deleted'))">
+                                        when a.id=#{item.id} then #{item.deleted}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('deletedIncrement')) or (colPickMode==1 and !item.containsKey('deletedIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.deleted,0) + #{item.deletedIncrement}
+                                    </when>
+                                </choose>
+                            </foreach>
+                        </trim>
+        </trim>
+        where id in
+        <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
+            #{item.id}
+        </foreach>
+    </update>
+    <!-- 根据主健查询 -->
+    <select id="getByKey" parameterType="paramDto" resultMap="SysFaceEntity-Map">
+        select <include refid="_columns"/>
+        from mortals_sys_face as a
+        where a.id=#{condition.id}
+    </select>
+    <!-- 根据主健删除 -->
+    <delete id="deleteByKey" parameterType="paramDto">
+        delete a.* from mortals_sys_face as a where a.id=#{condition.id}
+    </delete>
+    <!-- 根据主健删除一批，针对单一主健有效 -->
+    <delete id="deleteByKeys">
+        delete from mortals_sys_face where id in
+        <foreach collection="array" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </delete>
+    <!-- 根据paramDto删除一批 -->
+    <delete id="deleteByMap" parameterType="paramDto">
+        delete a.* from mortals_sys_face as a
+        <trim suffixOverrides="where" suffix="">
+            where
+            <trim prefixOverrides="and" prefix="">
+                <include refid="_condition_"/>
+            </trim>
+        </trim>
+    </delete>
+    <!-- 获取列表 -->
+    <select id="getList" parameterType="paramDto" resultMap="SysFaceEntity-Map">
+        select <include refid="_columns"/>
+        from mortals_sys_face as a
+        <trim suffixOverrides="where" suffix="">
+            where
+            <trim prefixOverrides="and" prefix="">
+                <include refid="_condition_"/>
+            </trim>
+        </trim>
+        <include refid="_orderCols_"/>
+    </select>
+
+
+
+    <!-- 获取 -->
+    <select id="getListCount" parameterType="paramDto" resultType="int">
+        select count(1)
+        from mortals_sys_face as a
+        <trim suffixOverrides="where" suffix="">
+            where
+            <trim prefixOverrides="and" prefix="">
+                <include refid="_condition_"/>
+            </trim>
+        </trim>
+    </select>
+    <!-- 条件映射 -->
+    <sql id="_condition_">
+        <if test="condition != null and !condition.isEmpty()">
+            <!-- 条件映射-普通条件 -->
+            <include refid="_condition_param_">
+                <property name="_conditionParam_" value="condition"/>
+                <property name="_conditionType_" value="and"/>
+            </include>
+            <!-- 条件映射-集合之间使用AND，集合中元素使用OR-(list[0].1 or list[0].2) and (list[1].3 or list[1].4) -->
+            <if test="condition.containsKey('andConditionList') and !condition.andConditionList.isEmpty()">
+                and
+                <foreach collection="condition.andConditionList" open="(" close=")" index="index" item="andCondition" separator=" and ">
+                    <trim prefixOverrides="or" prefix="(" suffix=")">
+                        <include refid="_condition_param_">
+                            <property name="_conditionParam_" value="andCondition"/>
+                            <property name="_conditionType_" value="or"/>
+                        </include>
+                    </trim>
+                </foreach>
+            </if>
+            <!-- 条件映射-集合之间使用OR，集合中元素使用AND-(list[0].1 and list[0].2) or (list[1].3 and list[1].4) -->
+            <if test="condition.containsKey('orConditionList') and !condition.orConditionList.isEmpty()">
+                and
+                <foreach collection="condition.orConditionList" open="(" close=")" index="index" item="orCondition" separator=" or ">
+                    <trim prefixOverrides="and" prefix="(" suffix=")">
+                        <include refid="_condition_param_">
+                            <property name="_conditionParam_" value="orCondition"/>
+                            <property name="_conditionType_" value="and"/>
+                        </include>
+                    </trim>
+                </foreach>
+            </if>
+        </if>
+    </sql>
+    <!-- 条件映射-代参数 -->
+    <sql id="_condition_param_">
+        <bind name="conditionParamRef" value="${_conditionParam_}"/>
+        <if test="conditionParamRef.containsKey('id')">
+            <if test="conditionParamRef.id != null">
+                ${_conditionType_} a.id=#{${_conditionParam_}.id}
+            </if>
+        </if>
+
+            <if test="conditionParamRef.containsKey('id')">
+                <if test="conditionParamRef.id != null and conditionParamRef.id != ''">
+                    ${_conditionType_} a.id like #{${_conditionParam_}.id}
+                </if>
+                <if test="conditionParamRef.id == null">
+                    ${_conditionType_} a.id is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('idList')">
+                ${_conditionType_} a.id in
+                <foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('placeName')">
+                <if test="conditionParamRef.placeName != null and conditionParamRef.placeName != ''">
+                    ${_conditionType_} a.place_name like #{${_conditionParam_}.placeName}
+                </if>
+                <if test="conditionParamRef.placeName == null">
+                    ${_conditionType_} a.place_name is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('placeNameList')">
+                ${_conditionType_} a.place_name in
+                <foreach collection="conditionParamRef.placeNameList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('placeId')">
+                <if test="conditionParamRef.placeId != null and conditionParamRef.placeId != ''">
+                    ${_conditionType_} a.place_id like #{${_conditionParam_}.placeId}
+                </if>
+                <if test="conditionParamRef.placeId == null">
+                    ${_conditionType_} a.place_id is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('placeIdList')">
+                ${_conditionType_} a.place_id in
+                <foreach collection="conditionParamRef.placeIdList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('face')">
+                <if test="conditionParamRef.face != null and conditionParamRef.face != ''">
+                    ${_conditionType_} a.face like #{${_conditionParam_}.face}
+                </if>
+                <if test="conditionParamRef.face == null">
+                    ${_conditionType_} a.face is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('faceList')">
+                ${_conditionType_} a.face in
+                <foreach collection="conditionParamRef.faceList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('faceFeature')">
+                <if test="conditionParamRef.faceFeature != null and conditionParamRef.faceFeature != ''">
+                    ${_conditionType_} a.face_feature like #{${_conditionParam_}.faceFeature}
+                </if>
+                <if test="conditionParamRef.faceFeature == null">
+                    ${_conditionType_} a.face_feature is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('faceFeatureList')">
+                ${_conditionType_} a.face_feature in
+                <foreach collection="conditionParamRef.faceFeatureList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('idCard')">
+                <if test="conditionParamRef.idCard != null and conditionParamRef.idCard != ''">
+                    ${_conditionType_} a.id_card like #{${_conditionParam_}.idCard}
+                </if>
+                <if test="conditionParamRef.idCard == null">
+                    ${_conditionType_} a.id_card is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('idCardList')">
+                ${_conditionType_} a.id_card in
+                <foreach collection="conditionParamRef.idCardList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('createTime')">
+                <if test="conditionParamRef.createTime != null ">
+                    ${_conditionType_} a.create_time = #{${_conditionParam_}.createTime}
+                </if>
+                <if test="conditionParamRef.createTime == null">
+                    ${_conditionType_} a.create_time is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('createTimeStart') and conditionParamRef.createTimeStart != null and conditionParamRef.createTimeStart!=''">
+                ${_conditionType_} a.create_time <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
+            </if>
+            <if test="conditionParamRef.containsKey('createTimeEnd') and conditionParamRef.createTimeEnd != null and conditionParamRef.createTimeEnd!=''">
+                ${_conditionType_} a.create_time <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
+            </if>
+
+            <if test="conditionParamRef.containsKey('updateTime')">
+                <if test="conditionParamRef.updateTime != null ">
+                    ${_conditionType_} a.update_time = #{${_conditionParam_}.updateTime}
+                </if>
+                <if test="conditionParamRef.updateTime == null">
+                    ${_conditionType_} a.update_time is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('updateTimeStart') and conditionParamRef.updateTimeStart != null and conditionParamRef.updateTimeStart!=''">
+                ${_conditionType_} a.update_time <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
+            </if>
+            <if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''">
+                ${_conditionType_} a.update_time <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
+            </if>
+            <if test="conditionParamRef.containsKey('deleted')">
+                <if test="conditionParamRef.deleted != null ">
+                    ${_conditionType_} a.deleted = #{${_conditionParam_}.deleted}
+                </if>
+                <if test="conditionParamRef.deleted == null">
+                    ${_conditionType_} a.deleted is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('deletedList')">
+                ${_conditionType_} a.deleted in
+                <foreach collection="conditionParamRef.deletedList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('deletedStart') and conditionParamRef.deletedStart != null">
+                ${_conditionType_} a.deleted <![CDATA[ >= ]]> #{${_conditionParam_}.deletedStart}
+            </if>
+            <if test="conditionParamRef.containsKey('deletedEnd') and conditionParamRef.deletedEnd != null">
+                ${_conditionType_} a.deleted <![CDATA[ <= ]]> #{${_conditionParam_}.deletedEnd}
+            </if>
+
+    </sql>
+    <sql id="_orderCols_">
+        <if test="orderColList != null and !orderColList.isEmpty()">
+            order by
+            <trim suffixOverrides=","  suffix="">
+                <foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
+                     ${item.colName} ${item.sortKind}
+                </foreach>
+            </trim>
+        </if>
+        <if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()">
+            order by
+            <trim suffixOverrides=","  suffix="">
+                    <if test="orderCol.containsKey('id')">
+                        a.id
+                        <if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('placeName')">
+                        a.place_name
+                        <if test='orderCol.placeName != null and "DESC".equalsIgnoreCase(orderCol.placeName)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('placeId')">
+                        a.place_id
+                        <if test='orderCol.placeId != null and "DESC".equalsIgnoreCase(orderCol.placeId)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('face')">
+                        a.face
+                        <if test='orderCol.face != null and "DESC".equalsIgnoreCase(orderCol.face)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('faceFeature')">
+                        a.face_feature
+                        <if test='orderCol.faceFeature != null and "DESC".equalsIgnoreCase(orderCol.faceFeature)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('idCard')">
+                        a.id_card
+                        <if test='orderCol.idCard != null and "DESC".equalsIgnoreCase(orderCol.idCard)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('createTime')">
+                        a.create_time
+                        <if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('updateTime')">
+                        a.update_time
+                        <if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('deleted')">
+                        a.deleted
+                        <if test='orderCol.deleted != null and "DESC".equalsIgnoreCase(orderCol.deleted)'>DESC</if>
+                        ,
+                    </if>
+            </trim>
+        </if>
+    </sql>
+    <sql id="_group_by_">
+        <if test="groupList != null and !groupList.isEmpty()">
+            GROUP BY
+            <trim suffixOverrides=","  suffix="">
+                <foreach collection="groupList" open="" close="" index="index" item="item" separator=",">
+                    ${item}
+                </foreach>
+            </trim>
+        </if>
+    </sql>
+</mapper>
\ No newline at end of file

base-manager/src/main/resources/sqlmap/module/identity/SysIdentityMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"mybatis-3-mapper.dtd">
+<mapper namespace="com.mortals.xhx.module.identity.dao.ibatis.SysIdentityDaoImpl">
+
+    <!-- 字段和属性映射 -->
+    <resultMap type="SysIdentityEntity" id="SysIdentityEntity-Map">
+            <id  property="id" column="id" />
+            <result property="region" column="region" />
+            <result property="birthday" column="birthday" />
+            <result property="ase" column="ase" />
+            <result property="name" column="name" />
+            <result property="phone" column="phone" />
+            <result property="createTime" column="create_time" />
+            <result property="updateTime" column="update_time" />
+            <result property="deleted" column="deleted" />
+            
+    </resultMap>
+
+
+    <!-- 表所有列 -->
+    <sql id="_columns">
+        <trim suffixOverrides="," suffix="">
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('id') or colPickMode == 1 and data.containsKey('id')))">
+                    a.id,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('region') or colPickMode == 1 and data.containsKey('region')))">
+                    a.region,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('birthday') or colPickMode == 1 and data.containsKey('birthday')))">
+                    a.birthday,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('ase') or colPickMode == 1 and data.containsKey('ase')))">
+                    AES_DECRYPT(UNHEX(a.ase),'${@com.mortals.xhx.common.key.Constant@MYSQL_KEY}') as ase,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('name') or colPickMode == 1 and data.containsKey('name')))">
+                    a.name,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('phone') or colPickMode == 1 and data.containsKey('phone')))">
+                    a.phone,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))">
+                    a.create_time,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
+                    a.update_time,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deleted') or colPickMode == 1 and data.containsKey('deleted')))">
+                    a.deleted,
+                </if>
+        </trim>
+    </sql>
+    <!-- 新增 区分主键自增加还是业务插入 -->
+    <insert id="insert" parameterType="SysIdentityEntity" >
+        insert into mortals_sys_identity
+        (id,region,birthday,ase,name,phone,create_time,update_time,deleted)
+        VALUES
+        (#{id},#{region},#{birthday},
+        HEX(AES_ENCRYPT(#{ase},'${@com.mortals.xhx.common.key.Constant@MYSQL_KEY}')),
+        #{name},#{phone},#{createTime},#{updateTime},#{deleted})
+    </insert>
+
+    <!-- 批量新增 -->
+    <insert id="insertBatch" parameterType="paramDto">
+        insert into mortals_sys_identity
+        (id,region,birthday,ase,name,phone,create_time,update_time,deleted)
+        VALUES
+        <foreach collection="data.dataList" item="item" index="index" separator="," >
+            (#{item.id},#{item.region},#{item.birthday},
+            HEX(AES_ENCRYPT(#{item.ase},'${@com.mortals.xhx.common.key.Constant@MYSQL_KEY}')),
+            #{item.name},#{item.phone},#{item.createTime},#{item.updateTime},#{item.deleted})
+        </foreach>
+    </insert>
+
+
+    <!-- 根据ParamDto更新 -->
+    <update id="update" parameterType="paramDto">
+        update mortals_sys_identity as a
+        set
+        <trim suffixOverrides="," suffix="">
+            <if test="(colPickMode==0 and data.containsKey('region')) or (colPickMode==1 and !data.containsKey('region'))">
+                a.region=#{data.region},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('regionIncrement')) or (colPickMode==1 and !data.containsKey('regionIncrement'))">
+                a.region=ifnull(a.region,0) + #{data.regionIncrement},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('birthday')) or (colPickMode==1 and !data.containsKey('birthday'))">
+                a.birthday=#{data.birthday},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('birthdayIncrement')) or (colPickMode==1 and !data.containsKey('birthdayIncrement'))">
+                a.birthday=ifnull(a.birthday,0) + #{data.birthdayIncrement},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('ase')) or (colPickMode==1 and !data.containsKey('ase'))">
+                a.ase=HEX(AES_ENCRYPT(#{data.ase},'${@com.mortals.xhx.common.key.Constant@MYSQL_KEY}')),
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('name')) or (colPickMode==1 and !data.containsKey('name'))">
+                a.name=#{data.name},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('phone')) or (colPickMode==1 and !data.containsKey('phone'))">
+                a.phone=#{data.phone},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('createTime')) or (colPickMode==1 and !data.containsKey('createTime'))">
+                a.create_time=#{data.createTime},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
+                a.update_time=#{data.updateTime},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('deleted')) or (colPickMode==1 and !data.containsKey('deleted'))">
+                a.deleted=#{data.deleted},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('deletedIncrement')) or (colPickMode==1 and !data.containsKey('deletedIncrement'))">
+                a.deleted=ifnull(a.deleted,0) + #{data.deletedIncrement},
+            </if>
+        </trim>
+        <trim suffixOverrides="where" suffix="">
+            where
+            <trim prefixOverrides="and" prefix="">
+                <include refid="_condition_"/>
+            </trim>
+        </trim>
+    </update>
+    <!-- 批量更新 -->
+    <update id="updateBatch" parameterType="paramDto">
+        update mortals_sys_identity as a
+        <trim prefix="set" suffixOverrides=",">
+                        <trim prefix="region=(case" suffix="ELSE region end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('region')) or (colPickMode==1 and !item.containsKey('region'))">
+                                        when a.id=#{item.id} then #{item.region}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('regionIncrement')) or (colPickMode==1 and !item.containsKey('regionIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.region,0) + #{item.regionIncrement}
+                                    </when>
+                                </choose>
+                            </foreach>
+                        </trim>
+                        <trim prefix="birthday=(case" suffix="ELSE birthday end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('birthday')) or (colPickMode==1 and !item.containsKey('birthday'))">
+                                        when a.id=#{item.id} then #{item.birthday}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('birthdayIncrement')) or (colPickMode==1 and !item.containsKey('birthdayIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.birthday,0) + #{item.birthdayIncrement}
+                                    </when>
+                                </choose>
+                            </foreach>
+                        </trim>
+                <trim prefix="ase=(case" suffix="ELSE ase end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('ase')) or (colPickMode==1 and !item.containsKey('ase'))">
+                            when a.id=#{item.id} then HEX(AES_ENCRYPT(#{item.ase},'${@com.mortals.xhx.common.key.Constant@MYSQL_KEY}')),
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="name=(case" suffix="ELSE name end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('name')) or (colPickMode==1 and !item.containsKey('name'))">
+                            when a.id=#{item.id} then #{item.name}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="phone=(case" suffix="ELSE phone end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('phone')) or (colPickMode==1 and !item.containsKey('phone'))">
+                            when a.id=#{item.id} then #{item.phone}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="create_time=(case" suffix="ELSE create_time end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))">
+                            when a.id=#{item.id} then #{item.createTime}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="update_time=(case" suffix="ELSE update_time end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('updateTime')) or (colPickMode==1 and !item.containsKey('updateTime'))">
+                            when a.id=#{item.id} then #{item.updateTime}
+                        </if>
+                    </foreach>
+                </trim>
+                        <trim prefix="deleted=(case" suffix="ELSE deleted end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('deleted')) or (colPickMode==1 and !item.containsKey('deleted'))">
+                                        when a.id=#{item.id} then #{item.deleted}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('deletedIncrement')) or (colPickMode==1 and !item.containsKey('deletedIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.deleted,0) + #{item.deletedIncrement}
+                                    </when>
+                                </choose>
+                            </foreach>
+                        </trim>
+        </trim>
+        where id in
+        <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
+            #{item.id}
+        </foreach>
+    </update>
+    <!-- 根据主健查询 -->
+    <select id="getByKey" parameterType="paramDto" resultMap="SysIdentityEntity-Map">
+        select <include refid="_columns"/>
+        from mortals_sys_identity as a
+        where a.id=#{condition.id}
+    </select>
+    <!-- 根据主健删除 -->
+    <delete id="deleteByKey" parameterType="paramDto">
+        delete a.* from mortals_sys_identity as a where a.id=#{condition.id}
+    </delete>
+    <!-- 根据主健删除一批，针对单一主健有效 -->
+    <delete id="deleteByKeys">
+        delete from mortals_sys_identity where id in
+        <foreach collection="array" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </delete>
+    <!-- 根据paramDto删除一批 -->
+    <delete id="deleteByMap" parameterType="paramDto">
+        delete a.* from mortals_sys_identity as a
+        <trim suffixOverrides="where" suffix="">
+            where
+            <trim prefixOverrides="and" prefix="">
+                <include refid="_condition_"/>
+            </trim>
+        </trim>
+    </delete>
+    <!-- 获取列表 -->
+    <select id="getList" parameterType="paramDto" resultMap="SysIdentityEntity-Map">
+        select <include refid="_columns"/>
+        from mortals_sys_identity as a
+        <trim suffixOverrides="where" suffix="">
+            where
+            <trim prefixOverrides="and" prefix="">
+                <include refid="_condition_"/>
+            </trim>
+        </trim>
+        <include refid="_orderCols_"/>
+    </select>
+
+
+
+    <!-- 获取 -->
+    <select id="getListCount" parameterType="paramDto" resultType="int">
+        select count(1)
+        from mortals_sys_identity as a
+        <trim suffixOverrides="where" suffix="">
+            where
+            <trim prefixOverrides="and" prefix="">
+                <include refid="_condition_"/>
+            </trim>
+        </trim>
+    </select>
+    <!-- 条件映射 -->
+    <sql id="_condition_">
+        <if test="condition != null and !condition.isEmpty()">
+            <!-- 条件映射-普通条件 -->
+            <include refid="_condition_param_">
+                <property name="_conditionParam_" value="condition"/>
+                <property name="_conditionType_" value="and"/>
+            </include>
+            <!-- 条件映射-集合之间使用AND，集合中元素使用OR-(list[0].1 or list[0].2) and (list[1].3 or list[1].4) -->
+            <if test="condition.containsKey('andConditionList') and !condition.andConditionList.isEmpty()">
+                and
+                <foreach collection="condition.andConditionList" open="(" close=")" index="index" item="andCondition" separator=" and ">
+                    <trim prefixOverrides="or" prefix="(" suffix=")">
+                        <include refid="_condition_param_">
+                            <property name="_conditionParam_" value="andCondition"/>
+                            <property name="_conditionType_" value="or"/>
+                        </include>
+                    </trim>
+                </foreach>
+            </if>
+            <!-- 条件映射-集合之间使用OR，集合中元素使用AND-(list[0].1 and list[0].2) or (list[1].3 and list[1].4) -->
+            <if test="condition.containsKey('orConditionList') and !condition.orConditionList.isEmpty()">
+                and
+                <foreach collection="condition.orConditionList" open="(" close=")" index="index" item="orCondition" separator=" or ">
+                    <trim prefixOverrides="and" prefix="(" suffix=")">
+                        <include refid="_condition_param_">
+                            <property name="_conditionParam_" value="orCondition"/>
+                            <property name="_conditionType_" value="and"/>
+                        </include>
+                    </trim>
+                </foreach>
+            </if>
+        </if>
+    </sql>
+    <!-- 条件映射-代参数 -->
+    <sql id="_condition_param_">
+        <bind name="conditionParamRef" value="${_conditionParam_}"/>
+        <if test="conditionParamRef.containsKey('id')">
+            <if test="conditionParamRef.id != null">
+                ${_conditionType_} a.id=#{${_conditionParam_}.id}
+            </if>
+        </if>
+
+            <if test="conditionParamRef.containsKey('id')">
+                <if test="conditionParamRef.id != null and conditionParamRef.id != ''">
+                    ${_conditionType_} a.id like #{${_conditionParam_}.id}
+                </if>
+                <if test="conditionParamRef.id == null">
+                    ${_conditionType_} a.id is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('idList')">
+                ${_conditionType_} a.id in
+                <foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('region')">
+                <if test="conditionParamRef.region != null ">
+                    ${_conditionType_} a.region = #{${_conditionParam_}.region}
+                </if>
+                <if test="conditionParamRef.region == null">
+                    ${_conditionType_} a.region is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('regionList')">
+                ${_conditionType_} a.region in
+                <foreach collection="conditionParamRef.regionList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('regionStart') and conditionParamRef.regionStart != null">
+                ${_conditionType_} a.region <![CDATA[ >= ]]> #{${_conditionParam_}.regionStart}
+            </if>
+            <if test="conditionParamRef.containsKey('regionEnd') and conditionParamRef.regionEnd != null">
+                ${_conditionType_} a.region <![CDATA[ <= ]]> #{${_conditionParam_}.regionEnd}
+            </if>
+
+            <if test="conditionParamRef.containsKey('birthday')">
+                <if test="conditionParamRef.birthday != null ">
+                    ${_conditionType_} a.birthday = #{${_conditionParam_}.birthday}
+                </if>
+                <if test="conditionParamRef.birthday == null">
+                    ${_conditionType_} a.birthday is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('birthdayList')">
+                ${_conditionType_} a.birthday in
+                <foreach collection="conditionParamRef.birthdayList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('birthdayStart') and conditionParamRef.birthdayStart != null">
+                ${_conditionType_} a.birthday <![CDATA[ >= ]]> #{${_conditionParam_}.birthdayStart}
+            </if>
+            <if test="conditionParamRef.containsKey('birthdayEnd') and conditionParamRef.birthdayEnd != null">
+                ${_conditionType_} a.birthday <![CDATA[ <= ]]> #{${_conditionParam_}.birthdayEnd}
+            </if>
+
+
+            <if test="conditionParamRef.containsKey('ase')">
+                <if test="conditionParamRef.ase != null and conditionParamRef.ase != ''">
+                    ${_conditionType_} a.ase like #{${_conditionParam_}.ase}
+                </if>
+                <if test="conditionParamRef.ase == null">
+                    ${_conditionType_} a.ase is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('aseList')">
+                ${_conditionType_} a.ase in
+                <foreach collection="conditionParamRef.aseList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('name')">
+                <if test="conditionParamRef.name != null and conditionParamRef.name != ''">
+                    ${_conditionType_} a.name like #{${_conditionParam_}.name}
+                </if>
+                <if test="conditionParamRef.name == null">
+                    ${_conditionType_} a.name is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('nameList')">
+                ${_conditionType_} a.name in
+                <foreach collection="conditionParamRef.nameList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('phone')">
+                <if test="conditionParamRef.phone != null and conditionParamRef.phone != ''">
+                    ${_conditionType_} a.phone like #{${_conditionParam_}.phone}
+                </if>
+                <if test="conditionParamRef.phone == null">
+                    ${_conditionType_} a.phone is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('phoneList')">
+                ${_conditionType_} a.phone in
+                <foreach collection="conditionParamRef.phoneList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('createTime')">
+                <if test="conditionParamRef.createTime != null ">
+                    ${_conditionType_} a.create_time = #{${_conditionParam_}.createTime}
+                </if>
+                <if test="conditionParamRef.createTime == null">
+                    ${_conditionType_} a.create_time is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('createTimeStart') and conditionParamRef.createTimeStart != null and conditionParamRef.createTimeStart!=''">
+                ${_conditionType_} a.create_time <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
+            </if>
+            <if test="conditionParamRef.containsKey('createTimeEnd') and conditionParamRef.createTimeEnd != null and conditionParamRef.createTimeEnd!=''">
+                ${_conditionType_} a.create_time <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
+            </if>
+
+            <if test="conditionParamRef.containsKey('updateTime')">
+                <if test="conditionParamRef.updateTime != null ">
+                    ${_conditionType_} a.update_time = #{${_conditionParam_}.updateTime}
+                </if>
+                <if test="conditionParamRef.updateTime == null">
+                    ${_conditionType_} a.update_time is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('updateTimeStart') and conditionParamRef.updateTimeStart != null and conditionParamRef.updateTimeStart!=''">
+                ${_conditionType_} a.update_time <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
+            </if>
+            <if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''">
+                ${_conditionType_} a.update_time <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
+            </if>
+            <if test="conditionParamRef.containsKey('deleted')">
+                <if test="conditionParamRef.deleted != null ">
+                    ${_conditionType_} a.deleted = #{${_conditionParam_}.deleted}
+                </if>
+                <if test="conditionParamRef.deleted == null">
+                    ${_conditionType_} a.deleted is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('deletedList')">
+                ${_conditionType_} a.deleted in
+                <foreach collection="conditionParamRef.deletedList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('deletedStart') and conditionParamRef.deletedStart != null">
+                ${_conditionType_} a.deleted <![CDATA[ >= ]]> #{${_conditionParam_}.deletedStart}
+            </if>
+            <if test="conditionParamRef.containsKey('deletedEnd') and conditionParamRef.deletedEnd != null">
+                ${_conditionType_} a.deleted <![CDATA[ <= ]]> #{${_conditionParam_}.deletedEnd}
+            </if>
+
+    </sql>
+    <sql id="_orderCols_">
+        <if test="orderColList != null and !orderColList.isEmpty()">
+            order by
+            <trim suffixOverrides=","  suffix="">
+                <foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
+                     ${item.colName} ${item.sortKind}
+                </foreach>
+            </trim>
+        </if>
+        <if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()">
+            order by
+            <trim suffixOverrides=","  suffix="">
+                    <if test="orderCol.containsKey('id')">
+                        a.id
+                        <if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('region')">
+                        a.region
+                        <if test='orderCol.region != null and "DESC".equalsIgnoreCase(orderCol.region)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('birthday')">
+                        a.birthday
+                        <if test='orderCol.birthday != null and "DESC".equalsIgnoreCase(orderCol.birthday)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('ase')">
+                        a.ase
+                        <if test='orderCol.ase != null and "DESC".equalsIgnoreCase(orderCol.ase)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('name')">
+                        a.name
+                        <if test='orderCol.name != null and "DESC".equalsIgnoreCase(orderCol.name)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('phone')">
+                        a.phone
+                        <if test='orderCol.phone != null and "DESC".equalsIgnoreCase(orderCol.phone)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('createTime')">
+                        a.create_time
+                        <if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('updateTime')">
+                        a.update_time
+                        <if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('deleted')">
+                        a.deleted
+                        <if test='orderCol.deleted != null and "DESC".equalsIgnoreCase(orderCol.deleted)'>DESC</if>
+                        ,
+                    </if>
+            </trim>
+        </if>
+    </sql>
+    <sql id="_group_by_">
+        <if test="groupList != null and !groupList.isEmpty()">
+            GROUP BY
+            <trim suffixOverrides=","  suffix="">
+                <foreach collection="groupList" open="" close="" index="index" item="item" separator=",">
+                    ${item}
+                </foreach>
+            </trim>
+        </if>
+    </sql>
+</mapper>
\ No newline at end of file

base-manager/src/main/resources/sqlmap/module/identity/SysIdentityMapperExt.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"mybatis-3-mapper.dtd">
+<mapper namespace="com.mortals.xhx.module.identity.dao.ibatis.SysIdentityDaoImpl">
+
+    <select id="findIdentity" resultMap="SysIdentityEntity-Map">
+        SELECT
+        id,region,birthday,
+        AES_DECRYPT(UNHEX(ase),'${@com.mortals.xhx.common.key.Constant@MYSQL_KEY}') as ase,
+        name,phone,create_time,update_time
+        FROM mortals_sys_identity
+        <where>
+            deleted = 0
+            <if test="region != null">
+                and region = #{region}
+            </if>
+            <if test="birthday != null">
+                and birthday = #{birthday}
+            </if>
+            <if test="ase != null and ase != ''">
+                and ase = HEX(AES_ENCRYPT(#{ase},'${@com.mortals.xhx.common.key.Constant@MYSQL_KEY}'))
+            </if>
+            <if test="name != null and name != ''">
+                and name = #{name}
+            </if>
+            <if test="id != null and id != ''">
+                and id = #{id}
+            </if>
+        </where>
+    </select>
+</mapper>
\ No newline at end of file

portal-manager/src/main/java/com/mortals/xhx/module/role/service/impl/RoleModelServiceImpl.java

@@ -83,9 +83,12 @@ public class RoleModelServiceImpl extends AbstractCRUDServiceImpl<RoleModelDao,
         query.setUserId(userId);
         List<RoleUserEntity> roleUserEntityList = roleUserService.find(query);
         List<Long> roleIds = new ArrayList<>();
-        roleUserEntityList.stream().forEach(item->{
+        roleUserEntityList.forEach(item->{
             roleIds.add(item.getRoleId());
         });
+        if(roleIds.isEmpty()){
+            return Collections.emptyList();
+        }
         RoleModelQuery condition = new RoleModelQuery();
         condition.setRoleIdList(roleIds);
         List<RoleModelEntity> roleModelEntities = this.find(condition);