Merge branches 'master' and 'pingyin_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud into pingyin_master

 Conflicts:

	epmet-user/epmet-user-server/pom.xml

epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/ComplementLogOperationDTO.java

@@ -0,0 +1,21 @@
+package com.epmet.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2022/10/20 14:21
+ * @DESC
+ */
+@Data
+public class ComplementLogOperationDTO implements Serializable {
+
+    private static final long serialVersionUID = 7563210356670229204L;
+
+    private String staffId;
+
+    private String orgId;
+    private String orgIdPath;
+}

epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/form/LogOperationListFormDTO.java

@@ -10,4 +10,24 @@ public class LogOperationListFormDTO {
     private Integer pageNo = 1;
 
     private Integer pageSize = 10;
+    /**
+     * 姓名
+     */
+    private String operatorName;
+    /**
+     * 手机号
+     */
+    private String operatorMobile;
+    /**
+     * yyyyMMdd
+     */
+    private String startTime;
+    /**
+     * yyyyMMdd
+     */
+    private String endTime;
+    /**
+     * 默认传data_tm
+     */
+    private String category;
 }

epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/region/LogOperationResultDTO.java

@@ -1,7 +1,10 @@
 package com.epmet.dto.region;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  *
  */
@@ -45,4 +48,6 @@ public class LogOperationResultDTO {
      */
     private Long operatingTime;
 
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm")
+    private Date operateTime;
 }

epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/LogOperationController.java

@@ -1,7 +1,10 @@
 package com.epmet.controller;
 
+import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.annotation.RequirePermission;
 import com.epmet.commons.tools.enums.RequirePermissionEnum;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.security.user.LoginUserUtil;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
@@ -45,4 +48,26 @@ public class LogOperationController {
         return new Result<List<LogOperationResultDTO>>().ok(resultList);
     }
 
+    /**
+     * 数字社区-操作记录
+     * @param formDTO
+     * @return
+     */
+    @PostMapping("page")
+    public Result<PageData<LogOperationResultDTO>> page(@RequestBody LogOperationListFormDTO formDTO, @LoginUser TokenDto tokenDto){
+        return new Result<PageData<LogOperationResultDTO>>().ok(logOperationService.page(loginUserUtil.getLoginUserCustomerId(),
+                formDTO.getStartTime(),
+                formDTO.getEndTime(),
+                formDTO.getOperatorName(),
+                formDTO.getOperatorMobile(),
+                formDTO.getPageNo(),
+                formDTO.getPageSize(),
+                formDTO.getCategory(),tokenDto));
+    }
+
+    @PostMapping("complementLogOperation")
+    public Result complementLogOperation(){
+        logOperationService.complementLogOperation();
+        return new Result();
+    }
 }

epmet-admin/epmet-admin-server/src/main/java/com/epmet/dao/LogOperationDao.java

@@ -18,8 +18,14 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.ComplementLogOperationDTO;
+import com.epmet.dto.region.LogOperationResultDTO;
 import com.epmet.entity.LogOperationEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * 操作日指标
@@ -29,5 +35,17 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface LogOperationDao extends BaseDao<LogOperationEntity> {
-	
+
+    List<LogOperationResultDTO> pageList(@Param("customerId") String customerId,
+                                         @Param("startTime")String startTime,
+                                         @Param("endTime")String endTime,
+                                         @Param("operatorName")String operatorName,
+                                         @Param("operatorMobile")String operatorMobile,
+                                         @Param("category")String category,
+                                         @Param("agencyId")String agencyId);
+
+    List<Map<String,String>> getStaffId();
+
+    void updateBatchLog(@Param("list") List<ComplementLogOperationDTO> list);
+
 }

epmet-admin/epmet-admin-server/src/main/java/com/epmet/entity/LogOperationEntity.java

@@ -79,6 +79,8 @@ public class LogOperationEntity extends BaseEpmetEntity {
 	 * 操作人手机号
 	 */
 	private String operatorMobile;
+	private String orgId;
+	private String orgIdPath;
 
     /**
      * 操作时间,该时间不是插入数据的时间，而是操作发生的真实时间

epmet-admin/epmet-admin-server/src/main/java/com/epmet/mq/listener/RocketMQConsumerRegister.java

@@ -5,6 +5,7 @@ import com.epmet.commons.rocketmq.constants.TopicConstants;
 import com.epmet.commons.rocketmq.register.MQAbstractRegister;
 import com.epmet.commons.rocketmq.register.MQConsumerProperties;
 import com.epmet.mq.listener.listener.AuthOperationLogListener;
+import com.epmet.mq.listener.listener.CheckAndExportOperationLogListener;
 import com.epmet.mq.listener.listener.PointOperationLogListener;
 import com.epmet.mq.listener.listener.ProjectOperationLogListener;
 import org.apache.rocketmq.common.protocol.heartbeat.MessageModel;
@@ -19,6 +20,7 @@ public class RocketMQConsumerRegister extends MQAbstractRegister {
         register(consumerProperties, ConsomerGroupConstants.AUTH_OPERATION_LOG_GROUP, MessageModel.CLUSTERING, TopicConstants.AUTH, "*", new AuthOperationLogListener());
         register(consumerProperties, ConsomerGroupConstants.PROJECT_OPERATION_LOG_GROUP, MessageModel.CLUSTERING, TopicConstants.PROJECT_CHANGED, "*", new ProjectOperationLogListener());
         register(consumerProperties, ConsomerGroupConstants.POINT_OPERATION_LOG_GROUP, MessageModel.CLUSTERING, TopicConstants.POINT, "*", new PointOperationLogListener());
+        register(consumerProperties, ConsomerGroupConstants.CHECK_OR_EXPORT_GROUP, MessageModel.CLUSTERING, TopicConstants.CHECK_OR_EXPORT, "*", new CheckAndExportOperationLogListener());
 
         // ...其他监听器类似
     }

epmet-admin/epmet-admin-server/src/main/java/com/epmet/mq/listener/listener/CheckAndExportOperationLogListener.java

@@ -0,0 +1,122 @@
+package com.epmet.mq.listener.listener;
+
+import com.alibaba.fastjson.JSON;
+import com.epmet.auth.constants.AuthOperationEnum;
+import com.epmet.commons.rocketmq.constants.MQUserPropertys;
+import com.epmet.commons.rocketmq.messages.CheckMQMsg;
+import com.epmet.commons.rocketmq.messages.LoginMQMsg;
+import com.epmet.commons.tools.distributedlock.DistributedLock;
+import com.epmet.commons.tools.exception.ExceptionUtils;
+import com.epmet.commons.tools.exception.RenException;
+import com.epmet.commons.tools.redis.RedisKeys;
+import com.epmet.commons.tools.redis.RedisUtils;
+import com.epmet.commons.tools.utils.SpringContextUtils;
+import com.epmet.entity.LogOperationEntity;
+import com.epmet.mq.listener.bean.log.LogOperationHelper;
+import com.epmet.mq.listener.bean.log.OperatorInfo;
+import com.epmet.service.LogOperationService;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.rocketmq.client.consumer.listener.ConsumeConcurrentlyContext;
+import org.apache.rocketmq.client.consumer.listener.ConsumeConcurrentlyStatus;
+import org.apache.rocketmq.client.consumer.listener.MessageListenerConcurrently;
+import org.apache.rocketmq.common.message.MessageExt;
+import org.redisson.api.RLock;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * @author zxc
+ * @Description 查询明文或者导出操作日志监听器
+ */
+public class CheckAndExportOperationLogListener implements MessageListenerConcurrently {
+
+    private Logger logger = LoggerFactory.getLogger(getClass());
+
+    private RedisUtils redisUtils;
+
+    @Override
+    public ConsumeConcurrentlyStatus consumeMessage(List<MessageExt> msgs, ConsumeConcurrentlyContext context) {
+
+        if (redisUtils == null) {
+            redisUtils = SpringContextUtils.getBean(RedisUtils.class);
+        }
+
+        try {
+            msgs.forEach(msg -> consumeMessage(msg));
+        } catch (Exception e) {
+            logger.error(ExceptionUtils.getErrorStackTrace(e));
+            return ConsumeConcurrentlyStatus.RECONSUME_LATER;
+        }
+        return ConsumeConcurrentlyStatus.CONSUME_SUCCESS;
+    }
+
+    private void consumeMessage(MessageExt messageExt) {
+        String tags = messageExt.getTags();
+        String msg = new String(messageExt.getBody());
+        String pendingMsgLabel = messageExt.getUserProperty(MQUserPropertys.BLOCKED_MSG_LABEL);
+        logger.info("查询明文或者导出操作日志监听器-收到消息内容:{}", msg);
+        CheckMQMsg msgObj = JSON.parseObject(msg, CheckMQMsg.class);
+
+        //获取操作人信息
+        OperatorInfo operatorInfo = LogOperationHelper.getInstance().getOperatorInfo(msgObj.getUserId());
+        LogOperationEntity logEntity = new LogOperationEntity();
+        logEntity.setCategory("data_tm");
+        logEntity.setType(msgObj.getType());
+        logEntity.setTypeDisplay(msgObj.getTypeDisplay());
+        logEntity.setIp(msgObj.getIp());
+        logEntity.setFromApp(msgObj.getFromApp());
+        logEntity.setFromClient(msgObj.getFromClient());
+        logEntity.setTargetId("");
+        logEntity.setCustomerId(operatorInfo.getCustomerId());
+        logEntity.setOperatorId(msgObj.getUserId());
+        logEntity.setOperatorName(operatorInfo.getName());
+        logEntity.setOperatorMobile(operatorInfo.getMobile());
+        logEntity.setOperatingTime(msgObj.getOperateTime());
+        logEntity.setContent(msgObj.getContent());
+        logEntity.setOrgId(msgObj.getOrgId());
+        logEntity.setOrgIdPath(msgObj.getOrgIdPath());
+
+        DistributedLock distributedLock = null;
+        RLock lock = null;
+        try {
+            distributedLock = SpringContextUtils.getBean(DistributedLock.class);
+            lock = distributedLock.getLock(String.format("lock:auth_operation_log:%s:%s", logEntity.getType(), logEntity.getOperatorId()),
+                    30L, 30L, TimeUnit.SECONDS);
+            SpringContextUtils.getBean(LogOperationService.class).log(logEntity);
+        } catch (RenException e) {
+            // 如果是我们手动抛出的异常，说明在业务可控范围内。目前不需要MQ重试
+            logger.error("【RocketMQ】添加操作日志失败:".concat(ExceptionUtils.getErrorStackTrace(e)));
+        } catch (Exception e) {
+            // 不是我们自己抛出的异常，可以让MQ重试
+            logger.error("【RocketMQ】添加操作日志失败:".concat(ExceptionUtils.getErrorStackTrace(e)));
+            throw e;
+        } finally {
+            distributedLock.unLock(lock);
+        }
+
+        if (StringUtils.isNotBlank(pendingMsgLabel)) {
+            try {
+                removePendingMqMsgCache(pendingMsgLabel);
+            } catch (Exception e) {
+                logger.error("【查询明文或者导出操作日志监听器】-删除mq阻塞消息缓存失败:{}", ExceptionUtils.getErrorStackTrace(e));
+            }
+        }
+    }
+
+    /**
+     * @description
+     *
+     * @param pendingMsgLabel
+     * @return
+     * @author wxz
+     * @date 2021.10.14 16:32:32
+     */
+    private void removePendingMqMsgCache(String pendingMsgLabel) {
+        String key = RedisKeys.blockedMqMsgKey(pendingMsgLabel);
+        redisUtils.delete(key);
+        //logger.info("【登录操作事件监听器】删除pendingMsgLabel成功:{}", pendingMsgLabel);
+    }
+}

epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/LogOperationService.java

@@ -1,5 +1,7 @@
 package com.epmet.service;
 
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.dto.region.LogOperationResultDTO;
 import com.epmet.entity.LogOperationEntity;
 
@@ -25,4 +27,23 @@ public interface LogOperationService {
      * @date 2021.06.07 21:56
     */
     List<LogOperationResultDTO> listOperationLogs(String condition, String customerId, Integer pageNo, Integer pageSize);
+
+    /**
+     * 数字社区-操作记录
+     * @param loginUserCustomerId
+     * @param startTime
+     * @param endTime
+     * @param operatorName
+     * @param operatorMobile
+     * @return
+     */
+    PageData<LogOperationResultDTO> page(String loginUserCustomerId,
+                                         String startTime,
+                                         String endTime,
+                                         String operatorName,
+                                         String operatorMobile,
+                                         Integer pageNo, Integer pageSize, String category, TokenDto tokenDto);
+
+    void complementLogOperation();
+
 }

epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/impl/LogOperationServiceImpl.java

@@ -4,20 +4,30 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
+import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.feign.ResultDataResolver;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
+import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dao.LogOperationDao;
+import com.epmet.dto.ComplementLogOperationDTO;
 import com.epmet.dto.CustomerStaffDTO;
 import com.epmet.dto.form.CustomerStaffFormDTO;
 import com.epmet.dto.region.LogOperationResultDTO;
 import com.epmet.entity.LogOperationEntity;
 import com.epmet.feign.EpmetUserOpenFeignClient;
 import com.epmet.service.LogOperationService;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import java.util.*;
@@ -174,7 +184,72 @@ public class LogOperationServiceImpl implements LogOperationService, ResultDataR
             ldto.setCustomerId(l.getCustomerId());
             ldto.setOperatorMobile(staffMap.get(l.getOperatorId()).getMobile());
             ldto.setOperatorName(staffMap.get(l.getOperatorId()).getRealName());
+            ldto.setOperateTime(l.getOperatingTime());
             return ldto;
         }).collect(Collectors.toList());
     }
+
+    /**
+     * 数字社区-操作记录
+     *
+     * @param customerId
+     * @param startTime
+     * @param endTime
+     * @param operatorName
+     * @param operatorMobile
+     * @return
+     */
+    @Override
+    public PageData<LogOperationResultDTO> page(String customerId, String startTime, String endTime, String operatorName, String operatorMobile,
+                                                Integer pageNo, Integer pageSize, String category, TokenDto tokenDto) {
+        CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), tokenDto.getUserId());
+        if (null == staffInfo){
+            throw new EpmetException("未查询工作人员信息："+tokenDto.getUserId());
+        }
+        // 列表/导出查询
+        PageHelper.startPage(pageNo, pageSize);
+        List<LogOperationResultDTO> list = logOperationDao.pageList(customerId, startTime, endTime, operatorName, operatorMobile,category,staffInfo.getAgencyId());
+        PageInfo<LogOperationResultDTO> pageInfo = new PageInfo<>(list);
+        return new PageData<>(list, pageInfo.getTotal());
+    }
+
+    /**
+     * Desc: 补全 log_operation 表的 org_id 和 org_id_path
+     * @param
+     * @author zxc
+     * @date 2022/10/20 13:50
+     */
+    @Override
+    public void complementLogOperation() {
+        Integer no = NumConstant.ONE;
+        Integer size;
+        do {
+            PageInfo<Map<String,String>> pageInfo = PageHelper.startPage(no, NumConstant.ONE_HUNDRED).doSelectPageInfo(() -> logOperationDao.getStaffId());
+            size = pageInfo.getList().size();
+            if (!CollectionUtils.isEmpty(pageInfo.getList())){
+                List<ComplementLogOperationDTO> needUpdate = new ArrayList<>();
+                for (Map<String, String> m : pageInfo.getList()) {
+                    CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(m.get("CUSTOMER_ID"), m.get("OPERATOR_ID"));
+                    if (null == staffInfo){
+                        logger.warn("未查询到工作人员信息"+m.get("OPERATOR_ID"));
+                        continue;
+                    }
+                    ComplementLogOperationDTO dto = new ComplementLogOperationDTO();
+                    dto.setStaffId(staffInfo.getStaffId());
+                    dto.setOrgId(staffInfo.getAgencyId());
+                    dto.setOrgIdPath(StringUtils.isBlank(staffInfo.getAgencyPIds()) ? staffInfo.getAgencyId() : staffInfo.getAgencyPIds().concat(":").concat(staffInfo.getAgencyId()));
+                    needUpdate.add(dto);
+                }
+                if (!CollectionUtils.isEmpty(needUpdate)){
+                    updateLog(needUpdate);
+                }
+            }
+            no++;
+        }while (size == NumConstant.ONE_HUNDRED);
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    public void updateLog(List<ComplementLogOperationDTO> list){
+        logOperationDao.updateBatchLog(list);
+    }
 }

epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.24__alter_log_operation.sql

@@ -0,0 +1,2 @@
+
+ALTER TABLE log_operation MODIFY COLUMN CATEGORY varchar(64) not null COMMENT '操作类型大类。例如login和logout都属于login大类。项目立项，项目流转，项目结案都属于项目大类；data_tm:数据脱敏；';

epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.25__alter_log_operation2.sql

@@ -0,0 +1,3 @@
+
+alter table log_operation add COLUMN ORG_ID VARCHAR(32) comment '组织ID' AFTER ID;
+alter table log_operation add COLUMN ORG_ID_PATH VARCHAR(255) comment '组织ID全路径，包括组织ID' AFTER ORG_ID;

epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.26__alter_dict.sql

