From e6d2d02cff8067a748f85a715010372537c5be86 Mon Sep 17 00:00:00 2001 From: wenc000 <450292408@qq.com> Date: Wed, 12 Aug 2020 22:50:06 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E5=BA=8F=E5=88=97=E5=8C=96?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cm/inspection/pojo/dtos/check/CheckDTO.java | 1 + .../inspection/pojo/dtos/checkitem/CheckItemDTO.java | 4 +++- .../dtos/checkitemoption/CheckItemOptionDTO.java | 5 ++++- .../inspection/pojo/dtos/checkplan/CheckPlanDTO.java | 5 ++++- .../cm/inspection/pojo/dtos/data/DepartmentDTO.java | 5 ++++- .../com/cm/inspection/pojo/dtos/data/UserDTO.java | 5 ++++- .../pojo/dtos/enterprise/EnterpriseDTO.java | 1 + .../EnterpriseOfGridOperatorDTO.java | 5 ++++- .../pojo/dtos/gridpersonnel/GridPersonnelDTO.java | 5 ++++- .../hiddendangerreport/HiddenDangerReportDTO.java | 5 ++++- .../dtos/industrycheckitem/IndustryCheckItemDTO.java | 4 +++- .../pojo/dtos/industryuser/IndustryUserDTO.java | 4 +++- .../dtos/publicareareport/PublicAreaReportDTO.java | 5 ++++- .../publicleaderhandle/PublicLeaderHandleDTO.java | 5 ++++- .../inspection/pojo/dtos/publiclog/PublicLogDTO.java | 5 ++++- .../ReviewItemOfEnterpriseDTO.java | 5 ++++- .../inspection/pojo/dtos/taskcheck/TaskCheckDTO.java | 5 ++++- .../service/count/impl/CountServiceImpl.java | 2 +- src/main/resources/application-test.yml | 12 ++++++------ .../resources/mybatis/mapper/check/check-mapper.xml | 2 +- 20 files changed, 67 insertions(+), 23 deletions(-) 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 3c4b2b1..e3b6a69 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 @@ -20,6 +20,7 @@ import java.util.List; @ApiModel public class CheckDTO implements Serializable { + private static final long serialVersionUID = 1066469161696590595L; @ApiModelProperty(name = "checkId", value = "主键") private String checkId; @ApiModelProperty(name = "enterpriseId", value = "企业ID") diff --git a/src/main/java/com/cm/inspection/pojo/dtos/checkitem/CheckItemDTO.java b/src/main/java/com/cm/inspection/pojo/dtos/checkitem/CheckItemDTO.java index 801b79c..9204d7b 100644 --- a/src/main/java/com/cm/inspection/pojo/dtos/checkitem/CheckItemDTO.java +++ b/src/main/java/com/cm/inspection/pojo/dtos/checkitem/CheckItemDTO.java @@ -5,6 +5,7 @@ import com.cm.inspection.pojo.dtos.hiddendangerreport.HiddenDangerReportDTO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import java.io.Serializable; import java.util.ArrayList; import java.util.List; @@ -16,8 +17,9 @@ import java.util.List; * @Version: 1.0 **/ @ApiModel -public class CheckItemDTO { +public class CheckItemDTO implements Serializable { + private static final long serialVersionUID = -2818176047255545522L; @ApiModelProperty(name = "checkItemId", value = "主键") private String checkItemId; @ApiModelProperty(name = "name", value = "名称") diff --git a/src/main/java/com/cm/inspection/pojo/dtos/checkitemoption/CheckItemOptionDTO.java b/src/main/java/com/cm/inspection/pojo/dtos/checkitemoption/CheckItemOptionDTO.java index 5875372..b78e0b2 100644 --- a/src/main/java/com/cm/inspection/pojo/dtos/checkitemoption/CheckItemOptionDTO.java +++ b/src/main/java/com/cm/inspection/pojo/dtos/checkitemoption/CheckItemOptionDTO.java @@ -3,6 +3,8 @@ package com.cm.inspection.pojo.dtos.checkitemoption; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import java.io.Serializable; + /** * * @ClassName: CheckItemOptionDTO @@ -12,8 +14,9 @@ import io.swagger.annotations.ApiModelProperty; * @Version: 1.0 **/ @ApiModel -public class CheckItemOptionDTO { +public class CheckItemOptionDTO implements Serializable { + private static final long serialVersionUID = 6722694872952713985L; @ApiModelProperty(name = "checkItemOptionId", value = "主键") private String checkItemOptionId; @ApiModelProperty(name = "checkItemId", value = "检查项ID") diff --git a/src/main/java/com/cm/inspection/pojo/dtos/checkplan/CheckPlanDTO.java b/src/main/java/com/cm/inspection/pojo/dtos/checkplan/CheckPlanDTO.java index 60102d0..23adbfd 100644 --- a/src/main/java/com/cm/inspection/pojo/dtos/checkplan/CheckPlanDTO.java +++ b/src/main/java/com/cm/inspection/pojo/dtos/checkplan/CheckPlanDTO.java @@ -3,6 +3,8 @@ package com.cm.inspection.pojo.dtos.checkplan; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import java.io.Serializable; + /** * @ClassName: CheckPlanDTO * @Description: 检查计划 @@ -11,8 +13,9 @@ import io.swagger.annotations.ApiModelProperty; * @Version: 1.0 **/ @ApiModel -public class CheckPlanDTO { +public class CheckPlanDTO implements Serializable { + private static final long serialVersionUID = -4109435023338377658L; @ApiModelProperty(name = "checkPlanId", value = "主键") private String checkPlanId; @ApiModelProperty(name = "checkPlanType", value = "计划类型") diff --git a/src/main/java/com/cm/inspection/pojo/dtos/data/DepartmentDTO.java b/src/main/java/com/cm/inspection/pojo/dtos/data/DepartmentDTO.java index ee24496..5434d03 100644 --- a/src/main/java/com/cm/inspection/pojo/dtos/data/DepartmentDTO.java +++ b/src/main/java/com/cm/inspection/pojo/dtos/data/DepartmentDTO.java @@ -1,5 +1,7 @@ package com.cm.inspection.pojo.dtos.data; +import java.io.Serializable; + /** * When you feel like quitting. Think about why you started * 当你想要放弃的时候，想想当初你为何开始 @@ -10,8 +12,9 @@ package com.cm.inspection.pojo.dtos.data; * @Date: 2020/5/1 16:21 * @Version: 1.0 **/ -public class DepartmentDTO { +public class DepartmentDTO implements Serializable { + private static final long serialVersionUID = -2584371772709371489L; private String departmentId; private String departmentParentId; private String departmentName; diff --git a/src/main/java/com/cm/inspection/pojo/dtos/data/UserDTO.java b/src/main/java/com/cm/inspection/pojo/dtos/data/UserDTO.java index 22d5338..0d1a5ca 100644 --- a/src/main/java/com/cm/inspection/pojo/dtos/data/UserDTO.java +++ b/src/main/java/com/cm/inspection/pojo/dtos/data/UserDTO.java @@ -1,8 +1,11 @@ package com.cm.inspection.pojo.dtos.data; -public class UserDTO { +import java.io.Serializable; +public class UserDTO implements Serializable { + + private static final long serialVersionUID = -2271176624984243101L; private String userId; private String userUsername; private String userName; diff --git a/src/main/java/com/cm/inspection/pojo/dtos/enterprise/EnterpriseDTO.java b/src/main/java/com/cm/inspection/pojo/dtos/enterprise/EnterpriseDTO.java index e2c3414..5f36bc1 100644 --- a/src/main/java/com/cm/inspection/pojo/dtos/enterprise/EnterpriseDTO.java +++ b/src/main/java/com/cm/inspection/pojo/dtos/enterprise/EnterpriseDTO.java @@ -15,6 +15,7 @@ import java.io.Serializable; @ApiModel public class EnterpriseDTO implements Serializable { + private static final long serialVersionUID = 8606689847116445169L; @ApiModelProperty(name = "enterpriseId", value = "主键") private String enterpriseId; @ApiModelProperty(name = "name", value = "名称") diff --git a/src/main/java/com/cm/inspection/pojo/dtos/enterpriseofgridoperator/EnterpriseOfGridOperatorDTO.java b/src/main/java/com/cm/inspection/pojo/dtos/enterpriseofgridoperator/EnterpriseOfGridOperatorDTO.java index 5112e2b..e1c1dc8 100644 --- a/src/main/java/com/cm/inspection/pojo/dtos/enterpriseofgridoperator/EnterpriseOfGridOperatorDTO.java +++ b/src/main/java/com/cm/inspection/pojo/dtos/enterpriseofgridoperator/EnterpriseOfGridOperatorDTO.java @@ -3,6 +3,8 @@ package com.cm.inspection.pojo.dtos.enterpriseofgridoperator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import java.io.Serializable; + /** * @ClassName: EnterpriseOfGridOperatorDTO * @Description: 网格员的企业 @@ -11,8 +13,9 @@ import io.swagger.annotations.ApiModelProperty; * @Version: 1.0 **/ @ApiModel -public class EnterpriseOfGridOperatorDTO { +public class EnterpriseOfGridOperatorDTO implements Serializable { + private static final long serialVersionUID = 2171747540468363785L; @ApiModelProperty(name = "enterpriseOfGridOperatorId", value = "主键") private String enterpriseOfGridOperatorId; @ApiModelProperty(name = "userId", value = "用户ID") diff --git a/src/main/java/com/cm/inspection/pojo/dtos/gridpersonnel/GridPersonnelDTO.java b/src/main/java/com/cm/inspection/pojo/dtos/gridpersonnel/GridPersonnelDTO.java index 8790a38..b3fe825 100644 --- a/src/main/java/com/cm/inspection/pojo/dtos/gridpersonnel/GridPersonnelDTO.java +++ b/src/main/java/com/cm/inspection/pojo/dtos/gridpersonnel/GridPersonnelDTO.java @@ -3,6 +3,8 @@ package com.cm.inspection.pojo.dtos.gridpersonnel; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import java.io.Serializable; + /** * @ClassName: GridPersonnelDTO * @Description: 网格人员 @@ -11,8 +13,9 @@ import io.swagger.annotations.ApiModelProperty; * @Version: 1.0 **/ @ApiModel -public class GridPersonnelDTO { +public class GridPersonnelDTO implements Serializable { + private static final long serialVersionUID = 1690871409983368941L; @ApiModelProperty(name = "gridPersonnelId", value = "主键") private String gridPersonnelId; @ApiModelProperty(name = "userId", value = "用户ID") diff --git a/src/main/java/com/cm/inspection/pojo/dtos/hiddendangerreport/HiddenDangerReportDTO.java b/src/main/java/com/cm/inspection/pojo/dtos/hiddendangerreport/HiddenDangerReportDTO.java index b82d56c..fee5b11 100644 --- a/src/main/java/com/cm/inspection/pojo/dtos/hiddendangerreport/HiddenDangerReportDTO.java +++ b/src/main/java/com/cm/inspection/pojo/dtos/hiddendangerreport/HiddenDangerReportDTO.java @@ -3,6 +3,8 @@ package com.cm.inspection.pojo.dtos.hiddendangerreport; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import java.io.Serializable; + /** * @ClassName: HiddenDangerReportDTO * @Description: 隐患上报 @@ -11,8 +13,9 @@ import io.swagger.annotations.ApiModelProperty; * @Version: 1.0 **/ @ApiModel -public class HiddenDangerReportDTO { +public class HiddenDangerReportDTO implements Serializable { + private static final long serialVersionUID = 5888237908484934679L; @ApiModelProperty(name = "hiddenDangerReportId", value = "主键") private String hiddenDangerReportId; @ApiModelProperty(name = "checkId", value = "检查ID") diff --git a/src/main/java/com/cm/inspection/pojo/dtos/industrycheckitem/IndustryCheckItemDTO.java b/src/main/java/com/cm/inspection/pojo/dtos/industrycheckitem/IndustryCheckItemDTO.java index e6c3799..f885884 100644 --- a/src/main/java/com/cm/inspection/pojo/dtos/industrycheckitem/IndustryCheckItemDTO.java +++ b/src/main/java/com/cm/inspection/pojo/dtos/industrycheckitem/IndustryCheckItemDTO.java @@ -4,6 +4,7 @@ import com.cm.inspection.pojo.dtos.checkitemoption.CheckItemOptionDTO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import java.io.Serializable; import java.util.ArrayList; import java.util.List; @@ -15,8 +16,9 @@ import java.util.List; * @Version: 1.0 **/ @ApiModel -public class IndustryCheckItemDTO { +public class IndustryCheckItemDTO implements Serializable { + private static final long serialVersionUID = -3848466845851514488L; @ApiModelProperty(name = "industryCheckItemId", value = "主键") private String industryCheckItemId; @ApiModelProperty(name = "natureId", value = "场所性质ID") diff --git a/src/main/java/com/cm/inspection/pojo/dtos/industryuser/IndustryUserDTO.java b/src/main/java/com/cm/inspection/pojo/dtos/industryuser/IndustryUserDTO.java index 493316f..73cfc8a 100644 --- a/src/main/java/com/cm/inspection/pojo/dtos/industryuser/IndustryUserDTO.java +++ b/src/main/java/com/cm/inspection/pojo/dtos/industryuser/IndustryUserDTO.java @@ -4,6 +4,7 @@ import com.cm.inspection.pojo.dtos.checkitemoption.CheckItemOptionDTO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import java.io.Serializable; import java.util.ArrayList; import java.util.List; @@ -15,8 +16,9 @@ import java.util.List; * @Version: 1.0 **/ @ApiModel -public class IndustryUserDTO { +public class IndustryUserDTO implements Serializable { + private static final long serialVersionUID = -1864003607245277977L; @ApiModelProperty(name = "industryUserId", value = "行业用户ID") private String industryUserId; @ApiModelProperty(name = "industryId", value = "行业性质ID") diff --git a/src/main/java/com/cm/inspection/pojo/dtos/publicareareport/PublicAreaReportDTO.java b/src/main/java/com/cm/inspection/pojo/dtos/publicareareport/PublicAreaReportDTO.java index 1aff598..8cc19ac 100644 --- a/src/main/java/com/cm/inspection/pojo/dtos/publicareareport/PublicAreaReportDTO.java +++ b/src/main/java/com/cm/inspection/pojo/dtos/publicareareport/PublicAreaReportDTO.java @@ -4,6 +4,8 @@ import com.cm.common.annotation.CheckEmptyAnnotation; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import java.io.Serializable; + /** * @ClassName: PublicAreaReportDTO * @Description: 公共区域上报 @@ -12,8 +14,9 @@ import io.swagger.annotations.ApiModelProperty; * @Version: 1.0 **/ @ApiModel -public class PublicAreaReportDTO { +public class PublicAreaReportDTO implements Serializable { + private static final long serialVersionUID = 5778361878252344868L; @ApiModelProperty(name = "publicAreaReportId", value = "主键") private String publicAreaReportId; @ApiModelProperty(name = "area1Id", value = "区域1") diff --git a/src/main/java/com/cm/inspection/pojo/dtos/publicleaderhandle/PublicLeaderHandleDTO.java b/src/main/java/com/cm/inspection/pojo/dtos/publicleaderhandle/PublicLeaderHandleDTO.java index df1ff50..64ca630 100644 --- a/src/main/java/com/cm/inspection/pojo/dtos/publicleaderhandle/PublicLeaderHandleDTO.java +++ b/src/main/java/com/cm/inspection/pojo/dtos/publicleaderhandle/PublicLeaderHandleDTO.java @@ -3,6 +3,8 @@ package com.cm.inspection.pojo.dtos.publicleaderhandle; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import java.io.Serializable; + /** * @ClassName: PublicLeaderHandleDTO * @Description: 公共领导处理 @@ -11,8 +13,9 @@ import io.swagger.annotations.ApiModelProperty; * @Version: 1.0 **/ @ApiModel -public class PublicLeaderHandleDTO { +public class PublicLeaderHandleDTO implements Serializable { + private static final long serialVersionUID = 7297647684251077228L; @ApiModelProperty(name = "publicLeaderHandleId", value = "主键") private String publicLeaderHandleId; @ApiModelProperty(name = "publicAreaReportId", value = "区域上报") diff --git a/src/main/java/com/cm/inspection/pojo/dtos/publiclog/PublicLogDTO.java b/src/main/java/com/cm/inspection/pojo/dtos/publiclog/PublicLogDTO.java index ea707d2..6a21739 100644 --- a/src/main/java/com/cm/inspection/pojo/dtos/publiclog/PublicLogDTO.java +++ b/src/main/java/com/cm/inspection/pojo/dtos/publiclog/PublicLogDTO.java @@ -3,6 +3,8 @@ package com.cm.inspection.pojo.dtos.publiclog; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import java.io.Serializable; + /** * @ClassName: PublicLogDTO * @Description: 公共日志 @@ -11,8 +13,9 @@ import io.swagger.annotations.ApiModelProperty; * @Version: 1.0 **/ @ApiModel -public class PublicLogDTO { +public class PublicLogDTO implements Serializable { + private static final long serialVersionUID = 4648058413644251606L; @ApiModelProperty(name = "publicLogId", value = "主键") private String publicLogId; @ApiModelProperty(name = "publicAreaReportId", value = "上报ID") diff --git a/src/main/java/com/cm/inspection/pojo/dtos/reviewitemofenterprise/ReviewItemOfEnterpriseDTO.java b/src/main/java/com/cm/inspection/pojo/dtos/reviewitemofenterprise/ReviewItemOfEnterpriseDTO.java index 7ced2e6..af5a375 100644 --- a/src/main/java/com/cm/inspection/pojo/dtos/reviewitemofenterprise/ReviewItemOfEnterpriseDTO.java +++ b/src/main/java/com/cm/inspection/pojo/dtos/reviewitemofenterprise/ReviewItemOfEnterpriseDTO.java @@ -3,6 +3,8 @@ package com.cm.inspection.pojo.dtos.reviewitemofenterprise; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import java.io.Serializable; + /** * @ClassName: ReviewItemOfEnterpriseDTO * @Description: 企业复查项 @@ -11,8 +13,9 @@ import io.swagger.annotations.ApiModelProperty; * @Version: 1.0 **/ @ApiModel -public class ReviewItemOfEnterpriseDTO { +public class ReviewItemOfEnterpriseDTO implements Serializable { + private static final long serialVersionUID = 9059581871746031155L; @ApiModelProperty(name = "reviewItemOfEnterpriseId", value = "主键") private String reviewItemOfEnterpriseId; @ApiModelProperty(name = "enterpriseId", value = "企业ID") diff --git a/src/main/java/com/cm/inspection/pojo/dtos/taskcheck/TaskCheckDTO.java b/src/main/java/com/cm/inspection/pojo/dtos/taskcheck/TaskCheckDTO.java index a46b5e2..de96411 100644 --- a/src/main/java/com/cm/inspection/pojo/dtos/taskcheck/TaskCheckDTO.java +++ b/src/main/java/com/cm/inspection/pojo/dtos/taskcheck/TaskCheckDTO.java @@ -3,6 +3,8 @@ package com.cm.inspection.pojo.dtos.taskcheck; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import java.io.Serializable; + /** * @ClassName: TaskCheckDTO * @Description: 检查任务 @@ -11,8 +13,9 @@ import io.swagger.annotations.ApiModelProperty; * @Version: 1.0 **/ @ApiModel -public class TaskCheckDTO { +public class TaskCheckDTO implements Serializable { + private static final long serialVersionUID = 1947138427504518969L; @ApiModelProperty(name = "taskCheckId", value = "主键") private String taskCheckId; @ApiModelProperty(name = "enterpriseId", value = "企业ID") diff --git a/src/main/java/com/cm/inspection/service/count/impl/CountServiceImpl.java b/src/main/java/com/cm/inspection/service/count/impl/CountServiceImpl.java index 25ca54c..7267edc 100644 --- a/src/main/java/com/cm/inspection/service/count/impl/CountServiceImpl.java +++ b/src/main/java/com/cm/inspection/service/count/impl/CountServiceImpl.java @@ -686,7 +686,7 @@ public class CountServiceImpl extends BaseService implements ICountService { return new ArrayList<>(); } Map params = getHashMap(4); - params.put("checkIds", checkIdList); + params.put("checkIdList", checkIdList); params.put("year", year); return checkService.listCheckSimple(params); } diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml index d20be61..300c320 100644 --- a/src/main/resources/application-test.yml +++ b/src/main/resources/application-test.yml @@ -83,16 +83,16 @@ security: client: client-id: 32ec344a5fd04fd9911586df5d1dc36b client-secret: a2NORTAyZmthdTNtVHNwLytGVVo0ckFhNktHQU9JWVFmUks0TGw5L2hQRW1ac2wwZTJHWk5NbXh3L3h3U2c4Rg== - user-authorization-uri: ${security.oauth2.oauth-server}/oauth/authorize - access-token-uri: ${security.oauth2.oauth-server}/oauth/token + user-authorization-uri: ${security.oauth2.oauth-server}/oauth_client/authorize + access-token-uri: ${security.oauth2.oauth-server}/oauth_client/token grant-type: authorization_code resource: jwt: - key-uri: ${security.oauth2.oauth-server}/oauth/token_key - token-info-uri: ${security.oauth2.oauth-server}/oauth/check_token + key-uri: ${security.oauth2.oauth-server}/oauth_client/token_key + token-info-uri: ${security.oauth2.oauth-server}/oauth_client/check_token user-info-uri: ${security.oauth2.oauth-server}/user authorization: - check-token-access: ${security.oauth2.oauth-server}/oauth/token_key + check-token-access: ${security.oauth2.oauth-server}/oauth_client/token_key api-path: user-center: ${security.oauth2.oauth-server} @@ -129,4 +129,4 @@ access-control: logging: level: root: error - com.cm: debug + com.cm: debug \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/check/check-mapper.xml b/src/main/resources/mybatis/mapper/check/check-mapper.xml index 6ca082d..d8e97ed 100644 --- a/src/main/resources/mybatis/mapper/check/check-mapper.xml +++ b/src/main/resources/mybatis/mapper/check/check-mapper.xml @@ -413,7 +413,7 @@ AND check_id IN - #{checkIds[${index}]} + #{checkIdList[${index}]}