wangxianzhang 3 years ago
parent
commit
fbace57888
  1. 30
      epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.26__alter_dict.sql
  2. 2
      epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/StrConstant.java
  3. 5
      epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/DictTypeEnum.java
  4. 2
      epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java
  5. 20
      epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/processor/MaskProcessor.java
  6. 2
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/CoverageController.java
  7. 7
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java
  8. 2
      epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerAgencyDao.xml
  9. 5
      epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/constants/ImportTaskConstants.java
  10. 6
      epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcPartyActivityDTO.java
  11. 1
      epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcPartyUnitDTO.java
  12. 1
      epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/PartyActivityFormDTO.java
  13. 5
      epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/PartyUnitFormDTO.java
  14. 14
      epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyActivityController.java
  15. 24
      epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyUnitController.java
  16. 10
      epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcPartyUnitDao.java
  17. 3
      epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcServiceItemDictDao.java
  18. 20
      epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPartyUnitService.java
  19. 2
      epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcServiceItemDictService.java
  20. 26
      epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java
  21. 49
      epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java
  22. 5
      epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcServiceItemDictServiceImpl.java
  23. 40
      epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml
  24. 50
      epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyUnitDao.xml
  25. 10
      epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcServiceItemDictDao.xml
  26. 17
      epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/GovMenuController.java
  27. 24
      epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovMenuServiceImpl.java
  28. 40
      epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovRoleServiceImpl.java
  29. 13
      epmet-module/gov-access/gov-access-server/src/main/resources/mapper/GovMenuDao.xml
  30. 3
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java
  31. 3
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java
  32. 2
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java
  33. 2
      epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/controller/OperMenuController.java
  34. 2
      epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcExportTemplateServiceImpl.java
  35. 18
      epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/IcPartyMemberDTO.java
  36. 4
      epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/form/IcPartyMemberFromDTO.java
  37. 12
      epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyOrgServiceImpl.java
  38. 6
      epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberController.java
  39. 11
      epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartymemberStyleController.java
  40. 15
      epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/entity/IcPartyMemberEntity.java
  41. 9
      epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/excel/IcPartyMemberImportExcel.java
  42. 7
      epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberServiceImpl.java
  43. 6
      epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartymemberStyleServiceImpl.java
  44. 10
      epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/V0.0.12__edit_partymember.sql
  45. 1
      epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/V0.0.13__partyorgnamelength.sql
  46. BIN
      epmet-module/resi-partymember/resi-partymember-server/src/main/resources/excel/ic_party_member.xlsx
  47. 3
      epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/IcPartyMemberDao.xml
  48. 5
      epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ChangeDeathDTO.java
  49. 10
      epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ChangeRelocationDTO.java
  50. 4
      epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcBirthRecordDTO.java
  51. 96
      epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcDangerAreaDTO.java
  52. 62
      epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcEpidemicSpecialAttentionDTO.java
  53. 8
      epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcNatCompareRecordDTO.java
  54. 9
      epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcNatDTO.java
  55. 156
      epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java
  56. 4
      epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVaccineDTO.java
  57. 78
      epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/BirthRecordListFormDTO.java
  58. 19
      epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DangerAreaListFormDTO.java
  59. 20
      epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EmphasisTripDetailFormDTO.java
  60. 30
      epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EmphasisTripListFormDTO.java
  61. 27
      epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EmphasisTripPieDetailFormDTO.java
  62. 74
      epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcTripReportFormDTO.java
  63. 25
      epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/OnlyIdFormDTO.java
  64. 6
      epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PageTripReportFormDTO.java
  65. 4
      epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/yqfk/IcNatCompareRecordPageFormDTO.java
  66. 71
      epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/EmphasisTripListResultDTO.java
  67. 19
      epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/EmphasisTripPieDetailResultDTO.java
  68. 9
      epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/EpidemicPreventionResultDTO.java
  69. 6
      epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcMoveInListResultDTO.java
  70. 103
      epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/VaccinationListResultDTO.java
  71. 4
      epmet-user/epmet-user-server/pom.xml
  72. 15
      epmet-user/epmet-user-server/src/main/java/com/epmet/controller/ChangeDeathController.java
  73. 15
      epmet-user/epmet-user-server/src/main/java/com/epmet/controller/ChangeRelocationController.java
  74. 9
      epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcBirthRecordController.java
  75. 222
      epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcDangerAreaController.java
  76. 1
      epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcEpidemicPreventionController.java
  77. 1
      epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcEpidemicSpecialAttentionController.java
  78. 10
      epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcFollowUpRecordController.java
  79. 9
      epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcMoveInRecordController.java
  80. 1
      epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcNatController.java
  81. 9
      epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
  82. 212
      epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java
  83. 1
      epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccineController.java
  84. 10
      epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcBirthRecordDao.java
  85. 19
      epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcDangerAreaDao.java
  86. 21
      epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcTripReportRecordDao.java
  87. 56
      epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcDangerAreaEntity.java
  88. 72
      epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcEpidemicSpecialAttentionEntity.java
  89. 10
      epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcNatCompareRecordEntity.java
  90. 15
      epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcPartyMemberEntity.java
  91. 61
      epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcTripReportRecordEntity.java
  92. 55
      epmet-user/epmet-user-server/src/main/java/com/epmet/enums/DangerLevelEnum.java
  93. 38
      epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcDangerAreaImportExcel.java
  94. 22
      epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcDangerAreaResultExcel.java
  95. 102
      epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExcel.java
  96. 150
      epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExportExcel.java
  97. 123
      epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcTripReportRecordExportExcel.java
  98. 71
      epmet-user/epmet-user-server/src/main/java/com/epmet/excel/ImportEpidemicSpecialAttention.java
  99. 71
      epmet-user/epmet-user-server/src/main/java/com/epmet/excel/NatExportExcel.java
  100. 71
      epmet-user/epmet-user-server/src/main/java/com/epmet/excel/NatHistoryExportExcel.java

30
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');

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

@ -99,6 +99,8 @@ public interface StrConstant {
String PY_CUSTOMER = "6f203e30de1a65aab7e69c058826cd80";
//平音客户跟组织Id
String PY_ROOT_AGENCY = "53613e1c5de6ed473467f0159a10b135";
//磐石街道客户Id
String PS_CUSTOMER_ID = "1580460084738760705";
/**
* 单位积分,积分上限积分说明积分事件

5
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;

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

@ -269,6 +269,8 @@ public enum EpmetErrorCode {
SAMPLE_TIME_AND_RESULT_IS_NULL_ERROR(8934,"检测时间或结果不能为空"),
ID_CARD_ERROR(8935,"请输入正确的身份证号或护照号"),
DANGER_AREA_ERROR(8937,"风险地区已存在"),
MISMATCH(10086,"人员与房屋信息不匹配,请与工作人员联系。"),
//通用错误码 start

20
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);
}
}

2
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());

7
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;
}
}
}

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

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

5
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";
/**
* 处理状态处理中

6
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;
/**

1
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;
/**
*

1
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;
}

5
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;
}

14
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){

24
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) {

10
epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcPartyUnitDao.java

@ -19,6 +19,7 @@ package com.epmet.dao;
import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.commons.tools.dto.result.OptionDataResultDTO;
import com.epmet.dto.form.PartyUnitFormDTO;
import com.epmet.dto.form.PartyUnitListbriefFormDTO;
import com.epmet.dto.result.PartyTypepercentResultDTO;
import com.epmet.dto.result.PartyUnitDistributionResultDTO;
@ -116,4 +117,13 @@ public interface IcPartyUnitDao extends BaseDao<IcPartyUnitEntity> {
@Param("customerId") String customerId);
List<IcPartyUnitEntity> selectByIds(@Param("partyUnitIds") List<String> partyUnitIds);
/**
* 联建单位-分页列表查询
* @param formDTO
* @return
*/
List<IcPartyUnitEntity> pageList(PartyUnitFormDTO formDTO);
List<String> getUnitNames(@Param("unitIds") List<String> unitIds);
}

3
epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcServiceItemDictDao.java

@ -21,6 +21,7 @@ import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.dto.result.demand.ServiceItemResultDTO;
import com.epmet.entity.IcServiceItemDictEntity;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@ -36,4 +37,6 @@ public interface IcServiceItemDictDao extends BaseDao<IcServiceItemDictEntity> {
List<ServiceItemResultDTO> pageList(String customerId);
IcServiceItemDictEntity selectMax(String customerId);
String selectName(@Param("customerId") String customerId, @Param("categoryCode") String categoryCode);
}

20
epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPartyUnitService.java

@ -6,13 +6,12 @@ import com.epmet.commons.tools.dto.result.OptionDataResultDTO;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.dto.IcPartyUnitDTO;
import com.epmet.dto.form.PartyActivityFormDTO;
import com.epmet.dto.form.PartyTypepercentFormDTO;
import com.epmet.dto.form.PartyUnitFormDTO;
import com.epmet.dto.form.PartyUnitListFormDTO;
import com.epmet.dto.form.PartyUnitListbriefFormDTO;
import com.epmet.dto.form.*;
import com.epmet.dto.form.demand.ServiceQueryFormDTO;
import com.epmet.dto.result.*;
import com.epmet.dto.result.CheckStaffInfoResultDTO;
import com.epmet.dto.result.PartyTypepercentResultDTO;
import com.epmet.dto.result.PartyUnitDistributionResultDTO;
import com.epmet.dto.result.PartyUnitListResultDTO;
import com.epmet.dto.result.demand.OptionDTO;
import com.epmet.entity.IcPartyUnitEntity;
import org.springframework.web.multipart.MultipartFile;
@ -20,7 +19,6 @@ import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.List;
import java.util.Map;
/**
* 联建单位
@ -181,4 +179,12 @@ public interface IcPartyUnitService extends BaseService<IcPartyUnitEntity> {
List<PartyTypepercentResultDTO> getTypepercent(PartyTypepercentFormDTO form);
void editPartyOrCommunity(CheckStaffInfoResultDTO formDTO);
/**
* 查询联建单位名称
* 不限制del_flag='0'
* @param unitIds
* @return
*/
List<String> getUnitNames(List<String> unitIds);
}

2
epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcServiceItemDictService.java

@ -79,4 +79,6 @@ public interface IcServiceItemDictService extends BaseService<IcServiceItemDictE
* @Date 2022/4/14 14:31
*/
void customerInit(String customerId);
String getCategoryName(String customerId, String id);
}

26
epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java

@ -119,17 +119,37 @@ public class IcPartyActivityServiceImpl extends BaseServiceImpl<IcPartyActivityD
//获取组织下联建单位
IcPartyUnitDTO unitDTO = new IcPartyUnitDTO();
unitDTO.setAgencyId(formDTO.getAgencyId());
Map<String, String> option = icPartyUnitService.option(unitDTO).stream().collect(Collectors.toMap(OptionDTO::getValue, OptionDTO::getLabel));
// Map<String, String> option = icPartyUnitService.option(unitDTO).stream().collect(Collectors.toMap(OptionDTO::getValue, OptionDTO::getLabel));
dtoList.forEach(dto -> {
//联建单位ID与单位名匹配
List<String> unitIds = Arrays.asList(dto.getUnitId().split(StrConstant.COMMA));
List<String> unitNames = unitIds.stream().map(option::get).collect(Collectors.toList());
// List<String> unitNames = unitIds.stream().map(option::get).collect(Collectors.toList());
// if(CollectionUtils.isEmpty(unitNames)){
List<String> unitNames=icPartyUnitService.getUnitNames(unitIds);
// }
dto.setUnitIdList(unitIds);
dto.setUnitName(StringUtils.join(unitNames, StrConstant.COMMA));
dto.setUnitNameList(unitNames);
if (StringUtils.isNotEmpty(dto.getGridId())) {
GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(dto.getGridId());
if (null != gridInfo) {
dto.setGridName(gridInfo.getGridName());
dto.setGridName(gridInfo.getGridNamePath());
dto.setAgencyName(gridInfo.getAgencyName());
}
}
//服务事项
if(StringUtils.isNotBlank(dto.getServiceMatter())){
List<String> serviceMatterid = Arrays.asList(dto.getServiceMatter().split(StrConstant.COMMA));
List<String> serviceMatterNameList=new ArrayList<>();
for(String id:serviceMatterid){
String categoryName=icServiceItemDictService.getCategoryName(dto.getCustomerId(),id);
if(StringUtils.isNotBlank(categoryName)){
serviceMatterNameList.add(categoryName);
}
}
dto.setServiceMatterList(serviceMatterid);
dto.setServiceMatterNameList(serviceMatterNameList);
dto.setServiceMatterName(StringUtils.join(serviceMatterNameList, StrConstant.COMMA));
}
});
}

49
epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java

@ -43,6 +43,7 @@ import com.epmet.commons.tools.redis.common.CustomerOrgRedis;
import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache;
import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.commons.tools.security.user.LoginUserUtil;
import com.epmet.commons.tools.utils.ConvertUtils;
import com.epmet.commons.tools.utils.ExcelPoiUtils;
import com.epmet.commons.tools.utils.Result;
@ -75,9 +76,9 @@ import org.apache.commons.fileupload.disk.DiskFileItemFactory;
import org.apache.commons.lang3.StringUtils;
import org.apache.http.entity.ContentType;
import org.apache.poi.ss.usermodel.Workbook;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.commons.CommonsMultipartFile;
@ -115,11 +116,12 @@ public class IcPartyUnitServiceImpl extends BaseServiceImpl<IcPartyUnitDao, IcPa
private IcCommunitySelfOrganizationService icCommunitySelfOrganizationService;
@Resource
private GovOrgOpenFeignClient govOrgOpenFeignClient;
@Autowired
private LoginUserUtil loginUserUtil;
@Override
public PageData<IcPartyUnitDTO> search(PartyUnitFormDTO formDTO) {
PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize());
LambdaQueryWrapper<IcPartyUnitEntity> wrapper = new LambdaQueryWrapper<>();
/*LambdaQueryWrapper<IcPartyUnitEntity> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(IcPartyUnitEntity::getAgencyId, formDTO.getAgencyId());
wrapper.like(StringUtils.isNotBlank(formDTO.getUnitName()), IcPartyUnitEntity::getUnitName, formDTO.getUnitName());
wrapper.like(StringUtils.isNotBlank(formDTO.getServiceMatter()), IcPartyUnitEntity::getServiceMatter, formDTO.getServiceMatter());
@ -127,7 +129,13 @@ public class IcPartyUnitServiceImpl extends BaseServiceImpl<IcPartyUnitDao, IcPa
wrapper.like(StringUtils.isNotBlank(formDTO.getContact()), IcPartyUnitEntity::getContact, formDTO.getContact());
wrapper.like(StringUtils.isNotBlank(formDTO.getContactMobile()), IcPartyUnitEntity::getContactMobile, formDTO.getContactMobile());
wrapper.orderByDesc(IcPartyUnitEntity::getCreatedTime);
List<IcPartyUnitEntity> list = baseDao.selectList(wrapper);
List<IcPartyUnitEntity> list = baseDao.selectList(wrapper);*/
//本组织及下级
if(StringUtils.isNotBlank(formDTO.getCurrentStaffId())&&StringUtils.isBlank(formDTO.getAgencyId())){
CustomerStaffInfoCacheResult staffInfo=CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(),formDTO.getCurrentStaffId());
formDTO.setAgencyId(staffInfo.getAgencyId());
}
List<IcPartyUnitEntity> list = baseDao.pageList(formDTO);
PageInfo<IcPartyUnitEntity> pageInfo = new PageInfo<>(list);
List<IcPartyUnitDTO> dtoList = ConvertUtils.sourceToTarget(list, IcPartyUnitDTO.class);
Result<Map<String, String>> unitTypeMap = epmetAdminOpenFeignClient.dictMap(DictTypeEnum.PARTY_UNIT_TYPE.getCode());
@ -150,6 +158,8 @@ public class IcPartyUnitServiceImpl extends BaseServiceImpl<IcPartyUnitDao, IcPa
item.setSatisfaction(new BigDecimal(item.getSatisfaction()).setScale(2, BigDecimal.ROUND_HALF_UP).toString());
}
item.setScore(null == pointMap.get(item.getId()) ? NumConstant.ZERO : pointMap.get(item.getId()));
AgencyInfoCache agencyInfoCache = CustomerOrgRedis.getAgencyInfo(item.getAgencyId());
item.setAgencyName(null != agencyInfoCache ? agencyInfoCache.getOrganizationName() : StrConstant.EPMETY_STR);
});
return new PageData<>(dtoList, pageInfo.getTotal());
}
@ -322,11 +332,18 @@ public class IcPartyUnitServiceImpl extends BaseServiceImpl<IcPartyUnitDao, IcPa
*/
@Override
public List<OptionDTO> option(IcPartyUnitDTO dto) {
LambdaQueryWrapper<IcPartyUnitEntity> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(IcPartyUnitEntity::getAgencyId, dto.getAgencyId());
wrapper.orderByDesc(IcPartyUnitEntity::getUpdatedTime);
wrapper.eq(StringUtils.isNotBlank(dto.getServiceMatter()), IcPartyUnitEntity::getServiceMatter, dto.getServiceMatter());
List<IcPartyUnitEntity> list = baseDao.selectList(wrapper);
// LambdaQueryWrapper<IcPartyUnitEntity> wrapper = new LambdaQueryWrapper<>();
// wrapper.eq(IcPartyUnitEntity::getAgencyId, dto.getAgencyId());
// wrapper.orderByDesc(IcPartyUnitEntity::getUpdatedTime);
// wrapper.eq(StringUtils.isNotBlank(dto.getServiceMatter()), IcPartyUnitEntity::getServiceMatter, dto.getServiceMatter());
// List<IcPartyUnitEntity> list = baseDao.selectList(wrapper);
// 改成查询当前组织及下级的数据
String customerId = loginUserUtil.getLoginUserCustomerId();
PartyUnitFormDTO partyUnitFormDTO = new PartyUnitFormDTO();
partyUnitFormDTO.setCustomerId(customerId);
partyUnitFormDTO.setAgencyId(dto.getAgencyId());
partyUnitFormDTO.setServiceMatter(dto.getServiceMatter());
List<IcPartyUnitEntity> list = baseDao.pageList(partyUnitFormDTO);
if (CollectionUtils.isEmpty(list)) {
return Collections.emptyList();
}
@ -761,4 +778,18 @@ public class IcPartyUnitServiceImpl extends BaseServiceImpl<IcPartyUnitDao, IcPa
}
}
/**
* 查询联建单位名称
* 不限制del_flag='0'
*
* @param unitIds
* @return
*/
@Override
public List<String> getUnitNames(List<String> unitIds) {
if(CollectionUtils.isEmpty(unitIds)){
return new ArrayList<>();
}
return baseDao.getUnitNames(unitIds);
}
}