@@ -0,0 +1,30 @@
+
+-- 相成的
+INSERT INTO `epmet_admin`.`sys_dict_type` (`id`, `dict_type`, `dict_name`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1587017193115787265', 'dangerAreaLevel', '风险地区级别', '', 0, 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2022-10-31 17:42:39', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2022-10-31 17:42:39');
+INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1587017335055228929', 1587017193115787265, '低风险', '0', '0', '', 0, 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2022-10-31 17:43:13', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2022-10-31 17:43:13');
+INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1587017381859467265', 1587017193115787265, '中风险', '1', '0', '', 1, 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2022-10-31 17:43:24', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2022-10-31 17:43:24');
+INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1587017428642734082', 1587017193115787265, '高风险', '2', '0', '', 2, 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2022-10-31 17:43:35', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2022-10-31 17:43:35');
+
+
+
+
+
+-- 字典表新增数据【自己的】
+INSERT INTO `epmet_admin`.`sys_dict_type` (`id`, `dict_type`, `dict_name`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('2100000000000000001', 'traffic_type', '交通方式', '交通方式【行程上报】', '36', '0', '0', 'APP_USER', '2022-10-31 18:23:27', 'APP_USER', '2022-10-31 18:23:27');
+INSERT INTO `epmet_admin`.`sys_dict_type` (`id`, `dict_type`, `dict_name`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('2100000000000000002', 'sojourn_history', '7天内旅居史情况', '7天内旅居史情况【行程上报】', '37', '0', '0', 'APP_USER', '2022-10-31 18:23:27', 'APP_USER', '2022-10-31 18:23:27');
+INSERT INTO `epmet_admin`.`sys_dict_type` (`id`, `dict_type`, `dict_name`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('2100000000000000004', 'trip_data_type', '行程记录类型', '行程记录类型【行程上报】', '39', '0', '0', 'APP_USER', '2022-10-31 18:23:27', 'APP_USER', '2022-10-31 18:23:27');
+
+
+INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('5100000000000000001', '2100000000000000001', '飞机', '1', '0', '', '0', '0', '0', 'APP_USER', '2022-10-31 18:23:27', 'APP_USER', '2022-10-31 18:23:27');
+INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('5100000000000000002', '2100000000000000001', '动车', '2', '0', '', '0', '0', '0', 'APP_USER', '2022-10-31 18:23:27', 'APP_USER', '2022-10-31 18:23:27');
+INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('5100000000000000003', '2100000000000000001', '火车', '3', '0', '', '0', '0', '0', 'APP_USER', '2022-10-31 18:23:27', 'APP_USER', '2022-10-31 18:23:27');
+INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('5100000000000000004', '2100000000000000001', '自驾', '4', '0', '', '0', '0', '0', 'APP_USER', '2022-10-31 18:23:27', 'APP_USER', '2022-10-31 18:23:27');
+INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('5100000000000000005', '2100000000000000001', '其他', '5', '0', '', '0', '0', '0', 'APP_USER', '2022-10-31 18:23:27', 'APP_USER', '2022-10-31 18:23:27');
+INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('5200000000000000001', '2100000000000000002', '高风险', '2', '0', '', '0', '0', '0', 'APP_USER', '2022-10-31 18:23:27', 'APP_USER', '2022-10-31 18:23:27');
+INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('5200000000000000002', '2100000000000000002', '中风险', '1', '0', '', '0', '0', '0', 'APP_USER', '2022-10-31 18:23:27', 'APP_USER', '2022-10-31 18:23:27');
+INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('5200000000000000003', '2100000000000000002', '低风险', '0', '0', '', '0', '0', '0', 'APP_USER', '2022-10-31 18:23:27', 'APP_USER', '2022-10-31 18:23:27');
+INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('5200000000000000004', '2100000000000000002', '无风险', '3', '0', '', '0', '0', '0', 'APP_USER', '2022-10-31 18:23:27', 'APP_USER', '2022-10-31 18:23:27');
+INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('5400000000000000001', '2100000000000000004', '省内', '1', '0', '', '0', '0', '0', 'APP_USER', '2022-10-31 18:23:27', 'APP_USER', '2022-10-31 18:23:27');
+INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('5400000000000000002', '2100000000000000004', '省外', '2', '0', '', '0', '0', '0', 'APP_USER', '2022-10-31 18:23:27', 'APP_USER', '2022-10-31 18:23:27');
+INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('5400000000000000003', '2100000000000000004', '市内', '3', '0', '', '0', '0', '0', 'APP_USER', '2022-10-31 18:23:27', 'APP_USER', '2022-10-31 18:23:27');
+INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('5400000000000000004', '2100000000000000004', '县内', '4', '0', '', '0', '0', '0', 'APP_USER', '2022-10-31 18:23:27', 'APP_USER', '2022-10-31 18:23:27');

epmet-admin/epmet-admin-server/src/main/resources/mapper/LogOperationDao.xml

@@ -26,5 +26,67 @@
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
 
+    <update id="updateBatchLog">
+        update log_operation
+        <trim prefix="set" suffixOverrides=",">
+            <trim prefix="ORG_ID =(case" suffix="end),">
+                <foreach collection="list" item="item">
+                    when OPERATOR_ID = #{item.staffId} then #{item.orgId}
+                </foreach>
+            </trim>
+            <trim prefix="ORG_ID_PATH =(case" suffix="end),">
+                <foreach collection="list" item="item">
+                    when OPERATOR_ID = #{item.staffId} then #{item.orgIdPath}
+                </foreach>
+            </trim>
+            UPDATED_TIME = NOW()
+        </trim>
+        where 1=1
+        <foreach collection="list" item="item" open="AND( " separator=" OR " index="index" close=")">
+            OPERATOR_ID = #{item.staffId}
+        </foreach>
+    </update>
 
+    <select id="pageList" parameterType="map" resultType="com.epmet.dto.region.LogOperationResultDTO">
+        SELECT
+            lo.CATEGORY as category,
+            lo.TYPE as type,
+            lo.TYPE_DISPLAY as typeDisplay,
+            lo.CONTENT as content,
+            lo.TARGET_ID as targetId,
+            lo.CUSTOMER_ID as customerId,
+            lo.OPERATOR_ID as operatorId,
+            lo.OPERATOR_NAME as operatorName,
+            lo.OPERATOR_MOBILE as operatorMobile,
+            lo.OPERATING_TIME as operateTime
+        FROM
+            log_operation lo
+        WHERE
+            lo.del_flag = '0'
+            AND lo.CUSTOMER_ID = #{customerId}
+            AND lo.ORG_ID_PATH LIKE concat('%',#{agencyId},'%')
+        <if test="category != null and category != ''">
+            AND lo.CATEGORY = #{category}
+        </if>
+        <if test="operatorName != null and operatorName != ''">
+            AND lo.OPERATOR_NAME LIKE concat('%',#{operatorName},'%')
+        </if>
+        <if test="operatorMobile != null and operatorMobile != ''">
+            AND lo.OPERATOR_MOBILE LIKE concat('%',#{operatorMobile},'%')
+        </if>
+        <if test="startTime != null and startTime != ''">
+            AND DATE_FORMAT( lo.OPERATING_TIME, '%Y%m%d' ) &gt;= #{startTime}
+        </if>
+        <if test="endTime != null and endTime != ''">
+            AND DATE_FORMAT( lo.OPERATING_TIME, '%Y%m%d' ) &lt;= #{endTime}
+        </if>
+        ORDER BY lo.OPERATING_TIME DESC
+    </select>
+    <select id="getStaffId" resultType="java.util.Map">
+        SELECT
+            OPERATOR_ID,
+            CUSTOMER_ID
+        FROM log_operation
+        GROUP BY OPERATOR_ID
+    </select>
 </mapper>

epmet-auth/src/main/java/com/epmet/controller/ThirdLoginController.java

@@ -9,10 +9,7 @@ import com.epmet.dto.result.UserTokenResultDTO;
 import com.epmet.service.ThirdLoginService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
@@ -219,4 +216,16 @@ public class ThirdLoginController {
         ValidatorUtils.validateEntity(formDTO);
         return new Result<UserTokenResultDTO>().ok(thirdLoginService.govLoginInternalDing(formDTO));
     }
+
+    /**
+     * 根据免登授权码, 获取登录用户身份
+     *
+     * @param authCode 烟台认证中心 授权码
+     * @return
+     */
+    @PostMapping("sso-govlogin-yantai/{authCode}")
+    public Result<UserTokenResultDTO> yantaiSSOLogin(@PathVariable(value = "authCode") String authCode) {
+        return new Result<UserTokenResultDTO>().ok(thirdLoginService.yanTaiSSOLogin(authCode));
+    }
+
 }

epmet-auth/src/main/java/com/epmet/dto/result/ResiDingAppLoginResDTO.java

@@ -38,5 +38,7 @@ public class ResiDingAppLoginResDTO {
      * false:未注册
      */
     private Boolean regFlag;
+
+    private String realName;
 }
 

epmet-auth/src/main/java/com/epmet/service/ThirdLoginService.java

@@ -117,4 +117,11 @@ public interface ThirdLoginService {
 	 * @return
 	 */
 	UserTokenResultDTO govLoginInternalDing(DingAppLoginMdFormDTO formDTO);
+
+	/**
+	 * desc:烟台sso根据authCode 获取本系统token
+	 * @param authCode
+	 * @return
+	 */
+	UserTokenResultDTO yanTaiSSOLogin(String authCode);
 }

epmet-auth/src/main/java/com/epmet/service/impl/GovWebServiceImpl.java

@@ -95,6 +95,7 @@ public class GovWebServiceImpl implements GovWebService, ResultDataResolver {
 
         //5.生成token存到redis并返回
         UserTokenResultDTO userTokenResultDTO = new UserTokenResultDTO();
+        userTokenResultDTO.setCustomerId(formDTO.getCustomerId());
         userTokenResultDTO.setToken(this.packagingUserToken(formDTO, resultDTO.getUserId()));
         return userTokenResultDTO;
 

epmet-auth/src/main/java/com/epmet/service/impl/IcLoginServiceImpl.java

@@ -5,11 +5,14 @@ import com.epmet.auth.constants.AuthOperationConstants;
 import com.epmet.commons.rocketmq.messages.LoginMQMsg;
 import com.epmet.commons.tools.constant.AppClientConstant;
 import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
+import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.feign.ResultDataResolver;
 import com.epmet.commons.tools.redis.RedisKeys;
 import com.epmet.commons.tools.redis.RedisUtils;
+import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
 import com.epmet.commons.tools.security.dto.IcTokenDto;
 import com.epmet.commons.tools.utils.CpUserDetailRedis;
 import com.epmet.commons.tools.utils.IpUtils;
@@ -23,6 +26,7 @@ import com.epmet.jwt.JwtTokenProperties;
 import com.epmet.jwt.JwtTokenUtils;
 import com.epmet.service.IcLoginService;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.web.context.request.RequestContextHolder;
@@ -115,14 +119,12 @@ public class IcLoginServiceImpl implements IcLoginService, ResultDataResolver {
      */
     private void sendLoginEvent(String userId, String fromApp, String fromClient) {
         HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
-
         LoginMQMsg loginMQMsg = new LoginMQMsg();
         loginMQMsg.setUserId(userId);
         loginMQMsg.setLoginTime(new Date());
         loginMQMsg.setIp(IpUtils.getIpAddr(request));
         loginMQMsg.setFromApp(fromApp);
         loginMQMsg.setFromClient(fromClient);
-
         SystemMsgFormDTO form = new SystemMsgFormDTO();
         form.setMessageType(AuthOperationConstants.LOGIN);
         form.setContent(loginMQMsg);

epmet-auth/src/main/java/com/epmet/service/impl/LoginServiceImpl.java

@@ -6,8 +6,10 @@ import cn.binarywang.wx.miniapp.bean.WxMaPhoneNumberInfo;
 import cn.binarywang.wx.miniapp.bean.WxMaUserInfo;
 import com.alibaba.fastjson.JSON;
 import com.epmet.common.token.constant.LoginConstant;
+import com.epmet.commons.tools.constant.AppClientConstant;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
+import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.security.password.PasswordUtils;
 import com.epmet.commons.tools.utils.CpUserDetailRedis;
@@ -130,13 +132,13 @@ public class LoginServiceImpl implements LoginService {
 				}
 			}
 		} catch (WxErrorException e) {
-			log.error("->[getMaOpenId]::error[{}]", "解析微信code失败",e);
+			log.warn("->[getMaOpenId]::error[{}]", "解析微信code失败",e);
 		}
 		if (null == wxMaJscode2SessionResult) {
-			log.error(String.format("解析微信用户信息失败,app[%s],wxCode[%s],result:[%S]",app,wxCode, JSON.toJSONString(wxMaJscode2SessionResult)));
+			log.warn(String.format("解析微信用户信息失败,app[%s],wxCode[%s],result:[%S]",app,wxCode, JSON.toJSONString(wxMaJscode2SessionResult)));
 			throw new RenException("解析微信用户信息失败");
 		} else if (StringUtils.isBlank(wxMaJscode2SessionResult.getOpenid())) {
-			log.error(String.format("获取微信openid失败,app[%s],wxCode[%s]",app,wxCode));
+			log.warn(String.format("获取微信openid失败,app[%s],wxCode[%s]",app,wxCode));
 			throw new RenException("获取微信openid失败");
 		}
 		return wxMaJscode2SessionResult;
@@ -366,6 +368,10 @@ public class LoginServiceImpl implements LoginService {
 		} else {
 			logger.error(String.format("运营人员%s退出成功,清空菜单和权限redis异常", tokenDto.getUserId()));
 		}
+		//如果是工作端退出，删除当前工作人员缓存
+		if(AppClientConstant.APP_GOV.equals(tokenDto.getApp())){
+			CustomerStaffRedis.delStaffInfoFormCache(tokenDto.getCustomerId(),tokenDto.getUserId());
+		}
 		return new Result();
 	}
 

epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java

@@ -12,6 +12,7 @@ import com.epmet.commons.rocketmq.messages.LoginMQMsg;
 import com.epmet.commons.tools.constant.AppClientConstant;
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.constant.StrConstant;
+import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
 import com.epmet.commons.tools.enums.EnvEnum;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.EpmetException;
@@ -21,12 +22,15 @@ import com.epmet.commons.tools.feign.ResultDataResolver;
 import com.epmet.commons.tools.redis.RedisKeys;
 import com.epmet.commons.tools.redis.RedisUtils;
 import com.epmet.commons.tools.redis.common.CustomerDingDingRedis;
+import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
 import com.epmet.commons.tools.redis.common.bean.DingMiniInfoCache;
 import com.epmet.commons.tools.security.dto.GovTokenDto;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.security.password.PasswordUtils;
 import com.epmet.commons.tools.security.user.LoginUserUtil;
 import com.epmet.commons.tools.utils.*;
+import com.epmet.commons.tools.utils.api.yt.YantaiApi;
+import com.epmet.commons.tools.utils.api.yt.YantaiSSOUser;
 import com.epmet.commons.tools.validator.PhoneValidatorUtils;
 import com.epmet.constant.AuthHttpUrlConstant;
 import com.epmet.constant.SmsTemplateConstant;
@@ -35,10 +39,7 @@ import com.epmet.dto.dingres.DingUserDetailDTO;
 import com.epmet.dto.dingres.V2UserGetuserinfoResDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
-import com.epmet.feign.EpmetMessageOpenFeignClient;
+import com.epmet.feign.*;
-import com.epmet.feign.EpmetUserFeignClient;
-import com.epmet.feign.EpmetUserOpenFeignClient;
-import com.epmet.feign.GovOrgOpenFeignClient;
 import com.epmet.jwt.JwtTokenProperties;
 import com.epmet.jwt.JwtTokenUtils;
 import com.epmet.redis.CaptchaRedis;
@@ -100,6 +101,8 @@ public class ThirdLoginServiceImpl implements ThirdLoginService, ResultDataResol
     private EpmetUserFeignClient epmetUserFeignClient;
     @Autowired
     private GovWebService govWebService;
+    @Autowired
+    private ThirdOpenFeignClient thirdOpenFeignClient;
 
     /**
      * @param formDTO
@@ -888,7 +891,6 @@ public class ThirdLoginServiceImpl implements ThirdLoginService, ResultDataResol
         loginMQMsg.setIp(IpUtils.getIpAddr(request));
         loginMQMsg.setFromApp(fromApp);
         loginMQMsg.setFromClient(fromClient);
-
         SystemMsgFormDTO form = new SystemMsgFormDTO();
         form.setMessageType(AuthOperationConstants.LOGIN);
         form.setContent(loginMQMsg);
@@ -1087,14 +1089,13 @@ public class ThirdLoginServiceImpl implements ThirdLoginService, ResultDataResol
     public ResiDingAppLoginResDTO resiLoginInternalDing(DingAppLoginMdFormDTO formDTO) {
         // 获取用户手机号
         log.info("1、钉钉居民端应用登录入参:" + JSON.toJSONString(formDTO));
-        ResiDingAppLoginResDTO resDTO = null;
+        ResiDingAppLoginResDTO resDTO =  new ResiDingAppLoginResDTO();
-        resDTO = new ResiDingAppLoginResDTO();
         resDTO.setCustomerId(getCurrentCustomerId());
 
         // 1、获取用户手机号
         DingLoginResiFormDTO dingLoginResiFormDTO = getDingLoginResiFormDTOInternal(formDTO.getMiniAppId(), formDTO.getAuthCode());
         dingLoginResiFormDTO.setCustomerId(resDTO.getCustomerId());
-
+        resDTO.setRealName(dingLoginResiFormDTO.getNick());
         // 2、调用userfeign接口获取userId、注册网格相关信息
         Result<DingLoginResiResDTO> loginResiResDTOResult = epmetUserOpenFeignClient.dingResiLogin(dingLoginResiFormDTO);
         if (!loginResiResDTOResult.success() || null == loginResiResDTOResult.getData()) {
@@ -1136,6 +1137,20 @@ public class ThirdLoginServiceImpl implements ThirdLoginService, ResultDataResol
         return govWebService.loginByThirdPlatform(loginGovParam);
     }
 
+    @Override
+    public UserTokenResultDTO yanTaiSSOLogin(String authCode) {
+        YantaiSSOUser ssoUserInfo = YantaiApi.getLoginToken(authCode);
+        if (ssoUserInfo== null){
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"登录失败-sso获取用户失败","登录失败-sso获取用户失败");
+        }
+
+        GovWebLoginFormDTO loginGovParam = new GovWebLoginFormDTO();
+        loginGovParam.setCustomerId("1535072605621841922");
+        loginGovParam.setPhone(ssoUserInfo.getMobile());
+
+        return govWebService.loginByThirdPlatform(loginGovParam);
+    }
+
     /**
      * 最原始的企业内部应用开发，不授权给产品服务商
      * @param miniAppId

epmet-cloud-generator/src/main/resources/template/Controller.java.vm

@@ -2,7 +2,6 @@ package ${package}.controller;
 
 import ${main}.commons.tools.aop.NoRepeatSubmit;
 import ${main}.commons.tools.page.PageData;
-import ${main}.commons.tools.utils.ExcelUtils;
 import ${main}.commons.tools.utils.Result;
 import ${main}.commons.tools.validator.AssertUtils;
 import ${main}.commons.tools.validator.ValidatorUtils;
@@ -10,7 +9,6 @@ import ${main}.commons.tools.validator.group.AddGroup;
 import ${main}.commons.tools.validator.group.UpdateGroup;
 import ${main}.commons.tools.validator.group.DefaultGroup;
 import ${package}.dto.${className}DTO;
-import ${package}.excel.${className}Excel;
 import ${package}.service.${className}Service;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -71,12 +69,4 @@ public class ${className}Controller {
         return new Result();
     }
 
-    @GetMapping("export")
-    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
-        List<${className}DTO> list = ${classname}Service.list(params);
-        ExcelUtils.exportExcelToTarget(response, null, list, ${className}Excel.class);
-    }
-
-
-
 }

epmet-cloud-generator/src/main/resources/template/ServiceImpl.java.vm

@@ -9,7 +9,6 @@ import ${package}.commons.tools.constant.FieldConstant;
 import ${package}.dao.${className}Dao;
 import ${package}.dto.${className}DTO;
 import ${package}.entity.${className}Entity;
-import ${package}.redis.${className}Redis;
 import ${package}.service.${className}Service;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -29,9 +28,6 @@ import java.util.Map;
 @Service
 public class ${className}ServiceImpl extends BaseServiceImpl<${className}Dao, ${className}Entity> implements ${className}Service {
 
-    @Autowired
-    private ${className}Redis ${classname}Redis;
-
     @Override
     public PageData<${className}DTO> page(Map<String, Object> params) {
         IPage<${className}Entity> page = baseDao.selectPage(

epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/constants/ConsomerGroupConstants.java

@@ -108,4 +108,9 @@ public interface ConsomerGroupConstants {
      * 党建积分操作消费组
      */
     String PARTY_BUILDING_GROUP = "party_building_group";
+
+    /**
+     * 查看或者导出 日志记录 消费组
+     */
+    String CHECK_OR_EXPORT_GROUP = "check_or_export_group";
 }

epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/constants/TopicConstants.java

@@ -91,4 +91,9 @@ public interface TopicConstants {
     String IC_MESSAGE = "ic_message";
 
     String PARTY_BUILDING = "party_building";
+
+    /**
+     * 查看或者导出 日志记录
+     */
+    String CHECK_OR_EXPORT = "check_or_export";
 }

epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/CheckMQMsg.java

@@ -0,0 +1,33 @@
+package com.epmet.commons.rocketmq.messages;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class CheckMQMsg {
+
+    /**
+     * 谁登录
+     */
+    private String userId;
+
+    private String content;
+
+    private String typeDisplay;
+    private String type;
+
+    /**
+     * 操作时间
+     */
+    private Date operateTime;
+
+    private String ip;
+
+    private String fromApp;
+
+    private String fromClient;
+    private String orgId;
+    private String orgIdPath;
+
+}

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/StrConstant.java

@@ -13,6 +13,8 @@ import org.springframework.http.MediaType;
 public interface StrConstant {
 
     String UTF_8 = CharEncoding.UTF_8;
+    String HTTP_STATUS_OK = "200";
+    String HTTP_RESP_CODE = "code";
 
     String ISO_8859_1 = CharEncoding.ISO_8859_1;
 
@@ -97,6 +99,8 @@ public interface StrConstant {
     String PY_CUSTOMER = "6f203e30de1a65aab7e69c058826cd80";
     //平音客户跟组织Id
     String PY_ROOT_AGENCY = "53613e1c5de6ed473467f0159a10b135";
+    //磐石街道客户Id
+    String PS_CUSTOMER_ID = "1580460084738760705";
 
     /**
      * 单位积分,积分上限，积分说明，积分事件

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/commondto/IcEventComDTO.java

@@ -0,0 +1,38 @@
+package com.epmet.commons.tools.dto.commondto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description
+ * @Author yzm
+ * @Date 2022/10/11 13:08
+ */
+@Data
+public class IcEventComDTO implements Serializable {
+    private static final long serialVersionUID = -5166489408303997740L;
+    /**
+     * 事件Id
+     */
+    private String icEventId;
+    /**
+     * 事件内容
+     */
+    private String eventContent;
+    /**
+     * 处理中：processing；已办结：closed_case
+     */
+    private String status;
+
+    /**
+     * 0:已回复 1:已转项目  2:已转需求3:转议题
+     */
+    private String operationType;
+
+    /**
+     * 项目、需求ID、议题id
+     */
+    private String operationId;
+}
+

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/commondto/TopicInfoComDTO.java

@@ -0,0 +1,65 @@
+package com.epmet.commons.tools.dto.commondto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description
+ * @Author yzm
+ * @Date 2022/10/11 13:06
+ */
+@Data
+public class TopicInfoComDTO implements Serializable {
+    private static final long serialVersionUID = 4242861917113716511L;
+    /**
+     * 话题id
+     */
+    private String topicId;
+
+    /**
+     * 话题内容
+     */
+    private String topicContent;
+
+    /**
+     * 图片列表
+     */
+    private List<String> topicImgs;
+
+    /**
+     * 话题语音-2022.10.10
+     */
+    private List<String> topicVoices;
+
+    /**
+     * 话题发表人（山东路168-尹女士）
+     */
+    private String publishedUser;
+
+    /**
+     * 话题发表时间 (时间戳 毫秒级)
+     */
+    private Long publishedTime;
+
+
+    private String releaseTime;
+
+    /**
+     * 小组类型(ordinary:楼院小组  branch:支部小组)
+     */
+    private String groupType;
+
+    /**
+     * 话题所属小组id
+     */
+    private String groupId;
+
+    /**
+     * 话题所属小组名称
+     */
+    private String groupName;
+
+}
+

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/YtDataSyncResDTO.java

@@ -0,0 +1,28 @@
+package com.epmet.commons.tools.dto.result;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+
+/**
+ * @Description
+ * @Author yzm
+ * @Date 2022/9/26 17:04
+ */
+@NoArgsConstructor
+@Data
+public class YtDataSyncResDTO {
+    private int code = 200;
+    private String msg = "请求成功";
+    /**
+     * 响应数据
+     */
+    private String data;
+    private int total;
+
+    public YtDataSyncResDTO(int code, String msg, String data) {
+        this.code = code;
+        this.msg = msg;
+        this.data = data;
+    }
+}

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/YtHscyResDTO.java

@@ -0,0 +1,80 @@
+package com.epmet.commons.tools.dto.result;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+
+/**
+ * @Description 核算采样结果
+ * @Author yzm
+ * @Date 2022/9/26 17:04
+ */
+@NoArgsConstructor
+@Data
+public class YtHscyResDTO {
+    private int code = 200;
+    private String msg = "请求成功";
+    /**
+     * 响应数据
+     */
+    private List<YtHscyResDetail> data;
+    private int total;
+
+    @Data
+    public static class YtHscyResDetail {
+        private String id;
+        private String name;
+        private String card_type;
+        private String card_no;
+        private String create_by;
+        /**
+         * 采样时间
+         */
+        private String create_time;
+        private String sys_org_code;
+        private String sample_tube;
+        private String package_id;
+        private String city;
+        private String uuid;
+        private String county;
+        private String depart_ids;
+        private Object depart_name;
+        /**
+         * 采样点名称
+         */
+        private String realname;
+        private String upload_time;
+        private Object sd_id;
+        private Object sd_batch;
+        private Object sd_operation;
+        private Object sd_time;
+        private String inserttime;
+    }
+
+    /*{
+                    "id":"1570924677539635484",
+                     "name":"杨XX",//姓名
+                    "card_type":"1",//证件类型
+                    "card_no":"37************0813",//证件号码
+                    "create_by":"370613594",//采样点账号
+                    "create_time":"2022-09-17 07:15:22",//采样时间
+                    "sys_org_code":"370613",//部门代码
+                    "sample_tube":"GCJ-0825-0441",//采样管号
+                    "package_id":"bcj00208083952",//采样包号
+                    "city":"烟台市",//城市
+                    "uuid":"6225684525062602095",//
+                    "county":"莱山区",//区县
+                    "depart_ids":"未填写",//街道
+                    "depart_name":null,//部门名称
+                    "realname":"采样点327",//采样点名称
+                    "upload_time":"2022-09-17 07:56:45",//自增时间戳
+                    "sd_id":null,
+                    "sd_batch":null,
+                    "sd_operation":null,
+                    "sd_time":null,
+                    "inserttime":"2022-09-17 09:36:20"//省大数据局返还烟台入库时间
+                }*/
+
+}

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/YtHsjcResDTO.java

@@ -6,7 +6,7 @@ import java.util.List;
 
 
 /**
- * @Description
+ * @Description 核酸结果查询
  * @Author yzm
  * @Date 2022/9/26 17:04
  */

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/YtSfhyxxcxdsjjResDTO.java

@@ -0,0 +1,24 @@
+package com.epmet.commons.tools.dto.result;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+
+/**
+ * @Description 根据身份证号和姓名查询公安部备案信息
+ */
+@NoArgsConstructor
+@Data
+public class YtSfhyxxcxdsjjResDTO {
+    private int code = 200;
+    private List<Result> result;
+    @Data
+    public static class Result {
+        //身份证号
+        private String GMSFHM;
+        //姓名
+        private String XM;
+    }
+}

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/DictTypeEnum.java

@@ -29,6 +29,11 @@ public enum DictTypeEnum {
     IC_DANGER_TYPE("ic_danger_type","危化品种类",24),
     POLICY_LEVEL("policy_level","政策级别",25),
     LOG_TYPE("log_type", "日志类型", 33),
+
+    DANGER_AREA_LEVEL_TYPE("dangerAreaLevel", "风险地区等级", 34),
+    TRAFFIC_TYPE("traffic_type", "交通方式", 36),
+    SOJOURN_HISTORY("sojourn_history", "7天内旅居史情况", 37),
+    TRIP_DATA_TYPE("trip_data_type", "行程记录类型", 39),
     ;
 
     private final String code;

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java

@@ -217,6 +217,8 @@ public enum EpmetErrorCode {
 
     CUSTOMER_CATEGORY(9101,"分类已使用，不允许删除"),
     CATEGORY_NAME(9102,"分类名称已存在，不允许重复"),
+    EXIST_SYNC_JOB_ERROR(9103,"存在等待或进行中的任务"),
+    OTHER_SYNC_JOB_ERROR(9104,"同步任务已提交，请稍后查看数据"),
 
 	// open api异常
 	OPEN_API_UNAUTHENTICATED(10100, "请求未认证"),
@@ -263,7 +265,14 @@ public enum EpmetErrorCode {
 	UNIT_EXIST_HOUSES_ERROR(8928,"单元下存在房屋，不可修改单元数"),
 	IC_VACCINE(8929,"已存在相同记录，请去修改原有记录"),
 	NOT_MATCH_IC_USER_ERROR(8930,"请联系社区工作人员"),
+	NAT_TIME_IS_NULL_ERROR(8931,"检测时间不能为空"),
+	NAT_RESULT_IS_NULL_ERROR(8932,"检测结果不能为空"),
+	SAMPLE_TIME_IS_NULL_ERROR(8933,"采样时间不能为空"),
+	SAMPLE_TIME_AND_RESULT_IS_NULL_ERROR(8934,"检测时间或结果不能为空"),
+	ID_CARD_ERROR(8935,"请输入正确的身份证号或护照号"),
 
+
+	DANGER_AREA_ERROR(8937,"风险地区已存在"),
 	MISMATCH(10086,"人员与房屋信息不匹配，请与工作人员联系。"),
 
 	//通用错误码 start

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/CommonUserFeignClient.java

@@ -2,6 +2,7 @@ package com.epmet.commons.tools.feign;
 
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.feign.fallback.CommonUserFeignClientFallBackFactory;
+import com.epmet.commons.tools.redis.common.bean.IcResiUserInfoCache;
 import com.epmet.commons.tools.redis.common.bean.ResiUserInfoCache;
 import com.epmet.commons.tools.utils.Result;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -17,4 +18,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 public interface CommonUserFeignClient {
     @PostMapping("/epmetuser/userbaseinfo/getUserInfo/{userId}")
     Result<ResiUserInfoCache> getUserInfo(@PathVariable("userId") String userId);
+
+    @PostMapping("/epmetuser/icresiuser/getIcResiUserInfo/{userId}")
+    Result<IcResiUserInfoCache> getIcResiUserInfo(@PathVariable("userId") String userId);
 }

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/fallback/CommonUserFeignClientFallback.java

@@ -2,6 +2,7 @@ package com.epmet.commons.tools.feign.fallback;
 
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.feign.CommonUserFeignClient;
+import com.epmet.commons.tools.redis.common.bean.IcResiUserInfoCache;
 import com.epmet.commons.tools.redis.common.bean.ResiUserInfoCache;
 import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
@@ -20,4 +21,9 @@ public class CommonUserFeignClientFallback implements CommonUserFeignClient {
     public Result<ResiUserInfoCache> getUserInfo(String userId) {
         return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getUserInfo", userId);
     }
+
+    @Override
+    public Result<IcResiUserInfoCache> getIcResiUserInfo(String userId) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getIcResiUserInfo", userId);
+    }
 }

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/filter/LogMsgSendFilter.java

@@ -49,6 +49,10 @@ public class LogMsgSendFilter extends LevelFilter {
         //如果日志级别等于设置的日志级别 则发送消息
         if (event.getLevel().isGreaterOrEqual(Level.ERROR)) {
             try {
+                //排除其他包路径的东西
+                if (!event.getLoggerName().startsWith(baseProjectPackage)){
+                    return super.decide(event);
+                }
                 getServerInfo();
                 if (EnvEnum.LOCAL.getName().equals(activeEnv)){
                     //交给其他filter继续向下处理

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/processor/MaskProcessor.java

@@ -15,7 +15,6 @@ import java.lang.reflect.Field;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
-import java.util.regex.Pattern;
 
 /**
  * desc:脱敏处理器
@@ -83,6 +82,9 @@ public class MaskProcessor {
                     String maskResult = maskString((String) value, fieldsMaskType.get(index));
                     entry.setValue(maskResult);
                 }
+            } else if (value instanceof List) {
+                // 列表
+                ((List)value).forEach(e -> mask(e));
             }
         }
     }
@@ -155,10 +157,12 @@ public class MaskProcessor {
         // 2个字以上的，首位字母明文，中间*
         // 中文不能用\\w，要用[\u4e00-\u9fa5]
         if (length == 2) {
-            return originString.replaceAll("^([\\u4e00-\\u9fa5]).*$", "$1*");
+//            return originString.replaceAll("^([\\u4e00-\\u9fa5]).*$", "$1*");
+            return originString.substring(0).concat("*");
         } else {
             String maskStr = StrUtil.repeat("*", length - 2);
-            return originString.replaceAll("^([\\u4e00-\\u9fa5]).*([\\u4e00-\\u9fa5])$", "$1" + maskStr + "$2");
+//            return originString.replaceAll("^([\\u4e00-\\u9fa5]).*([\\u4e00-\\u9fa5])$", "$1" + maskStr + "$2");
+            return originString.charAt(0) + maskStr + originString.charAt(originString.length() - 1);
         }
     }
 
@@ -168,7 +172,7 @@ public class MaskProcessor {
      * @param originString
      * @return
      */
-    private String maskIdCard(String originString) {
+    public static String maskIdCard(String originString) {
 
         IdCardRegexUtils regexUtil = IdCardRegexUtils.parse(originString);
         if (regexUtil == null) {
@@ -209,14 +213,18 @@ public class MaskProcessor {
         }
 
         String maskStr = StrUtil.repeatByLength("*", length - 7);
-
+        if (length != 11) {
+            return StringUtils.leftPad(StringUtils.right(originString, 4), length, "*");
+        }
         return originString.replaceAll("^(1\\d{2})\\d*(\\d{4})$", new StringBuilder("$1").append(maskStr).append("$2").toString());
     }
 
     public static void main(String[] args) {
         String[] idc = {"idCard"};
         String[] idct = {MaskResponse.MASK_TYPE_ID_CARD};
-        String r = new MaskProcessor(idc, idct).maskString("333333333333333333", MaskResponse.MASK_TYPE_ID_CARD);
+        String r = new MaskProcessor(idc, idct).maskString("王五(372284152412022222)", MaskResponse.MASK_TYPE_ID_CARD);
         System.out.println(r);
+        String s = MaskProcessor.maskIdCard("372284152412022222");
+        System.out.println(s);
     }
 }

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java

@@ -393,6 +393,10 @@ public class RedisKeys {
 		return rootPrefix.concat("resi:user:").concat(userId);
 	}
 
+	public static String getIcResiUserKey(String userId) {
+		return rootPrefix.concat("resi:icResiUser:").concat(userId);
+	}
+
 	/**
 	 * @param userId
 	 * @return epmet:badge:user:[customerId]:[userId]
@@ -533,6 +537,14 @@ public class RedisKeys {
 		return rootPrefix.concat("gov:staff:").concat(customerId).concat(StrConstant.COLON).concat(staffId);
 	}
 
+	public static String getCustomerAllStaffInfoKey(String customerId) {
+		return rootPrefix.concat("gov:allCustomerStaff:").concat(customerId).concat(StrConstant.COLON).concat("*");
+	}
+
+	public static String getCustomerStaffInfoKeyByMobile(String customerId,String mobile) {
+		return rootPrefix.concat("gov:allCustomerStaff:").concat(customerId).concat(StrConstant.COLON).concat(mobile);
+	}
+
 	/**
 	 * @description 网格信息
 	 *

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/CustomerOrgRedis.java

@@ -1,7 +1,6 @@
 package com.epmet.commons.tools.redis.common;
 
 import cn.hutool.core.bean.BeanUtil;
-import com.alibaba.fastjson.JSON;
 import com.epmet.commons.tools.dto.form.CustomerGridFormDTO;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.feign.CommonAggFeignClient;
@@ -13,6 +12,7 @@ import com.epmet.commons.tools.redis.common.bean.GridInfoCache;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;
@@ -55,9 +55,12 @@ public class CustomerOrgRedis {
      * @date 2021/11/5 3:12 下午
      */
     public static GridInfoCache getGridInfo(String gridId){
+        if (StringUtils.isBlank(gridId)) {
+            log.warn("查询网格缓存,gridId is null");
+            return null;
+        }
         String key = RedisKeys.getGridInfoKey(gridId);
         Map<String, Object> grid = customerOrgRedis.redisUtils.hGetAll(key);
-        log.info("grid is {}", JSON.toJSONString(grid));
         if (!CollectionUtils.isEmpty(grid)) {
             return ConvertUtils.mapToEntity(grid, GridInfoCache.class);
         }
@@ -111,4 +114,36 @@ public class CustomerOrgRedis {
         customerOrgRedis.redisUtils.delete(key);
     }
 
+    /**
+     * 拼接orgIdPath
+     * @param orgId
+     * @param orgType
+     * @return
+     */
+    public static String getOrgIdPath(String orgId, String orgType) {
+        String orgPids = null;
+
+        if ("grid".equals(orgType)) {
+            GridInfoCache gridInfo = getGridInfo(orgId);
+            if (gridInfo == null) {
+                log.error("查询网格信息失败:{}", orgId);
+                return null;
+            }
+            orgPids = gridInfo.getPids();
+        } else if ("agency".equals(orgType)) {
+            AgencyInfoCache agencyInfo = getAgencyInfo(orgId);
+            if (agencyInfo == null) {
+                log.error("查询组织信息失败:{}", orgId);
+                return null;
+            }
+            orgPids = agencyInfo.getPids();
+        }
+
+        if (StringUtils.isBlank(orgPids) || "0".equals(orgPids)) {
+            return orgId;
+        }
+
+        return orgPids.concat(":").concat(orgId);
+    }
+
 }

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/CustomerResiUserRedis.java

@@ -1,10 +1,12 @@
 package com.epmet.commons.tools.redis.common;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.feign.CommonUserFeignClient;
 import com.epmet.commons.tools.redis.RedisKeys;
 import com.epmet.commons.tools.redis.RedisUtils;
+import com.epmet.commons.tools.redis.common.bean.IcResiUserInfoCache;
 import com.epmet.commons.tools.redis.common.bean.ResiUserInfoCache;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
@@ -70,6 +72,31 @@ public class CustomerResiUserRedis {
         return resultData;
     }
 
+    public static IcResiUserInfoCache getIcResiUserInfo(String icResiUserId){
+        if (StringUtils.isBlank(icResiUserId)){
+            log.warn("getIcResiUserInfo param is blank,userId:{}",icResiUserId);
+            return null;
+        }
+        String key = RedisKeys.getIcResiUserKey(icResiUserId);
+        Map<String, Object> map = customerResiUserRedis.redisUtils.hGetAll(key);
+        if (!CollectionUtils.isEmpty(map)) {
+            return ConvertUtils.mapToEntity(map, IcResiUserInfoCache.class);
+        }
+        Result<IcResiUserInfoCache> result = customerResiUserRedis.commonUserFeignClient.getIcResiUserInfo(icResiUserId);
+        if (result == null || !result.success()) {
+            throw new EpmetException("获取居民信息失败");
+        }
+        IcResiUserInfoCache data = result.getData();
+        if (null == data) {
+            log.warn("居民信息为空,userId:{}", icResiUserId);
+            return null;
+        }
+
+        Map<String, Object> cacheMap = BeanUtil.beanToMap(data, false, true);
+        customerResiUserRedis.redisUtils.hMSet(key, cacheMap);
+        return data;
+    }
+
     @Nullable
     private static ResiUserInfoCache reloadStaffCache(String userId, String key) {
         Result<ResiUserInfoCache> result = customerResiUserRedis.commonUserFeignClient.getUserInfo(userId);
@@ -87,4 +114,15 @@ public class CustomerResiUserRedis {
         return resultData;
     }
 
+    /**
+     * Desc: 删除Ic居民缓存
+     * @param icResiUserId
+     * @author zxc
+     * @date 2022/10/20 15:57
+     */
+    public static Boolean delIcResiUserInfo(String icResiUserId){
+        String key = RedisKeys.getIcResiUserKey(icResiUserId);
+        return customerResiUserRedis.redisUtils.delete(key);
+    }
+
 }

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/CustomerStaffRedis.java

@@ -9,6 +9,7 @@ import com.epmet.commons.tools.feign.CommonAggFeignClient;
 import com.epmet.commons.tools.redis.RedisKeys;
 import com.epmet.commons.tools.redis.RedisUtils;
 import com.epmet.commons.tools.redis.common.bean.CustomerStaffInfoCache;
+import com.epmet.commons.tools.redis.common.bean.CustomerStaffInfoDTOCache;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
 import lombok.extern.slf4j.Slf4j;
@@ -138,4 +139,32 @@ public class CustomerStaffRedis {
         return customerStaffRedis.redisUtils.delete(key);
     }
 
+    /**
+     * Desc: 拉取烟台用户时使用。
+     * 根据客户ID 手机号获取工作人员信息，没有返回null
+     * @param customerId
+     * @param mobile
+     * @author zxc
+     * @date 2022/10/19 14:18
+     */
+    public static CustomerStaffInfoDTOCache getStaffInfoByMobile(String customerId, String mobile){
+        String key = RedisKeys.getCustomerStaffInfoKeyByMobile(customerId, mobile);
+        Map<String, Object> roleMap = customerStaffRedis.redisUtils.hGetAll(key);
+        if (!CollectionUtils.isEmpty(roleMap)) {
+            return ConvertUtils.mapToEntity(roleMap, CustomerStaffInfoDTOCache.class);
+        }
+        return null;
+    }
+
+    /**
+     * Desc: 【烟台用】删除所有工作人员信息
+     * @param customerId
+     * @author zxc
+     * @date 2022/10/19 14:28
+     */
+    public static void delAllCustomerStaff(String customerId){
+        String key = RedisKeys.getCustomerAllStaffInfoKey(customerId);
+        customerStaffRedis.redisUtils.deleteByPattern(key);
+    }
+
 }

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/bean/CustomerStaffInfoDTOCache.java

@@ -0,0 +1,133 @@
+package com.epmet.commons.tools.redis.common.bean;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Author zxc
+ * @DateTime 2022/10/19 14:26
+ * @DESC
+ */
+@Data
+public class CustomerStaffInfoDTOCache implements Serializable {
+
+    private static final long serialVersionUID = 6967736754443092229L;
+
+
+    /**
+     * ID
+     */
+    private String id;
+
+    /**
+     * 关联User表的主键Id
+     */
+    private String userId;
+
+    /**
+     * 账户
+     */
+    private String userAccount;
+
+    /**
+     * 真实姓名
+     */
+    private String realName;
+
+    /**
+     * 性别0.未知，1男，2.女
+     */
+    private Integer gender;
+
+    /**
+     * 邮箱
+     */
+    private String email;
+
+    /**
+     * 手机号-唯一键
+     */
+    private String mobile;
+
+    /**
+     * 地址
+     */
+    private String address;
+
+    /**
+     * 删除标识
+     */
+    private Integer delFlag;
+
+    /**
+     * 乐观锁
+     */
+    private Integer revision;
+
+    /**
+     * 创建人
+     */
+    private String createdBy;
+
+    /**
+     * 创建时间
+     */
+    private Date createdTime;
+
+    /**
+     * 更新人
+     */
+    private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+    private Date updatedTime;
+
+    /**
+     * fulltime专职parttime兼职
+     */
+    private String workType;
+
+    /**
+     * 头像
+     */
+    private String headPhoto;
+
+    /**
+     * inactive未激活，active已激活
+     */
+    private String activeFlag;
+
+    /**
+     * 激活时间
+     */
+    private Date activeTime;
+
+    /**
+     * 未禁用enable,已禁用diabled
+     */
+    private String enableFlag;
+
+    /**
+     * 客户id
+     */
+    private String customerId;
+
+    /**
+     * 角色名称
+     */
+    private String roleName;
+
+    /**
+     * 登录密码
+     */
+    private String password;
+
+    /**
+     * 身份证号
+     */
+    private String idCard;
+}

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/bean/HouseInfoCache.java

@@ -107,4 +107,19 @@ public class HouseInfoCache implements Serializable {
      * 二维码地址
      */
     private String houseQrcodeUrl;
+
+    /**
+     * 房主姓名
+     */
+    private String ownerName;
+
+    /**
+     * 房主电话
+     */
+    private String ownerPhone;
+
+    /**
+     * 房主身份证
+     */
+    private String ownerIdCard;
 }

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/bean/IcResiUserInfoCache.java

@@ -0,0 +1,539 @@
+package com.epmet.commons.tools.redis.common.bean;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Author zxc
+ * @DateTime 2022/10/17 15:40
+ * @DESC
+ */
+@Data
+public class IcResiUserInfoCache implements Serializable {
+
+    private static final long serialVersionUID = -3644143706074015380L;
+
+
+    /**
+     * 主键
+     */
+    private String id;
+
+    /**
+     * 客户Id customer.id
+     */
+    private String customerId;
+
+    /**
+     *
+     */
+    private String agencyId;
+
+    /**
+     *
+     */
+    private String pids;
+
+    /**
+     * 网格ID
+     */
+    private String gridId;
+
+    /**
+     * 所属小区ID
+     */
+    private String villageId;
+
+    /**
+     * 所属楼宇Id
+     */
+    private String buildId;
+
+    /**
+     * 单元id
+     */
+    private String unitId;
+
+    /**
+     * 所属家庭Id
+     */
+    private String homeId;
+
+    /**
+     * 是否本地户籍
+     */
+    private String isBdhj;
+
+    /**
+     * 姓名
+     */
+    private String name;
+
+    /**
+     * 手机号
+     */
+    private String mobile;
+
+    /**
+     * 性别
+     */
+    private String gender;
+
+    /**
+     * 身份证号
+     */
+    private String idCard;
+
+    /**
+     * 出生日期
+     */
+    private String birthday;
+
+    /**
+     * 备注
+     */
+    private String remarks;
+
+    /**
+     * 联系人
+     */
+    private String contacts;
+
+    /**
+     * 联系人电话
+     */
+    private String contactsMobile;
+
+    /**
+     * 九小场所url
+     */
+    private String ninePlace;
+
+    /**
+     * 是否党员
+     */
+    private String isParty;
+
+    /**
+     * 是否低保户
+     */
+    private String isDbh;
+
+    /**
+     * 是否保障房
+     */
+    private String isEnsureHouse;
+
+    /**
+     * 是否失业
+     */
+    private String isUnemployed;
+
+    /**
+     * 是否育龄妇女
+     */
+    private String isYlfn;
+
+    /**
+     * 是否退役军人
+     */
+    private String isVeterans;
+
+    /**
+     * 是否统战人员
+     */
+    private String isUnitedFront;
+
+    /**
+     * 是否信访人员
+     */
+    private String isXfry;
+
+    /**
+     * 是否志愿者
+     */
+    private String isVolunteer;
+
+    /**
+     * 是否老年人
+     */
+    private String isOldPeople;
+
+    /**
+     * 是否空巢
+     */
+    private String isKc;
+
+    /**
+     * 是否失独
+     */
+    private String isSd;
+
+    /**
+     * 是否失能
+     */
+    private String isSn;
+
+    /**
+     * 是否失智
+     */
+    private String isSz;
+
+    /**
+     * 是否残疾
+     */
+    private String isCj;
+
+    /**
+     * 是否大病
+     */
+    private String isDb;
+
+    /**
+     * 是否慢病
+     */
+    private String isMb;
+
+    /**
+     * 是否特殊人群
+     */
+    private String isSpecial;
+
+    /**
+     * 是否租户【是:1 否:0】
+     */
+    private String isTenant;
+
+    /**
+     * 是否是流动人口【是:1 否:0】
+     */
+    private String isFloating;
+
+    /**
+     * 是否新阶层人士【是:1 否:0】
+     */
+    private String isXjc;
+
+    /**
+     * 文化程度【字典表】
+     */
+    private String culture;
+
+    /**
+     * 文化程度备注
+     */
+    private String cultureRemakes;
+
+    /**
+     * 特长【字典表】
+     */
+    private String specialSkill;
+
+    /**
+     * 兴趣爱好
+     */
+    private String hobby;
+
+    /**
+     * 兴趣爱好备注
+     */
+    private String hobbyRemakes;
+
+    /**
+     * 宗教信仰
+     */
+    private String faith;
+
+    /**
+     * 宗教信仰备注
+     */
+    private String faithRemakes;
+
+    /**
+     * 残疾类别【字典表】
+     */
+    private String cjlb;
+
+    /**
+     * 残疾登记(状况)【字典表】
+     */
+    private String cjzk;
+
+    /**
+     * 残疾证号
+     */
+    private String cjzh;
+
+    /**
+     * 残疾说明
+     */
+    private String cjsm;
+
+    /**
+     * 有无监护人【yes no】
+     */
+    private String ynJdr;
+
+    /**
+     * 有无技能特长【yes no】
+     */
+    private String ynJntc;
+
+    /**
+     * 有无劳动能力
+     */
+    private String ynLdnl;
+
+    /**
+     * 有无非义务教育阶段助学【yes no】
+     */
+    private String ynFywjyjdzx;
+
+    /**
+     * 所患大病
+     */
+    private String shdb;
+
+    /**
+     * 患大病时间
+     */
+    private String dbsj;
+
+    /**
+     * 所患慢性病
+     */
+    private String shmxb;
+
+    /**
+     * 患慢性病时间
+     */
+    private String mxbsj;
+
+    /**
+     * 是否参保
+     */
+    private String isCb;
+
+    /**
+     * 自付金额
+     */
+    private String zfje;
+
+    /**
+     * 救助金额
+     */
+    private String jzje;
+
+    /**
+     * 救助时间[yyyy-MM-dd]
+     */
+    private String jzsj;
+
+    /**
+     * 享受救助明细序号
+     */
+    private String jzmxxh;
+
+    /**
+     * 健康信息备注
+     */
+    private String healthRemakes;
+
+    /**
+     * 工作单位
+     */
+    private String gzdw;
+
+    /**
+     * 职业
+     */
+    private String zy;
+
+    /**
+     * 离退休时间
+     */
+    private String ltxsj;
+
+    /**
+     * 工作信息备注
+     */
+    private String workRemake;
+
+    /**
+     * 退休金额
+     */
+    private String txje;
+
+    /**
+     * 月收入
+     */
+    private String ysr;
+
+    /**
+     * 是否经济低保
+     */
+    private String isJjdb;
+
+    /**
+     * 籍贯
+     */
+    private String jg;
+
+    /**
+     * 户籍所在地
+     */
+    private String hjszd;
+
+    /**
+     * 现居住地
+     */
+    private String xjzd;
+
+    /**
+     * 人户情况
+     */
+    private String rhzk;
+
+    /**
+     * 居住信息备注
+     */
+    private String jzxxRemakes;
+
+    /**
+     * 民族【字典表】
+     */
+    private String mz;
+
+    /**
+     * 与户主关系【字典表】
+     */
+    private String yhzgx;
+
+    /**
+     * 居住情况【字典表】
+     */
+    private String jzqk;
+
+    /**
+     * 婚姻状况【字典表】
+     */
+    private String hyzk;
+
+    /**
+     * 配偶情况【字典表】
+     */
+    private String poqk;
+
+    /**
+     * 有无赡养人
+     */
+    private String ynSyr;
+
+    /**
+     * 与赡养人关系【字典表】
+     */
+    private String ysyrgx;
+
+    /**
+     * 赡养人电话
+     */
+    private String syrMobile;
+
+    /**
+     * 家庭信息备注
+     */
+    private String jtxxRemakes;
+
+    /**
+     * 用户状态【0:正常;1:迁出;2:注销】
+     */
+    private String status;
+
+    /**
+     * 用户详细状态：01：新增、02：导入、03：迁入、04：新生、11：迁出、21死亡
+     */
+    private String subStatus;
+
+
+    /**
+     * 删除标识 0.未删除 1.已删除
+     */
+    private Integer delFlag;
+
+    /**
+     * 乐观锁
+     */
+    private Integer revision;
+
+    /**
+     * 创建人
+     */
+    private String createdBy;
+
+    /**
+     * 创建时间
+     */
+    private Date createdTime;
+
+    /**
+     * 更新人
+     */
+    private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+    private Date updatedTime;
+
+    /**
+     * 预留字段1
+     */
+    private String field1;
+
+    /**
+     * 预留字段2
+     */
+    private String field2;
+
+    /**
+     * 预留字段3
+     */
+    private String field3;
+
+    /**
+     * 预留字段4
+     */
+    private String field4;
+
+    /**
+     * 预留字段5
+     */
+    private String field5;
+
+    /**
+     * 预留字段6
+     */
+    private String field6;
+
+    /**
+     * 预留字段7
+     */
+    private String field7;
+
+    /**
+     * 预留字段8
+     */
+    private String field8;
+
+    /**
+     * 预留字段9
+     */
+    private String field9;
+
+    /**
+     * 预留字段10
+     */
+    private String field10;
+}

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DingdingMsgSender.java

@@ -1,6 +1,8 @@
 package com.epmet.commons.tools.utils;
 
 import com.alibaba.fastjson.JSON;
+import com.dingtalk.api.DefaultDingTalkClient;
+import com.dingtalk.api.request.OapiRobotSendRequest;
 import com.epmet.commons.tools.dto.form.DingTalkTextMsg;
 import com.google.common.collect.Lists;
 import org.apache.commons.codec.binary.Base64;
@@ -12,9 +14,13 @@ import org.springframework.stereotype.Component;
 import javax.annotation.PreDestroy;
 import javax.crypto.Mac;
 import javax.crypto.spec.SecretKeySpec;
+import javax.validation.constraints.NotNull;
 import java.io.IOException;
+import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
+import java.security.InvalidKeyException;
+import java.security.NoSuchAlgorithmException;
 import java.util.concurrent.ArrayBlockingQueue;
 
 /**
@@ -115,36 +121,71 @@ public class DingdingMsgSender {
 		running = false;
 	}
 
-	/**
+    /**
-	 * 发送POST 请求
+     * 发送POST 请求
-	 *
+     *
-	 * @param param 请求参数，JSON格式
+     * @param param 请求参数，JSON格式
-	 * @return
+     * @return
-	 */
+     */
-	private Result<String> sendMsg(DingTalkTextMsg param) {
+    @Deprecated
-		if (StringUtils.isBlank(param.getWebHook())) {
+    private Result<String> sendMsg(DingTalkTextMsg param) {
-			param.setWebHook(webHook);
+        if (StringUtils.isBlank(param.getWebHook())) {
-		}
+            param.setWebHook(webHook);
-		if (StringUtils.isBlank(param.getSecret())) {
+        }
-			param.setSecret(secret);
+        if (StringUtils.isBlank(param.getSecret())) {
-		}
+            param.setSecret(secret);
-		Result<String> result = new Result<String>().error();
+        }
-		Long timestamp = System.currentTimeMillis();
+        Result<String> result = new Result<String>().error();
-		try {
+        try {
-			String stringToSign = timestamp + "\n" + param.getSecret();
+            String url = getUrlString(param, System.currentTimeMillis());
-			Mac mac = Mac.getInstance("HmacSHA256");
+            String jsonStrParam = param.getMsgContent();
-			mac.init(new SecretKeySpec(param.getSecret().getBytes(StandardCharsets.UTF_8), "HmacSHA256"));
+            result = HttpClientManager.getInstance().sendPostByJSON(url, jsonStrParam);
-			byte[] signData = mac.doFinal(stringToSign.getBytes(StandardCharsets.UTF_8));
+        } catch (Exception e) {
-			String sign = URLEncoder.encode(new String(Base64.encodeBase64(signData)), "UTF-8");
+            logger.warn("sendPostByJSON error", e);
-			String url = param.getWebHook();
+        }
-			url = url.concat("&timestamp=" + timestamp + "&sign=" + sign);
+        return result;
-			String jsonStrParam = param.getMsgContent();
+    }
-			result = HttpClientManager.getInstance().sendPostByJSON(url, jsonStrParam);
+
-		} catch (Exception e) {
+    @NotNull
-			logger.warn("sendPostByJSON error", e);
+    private String getUrlString(DingTalkTextMsg param, Long timestamp) throws NoSuchAlgorithmException, InvalidKeyException, UnsupportedEncodingException {
-		}
+        String stringToSign = timestamp + "\n" + param.getSecret();
-		return result;
+        Mac mac = Mac.getInstance("HmacSHA256");
-	}
+        mac.init(new SecretKeySpec(param.getSecret().getBytes(StandardCharsets.UTF_8), "HmacSHA256"));
+        byte[] signData = mac.doFinal(stringToSign.getBytes(StandardCharsets.UTF_8));
+        String sign = URLEncoder.encode(new String(Base64.encodeBase64(signData)), "UTF-8");
+        String url = param.getWebHook();
+        url = url.concat("&timestamp=" + timestamp + "&sign=" + sign);
+        return url;
+    }
+
+    /**
+     * 发送POST 请求
+     *
+     * @param param 请求参数，JSON格式
+     * @return
+     */
+    public Result<String> sendMsgSdk(DingTalkTextMsg param) {
+        if (StringUtils.isBlank(param.getWebHook())) {
+            param.setWebHook(webHook);
+        }
+        if (StringUtils.isBlank(param.getSecret())) {
+            param.setSecret(secret);
+        }
+        Result<String> result = new Result<String>().error();
+        try {
+            String url = getUrlString(param, System.currentTimeMillis());
+            DefaultDingTalkClient client = new DefaultDingTalkClient(url);
+            OapiRobotSendRequest request = new OapiRobotSendRequest();
+            request.setMsgtype("text");
+            OapiRobotSendRequest.Text text = new OapiRobotSendRequest.Text();
+            text.setContent(param.getContent());
+            request.setText(text);
+            client.execute(request);
+        } catch (Exception e) {
+            logger.warn("sendPostByJSON error", e);
+        }
+        return result;
+    }
 
 	public static void main(String[] args) {
 		for (int i = 0; i < 50; i++) {

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/ScanContentUtils.java

@@ -3,6 +3,7 @@ package com.epmet.commons.tools.utils;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.TypeReference;
 import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.enums.EnvEnum;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.scan.param.*;
@@ -16,6 +17,7 @@ import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 扫描内容工具类
@@ -31,6 +33,15 @@ public class ScanContentUtils {
 	 * @return
 	 */
 	public static Result<SyncScanResult> imgSyncScan(String url, ImgScanParamDTO param) {
+		//start 测试环境停机了，先这样改试试
+		EnvEnum currentEnv = EnvEnum.getCurrentEnv();
+		if(EnvEnum.LOCAL.getCode().equals(currentEnv.getCode())||EnvEnum.DEV.getCode().equals(currentEnv.getCode())){
+			SyncScanResult syncScanResult=new SyncScanResult();
+			syncScanResult.setSuccessDataIds(param.getTasks().stream().map(c -> c.getDataId()).collect(Collectors.toList()));
+			syncScanResult.setAllPass(true);
+			return new Result<SyncScanResult>().ok(syncScanResult);
+		}//end
+
 		log.debug("imgSyncScan param:{}", JSON.toJSONString(param));
 		if (StringUtils.isBlank(url) || param == null) {
 			throw new RenException("参数错误");
@@ -57,6 +68,15 @@ public class ScanContentUtils {
 	 * @return
 	 */
 	public static  Result<SyncScanResult> textSyncScan(String url, TextScanParamDTO param) {
+		//start 测试环境停机了，先这样改试试
+		EnvEnum currentEnv = EnvEnum.getCurrentEnv();
+		if(EnvEnum.LOCAL.getCode().equals(currentEnv.getCode())||EnvEnum.DEV.getCode().equals(currentEnv.getCode())){
+			SyncScanResult syncScanResult=new SyncScanResult();
+			syncScanResult.setSuccessDataIds(param.getTasks().stream().map(c -> c.getDataId()).collect(Collectors.toList()));
+			syncScanResult.setAllPass(true);
+			return new Result<SyncScanResult>().ok(syncScanResult);
+		}//end
+
 		log.debug("textSyncScan param:{}", JSON.toJSONString(param));
 		if (StringUtils.isBlank(url) || param == null) {
 			throw new RenException("参数错误");

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/YtHsResUtils.java

@@ -1,12 +1,20 @@
 package com.epmet.commons.tools.utils;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.epmet.commons.tools.constant.StrConstant;
+import com.epmet.commons.tools.dto.result.YtDataSyncResDTO;
+import com.epmet.commons.tools.dto.result.YtHscyResDTO;
 import com.epmet.commons.tools.dto.result.YtHsjcResDTO;
+import com.epmet.commons.tools.dto.result.YtSfhyxxcxdsjjResDTO;
+import com.google.common.util.concurrent.RateLimiter;
 import lombok.extern.slf4j.Slf4j;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.TimeUnit;
 
 /**
  * @Description
@@ -15,39 +23,253 @@ import java.util.Map;
  */
 @Slf4j
 public class YtHsResUtils {
-    private static String URL = "http://10.2.2.60:8191/sjzt/server/hsjcxx";
+    private static String SERVER_URL = "http://10.2.2.60:8191/sjzt/server/";
-    private static final String APP_KEY_VALUE = "DR4jF5Be7sCsqDmCamq2tmYCl";
     private static final String APP_KEY = "appkey";
     private static final String CARD_NO = "card_no";
     private static final String ROW_NUM = "ROWNUM";
     private static final String PAGE_SIZE = "PAGESIZE";
     /**
-     * desc:图片同步扫描
+     * rate is "2 permits per second"
+     */
+    private static final Map<String,RateLimiter> rateLimiterMap = new ConcurrentHashMap<>();
+
+
+    /**
+     * desc:核酸采样查询
+     *
+     * @return
+     */
+    public static YtHscyResDTO hscy(String cardNo, Integer rowNum, Integer pageSize) {
+        try {
+            tryAcquire("hscy");
+
+            Map<String, Object> param = new HashMap<>();
+            param.put(APP_KEY, "tz45j4kuWcnnjoJOVSlzGWJgI");
+            param.put(CARD_NO, cardNo);
+            param.put(ROW_NUM, rowNum);
+            param.put(PAGE_SIZE, pageSize);
+            log.info("hscy api param:{}", param);
+
+            Result<String> result = HttpClientManager.getInstance().sendGet(SERVER_URL + "hscyxxcx", param);
+//            String mockData = "{\"code\":\"200\",\"msg\":\"请求成功\",\"data\":[{\"id\":\"1570924677539635484\",\"name\":\"杨XX\",\"card_type\":\"1\",\"card_no\":\"370283199912010302\",\"create_by\":\"370613594\",\"create_time\":\"2022-09-24 06:48:28\",\"sys_org_code\":\"370613\",\"sample_tube\":\"GCJ-0825-0441\",\"package_id\":\"bcj00208083952\",\"city\":\"烟台市\",\"uuid\":\"6225684525062602095\",\"county\":\"莱山区\",\"depart_ids\":\"未填写\",\"depart_name\":null,\"realname\":\"采样点327\",\"upload_time\":\"2022-09-17 07:56:45\",\"sd_id\":null,\"sd_batch\":null,\"sd_operation\":null,\"sd_time\":null,\"inserttime\":\"2022-09-17 09:36:20\"}]}";
+//            Result<String> result = new Result<String>().ok(mockData);
+            log.info("hscy api result:{}", JSON.toJSONString(result));
+            if (result.success()) {
+                String data = result.getData();
+                JSONObject jsonObject = JSON.parseObject(data);
+                if (jsonObject != null && StrConstant.HTTP_STATUS_OK.equals(jsonObject.getString(StrConstant.HTTP_RESP_CODE))) {
+                    return JSON.parseObject(result.getData(), YtHscyResDTO.class);
+                } else {
+                    log.warn("hscy 调用蓝图接口败");
+                }
+            }
+        } catch (Exception e) {
+            log.error(String.format("烟台核酸检测结果查询异常cardNo:%s", cardNo), e);
+        }
+        YtHscyResDTO resultResult = new YtHscyResDTO();
+        resultResult.setData(new ArrayList<>());
+        return resultResult;
+    }
+
+    private static void tryAcquire(String hscy) {
+        RateLimiter rateLimiter = rateLimiterMap.getOrDefault(hscy, RateLimiter.create(2.0));
+        rateLimiterMap.putIfAbsent(hscy,rateLimiter);
+        rateLimiter.tryAcquire(1, TimeUnit.SECONDS);
+    }
+
+    /**
+     * desc:核酸结果查询
      *
      * @return
      */
     public static YtHsjcResDTO hsjc(String cardNo, Integer rowNum, Integer pageSize) {
         try {
-            //String param = String.format("&card_no=%s&ROWNUM=%s&PAGESIZE=%s", cardNo, rowNum, pageSize);
+            tryAcquire("hsjc");
-            //String apiUrl = url.concat(param);
+
-            Map<String,Object> param = new HashMap<>();
+            Map<String, Object> param = new HashMap<>();
-            param.put(APP_KEY,APP_KEY_VALUE);
+            param.put(APP_KEY, "DR4jF5Be7sCsqDmCamq2tmYCl");
-            param.put(CARD_NO,cardNo);
+            param.put(CARD_NO, cardNo);
-            param.put(ROW_NUM,rowNum);
+            param.put(ROW_NUM, rowNum);
-            param.put(PAGE_SIZE,pageSize);
+            param.put(PAGE_SIZE, pageSize);
-            log.info("hsjc api param:{}",param);
+            log.info("hsjc api param:{}", param);
-            Result<String> result = HttpClientManager.getInstance().sendGet(URL, param);
+            Result<String> result = HttpClientManager.getInstance().sendGet(SERVER_URL + "hsjcxx", param);
-            log.info("hsjc api result:{}",JSON.toJSONString(result));
+//            String mockData = "{\"code\":\"200\",\"msg\":\"请求成功\",\"data\":[{\"id\":\"6a31eb2d38c011eda054fa163ebc7ff4\",\"name\":\"数据同步测试用户\",\"card_no\":\"370283199912010302\",\"telephone\":\"13697890860\",\"address\":\"保利香榭里公馆18-1-302\",\"test_time\":\"2022-09-24 12:52:28\",\"depart_name\":\"天仁医学检验实验室有限公司\",\"county\":\"莱山区\",\"upload_time\":\"2022-09-20 21:23:10\",\"sample_result_pcr\":\"2\",\"sample_time\":\"2022-09-24 06:48:28\",\"sampling_org_pcr\":\"采样点327\"}],\"total\":1}";
+//            Result<String> result = new Result<String>().ok(mockData);
+            log.info("hsjc api result:{}", JSON.toJSONString(result));
             if (result.success()) {
-                return JSON.parseObject(result.getData(), YtHsjcResDTO.class);
+                String data = result.getData();
+                JSONObject jsonObject = JSON.parseObject(data);
+                if (jsonObject != null && StrConstant.HTTP_STATUS_OK.equals(jsonObject.getString(StrConstant.HTTP_RESP_CODE))) {
+                    return JSON.parseObject(result.getData(), YtHsjcResDTO.class);
+                } else {
+                    log.warn("hsjc 调用蓝图接口败");
+                }
+
             }
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error(String.format("烟台核酸检测结果查询异常cardNo:%s", cardNo), e);
-            log.warn(String.format("烟台核酸检测结果查询异常cardNo:%s,异常信息:%s", cardNo, e.getMessage()));
         }
         YtHsjcResDTO resultResult = new YtHsjcResDTO();
         resultResult.setData(new ArrayList<>());
         return resultResult;
     }
+
+    /**
+     * desc:死亡数据同步
+     *
+     * @return
+     */
+    public static YtDataSyncResDTO siWang(String cardNo, String userName) {
+        try {
+            tryAcquire("siWang");
+//            1)appkey秘钥
+//            2)name姓名 必填
+//            3)idcard身份证号 必填
+//            4)start开始默认0
+//            5)limit每页记录数
+            Map<String, Object> param = new HashMap<>();
+            param.put(APP_KEY, "IGE8TMM6f4t1Sef7FfstOLHAL");
+            param.put("id_card", cardNo);
+            param.put("name", userName);
+            param.put("start", 0);
+            param.put("limit", 1);
+
+            log.info("siWang api param:{}", param);
+
+            Result<String> result = HttpClientManager.getInstance().sendGet(SERVER_URL + "mzt_hhrysj1", param);
+//            String mockData = "{\"code\":\"200\",\"msg\":\"请求成功\",\"data\":\"{\\\"code\\\":200,\\\"data\\\":\\\"{\\\\\\\"data\\\\\\\":[{\\\\\\\"AGE\\\\\\\":\\\\\\\"82\\\\\\\",\\\\\\\"BIRTHDAY\\\\\\\":\\\\\\\"1933-02-23\\\\\\\",\\\\\\\"CARD_TYPE\\\\\\\":\\\\\\\"1\\\\\\\",\\\\\\\"CREATE_ORGAN_NAME\\\\\\\":\\\\\\\"莱州市殡仪馆\\\\\\\",\\\\\\\"CREMATION_TIME\\\\\\\":\\\\\\\"2016-01-03 13:01\\\\\\\",\\\\\\\"DEAD_ID\\\\\\\":\\\\\\\"8abc809851ffaf1501520600555c2849\\\\\\\",\\\\\\\"DEATH_DATE\\\\\\\":\\\\\\\"2016-01-02\\\\\\\",\\\\\\\"FAMILY_ADD\\\\\\\":\\\\\\\"山东省莱州市光州西路420号\\\\\\\",\\\\\\\"FOLK\\\\\\\":\\\\\\\"01\\\\\\\",\\\\\\\"ID_CARD\\\\\\\":\\\\\\\"370625193302231929\\\\\\\",\\\\\\\"NAME\\\\\\\":\\\\\\\"陈秀芬\\\\\\\",\\\\\\\"NATION\\\\\\\":\\\\\\\"156\\\\\\\",\\\\\\\"POPULACE\\\\\\\":\\\\\\\"3381C300B4B9439FE05319003C0A0897\\\\\\\",\\\\\\\"POPULACE_NAME\\\\\\\":\\\\\\\"烟台市莱州市文昌路街道\\\\\\\",\\\\\\\"RECORD_ID\\\\\\\":\\\\\\\"8abc809851ffaf1501520600694e2877\\\\\\\",\\\\\\\"RN\\\\\\\":\\\\\\\"1\\\\\\\",\\\\\\\"SEX\\\\\\\":\\\\\\\"2\\\\\\\"}],\\\\\\\"fields\\\\\\\":[\\\\\\\"RN\\\\\\\",\\\\\\\"RECORD_ID\\\\\\\",\\\\\\\"DEAD_ID\\\\\\\",\\\\\\\"NAME\\\\\\\",\\\\\\\"SEX\\\\\\\",\\\\\\\"CARD_TYPE\\\\\\\",\\\\\\\"ID_CARD\\\\\\\",\\\\\\\"BIRTHDAY\\\\\\\",\\\\\\\"AGE\\\\\\\",\\\\\\\"NATION\\\\\\\",\\\\\\\"FOLK\\\\\\\",\\\\\\\"IF_LOCAL\\\\\\\",\\\\\\\"POPULACE\\\\\\\",\\\\\\\"FAMILY_ADD\\\\\\\",\\\\\\\"WORK_NAME\\\\\\\",\\\\\\\"DEATH_DATE\\\\\\\",\\\\\\\"CREMATION_TIME\\\\\\\",\\\\\\\"CREATE_ORGAN_NAME\\\\\\\",\\\\\\\"POPULACE_NAME\\\\\\\"],\\\\\\\"total\\\\\\\":\\\\\\\"1\\\\\\\"}\\\",\\\"message\\\":\\\"\\\"}\",\"total\":0}";
+//            Result<String> result = new Result<String>().ok(mockData);
+            log.info("siWang api result:{}", JSON.toJSONString(result));
+            if (!result.success()) {
+                return new YtDataSyncResDTO();
+            }
+            String data = result.getData();
+            JSONObject jsonObject = JSON.parseObject(data);
+            //他们的结果是成功的
+            if (jsonObject != null && StrConstant.HTTP_STATUS_OK.equals(jsonObject.getString(StrConstant.HTTP_RESP_CODE))) {
+                //第一层
+                JSONObject firstData = JSON.parseObject(jsonObject.getString("data"));
+
+                //第二层 data
+                if (firstData != null && StrConstant.HTTP_STATUS_OK.equals(firstData.getString(StrConstant.HTTP_RESP_CODE))) {
+                    //第一层
+                    JSONObject secondData = JSON.parseObject(firstData.getString("data"));
+                    Object thirdData = "";
+                    if (secondData != null && secondData.getJSONArray("data") != null && secondData.getJSONArray("data").size() >0 ) {
+                        //第二层 data
+                        thirdData = secondData.getJSONArray("data").get(0);
+                    }
+                    return new YtDataSyncResDTO(200, "", thirdData.toString());
+                } else {
+                    log.warn("siWang 调用蓝图接口成功但是蓝图的结果中 省平台失败");
+                }
+            } else {
+                log.warn("siWang 调用蓝图接口败");
+            }
+        } catch (Exception e) {
+            log.error(String.format("烟台siWang结果查询异常cardNo:%s", cardNo), e);
+        }
+        return new YtDataSyncResDTO();
+    }
+
+    /**
+     * desc:残疾数据同步
+     *
+     * @return
+     * @remark：默认失败 因为一旦成功没有数据 会影响残疾人的数据 接口失败数据不做任何处理
+     */
+    public static YtDataSyncResDTO canji(String idCard, String userName) {
+        tryAcquire("canji");
+
+        YtDataSyncResDTO failResult = new YtDataSyncResDTO();
+        failResult.setCode(500);
+        failResult.setMsg("默认错误");
+        try {
+//          1)appkey
+//          2)name姓名
+//          3)citizenId身份证号
+            Map<String, Object> param = new HashMap<>();
+            param.put(APP_KEY, "EWGsaK0aM21wkDjCIWbahGVk2");
+            param.put("citizenId", idCard);
+            param.put("name", userName);
+
+            log.info("canji api param:{}", param);
+
+
+            Result<String> result = HttpClientManager.getInstance().sendGet(SERVER_URL + "sdcl_xxzx_czcjr1", param);
+//            String mockData = "{\"code\":\"200\",\"msg\":\"请求成功\",\"data\":\"{\\\"code\\\":200,\\\"data\\\":\\\"{\\\\\\\"result\\\\\\\":true,\\\\\\\"errorcode\\\\\\\":0,\\\\\\\"msg\\\\\\\":\\\\\\\"获取成功\\\\\\\",\\\\\\\"data\\\\\\\":{\\\\\\\"isNewRecord\\\\\\\":true,\\\\\\\"delFlag\\\\\\\":\\\\\\\"0\\\\\\\",\\\\\\\"pageNo\\\\\\\":0,\\\\\\\"pageSize\\\\\\\":0,\\\\\\\"name\\\\\\\":\\\\\\\"数据同步测试用户\\\\\\\",\\\\\\\"genderName\\\\\\\":\\\\\\\"男\\\\\\\",\\\\\\\"citizenId\\\\\\\":\\\\\\\"370682198002072719\\\\\\\",\\\\\\\"cardNum\\\\\\\":\\\\\\\"370283199912010302\\\\\\\",\\\\\\\"idtKindName\\\\\\\":\\\\\\\"精神\\\\\\\",\\\\\\\"idtLevelName\\\\\\\":\\\\\\\"二级\\\\\\\",\\\\\\\"eduLevelName\\\\\\\":\\\\\\\"小学\\\\\\\",\\\\\\\"marriagerName\\\\\\\":\\\\\\\"未婚\\\\\\\",\\\\\\\"guardian\\\\\\\":\\\\\\\"盖希仁\\\\\\\",\\\\\\\"guardianPhone\\\\\\\":\\\\\\\"13854516627\\\\\\\",\\\\\\\"guardianRName\\\\\\\":\\\\\\\"兄/弟/姐/妹\\\\\\\",\\\\\\\"raceName\\\\\\\":\\\\\\\"汉族\\\\\\\",\\\\\\\"certDate\\\\\\\":1620779842000,\\\\\\\"residentAdd\\\\\\\":\\\\\\\"姜疃镇凤头村248号附1号\\\\\\\",\\\\\\\"nowAdd\\\\\\\":\\\\\\\"山东省烟台市莱阳市姜疃镇凤头村委会\\\\\\\",\\\\\\\"phoneNo\\\\\\\":\\\\\\\"13854516627\\\\\\\"}}\\\",\\\"message\\\":\\\"\\\"}\",\"total\":0}";
+//            Result<String> result = new Result<String>().ok(mockData);
+            log.info("canji api result:{}", JSON.toJSONString(result));
+
+            if (result.success()) {
+                String data = result.getData();
+                JSONObject jsonObject = JSON.parseObject(data);
+                //他们的结果是成功的
+                if (jsonObject != null && StrConstant.HTTP_STATUS_OK.equals(jsonObject.getString(StrConstant.HTTP_RESP_CODE))) {
+                    //第一层data
+                    JSONObject realObject = JSON.parseObject(jsonObject.getString("data"));
+
+                    if (realObject != null && StrConstant.HTTP_STATUS_OK.equals(realObject.getString(StrConstant.HTTP_RESP_CODE))) {
+                        //第二层 data
+                        String thirdData = realObject.getString("data");
+                        return JSON.parseObject(thirdData, YtDataSyncResDTO.class);
+                    } else {
+                        log.warn("canji 调用蓝图接口成功但是蓝图的结果中 省平台失败");
+                    }
+                } else {
+                    log.warn("canji 调用蓝图接口败");
+                }
+
+            }
+        } catch (Exception e) {
+            log.error(String.format("烟台canji结果查询异常cardNo:%s,异常信息:%s", idCard), e);
+        }
+        return failResult;
+    }
+
+    /**
+     * desc:根据身份证号和姓名查询公安部备案信息
+     *
+     * @return
+     */
+    public static YtSfhyxxcxdsjjResDTO sfhyxxcxdsjj(String gmsfhm, String xm) {
+        try {
+            tryAcquire("sfhyxxcxdsjj");
+
+            Map<String, Object> param = new HashMap<>();
+            param.put(APP_KEY, "RhOHlu7Bmkrj8Vk7uGTNNxHqI");
+            param.put("gmsfhm", gmsfhm);
+            param.put("xm", xm);
+            log.info("sfhyxxcxdsjj api param:{}", param);
+
+            Result<String> result = HttpClientManager.getInstance().sendGet(SERVER_URL + "sfhyxxcxdsjj", param);
+            log.info("sfhyxxcxdsjj api result:{}", JSON.toJSONString(result));
+            if (result.success()) {
+                String data = result.getData();
+                JSONObject jsonObject = JSON.parseObject(data);
+                if (jsonObject != null && StrConstant.HTTP_STATUS_OK.equals(jsonObject.getString(StrConstant.HTTP_RESP_CODE))) {
+                    return JSON.parseObject(result.getData(), YtSfhyxxcxdsjjResDTO.class);
+                } else {
+                    log.warn("sfhyxxcxdsjj 烟台公安部居民基础信息调用失败");
+                }
+            }
+        } catch (Exception e) {
+            log.error(String.format("烟台公民基本信息查询异常gmsfhm:%s", gmsfhm), e);
+        }
+        YtSfhyxxcxdsjjResDTO resultResult = new YtSfhyxxcxdsjjResDTO();
+        return resultResult;
+    }
+
+
+    public static void main(String[] args) {
+        //YtDataSyncResDTO canji = canji("123", "123");
+        //System.out.println("残疾结果：" + JSON.toJSON(canji));
+
+
+        YtDataSyncResDTO siwang = siWang("1213", "!23");
+        System.out.println("死亡结果：" + JSON.toJSON(siwang));
+    }
+
+
 }
 

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/api/yt/OrgData.java

@@ -0,0 +1,92 @@
+
+package com.epmet.commons.tools.utils.api.yt;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * desc:组织机构数据 实体类
+ * @author liujianjun
+ */
+@Data
+public class OrgData implements Serializable {
+
+    /**
+     * 联系人姓名
+     */
+    private String contact;
+    /**
+     * 联系电话号码
+     */
+    private String contactTelephoneNumber;
+
+    /**
+     * 详细地址
+     */
+    private String detailAddress;
+
+    /**
+     * 组织机构第一名称
+     */
+    private String firstNameOfOrganization;
+
+    /**
+     * 组织机构全称
+     */
+    private String nameOfOrganization;
+
+    /**
+     * 排序号码
+     */
+    private String orderNumber;
+
+    /**
+     * 组织机构简称
+     */
+    private String organizatioNabbreviation;
+
+    /**
+     * 组织机构ID
+     */
+    private String organizationId;
+
+    /**
+     * 组织机构级别
+     */
+    private String organizationLevel;
+
+    /**
+     * 组织机构路径
+     */
+    private String organizationPath;
+
+    /**
+     * 组织机构类型
+     */
+    private String organizationType;
+    /**
+     * 注册类型
+     */
+    private String registrationType;
+    /**
+     * 统一社会信用代码
+     */
+    private String unifiedSocialCreditId;
+
+    /**
+     * 上级ID
+     */
+    private String pid;
+
+    /**
+     * orgId全路径
+     */
+    private String pids;
+
+    /**
+     * 上级组织名
+     */
+    private String parentOrgName;
+
+}

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/api/yt/SM4UtilsForYanTai.java

@@ -0,0 +1,199 @@
+package com.epmet.commons.tools.utils.api.yt;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.commons.codec.binary.Base64;
+import org.bouncycastle.jce.provider.BouncyCastleProvider;
+
+import javax.crypto.BadPaddingException;
+import javax.crypto.Cipher;
+import javax.crypto.IllegalBlockSizeException;
+import javax.crypto.SecretKey;
+import javax.crypto.spec.SecretKeySpec;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+import java.security.InvalidKeyException;
+import java.security.Security;
+
+/**
+ * 烟台的认证中心-国密sm4加解密
+ */
+public class SM4UtilsForYanTai {
+    private static String SM4_KEY = "yaweisoftware@xy";
+    //编码格式
+    private static final Charset encryptCharset = StandardCharsets.UTF_8;
+
+    public enum Algorithm {
+        SM4("SM4","SM4","国密四,key长16byte");
+        private String keyAlgorithm;
+        private String transformation;
+        private String description;//描述
+        Algorithm(String keyAlgorithm, String transformation, String description) {
+            this.keyAlgorithm = keyAlgorithm;
+            this.transformation = transformation;
+            this.description = description;
+        }
+        public String getKeyAlgorithm() {
+            return this.keyAlgorithm;
+        }
+        public String getTransformation() {
+            return this.transformation;
+        }
+        public String getDescription() {
+            return this.description;
+        }
+    }
+
+    private static final String PROVIDER_NAME = "BC";
+    static {
+        Security.addProvider(new BouncyCastleProvider());
+    }
+
+    /**
+     * 自定字符串产生密钥
+     * @param algorithm 加解密算法
+     * @param keyStr 密钥字符串
+     * @param charset 编码字符集
+     * @return 密钥
+     */
+    public static SecretKey genKeyByStr(Algorithm algorithm, String keyStr, Charset charset) {
+        return readKeyFromBytes(algorithm, keyStr.getBytes(charset));
+    }
+
+    /**
+     * 根据指定字节数组产生密钥
+     * @param algorithm 加解密算法
+     * @param keyBytes 密钥字节数组
+     * @return 密钥
+     */
+    public static SecretKey readKeyFromBytes(Algorithm algorithm, byte[] keyBytes) {
+        return new SecretKeySpec(keyBytes, algorithm.getKeyAlgorithm());
+    }
+
+    /****************************加密*********************************/
+    /**
+     * 加密字符串，并进行base64编码
+     * @param algorithm 加解密算法
+     * @param key 密钥
+     * @param data 明文
+     * @param charset 编码字符集
+     * @return 密文
+     * @throws InvalidKeyException 密钥错误
+     */
+    public static String encryptBase64(Algorithm algorithm, SecretKey key, String data, Charset charset) throws InvalidKeyException {
+        return Base64.encodeBase64String(encrypt(algorithm, key, data.getBytes(charset)));
+    }
+
+    /**
+     * 加密字节数组
+     * @param algorithm 加解密算法
+     * @param key 密钥
+     * @param data 明文
+     * @return 密文
+     * @throws InvalidKeyException 密钥错误
+     */
+    public static byte[] encrypt(Algorithm algorithm, SecretKey key, byte[] data) throws InvalidKeyException {
+        try {
+            return cipherDoFinal(algorithm, Cipher.ENCRYPT_MODE, key, data);
+        } catch (BadPaddingException e) {
+            throw new RuntimeException(e);//明文没有具体格式要求，不会出错。所以这个异常不需要外部捕获。
+        }
+    }
+
+    /**
+     * 加解密字节数组
+     * @param algorithm 加解密算法
+     * @param opmode 操作：1加密，2解密
+     * @param key 密钥
+     * @param data 数据
+     * @throws InvalidKeyException 密钥错误
+     * @throws BadPaddingException 解密密文错误(加密模式没有)
+     */
+    private static byte[] cipherDoFinal(Algorithm algorithm, int opmode, SecretKey key, byte[] data) throws InvalidKeyException, BadPaddingException {
+        Cipher cipher;
+        try {
+            cipher = Cipher.getInstance(algorithm.getTransformation(), PROVIDER_NAME);
+        } catch (Exception e) {
+            //NoSuchAlgorithmException：加密算法名是本工具类提供的，如果错了业务没有办法处理。所以这个异常不需要外部捕获。
+            //NoSuchProviderException：Provider是本工具类提供的，如果错了业务没有办法处理。所以这个异常不需要外部捕获。
+            //NoSuchPaddingException：没有特定的填充机制，与环境有关，业务没有办法处理。所以这个异常不需要外部捕获。
+            throw new RuntimeException(e);
+        }
+        cipher.init(opmode, key);
+        try {
+            return cipher.doFinal(data);
+        } catch (IllegalBlockSizeException e) {
+            throw new RuntimeException(e);//业务不需要将数据分块(好像由底层处理了)，如果错了业务没有办法处理。所以这个异常不需要外部捕获。
+        }
+    }
+
+    /****************************解密*********************************/
+    /**
+     * 对字符串先进行base64解码，再解密
+     * @param algorithm 加解密算法
+     * @param key 密钥
+     * @param data 密文
+     * @param charset 编码字符集
+     * @return 明文
+     * @throws InvalidKeyException 密钥错误
+     * @throws BadPaddingException 密文错误
+     */
+    public static String decryptBase64(Algorithm algorithm, SecretKey key, String data, Charset charset)
+            throws InvalidKeyException, BadPaddingException {
+        return new String(decrypt(algorithm, key, Base64.decodeBase64(data)), charset);
+    }
+
+    /**
+     * 解密字节数组
+     * @param algorithm 加解密算法
+     * @param key 密钥
+     * @param data 密文
+     * @return 明文
+     * @throws InvalidKeyException 密钥错误
+     * @throws BadPaddingException 密文错误
+     */
+    public static byte[] decrypt(Algorithm algorithm, SecretKey key, byte[] data) throws InvalidKeyException, BadPaddingException {
+        return cipherDoFinal(algorithm, Cipher.DECRYPT_MODE, key, data);
+    }
+
+    public static String Encrypt(String data) throws InvalidKeyException {
+        SecretKey key = genKeyByStr(Algorithm.SM4, SM4_KEY, encryptCharset);
+        return encryptBase64(Algorithm.SM4, key, data, encryptCharset);
+    }
+    public static String Decrypt(String data) throws BadPaddingException, InvalidKeyException {
+        SecretKey key = genKeyByStr(Algorithm.SM4, SM4_KEY, encryptCharset);
+        return decryptBase64(Algorithm.SM4, key, data, encryptCharset);
+    }
+	//加密
+	public static String dealEncryptData(Object data) throws JsonProcessingException, InvalidKeyException {
+        ObjectMapper objectMapper = new ObjectMapper();
+        String dataString = "";
+        try {
+            if(data instanceof String){
+                dataString = (String) data;
+            }else {
+                dataString = objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(data);
+            }
+            String dataEncrypt = Encrypt(dataString);
+            return dataEncrypt;
+        }catch (Exception e){
+            return dataString;
+        }
+    }
+    //解密
+    public static String dealDecryptData(Object data) throws JsonProcessingException, BadPaddingException, InvalidKeyException {
+        String dataString = "";
+        try {
+            ObjectMapper objectMapper = new ObjectMapper();
+            if (data instanceof String) {
+                dataString = (String) data;
+            } else {
+                dataString = objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(data);
+            }
+            String dataDecrypt = Decrypt(dataString);
+            return dataDecrypt;
+        }catch (Exception e){
+            return dataString;
+        }
+    }
+}

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/api/yt/TestMs4.java

@@ -0,0 +1,184 @@
+package com.epmet.commons.tools.utils.api.yt;
+
+
+import org.bouncycastle.jce.provider.BouncyCastleProvider;
+import org.bouncycastle.pqc.math.linearalgebra.ByteUtils;
+
+import javax.crypto.Cipher;
+import javax.crypto.KeyGenerator;
+import javax.crypto.spec.SecretKeySpec;
+import java.security.*;
+import java.util.Arrays;
+
+/**
+ * sm4加密算法工具类
+ *
+ * @explain sm4加密、解密与加密结果验证 可逆算法
+ * @Autor：jingyao
+ */
+public class TestMs4 {
+    static {
+        Security.addProvider(new BouncyCastleProvider());
+    }
+
+    private static final String ENCODING = "UTF-8";
+    public static final String ALGORITHM_NAME = "SM4";
+    // 加密算法/分组加密模式/分组填充方式
+    // PKCS5Padding-以8个字节为一组进行分组加密
+    // 定义分组加密模式使用：PKCS5Padding
+    public static final String ALGORITHM_NAME_ECB_PADDING = "SM4/ECB/PKCS5Padding";
+    // 128-32位16进制；256-64位16进制
+    public static final int DEFAULT_KEY_SIZE = 128;
+
+    /**
+     * 生成ECB暗号
+     *
+     * @param algorithmName 算法名称
+     * @param mode          模式
+     * @param key
+     * @return
+     * @throws Exception
+     * @explain ECB模式（电子密码本模式：Electronic codebook）
+     */
+    private static Cipher generateEcbCipher(String algorithmName, int mode, byte[] key) throws Exception {
+        Cipher cipher = Cipher.getInstance(algorithmName, BouncyCastleProvider.PROVIDER_NAME);
+        Key sm4Key = new SecretKeySpec(key, ALGORITHM_NAME);
+        cipher.init(mode, sm4Key);
+        return cipher;
+    }
+
+    /**
+     * 自动生成密钥
+     *
+     * @return
+     * @throws NoSuchAlgorithmException
+     * @throws NoSuchProviderException
+     * @explain
+     */
+    public static byte[] generateKey() throws Exception {
+        return generateKey(DEFAULT_KEY_SIZE);
+    }
+
+
+    //加密******************************************
+
+    /**
+     * @param keySize
+     * @return
+     * @throws Exception
+     * @explain 系统产生秘钥
+     */
+    public static byte[] generateKey(int keySize) throws Exception {
+        KeyGenerator kg = KeyGenerator.getInstance(ALGORITHM_NAME, BouncyCastleProvider.PROVIDER_NAME);
+        kg.init(keySize, new SecureRandom());
+        return kg.generateKey().getEncoded();
+    }
+
+    /**
+     * sm4加密
+     *
+     * @param hexKey   16进制密钥（忽略大小写）
+     * @param paramStr 待加密字符串
+     * @return 返回16进制的加密字符串
+     * @throws Exception
+     * @explain 加密模式：ECB 密文长度不固定，会随着被加密字符串长度的变化而变化
+     */
+    public static String encryptEcb(String hexKey, String paramStr) throws Exception {
+        String cipherText = "";
+        // 16进制字符串-->byte[]
+        byte[] keyData = ByteUtils.fromHexString(hexKey);
+        // String-->byte[]
+        byte[] srcData = paramStr.getBytes(ENCODING);
+        // 加密后的数组
+        byte[] cipherArray = encrypt_Ecb_Padding(keyData, srcData);
+        // byte[]-->hexString
+        cipherText = ByteUtils.toHexString(cipherArray);
+        return cipherText;
+    }
+
+    /**
+     * 加密模式之Ecb
+     *
+     * @param key
+     * @param data
+     * @return
+     * @throws Exception
+     */
+    public static byte[] encrypt_Ecb_Padding(byte[] key, byte[] data) throws Exception {
+        Cipher cipher = generateEcbCipher(ALGORITHM_NAME_ECB_PADDING, Cipher.ENCRYPT_MODE, key);//声称Ecb暗号,通过第二个参数判断加密还是解密
+        return cipher.doFinal(data);
+    }
+
+    //解密****************************************
+
+    /**
+     * sm4解密
+     *
+     * @param hexKey     16进制密钥
+     * @param cipherText 16进制的加密字符串（忽略大小写）
+     * @return 解密后的字符串
+     * @throws Exception
+     * @explain 解密模式：采用ECB
+     */
+    public static String decryptEcb(String hexKey, String cipherText) throws Exception {
+        // 用于接收解密后的字符串
+        String decryptStr = "";
+        // hexString-->byte[]
+        byte[] keyData = ByteUtils.fromHexString(hexKey);
+        // hexString-->byte[]
+        byte[] cipherData = ByteUtils.fromHexString(cipherText);
+        // 解密
+        byte[] srcData = decrypt_Ecb_Padding(keyData, cipherData);
+        // byte[]-->String
+        decryptStr = new String(srcData, ENCODING);
+        return decryptStr;
+    }
+
+    /**
+     * 解密
+     *
+     * @param key
+     * @param cipherText
+     * @return
+     * @throws Exception
+     * @explain
+     */
+    public static byte[] decrypt_Ecb_Padding(byte[] key, byte[] cipherText) throws Exception {
+        Cipher cipher = generateEcbCipher(ALGORITHM_NAME_ECB_PADDING, Cipher.DECRYPT_MODE, key);//生成Ecb暗号,通过第二个参数判断加密还是解密
+        return cipher.doFinal(cipherText);
+    }
+
+    /**
+     * 校验加密前后的字符串是否为同一数据
+     *
+     * @param hexKey     16进制密钥（忽略大小写）
+     * @param cipherText 16进制加密后的字符串
+     * @param paramStr   加密前的字符串
+     * @return 是否为同一数据
+     * @throws Exception
+     * @explain
+     */
+    public static boolean verifyEcb(String hexKey, String cipherText, String paramStr) throws Exception {
+        // 用于接收校验结果
+        boolean flag = false;
+        // hexString-->byte[]
+        byte[] keyData = ByteUtils.fromHexString(hexKey);
+        // 将16进制字符串转换成数组
+        byte[] cipherData = ByteUtils.fromHexString(cipherText);
+        // 解密
+        byte[] decryptData = decrypt_Ecb_Padding(keyData, cipherData);
+        // 将原字符串转换成byte[]
+        byte[] srcData = paramStr.getBytes(ENCODING);
+        // 判断2个数组是否一致
+        flag = Arrays.equals(decryptData, srcData);
+        return flag;
+    }
+
+    public static void main(String[] args) throws Exception {
+        String text = "5d22ea44c7599a48f0d4446b1b7fbb4bb8353922df437d39c3a38549c0f2549cbd021ada00a8be83027ae06203c3daea2eedc5bd0875c7e509c7049045c5349577f2c21bcec328a5ea0bf341191e5bdba978566dddd16f1cf1928ff5cbd826dd33289fb45a8a04585f1f24ab04f59426371a5a0a0f2ee3e7b00d2bdfba7810524ce4c33130eda077546fa4c4191d0117f7a44e1cadac6c69a7d437653be1f958a459e0f025d471e09ab4636c38013032948ffb0827040ed6f3436be090f545186928a7b0b2bfc65782452606607ce8555ba130caacad73998da704428a07276a2699889c9872eebba5de8b72cdbe88705483293b00ab3ecb3aa57d283a4ecab40b71bc0a10e9ec626f07b2293255349fb2270d37e81c5c3d0de0b0f0706ed1872f60f039ce2e51effc39aef9747d67457e072cf3170a9c19589c1bab1a7d9d80";
+        String s = TestMs4.decryptEcb("dbcff4c9f4774e6cb56080f279149d59", text);
+        System.out.println(s);
+    }
+
+}
+

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/api/yt/UserData.java

@@ -0,0 +1,50 @@
+
+package com.epmet.commons.tools.utils.api.yt;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * desc:认证中心-用户信息
+ * @author liujianjun
+ */
+@Data
+public class UserData implements Serializable {
+
+    /**
+     * 性别：todo 不知道是什么值
+     */
+    private String gender;
+    /**
+     * 手机号码
+     */
+    private String mobileTelephoneNumber;
+    private String orderNumber;
+    /**
+     * 职务
+     */
+    private String position;
+    /**
+     * 职级
+     */
+    private String positionLevel;
+    /**
+     * 电话号码
+     */
+    private String telephoneNumber;
+    /**
+     * 用户编码/id
+     */
+    private String userGuid;
+    /**
+     * 用户姓名
+     */
+    private String userName;
+    /**
+     * 人员路径
+     */
+    private String userPath;
+
+
+}

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/api/yt/YantaiApi.java

@@ -0,0 +1,327 @@
+package com.epmet.commons.tools.utils.api.yt;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.exception.EpmetErrorCode;
+import com.epmet.commons.tools.exception.EpmetException;
+import com.epmet.commons.tools.utils.HttpClientManager;
+import com.epmet.commons.tools.utils.Result;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.jetbrains.annotations.NotNull;
+
+import javax.crypto.BadPaddingException;
+import java.security.InvalidKeyException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * desc:
+ *
+ * @author: LiuJanJun
+ * @date: 2022/10/17 3:57 下午
+ * @version: 1.0
+ */
+@Slf4j
+public class YantaiApi {
+    private static final String SSO_SERVER = "http://172.20.46.155:8080/sso/";
+    /**
+     * 相当于 appKey
+     */
+    private static final String CLIENT_ID = "1000009";
+    /**
+     * 相当于 appSecret 用于解密 他们重定向回来的code 解密他们的token 获取用户嘻嘻
+     */
+    private static final String CLIENT_SECRET = "a1f9879119bc4080ab5575f832b7d98b";
+    /**
+     * 调用sso后台api接口的 秘钥
+     */
+    private static final String SSO_API_TOKEN = "iJCDUgCBV/Zk5FkkaxLypA==";
+    /**
+     * 政务网地址
+     */
+    private static final String SSO_BACKGROUND_SERVER_URL = "http://172.20.46.155:8082/";
+    /**
+     * 互联网地址
+     */
+    //private static final String SSO_BACKGROUND_SERVER_URL = "http://120.220.248.247:8081/";
+
+    /**
+     * desc:根据组织id获取本级组织信息
+     *
+     * @param organizationId
+     * @return
+     */
+    public static OrgData getOuInfoByOuGuid(String organizationId) {
+        try {
+            if (StringUtils.isBlank(organizationId)) {
+                throw new EpmetException(EpmetErrorCode.INTERNAL_VALIDATE_ERROR.getCode(), EpmetErrorCode.INTERNAL_VALIDATE_ERROR.getMsg(), EpmetErrorCode.INTERNAL_VALIDATE_ERROR.getMsg());
+            }
+            //加密
+            String organizationIdEn = SM4UtilsForYanTai.dealEncryptData(organizationId);
+            //pwd = URLEncoder.encode(pwd, "UTF-8");
+            String url = SSO_BACKGROUND_SERVER_URL + "person/ouinfo/getOuInfoByOuGuid";
+
+            Map<String, Object> paramMap = new HashMap<>();
+            paramMap.put("organizationId",organizationIdEn);
+
+            log.info("getOuInfoByOuGuid    request param:{} url:{}",paramMap, url);
+            Result<String> result = HttpClientManager.getInstance().sendGet(url, paramMap, getApiHeaderMap());
+            log.info("getOuInfoByOuGuid    request result:{}", result);
+            if (!result.success()){
+                return new OrgData();
+            }
+            JSONObject jsonObject = JSONObject.parseObject(result.getData());
+            String secondCode = jsonObject.getString("code");
+            String secondMessage = jsonObject.getString("message");
+            if (!"200".equals(secondCode)) {
+                log.warn("getOuInfoByOuGuid    接口错误");
+                return new OrgData();
+            }
+            //解密
+            String data = SM4UtilsForYanTai.dealDecryptData(jsonObject.getString("data"));
+            OrgData orgData = JSON.parseObject(data, OrgData.class);
+            log.info("getChildOuInfoByGuid request real result:{}", JSON.toJSONString(orgData));
+            return orgData;
+        } catch (Exception e) {
+            log.error("getChildOuInfoByGuid exception", e);
+        }
+        return new OrgData();
+    }
+
+    /**
+     * desc:根据组织id获取下级组织
+     *
+     * @param organizationId
+     * @return
+     */
+    public static List<OrgData> getChildOuInfoByGuid(String organizationId) {
+        try {
+            if (StringUtils.isBlank(organizationId)) {
+                throw new EpmetException(EpmetErrorCode.INTERNAL_VALIDATE_ERROR.getCode(), EpmetErrorCode.INTERNAL_VALIDATE_ERROR.getMsg(), EpmetErrorCode.INTERNAL_VALIDATE_ERROR.getMsg());
+            }
+            //加密
+            String organizationIdEn = SM4UtilsForYanTai.dealEncryptData(organizationId);
+            //pwd = URLEncoder.encode(pwd, "UTF-8");
+            String url = SSO_BACKGROUND_SERVER_URL + "person/ouinfo/getChildOuInfoByGuid";
+
+            Map<String, Object> paramMap = new HashMap<>();
+            paramMap.put("organizationId",organizationIdEn);
+
+            log.info("getChildOuInfoByGuid request param:{} url:{}",paramMap, url);
+            Result<String> result = HttpClientManager.getInstance().sendGet(url, paramMap, getApiHeaderMap());
+            log.info("getChildOuInfoByGuid request result:{}", result);
+            if (!result.success()){
+                return new ArrayList<>();
+            }
+            JSONObject jsonObject = JSONObject.parseObject(result.getData());
+            String secondCode = jsonObject.getString("code");
+            String secondMessage = jsonObject.getString("message");
+            if (!"200".equals(secondCode)) {
+                log.warn("getChildOuInfoByGuid 接口错误");
+                return new ArrayList<>();
+            }
+            //解密
+            String data = SM4UtilsForYanTai.dealDecryptData(jsonObject.getString("data"));
+            List<OrgData> orgData = JSON.parseArray(data, OrgData.class);
+            log.info("getChildOuInfoByGuid request real result:{}", JSON.toJSONString(orgData));
+            return orgData;
+        } catch (Exception e) {
+            log.error("getChildOuInfoByGuid exception", e);
+        }
+        return new ArrayList<>();
+    }
+
+    /**
+     * desc:根据组织id获取下级组织
+     *
+     * @param organizationId
+     * @return
+     */
+    public static List<UserData> getUserByOuGuid(String organizationId) {
+        try {
+            if (StringUtils.isBlank(organizationId)) {
+                throw new EpmetException(EpmetErrorCode.INTERNAL_VALIDATE_ERROR.getCode(), EpmetErrorCode.INTERNAL_VALIDATE_ERROR.getMsg(), EpmetErrorCode.INTERNAL_VALIDATE_ERROR.getMsg());
+            }
+            //加密
+            String organizationIdEn = SM4UtilsForYanTai.dealEncryptData(organizationId);
+            //pwd = URLEncoder.encode(pwd, "UTF-8");
+            String url = SSO_BACKGROUND_SERVER_URL + "person/userInfo/getUserByOuGuid";
+
+
+            Map<String, Object> paramMap = new HashMap<>();
+            paramMap.put("organizationId",organizationIdEn);
+            log.info("getUserByOuGuid request param: url:{},param:{}", url, paramMap);
+            Result<String> result = HttpClientManager.getInstance().sendGet(url, paramMap, getApiHeaderMap());
+            log.info("getUserByOuGuid request result:{}", result);
+            if (!result.success()){
+                return new ArrayList<>();
+            }
+            JSONObject jsonObject = JSONObject.parseObject(result.getData());
+            String secondCode = jsonObject.getString("code");
+            String secondMessage = jsonObject.getString("message");
+            if (!"200".equals(secondCode)) {
+                log.warn("getUserByOuGuid 接口错误");
+                return new ArrayList<>();
+            }
+            //解密
+            String data = SM4UtilsForYanTai.dealDecryptData(jsonObject.getString("data"));
+            List<UserData> userData = JSON.parseArray(data, UserData.class);
+            log.info("getUserByOuGuid request real result:{}", JSON.toJSONString(userData));
+            return userData;
+        } catch (Exception e) {
+            log.error("getUserByOuGuid exception", e);
+        }
+        return new ArrayList<>();
+    }
+
+    /**
+     * desc:根据组织id获取下级组织
+     *
+     * @param code
+     * @return
+     */
+    public static YantaiSSOUser getLoginToken(String code) {
+        try {
+            if (StringUtils.isBlank(code)) {
+                throw new EpmetException(EpmetErrorCode.INTERNAL_VALIDATE_ERROR.getCode(), EpmetErrorCode.INTERNAL_VALIDATE_ERROR.getMsg(), EpmetErrorCode.INTERNAL_VALIDATE_ERROR.getMsg());
+            }
+            //加密
+            String organizationIdEn = SM4UtilsForYanTai.dealEncryptData(code);
+            //pwd = URLEncoder.encode(pwd, "UTF-8");
+            log.info("getLoginToken加密组织Id = " + organizationIdEn);
+            String url = SSO_SERVER + "logintoken?client_id=" + CLIENT_ID + "&client_code=" + code;
+
+            Map<String, Object> headerMap = new HashMap<>();
+            Map<String, Object> paramMap = new HashMap<>();
+            log.info("getUserByOuGuid request param: url:{},header:{}", url, headerMap);
+            Result<String> result = HttpClientManager.getInstance().sendGet(url, paramMap, headerMap);
+            if (!result.success() || StringUtils.isBlank(result.getData())) {
+                log.info("getUserByOuGuid fail result:{}", JSON.toJSONString(result));
+                throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取token为空", "获取token为空");
+            }
+            log.info("getUserByOuGuid request result:{}", result);
+            JSONObject jsonObject = JSONObject.parseObject(result.getData());
+            //解密
+            String errcode = jsonObject.getString("errcode");
+            if (!NumConstant.ZERO_STR.equals(errcode)) {
+                throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取token失败", "获取token失败");
+            }
+            String sencondData = jsonObject.getString("data");
+            log.info("getLoginToken jiami data:{}", sencondData);
+            //String data = SM4UtilsForYanTai.dealDecryptData(sencondData);
+
+
+            String data = TestMs4.decryptEcb(CLIENT_SECRET, sencondData);
+            log.info("getLoginToken jiemi data:{}", sencondData);
+            YantaiSSOUser userData = JSON.parseObject(data, YantaiSSOUser.class);
+            log.info("getUserByOuGuid request real result:{}", JSON.toJSONString(userData));
+            String userInfoMobile = getUserInfoMobile(userData.getUserGuid());
+            userData.setMobile(userInfoMobile);
+            return userData;
+        } catch (Exception e) {
+            log.error("getUserByOuGuid exception", e);
+        }
+        return null;
+    }
+
+    public static String getUserInfoMobile(String userId) {
+        try {
+
+            String userIdEn = SM4UtilsForYanTai.dealEncryptData(userId);
+
+            String serverUrl = SSO_BACKGROUND_SERVER_URL + "person/userInfo/getUserByUserGuid";
+            //String serverUrl = "http://120.220.248.247:8081/person/userInfo/getUserByUserGuid";
+            Map<String, Object> param = new HashMap<>();
+            param.put("userGuid", userIdEn);
+
+            Result<String> result = HttpClientManager.getInstance().sendGet(serverUrl, param, getApiHeaderMap());
+            System.out.println(JSON.toJSONString(result));
+            if (!result.success() || StringUtils.isBlank(result.getData())) {
+                log.info("getUserInfoMobile fail result:{}", JSON.toJSONString(result));
+                throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取用户信息失败", "获取用户信息失败");
+            }
+            String data = result.getData();
+            log.info("getUserInfoMobile jiami data:{}", JSON.parseObject(data));
+            JSONObject jsonObject = JSON.parseObject(data);
+            String secondCode = jsonObject.getString("code");
+            String secondMessage = jsonObject.getString("message");
+            if (!"200".equals(secondCode)) {
+                throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取人员信息接口返回失败" + secondMessage, "获取人员信息接口返回失败" + secondMessage);
+            }
+            String data1 = SM4UtilsForYanTai.dealDecryptData(jsonObject.getString("data"));
+            String telephoneNumber = JSON.parseObject(data1).getString("mobileTelephoneNumber");
+            log.info("getUserInfoMobile jiemi data:{}", telephoneNumber);
+            return telephoneNumber;
+        } catch (Exception e) {
+            log.error("getUserInfoMobile exception", e);
+        }
+        return null;
+    }
+
+    @NotNull
+    private static Map<String, Object> getApiHeaderMap() {
+        Map<String, Object> headerMap = new HashMap<>();
+        try {
+            JSONObject token = new JSONObject();
+            token.put("token", SSO_API_TOKEN);
+            // token.put("token","iJCDUgCBV/Zk5FkkaxLypA==");
+            token.put("expiration", System.currentTimeMillis());
+
+            String tokanStr = SM4UtilsForYanTai.dealEncryptData(token.toString());
+            headerMap.put("Authorization", "Bearer " + tokanStr);
+        } catch (Exception e) {
+            log.error("getApiHeaderMap exception", e);
+        }
+        return headerMap;
+    }
+
+    public static void main(String[] args) throws BadPaddingException, InvalidKeyException, JsonProcessingException {
+
+        //testGetUserByUserId();
+
+        //code只能用一次
+        //getLoginToken("0d554bccfbac4be3846d643252daf92b");
+
+        String organizationId = "44e05de9-34fa-48f6-b89f-02838d792cf9";
+        OrgData ouInfoByOuGuid = getOuInfoByOuGuid(organizationId);
+        System.out.println("ouInfoByOuGuid:"+JSON.toJSONString(ouInfoByOuGuid));
+        List<OrgData> childOuInfoByGuid = getChildOuInfoByGuid(organizationId);
+        System.out.println("childOuInfoByGuid:"+JSON.toJSONString(childOuInfoByGuid));
+        //先用他说的有人的组织id联调
+        //String orgId = "2b271845-ed51-48aa-9935-00b9e7e06311";
+        //orgId = "2b271845-ed51-48aa-9935-00b9e7e05778";
+        List<UserData> userByOuGuid = getUserByOuGuid(organizationId);
+        System.out.println("getUserByOuGuid:"+JSON.toJSONString(userByOuGuid));
+
+        Map<String, Object> apiHeaderMap = getApiHeaderMap();
+        System.out.println(apiHeaderMap);
+        //testGetUserByUserId();
+    }
+
+    private static void testGetUserByUserId() throws JsonProcessingException, InvalidKeyException, BadPaddingException {
+        String testUserId = "0ffd76e2-27b5-4b33-be9a-186f9f878bf1";
+
+        String serverUrl = SSO_BACKGROUND_SERVER_URL +"person/userInfo/getUserByUserGuid";
+        //String serverUrl = "http://120.220.248.247:8081/person/userInfo/getUserByUserGuid";
+        Map<String, Object> param = new HashMap<>();
+        param.put("userGuid", SM4UtilsForYanTai.dealEncryptData(testUserId));
+        Result<String> stringResult = HttpClientManager.getInstance().sendGet(serverUrl, param, getApiHeaderMap());
+        System.out.println(JSON.toJSONString(stringResult));
+
+        String data = stringResult.getData();
+        JSONObject jsonObject = JSON.parseObject(data);
+        String secondCode = jsonObject.getString("code");
+        String secondMessage = jsonObject.getString("message");
+        System.out.println(secondCode);
+        System.out.println(secondMessage);
+        String data1 = SM4UtilsForYanTai.dealDecryptData(jsonObject.getString("data"));
+        System.out.println("======" + data1);
+        String s = SM4UtilsForYanTai.dealDecryptData("EsOeQX+A8+GG26lzLnuKeuylkBDRFcTbF+gE/jURIzddlVI8RToQQhzK4EHy0WfpS/L4dSAJC93UyVLJhj+r/pup2RFq/GjpH7Md+1Mjg3dM+eyDuGql71bUrldQwJXYnHrQm3Mn7tk5m2eLhEVNkFvdELjuy3Kg8YihZXf2Sox+kxtmK4DSIn/gxhVCoUneWeL0cA6JGHI6jNuq97rzgcNK3Mwen8MxOoWP3n3r+kIpwZCwIlL70MrBjIZ6FHIhcxpqL82gpLSe1K0TFgeWw+9PMo1yv4cGZn7rU86TDlQFoDP86dVa1jrBoyUmW/vvLXrMKwfBaiv9/EUzcCLZWYxEwH93n0X/NYCYem3pfv4uXk5A7/D+Npgj9OKCEIz0ROn0UW5NiXI5Vibz0dywaq4sfsR/LiwjV81QOGY9tsHzN2+MnyTVpQg1l7looNnq1j+wwLneS0aDmbTqBLEn/baph/Hnr2L/9HYpWfXkhz93XRNAdsbxhXdG5ZIiJSwNasHinPR3e2Hmn/02GOsBPFUifbyNUtslt4RS/gwboonBoXz8wrmXi+PfzUXwN8f2CKdBNEHl72USp70NtBSJUPAkHdXZEQPgGRped63Z9GA=");
+        System.out.println("sssssss:" + s);
+    }
+}

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/api/yt/YantaiSSOUser.java

@@ -0,0 +1,35 @@
+
+package com.epmet.commons.tools.utils.api.yt;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * sso：认证中心 用户信息
+ * @author liujianjun
+ */
+@Data
+public class YantaiSSOUser implements Serializable {
+
+    private static final long serialVersionUID = -2794280342919451106L;
+
+    /**
+     * 他说这个是手机号
+     */
+    private String clientId;
+    private String departmentCode;
+    private String expirationTime;
+    private String ip;
+    private String issueTime;
+    private String registerGuid;
+    private String registerName;
+    private String userGuid;
+    private String userName;
+
+    /**
+     * 二次请求结果
+     */
+    private String mobile;
+
+}

epmet-gateway/src/main/resources/bootstrap.yml

@@ -536,6 +536,9 @@ epmet:
     - /gov/org/ichouse/houseoption
     - /epmetuser/icresicollect/save
     - /gov/org/customergrid/gridoption
+    # 员工登记、受众群体登记
+    - /gov/org/icEmployeeRegister/add
+    - /gov/org/icGroupPeopleRegister/add
   # 外部应用认证，使用AccessToken等头进行认证
   externalOpenUrls:
     - /data/report/**

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govissue/IssueApplicationDTO.java

@@ -73,6 +73,8 @@ public class IssueApplicationDTO implements Serializable {
      * 网格ID 居民端议题对应一个网格Id
      */
 	private String gridId;
+    private String orgId;
+    private String orgIdPath;
 
     /**
      * 审核通过后对应的 议题id

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govissue/result/IssueListResultDTO.java

@@ -108,7 +108,10 @@ public class IssueListResultDTO implements Serializable {
 
     @JsonIgnore
     private String applyStatus;
-
+    /**
+     * 来源类型 话题：resi_topic；直接立议题：issue；事件：ic_event
+     */
+    private String sourceType;
     public IssueListResultDTO() {
         this.issueId = "";
         this.issueTitle = "";
@@ -129,5 +132,6 @@ public class IssueListResultDTO implements Serializable {
         this.projectId = "";
         this.issueClosedTime = 0L;
         this.issueApplicationId = "";
+        this.sourceType="";
     }
 }

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/StaffDetailV2FormDTO.java

@@ -42,5 +42,10 @@ public class StaffDetailV2FormDTO implements Serializable {
     private String orgType = "";
     //职责名称列表
     private List<String> roles;
+    /**
+     * 数字社区里的角色名称
+     */
+    private List<String> szsqRoles;
+    private String customerId;
 
 }

epmet-module/data-aggregator/data-aggregator-server/pom.xml

@@ -133,6 +133,18 @@
             <version>2.0.0</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>epmet-commons-rocketmq</artifactId>
+            <version>2.0.0</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>epmet-message-client</artifactId>
+            <version>2.0.0</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/CoverageController.java

@@ -1,6 +1,7 @@
 package com.epmet.dataaggre.controller;
 
 import com.epmet.commons.tools.annotation.LoginUser;
+import com.epmet.commons.tools.annotation.MaskResponse;
 import com.epmet.commons.tools.dto.result.ZhzlCategorySelectDTO;
 import com.epmet.commons.tools.enums.ZhzlResiCategoryEnum;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
@@ -74,6 +75,7 @@ public class CoverageController {
      * @author zxc
      * @date 2022/7/26 16:29
      */
+    @MaskResponse(fieldNames = {"mobile","idCard"}, fieldsMaskType = {MaskResponse.MASK_TYPE_MOBILE,MaskResponse.MASK_TYPE_ID_CARD})
     @PostMapping("search")
     public Result<CoverageHomeSearchResultDTO> coverageHomeSearch(@RequestBody CoverageHomeSearchFormDTO formDTO, @LoginUser TokenDto tokenDto){
         formDTO.setCustomerId(tokenDto.getCustomerId());

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetUserController.java

@@ -14,6 +14,8 @@ import com.epmet.dataaggre.dto.govorg.result.GridMemberDataAnalysisResultDTO;
 import com.epmet.dataaggre.excel.StaffPatrollExcel;
 import com.epmet.dataaggre.service.datastats.DataStatsService;
 import com.epmet.dataaggre.service.epmetuser.EpmetUserService;
+import com.epmet.dto.form.DetailByTypeFormDTO;
+import com.epmet.dto.result.DetailByTypeResultDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -285,4 +287,16 @@ public class EpmetUserController {
         return new Result<List<GridMemberPatrolListResultDTO>>().ok(epmetUserService.gridMemberPatrolList(formDTO));
     }
 
+    /**
+     * Desc: 数据明文查询
+     * @param formDTO
+     * @author zxc
+     * @date 2022/10/17 13:45
+     */
+    @PostMapping("detailByType")
+    public Result<DetailByTypeResultDTO> detailByType(@RequestBody DetailByTypeFormDTO formDTO, @LoginUser TokenDto tokenDto){
+        ValidatorUtils.validateEntity(formDTO, DetailByTypeFormDTO.DetailByTypeForm.class);
+        return new Result<DetailByTypeResultDTO>().ok(epmetUserService.detailByType(formDTO,tokenDto));
+    }
+
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/IcResiUserDao.java

@@ -30,6 +30,7 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 用户基础信息
@@ -138,4 +139,14 @@ public interface IcResiUserDao extends BaseDao<IcResiUserEntity> {
                                                     @Param("agencyId")String agencyId,
                                                     @Param("staffOrgIds")String staffOrgIds,
                                                     @Param("search")String search);
+
+    Map<String,String> getTripReportRecordInfo(@Param("id")String id);
+
+    Map<String,String> getVaccineRecordInfo(@Param("id")String id);
+
+    Map<String,String> getSpecialAttentionInfo(@Param("id")String id);
+
+    Map<String,String> getNoNatCompareInfo(@Param("id")String id);
+
+    Map<String,String> getNatInfo(@Param("id")String id);
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerAgencyDao.java

@@ -26,6 +26,7 @@ import org.apache.ibatis.annotations.Param;
 
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 机关单位信息表
@@ -110,4 +111,12 @@ public interface CustomerAgencyDao extends BaseDao<CustomerAgencyEntity> {
     List<String> getSubAgencyList(@Param("agencyId") String agencyId);
 
     List<ScreenCustomerAgencyDTO> getSubAgencyListByAgency(@Param("customerId") String customerId, @Param("agencyId") String agencyId);
+
+    /**
+     * @Description 查询员工的证件号和手机号
+     * @param registerId
+     * @Author zxc
+     * @Date 2022/10/27 14:03
+     */
+    Map<String, String> getEmployeeRegisterMobileAndIdCard(@Param("registerId") String registerId);
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govissue/IssueApplicationEntity.java

@@ -70,6 +70,9 @@ public class IssueApplicationEntity extends BaseEpmetEntity {
      */
 	private String gridId;
 
+	private String orgId;
+	private String orgIdPath;
+
     /**
      * 审核通过后对应的 议题id
      */

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java

@@ -1,6 +1,7 @@
 package com.epmet.dataaggre.service.epmetuser;
 
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.dataaggre.dto.datastats.form.NowStatsDataFormDTO;
 import com.epmet.dataaggre.dto.datastats.result.NowStatsDataResultDTO;
 import com.epmet.dataaggre.dto.epmetuser.form.*;
@@ -20,6 +21,8 @@ import com.epmet.dataaggre.entity.epmetuser.IcPointVaccinesInoculationEntity;
 import com.epmet.dataaggre.entity.epmetuser.IcResiUserEntity;
 import com.epmet.dto.IcResiUserDTO;
 import com.epmet.dto.UserBaseInfoDTO;
+import com.epmet.dto.form.DetailByTypeFormDTO;
+import com.epmet.dto.result.DetailByTypeResultDTO;
 
 import java.util.List;
 import java.util.Map;
@@ -250,4 +253,14 @@ public interface EpmetUserService {
     List<IcPointVaccinesInoculationEntity> listVaccinePoints(String customerId, String agencyId, String staffOrgIds, String search);
 
     List<IcPointNucleicMonitoringEntity> listNucleicPoints(String customerId, String agencyId,String staffOrgIds, String search);
+
+
+    /**
+     * Desc: 数据明文查询
+     * @param formDTO
+     * @author zxc
+     * @date 2022/10/17 13:45
+     */
+    DetailByTypeResultDTO detailByType(DetailByTypeFormDTO formDTO, TokenDto tokenDto);
+
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java

@@ -2,16 +2,29 @@ package com.epmet.dataaggre.service.epmetuser.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
+import com.epmet.commons.rocketmq.constants.TopicConstants;
+import com.epmet.commons.rocketmq.messages.CheckMQMsg;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.dto.form.IdAndNameDTO;
 import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
 import com.epmet.commons.tools.enums.OrgTypeEnum;
+import com.epmet.commons.tools.exception.EpmetException;
+import com.epmet.commons.tools.exception.EpmetErrorCode;
+import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.redis.common.CustomerIcHouseRedis;
+import com.epmet.commons.tools.redis.common.CustomerResiUserRedis;
 import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
+import com.epmet.commons.tools.redis.common.bean.HouseInfoCache;
+import com.epmet.commons.tools.redis.common.bean.IcResiUserInfoCache;
+import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.DateUtils;
+import com.epmet.commons.tools.utils.IpUtils;
+import com.epmet.commons.tools.utils.Result;
 import com.epmet.constant.BadgeConstant;
+import com.epmet.constant.NeighborhoodConstant;
 import com.epmet.constant.OrgInfoConstant;
 import com.epmet.dataaggre.constant.DataSourceConstant;
 import com.epmet.dataaggre.dao.epmetuser.*;
@@ -42,7 +55,14 @@ import com.epmet.dataaggre.service.govproject.GovProjectService;
 import com.epmet.dataaggre.service.opercustomize.CustomerFootBarService;
 import com.epmet.dto.IcResiUserDTO;
 import com.epmet.dto.UserBaseInfoDTO;
+import com.epmet.dto.form.DetailByTypeFormDTO;
+import com.epmet.dto.form.SystemMsgFormDTO;
+import com.epmet.dto.result.DetailByTypeResultDTO;
+import com.epmet.dto.form.GetStaffExistRoleFormDTO;
+import com.epmet.dto.result.NewUserRoleResultDTO;
 import com.epmet.dto.result.StaffRoleResultDTO;
+import com.epmet.feign.EpmetMessageOpenFeignClient;
+import com.epmet.feign.GovAccessFeignClient;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import lombok.extern.slf4j.Slf4j;
@@ -51,8 +71,11 @@ import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 import java.text.NumberFormat;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -98,6 +121,10 @@ public class EpmetUserServiceImpl implements EpmetUserService {
     private IcPointVaccinesInoculationDao pointVaccinesInoculationDao;
     @Resource
     private IcPointNucleicMonitoringDao pointNucleicMonitoringDao;
+    @Autowired
+    private EpmetMessageOpenFeignClient epmetMessageOpenFeignClient;
+    @Autowired
+    private GovAccessFeignClient govAccessFeignClient;
 
     /**
      * @Description  根据UserIds查询
@@ -714,7 +741,8 @@ public class EpmetUserServiceImpl implements EpmetUserService {
         //基本信息
         CustomerStaffDTO dto = customerStaffDao.selectByStaffId(staffId);
         if (null == dto) {
-            return result;
+            // return result;
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"customer_staff is null staffId:"+staffId,"未查询到工作人员基础信息");
         }
         //角色信息
         List<String> list = staffRoleDao.selectByStaffId(staffId);
@@ -724,7 +752,16 @@ public class EpmetUserServiceImpl implements EpmetUserService {
         result.setName(dto.getRealName());
         result.setGender(dto.getGender().toString());
         result.setRoles(list);
-
+        // 获取数字社区里的新角色
+        GetStaffExistRoleFormDTO getStaffExistRoleFormDTO = new GetStaffExistRoleFormDTO();
+        getStaffExistRoleFormDTO.setStaffId(staffId);
+        getStaffExistRoleFormDTO.setCustomerId(dto.getCustomerId());
+        Result<List<NewUserRoleResultDTO>> staffExistRole = govAccessFeignClient.getStaffExistRole(getStaffExistRoleFormDTO);
+        if (staffExistRole.success()&&CollectionUtils.isNotEmpty(staffExistRole.getData())){
+            // 过滤selected=true的
+            List<String> szsqRoles=staffExistRole.getData().stream().filter(t->t.getSelected()).map(m -> m.getRoleName()).distinct().collect(Collectors.toList());
+            result.setSzsqRoles(szsqRoles);
+        }
         return result;
     }
 
@@ -971,4 +1008,121 @@ public class EpmetUserServiceImpl implements EpmetUserService {
         query.like(StringUtils.isNotBlank(search), IcPointNucleicMonitoringEntity::getName, search);
         return pointNucleicMonitoringDao.selectList(query);
     }
+
+    @Override
+    public DetailByTypeResultDTO detailByType(DetailByTypeFormDTO formDTO, TokenDto tokenDto) {
+        DetailByTypeResultDTO result = new DetailByTypeResultDTO();
+        String customerId = tokenDto.getCustomerId();
+        String userId = tokenDto.getUserId();
+        CheckMQMsg msg = new CheckMQMsg();
+        if (formDTO.getType().equals(NeighborhoodConstant.CHECK_HOUSE)){
+            HouseInfoCache houseInfo = CustomerIcHouseRedis.getHouseInfo(customerId, formDTO.getId());
+            if (null == houseInfo){
+                throw new EpmetException("查询房屋信息失败："+formDTO.getId());
+            }
+            result.setMobile(houseInfo.getOwnerPhone());
+            result.setIdCard(houseInfo.getOwnerIdCard());
+            msg.setContent("查看"+houseInfo.getAllName()+"房屋的敏感信息");
+        }else if (formDTO.getType().equals(NeighborhoodConstant.CHECK_IC_RESI_USER)){
+            IcResiUserInfoCache icResiUserInfo = CustomerResiUserRedis.getIcResiUserInfo(formDTO.getId());
+            if (null == icResiUserInfo){
+                throw new EpmetException("查询icResiUser失败："+formDTO.getId());
+            }
+            result.setIdCard(icResiUserInfo.getIdCard());
+            result.setMobile(icResiUserInfo.getMobile());
+            msg.setContent("查看"+icResiUserInfo.getName()+"的敏感信息");
+        }else if (formDTO.getType().equals(NeighborhoodConstant.JMFYXX)){
+            IcResiUserInfoCache icResiUserInfo = CustomerResiUserRedis.getIcResiUserInfo(formDTO.getId());
+            if (null == icResiUserInfo){
+                throw new EpmetException("查询icResiUser失败："+formDTO.getId());
+            }
+            result.setIdCard(icResiUserInfo.getIdCard());
+            result.setMobile(icResiUserInfo.getMobile());
+            msg.setContent("查看"+icResiUserInfo.getName()+"的敏感信息(居民防疫信息)");
+        }else if (formDTO.getType().equals(NeighborhoodConstant.ROUTE_FOLLOW)){
+            Map<String, String> info = icResiUserDao.getTripReportRecordInfo(formDTO.getId());
+            if (null == info){
+                throw new EpmetException("未查询到行程随访信息："+formDTO.getId());
+            }
+            result.setIdCard(info.get(NeighborhoodConstant.ID_CARD));
+            result.setMobile(info.get(NeighborhoodConstant.MOBILE));
+            msg.setContent("查看"+info.get(NeighborhoodConstant.NAME)+"的敏感信息(行程随访)");
+        }else if (formDTO.getType().equals(NeighborhoodConstant.VACCINATION_RECORD)){
+            Map<String, String> info = icResiUserDao.getVaccineRecordInfo(formDTO.getId());
+            if (null == info){
+                throw new EpmetException("未查询到疫苗接种信息："+formDTO.getId());
+            }
+            result.setIdCard(info.get(NeighborhoodConstant.ID_CARD));
+            result.setMobile(info.get(NeighborhoodConstant.MOBILE));
+            msg.setContent("查看"+info.get(NeighborhoodConstant.NAME)+"的敏感信息(疫苗接种记录)");
+        }else if (formDTO.getType().equals(NeighborhoodConstant.VACCINE_SPECIAL_ATTENTION)
+        || formDTO.getType().equals(NeighborhoodConstant.FOCUS_GROUP_SPECIAL_ATTENTION_QUARANTINE)
+        || formDTO.getType().equals(NeighborhoodConstant.FOCUS_GROUP_SPECIAL_ATTENTION_HISTORY)){
+            Map<String, String> info = icResiUserDao.getSpecialAttentionInfo(formDTO.getId());
+            if (null == info){
+                throw new EpmetException("未查询到特别关注名单信息："+formDTO.getId());
+            }
+            result.setIdCard(info.get(NeighborhoodConstant.ID_CARD));
+            result.setMobile(info.get(NeighborhoodConstant.MOBILE));
+            String cMsg = "";
+            switch (formDTO.getType()){
+                case NeighborhoodConstant.VACCINE_SPECIAL_ATTENTION:
+                    cMsg = "疫苗接种关注名单";
+                    break;
+                case NeighborhoodConstant.FOCUS_GROUP_SPECIAL_ATTENTION_QUARANTINE:
+                    cMsg = "重点人群关注名单(防疫隔离)";
+                    break;
+                case NeighborhoodConstant.FOCUS_GROUP_SPECIAL_ATTENTION_HISTORY:
+                    cMsg = "重点人群关注名单(历史记录)";
+                    break;
+                default:
+            }
+            msg.setContent("查看"+info.get(NeighborhoodConstant.NAME)+"的敏感信息("+cMsg+")");
+
+        }else if (formDTO.getType().equals(NeighborhoodConstant.NO_NAT_COMPARE)){
+            Map<String, String> info = icResiUserDao.getNoNatCompareInfo(formDTO.getId());
+            if (null == info){
+                throw new EpmetException("未查询到未做核酸比对信息："+formDTO.getId());
+            }
+            result.setIdCard(info.get(NeighborhoodConstant.ID_CARD));
+            result.setMobile(info.get(NeighborhoodConstant.MOBILE));
+            msg.setContent("查看"+info.get(NeighborhoodConstant.NAME)+"的敏感信息(未做核酸比对)");
+        }else if (formDTO.getType().equals(NeighborhoodConstant.NAT_RECORD)){
+            Map<String, String> info = icResiUserDao.getNatInfo(formDTO.getId());
+            if (null == info){
+                throw new EpmetException("未查询到核酸检测信息："+formDTO.getId());
+            }
+            result.setIdCard(info.get(NeighborhoodConstant.ID_CARD));
+            result.setMobile(info.get(NeighborhoodConstant.MOBILE));
+            msg.setContent("查看"+info.get(NeighborhoodConstant.NAME)+"的敏感信息(核酸检测信息)");
+        }else if (formDTO.getType().equals(NeighborhoodConstant.EMPLOYEE_EPIDEMIC_MANAGE_DETAIL)){
+            Map<String, String> info = govOrgService.getEmployeeRegisterMobileAndIdCard(formDTO.getId());
+            if (null == info){
+                throw new EpmetException("未查询到员工登记信息："+formDTO.getId());
+            }
+            result.setIdCard(info.get(NeighborhoodConstant.ID_CARD));
+            result.setMobile(info.get(NeighborhoodConstant.MOBILE));
+            msg.setContent("查看"+info.get(NeighborhoodConstant.NAME)+"的敏感信息(员工登记信息)");
+        }
+        // 发送mq消息
+        HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+        msg.setOperateTime(new Date());
+        msg.setType(formDTO.getType());
+        msg.setTypeDisplay(msg.getContent());
+        msg.setUserId(userId);
+        CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(customerId, userId);
+        if(null == staffInfo){
+            throw new EpmetException("未查询到工作人员信息："+userId);
+        }
+        msg.setOrgId(staffInfo.getAgencyId());
+        msg.setOrgIdPath(StringUtils.isBlank(staffInfo.getAgencyPIds()) ? staffInfo.getAgencyId() : staffInfo.getAgencyPIds().concat(":").concat(staffInfo.getAgencyId()));
+        msg.setFromApp(tokenDto.getApp());
+        msg.setIp(IpUtils.getIpAddr(request));
+        msg.setFromClient(tokenDto.getClient());
+        SystemMsgFormDTO form = new SystemMsgFormDTO();
+        form.setMessageType(TopicConstants.CHECK_OR_EXPORT);
+        form.setContent(msg);
+        epmetMessageOpenFeignClient.sendSystemMsgByMQ(form);
+        return result;
+    }
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java

@@ -17,6 +17,7 @@ import com.epmet.dto.IcNeighborHoodDTO;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Author zxc
@@ -292,4 +293,12 @@ public interface GovOrgService {
 
     ScreenAgencyOrGridListDTO getSubAgencyOrGridList(String customerId, String agencyId, Boolean isGetSubAllGrid);
 
+    /**
+     * @Description 查询员工的证件号和手机号
+     * @param registerId
+     * @Author zxc
+     * @Date 2022/10/27 14:03
+     */
+    Map<String,String> getEmployeeRegisterMobileAndIdCard(String registerId);
+
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java

@@ -504,8 +504,9 @@ public class GovOrgServiceImpl implements GovOrgService {
     public StaffDetailV2FormDTO staffDetailV2(StaffDetailV2ResultDTO formDTO) {
         //1.查询工作人员基本信息、角色信息
         StaffDetailV2FormDTO result = epmetUserService.selectByStaffId(formDTO.getStaffId());
-        if (null == result) {
+        if (null == result||StringUtils.isBlank(result.getStaffId())) {
-            return new StaffDetailV2FormDTO();
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"customer_staff is null staffId:"+formDTO.getStaffId(),"未查询到工作人员基本信息");
+            // return new StaffDetailV2FormDTO();
         }
 
         //2.查询工作人员注册组织关系信息
@@ -513,7 +514,7 @@ public class GovOrgServiceImpl implements GovOrgService {
         staffIdList.add(formDTO.getStaffId());
         List<StaffOrgNameResultDTO> list = customerAgencyDao.selelctStaffOrg(staffIdList);
         if (null == list || list.size() < NumConstant.ONE) {
-            throw new RenException("未查询到工作人员注册组织信息");
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"未查询到工作人员注册组织信息","未查询到工作人员所属组织信息");
         }
 
         //3.封装数据并返回
@@ -1522,4 +1523,15 @@ public class GovOrgServiceImpl implements GovOrgService {
         return resultDTO;
     }
 
+    /**
+     * @Description 查询员工的证件号和手机号
+     * @param registerId
+     * @Author zxc
+     * @Date 2022/10/27 14:03
+     */
+    @Override
+    public Map<String, String> getEmployeeRegisterMobileAndIdCard(String registerId) {
+        return customerAgencyDao.getEmployeeRegisterMobileAndIdCard(registerId);
+    }
+
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java

@@ -9,6 +9,7 @@ import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.exception.ExceptionUtils;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.processor.MaskProcessor;
 import com.epmet.commons.tools.redis.common.CustomerIcHouseRedis;
 import com.epmet.commons.tools.redis.common.CustomerOrgRedis;
 import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
@@ -670,7 +671,7 @@ public class CoverageServiceImpl implements CoverageService {
 
                 return new CoverageAnalisisDataListResultDTO(
                         re.getId(), categoryKey, isPage ? categoryDict.getCategoryName() : null, placeType,
-                        re.getName().concat(StrConstant.BRACKET_LEFT).concat(re.getIdCard()).concat(StrConstant.BRACKET_RIGNT),
+                        re.getName().concat(StrConstant.BRACKET_LEFT).concat(MaskProcessor.maskIdCard(re.getIdCard())).concat(StrConstant.BRACKET_RIGNT),
                         coordinates[1], coordinates[0]);
 
             }).collect(Collectors.toList());
@@ -684,7 +685,7 @@ public class CoverageServiceImpl implements CoverageService {
 
                 return new CoverageAnalisisDataListResultDTO(
                         re.getId(), categoryKey, isPage ? categoryDict.getCategoryName() : null, placeType,
-                        re.getName().concat(StrConstant.BRACKET_LEFT).concat(re.getIdNum()).concat(StrConstant.BRACKET_RIGNT),
+                        re.getName().concat(StrConstant.BRACKET_LEFT).concat(MaskProcessor.maskIdCard(re.getIdNum())).concat(StrConstant.BRACKET_RIGNT),
                         coordinates[1], coordinates[0]);
 
             }).collect(Collectors.toList());
@@ -1276,4 +1277,4 @@ public class CoverageServiceImpl implements CoverageService {
         }
         return resultList;
     }
-}
+}

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml

@@ -283,4 +283,47 @@
         having volunteerCategory is null
             or volunteerCategory = ''
     </select>
+
+    <select id="getTripReportRecordInfo" resultType="java.util.Map">
+        select
+            MOBILE,
+            ID_CARD,
+            NAME
+        from ic_trip_report_record
+        where id = #{id}
+    </select>
+    <select id="getVaccineRecordInfo" resultType="java.util.Map">
+        select
+            MOBILE,
+            ID_CARD,
+            NAME
+        from ic_vaccine
+        where id = #{id}
+    </select>
+
+    <select id="getSpecialAttentionInfo" resultType="java.util.Map">
+        select
+            MOBILE,
+            ID_CARD,
+            NAME
+        from ic_epidemic_special_attention
+        where id = #{id}
+    </select>
+
+    <select id="getNoNatCompareInfo" resultType="java.util.Map">
+        select
+            MOBILE,
+            ID_CARD,
+            NAME
+        from ic_nat_compare_record
+        where id = #{id}
+    </select>
+    <select id="getNatInfo" resultType="java.util.Map">
+        select
+            MOBILE,
+            ID_CARD,
+            NAME
+        from ic_nat
+        where id = #{id}
+    </select>
 </mapper>

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govissue/IssueApplicationDao.xml

@@ -12,7 +12,12 @@
             ia.TOPIC_ID,
             iah.REASON AS rejectedReason,
             ia.grid_id,
-            ia.apply_status
+            ia.apply_status,
+            (
+                case when ia.TOPIC_ID is not null then 'resi_topic'
+                else ''
+                end
+            ) as sourceType
         FROM issue_application_history iah
         LEFT JOIN issue_application ia ON iah.ISSUE_APPLICATION_ID = ia.ID AND ia.APPLY_STATUS = 'rejected'
         WHERE ia.DEL_FLAG = 0
@@ -31,7 +36,12 @@
             ISSUE_TITLE,
             UNIX_TIMESTAMP(CREATED_TIME) AS auditingTime,
             TOPIC_ID,
-            grid_id
+            grid_id,
+            (
+                case when TOPIC_ID is not null then 'resi_topic'
+                else ''
+                end
+            ) as sourceType
         FROM issue_application
         WHERE DEL_FLAG = 0
             AND (

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govissue/IssueDao.xml

@@ -12,7 +12,8 @@
             ISSUE_TITLE AS issueTitle ,
             UNIX_TIMESTAMP(CREATED_TIME) AS createTime,
             SUGGESTION,
-            grid_id
+            grid_id,
+            SOURCE_TYPE as sourceType
         FROM issue
         WHERE DEL_FLAG = '0'
             AND ISSUE_STATUS = #{issueStatus}
@@ -30,7 +31,8 @@
             SUGGESTION ,
             UNIX_TIMESTAMP(SHIFTED_TIME) AS shiftProjectTime,
             grid_id,
-            issue_title
+            issue_title,
+            SOURCE_TYPE as sourceType
         FROM issue
         WHERE DEL_FLAG = '0'
           AND ISSUE_STATUS = 'shift_project'

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerAgencyDao.xml

@@ -326,4 +326,9 @@
         AND pid = #{agencyId}
     </select>
 
+    <!-- 查询员工的证件号和手机号 -->
+    <select id="getEmployeeRegisterMobileAndIdCard" resultType="java.util.Map">
+        select MOBILE,ID_CARD,NAME from ic_employee_register where id = #{registerId}
+    </select>
+
 </mapper>

epmet-module/data-report/data-report-client/src/main/java/com/epmet/constant/DataSourceConstant.java

@@ -7,5 +7,6 @@ public interface DataSourceConstant {
      */
     String EVALUATION_INDEX = "evaluationIndex";
     String STATS_DISPLAY = "statsDisplay";
+    String STATS = "stats";
 
 }

epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/form/stats/UserHouseStatsQueryFormDTO.java

@@ -0,0 +1,23 @@
+package com.epmet.dto.form.stats;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * 人房信息查询dto
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class UserHouseStatsQueryFormDTO {
+
+    private String orgId;
+    private String orgType;
+
+    @NotBlank(message = "dateId不能为空")
+    private String dateId;
+
+}

epmet-module/data-report/data-report-client/src/main/java/com/epmet/feign/DataReportOpenFeignClient.java

@@ -2,11 +2,15 @@ package com.epmet.feign;
 
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.form.stats.UserHouseStatsQueryFormDTO;
 import com.epmet.dto.result.plugins.AgencyNodeDTO;
 import com.epmet.feign.impl.DataReportOpenFeignClientFallBackFactory;
+import com.epmet.stats.UserHouseStatsResultDTO;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 
 /**
  * 本服务对外开放的API,其他服务通过引用此client调用该服务
@@ -24,4 +28,12 @@ public interface DataReportOpenFeignClient {
      **/
     @GetMapping("/data/report/screen/agency/querystaffagencytree/{agencyId}")
     Result<AgencyNodeDTO> queryStaffAgencyTree(@PathVariable("agencyId") String agencyId);
+
+    /**
+     * 通过dateId查询人房统计信息
+     * @param input  3个参数，就不用dto了，类太多：
+     * @return
+     */
+    @PostMapping("/data/report/userHouse/getUserHouseDailyStatsByDateId")
+    Result<UserHouseStatsResultDTO> getUserHouseDailyStatsByDateId(@RequestBody UserHouseStatsQueryFormDTO input);
 }

epmet-module/data-report/data-report-client/src/main/java/com/epmet/feign/impl/DataReportOpenFeignClientFallBack.java

@@ -3,8 +3,10 @@ package com.epmet.feign.impl;
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.form.stats.UserHouseStatsQueryFormDTO;
 import com.epmet.dto.result.plugins.AgencyNodeDTO;
 import com.epmet.feign.DataReportOpenFeignClient;
+import com.epmet.stats.UserHouseStatsResultDTO;
 
 //@Component
 public class DataReportOpenFeignClientFallBack implements DataReportOpenFeignClient {
@@ -17,4 +19,9 @@ public class DataReportOpenFeignClientFallBack implements DataReportOpenFeignCli
     public Result<AgencyNodeDTO> queryStaffAgencyTree(String agencyId) {
         return ModuleUtils.feignConError(ServiceConstant.DATA_REPORT_SERVER, "queryStaffAgencyTree",agencyId);
     }
+
+    @Override
+    public Result<UserHouseStatsResultDTO> getUserHouseDailyStatsByDateId(UserHouseStatsQueryFormDTO input) {
+        return ModuleUtils.feignConError(ServiceConstant.DATA_REPORT_SERVER, "getUserHouseDailyStatsByDateId",input);
+    }
 }

epmet-module/data-report/data-report-client/src/main/java/com/epmet/stats/UserHouseStatsResultDTO.java

@@ -0,0 +1,18 @@
+package com.epmet.stats;
+
+import lombok.Data;
+
+/**
+ * 人房信息统计
+ */
+@Data
+public class UserHouseStatsResultDTO {
+    private Integer houseTotal = 0;
+    private Integer zzHouseTotal = 0;
+    private Integer czHouseTotal = 0;
+    private Integer xzHouseTotal = 0;
+    private Integer userTotal = 0;
+    private Integer czUserTotal = 0;
+    private Integer ldUserTotal = 0;
+    private Integer usingCommunityNum = 0;
+}

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/stats/UserHouseController.java

@@ -0,0 +1,37 @@
+package com.epmet.datareport.controller.stats;
+
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.datareport.service.stats.UserHouseStatsService;
+import com.epmet.dto.form.stats.UserHouseStatsQueryFormDTO;
+import com.epmet.stats.UserHouseStatsResultDTO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("userHouse")
+public class UserHouseController {
+
+    @Autowired
+    private UserHouseStatsService userHouseStatsService;
+
+    /**
+     * 通过dateId查询人房统计信息
+     * @param input
+     * @return
+     */
+    @PostMapping("getUserHouseDailyStatsByDateId")
+    public Result<UserHouseStatsResultDTO> getUserHouseDailyStatsByDateId(@RequestBody UserHouseStatsQueryFormDTO input) {
+        ValidatorUtils.validateEntity(input);
+        String orgId = input.getOrgId();
+        String orgType = input.getOrgType();
+        String dateId = input.getDateId();
+
+        UserHouseStatsResultDTO r = userHouseStatsService.getUserHouseDailyStats(orgId, orgType, dateId);
+        return new Result<UserHouseStatsResultDTO>().ok(r);
+    }
+
+}

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/stats/FactAgencyUserHouseDailyDao.java

@@ -0,0 +1,17 @@
+package com.epmet.datareport.dao.stats;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.datareport.entity.stats.FactAgencyUserHouseDailyEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+
+/**
+ * 人房信息统计数，按天统计
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-05-27
+ */
+@Mapper
+public interface FactAgencyUserHouseDailyDao extends BaseDao<FactAgencyUserHouseDailyEntity> {
+
+}

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/stats/FactGridUserHouseDailyDao.java

@@ -0,0 +1,17 @@
+package com.epmet.datareport.dao.stats;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.datareport.entity.stats.FactGridUserHouseDailyEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+
+/**
+ * 网格的人房信息统计数，按天统计
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-05-27
+ */
+@Mapper
+public interface FactGridUserHouseDailyDao extends BaseDao<FactGridUserHouseDailyEntity> {
+
+}

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/entity/stats/FactAgencyUserHouseDailyEntity.java

@@ -0,0 +1,115 @@
+package com.epmet.datareport.entity.stats;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 人房信息统计数，按天统计
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-05-27
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("fact_agency_user_house_daily")
+public class FactAgencyUserHouseDailyEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户id
+     */
+	private String customerId;
+
+    /**
+     * 数据更新至：yyyyMMdd; 
+     */
+	private String dateId;
+
+    /**
+     * 组织id
+     */
+	private String agencyId;
+
+    /**
+     * agency_id所属的机关级别（社区级：community，
+乡（镇、街道）级:street,
+区县级: district,
+市级: city
+省级:province）
+     */
+	private String level;
+
+    /**
+     * 组织i所属的组织id
+     */
+	private String pid;
+
+    /**
+     * 组织i所有上级id
+     */
+	private String pids;
+
+    /**
+     * 小区总数
+     */
+	private Integer neighbourhoodsCount;
+
+    /**
+     * 房屋总数
+     */
+	private Integer houseCount;
+
+    /**
+     * 自住房屋总数
+     */
+	private Integer houseSelfCount;
+
+    /**
+     * 出租房屋总数
+     */
+	private Integer houseLeaseCount;
+
+    /**
+     * 闲置房屋总数
+     */
+	private Integer houseIdleCount;
+
+    /**
+     * 居民总数
+     */
+	private Integer userCount;
+
+    /**
+     * 常住居民总数
+     */
+	private Integer userResiCount;
+
+    /**
+     * 流动居民总数
+     */
+	private Integer userFloatCount;
+
+    /**
+     * 当日新增房屋数
+     */
+	private Integer houseIncr;
+
+    /**
+     * 当日修改房屋数
+     */
+	private Integer houseModify;
+
+    /**
+     * 当日新增居民数
+     */
+	private Integer userIncr;
+
+    /**
+     * 当日修改居民数
+     */
+	private Integer userModify;
+
+}

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/entity/stats/FactGridUserHouseDailyEntity.java

@@ -0,0 +1,106 @@
+package com.epmet.datareport.entity.stats;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 网格的人房信息统计数，按天统计
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-05-27
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("fact_grid_user_house_daily")
+public class FactGridUserHouseDailyEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户id
+     */
+	private String customerId;
+
+    /**
+     * 数据更新至：yyyyMMdd; 
+     */
+	private String dateId;
+
+    /**
+     * 网格id
+     */
+	private String gridId;
+
+    /**
+     * 网格所属的组织id
+     */
+	private String pid;
+
+    /**
+     * 网格所有上级id
+     */
+	private String pids;
+
+    /**
+     * 小区总数
+     */
+	private Integer neighbourhoodsCount;
+
+    /**
+     * 房屋总数
+     */
+	private Integer houseCount;
+
+    /**
+     * 自住房屋总数
+     */
+	private Integer houseSelfCount;
+
+    /**
+     * 出租房屋总数
+     */
+	private Integer houseLeaseCount;
+
+    /**
+     * 闲置房屋总数
+     */
+	private Integer houseIdleCount;
+
+    /**
+     * 居民总数
+     */
+	private Integer userCount;
+
+    /**
+     * 常住居民总数
+     */
+	private Integer userResiCount;
+
+    /**
+     * 流动居民总数
+     */
+	private Integer userFloatCount;
+
+    /**
+     * 当日新增房屋数
+     */
+	private Integer houseIncr;
+
+    /**
+     * 当日修改房屋数
+     */
+	private Integer houseModify;
+
+    /**
+     * 当日新增居民数
+     */
+	private Integer userIncr;
+
+    /**
+     * 当日修改居民数
+     */
+	private Integer userModify;
+
+}

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/stats/UserHouseStatsService.java

@@ -0,0 +1,19 @@
+package com.epmet.datareport.service.stats;
+
+import com.epmet.stats.UserHouseStatsResultDTO;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * 人房统计service
+ */
+public interface UserHouseStatsService {
+
+    /**
+     * 查询指定dateId的人房统计信息
+     * @param orgId
+     * @param orgType
+     * @param dateId
+     * @return
+     */
+    UserHouseStatsResultDTO getUserHouseDailyStats(String orgId, String orgType, String dateId);
+}

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/stats/impl/UserHouseStatsServiceImpl.java

@@ -0,0 +1,87 @@
+package com.epmet.datareport.service.stats.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
+import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
+import com.epmet.commons.tools.exception.EpmetException;
+import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
+import com.epmet.commons.tools.utils.EpmetRequestHolder;
+import com.epmet.constant.DataSourceConstant;
+import com.epmet.datareport.dao.stats.FactAgencyUserHouseDailyDao;
+import com.epmet.datareport.dao.stats.FactGridUserHouseDailyDao;
+import com.epmet.datareport.entity.stats.FactAgencyUserHouseDailyEntity;
+import com.epmet.datareport.entity.stats.FactGridUserHouseDailyEntity;
+import com.epmet.datareport.service.stats.UserHouseStatsService;
+import com.epmet.stats.UserHouseStatsResultDTO;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Slf4j
+@Service
+@DataSource(DataSourceConstant.STATS)
+public class UserHouseStatsServiceImpl implements UserHouseStatsService {
+
+    @Autowired
+    private FactGridUserHouseDailyDao factGridUserHouseDailyDao;
+
+    @Autowired
+    private FactAgencyUserHouseDailyDao factAgencyUserHouseDailyDao;
+
+    @Override
+    public UserHouseStatsResultDTO getUserHouseDailyStats(String orgId, String orgType, String dateId) {
+        // 没有传参，使用当前登录人的
+        if (StringUtils.isEmpty(orgId) || StringUtils.isEmpty(orgType)) {
+            String userId = EpmetRequestHolder.getLoginUserId();
+            String customerId = EpmetRequestHolder.getLoginUserCustomerId();
+
+            CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(customerId, userId);
+            if (null == staffInfo) {
+                throw new EpmetException(String.format("查询工作人员%s缓存信息失败:%s", userId));
+            }
+
+            orgId = staffInfo.getAgencyId();
+            orgType = "agency";
+        }
+
+        // 结果对象初始化
+        UserHouseStatsResultDTO result = new UserHouseStatsResultDTO();
+
+        if ("agency".equals(orgType)) {
+            // 查询的目标是组织
+            LambdaQueryWrapper<FactAgencyUserHouseDailyEntity> query = new LambdaQueryWrapper<>();
+            query.eq(FactAgencyUserHouseDailyEntity::getDateId, dateId);
+            query.eq(FactAgencyUserHouseDailyEntity::getAgencyId, orgId);
+            FactAgencyUserHouseDailyEntity agencyDailyStats = factAgencyUserHouseDailyDao.selectOne(query);
+            if (agencyDailyStats != null) {
+                result.setHouseTotal(agencyDailyStats.getHouseCount());
+                result.setCzHouseTotal(agencyDailyStats.getHouseLeaseCount());
+                result.setXzHouseTotal(agencyDailyStats.getHouseIdleCount());
+                result.setZzHouseTotal(agencyDailyStats.getHouseSelfCount());
+                result.setUserTotal(agencyDailyStats.getUserCount());
+                result.setCzUserTotal(agencyDailyStats.getUserResiCount());
+                result.setLdUserTotal(agencyDailyStats.getUserFloatCount());
+            }
+        } else {
+            // 查询的目标是网格
+            LambdaQueryWrapper<FactGridUserHouseDailyEntity> query = new LambdaQueryWrapper<>();
+            query.eq(FactGridUserHouseDailyEntity::getDateId, dateId);
+            query.eq(FactGridUserHouseDailyEntity::getGridId, orgId);
+            FactGridUserHouseDailyEntity gridDailyStats = factGridUserHouseDailyDao.selectOne(query);
+            if (gridDailyStats != null) {
+                result.setHouseTotal(gridDailyStats.getHouseCount());
+                result.setCzHouseTotal(gridDailyStats.getHouseLeaseCount());
+                result.setXzHouseTotal(gridDailyStats.getHouseIdleCount());
+                result.setZzHouseTotal(gridDailyStats.getHouseSelfCount());
+                result.setUserTotal(gridDailyStats.getUserCount());
+                result.setCzUserTotal(gridDailyStats.getUserResiCount());
+                result.setLdUserTotal(gridDailyStats.getUserFloatCount());
+            }
+        }
+
+        return result;
+    }
+}

epmet-module/data-report/data-report-server/src/main/resources/mapper/stats/FactAgencyUserHouseDailyDao.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.datareport.dao.stats.FactAgencyUserHouseDailyDao">
+
+    <resultMap type="com.epmet.datareport.entity.stats.FactAgencyUserHouseDailyEntity" id="factAgencyUserHouseDailyMap">
+        <result property="id" column="ID"/>
+        <result property="customerId" column="CUSTOMER_ID"/>
+        <result property="dateId" column="DATE_ID"/>
+        <result property="agencyId" column="AGENCY_ID"/>
+        <result property="level" column="LEVEL"/>
+        <result property="pid" column="PID"/>
+        <result property="pids" column="PIDS"/>
+        <result property="neighbourhoodsCount" column="NEIGHBOURHOODS_COUNT"/>
+        <result property="houseCount" column="HOUSE_COUNT"/>
+        <result property="houseSelfCount" column="HOUSE_SELF_COUNT"/>
+        <result property="houseLeaseCount" column="HOUSE_LEASE_COUNT"/>
+        <result property="houseIdleCount" column="HOUSE_IDLE_COUNT"/>
+        <result property="userCount" column="USER_COUNT"/>
+        <result property="userResiCount" column="USER_RESI_COUNT"/>
+        <result property="userFloatCount" column="USER_FLOAT_COUNT"/>
+        <result property="houseIncr" column="HOUSE_INCR"/>
+        <result property="houseModify" column="HOUSE_MODIFY"/>
+        <result property="userIncr" column="USER_INCR"/>
+        <result property="userModify" column="USER_MODIFY"/>
+        <result property="delFlag" column="DEL_FLAG"/>
+        <result property="revision" column="REVISION"/>
+        <result property="createdBy" column="CREATED_BY"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="updatedBy" column="UPDATED_BY"/>
+        <result property="updatedTime" column="UPDATED_TIME"/>
+    </resultMap>
+</mapper>

epmet-module/data-report/data-report-server/src/main/resources/mapper/stats/FactGridUserHouseDailyDao.xml

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.datareport.dao.stats.FactGridUserHouseDailyDao">
+
+    <resultMap type="com.epmet.datareport.entity.stats.FactGridUserHouseDailyEntity" id="factGridUserHouseDailyMap">
+        <result property="id" column="ID"/>
+        <result property="customerId" column="CUSTOMER_ID"/>
+        <result property="dateId" column="DATE_ID"/>
+        <result property="gridId" column="GRID_ID"/>
+        <result property="pid" column="PID"/>
+        <result property="pids" column="PIDS"/>
+        <result property="neighbourhoodsCount" column="NEIGHBOURHOODS_COUNT"/>
+        <result property="houseCount" column="HOUSE_COUNT"/>
+        <result property="houseSelfCount" column="HOUSE_SELF_COUNT"/>
+        <result property="houseLeaseCount" column="HOUSE_LEASE_COUNT"/>
+        <result property="houseIdleCount" column="HOUSE_IDLE_COUNT"/>
+        <result property="userCount" column="USER_COUNT"/>
+        <result property="userResiCount" column="USER_RESI_COUNT"/>
+        <result property="userFloatCount" column="USER_FLOAT_COUNT"/>
+        <result property="houseIncr" column="HOUSE_INCR"/>
+        <result property="houseModify" column="HOUSE_MODIFY"/>
+        <result property="userIncr" column="USER_INCR"/>
+        <result property="userModify" column="USER_MODIFY"/>
+        <result property="delFlag" column="DEL_FLAG"/>
+        <result property="revision" column="REVISION"/>
+        <result property="createdBy" column="CREATED_BY"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="updatedBy" column="UPDATED_BY"/>
+        <result property="updatedTime" column="UPDATED_TIME"/>
+    </resultMap>
+</mapper>

epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/constants/ImportTaskConstants.java

@@ -21,6 +21,7 @@ public interface ImportTaskConstants {
     String BIZ_TYPE_IC_PARTY_MEMBER = "ic_party_member";
     String BIZ_TYPE_IC_DANGEROUS_CHEMICALS = "ic_dangerous_chemicals";
     String BIZ_TYPE_IC_ENTERPRISE="ic_enterprise";
+    String BIZ_TYPE_IC_DANGER_AREA="ic_danger_area";
     String IC_POINT_NUCLEIC_MONITORING = "ic_point_nucleic_monitoring";
     String IC_POINT_VACCINES_INOCULATION = "ic_point_vaccines_inoculation";
     // 新冠病毒疫苗接种人员信息台账
@@ -41,6 +42,10 @@ public interface ImportTaskConstants {
      * 行程上报
      */
     String BIZ_TYPE_IC_TRIP_REPORT = "ic_trip_report";
+    /**
+     * 磐石-行程上报
+     */
+    String PS_BIZ_TYPE_IC_TRIP_REPORT = "ps_ic_trip_report";
 
     /**
      * 处理状态：处理中

epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/AreaCodeServiceImpl.java

@@ -833,7 +833,7 @@ public class AreaCodeServiceImpl extends BaseServiceImpl<AreaCodeDao, AreaCodeEn
     private String addDistrictAreaCode(String cityCode, String countyName) {
         AreaCodeDTO city = baseDao.selectByCityCode(cityCode);
         AreaCodeEntity insert = ConvertUtils.sourceToTarget(city, AreaCodeEntity.class);
-        insert.setCityName(countyName);
+        insert.setCountyName(countyName);
         AreaCodeDTO maxCountyDTO = baseDao.selectMaxCounty(cityCode);
         if (null == maxCountyDTO) {
             insert.setCountyCode(cityCode.concat(AreaCodeConstant.FIRST_TOW_UD));

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcPartyActivityDTO.java

@@ -55,8 +55,12 @@ public class IcPartyActivityDTO implements Serializable {
     /**
      * 组织ID
      */
-    @JsonIgnore
+    // @JsonIgnore
 	private String agencyId;
+    /**
+     * 组织名称
+     */
+    private String agencyName;
     private String gridId;
     private String gridName;
     /**

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcPartyUnitDTO.java

@@ -51,6 +51,7 @@ public class IcPartyUnitDTO implements Serializable {
      * 组织ID
      */
 	private String agencyId;
+    private String agencyName;
 
     /**
      * 

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/GetListSocietyOrgFormDTO.java

@@ -57,4 +57,9 @@ public class GetListSocietyOrgFormDTO implements Serializable {
     //token中userId所属组织Id
     private String agencyId;
 
+    /**
+     * resi:居民端
+     */
+    private String app;
+
 }

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/PartyActivityFormDTO.java

@@ -29,4 +29,5 @@ public class PartyActivityFormDTO implements Serializable {
     private String serviceMatter;
     private Integer pageNo;
     private Integer pageSize;
+    private String customerId;
 }

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/PartyUnitFormDTO.java

@@ -24,4 +24,9 @@ public class PartyUnitFormDTO implements Serializable {
     private String contactMobile;
     private Integer pageNo;
     private Integer pageSize;
+
+    /**
+     * 工作端当前登录人员
+     */
+    private String currentStaffId;
 }

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/EpmetHeartOpenFeignClient.java

@@ -173,6 +173,7 @@ public interface EpmetHeartOpenFeignClient {
 
     /**
      * desc:根据来源id 删除需求 只删主表
+     * 服务需求相关表都删除：ic_user_demand_rec、ic_user_demand_service、ic_user_demand_satisfaction、ic_user_demand_operate_log
      * @param originId
      * @param origin
      * @return

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyActivityController.java

@@ -71,8 +71,14 @@ public class IcPartyActivityController {
     @Resource
     private EpmetCommonServiceOpenFeignClient commonServiceOpenFeignClient;
 
+    /**
+     * 联建活动-列表
+     * @param formDTO
+     * @return
+     */
     @PostMapping("search")
-    public Result<PageData<IcPartyActivityDTO>> page(@RequestBody PartyActivityFormDTO formDTO){
+    public Result<PageData<IcPartyActivityDTO>> page(@LoginUser TokenDto tokenDto,@RequestBody PartyActivityFormDTO formDTO){
+        formDTO.setCustomerId(formDTO.getCustomerId());
         PageData<IcPartyActivityDTO> page = icPartyActivityService.search(formDTO);
         return new Result<PageData<IcPartyActivityDTO>>().ok(page);
     }
@@ -83,6 +89,12 @@ public class IcPartyActivityController {
         return new Result<IcPartyActivityDTO>().ok(data);
     }
 
+    /**
+     * 联建活动-新增
+     * @param tokenDto
+     * @param dto
+     * @return
+     */
     @PostMapping("save")
     @NoRepeatSubmit
     public Result save(@LoginUser TokenDto tokenDto, @RequestBody IcPartyActivityDTO dto){

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyUnitController.java

@@ -3,6 +3,7 @@ package com.epmet.controller;
 import com.epmet.commons.rocketmq.messages.ServerSatisfactionCalFormDTO;
 import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.aop.NoRepeatSubmit;
+import com.epmet.commons.tools.constant.AppClientConstant;
 import com.epmet.commons.tools.dto.result.OptionDataResultDTO;
 import com.epmet.commons.tools.exception.ExceptionUtils;
 import com.epmet.commons.tools.exception.RenException;
@@ -16,10 +17,6 @@ import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.constants.ImportTaskConstants;
 import com.epmet.dto.IcPartyUnitDTO;
-import com.epmet.dto.form.ImportTaskCommonFormDTO;
-import com.epmet.dto.form.PartyActivityFormDTO;
-import com.epmet.dto.form.PartyUnitFormDTO;
-import com.epmet.dto.form.PartyUnitListFormDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.form.demand.ServiceQueryFormDTO;
 import com.epmet.dto.result.*;
@@ -37,12 +34,10 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
 import java.io.IOException;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
@@ -70,9 +65,20 @@ public class IcPartyUnitController {
     private Path IC_PARTY_UNIT_UPLOAD_DIR;
 
 
+    /**
+     * 联建单位-列表查询
+     * 本组织及下级数据
+     * @param tokenDto
+     * @param formDTO
+     * @return
+     */
     @PostMapping("list")
     public Result<PageData<IcPartyUnitDTO>> search(@LoginUser TokenDto tokenDto, @RequestBody PartyUnitFormDTO formDTO) {
         formDTO.setCustomerId(tokenDto.getCustomerId());
+        //工作端调用的话，赋值当前登录用户id
+        if(AppClientConstant.APP_GOV.equals(tokenDto.getApp())){
+            formDTO.setCurrentStaffId(tokenDto.getUserId());
+        }
         PageData<IcPartyUnitDTO> page = icPartyUnitService.search(formDTO);
         return new Result<PageData<IcPartyUnitDTO>>().ok(page);
     }
@@ -84,6 +90,12 @@ public class IcPartyUnitController {
         return new Result<IcPartyUnitDTO>().ok(data);
     }
 
+    /**
+     * 联建单位新增
+     * @param tokenDto
+     * @param dto
+     * @return
+     */
     @PostMapping("save")
     @NoRepeatSubmit
     public Result save(@LoginUser TokenDto tokenDto, @RequestBody IcPartyUnitDTO dto) {

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcSocietyOrgController.java

@@ -142,6 +142,7 @@ public class IcSocietyOrgController implements ResultDataResolver {
     public Result<GetListSocietyOrgResultDTO> getList(@LoginUser TokenDto tokenDto, @RequestBody GetListSocietyOrgFormDTO formDTO) {
         formDTO.setCustomerId(tokenDto.getCustomerId());
         formDTO.setStaffId(tokenDto.getUserId());
+        formDTO.setApp(tokenDto.getApp());
         return new Result<GetListSocietyOrgResultDTO>().ok(societyOrgService.getList(formDTO));
     }
 
@@ -171,7 +172,7 @@ public class IcSocietyOrgController implements ResultDataResolver {
         // formDTO.setIsPage(false);
         // GetListSocietyOrgResultDTO list = societyOrgService.getList(formDTO);
         // ExcelUtils.exportExcelToTarget(response, null, list.getList(), IcSocietyOrgExportExcel.class);
-
+        formDTO.setApp(tokenDto.getApp());
         formDTO.setCustomerId(tokenDto.getCustomerId());
         formDTO.setStaffId(tokenDto.getUserId());
         formDTO.setIsPage(false);

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcUserDemandRecController.java

@@ -398,6 +398,7 @@ public class IcUserDemandRecController implements ResultDataResolver {
 
     /**
      * desc:根据来源id 删除需求 只删主表
+     * 2022.10.12:删除服务需求：ic_user_demand_rec、ic_user_demand_service、ic_user_demand_satisfaction、ic_user_demand_operate_log
      * @param originId
      * @param origin
      * @return