Merge remote-tracking branch 'remotes/烟台/master' into 烟台-政务master

3 years ago · ab958a40a8
10 changed files with 116 additions and 15 deletions
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/YtHsResUtils.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/YtHsResUtils.java
@ -40,8 +40,8 @@ public class YtHsResUtils {
            log.info("hscy api param:{}", param);

            Result<String> result = HttpClientManager.getInstance().sendGet(SERVER_URL + "hscyxxcx", param);
-            //String mockData = "{\"id\":\"1570924677539635484\",\"name\":\"杨XX\",\"card_type\":\"1\",\"card_no\":\"370283199912010302\",\"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\"}";
-            //Result<String> result = new Result<String>().ok(mockData);
+//            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();
@ -74,7 +74,7 @@ public class YtHsResUtils {
            param.put(PAGE_SIZE, pageSize);
            log.info("hsjc api param:{}", param);
            Result<String> result = HttpClientManager.getInstance().sendGet(SERVER_URL + "hsjcxx", param);
-//            String mockData = "{\"code\":\"200\",\"msg\":\"请求成功\",\"data\":[{\"id\":\"6a31eb2d38c011eda054fa163ebc7ff4\",\"name\":\"数据同步测试用户\",\"card_no\":\"370283199912010302\",\"telephone\":\"13697890860\",\"address\":\"保利香榭里公馆18-1-302\",\"test_time\":\"2022-09-20 12:52:28\",\"depart_name\":\"天仁医学检验实验室有限公司\",\"county\":\"莱山区\",\"upload_time\":\"2022-09-20 21:23:10\",\"sample_result_pcr\":\"2\",\"sample_time\":\"2022-09-20 06:48:28\",\"sampling_org_pcr\":\"采样点327\"}],\"total\":1}";
+//            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()) {
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/api/yt/YantaiApi.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/api/yt/YantaiApi.java
@ -50,6 +50,49 @@ public class YantaiApi {
     */
    //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获取下级组织
     *
@ -245,6 +288,8 @@ public class YantaiApi {
        //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联调
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/NatUserInfoResultDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/NatUserInfoResultDTO.java
@ -32,4 +32,9 @@ public class NatUserInfoResultDTO implements Serializable {
     * 18大类 中 某一类的 是否值，用于比较 同步数据结果确定是否要插入到表中
     */
    private String categoryColumn;
+
+    /**
+     * ic_nat表ID
+     */
+    private String id;
 }
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcEpidemicSpecialAttentionController.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcEpidemicSpecialAttentionController.java
@ -25,6 +25,7 @@ import com.epmet.feign.EpmetAdminOpenFeignClient;
 import com.epmet.feign.EpmetCommonServiceOpenFeignClient;
 import com.epmet.service.IcEpidemicSpecialAttentionService;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.io.FilenameUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@ -244,4 +245,16 @@ public class IcEpidemicSpecialAttentionController {
        return new Result<NatPieResultDTO>().ok(icEpidemicSpecialAttentionService.pie(tokenDto));
    }

+    /**
+     * 批量删除 ic_epidemic_special_attention
+     * @param ids
+     * @return
+     */
+    @PostMapping("delete")
+    public Result delete(@RequestBody List<String> ids){
+        if(CollectionUtils.isNotEmpty(ids)){
+            icEpidemicSpecialAttentionService.delete(ids);
+        }
+        return new Result();
+    }
 }
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcEpidemicSpecialAttentionService.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcEpidemicSpecialAttentionService.java
@ -82,7 +82,7 @@ public interface IcEpidemicSpecialAttentionService extends BaseService<IcEpidemi
     * @author generator
     * @date 2022-03-28
     */
-    void delete(String[] ids);
+    void delete(List<String> ids);

    /**
     * Desc: 【疫苗接种关注名单，疫苗接种关注名单】列表
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java
@ -539,7 +539,10 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl<DataSyncConfigDao
         * 数据库采样时间+idCard+userId 存在的 做更新
         * 数据库采样时间+idCard+userId 不存在的 新增
         */
-        entities.forEach(e -> existInfo.stream().filter(i -> i.getUserId().equals(e.getUserId()) && i.getIdCard().equals(e.getIdCard())).forEach(i -> e.setExistStatus(true)));
+        entities.forEach(e -> existInfo.stream().filter(i -> i.getUserId().equals(e.getUserId()) && i.getIdCard().equals(e.getIdCard())).forEach(i -> {
+            e.setExistStatus(true);
+            e.setId(i.getId());
+        }));
        Map<Boolean, List<IcNatEntity>> groupByStatus = entities.stream().collect(Collectors.groupingBy(IcNatEntity::getExistStatus));
        if (CollectionUtils.isNotEmpty(groupByStatus.get(false))) {
            for (List<IcNatEntity> icNatEntities : ListUtils.partition(groupByStatus.get(false), NumConstant.FIVE_HUNDRED)) {
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncRecordDisabilityServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncRecordDisabilityServiceImpl.java
@ -11,6 +11,7 @@ import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
+import com.epmet.commons.tools.enums.GenderEnum;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.page.PageData;
@ -97,7 +98,10 @@ public class DataSyncRecordDisabilityServiceImpl extends BaseServiceImpl<DataSyn
    public DataSyncRecordDisabilityDTO get(String id) {
        DataSyncRecordDisabilityEntity entity = baseDao.selectById(id);
        DataSyncRecordDisabilityDTO result = ConvertUtils.sourceToTarget(entity, DataSyncRecordDisabilityDTO.class);
+        result.setGenderCn(GenderEnum.UN_KNOWN.getName());
+        if (null != result.getGender()){
            result.setGenderCn(result.getGender() == NumConstant.ONE ? "男" : "女");
+        }
        IcResiUserDTO icResiUserDTO = icResiUserService.get(entity.getIcResiUserId());
        ResiInfoDTO resiInfoDTO = ConvertUtils.sourceToTarget(icResiUserDTO, ResiInfoDTO.class);
        resiInfoDTO.setGenderCn(resiInfoDTO.getGender().equals(NumConstant.ONE_STR) ? "男" : "女");
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java
@ -131,9 +131,9 @@ public class IcEpidemicSpecialAttentionServiceImpl extends BaseServiceImpl<IcEpi

    @Override
    @Transactional(rollbackFor = Exception.class)
-    public void delete(String[] ids) {
+    public void delete( List<String> ids) {
        // 逻辑删除（@TableLogic 注解）
-        baseDao.deleteBatchIds(Arrays.asList(ids));
+        baseDao.deleteBatchIds(ids);
    }

    /**
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcNatDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcNatDao.xml
@ -158,6 +158,7 @@
    <select id="getExistNatInfo" resultType="com.epmet.dto.result.NatUserInfoResultDTO">
        <foreach collection="list" item="l" separator="UNION ALL">
            SELECT
+                ID,
            USER_ID,
            ID_CARD
            FROM ic_nat
@ -194,31 +195,31 @@
        <trim prefix="set" suffixOverrides=",">
            <trim prefix="NAT_TIME =(case" suffix="end),">
                <foreach collection="list" item="l">
-                    when USER_ID = #{l.userId} AND ID_CARD = #{l.idCard} then #{l.natTime}
+                    when ID = #{l.id} then #{l.natTime}
                </foreach>
            </trim>
            <trim prefix="NAT_ADDRESS =(case" suffix="end),">
                <foreach collection="list" item="l">
-                    when USER_ID = #{l.userId} AND ID_CARD = #{l.idCard} then #{l.natAddress}
+                    when ID = #{l.id} then #{l.natAddress}
                </foreach>
            </trim>
            <trim prefix="NAT_RESULT =(case" suffix="end),">
                <foreach collection="list" item="l">
-                    when USER_ID = #{l.userId} AND ID_CARD = #{l.idCard} then #{l.natResult}
+                    when ID = #{l.id} then #{l.natResult}
                </foreach>
            </trim>
            <trim prefix="MOBILE =(case" suffix="end),">
                <foreach collection="list" item="l">
-                    when USER_ID = #{l.userId} AND ID_CARD = #{l.idCard} then #{l.mobile}
+                    when ID = #{l.id} then #{l.mobile}
                </foreach>
            </trim>
            UPDATED_TIME = NOW()
        </trim>
        WHERE DEL_FLAG = '0'
+        AND ID IN(
        <foreach collection="list" item="l" separator=",">
-            AND USER_ID = #{l.userId}
-            AND ID_CARD = #{l.idCard}
-        </foreach>
+            #{l.id}
+        </foreach>)

    </update>
 </mapper>
--- a/epmet-user/epmet-user-server/src/test/java/com/epmet/dao/IcNatDaoTest.java
+++ b/epmet-user/epmet-user-server/src/test/java/com/epmet/dao/IcNatDaoTest.java
@ -0,0 +1,30 @@
+package com.epmet.dao;
+
+import com.epmet.entity.IcNatEntity;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import java.util.ArrayList;
+import java.util.List;
+@SpringBootTest
+@RunWith(SpringRunner.class)
+public class IcNatDaoTest {
+    @Autowired
+    private IcNatDao icNatDao;
+
+    @Test
+    public void updateBatchNat() {
+        List<IcNatEntity> entities = new ArrayList<>();
+        for (int i = 0; i < 2; i++) {
+            IcNatEntity en = new IcNatEntity();
+            en.setNatResult("222222"+i);
+            en.setUserId(""+i);
+            en.setIdCard("card"+i);
+            entities.add(en);
+        }
+        icNatDao.updateBatchNat(entities);
+    }
+}