diff --git a/src/main/java/com/cm/inspection/pojo/dtos/check/CheckDTO.java b/src/main/java/com/cm/inspection/pojo/dtos/check/CheckDTO.java index 2b43451..d3a9cbf 100644 --- a/src/main/java/com/cm/inspection/pojo/dtos/check/CheckDTO.java +++ b/src/main/java/com/cm/inspection/pojo/dtos/check/CheckDTO.java @@ -1,8 +1,6 @@ package com.cm.inspection.pojo.dtos.check; import com.cm.inspection.pojo.dtos.checkitem.CheckItemDTO; -import com.cm.inspection.pojo.dtos.hiddendangerreport.HiddenDangerReportDTO; -import com.cm.inspection.pojo.vos.hiddendangerreport.HiddenDangerReportVO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -33,14 +31,24 @@ public class CheckDTO implements Serializable { private String typeDictionaryName; @ApiModelProperty(name = "area1JoinByEnterpriseId", value = "企业ID的1级地区") private String area1JoinByEnterpriseId; + @ApiModelProperty(name = "area1DictionaryName", value = "企业1级地区名称") + private String area1DictionaryName; @ApiModelProperty(name = "area2JoinByEnterpriseId", value = "企业ID的2级区域") private String area2JoinByEnterpriseId; + @ApiModelProperty(name = "area2DictionaryName", value = "企业2级地区名称") + private String area2DictionaryName; @ApiModelProperty(name = "area3JoinByEnterpriseId", value = "企业ID的3级区域") private String area3JoinByEnterpriseId; + @ApiModelProperty(name = "area3DictionaryName", value = "企业3级地区名称") + private String area3DictionaryName; @ApiModelProperty(name = "area4JoinByEnterpriseId", value = "企业ID的4级区域") private String area4JoinByEnterpriseId; + @ApiModelProperty(name = "area4DictionaryName", value = "企业4级地区名称") + private String area4DictionaryName; @ApiModelProperty(name = "area5JoinByEnterpriseId", value = "企业ID的5级区域") private String area5JoinByEnterpriseId; + @ApiModelProperty(name = "area5DictionaryName", value = "企业5级地区名称") + private String area5DictionaryName; @ApiModelProperty(name = "addressJoinByEnterpriseId", value = "企业ID的详细地址") private String addressJoinByEnterpriseId; @ApiModelProperty(name = "industryJoinByEnterpriseId", value = "企业ID的管理行业") @@ -140,6 +148,14 @@ public class CheckDTO implements Serializable { this.area1JoinByEnterpriseId = area1JoinByEnterpriseId; } + public String getArea1DictionaryName() { + return area1DictionaryName == null ? "" : area1DictionaryName; + } + + public void setArea1DictionaryName(String area1DictionaryName) { + this.area1DictionaryName = area1DictionaryName; + } + public String getArea2JoinByEnterpriseId() { return area2JoinByEnterpriseId == null ? "" : area2JoinByEnterpriseId; } @@ -148,6 +164,14 @@ public class CheckDTO implements Serializable { this.area2JoinByEnterpriseId = area2JoinByEnterpriseId; } + public String getArea2DictionaryName() { + return area2DictionaryName == null ? "" : area2DictionaryName; + } + + public void setArea2DictionaryName(String area2DictionaryName) { + this.area2DictionaryName = area2DictionaryName; + } + public String getArea3JoinByEnterpriseId() { return area3JoinByEnterpriseId == null ? "" : area3JoinByEnterpriseId; } @@ -156,6 +180,14 @@ public class CheckDTO implements Serializable { this.area3JoinByEnterpriseId = area3JoinByEnterpriseId; } + public String getArea3DictionaryName() { + return area3DictionaryName == null ? "" : area3DictionaryName; + } + + public void setArea3DictionaryName(String area3DictionaryName) { + this.area3DictionaryName = area3DictionaryName; + } + public String getArea4JoinByEnterpriseId() { return area4JoinByEnterpriseId == null ? "" : area4JoinByEnterpriseId; } @@ -164,6 +196,14 @@ public class CheckDTO implements Serializable { this.area4JoinByEnterpriseId = area4JoinByEnterpriseId; } + public String getArea4DictionaryName() { + return area4DictionaryName == null ? "" : area4DictionaryName; + } + + public void setArea4DictionaryName(String area4DictionaryName) { + this.area4DictionaryName = area4DictionaryName; + } + public String getArea5JoinByEnterpriseId() { return area5JoinByEnterpriseId == null ? "" : area5JoinByEnterpriseId; } @@ -172,6 +212,14 @@ public class CheckDTO implements Serializable { this.area5JoinByEnterpriseId = area5JoinByEnterpriseId; } + public String getArea5DictionaryName() { + return area5DictionaryName == null ? "" : area5DictionaryName; + } + + public void setArea5DictionaryName(String area5DictionaryName) { + this.area5DictionaryName = area5DictionaryName; + } + public String getAddressJoinByEnterpriseId() { return addressJoinByEnterpriseId == null ? "" : addressJoinByEnterpriseId; } diff --git a/src/main/java/com/cm/inspection/startup/StartUp.java b/src/main/java/com/cm/inspection/startup/StartUp.java index 0ed9631..b1eeebc 100644 --- a/src/main/java/com/cm/inspection/startup/StartUp.java +++ b/src/main/java/com/cm/inspection/startup/StartUp.java @@ -38,6 +38,8 @@ public class StartUp implements ApplicationRunner { private IDischargePermitService dischargePermitService; @Value("${version:1}") private Integer version; + @Value("${report-form.check-detail:false}") + private Boolean checkDetailReportForm; @Autowired private ICountService countService; @Autowired @@ -51,10 +53,12 @@ public class StartUp implements ApplicationRunner { // 部署流程 processService.deployProcess("check-self", "网格员检查上报流程"); - // 初始化统计,防止第一次打开慢 - new Thread(() -> { - CheckDetailTable.getInstance().setCountService(countService).refresh(); - }).start(); + if (checkDetailReportForm) { + // 初始化统计,防止第一次打开慢 + new Thread(() -> { + CheckDetailTable.getInstance().setCountService(countService).refresh(); + }).start(); + } } /** @@ -62,6 +66,9 @@ public class StartUp implements ApplicationRunner { */ @Scheduled(cron = "0 0 23 * * ?") public void checkDetailTable() { + if (!checkDetailReportForm) { + return; + } CheckDetailTable.getInstance().setCountService(countService).refresh(); } diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml index 557ea7c..8048b06 100644 --- a/src/main/resources/application-test.yml +++ b/src/main/resources/application-test.yml @@ -20,11 +20,14 @@ spring: max-request-size: 1GB datasource: druid: - url: jdbc:mysql://49.233.36.36:6688/db_cloud_inspection?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&autoReconnect=true&failOverReadOnly=false&useSSL=false +# url: jdbc:mysql://49.233.36.36:6688/db_cloud_inspection?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&autoReconnect=true&failOverReadOnly=false&useSSL=false + url: jdbc:mysql://127.0.0.1:3306/db_cloud_inspection?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&autoReconnect=true&failOverReadOnly=false&useSSL=false db-type: mysql driver-class-name: com.mysql.jdbc.Driver - username: wanggeng - password: WenG>2132997 +# username: wanggeng + username: root +# password: WenG>2132997 + password: root initial-size: 2 min-idle: 2 max-active: 5 @@ -82,7 +85,9 @@ security: oauth-logout: ${security.oauth2.oauth-server}/logout?redirect_uri=${server.url} client: client-id: 44a8dc867f7f4465b7ba6065d87e30d7 +# client-id: 32ec344a5fd04fd9911586df5d1dc36b client-secret: bTRCTEw1TEZkL284bVhLOXJ2NDYrSUlGdU1DSlNGaGdLTWhEb1l1VHZHMG1ac2wwZTJHWk5NbXh3L3h3U2c4Rg== +# client-secret: a2NORTAyZmthdTNtVHNwLytGVVo0ckFhNktHQU9JWVFmUks0TGw5L2hQRW1ac2wwZTJHWk5NbXh3L3h3U2c4Rg== user-authorization-uri: ${security.oauth2.oauth-server}/oauth_client/authorize access-token-uri: ${security.oauth2.oauth-server}/oauth_client/token grant-type: authorization_code @@ -98,6 +103,8 @@ api-path: user-center: ${security.oauth2.oauth-server} notice-url: http://192.168.0.103:7001/usercenter version: 2 +report-form: + check-detail: false # 访问控制 access-control: diff --git a/src/main/resources/mybatis/mapper/check/check-mapper.xml b/src/main/resources/mybatis/mapper/check/check-mapper.xml index 42c705a..27035da 100644 --- a/src/main/resources/mybatis/mapper/check/check-mapper.xml +++ b/src/main/resources/mybatis/mapper/check/check-mapper.xml @@ -11,10 +11,15 @@ + + + + + @@ -209,10 +214,15 @@ jt1.type type_join_by_enterprise_id, dt1.dictionary_name type_dictionary_name, jt1.area1 area1_join_by_enterprise_id, + jt1.area1_dictionary_name area1_dictionary_name, jt1.area2 area2_join_by_enterprise_id, + jt1.area2_dictionary_name area2_dictionary_name, jt1.area3 area3_join_by_enterprise_id, + jt1.area3_dictionary_name area3_dictionary_name, jt1.area4 area4_join_by_enterprise_id, + jt1.area4_dictionary_name area4_dictionary_name, jt1.area5 area5_join_by_enterprise_id, + jt1.area5_dictionary_name area5_dictionary_name, jt1.address address_join_by_enterprise_id, jt1.industry industry_join_by_enterprise_id, dt2.dictionary_name industry_dictionary_name, diff --git a/src/main/resources/mybatis/mapper/gridpersonnel/gridpersonnel-mapper.xml b/src/main/resources/mybatis/mapper/gridpersonnel/gridpersonnel-mapper.xml index 608ddff..238c3de 100644 --- a/src/main/resources/mybatis/mapper/gridpersonnel/gridpersonnel-mapper.xml +++ b/src/main/resources/mybatis/mapper/gridpersonnel/gridpersonnel-mapper.xml @@ -124,7 +124,7 @@ - SELECT t1.user_id, t1.area1,