Merge remote-tracking branch 'origin/dev_qr_code' into dev_qr_code

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

@@ -102,7 +102,7 @@ public class BarcodeUtils {
         Graphics2D g = outImage.createGraphics();
         g.drawImage(image, 0, 0, imageW, imageH, null);
         g.setColor(QRCOLOR);
-//        g.setFont(new Font("微软雅黑", Font.BOLD, FONTSIZE));
+        g.setFont(new Font("宋体", Font.BOLD, FONTSIZE));
         g.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING, RenderingHints.VALUE_TEXT_ANTIALIAS_ON);
         g.setBackground(Color.white);
 //        获取文字数量  按照字节展示

epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml

@@ -8,11 +8,16 @@ services:
     network_mode: host # 使用现有网络
     volumes:
       - "/opt/epmet-cloud-logs/dev:/logs"
+      - ./fonts:/usr/share/fonts
     environment:
       RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./gov-org.jar"
     restart: "unless-stopped"
+    build:
+      context: .
+      args:
+        - LANG=C.UTF-8
     deploy:
       resources:
         limits:
           cpus: '0.1'
-          memory: 300M
+          memory: 300M

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

@@ -419,6 +419,7 @@ public class AgencyController {
                     .concat("epmet-oper-gov/#/caiji/")
                     .concat(id).concat("?")
                     .concat("name=").concat(name).concat(StrConstant.AND_MARK)
+                    .concat("customerId=").concat(tokenDto.getCustomerId()).concat(StrConstant.AND_MARK)
                     .concat("type=").concat(type).concat(StrConstant.AND_MARK)
                     .concat("userId=").concat(tokenDto.getUserId())
                     .concat(StrConstant.AND_MARK).concat(String.valueOf(LocalDateTime.now().toInstant(ZoneOffset.of("+8")).toEpochMilli()));

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListResultDTO.java

@@ -22,6 +22,7 @@ public class CollectListResultDTO implements Serializable {
      */
     private String houseHolderName;
 
+    @JsonIgnore
     private String id;
 
     /**

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

@@ -61,11 +61,10 @@ public class IcResiCollectController {
      * @date 2022/3/18 19:23
      */
     @PostMapping("list")
-//    public Result<PageData<CollectListResultDTO>> getCollectList(@RequestBody CollectListFormDTO formDTO, @LoginUser TokenDto tokenDto){
-    public Result<PageData<CollectListResultDTO>> getCollectList(@RequestBody CollectListFormDTO formDTO){
+    public Result<PageData<CollectListResultDTO>> getCollectList(@RequestBody CollectListFormDTO formDTO, @LoginUser TokenDto tokenDto){
         ValidatorUtils.validateEntity(formDTO,CollectListFormDTO.CollectListForm.class);
-        formDTO.setUserId("ebcef7c1c63a87a226e59f1e0149d331");
-        formDTO.setCustomerId("45687aa479955f9d06204d415238f7cc");
+        formDTO.setUserId(tokenDto.getUserId());
+        formDTO.setCustomerId(tokenDto.getCustomerId());
         return new Result<PageData<CollectListResultDTO>>().ok(icResiCollectService.getCollectList(formDTO));
     }
 

epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectDao.xml

@@ -55,7 +55,7 @@
             m.`NAME` AS memberName,
             m.ID_NUM AS memberIdNum,
             m.MOBILE AS memberMobile,
-            m.HESUAN_COUNT AS heSuanCount,
+            m.HE_SUAN_COUNT AS heSuanCount,
             m.YMJZ AS ymjz
         from ic_resi_member m
         where m.DEL_FLAG = 0