diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/BarcodeUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/BarcodeUtils.java index 321d1379ad..ee5369b3af 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/BarcodeUtils.java +++ b/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("Noto Sans SC Light", Font.BOLD, FONTSIZE)); g.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING, RenderingHints.VALUE_TEXT_ANTIALIAS_ON); g.setBackground(Color.white); // 获取文字数量 按照字节展示 diff --git a/epmet-module/gov-org/gov-org-server/Dockerfile b/epmet-module/gov-org/gov-org-server/Dockerfile index b4f5ecffbb..84c2478da5 100644 --- a/epmet-module/gov-org/gov-org-server/Dockerfile +++ b/epmet-module/gov-org/gov-org-server/Dockerfile @@ -5,6 +5,7 @@ RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime RUN echo 'Asia/Shanghai' > /etc/timezone COPY ./target/*.jar ./gov-org.jar +COPY ./fonts/NotoSansSC-Light.otf /usr/share/fonts EXPOSE 8092 diff --git a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml index 8d31316572..0297930754 100644 --- a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml +++ b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml @@ -8,14 +8,9 @@ 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: diff --git a/epmet-module/gov-org/gov-org-server/fonts/NotoSansSC-Light.otf b/epmet-module/gov-org/gov-org-server/fonts/NotoSansSC-Light.otf new file mode 100644 index 0000000000..a1f02c6c62 Binary files /dev/null and b/epmet-module/gov-org/gov-org-server/fonts/NotoSansSC-Light.otf differ diff --git a/epmet-module/gov-org/gov-org-server/fonts/Songti.ttc b/epmet-module/gov-org/gov-org-server/fonts/Songti.ttc deleted file mode 100644 index c8430ddd77..0000000000 Binary files a/epmet-module/gov-org/gov-org-server/fonts/Songti.ttc and /dev/null differ diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiCollectFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiCollectFormDTO.java index c6d45ed0da..21f2244129 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiCollectFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiCollectFormDTO.java @@ -84,8 +84,8 @@ public class IcResiCollectFormDTO implements Serializable { /** * 1自由0租住 */ - @NotNull(message = "房子属于自由还是组织？", groups = {InternalShowGroup.class, ExternalShowGroup.class}) - private Integer houseType; + @NotBlank(message = "房子属于自由还是组织？", groups = {InternalShowGroup.class, ExternalShowGroup.class}) + private String houseType; /** * 户主姓名 diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiCollectMemFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiCollectMemFormDTO.java index 9778aacb4f..7d6d1743af 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiCollectMemFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiCollectMemFormDTO.java @@ -28,7 +28,7 @@ public class IcResiCollectMemFormDTO implements Serializable { /** * 居住成员1是否参加几轮全员核算检测，数字1-10 */ - private Integer heSuanCount; + private String heSuanCount; /** * 居住成员1新冠疫苗接种情况;1:已全程接种；2：未全程接种；0未接种； diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListResultDTO.java index c9c45c0dba..9edcfa4d8d 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListResultDTO.java @@ -33,7 +33,7 @@ public class CollectListResultDTO implements Serializable { /** * 房屋类型，1:自有, 0:租住 */ - private Integer houseType; + private String houseType; /** * 居住人数 @@ -45,7 +45,7 @@ public class CollectListResultDTO implements Serializable { public CollectListResultDTO() { this.houseHolderName = ""; this.address = ""; - this.houseType = 0; + this.houseType = "0"; this.totalResi = 0; this.list = new ArrayList<>(); } @@ -70,7 +70,7 @@ public class CollectListResultDTO implements Serializable { /** * 核酸检测次数 */ - private Integer heSuanCount; + private String heSuanCount; /** * 疫苗是否全程接种，1：全程接种，2：未全程接种，3：为接种 @@ -81,7 +81,7 @@ public class CollectListResultDTO implements Serializable { this.memberName = ""; this.memberIdNum = ""; this.memberMobile = ""; - this.heSuanCount = 0; + this.heSuanCount = "0"; this.ymjz = 0; } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiCollectDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiCollectDao.java index 72f7edbc7f..f70f0e04ff 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiCollectDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiCollectDao.java @@ -21,7 +21,7 @@ public interface IcResiCollectDao extends BaseDao { IcResiCollectEntity selectByAddress(String address); int updateRec(@Param("id") String id, - @Param("houseType") Integer houseType, + @Param("houseType") String houseType, @Param("houseHolderName") String houseHolderName, @Param("totalResi") Integer totalResi); diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiCollectEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiCollectEntity.java index ccdbb77325..1123bca8b8 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiCollectEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiCollectEntity.java @@ -71,7 +71,7 @@ public class IcResiCollectEntity extends BaseEpmetEntity { /** * 1自由0租住 */ - private Integer houseType; + private String houseType; /** * 户主姓名 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiMemberEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiMemberEntity.java index 28ee2c49e4..399ce07822 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiMemberEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiMemberEntity.java @@ -46,7 +46,7 @@ public class IcResiMemberEntity extends BaseEpmetEntity { /** * 居住成员1是否参加几轮全员核算检测，数字1-10 */ - private Integer heSuanCount; + private String heSuanCount; /** * 居住成员1新冠疫苗接种情况;1:已全程接种；2：未全程接种；0未接种； diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java index eb737b7a2e..4037180bf0 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java @@ -126,6 +126,7 @@ public class IcResiCollectServiceImpl extends BaseServiceImpl