获取一户一码二维码前缀方式调整;家庭成员列手机号脱敏

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

@@ -9,7 +9,8 @@ package com.epmet.commons.tools.enums;
 */
 public enum HouseQrcodeEnum {
 
-    SUFFIX(".png", "二维码格式的后缀");
+    SUFFIX(".png", "二维码格式的后缀"),
+    PREFIX_KEY("house_qrcode_pre", "二维码格式的前缀key");
 //    PREFIX("https://epmet-dev.elinkservice.cn/cqrcode-ty/", "二维码地址的前缀");
 
 

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java

@@ -32,6 +32,7 @@ import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.dto.form.IcHouseFormDTO;
+import com.epmet.commons.tools.enums.HouseQrcodeEnum;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.feign.ResultDataResolver;
@@ -49,6 +50,7 @@ import com.epmet.constants.ImportTaskConstants;
 import com.epmet.dao.IcHouseDao;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
+import com.epmet.entity.CustomerOrgParameterEntity;
 import com.epmet.feign.EpmetAdminOpenFeignClient;
 import com.epmet.feign.EpmetCommonServiceOpenFeignClient;
 import com.epmet.feign.EpmetUserOpenFeignClient;
@@ -431,7 +433,7 @@ public class HouseController implements ResultDataResolver {
 
     /**
      * @return void
-     * @describe: 下载房屋编码
+     * @describe: 下载房屋一户一码
      * @author wangtong
      * @date 2022/6/1 17:24
      * @params [formDTO, response]
@@ -445,11 +447,11 @@ public class HouseController implements ResultDataResolver {
                 throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "未查到房屋信息", "未查到房屋信息");
             }
             //url组成:小程序地址?房屋编码
-            IcHouseQrcodeConfigDTO codePre = icHouseDao.selectByCustomerId(house.getCustomerId());
+            CustomerOrgParameterEntity codePre = icHouseDao.selectByCustomerId(house.getCustomerId(), HouseQrcodeEnum.PREFIX_KEY.getCode());
             if(null == codePre){
                 throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "请先维护二维码前缀信息", "请先维护二维码前缀信息");
             }
-            String url = codePre.getQrcodePre() + house.getHouseCode();
+            String url = codePre.getParameterValue() + house.getHouseCode();
             BufferedImage image = HouseQRcodeUtils.drawHouseQRImage(house.getBuildingName() + house.getUnitNum() + house.getDoorName(), url);
             //BufferedImage 转 InputStream
             ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java

@@ -4,6 +4,7 @@ import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.ImportGeneralDTO;
 import com.epmet.dto.form.IcHouseListFormDTO;
 import com.epmet.dto.result.*;
+import com.epmet.entity.CustomerOrgParameterEntity;
 import com.epmet.entity.IcHouseEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -136,5 +137,5 @@ public interface IcHouseDao extends BaseDao<IcHouseEntity> {
     * @params [customerId]
     * @return com.epmet.dto.result.IcHouseQrcodeConfigDTO
     */
-    IcHouseQrcodeConfigDTO selectByCustomerId(@Param("customerId") String customerId);
+    CustomerOrgParameterEntity selectByCustomerId(@Param("customerId") String customerId, @Param("preKey") String preKey);
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java

@@ -32,10 +32,7 @@ import com.epmet.dao.*;
 import com.epmet.dto.*;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
-import com.epmet.entity.IcHouseChangeDetailEntity;
+import com.epmet.entity.*;
-import com.epmet.entity.IcHouseChangeRecordEntity;
-import com.epmet.entity.IcHouseCodeInfoEntity;
-import com.epmet.entity.IcHouseEntity;
 import com.epmet.enums.HouseChangeEnums;
 import com.epmet.enums.HousePurposeEnums;
 import com.epmet.enums.HouseRentFlagEnums;
@@ -834,14 +831,14 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
         List<IcHouseListResultDTO> houseList = icHouseDao.searchHouseByPage(formDTO);
 
         //获取一户一码前缀地址
-        IcHouseQrcodeConfigDTO codePre = icHouseDao.selectByCustomerId(formDTO.getCustomerId());
+        CustomerOrgParameterEntity codePre = icHouseDao.selectByCustomerId(formDTO.getCustomerId(), HouseQrcodeEnum.PREFIX_KEY.getCode());
         if(null == codePre){
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "请先维护二维码前缀信息", "请先维护二维码前缀信息");
         }
         for (IcHouseListResultDTO house : houseList) {
 
             BufferedImage image = HouseQRcodeUtils.drawHouseQRImage(house.getBuildingName() + house.getUnitNum() + house.getDoorName(),
-                    codePre.getQrcodePre() +  house.getHouseCode());
+                    codePre.getParameterValue() +  house.getHouseCode());
 
             try {
                 byte[] buf = new byte[8192];
@@ -929,11 +926,11 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "未查到房屋信息", "未查到房屋信息");
         }
         //url组成:小程序地址?房屋编码