5
epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcServiceItemDictServiceImpl.java

@ -201,5 +201,8 @@ public class IcServiceItemDictServiceImpl extends BaseServiceImpl<IcServiceItemD
}
}
@Override
public String getCategoryName(String customerId, String categoryCode) {
return baseDao.selectName(customerId,categoryCode);
}
}

40
epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml

@ -61,42 +61,50 @@
ADDRESS,
LONGITUDE,
LATITUDE,
RESULT
RESULT,
a.AGENCY_ID,
a.CUSTOMER_ID
FROM
ic_party_activity a
INNER JOIN (
SELECT
ACTIVITY_ID,
GROUP_CONCAT( UNIT_ID ) AS unitId
ur.ACTIVITY_ID,
GROUP_CONCAT( ur.UNIT_ID ) AS unitId
FROM
ic_activity_unit_relation
ic_activity_unit_relation ur
WHERE
DEL_FLAG = '0'
AND AGENCY_ID = #{agencyId}
ur.DEL_FLAG = '0'
<if test='null != agencyId and "" != agencyId'>
AND (ur.AGENCY_ID = #{agencyId} or ur.PIDS like concat('%',#{agencyId},'%'))
</if>
<if test='null != unitId and "" != unitId'>
AND UNIT_ID = #{unitId}
AND ur.UNIT_ID = #{unitId}
</if>
GROUP BY
ACTIVITY_ID
ur.ACTIVITY_ID
) b ON a.ID = b.ACTIVITY_ID
INNER JOIN (
SELECT
ACTIVITY_ID,
GROUP_CONCAT( SERVICE_MATTER ) AS serviceMatter
sr.ACTIVITY_ID,
GROUP_CONCAT( sr.SERVICE_MATTER ) AS serviceMatter
FROM
ic_activity_service_relation
ic_activity_service_relation sr
WHERE
DEL_FLAG = '0'
AND AGENCY_ID = #{agencyId}
sr.DEL_FLAG = '0'
<if test='null != agencyId and "" != agencyId'>
AND (sr.AGENCY_ID = #{agencyId} or sr.PIDS like concat('%',#{agencyId},'%'))
</if>
<if test='null != serviceMatter and "" != serviceMatter'>
AND SERVICE_MATTER = #{serviceMatter}
AND sr.SERVICE_MATTER = #{serviceMatter}
</if>
GROUP BY
ACTIVITY_ID
sr.ACTIVITY_ID
) c ON a.ID = c.ACTIVITY_ID
WHERE
a.DEL_FLAG = '0'
AND a.AGENCY_ID = #{agencyId}
<if test='null != agencyId and "" != agencyId'>
AND (a.AGENCY_ID = #{agencyId} or a.PIDS like concat('%',#{agencyId},'%'))
</if>
<if test='null != gridId and "" != gridId'>
AND a.GRID_ID = #{gridId}
</if>

50
epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyUnitDao.xml

@ -193,4 +193,54 @@
</foreach>
)
</select>
<select id="pageList" parameterType="com.epmet.dto.form.PartyUnitFormDTO" resultType="com.epmet.entity.IcPartyUnitEntity">
SELECT
u.*
FROM
ic_party_unit u
WHERE
u.DEL_FLAG = '0'
<if test="null != customerId and customerId != '' ">
AND u.CUSTOMER_ID = #{customerId}
</if>
<if test="null != agencyId and agencyId != '' ">
AND ( u.AGENCY_ID = #{agencyId} OR u.PIDS LIKE concat( '%', #{agencyId}, '%' ))
</if>
<if test="null != unitName and unitName != '' ">
and u.UNIT_NAME like concat( '%', #{unitName}, '%' )
</if>
<if test="null != serviceMatter and serviceMatter != '' ">
and u.SERVICE_MATTER like concat( '%', #{serviceMatter}, '%' )
</if>
<if test="null != type and type != '' ">
and u.TYPE =#{type}
</if>
<if test="null != contact and contact != '' ">
and u.CONTACT like concat( '%', #{contact}, '%' )
</if>
<if test="null != contactMobile and contactMobile != '' ">
and u.CONTACT_MOBILE like concat( '%', #{contactMobile}, '%' )
</if>
order by u.CREATED_TIME desc
</select>
<select id="getUnitNames" parameterType="map" resultType="java.lang.String">
SELECT
u.UNIT_NAME
FROM
ic_party_unit u
where 1=1
<trim prefix="AND ( " suffix=" )">
<foreach collection="unitIds" separator="or" item="id" index="index" >
u.ID = #{id}
</foreach>
</trim>
ORDER BY field(
u.ID,
<foreach item="unitId" collection="unitIds" separator=",">
#{unitId}
</foreach>
)
</select>
</mapper>

10
epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcServiceItemDictDao.xml

@ -31,4 +31,14 @@
order by CATEGORY_CODE desc
limit 1
</select>
<select id="selectName" parameterType="map" resultType="java.lang.String">
SELECT
d.CATEGORY_NAME
FROM
ic_service_item_dict d
WHERE
d.CUSTOMER_ID = #{customerId}
AND d.CATEGORY_CODE = #{categoryCode}
</select>
</mapper>

17
epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/GovMenuController.java

@ -59,6 +59,22 @@ public class GovMenuController {
return new Result();
}
/**
* 疯狂家按钮我要写个接口批量赠....
* @param formList
* @param tokenDto
* @return
*/
@PostMapping("batch-save")
public Result save(@RequestBody List<GovMenuDTO> formList, @LoginUser TokenDto tokenDto){
//效验数据
ValidatorUtils.validateEntity(formList, AddGroup.class, DefaultGroup.class);
for(GovMenuDTO dto:formList){
govMenuService.save(dto,tokenDto);
}
return new Result();
}
@PutMapping
public Result update(@RequestBody GovMenuDTO dto, @LoginUser TokenDto tokenDto){
//效验数据
@ -106,6 +122,7 @@ public class GovMenuController {
/**
* 导航
* +数字社区-系统管理-角色管理配置角色权限也会调用此接口
* @param tokenDto token
* @return List<GovMenuDTO>
*/

24
epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovMenuServiceImpl.java

@ -234,13 +234,22 @@ public class GovMenuServiceImpl extends BaseServiceImpl<GovMenuDao, GovMenuEntit
// PC端 每个客户的菜单信息,不放入缓存,每次登陆重新查询。
// 或者 你可以选择,在给每个客户 配置可见菜单的时候, 在saveCustomerMenu方法中,增加更新缓存的逻辑
tableName = getTableName(tableName);
return getCustomerMenuList(tokenDto.getCustomerId(), null,tableName,tokenDto.getUserId());
// 来自于烟台的需求,需要添加按钮,所以不限制type
// return getCustomerMenuList(tokenDto.getCustomerId(), MenuTypeEnum.MENU.value(),tableName,tokenDto.getUserId());
return getCustomerMenuList(tokenDto.getCustomerId(),null,tableName,tokenDto.getUserId());
}
@Override
public List<GovMenuDTO> navDigitalCommunity(TokenDto tokenDto, String tableName) {
tableName = getTableName(tableName);
List<GovMenuEntity> menuList = baseDao.getCustomerMenuList(tokenDto.getCustomerId(), MenuTypeEnum.MENU.value(), HttpContextUtils.getLanguage(),tableName);
List<GovMenuEntity> menuList=new ArrayList<>();
if("gov_menu".equals(tableName)){
// 管理平台菜单返回所有的
menuList = baseDao.getCustomerMenuList(tokenDto.getCustomerId(),null, HttpContextUtils.getLanguage(),tableName);
}else{
//数据分析还是沿用原来的
menuList = baseDao.getCustomerMenuList(tokenDto.getCustomerId(), MenuTypeEnum.MENU.value(), HttpContextUtils.getLanguage(),tableName);
}
Result<Boolean> isRootManager = epmetUserOpenFeignClient.getIsRootManager(tokenDto.getUserId());
if (!isRootManager.success()){
throw new EpmetException("getIsRootManager method is failure");
@ -249,6 +258,11 @@ public class GovMenuServiceImpl extends BaseServiceImpl<GovMenuDao, GovMenuEntit
List<GovMenuDTO> govMenuDTOS = ConvertUtils.sourceToTarget(menuList, GovMenuDTO.class);
return TreeUtils.buildTree(govMenuDTOS);
}
/*for(GovMenuEntity m:menuList){
if("ic_resi_add".equals(m.getPermissions())){
logger.info("1、菜单返回了新增居民");
}
}*/
disposeGovMenu(menuList,tokenDto.getUserId());
Map<Boolean, List<GovMenuEntity>> groupByStatus = menuList.stream().collect(Collectors.groupingBy(GovMenuEntity::getRoleStatus));
List<GovMenuDTO> dtoList = ConvertUtils.sourceToTarget(CollectionUtils.isEmpty(groupByStatus.get(true)) ? new ArrayList<>() : groupByStatus.get(true), GovMenuDTO.class);
@ -284,11 +298,17 @@ public class GovMenuServiceImpl extends BaseServiceImpl<GovMenuDao, GovMenuEntit
menuList = new ArrayList<>();
return;
}
// logger.info("==roleIdList="+ JSON.toJSONString(roleIdList));
List<String> menuIdsList = govRoleMenuDao.getMenuIdsList(roleIdList);
if (CollectionUtils.isEmpty(menuIdsList)){
menuList = new ArrayList<>();
return;
}
/*for(String mid:menuIdsList){
if("1581827798717898754".equals(mid)){
logger.info("2、角色也有此菜单");
}
}*/
for (String id : menuIdsList) {
for (GovMenuEntity m : menuList) {
if (m.getId().equals(id)){

40
epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovRoleServiceImpl.java

@ -18,7 +18,6 @@
package com.epmet.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
import com.epmet.commons.tools.constant.FieldConstant;
import com.epmet.commons.tools.exception.EpmetErrorCode;
@ -34,6 +33,8 @@ import com.epmet.redis.GovRoleRedis;
import com.epmet.service.GovRoleMenuService;
import com.epmet.service.GovRoleService;
import com.epmet.service.GovRoleUserService;
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;
@ -64,11 +65,20 @@ public class GovRoleServiceImpl extends BaseServiceImpl<GovRoleDao, GovRoleEntit
@Override
public PageData<GovRoleDTO> page(Map<String, Object> params) {
IPage<GovRoleEntity> page = baseDao.selectPage(
getPage(params, FieldConstant.CREATED_TIME, false),
getWrapper(params)
);
return getPageData(page, GovRoleDTO.class);
Integer pageNo = Integer.valueOf((String) params.get("pageNo"));
Integer pageSize = Integer.valueOf((String) params.get("pageSize"));
String id = (String) params.get(FieldConstant.ID_HUMP);
String name = (String) params.get(FieldConstant.NAME_HUMP);
String customerId = (String) params.get(FieldConstant.CUSTOMER_ID_HUMP);
QueryWrapper<GovRoleEntity> wrapper = new QueryWrapper<>();
wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id)
.like(StringUtils.isNotBlank(name), FieldConstant.NAME, name)
.eq(StringUtils.isNotBlank(customerId), FieldConstant.CUSTOMER_ID, customerId);
PageHelper.startPage(pageNo, pageSize);
List<GovRoleEntity> list = baseDao.selectList(wrapper);
List<GovRoleDTO> resList = ConvertUtils.sourceToTarget(list, GovRoleDTO.class);
PageInfo<GovRoleDTO> pageInfo = new PageInfo<>(resList);
return new PageData<>(resList, pageInfo.getTotal());
}
@Override
@ -79,10 +89,10 @@ public class GovRoleServiceImpl extends BaseServiceImpl<GovRoleDao, GovRoleEntit
return ConvertUtils.sourceToTarget(entityList, GovRoleDTO.class);
}
private QueryWrapper<GovRoleEntity> getWrapper(Map<String, Object> params){
String id = (String)params.get(FieldConstant.ID_HUMP);
String name = (String)params.get(FieldConstant.NAME_HUMP);
String customerId = (String)params.get(FieldConstant.CUSTOMER_ID_HUMP);
private QueryWrapper<GovRoleEntity> getWrapper(Map<String, Object> params) {
String id = (String) params.get(FieldConstant.ID_HUMP);
String name = (String) params.get(FieldConstant.NAME_HUMP);
String customerId = (String) params.get(FieldConstant.CUSTOMER_ID_HUMP);
QueryWrapper<GovRoleEntity> wrapper = new QueryWrapper<>();
wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id).like(StringUtils.isNotBlank(name), FieldConstant.NAME, name)
.eq(StringUtils.isNotBlank(customerId), FieldConstant.CUSTOMER_ID, customerId);
@ -101,7 +111,7 @@ public class GovRoleServiceImpl extends BaseServiceImpl<GovRoleDao, GovRoleEntit
public void save(GovRoleDTO dto) {
GovRoleEntity entity = ConvertUtils.sourceToTarget(dto, GovRoleEntity.class);
insert(entity);
//保存角色菜单关系
// 保存角色菜单关系
govRoleMenuService.saveOrUpdate(entity.getId(), dto.getMenuIdList());
}
@ -110,16 +120,16 @@ public class GovRoleServiceImpl extends BaseServiceImpl<GovRoleDao, GovRoleEntit
public void update(GovRoleDTO dto) {
GovRoleEntity entity = ConvertUtils.sourceToTarget(dto, GovRoleEntity.class);
updateById(entity);
//保存角色菜单关系
// 保存角色菜单关系
govRoleMenuService.saveOrUpdate(entity.getId(), dto.getMenuIdList());
}
@Override
@Transactional(rollbackFor = Exception.class)
public void delete(String[] ids) {
//联建单位负责人、社区自组织负责人两个默认解释不允许删除
// 联建单位负责人、社区自组织负责人两个默认解释不允许删除
GovRoleEntity entity = baseDao.selectById(ids[0]);
if(null!=entity && "1".equals(entity.getDefaultRole())){
if (null != entity && "1".equals(entity.getDefaultRole())) {
throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "系统默认角色,不允许删除", "系统默认角色,不允许删除");
}
baseDao.deleteBatchIds(Arrays.asList(ids));
@ -144,7 +154,7 @@ public class GovRoleServiceImpl extends BaseServiceImpl<GovRoleDao, GovRoleEntit
entity.setRemark("默认角色");
entity.setDefaultRole("1");
list.add(entity);
GovRoleEntity entity1 = ConvertUtils.sourceToTarget(entity,GovRoleEntity.class);
GovRoleEntity entity1 = ConvertUtils.sourceToTarget(entity, GovRoleEntity.class);
entity1.setId(null);
entity1.setName("社区自组织负责人");
list.add(entity1);

13
epmet-module/gov-access/gov-access-server/src/main/resources/mapper/GovMenuDao.xml

@ -47,9 +47,16 @@
select t1.*,
lang.field_value name
from gov_menu t1
INNER join gov_language lang on lang.table_name=#{tableName} and lang.field_name='name' and lang.table_id=t1.id and lang.language=#{language}
RIGHT JOIN gov_customer_menu m ON t1.id = m.TABLE_ID
where t1.del_flag = 0 AND m.del_flag = 0
INNER join gov_language lang
on (lang.table_name=#{tableName}
and lang.field_name='name'
and lang.table_id=t1.id
and lang.language=#{language}
)
RIGHT JOIN gov_customer_menu m
ON t1.id = m.TABLE_ID
where t1.del_flag = 0
AND m.del_flag = 0
<if test="type != null">
and t1.type = #{type}
</if>

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

@ -414,7 +414,7 @@ public class AgencyController {
//获取AccessToken
String accessToken = ThirdUtils.getAccessToken(tokenDto.getCustomerId()).getResiToken();
if (org.apache.commons.lang3.StringUtils.isBlank(accessToken)) {
log.warn("获取accessToken失败,customerId:{}", tokenDto.getCustomerId());
log.error("获取accessToken失败,customerId:{}", tokenDto.getCustomerId());
throw new RenException("获取accessToken失败,customerId:{}", tokenDto.getCustomerId());
}
CustomerAgencyDTO customerAgencyDTO = customerAgencyService.get(id);
@ -446,6 +446,7 @@ public class AgencyController {
qrCodeMultipartFile.setOriginalFilename(originalFilename);
Result<UploadImgResultDTO> uploadResult = ossFeignClient.uploadQrCode(qrCodeMultipartFile);
if (!uploadResult.success()) {
log.error("调用oss服务上传活动居民信息录入码失败");
throw new RenException("调用oss服务上传活动居民信息录入码失败");
}

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

@ -766,6 +766,9 @@ public class AgencyServiceImpl implements AgencyService {
}
if (formDTO.getLevel().equals(OrgInfoConstant.AGENCY)) {
CustomerAgencyEntity entity = customerAgencyDao.selectById(formDTO.getOrgId());
if (null == entity) {
throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "customer_agency is null orgId:" + formDTO.getOrgId(), "组织信息查询为空orgId:" + formDTO.getOrgId());
}
result = ConvertUtils.sourceToTarget(entity, MapOrgResultDTO.class);
result.setName(entity.getOrganizationName());
result.setLevel(formDTO.getLevel());

2
epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java

@ -5,6 +5,7 @@ import com.alibaba.excel.ExcelWriter;
import com.alibaba.excel.write.metadata.WriteSheet;
import com.alibaba.fastjson.JSON;
import com.epmet.commons.tools.annotation.LoginUser;
import com.epmet.commons.tools.annotation.MaskResponse;
import com.epmet.commons.tools.annotation.RequirePermission;
import com.epmet.commons.tools.aop.NoRepeatSubmit;
import com.epmet.commons.tools.constant.NumConstant;
@ -304,6 +305,7 @@ public class IcEventController {
* @Author sun
* @Description 事件管理-详情
**/
@MaskResponse(fieldNames = { "idCard"}, fieldsMaskType = {MaskResponse.MASK_TYPE_ID_CARD })
@PostMapping("detail")
public Result<IcEventListResultDTO> detail(@LoginUser TokenDto tokenDto, @RequestBody IcEventListFormDTO formDTO) {
formDTO.setCustomerId(tokenDto.getCustomerId());

2
epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/controller/OperMenuController.java

@ -1,11 +1,9 @@
package com.epmet.controller;
import com.epmet.commons.tools.annotation.LoginUser;
import com.epmet.commons.tools.constant.AppClientConstant;
import com.epmet.commons.tools.exception.ErrorCode;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.commons.tools.utils.EpmetRequestHolder;
import com.epmet.commons.tools.utils.ExcelUtils;
import com.epmet.commons.tools.utils.Result;
import com.epmet.commons.tools.validator.AssertUtils;

2
epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcExportTemplateServiceImpl.java

@ -124,7 +124,7 @@ public class IcExportTemplateServiceImpl extends BaseServiceImpl<IcExportTemplat
//增加校验 同组织内模板名不能重复
templist.forEach(t -> {
if (formDTO.getName().equals(t.getName())) {
throw new EpmetException(9999, "当前组织下已存在相同名称的模板!", "当前组织下已存在相同名称的模板!");
throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "当前组织下已存在相同名称的模板!", "当前组织下已存在相同名称的模板!");
}
});
sort = templist.get(NumConstant.ZERO).getSort() + NumConstant.ONE;

18
epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/IcPartyMemberDTO.java

@ -63,7 +63,8 @@ public class IcPartyMemberDTO implements Serializable {
*/
@NotBlank(message = "当前网格id不能为空",groups ={AddGroup.class, UpdateGroup.class})
private String mobile;
private String showMobile;
private String showIdCard;
/**
* 身份证号
*/
@ -110,6 +111,21 @@ public class IcPartyMemberDTO implements Serializable {
*/
private String isDyzxh;
/**
* 入党时所在党支部
*/
private String rdsszzb;
/**
* 组织关系转入社区时间
*/
private String zzgxzrsqsj;
/**
* 是否请长假
*/
private String isQcj;
/**
* 是否免学习0否,1是
*/

4
epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/form/IcPartyMemberFromDTO.java

@ -82,4 +82,8 @@ public class IcPartyMemberFromDTO extends PageFormDTO implements Serializable {
private String payEndDate;
private String year;
private String month;
/**
* 是否请长假
*/
private String isQcj;
}

12
epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyOrgServiceImpl.java

@ -101,24 +101,24 @@ public class IcPartyOrgServiceImpl extends BaseServiceImpl<IcPartyOrgDao, IcPart
//同一个客户下,名称和编码不可重复
IcPartyOrgEntity repeatName = baseDao.selectByCuIdAndNameOrCode(dto.getPartyOrgName(), null, dto.getCustomerId());
if (null != repeatName) {
throw new EpmetException("行政组织名称不可重复!");
throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"partyOrgName重复","行政组织名称不可重复!");
}
if (StringUtils.isNotBlank(dto.getPartyOrgCode())) {
IcPartyOrgEntity repeatCode = baseDao.selectByCuIdAndNameOrCode(null, dto.getPartyOrgCode(), dto.getCustomerId());
if (null != repeatCode) {
throw new EpmetException("行政组织编码不可重复!");
throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"partyOrgCode重复","行政组织编码不可重复!");
}
}
IcPartyOrgEntity parentOrg = baseDao.selectById(dto.getOrgPid());
//判断当前党组织的类型是否是所选上级党组织类型的直接下级
if ("0".equals(dto.getOrgPid())) {
if (PartyOrgTypeEnum.BRANCH.getCode().equals(dto.getPartyOrgType())) {
throw new EpmetException("支部不可设为一级组织!");
throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"支部不可设为一级组织!","支部不可设为一级组织!");
}
//一个客户下只能有一个一级组织
IcPartyOrgEntity levelOneOrg = baseDao.selectLevelOneOrgByCustomerId(dto.getCustomerId());
if (null != levelOneOrg) {
throw new EpmetException("当前客户下已存在一级组织,不可重复添加!");
throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"当前客户下已存在一级组织,不可重复添加!","当前客户下已存在一级组织,不可重复添加!");
}
} else {
checkOrgType(parentOrg.getPartyOrgType(), dto.getPartyOrgType());
@ -127,7 +127,7 @@ public class IcPartyOrgServiceImpl extends BaseServiceImpl<IcPartyOrgDao, IcPart
if (!PartyOrgTypeEnum.BRANCH.getCode().equals(dto.getPartyOrgType())) {
IcPartyOrgEntity isAgency = baseDao.selectByAgencyId(dto.getAgencyId(), PartyOrgTypeEnum.BRANCH.getCode());
if (null != isAgency) {
throw new EpmetException("该行政组织已被关联!");
throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"该行政组织已被关联!","该行政组织已被关联!");
}
AgencyInfoCache agency = CustomerOrgRedis.getAgencyInfo(dto.getAgencyId());
//判断该所选的行政组织类型是否与当前党组织的类型一致
@ -140,7 +140,7 @@ public class IcPartyOrgServiceImpl extends BaseServiceImpl<IcPartyOrgDao, IcPart
}
AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(dto.getAgencyId());
if (null == agencyInfo) {
throw new EpmetException("组织信息获取失败");
throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"组织信息获取失败","组织信息获取失败");
}
IcPartyOrgEntity entity = ConvertUtils.sourceToTarget(dto, IcPartyOrgEntity.class);
insert(entity);

6
epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberController.java

@ -30,7 +30,6 @@ import com.epmet.commons.tools.validator.group.UpdateGroup;
import com.epmet.constants.ImportTaskConstants;
import com.epmet.dto.form.IcPartyMemberFormDTO;
import com.epmet.dto.form.IcPartyMemberListFormDTO;
import com.epmet.dto.form.ReadIcMessageFormDTO;
import com.epmet.dto.result.ImportTaskCommonResultDTO;
import com.epmet.dto.result.PartyMemberAgeResultDTO;
import com.epmet.dto.result.PartyMemberEducationResultDTO;
@ -90,9 +89,14 @@ public class IcPartyMemberController implements ResultDataResolver {
return new Result<PageData<IcPartyMemberResultDTO>>().ok(page);
}
@MaskResponse(fieldNames = { "showMobile", "showIdCard" }, fieldsMaskType = { MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD })
@RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET})
public Result<IcPartyMemberDTO> get(@LoginUser TokenDto tokenDto, @PathVariable("id") String id){
IcPartyMemberDTO data = icPartyMemberService.get(tokenDto, id);
if(null!=data){
data.setShowMobile(data.getMobile());
data.setShowIdCard(data.getIdCard());
}
return new Result<IcPartyMemberDTO>().ok(data);
}
@NoRepeatSubmit

11
epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartymemberStyleController.java

@ -89,6 +89,12 @@ public class IcPartymemberStyleController {
return new Result<IcPartymemberStyleDTO>().ok(data);
}
/**
* 党员风采-新增
* @param tokenDto
* @param dto
* @return
*/
@PostMapping("save")
@NoRepeatSubmit
public Result save(@LoginUser TokenDto tokenDto, @RequestBody IcPartymemberStyleDTO dto) {
@ -98,6 +104,11 @@ public class IcPartymemberStyleController {
return new Result();
}
/**
* 党员风采-删除
* @param dto
* @return
*/
@PostMapping("delete")
public Result delete(@RequestBody IcPartymemberStyleDTO dto) {
//效验数据

15
epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/entity/IcPartyMemberEntity.java

@ -98,6 +98,21 @@ public class IcPartyMemberEntity extends BaseEpmetEntity {
*/
private String isDyzxh;
/**
* 入党时所在党支部
*/
private String rdsszzb;
/**
* 组织关系转入社区时间
*/
private String zzgxzrsqsj;
/**
* 是否请长假
*/
private String isQcj;
/**
* 是否免学习0否,1是
*/

9
epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/excel/IcPartyMemberImportExcel.java

@ -56,6 +56,15 @@ public class IcPartyMemberImportExcel {
@ExcelProperty("文化程度")
private String culture;
@ExcelProperty("入党时所在党支部")
private String rdsszzb;
@ExcelProperty("组织关系转入社区时间")
private String zzgxzrsqsj;
@ExcelProperty("是否请长假")
private String isQcj;
@ExcelProperty("备注")
private String remark;

7
epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberServiceImpl.java

@ -13,7 +13,6 @@ import com.epmet.commons.tools.dto.form.DictListFormDTO;
import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
import com.epmet.commons.tools.dto.result.DictListResultDTO;
import com.epmet.commons.tools.dto.result.OptionDataResultDTO;
import com.epmet.commons.tools.dto.result.OptionResultDTO;
import com.epmet.commons.tools.enums.DictTypeEnum;
import com.epmet.commons.tools.enums.IcFormCodeEnum;
import com.epmet.commons.tools.enums.PartyPostEnum;
@ -399,6 +398,9 @@ public class IcPartyMemberServiceImpl extends BaseServiceImpl<IcPartyMemberDao,
if (StringUtils.isBlank(entity.getIsTx())) {
entity.setIsTx(NumConstant.ZERO_STR);
}
if (StringUtils.isBlank(entity.getIsQcj())) {
entity.setIsQcj(NumConstant.ZERO_STR);
}
//判断党员是否已存在,有则更新,没有则添加
if (null != partyMember) {
@ -674,6 +676,7 @@ public class IcPartyMemberServiceImpl extends BaseServiceImpl<IcPartyMemberDao,
e.setIsLd(("是").equals(e.getIsLd())?NumConstant.ONE_STR:NumConstant.ZERO_STR);
e.setIsDyzxh(("是").equals(e.getIsDyzxh())?NumConstant.ONE_STR:NumConstant.ZERO_STR);
e.setIsMxx(("是").equals(e.getIsMxx())?NumConstant.ONE_STR:NumConstant.ZERO_STR);
e.setIsQcj(("是").equals(e.getIsQcj())?NumConstant.ONE_STR:NumConstant.ZERO_STR);
//职务
e.setPartyZw(PartyPostEnum.getCode(e.getPartyZw()));
//文化程度
@ -691,7 +694,7 @@ public class IcPartyMemberServiceImpl extends BaseServiceImpl<IcPartyMemberDao,
if (result.success() && null != result.getData()) {
e.setIcResiUser(result.getData().getIcResiUser());
e.setVolunteerCategory(result.getData().getVolunteerCategory());
e.setAddress(result.getData().getAddress());
e.setAddress(StringUtils.isNotBlank(result.getData().getAddress())?result.getData().getAddress():e.getAddress());
}
e.setCreatedBy(currentUserId);
e.setUpdatedBy(currentUserId);

6
epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartymemberStyleServiceImpl.java

@ -208,11 +208,17 @@ public class IcPartymemberStyleServiceImpl extends BaseServiceImpl<IcPartymember
}
}
/**
* 删除党员风采
* 同时删除党员风采相关照片
* @param id
*/
@Override
@Transactional(rollbackFor = Exception.class)
public void delete(String id) {
// 逻辑删除(@TableLogic 注解)
baseDao.deleteById(id);
icPartymemberStyleImageService.deleteByStyleId(id);
}
/**

10
epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/V0.0.12__edit_partymember.sql

@ -0,0 +1,10 @@
ALTER TABLE `ic_party_member`
ADD COLUMN `RDSSZZB` varchar(255) NULL COMMENT '入党时所在党支部' AFTER `IS_DYZXH`,
ADD COLUMN `ZZGXZRSQSJ` varchar(64) NULL COMMENT '组织关系转入社区时间' AFTER `RDSSZZB`,
ADD COLUMN `IS_QCJ` char(2) NULL COMMENT '是否请长假' AFTER `ZZGXZRSQSJ`;
UPDATE ic_party_member
SET IS_QCJ = '0'
WHERE
IS_QCJ IS NULL;

1
epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/V0.0.13__partyorgnamelength.sql

@ -0,0 +1 @@
alter table ic_party_org MODIFY COLUMN `PARTY_ORG_NAME` varchar(128) NOT NULL COMMENT '组织名称';

BIN
epmet-module/resi-partymember/resi-partymember-server/src/main/resources/excel/ic_party_member.xlsx

Binary file not shown.

3
epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/IcPartyMemberDao.xml

@ -106,6 +106,9 @@
<if test='null != isMxx and "" != isMxx.trim()'>
AND a.IS_MXX = #{isMxx}
</if>
<if test='null != isQcj and "" != isQcj.trim()'>
AND a.IS_QCJ = #{isQcj}
</if>
<if test='null != culture and "" != culture.trim()'>
AND a.CULTURE = #{culture}
</if>

5
epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ChangeDeathDTO.java

@ -26,6 +26,11 @@ public class ChangeDeathDTO implements Serializable {
*/
private String id;
/**
* ic_resi_user主键
*/
private String icResiUserId;
/**
* epmet用户主键
*/

10
epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ChangeRelocationDTO.java

@ -24,6 +24,16 @@ public class ChangeRelocationDTO implements Serializable {
*/
private String id;
/**
* ic_resi_user主键
*/
private String icResiUserId;
/**
* ic_resi_user 用户状态
*/
private String status;
/**
* 姓名
*/

4
epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcBirthRecordDTO.java

@ -25,6 +25,8 @@ public class IcBirthRecordDTO implements Serializable {
*/
private String id;
private String icResiUserId;
/**
* 客户Id customer.id
*/
@ -193,4 +195,4 @@ public class IcBirthRecordDTO implements Serializable {
@JsonIgnore
private Date updatedTime;
}
}

96
epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcDangerAreaDTO.java

@ -0,0 +1,96 @@
package com.epmet.dto;
import java.io.Serializable;
import java.util.Date;
import com.epmet.commons.tools.validator.group.AddGroup;
import com.epmet.commons.tools.validator.group.DefaultGroup;
import lombok.Data;
import javax.validation.constraints.NotBlank;
/**
* 疫情风险地区
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2022-10-31
*/
@Data
public class IcDangerAreaDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* ID
*/
private String id;
/**
* 客户ID
*/
private String customerId;
/**
* 风险等级
*/
// @NotBlank(message = "dangerLevel不能为空",groups = {AddGroup.class})
private String dangerLevel;
/**
*
*/
// @NotBlank(message = "province不能为空",groups = {AddGroup.class})
private String province;
/**
*
*/
// @NotBlank(message = "city不能为空",groups = {AddGroup.class})
private String city;
/**
*
*/
// @NotBlank(message = "district不能为空",groups = {AddGroup.class})
private String district;
/**
* --
*/
@NotBlank(message = "allName不能为空",groups = {AddGroup.class})
private String allName;
private String allNameCode;
/**
*
*/
private Integer delFlag;
/**
* 乐观锁
*/
private Integer revision;
/**
* 创建人
*/
private String createdBy;
/**
* 创建时间
*/
private Date createdTime;
/**
* 更新人
*/
private String updatedBy;
/**
* 更新时间
*/
private Date updatedTime;
}

62
epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcEpidemicSpecialAttentionDTO.java

@ -95,7 +95,7 @@ public class IcEpidemicSpecialAttentionDTO implements Serializable {
private String idCard;
/**
* 原因
* 关注原因后磐石改名为隔离原因
*/
@Length(max = 500,message = "原因限制500字以内",groups = {IcEpidemicSpecialAttentionAdd.class,IcEpidemicSpecialAttentionUpdate.class})
private String reason;
@ -106,6 +106,66 @@ public class IcEpidemicSpecialAttentionDTO implements Serializable {
@Length(max = 500,message = "备注限制500字以内",groups = {IcEpidemicSpecialAttentionAdd.class,IcEpidemicSpecialAttentionUpdate.class})
private String remark;
/**
* 管控开始时间yyyy-MM-dd,需求来源于磐石
*/
private String gkStartTime;
/**
* 管控结束时间yyyy-MM-dd,需求来源于磐石
*/
private String gkEndTime;
/**
* 干部名称,需求来源于磐石
*/
private String gbName;
/**
* 干部联系方式,需求来源于磐石
*/
private String gbMobile;
/**
* 社区网格管理员,需求来源于磐石
*/
private String gridManager;
/**
* 社区网格管理员联系方式,需求来源于磐石
*/
private String gridManagerMobile;
/**
* 基层医务工作者,需求来源于磐石
*/
private String healthWorker;
/**
* 基层医务工作者联系方式,需求来源于磐石
*/
private String healthWorkerMobile;
/**
* 民警,需求来源于磐石
*/
private String policeName;
/**
* 民警联系方式,需求来源于磐石
*/
private String policeMobile;
/**
* 志愿者,需求来源于磐石
*/
private String volunteerName;
/**
* 志愿者联系方式,需求来源于磐石
*/
private String volunteerMobile;
/**
*
*/

8
epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcNatCompareRecordDTO.java

@ -82,6 +82,14 @@ public class IcNatCompareRecordDTO implements Serializable {
@ExcelIgnore
private String icResiUserId;
/***
* 采样时间
*/
@ColumnWidth(30)
@ExcelProperty("最近一次采样时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date latestCyTime;
/**
* 最近一次核酸时间:接口填入
*/

9
epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcNatDTO.java

@ -61,6 +61,15 @@ public class IcNatDTO implements Serializable {
*/
private String idCard;
/**
* 脱敏详情用
*/
private String showMobile;
/**
* 脱敏详情用
*/
private String showIdCard;
/**
* 检测时间精确到分钟
*/

156
epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java

@ -66,14 +66,14 @@ public class IcTripReportRecordDTO implements Serializable {
* 姓名
*/
@ColumnWidth(15)
@ExcelProperty("姓名")
@ExcelProperty(value = "姓名")
private String name;
/**
* 手机号
*/
@ColumnWidth(15)
@ExcelProperty("手机号")
@ExcelProperty(value = "手机号")
private String mobile;
/**
@ -81,11 +81,16 @@ public class IcTripReportRecordDTO implements Serializable {
*/
private String realMobile;
/**
* 脱敏
*/
private String showMobile;
/**
* 身份证号
*/
@ColumnWidth(22)
@ExcelProperty("身份证号")
@ExcelProperty(value = "证号")
private String idCard;
/**
@ -93,6 +98,11 @@ public class IcTripReportRecordDTO implements Serializable {
*/
private String realIdCard;
/**
* 脱敏
*/
private String showIdCard;
/**
* 用户id
*/
@ -121,14 +131,14 @@ public class IcTripReportRecordDTO implements Serializable {
* 现居地名称eg:山东省青岛市黄岛区玫瑰山路社区
*/
@ColumnWidth(50)
@ExcelProperty("现居地")
@ExcelProperty(value = "现居地")
private String presentAddress;
/**
* 详细地址
*/
@ColumnWidth(35)
@ExcelProperty("详细地址")
@ExcelProperty(value = "现居地详细地址")
private String detailAddress;
/**
@ -147,30 +157,30 @@ public class IcTripReportRecordDTO implements Serializable {
* 来源地区地址
*/
@ColumnWidth(50)
@ExcelProperty("来自地区")
@ExcelProperty(value = "来自地区")
private String sourceAddress;
/**
* 到达日期
*/
@ColumnWidth(25)
@ExcelProperty("来到本地时间")
@ExcelProperty(value = "来到本地时间")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date arriveDate;
private String arriveDate;
/**
* 离开日期
*/
@ColumnWidth(25)
@ExcelProperty("离开本地时间")
@ExcelProperty(value = "离开本地时间")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date leaveDate;
private String leaveDate;
/**
* pc行程上报-列表返参最近一次通知时间
*/
@ColumnWidth(25)
@ExcelProperty("最近一次通知时间")
//@ExcelProperty("最近一次通知时间")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date latestNoticeTime;
@ -178,7 +188,7 @@ public class IcTripReportRecordDTO implements Serializable {
* 备注信息
*/
@ColumnWidth(100)
@ExcelProperty("备注")
@ExcelProperty(value = "备注")
private String remark;
/**
@ -233,4 +243,126 @@ public class IcTripReportRecordDTO implements Serializable {
@ColumnWidth(25)
@ExcelProperty("核算检测关注名单")
private String heSuanCheckDesc;
/**
* 交通方式来源字典表(traffic_type)
*/
@ExcelIgnore
private String trafficType;
/**
* 交通方式-中国字
*/
@ExcelIgnore
private String trafficTypeName;
/**
* 其他返回方式交通方式为其他时此列需要有值
*/
@ExcelIgnore
private String trafficTypeExplain;
/**
* 来自地区详细地址 source_address字段的说明
*/
@ExcelIgnore
private String sourceDetailAddress;
/**
* 疫苗接种针次 (0 1 2 3)小寨子
*/
@ExcelIgnore
private String vaccineNum;
/**
* 疫苗接种针次 -中国字(0针 1针 2针 3针)
*/
@ExcelIgnore
private String vaccineNumName;
/**
* 是否有48小时核算记录 0: 1: 小寨子
*/
@ExcelIgnore
private String isNatRecord;
/**
* 是否有48小时核算记录 0: 1: 小寨子-中国字
*/
@ExcelIgnore
private String isNatRecordName;
/**
* 户籍地 磐石
*/
@ExcelIgnore
private String registeredResidence;
/**
* 来曹事由磐石
*/
@ExcelIgnore
private String describeContent;
/**
* 48小时核算检查结果(0:阴性 1:阳性)磐石
*/
@ExcelIgnore
private String natOutcome;
/**
* 48小时核算检查结果(阴性 阳性)磐石-中国字
*/
@ExcelIgnore
private String natOutcomeName;
/**
* 7天内旅居史情况字典表(sojourn_history)磐石
*/
@ExcelIgnore
private String sojournHistory;
/**
* 7天内旅居史情况字典表(sojourn_history)磐石-中国字
*/
@ExcelIgnore
private String sojournHistoryName;
/**
* 隔离状态字典表(isolate_type)磐石
*/
@ExcelIgnore
private String isolateType;
/**
* 隔离状态字典表(isolate_type)磐石-中国字
*/
@ExcelIgnore
private String isolateTypeName;
/**
* 是否落实"落地检" 0: 1:磐石
*/
@ExcelIgnore
private String isArriveCheck;
/**
* 是否落实"落地检" 0: 1:磐石-中国字
*/
@ExcelIgnore
private String isArriveCheckName;
/**
* 是否达到曹县 0: 1:磐石
*/
@ExcelIgnore
private String isArrive;
/**
* 是否达到曹县 0: 1:磐石-中国字
*/
@ExcelIgnore
private String isArriveName;
/**
* 上报时间磐石
*/
@ExcelIgnore
@JsonFormat(pattern = "yyyy-MM-dd")
private String reportingTime;
/**
* 管控措施磐石
*/
@ExcelIgnore
private String controlMeasures;
/**
* 行程记录类型字典表(trip_data_type)磐石
*/
@ExcelIgnore
private String tripDataType;
/**
* 行程记录类型字典表(trip_data_type)磐石-中国字
*/
@ExcelIgnore
private String tripDataTypeName;
}

4
epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVaccineDTO.java

@ -36,12 +36,12 @@ public class IcVaccineDTO implements Serializable {
* 手机号
*/
private String mobile;
private String showMobile;
/**
* 身份证号
*/
private String idCard;
private String showIdCard;
/**
* 是否客户下居民(0: 1:)
*/

78
epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/BirthRecordListFormDTO.java

@ -0,0 +1,78 @@
package com.epmet.dto.form;
import com.epmet.commons.tools.dto.form.PageFormDTO;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
/**
* @Description
* @Author zhaoqifeng
* @Date 2022/5/10 10:02
*/
@NoArgsConstructor
@Data
public class BirthRecordListFormDTO extends PageFormDTO implements Serializable {
private static final long serialVersionUID = 5077167613040462646L;
/**
* 客户ID
*/
private String customerId;
private String staffId;
/**
* 组织Id
*/
private String agencyId;
/**
* 网格ID
*/
private String gridId;
/**
* 小区ID
*/
private String villageId;
/**
* 楼栋ID
*/
private String buildId;
/**
* 单元ID
*/
private String unitId;
/**
* 房屋ID
*/
private String homeId;
/**
* 姓名
*/
private String name;
/**
* 手机
*/
private String mobile;
/**
* 身份证
*/
private String idCard;
/**
* 性别
*/
private String gender;
/**
* 出生日开始
*/
private String startTime;
/**
* 出生日期结束
*/
private String endTime;
/**
* 是否福利
*/
private String isWelfare;
}

19
epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DangerAreaListFormDTO.java

@ -0,0 +1,19 @@
package com.epmet.dto.form;
import com.epmet.commons.tools.dto.form.PageFormDTO;
import lombok.Data;
import java.io.Serializable;
/**
* @Author zxc
* @DateTime 2022/10/31 16:59
*/
@Data
public class DangerAreaListFormDTO extends PageFormDTO implements Serializable {
private static final long serialVersionUID = 8868052895161162655L;
private String name;
private String dangerLevel;
private String customerId;
}

20
epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EmphasisTripDetailFormDTO.java

@ -0,0 +1,20 @@
package com.epmet.dto.form;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import java.io.Serializable;
/**
* @Author zxc
* @DateTime 2022/11/1 15:58
*/
@Data
public class EmphasisTripDetailFormDTO implements Serializable {
private static final long serialVersionUID = 4725053371888196275L;
public interface EmphasisTripDetailForm{}
@NotBlank(message = "id不能为空",groups = {EmphasisTripDetailForm.class})
private String id;
}

30
epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EmphasisTripListFormDTO.java

@ -0,0 +1,30 @@
package com.epmet.dto.form;
import com.epmet.commons.tools.dto.form.PageFormDTO;
import lombok.Data;
import java.io.Serializable;
/**
* @Author zxc
* @DateTime 2022/11/1 15:39
*/
@Data
public class EmphasisTripListFormDTO extends PageFormDTO implements Serializable {
private static final long serialVersionUID = 5850717233738956442L;
private String code;
private String name;
private String dangerLevel;
private String staffId;
private String customerId;
private String agencyId;
/**
* ic_trip_report_record.id
*/
private String id;
}

27
epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EmphasisTripPieDetailFormDTO.java

@ -0,0 +1,27 @@
package com.epmet.dto.form;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import java.io.Serializable;
/**
* @Author zxc
* @DateTime 2022/11/1 16:08
*/
@Data
public class EmphasisTripPieDetailFormDTO implements Serializable {
private static final long serialVersionUID = 8822391154779579664L;
public interface EmphasisTripPieDetailForm{}
// @NotBlank(message = "code不能为空",groups = {EmphasisTripPieDetailForm.class})
private String code;
private String name;
private String customerId;
private String staffId;
private String agencyId;
}

74
epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcTripReportFormDTO.java

@ -33,6 +33,10 @@ public class IcTripReportFormDTO implements Serializable {
public interface PcUpdateRequired extends CustomerClientShowGroup {
}
public interface PsAdd extends CustomerClientShowGroup {
}
public interface XzzAdd extends CustomerClientShowGroup {
}
@NotBlank(message = "主键不能为空", groups = {PcUpdateRequired.class})
private String id;
@ -176,5 +180,75 @@ public class IcTripReportFormDTO implements Serializable {
*/
private String content = "";
/**
* 交通方式来源字典表(traffic_type)
*/
@NotBlank(message = "返回方式不能为空", groups = {PcAddRequired.class, ResiUserRequired.class})
private String trafficType;
/**
* 其他返回方式交通方式为其他时此列需要有值
*/
private String trafficTypeExplain;
/**
* 来源地详细信息 source_address字段的说明
*/
@NotBlank(message = "来自地区不能为空", groups = {PcAddRequired.class, ResiUserRequired.class})
private String sourceDetailAddress;
/**
* 疫苗接种针次 (0针 1针 2针 3针)小寨子
*/
@NotBlank(message = "疫苗接种针次不能为空", groups = {XzzAdd.class})
private String vaccineNum;
/**
* 是否有48小时核算记录 0: 1: 小寨子
*/
@NotBlank(message = "48小时核算记录不能为空", groups = {XzzAdd.class})
private String isNatRecord;
/**
* 户籍地 磐石
*/
@NotBlank(message = "户籍地不能为空", groups = {PsAdd.class})
private String registeredResidence;
/**
* 来曹事由磐石
*/
@NotBlank(message = "来曹事由不能为空", groups = {PsAdd.class})
private String describeContent;
/**
* 48小时核算检查结果(阴性 阳性)磐石
*/
@NotBlank(message = "48小时核算检测不能为空", groups = {PsAdd.class})
private String natOutcome;
/**
* 7天内旅居史情况字典表(sojourn_history)磐石
*/
private String sojournHistory;
/**
* 隔离状态字典表(isolate_type)磐石
*/
private String isolateType;
/**
* 是否落实"落地检" 0: 1:磐石
*/
private String isArriveCheck;
/**
* 是否达到曹县 0: 1:磐石
*/
private String isArrive;
/**
* 上报时间磐石
*/
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date reportingTime;
/**
* 管控措施磐石
*/
private String controlMeasures;
/**
* 行程记录类型字典表(trip_data_type)磐石
*/
private String tripDataType;
}

25
epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/OnlyIdFormDTO.java

@ -0,0 +1,25 @@
package com.epmet.dto.form;
import lombok.Data;
import lombok.NoArgsConstructor;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotEmpty;
import java.io.Serializable;
import java.util.List;
/**
* @author wgf
* @dscription
*/
@Data
public class OnlyIdFormDTO implements Serializable {
private static final long serialVersionUID = -5220529162950147825L;
/**
* 主键
*/
@NotBlank(message = "主键不能为空")
private String id;
}

6
epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PageTripReportFormDTO.java

@ -54,4 +54,10 @@ public class PageTripReportFormDTO extends PageFormDTO implements Serializable {
* 查看详情时此列有值
*/
private String id;
/**
* 7天内旅居史情况字典表(sojourn_history)磐石
*/
private String sojournHistory;
}

4
epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/yqfk/IcNatCompareRecordPageFormDTO.java

@ -38,6 +38,10 @@ public class IcNatCompareRecordPageFormDTO extends PageFormDTO {
private String customerId;
private String userId;
private String agencyId;
/**
* 采样日期yyyyMMdd
*/
private String cyDate;
/**
* 检测时间

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

@ -0,0 +1,71 @@
package com.epmet.dto.result;
import lombok.Data;
import java.io.Serializable;
/**
* @Author zxc
* @DateTime 2022/11/1 15:38
*/
@Data
public class EmphasisTripListResultDTO implements Serializable {
private static final long serialVersionUID = -1646171374911115465L;
private String id;
private String agencyId;
private String name;
private String mobile;
private String idCard;
/**
* 来源地
*/
private String sourceAddress;
/**
* 来曹事由
*/
private String describeContent;
/**
* 核酸检测结果
*/
private String natOutcome;
private String natOutComeName;
/**
* 7天旅居史
*/
private String sojournHistory;
private String sojournHistoryName;
/**
* 隔离状态
*/
private String isolateType;
private String isolateTypeName;
/**
* 来曹时间
*/
private String arriveDate;
/**
* 离开时间
*/
private String leaveDate;
/**
* 现居地
*/
private String presentAddress;
/**
* 详细地址
*/
private String detailAddress;
private String remark;
}

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

@ -0,0 +1,19 @@
package com.epmet.dto.result;
import com.epmet.commons.tools.constant.NumConstant;
import lombok.Data;
import java.io.Serializable;
/**
* @Author zxc
* @DateTime 2022/11/1 16:06
*/
@Data
public class EmphasisTripPieDetailResultDTO implements Serializable {
private static final long serialVersionUID = -7654816048391073022L;
private String dangerLevelName;
private String dangerLevel;
private Integer total = NumConstant.ZERO;
}

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

@ -38,6 +38,15 @@ public class EpidemicPreventionResultDTO implements Serializable {
*/
private String idCard;
/**
* 脱敏详情用
*/
private String showMobile;
/**
* 脱敏详情用
*/
private String showIdCard;
private String birthDay;
/**

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

@ -18,6 +18,12 @@ public class IcMoveInListResultDTO implements Serializable {
* 迁入Id
*/
private String moveInId;
/**
* ic_resi_user主键
*/
private String icResiUserId;
/**
* 网格ID
*/

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

@ -42,7 +42,10 @@ public class VaccinationListResultDTO implements Serializable {
* 真实手机号
*/
private String realMobile;
/**
* 脱敏详情用
*/
private String showMobile;
/**
* 身份证
*/
@ -52,6 +55,10 @@ public class VaccinationListResultDTO implements Serializable {
* 真实的身份证
*/
private String realIdCard;
/**
* 脱敏详情用
*/
private String showIdCard;
private String sex;
@ -127,6 +134,100 @@ public class VaccinationListResultDTO implements Serializable {
@JsonIgnore
private String customerId;
/**
* 管控开始时间yyyy-MM-dd,需求来源于磐石
* gkStartTime-gkEndTime
*/
private String gkTime;
/**
* 管控开始时间yyyy-MM-dd,需求来源于磐石
*/
private String gkStartTime;
/**
* 管控结束时间yyyy-MM-dd,需求来源于磐石
*/
private String gkEndTime;
/**
* 干部名称联系方式,需求来源于磐石
* gbName+gbMobile
*/
private String gb;
/**
* 干部名称,需求来源于磐石
*/
private String gbName;
/**
* 干部联系方式,需求来源于磐石
*/
private String gbMobile;
/**
* 社区网格管理员gridManager,需求来源于磐石
* gridManager+gridManagerMobile
*/
private String gridManagerShow;
/**
* 社区网格管理员,需求来源于磐石
*/
private String gridManager;
/**
* 社区网格管理员联系方式,需求来源于磐石
*/
private String gridManagerMobile;
/**
* 基层医务工作者联系方式,需求来源于磐石
* healthWorker+healthWorkerMobile
*/
private String healthWorkerShow;
/**
* 基层医务工作者,需求来源于磐石
*/
private String healthWorker;
/**
* 基层医务工作者联系方式,需求来源于磐石
*/
private String healthWorkerMobile;
/**
* 民警联系方式,需求来源于磐石
* policeName+policeMobile
*/
private String policeShow;
/**
* 民警,需求来源于磐石
*/
private String policeName;
/**
* 民警联系方式,需求来源于磐石
*/
private String policeMobile;
/**
* 志愿者+联系方式,需求来源于磐石
*/
private String volunteerShow;
/**
* 志愿者,需求来源于磐石
*/
private String volunteerName;
/**
* 志愿者联系方式,需求来源于磐石
*/
private String volunteerMobile;
public VaccinationListResultDTO() {
this.vaccinationCount = NumConstant.ZERO;
this.name = "";

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

@ -28,11 +28,11 @@
<artifactId>epmet-commons-mybatis</artifactId>
<version>2.0.0</version>
</dependency>
<dependency>
<!--<dependency>
<groupId>com.epmet</groupId>
<artifactId>epmet-commons-dynamic-datasource</artifactId>
<version>2.0.0</version>
</dependency>
</dependency>-->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>

15
epmet-user/epmet-user-server/src/main/java/com/epmet/controller/ChangeDeathController.java

@ -13,6 +13,7 @@ import com.epmet.commons.tools.validator.group.AddGroup;
import com.epmet.commons.tools.validator.group.DefaultGroup;
import com.epmet.commons.tools.validator.group.UpdateGroup;
import com.epmet.dto.ChangeDeathDTO;
import com.epmet.dto.form.OnlyIdFormDTO;
import com.epmet.excel.ChangeDeathExcel;
import com.epmet.service.ChangeDeathService;
import org.apache.commons.collections4.CollectionUtils;
@ -94,6 +95,20 @@ public class ChangeDeathController {
ExcelUtils.exportEpmetExcel(response, null, list, ChangeDeathExcel.class);
}
/**
* 恢复死亡人员
* @param tokenDto
* @param dto
* @return
*/
@PostMapping("recovery")
public Result recovery(@LoginUser TokenDto tokenDto,@RequestBody OnlyIdFormDTO dto) {
//效验数据
ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
changeDeathService.recovery(tokenDto,dto);
return new Result();
}
}

15
epmet-user/epmet-user-server/src/main/java/com/epmet/controller/ChangeRelocationController.java

@ -13,6 +13,7 @@ import com.epmet.commons.tools.validator.group.AddGroup;
import com.epmet.commons.tools.validator.group.DefaultGroup;
import com.epmet.commons.tools.validator.group.UpdateGroup;
import com.epmet.dto.ChangeRelocationDTO;
import com.epmet.dto.form.OnlyIdFormDTO;
import com.epmet.excel.ChangeRelocationExcel;
import com.epmet.service.ChangeRelocationService;
import org.apache.commons.collections4.CollectionUtils;
@ -144,4 +145,18 @@ public class ChangeRelocationController {
return new Result();
}
/**
* 恢复迁出人员
* @param tokenDto
* @param dto
* @return
*/
@PostMapping("recovery")
public Result recovery(@LoginUser TokenDto tokenDto,@RequestBody OnlyIdFormDTO dto) {
//效验数据
ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
changeRelocationService.recovery(tokenDto,dto);
return new Result();
}
}

9
epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcBirthRecordController.java

@ -24,6 +24,7 @@ import com.epmet.commons.tools.validator.group.UpdateGroup;
import com.epmet.dto.IcBirthRecordDTO;
import com.epmet.dto.form.BirthRecordFormDTO;
import com.epmet.dto.form.BirthRecordUpdateDTO;
import com.epmet.dto.form.OnlyIdFormDTO;
import com.epmet.excel.IcBirthRecordExcel;
import com.epmet.service.IcBirthRecordService;
import lombok.extern.slf4j.Slf4j;
@ -92,6 +93,14 @@ public class IcBirthRecordController {
return new Result();
}
@PostMapping("deleteById")
public Result deleteById(@RequestBody OnlyIdFormDTO dto) {
//效验数据
ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
icBirthRecordService.deleteById(dto.getId());
return new Result();
}
@NoRepeatSubmit
@PostMapping("export")
public void export(@LoginUser TokenDto tokenDto, @RequestBody BirthRecordFormDTO formDTO, HttpServletResponse response) throws Exception {

222
epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcDangerAreaController.java

@ -0,0 +1,222 @@
package com.epmet.controller;
import com.alibaba.excel.EasyExcel;
import com.alibaba.excel.ExcelWriter;
import com.alibaba.excel.write.metadata.WriteSheet;
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.constant.NumConstant;
import com.epmet.commons.tools.constant.ServiceConstant;
import com.epmet.commons.tools.dto.form.PageFormDTO;
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.security.dto.TokenDto;
import com.epmet.commons.tools.utils.*;
import com.epmet.commons.tools.utils.poi.excel.handler.FreezeAndFilter;
import com.epmet.commons.tools.feign.*;
import com.epmet.commons.tools.validator.ValidatorUtils;
import com.epmet.commons.tools.validator.group.AddGroup;
import com.epmet.commons.tools.validator.group.UpdateGroup;
import com.epmet.commons.tools.validator.group.DefaultGroup;
import com.epmet.constants.ImportTaskConstants;
import com.epmet.dto.IcDangerAreaDTO;
import com.epmet.dto.form.DangerAreaListFormDTO;
import com.epmet.dto.form.ImportTaskCommonFormDTO;
import com.epmet.dto.result.ImportTaskCommonResultDTO;
import com.epmet.dto.result.NatListCommonExcelResultDTO;
import com.epmet.dto.result.NatListResultDTO;
import com.epmet.enums.DangerLevelEnum;
import com.epmet.excel.IcDangerAreaResultExcel;
import com.epmet.feign.EpmetCommonServiceOpenFeignClient;
import com.epmet.service.IcDangerAreaService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.io.IOUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpHeaders;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.net.URLEncoder;
import java.nio.file.Path;
import java.util.List;
import java.util.Map;
import java.util.UUID;
/**
* 疫情风险地区
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2022-10-31
*/
@RestController
@Slf4j
@RequestMapping("icDangerArea")
public class IcDangerAreaController implements ResultDataResolver{
@Autowired
private IcDangerAreaService icDangerAreaService;
@Autowired
private EpmetCommonServiceOpenFeignClient commonServiceOpenFeignClient;
@RequestMapping("page")
public Result<PageData<IcDangerAreaDTO>> page(@RequestParam Map<String, Object> params){
PageData<IcDangerAreaDTO> page = icDangerAreaService.page(params);
return new Result<PageData<IcDangerAreaDTO>>().ok(page);
}
@RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET})
public Result<IcDangerAreaDTO> get(@PathVariable("id") String id){
IcDangerAreaDTO data = icDangerAreaService.get(id);
return new Result<IcDangerAreaDTO>().ok(data);
}
/**
* @Description 新增
* @param dto
* @param tokenDto
* @Author zxc
* @Date 2022/11/1 09:09
*/
@NoRepeatSubmit
@PostMapping("add")
public Result save(@RequestBody IcDangerAreaDTO dto, @LoginUser TokenDto tokenDto){
ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
dto.setCustomerId(tokenDto.getCustomerId());
icDangerAreaService.save(dto);
return new Result();
}
@NoRepeatSubmit
@PostMapping("update")
public Result update(@RequestBody IcDangerAreaDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
icDangerAreaService.update(dto);
return new Result();
}
@PostMapping("delete")
public Result delete(@RequestBody List<String> ids,@LoginUser TokenDto tokenDto){
icDangerAreaService.delete(ids,tokenDto.getUserId());
return new Result();
}
@RequestMapping("list")
public Result<PageData<IcDangerAreaDTO>> list(@RequestBody DangerAreaListFormDTO formDTO,@LoginUser TokenDto tokenDto){
ValidatorUtils.validateEntity(formDTO, PageFormDTO.AddUserInternalGroup.class);
formDTO.setCustomerId(tokenDto.getCustomerId());
return new Result<PageData<IcDangerAreaDTO>>().ok(icDangerAreaService.list(formDTO));
}
@RequestMapping("export")
public void export(@LoginUser TokenDto tokenDto,@RequestBody DangerAreaListFormDTO formDTO,HttpServletResponse response){
formDTO.setCustomerId(tokenDto.getCustomerId());
ExcelWriter excelWriter = null;
int pageNo = NumConstant.ONE;
formDTO.setPageSize(NumConstant.ONE_THOUSAND);
try {
excelWriter = EasyExcel.write(ExcelUtils.getOutputStreamForExcel("风险地区", response), IcDangerAreaResultExcel.class).build();
WriteSheet writeSheet = EasyExcel.writerSheet("Sheet1").registerWriteHandler(new FreezeAndFilter()).build();
Integer size;
do {
PageData<IcDangerAreaDTO> list = icDangerAreaService.list(formDTO);
List<IcDangerAreaDTO> data = list.getList();
if (CollectionUtils.isNotEmpty(data)){
data.forEach(d -> {
d.setDangerLevel(DangerLevelEnum.getNameByCode(d.getDangerLevel()));
});
}
excelWriter.write(ConvertUtils.sourceToTarget(data,IcDangerAreaResultExcel.class), writeSheet);
formDTO.setPageNo(pageNo++);
size = data.size();
} while (size == NumConstant.ONE_THOUSAND);
}catch (Exception e){
log.error("export exception", e);
}finally {
if (excelWriter != null) {
excelWriter.finish();
}
}
}
/**
* @Description 模板下载
* @param response
* @Author zxc
* @Date 2022/11/1 09:52
*/
@PostMapping("downloadTemplate")
public void downloadTemplate(HttpServletResponse response) throws IOException{
response.setCharacterEncoding("UTF-8");
response.addHeader(HttpHeaders.ACCESS_CONTROL_EXPOSE_HEADERS, "Content-Disposition");
response.setHeader(HttpHeaders.CONTENT_TYPE, "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
response.setHeader(HttpHeaders.CONTENT_DISPOSITION, "attachment;filename=" + URLEncoder.encode("风险地区导入模板", "UTF-8") + ".xlsx");
InputStream is = this.getClass().getClassLoader().getResourceAsStream("excel/ic_danger_area_template.xlsx");
try {
ServletOutputStream os = response.getOutputStream();
IOUtils.copy(is, os);
} finally {
if (is != null) {
is.close();
}
}
}
@PostMapping("import")
public Result importExcel(@LoginUser TokenDto tokenDto, @RequestPart("file") MultipartFile file) {
String userId = EpmetRequestHolder.getHeader(AppClientConstant.USER_ID);
// 1.暂存文件
String originalFilename = file.getOriginalFilename();
String extName = originalFilename.substring(originalFilename.lastIndexOf("."));
Path fileSavePath;
try {
Path importPath = FileUtils.getAndCreateDirUnderEpmetFilesDir("ic_danger_area", "import");
fileSavePath = importPath.resolve(UUID.randomUUID().toString().concat(extName));
} catch (IOException e) {
String errorMsg = ExceptionUtils.getErrorStackTrace(e);
log.error("【风险地区】创建临时存储文件失败:{}", errorMsg);
throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "文件上传失败", "文件上传失败");
}
InputStream is = null;
FileOutputStream os = null;
try {
is = file.getInputStream();
os = new FileOutputStream(fileSavePath.toString());
IOUtils.copy(is, os);
} catch (Exception e) {
log.error("method exception", e);
} finally {
org.apache.poi.util.IOUtils.closeQuietly(is);
org.apache.poi.util.IOUtils.closeQuietly(os);
}
// 2.生成导入任务记录
ImportTaskCommonFormDTO importTaskForm = new ImportTaskCommonFormDTO();
importTaskForm.setOperatorId(userId);
importTaskForm.setBizType(ImportTaskConstants.BIZ_TYPE_IC_DANGER_AREA);
importTaskForm.setOriginFileName(originalFilename);
ImportTaskCommonResultDTO rstData = getResultDataOrThrowsException(commonServiceOpenFeignClient.createImportTask(importTaskForm),
ServiceConstant.EPMET_COMMON_SERVICE,
EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),
"excel导入风险地区错误",
"风险地区导入失败");
// 3.执行导入
icDangerAreaService.execAsyncExcelImport(fileSavePath, rstData.getTaskId(),tokenDto.getCustomerId(),tokenDto.getUserId());
return new Result();
}
}

1
epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcEpidemicPreventionController.java

@ -91,6 +91,7 @@ public class IcEpidemicPreventionController{
* @Author zhaoqifeng
* @Date 2022/3/29 16:13
*/
@MaskResponse(fieldNames = { "showMobile", "showIdCard" }, fieldsMaskType = { MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD })
@PostMapping("detail")
public Result<EpidemicPreventionResultDTO> detail(@LoginUser TokenDto tokenDto, @RequestBody EpidemicPreventionFormDTO formDTO) {
formDTO.setCustomerId(tokenDto.getCustomerId());

1
epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcEpidemicSpecialAttentionController.java

@ -88,6 +88,7 @@ public class IcEpidemicSpecialAttentionController {
* @author zxc
* @date 2022/4/27 15:47
*/
@MaskResponse(fieldNames = { "showMobile", "showIdCard" }, fieldsMaskType = { MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD })
@PostMapping("detail")
public Result<VaccinationListResultDTO> detail(@RequestBody AttentionDetailFormDTO formDTO){
ValidatorUtils.validateEntity(formDTO,VaccinationListFormDTO.VaccinationListForm.class);

10
epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcFollowUpRecordController.java

@ -56,6 +56,11 @@ public class IcFollowUpRecordController {
return new Result<PageData<IcFollowUpRecordDTO>>().ok(page);
}
/**
* 随访记录查看详情
* @param id
* @return
*/
@RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET})
public Result<IcFollowUpRecordDTO> get(@PathVariable("id") String id){
IcFollowUpRecordDTO data = icFollowUpRecordService.get(id);
@ -86,6 +91,11 @@ public class IcFollowUpRecordController {
return new Result();
}
/**
* 随访记录删除
* @param ids
* @return
*/
@PostMapping("delete")
public Result delete(@RequestBody String[] ids){
//效验数据

9
epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcMoveInRecordController.java

@ -23,6 +23,7 @@ import com.epmet.commons.tools.validator.group.AddGroup;
import com.epmet.commons.tools.validator.group.DefaultGroup;
import com.epmet.commons.tools.validator.group.UpdateGroup;
import com.epmet.dto.IcMoveInRecordDTO;
import com.epmet.dto.form.OnlyIdFormDTO;
import com.epmet.dto.form.IcMoveInAddEditFormDTO;
import com.epmet.dto.form.IcMoveInListFormDTO;
import com.epmet.dto.result.IcMoveInListResultDTO;
@ -95,6 +96,14 @@ public class IcMoveInRecordController {
return new Result();
}
@PostMapping("deleteById")
public Result deleteById(@RequestBody OnlyIdFormDTO dto) {
//效验数据
ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
icMoveInRecordService.deleteById(dto.getId());
return new Result();
}
@NoRepeatSubmit
@PostMapping("export")
public void export(@LoginUser TokenDto tokenDto, @RequestBody IcMoveInListFormDTO formDTO, HttpServletResponse response) throws IOException {

1
epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcNatController.java

@ -125,6 +125,7 @@ public class IcNatController implements ResultDataResolver {
* @Author sun
* @Description 核酸核酸检测信息详情
**/
@MaskResponse(fieldNames = { "showMobile", "showIdCard" }, fieldsMaskType = { MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD })
@NoRepeatSubmit
@PostMapping("detail")
public Result<IcNatDTO> detail(@RequestBody MyNatListFormDTO formDTO) {

9
epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java

@ -426,6 +426,7 @@ public class IcResiUserController implements ResultDataResolver {
* @author yinzuomei
* @date 2021/10/28 10:29 上午
*/
@MaskResponse(fieldNames = {"MOBILE","ID_CARD"}, fieldsMaskType = {MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD})
@PostMapping("detail")
public Result queryIcResiDetail(@LoginUser TokenDto tokenDto, @RequestBody IcResiDetailFormDTO pageFormDTO) {
//pageFormDTO.setCustomerId("45687aa479955f9d06204d415238f7cc");
@ -773,6 +774,7 @@ public class IcResiUserController implements ResultDataResolver {
* @author zxc
* @date 2021/11/3 9:21 上午
*/
@MaskResponse(fieldNames = {"mobile"}, fieldsMaskType = {MaskResponse.MASK_TYPE_MOBILE})
@PostMapping("persondata")
public Result<PersonDataResultDTO> personData(@LoginUser TokenDto tokenDto, @RequestBody PersonDataFormDTO formDTO) {
formDTO.setCustomerId(tokenDto.getCustomerId());
@ -802,6 +804,7 @@ public class IcResiUserController implements ResultDataResolver {
* @param tokenDto
* @return 根据分类搜索
*/
@MaskResponse(fieldNames = {"mobile","idCard"}, fieldsMaskType = {MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD})
@PostMapping("searchbycategory")
public Result<PageData<SearchByNameResultDTO>> search(@RequestBody SearchByNameFormDTO formDTO, @LoginUser TokenDto tokenDto) {
formDTO.setCustomerId(tokenDto.getCustomerId());
@ -914,7 +917,7 @@ public class IcResiUserController implements ResultDataResolver {
* @Date 2021/12/10 17:54
*/
@PostMapping("partymemberagelist")
@MaskResponse(fieldNames = {"mobile"}, fieldsMaskType = {MaskResponse.MASK_TYPE_MOBILE})
@MaskResponse(fieldNames = {"name","mobile"}, fieldsMaskType = {MaskResponse.MASK_TYPE_CHINESE_NAME,MaskResponse.MASK_TYPE_MOBILE})
public Result<PageData<PartyMemberAgeResultDTO>> partyMemberAgelist(@RequestBody PartyMemberListFormDTO formDTO) {
ValidatorUtils.validateEntity(formDTO);
return new Result<PageData<PartyMemberAgeResultDTO>>().ok(icResiUserService.getPartyMemberAgeList(formDTO));
@ -993,7 +996,7 @@ public class IcResiUserController implements ResultDataResolver {
* @Date 2021/12/10 17:58
*/
@PostMapping("partymembereducationlist")
@MaskResponse(fieldNames = {"mobile"}, fieldsMaskType = {MaskResponse.MASK_TYPE_MOBILE})
@MaskResponse(fieldNames = {"name","mobile"}, fieldsMaskType = {MaskResponse.MASK_TYPE_CHINESE_NAME,MaskResponse.MASK_TYPE_MOBILE})
public Result<PageData<PartyMemberEducationResultDTO>> partyMemberEducationlist(@RequestBody PartyMemberListFormDTO formDTO) {
ValidatorUtils.validateEntity(formDTO);
return new Result<PageData<PartyMemberEducationResultDTO>>().ok(icResiUserService.getPartyMemberEducationList(formDTO));
@ -1061,6 +1064,7 @@ public class IcResiUserController implements ResultDataResolver {
* @param resiUserId
* @return
*/
@MaskResponse(fieldNames = {"mobile","idCard"}, fieldsMaskType = {MaskResponse.MASK_TYPE_MOBILE,MaskResponse.MASK_TYPE_ID_CARD})
@PostMapping("resi-brief/{resi-user-id}")
public Result<IcResiUserBriefDTO> getResiBrief(@PathVariable("resi-user-id") String resiUserId, @LoginUser TokenDto loginUser) {
String customerId = loginUser.getCustomerId();
@ -1435,6 +1439,7 @@ public class IcResiUserController implements ResultDataResolver {
* @Author sun
* @Description 人房概览居民统计数点击查询列表
**/
@MaskResponse(fieldNames = {"mobile", "idCard"},fieldsMaskType = {MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD})
@PostMapping("icuserstatislist")
public Result<PageData<SearchByNameResultDTO>> icUserStatisList(@LoginUser TokenDto tokenDto, @RequestBody UserChartFormDTO formDTO) {
formDTO.setCustomerId(tokenDto.getCustomerId());

212
epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java

@ -9,10 +9,12 @@ import com.epmet.commons.tools.aop.NoRepeatSubmit;
import com.epmet.commons.tools.constant.AppClientConstant;
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.PageFormDTO;
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.exception.RenException;
import com.epmet.commons.tools.feign.ResultDataResolver;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.security.dto.TokenDto;
@ -22,20 +24,23 @@ import com.epmet.commons.tools.validator.ValidatorUtils;
import com.epmet.constant.IcResiUserConstant;
import com.epmet.constants.ImportTaskConstants;
import com.epmet.dto.IcTripReportRecordDTO;
import com.epmet.dto.form.IcTripReportFormDTO;
import com.epmet.dto.form.ImportTaskCommonFormDTO;
import com.epmet.dto.form.MyReportedTripFormDTO;
import com.epmet.dto.form.PageTripReportFormDTO;
import com.epmet.dto.form.*;
import com.epmet.dto.result.EmphasisTripListResultDTO;
import com.epmet.dto.result.EmphasisTripPieDetailResultDTO;
import com.epmet.dto.result.ImportTaskCommonResultDTO;
import com.epmet.excel.IcPsTripReportRecordExportExcel;
import com.epmet.excel.IcTripReportRecordExportExcel;
import com.epmet.feign.EpmetCommonServiceOpenFeignClient;
import com.epmet.service.IcTripReportRecordService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.io.FilenameUtils;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpHeaders;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@ -88,6 +93,7 @@ public class IcTripReportRecordController implements ResultDataResolver {
* @param formDTO
* @return
*/
@MaskResponse(fieldNames = { "showMobile", "showIdCard" }, fieldsMaskType = { MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD })
@PostMapping("detail")
public Result<IcTripReportRecordDTO> detail(@LoginUser TokenDto tokenDto,@RequestBody IcTripReportRecordDTO formDTO){
ValidatorUtils.validateEntity(formDTO,IcTripReportRecordDTO.DetailViewGroup.class);
@ -112,6 +118,16 @@ public class IcTripReportRecordController implements ResultDataResolver {
if(IcResiUserConstant.USER_TYPE_IC_RESI.equals(formDTO.getUserType())){
ValidatorUtils.validateEntity(formDTO,IcTripReportFormDTO.IcResiInternalGroup.class);
}
//磐石客户
if(StrConstant.PS_CUSTOMER_ID.equals(formDTO.getCustomerId())){
ValidatorUtils.validateEntity(formDTO,IcTripReportFormDTO.PsAdd.class);
}else {
ValidatorUtils.validateEntity(formDTO,IcTripReportFormDTO.XzzAdd.class);
}
//校验参数
if ("5".equals(formDTO.getTrafficType()) && StringUtils.isBlank(formDTO.getTrafficTypeExplain())) {
throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "返回方式为其他时,“其他返回方式”为必填", "返回方式为其他时,“其他返回方式”为必填");
}
String id=icTripReportRecordService.save(formDTO);
return new Result().ok(id);
}
@ -166,6 +182,16 @@ public class IcTripReportRecordController implements ResultDataResolver {
throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"请输入正确的证件号","请输入正确的证件号");
}
}
//磐石客户
if(StrConstant.PS_CUSTOMER_ID.equals(formDTO.getCustomerId())){
ValidatorUtils.validateEntity(formDTO,IcTripReportFormDTO.PsAdd.class);
}else {
ValidatorUtils.validateEntity(formDTO,IcTripReportFormDTO.XzzAdd.class);
}
//校验参数
if ("5".equals(formDTO.getTrafficType()) && StringUtils.isBlank(formDTO.getTrafficTypeExplain())) {
throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "返回方式为其他时,“其他返回方式”为必填", "返回方式为其他时,“其他返回方式”为必填");
}
return new Result().ok(icTripReportRecordService.resiSave(formDTO));
}
@ -217,8 +243,6 @@ public class IcTripReportRecordController implements ResultDataResolver {
public void export(@LoginUser TokenDto tokenDto, @RequestBody PageTripReportFormDTO formDTO, HttpServletResponse response) {
formDTO.setCustomerId(tokenDto.getCustomerId());
formDTO.setUserId(tokenDto.getUserId());
// formDTO.setCustomerId("45687aa479955f9d06204d415238f7cc");
// formDTO.setUserId("35005df15fb0f7c791344f0b424870b7");
formDTO.setIsPage(false);
ExcelWriter excelWriter = null;
formDTO.setPageSize(NumConstant.TEN_THOUSAND);
@ -227,13 +251,15 @@ public class IcTripReportRecordController implements ResultDataResolver {
// 这里 需要指定写用哪个class去写
String today= DateUtils.format(new Date(),DateUtils.DATE_PATTERN_MMDD);
String fileName = "行程上报信息".concat(today);
excelWriter = EasyExcel.write(ExcelUtils.getOutputStreamForExcel(fileName, response), IcTripReportRecordDTO.class).build();
excelWriter = EasyExcel.write(ExcelUtils.getOutputStreamForExcel(fileName, response), IcTripReportRecordExportExcel.class).build();
WriteSheet writeSheet = EasyExcel.writerSheet("Sheet1").registerWriteHandler(new FreezeAndFilter()).build();
PageData<IcTripReportRecordDTO> data = null;
List<IcTripReportRecordExportExcel> list = null;
do {
data = icTripReportRecordService.page(formDTO);
list = ConvertUtils.sourceToTarget(data.getList(), IcTripReportRecordExportExcel.class);
formDTO.setPageNo(++pageNo);
excelWriter.write(data.getList(), writeSheet);
excelWriter.write(list, writeSheet);
} while (CollectionUtils.isNotEmpty(data.getList()) && data.getList().size() == formDTO.getPageSize());
} catch (Exception e) {
@ -246,7 +272,6 @@ public class IcTripReportRecordController implements ResultDataResolver {
}
}
/**
* 导入excel
* @return
@ -300,4 +325,173 @@ public class IcTripReportRecordController implements ResultDataResolver {
icTripReportRecordService.execAsyncExcelImport(fileSavePath, rstData.getTaskId(),tokenDto.getCustomerId(),tokenDto.getUserId());
return new Result();
}
/**
* pc:磐石-行程上报-下载模板
* @param response
* @throws IOException
*/
@RequestMapping(value = "psdownloadtemplate", method = {RequestMethod.GET, RequestMethod.POST})
public void psDownloadTemplate(HttpServletResponse response) throws IOException {
response.setCharacterEncoding("UTF-8");
response.addHeader(HttpHeaders.ACCESS_CONTROL_EXPOSE_HEADERS, "Content-Disposition");
//response.setHeader(HttpHeaders.CONTENT_TYPE, "application/vnd.ms-excel");
response.setHeader(HttpHeaders.CONTENT_TYPE, "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
response.setHeader(HttpHeaders.CONTENT_DISPOSITION, "attachment;filename=" + URLEncoder.encode("行程上报导入模板", "UTF-8") + ".xlsx");
InputStream is = this.getClass().getClassLoader().getResourceAsStream("excel/ps_trip_report_import_template.xlsx");
try {
ServletOutputStream os = response.getOutputStream();
IOUtils.copy(is, os);
} finally {
if (is != null) {
is.close();
}
}
}
/**
* 磐石-导入excel
* @return
*/
@PostMapping("psimport")
@Transactional(rollbackFor = Exception.class)
public Result psImportExcel(@LoginUser TokenDto tokenDto, HttpServletResponse response, @RequestPart("file") MultipartFile file) throws Exception {
if (file.isEmpty()) {
throw new RenException("请上传文件");
}
// 1.暂存文件
String originalFilename = file.getOriginalFilename();
String extName = originalFilename.substring(originalFilename.lastIndexOf("."));
Path fileSavePath;
try {
Path importPath = FileUtils.getAndCreateDirUnderEpmetFilesDir("ic_trip_preport", "import");
fileSavePath = importPath.resolve(UUID.randomUUID().toString().concat(extName));
} catch (IOException e) {
String errorMsg = ExceptionUtils.getErrorStackTrace(e);
log.error("【行程上报导入】创建临时存储文件失败:{}", errorMsg);
throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "文件上传失败", "文件上传失败");
}
InputStream is = null;
FileOutputStream os = null;
try {
is = file.getInputStream();
os = new FileOutputStream(fileSavePath.toString());
IOUtils.copy(is, os);
} catch (Exception e) {
log.error("method exception", e);
} finally {
org.apache.poi.util.IOUtils.closeQuietly(is);
org.apache.poi.util.IOUtils.closeQuietly(os);
}
//校验文件类型
String extension = FilenameUtils.getExtension(file.getOriginalFilename());
if (!"xls".equals(extension) && !"xlsx".equals(extension)) {
throw new RenException("文件类型不匹配");
}
//2.查询当前工作人员是否有再导入的党员先锋数据,有则不允许导入,没有则进行新的导入
ImportTaskCommonFormDTO importTaskForm = new ImportTaskCommonFormDTO();
importTaskForm.setOriginFileName(file.getOriginalFilename());
importTaskForm.setOperatorId(tokenDto.getUserId());
importTaskForm.setBizType(ImportTaskConstants.PS_BIZ_TYPE_IC_TRIP_REPORT);
Result<ImportTaskCommonResultDTO> result = commonServiceOpenFeignClient.createImportTask(importTaskForm);
if (!result.success()) {
throw new RenException(result.getInternalMsg());
}
InputStream inputStream = null;
try {
inputStream = file.getInputStream();
}catch (Exception e){
ImportTaskCommonFormDTO input = new ImportTaskCommonFormDTO();
input.setOperatorId(tokenDto.getUserId());
input.setTaskId(result.getData().getTaskId());
input.setProcessStatus(ImportTaskConstants.PROCESS_STATUS_FINISHED_FAIL);
commonServiceOpenFeignClient.finishImportTask(input);
log.error("读取文件失败");
}
//3.执行导入程序
icTripReportRecordService.psExecAsyncExcelImport(fileSavePath, result.getData().getTaskId(),tokenDto);
return new Result();
}
/**
* pc:磐石-行程上报-导出
*/
@NoRepeatSubmit
@PostMapping("psexport")
public void psEexport(@LoginUser TokenDto tokenDto, @RequestBody PageTripReportFormDTO formDTO, HttpServletResponse response) {
formDTO.setCustomerId(tokenDto.getCustomerId());
formDTO.setUserId(tokenDto.getUserId());
formDTO.setIsPage(false);
ExcelWriter excelWriter = null;
formDTO.setPageSize(NumConstant.TEN_THOUSAND);
int pageNo = formDTO.getPageNo();
try {
// 这里 需要指定写用哪个class去写
String today= DateUtils.format(new Date(),DateUtils.DATE_PATTERN_MMDD);
String fileName = "行程上报信息".concat(today);
excelWriter = EasyExcel.write(ExcelUtils.getOutputStreamForExcel(fileName, response), IcPsTripReportRecordExportExcel.class).build();
WriteSheet writeSheet = EasyExcel.writerSheet("Sheet1").registerWriteHandler(new FreezeAndFilter()).build();
PageData<IcTripReportRecordDTO> data = null;
List<IcPsTripReportRecordExportExcel> list = null;
do {
data = icTripReportRecordService.page(formDTO);
list = ConvertUtils.sourceToTarget(data.getList(), IcPsTripReportRecordExportExcel.class);
formDTO.setPageNo(++pageNo);
excelWriter.write(list, writeSheet);
} while (CollectionUtils.isNotEmpty(data.getList()) && data.getList().size() == formDTO.getPageSize());
} catch (Exception e) {
log.error("export exception", e);
} finally {
if (excelWriter != null) {
excelWriter.finish();
}
}
}
/**
* @Description 重点行程名单列表
* @param tokenDto
* @param formDTO
* @Author zxc
* @Date 2022/11/1 15:43
*/
@PostMapping("list")
@MaskResponse(fieldNames = { "mobile", "idCard" }, fieldsMaskType = { MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD })
public Result<PageData<EmphasisTripListResultDTO>> emphasisTripList(@LoginUser TokenDto tokenDto, @RequestBody EmphasisTripListFormDTO formDTO){
ValidatorUtils.validateEntity(formDTO, PageFormDTO.AddUserInternalGroup.class);
formDTO.setStaffId(tokenDto.getUserId());
formDTO.setCustomerId(tokenDto.getCustomerId());
return new Result<PageData<EmphasisTripListResultDTO>>().ok(icTripReportRecordService.emphasisTripList(formDTO));
}
/**
* @Description 重点行程详情
* @param formDTO
* @Author zxc
* @Date 2022/11/1 16:05
*/
@MaskResponse(fieldNames = { "mobile", "idCard" }, fieldsMaskType = { MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD })
@PostMapping("emphasisTripDetail")
public Result<EmphasisTripListResultDTO> emphasisTripDetail(@RequestBody EmphasisTripDetailFormDTO formDTO){
ValidatorUtils.validateEntity(formDTO, EmphasisTripDetailFormDTO.EmphasisTripDetailForm.class);
return new Result<EmphasisTripListResultDTO>().ok(icTripReportRecordService.emphasisTripDetail(formDTO));
}
/**
* @Description 重点行程名单饼图详情
* @param formDTO
* @Author zxc
* @Date 2022/11/1 16:09
*/
@PostMapping("emphasisTripPieDetail")
public Result<List<EmphasisTripPieDetailResultDTO>> emphasisTripPieDetail(@RequestBody EmphasisTripPieDetailFormDTO formDTO, @LoginUser TokenDto tokenDto){
formDTO.setStaffId(tokenDto.getUserId());
formDTO.setCustomerId(tokenDto.getCustomerId());
return new Result<List<EmphasisTripPieDetailResultDTO>>().ok(icTripReportRecordService.emphasisTripPieDetail(formDTO));
}
}

1
epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccineController.java

@ -231,6 +231,7 @@ public class IcVaccineController implements ResultDataResolver {
* @Author sun
* @Description 疫苗接种情况-列表点击查询详情
**/
@MaskResponse(fieldNames = { "showMobile", "showIdCard" }, fieldsMaskType = { MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD })
@NoRepeatSubmit
@PostMapping("detail")
public Result<IcVaccineDTO> detail(@RequestBody IcVaccineFormDTO formDTO) {

10
epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcBirthRecordDao.java

@ -1,9 +1,13 @@
package com.epmet.dao;
import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.dto.IcBirthRecordDTO;
import com.epmet.dto.form.BirthRecordListFormDTO;
import com.epmet.entity.IcBirthRecordEntity;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
/**
* 出生管理
*
@ -12,5 +16,7 @@ import org.apache.ibatis.annotations.Mapper;
*/
@Mapper
public interface IcBirthRecordDao extends BaseDao<IcBirthRecordEntity> {
}
List<IcBirthRecordDTO> selectListByEntity(BirthRecordListFormDTO birthRecordListFormDTO);
}

19
epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcDangerAreaDao.java

@ -0,0 +1,19 @@
package com.epmet.dao;
import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.entity.IcDangerAreaEntity;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
/**
* 疫情风险地区
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2022-10-31
*/
@Mapper
public interface IcDangerAreaDao extends BaseDao<IcDangerAreaEntity> {
Integer delAllDangerArea(@Param("customerId")String customerId);
}

21
epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcTripReportRecordDao.java

@ -2,7 +2,11 @@ package com.epmet.dao;
import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.dto.IcTripReportRecordDTO;
import com.epmet.dto.form.EmphasisTripListFormDTO;
import com.epmet.dto.form.EmphasisTripPieDetailFormDTO;
import com.epmet.dto.form.PageTripReportFormDTO;
import com.epmet.dto.result.EmphasisTripListResultDTO;
import com.epmet.dto.result.EmphasisTripPieDetailResultDTO;
import com.epmet.entity.IcTripReportRecordEntity;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@ -42,4 +46,21 @@ public interface IcTripReportRecordDao extends BaseDao<IcTripReportRecordEntity>
* @return
*/
int batchDel(@Param("userId")String userId,@Param("agencyId")String agencyId, @Param("ids")String[] ids);
/**
* @Description 重点行程名单列表
* @param formDTO
* @Author zxc
* @Date 2022/11/1 16:18
*/
List<EmphasisTripListResultDTO> emphasisTripList(EmphasisTripListFormDTO formDTO);
/**
* @Description 重点行程名单饼图详情
* @param formDTO
* @Author zxc
* @Date 2022/11/2 10:07
*/
List<EmphasisTripPieDetailResultDTO> emphasisTripPieDetail(EmphasisTripPieDetailFormDTO formDTO);
}

56
epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcDangerAreaEntity.java

@ -0,0 +1,56 @@
package com.epmet.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Date;
/**
* 疫情风险地区
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2022-10-31
*/
@Data
@EqualsAndHashCode(callSuper=false)
@TableName("ic_danger_area")
public class IcDangerAreaEntity extends BaseEpmetEntity {
private static final long serialVersionUID = 1L;
/**
* 客户ID
*/
private String customerId;
/**
* 风险等级
*/
private String dangerLevel;
/**
*
*/
private String province;
/**
*
*/
private String city;
/**
*
*/
private String district;
/**
* --
*/
private String allName;
private String allNameCode;
}

72
epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcEpidemicSpecialAttentionEntity.java

@ -73,14 +73,74 @@ public class IcEpidemicSpecialAttentionEntity extends BaseEpmetEntity {
*/
private String idCard;
/**
* 原因
*/
/**
* 关注原因后磐石改名为隔离原因
*/
private String reason;
/**
* 备注
*/
/**
* 备注
*/
private String remark;
/**
* 管控开始时间yyyy-MM-dd,需求来源于磐石
*/
private String gkStartTime;
/**
* 管控结束时间yyyy-MM-dd,需求来源于磐石
*/
private String gkEndTime;
/**
* 干部名称,需求来源于磐石
*/
private String gbName;
/**
* 干部联系方式,需求来源于磐石
*/
private String gbMobile;
/**
* 社区网格管理员,需求来源于磐石
*/
private String gridManager;
/**
* 社区网格管理员联系方式,需求来源于磐石
*/
private String gridManagerMobile;
/**
* 基层医务工作者,需求来源于磐石
*/
private String healthWorker;
/**
* 基层医务工作者联系方式,需求来源于磐石
*/
private String healthWorkerMobile;
/**
* 民警,需求来源于磐石
*/
private String policeName;
/**
* 民警联系方式,需求来源于磐石
*/
private String policeMobile;
/**
* 志愿者,需求来源于磐石
*/
private String volunteerName;
/**
* 志愿者联系方式,需求来源于磐石
*/
private String volunteerMobile;
}

10
epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcNatCompareRecordEntity.java

@ -45,7 +45,10 @@ public class IcNatCompareRecordEntity extends BaseEpmetEntity {
* 是否客户下居民ic_resi_user.id
*/
private String icResiUserId;
/**
* 最近一次采样时间:接口填入
*/
private Date latestCyTime;
/**
* 最近一次核酸时间:接口填入
*/
@ -68,4 +71,9 @@ public class IcNatCompareRecordEntity extends BaseEpmetEntity {
* 最新一次导入时间对应ic_nat_compare_rec_relation.IMPORT_TIME
*/
private Date latestImportTime;
/**
* 备注系统内部使用方便看看错误
*/
private String internalRemark;
}

15
epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcPartyMemberEntity.java

@ -85,6 +85,21 @@ public class IcPartyMemberEntity extends BaseEpmetEntity {
*/
private String isDyzxh;
/**
* 入党时所在党支部
*/
private String rdsszzb;
/**
* 组织关系转入社区时间
*/
private String zzgxzrsqsj;
/**
* 是否请长假
*/
private String isQcj;
/**
* 预留字段1
*/

61
epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcTripReportRecordEntity.java

@ -115,4 +115,65 @@ public class IcTripReportRecordEntity extends BaseEpmetEntity {
*/
private String remark;
/**
* 交通方式来源字典表(traffic_type)
*/
private String trafficType;
/**
* 其他返回方式交通方式为其他时此列需要有值
*/
private String trafficTypeExplain;
/**
* 来源地详细信息 source_address字段的说明
*/
private String sourceDetailAddress;
/**
* 疫苗接种针次 (0针 1针 2针 3针)小寨子
*/
private String vaccineNum;
/**
* 是否有48小时核算记录 0: 1: 小寨子
*/
private String isNatRecord;
/**
* 户籍地 磐石
*/
private String registeredResidence;
/**
* 来曹事由磐石
*/
private String describeContent;
/**
* 48小时核算检查结果(0:阴性 1:阳性)磐石
*/
private String natOutcome;
/**
* 7天内旅居史情况字典表(sojourn_history)磐石
*/
private String sojournHistory;
/**
* 隔离状态字典表(isolate_type)磐石
*/
private String isolateType;
/**
* 是否落实"落地检" 0: 1:磐石
*/
private String isArriveCheck;
/**
* 是否达到曹县 0: 1:磐石
*/
private String isArrive;
/**
* 上报时间磐石
*/
private Date reportingTime;
/**
* 管控措施磐石
*/
private String controlMeasures;
/**
* 行程记录类型字典表(trip_data_type)磐石
*/
private String tripDataType;
}

55
epmet-user/epmet-user-server/src/main/java/com/epmet/enums/DangerLevelEnum.java

@ -0,0 +1,55 @@
package com.epmet.enums;
/**
* desc:数据同步配置枚举 对应data_sync_config中的DATA_CODE
* @author Administrator
*/
public enum DangerLevelEnum {
LOW("0", "低风险"),
MIDDLE("1", "中风险"),
HIGH("2", "高风险"),
OTHER("3", "无风险"),
;
private final String code;
private final String name;
DangerLevelEnum(String code, String name) {
this.code = code;
this.name = name;
}
public static DangerLevelEnum getEnum(String code) {
DangerLevelEnum[] values = DangerLevelEnum.values();
for (DangerLevelEnum value : values) {
if (value.getCode().equals(code)) {
return value;
}
}
return DangerLevelEnum.OTHER;
}
public static String getNameByCode(String code) {
DangerLevelEnum[] values = DangerLevelEnum.values();
for (DangerLevelEnum value : values) {
if (value.getCode().equals(code)) {
return value.getName();
}
}
return DangerLevelEnum.OTHER.getName();
}
public String getCode() {
return code;
}
public String getName() {
return name;
}
}

38
epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcDangerAreaImportExcel.java

@ -0,0 +1,38 @@
package com.epmet.excel;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.ColumnWidth;
import lombok.Data;
import javax.validation.constraints.NotBlank;
/**
* @Author zxc
* @DateTime 2022/11/1 11:18
*/
@Data
public class IcDangerAreaImportExcel {
@NotBlank(message = "风险地区为必填项")
@ExcelProperty("风险地区")
private String allName;
@NotBlank(message = "风险等级为必填项")
@ExcelProperty("风险等级")
private String dangerLevel;
@Data
public static class IcDangerAreaError{
@ColumnWidth(30)
@ExcelProperty(value = "风险地区")
private String name;
@ColumnWidth(20)
@ExcelProperty(value = "风险等级")
private String dangerLevel;
@ColumnWidth(40)
@ExcelProperty(value = "错误信息")
private String errorInfo;
}
}

22
epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcDangerAreaResultExcel.java

@ -0,0 +1,22 @@
package com.epmet.excel;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.ColumnWidth;
import lombok.Data;
/**
* @Author zxc
* @DateTime 2022/11/1 10:26
*/
@Data
public class IcDangerAreaResultExcel {
@ColumnWidth(40)
@ExcelProperty(value = "风险地区")
private String allName;
@ColumnWidth(20)
@ExcelProperty(value = "风险等级")
private String dangerLevel;
}

102
epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExcel.java

@ -0,0 +1,102 @@
package com.epmet.excel;
import com.alibaba.excel.annotation.ExcelProperty;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import org.hibernate.validator.constraints.Length;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.util.Date;
/**
* 磐石-行程上报信息
*
*/
@Data
public class IcPsTripReportRecordExcel {
@ExcelProperty("姓名")
@NotBlank(message = "姓名不能为空")
private String name;
@ExcelProperty("证件号")
@NotBlank(message = "证件号不能为空")
private String idCard;
@ExcelProperty("户籍地(省市县区)")
@NotBlank(message = "户籍地不能为空")
private String registeredResidence;
@ExcelProperty("手机号")
@NotBlank(message = "手机号不能为空")
private String mobile;
@ExcelProperty("来自地区(格式:省-市-区-街道-社区)")
@NotBlank(message = "来自地区不能为空")
private String sourceAddress;
@ExcelProperty("来自地区详细地址")
@NotBlank(message = "来自地区详细地址不能为空")
private String sourceDetailAddress;
@ExcelProperty("来曹事由(100字以内)")
@NotBlank(message = "来曹事由不能为空")
@Length(max = 500,message = "来曹事由不能超过100字")
private String describeContent;
@ExcelProperty("48小时核酸检测")
@NotBlank(message = "48小时核酸检测不能为空")
private String natOutcome;
@ExcelProperty("来到本地时间\n" +
"(2022-01-01)")
//@NotBlank(message = "来到本地时间不能为空")
@JsonFormat(pattern = "yyyy-MM-dd")
@NotNull(message = "来到本地时间为必填项")
private Date arriveDate;
@ExcelProperty("现居地")
@NotBlank(message = "现居地不能为空")
private String presentAddress;
@ExcelProperty("现居地详细地址")
@NotBlank(message = "现居地详细地址不能为空")
private String detailAddress;
@ExcelProperty("返回方式")
@NotBlank(message = "返回方式不能为空")
private String trafficType;
@ExcelProperty("其他返回方式")
private String trafficTypeExplain;
@ExcelProperty("7天内旅居史情况")
private String sojournHistory;
@ExcelProperty("隔离状态")
private String isolateType;
@ExcelProperty("备注(500字以内)")
@Length(max = 500,message = "备注不能超过500字")
private String remark;
@ExcelProperty("是否落实“落地检”")
private String isArriveCheck;
@ExcelProperty("是否达到曹县")
private String isArrive;
@ExcelProperty("上报时间\n" +
"(2022-01-01)")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date reportingTime;
@ExcelProperty("管控措施\n" +
"(500字以内)")
@Length(max = 500,message = "管控措施不能超过500字")
private String controlMeasures;
@ExcelProperty("类型\n" +
"(省内、省外、市内、县内)")
private String tripDataType;
}

150
epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExportExcel.java

@ -0,0 +1,150 @@
package com.epmet.excel;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.ColumnWidth;
import com.alibaba.excel.annotation.write.style.HeadStyle;
import com.alibaba.excel.enums.poi.FillPatternTypeEnum;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.io.Serializable;
/**
* 磐石-行程上报信息-导出
*
*/
@HeadStyle(fillPatternType = FillPatternTypeEnum.SOLID_FOREGROUND, fillForegroundColor = 44)
@Data
public class IcPsTripReportRecordExportExcel implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 姓名
*/
@ColumnWidth(12)
@ExcelProperty(value = "姓名", order = 1)
private String name;
/**
* 证件号
*/
@ColumnWidth(20)
@ExcelProperty(value = "证件号", order = 2)
private String idCard;
/**
* 户籍地 磐石
*/
@ColumnWidth(28)
@ExcelProperty(value = "户籍地(省市县区)", order = 3)
private String registeredResidence;
/**
* 手机号
*/
@ColumnWidth(15)
@ExcelProperty(value = "手机号", order = 4)
private String mobile;
/**
* 来自地区格式---街道-社区
*/
@ColumnWidth(30)
@ExcelProperty(value = "来自地区(格式:省-市-区-街道-社区)",order = 5)
private String sourceAddress;
/**
* 来自地区详细地址 source_address字段的说明
*/
@ColumnWidth(30)
@ExcelProperty(value = "来自地区详细地址",order = 6)
private String sourceDetailAddress;
/**
* 来曹事由100字以内磐石
*/
@ColumnWidth(25)
@ExcelProperty(value = "来曹事由(100字以内)",order = 7)
private String describeContent;
/**
* 48小时核酸检测 0:阴性 1:阳性 -中国字
*/
@ColumnWidth(20)
@ExcelProperty(value = "48小时核酸检测",order = 8)
private String isNatRecordName;
/**
* 来到本地时间2022-01-01
*/
@ColumnWidth(20)
@ExcelProperty(value = "来到本地时间(2022-01-01)",order = 9)
@JsonFormat(pattern = "yyyy-MM-dd")
private String arriveDate;
/**
* 现居地
*/
@ColumnWidth(30)
@ExcelProperty(value = "现居地",order = 10)
private String presentAddress;
/**
* 现居地详细地址
*/
@ColumnWidth(30)
@ExcelProperty(value = "现居地详细地址",order = 11)
private String detailAddress;
/**
* 交通方式-中国字
*/
@ColumnWidth(15)
@ExcelProperty(value = "返回方式",order = 12)
private String trafficTypeName;
/**
* 其他返回方式交通方式为其他时此列需要有值
*/
@ColumnWidth(18)
@ExcelProperty(value = "其他返回方式",order = 13)
private String trafficTypeExplain;
/**
* 7天内旅居史情况字典表(sojourn_history)磐石-中国字
*/
@ColumnWidth(20)
@ExcelProperty(value = "7天内旅居史情况",order = 14)
private String sojournHistoryName;
/**
* 隔离状态字典表(isolate_type)磐石-中国字
*/
@ColumnWidth(15)
@ExcelProperty(value = "隔离状态",order = 17)
private String isolateTypeName;
/**
* 备注500字以内
*/
@ColumnWidth(30)
@ExcelProperty(value = "备注(500字以内)",order = 16)
private String remark;
/**
* 是否落实"落地检" 0: 1:磐石-中国字
*/
@ColumnWidth(20)
@ExcelProperty(value = "是否落实“落地检”",order = 17)
private String isArriveCheckName;
/**
* 是否达到曹县 0: 1:磐石-中国字
*/
@ColumnWidth(20)
@ExcelProperty(value = "是否达到曹县",order = 18)
private String isArriveName;
/**
* 上报时间2022-01-01磐石
*/
@ColumnWidth(20)
@ExcelProperty(value = "上报时间(2022-01-01)",order = 19)
@JsonFormat(pattern = "yyyy-MM-dd")
private String reportingTime;
/**
* 管控措施500字以内磐石
*/
@ColumnWidth(30)
@ExcelProperty(value = "管控措施(500字以内)",order = 20)
private String controlMeasures;
/**
* 类型省内省外市内县内字典表(trip_data_type)磐石-中国字
*/
@ColumnWidth(25)
@ExcelProperty(value = "类型(省内、省外、市内、县内)",order = 21)
private String tripDataTypeName;
}

123
epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcTripReportRecordExportExcel.java

@ -0,0 +1,123 @@
package com.epmet.excel;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.ColumnWidth;
import com.alibaba.excel.annotation.write.style.HeadStyle;
import com.alibaba.excel.enums.poi.FillPatternTypeEnum;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
* 行程上报信息
*
*/
@HeadStyle(fillPatternType = FillPatternTypeEnum.SOLID_FOREGROUND, fillForegroundColor = 44)
@Data
public class IcTripReportRecordExportExcel implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 姓名
*/
@ColumnWidth(12)
@ExcelProperty(value = "姓名", order = 1)
private String name;
/**
* 证件号
*/
@ColumnWidth(20)
@ExcelProperty(value = "证件号",order = 2)
private String idCard;
/**
* 手机号
*/
@ColumnWidth(15)
@ExcelProperty(value = "手机号",order = 3)
private String mobile;
/**
* 现居地名称eg:山东省青岛市黄岛区玫瑰山路社区
*/
@ColumnWidth(30)
@ExcelProperty(value = "现居地",order = 4)
private String presentAddress;
/**
* 详细地址
*/
@ColumnWidth(30)
@ExcelProperty(value = "现居地详细地址",order = 5)
private String detailAddress;
/**
* 来源地区地址
*/
@ColumnWidth(30)
@ExcelProperty(value = "来自地区",order = 6)
private String sourceAddress;
/**
* 来自地区详细地址 source_address字段的说明
*/
@ColumnWidth(30)
@ExcelProperty(value = "来自地区详细地址",order = 7)
private String sourceDetailAddress;
/**
* 到达日期
*/
@ColumnWidth(20)
@ExcelProperty(value = "来到本地时间",order = 8)
@JsonFormat(pattern = "yyyy-MM-dd")
private String arriveDate;
/**
* 交通方式-中国字
*/
@ColumnWidth(15)
@ExcelProperty(value = "返回方式",order = 9)
private String trafficTypeName;
/**
* 其他返回方式交通方式为其他时此列需要有值
*/
@ColumnWidth(18)
@ExcelProperty(value = "其他返回方式",order = 10)
private String trafficTypeExplain;
/**
* 是否有48小时核算记录 0: 1: 小寨子-中国字
*/
@ColumnWidth(20)
@ExcelProperty(value = "48小时核酸检测",order = 11)
private String isNatRecordName;
/**
* 疫苗接种针次 -中国字(0针 1针 2针 3针)
*/
@ColumnWidth(20)
@ExcelProperty(value = "疫苗接种针次",order = 12)
private String vaccineNumName;
/**
* 离开日期
*/
@ColumnWidth(15)
@ExcelProperty(value = "离开本地时间",order = 13)
@JsonFormat(pattern = "yyyy-MM-dd")
private String leaveDate;
/**
* 备注信息
*/
@ColumnWidth(30)
@ExcelProperty(value = "备注",order = 14)
private String remark;
}

71
epmet-user/epmet-user-server/src/main/java/com/epmet/excel/ImportEpidemicSpecialAttention.java

@ -66,4 +66,75 @@ public class ImportEpidemicSpecialAttention extends ExcelVerifyInfo {
@ExcelIgnore
private Integer num;
/**
* 管控开始时间yyyy-MM-dd,需求来源于磐石
*/
@Excel(name = "管控开始时间")
private String gkStartTime;
/**
* 管控结束时间yyyy-MM-dd,需求来源于磐石
*/
@Excel(name = "管控结束时间")
private String gkEndTime;
/**
* 干部名称,需求来源于磐石
*/
@Excel(name = "镇(街)干部名称")
private String gbName;
/**
* 干部联系方式,需求来源于磐石
*/
@Excel(name = "镇(街)干部联系方式")
private String gbMobile;
/**
* 社区网格管理员,需求来源于磐石
*/
@Excel(name = "村(社区)网格管理员")
private String gridManager;
/**
* 社区网格管理员联系方式,需求来源于磐石
*/
@Excel(name = "村(社区)网格管理员联系方式")
private String gridManagerMobile;
/**
* 基层医务工作者,需求来源于磐石
*/
@Excel(name = "基层医务工作者")
private String healthWorker;
/**
* 基层医务工作者联系方式,需求来源于磐石
*/
@Excel(name = "基层医务工作者联系方式")
private String healthWorkerMobile;
/**
* 民警,需求来源于磐石
*/
@Excel(name = "民警")
private String policeName;
/**
* 民警联系方式,需求来源于磐石
*/
@Excel(name = "民警联系方式")
private String policeMobile;
/**
* 志愿者,需求来源于磐石
*/
@Excel(name = "志愿者")
private String volunteerName;
/**
* 志愿者联系方式,需求来源于磐石
*/
@Excel(name = "志愿者联系方式")
private String volunteerMobile;
}

71
epmet-user/epmet-user-server/src/main/java/com/epmet/excel/NatExportExcel.java

@ -34,5 +34,76 @@ public class NatExportExcel {
@Excel(name = "隔离状态",width = 20)
private String isolatedState;
/**
* 管控开始时间yyyy-MM-dd,需求来源于磐石
*/
@Excel(name = "管控开始时间",width = 30)
private String gkStartTime;
/**
* 管控结束时间yyyy-MM-dd,需求来源于磐石
*/
@Excel(name = "管控结束时间",width = 30)
private String gkEndTime;
/**
* 干部名称,需求来源于磐石
*/
@Excel(name = "镇(街)干部名称",width = 30)
private String gbName;
/**
* 干部联系方式,需求来源于磐石
*/
@Excel(name = "镇(街)干部联系方式",width = 30)
private String gbMobile;
/**
* 社区网格管理员,需求来源于磐石
*/
@Excel(name = "村(社区)网格管理员",width = 30)
private String gridManager;
/**
* 社区网格管理员联系方式,需求来源于磐石
*/
@Excel(name = "村(社区)网格管理员联系方式",width = 30)
private String gridManagerMobile;
/**
* 基层医务工作者,需求来源于磐石
*/
@Excel(name = "基层医务工作者",width = 30)
private String healthWorker;
/**
* 基层医务工作者联系方式,需求来源于磐石
*/
@Excel(name = "基层医务工作者联系方式",width = 30)
private String healthWorkerMobile;
/**
* 民警,需求来源于磐石
*/
@Excel(name = "民警",width = 30)
private String policeName;
/**
* 民警联系方式,需求来源于磐石
*/
@Excel(name = "民警联系方式",width = 30)
private String policeMobile;
/**
* 志愿者,需求来源于磐石
*/
@Excel(name = "志愿者",width = 30)
private String volunteerName;
/**
* 志愿者联系方式,需求来源于磐石
*/
@Excel(name = "志愿者联系方式",width = 30)
private String volunteerMobile;
}

71
epmet-user/epmet-user-server/src/main/java/com/epmet/excel/NatHistoryExportExcel.java

@ -36,5 +36,76 @@ public class NatHistoryExportExcel {
@Excel(name = "隔离状态",width = 20)
private String isolatedState;
/**
* 管控开始时间yyyy-MM-dd,需求来源于磐石
*/
@Excel(name = "管控开始时间",width = 30)
private String gkStartTime;
/**
* 管控结束时间yyyy-MM-dd,需求来源于磐石
*/
@Excel(name = "管控结束时间",width = 30)
private String gkEndTime;
/**
* 干部名称,需求来源于磐石
*/
@Excel(name = "镇(街)干部名称",width = 30)
private String gbName;
/**
* 干部联系方式,需求来源于磐石
*/
@Excel(name = "镇(街)干部联系方式",width = 30)
private String gbMobile;
/**
* 社区网格管理员,需求来源于磐石
*/
@Excel(name = "村(社区)网格管理员",width = 30)
private String gridManager;
/**
* 社区网格管理员联系方式,需求来源于磐石
*/
@Excel(name = "村(社区)网格管理员联系方式",width = 30)
private String gridManagerMobile;
/**
* 基层医务工作者,需求来源于磐石
*/
@Excel(name = "基层医务工作者",width = 30)
private String healthWorker;
/**
* 基层医务工作者联系方式,需求来源于磐石
*/
@Excel(name = "基层医务工作者联系方式",width = 30)
private String healthWorkerMobile;
/**
* 民警,需求来源于磐石
*/
@Excel(name = "民警",width = 30)
private String policeName;
/**
* 民警联系方式,需求来源于磐石
*/
@Excel(name = "民警联系方式",width = 30)
private String policeMobile;
/**
* 志愿者,需求来源于磐石
*/
@Excel(name = "志愿者",width = 30)
private String volunteerName;
/**
* 志愿者联系方式,需求来源于磐石
*/
@Excel(name = "志愿者联系方式",width = 30)
private String volunteerMobile;
}

Some files were not shown because too many files changed in this diff

Loading…
Cancel
Save