Tenlion/btyjj-inspection
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

实现序列化接口

Browse Source
This commit is contained in:
wenc000 2020-08-12 22:50:06 +08:00
parent bb3707467e
commit e6d2d02cff
20 changed files with 67 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/cm/inspection/pojo/dtos/check/CheckDTO.java
View File

@ -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")

4
src/main/java/com/cm/inspection/pojo/dtos/checkitem/CheckItemDTO.java
View File

@ -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 = "名称")

5
src/main/java/com/cm/inspection/pojo/dtos/checkitemoption/CheckItemOptionDTO.java
View File

@ -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")

5
src/main/java/com/cm/inspection/pojo/dtos/checkplan/CheckPlanDTO.java
View File

@ -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 = "计划类型")

5
src/main/java/com/cm/inspection/pojo/dtos/data/DepartmentDTO.java
View File

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

5
src/main/java/com/cm/inspection/pojo/dtos/data/UserDTO.java
View File

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

1
src/main/java/com/cm/inspection/pojo/dtos/enterprise/EnterpriseDTO.java
View File

@ -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 = "名称")

5
src/main/java/com/cm/inspection/pojo/dtos/enterpriseofgridoperator/EnterpriseOfGridOperatorDTO.java
View File

@ -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")

5
src/main/java/com/cm/inspection/pojo/dtos/gridpersonnel/GridPersonnelDTO.java
View File

@ -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")

5
src/main/java/com/cm/inspection/pojo/dtos/hiddendangerreport/HiddenDangerReportDTO.java
View File

@ -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")

4
src/main/java/com/cm/inspection/pojo/dtos/industrycheckitem/IndustryCheckItemDTO.java
View File

@ -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")

4
src/main/java/com/cm/inspection/pojo/dtos/industryuser/IndustryUserDTO.java
View File

@ -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")

5
src/main/java/com/cm/inspection/pojo/dtos/publicareareport/PublicAreaReportDTO.java
View File

@ -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")

5
src/main/java/com/cm/inspection/pojo/dtos/publicleaderhandle/PublicLeaderHandleDTO.java
View File

@ -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 = "区域上报")

5
src/main/java/com/cm/inspection/pojo/dtos/publiclog/PublicLogDTO.java
View File

@ -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")

5
src/main/java/com/cm/inspection/pojo/dtos/reviewitemofenterprise/ReviewItemOfEnterpriseDTO.java
View File

@ -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")

5
src/main/java/com/cm/inspection/pojo/dtos/taskcheck/TaskCheckDTO.java
View File

@ -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")

2
src/main/java/com/cm/inspection/service/count/impl/CountServiceImpl.java
View File

@ -686,7 +686,7 @@ public class CountServiceImpl extends BaseService implements ICountService {
return new ArrayList<>();
}
Map<String, Object> params = getHashMap(4);
params.put("checkIds", checkIdList);
params.put("checkIdList", checkIdList);
params.put("year", year);
return checkService.listCheckSimple(params);
}

12
src/main/resources/application-test.yml
View File

@ -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

2
src/main/resources/mybatis/mapper/check/check-mapper.xml
View File

@ -413,7 +413,7 @@
AND
check_id IN
<foreach collection="checkIdList" index="index" open="(" separator="," close=")">
#{checkIds[${index}]}
#{checkIdList[${index}]}
</foreach>
</if>
<if test="userIdList != null and userIdList.size > 0">