-        IcHouseQrcodeConfigDTO codePre = icHouseDao.selectByCustomerId(house.getCustomerId());
+        CustomerOrgParameterEntity codePre = icHouseDao.selectByCustomerId(house.getCustomerId(), HouseQrcodeEnum.PREFIX_KEY.getCode());
         if(null == codePre){
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "请先维护二维码前缀信息", "请先维护二维码前缀信息");
         }
-        String url = codePre.getQrcodePre() + house.getHouseCode();
+        String url = codePre.getParameterValue() + house.getHouseCode();
         String fileName = house.getBuildingName() + house.getUnitNum() + house.getDoorName() + ".png";
         BufferedImage image = HouseQRcodeUtils.drawHouseQRImage(house.getBuildingName() + house.getUnitNum() + house.getDoorName(), url);
 

epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.22__alter_customer_org_parameter.sql

@@ -0,0 +1,7 @@
+
+alter table customer_org_parameter modify column PARAMETER_VALUE varchar(256);
+
+
+INSERT INTO `epmet_gov_org`.`customer_org_parameter`(`ID`, `CUSTOMER_ID`, `PARAMETER_KEY`, `PARAMETER_NAME`, `PARAMETER_VALUE`, `DESCRIPTION`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('5', '3fdd0380deff5b30f45376cdf995d1c1', 'house_qrcode_pre', '一户一码前缀', 'https://epmet-cloud.elinkservice.cn/cqrcode-wxls/', '', '0', 0, 'APP_USER', '2022-06-08 09:22:52', 'APP_USER', '2022-06-08 09:22:52');
+
+INSERT INTO `epmet_gov_org`.`customer_org_parameter`(`ID`, `CUSTOMER_ID`, `PARAMETER_KEY`, `PARAMETER_NAME`, `PARAMETER_VALUE`, `DESCRIPTION`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('6', '1530123370795233281', 'house_qrcode_pre', '一户一码前缀', 'https://epmet-cloud.elinkservice.cn/cqrcode-sjt/', '', '0', 0, 'APP_USER', '2022-06-08 09:22:52', 'APP_USER', '2022-06-08 09:22:52');

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml

@@ -415,9 +415,11 @@
               and(h.HOUSE_CODE is null or h.HOUSE_CODE = '')
         order by h.CREATED_TIME desc
     </select>
-    <select id="selectByCustomerId" resultType="com.epmet.dto.result.IcHouseQrcodeConfigDTO">
+    <select id="selectByCustomerId" resultType="com.epmet.entity.CustomerOrgParameterEntity">
-        select * from ic_house_qrcode_config
+        select * from customer_org_parameter
         where CUSTOMER_ID = #{customerId}
+              and PARAMETER_KEY=#{preKey}
+              and DEL_FLAG='0'
     </select>
 
 </mapper>

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/MyHomeController.java

@@ -1,6 +1,7 @@
 package com.epmet.controller;
 
 import com.epmet.commons.tools.annotation.LoginUser;
+import com.epmet.commons.tools.annotation.MaskResponse;
 import com.epmet.commons.tools.enums.HomeMemberOperationEnum;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
@@ -42,6 +43,7 @@ public class MyHomeController {
     private IcResiUserService icResiUserService;
 
 
+    @MaskResponse(fieldNames = {"mobile"}, fieldsMaskType = {MaskResponse.MASK_TYPE_MOBILE})
     @PostMapping("memberList/{houseCode}")
     public Result<List<HomeUserBriefResultDTO>> selectListHomeMember(@PathVariable("houseCode") String houseCode, @LoginUser TokenDto tokenDto) {
         return new Result().ok(myHomeService.selectListHomeMember(houseCode, tokenDto.getCustomerId()));