From 433dfaf3003b717a05db829c8b699c009baa8d93 Mon Sep 17 00:00:00 2001 From: Jackwang Date: Fri, 10 Jul 2020 15:16:58 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=86=85=E5=AE=B9=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E3=80=91-=E3=80=90=E5=90=8E=E5=8F=B0=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E8=BF=9D=E8=A7=84=E8=AE=B0=E5=BD=95=E5=88=97=E8=A1=A8=E5=8F=8A?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E3=80=91-=EF=BC=88=E7=8E=8B=E7=AB=A5?= =?UTF-8?q?=EF=BC=89-2020/07/10?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/dto/ViolationsDetailsDTO.java | 20 +++++ .../esua/epdc/dto/ViolationsRecordsDTO.java | 49 +++--------- .../ViolationsRecordsController.java | 2 +- .../esua/epdc/dao/ViolationsRecordsDao.java | 24 +++++- .../esua/epdc/entity/CheckRecordsEntity.java | 11 ++- .../epdc/entity/ViolationsRecordsEntity.java | 11 +-- .../service/ViolationsRecordsService.java | 9 +++ .../impl/ViolationsRecordsServiceImpl.java | 16 ++-- .../resources/mapper/ViolationsRecordsDao.xml | 76 ++++++++++++++++++- 9 files changed, 162 insertions(+), 56 deletions(-) create mode 100644 esua-epdc/epdc-module/epdc-content-security/epdc-content-security-client/src/main/java/com/elink/esua/epdc/dto/ViolationsDetailsDTO.java diff --git a/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-client/src/main/java/com/elink/esua/epdc/dto/ViolationsDetailsDTO.java b/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-client/src/main/java/com/elink/esua/epdc/dto/ViolationsDetailsDTO.java new file mode 100644 index 000000000..3d9060fc3 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-client/src/main/java/com/elink/esua/epdc/dto/ViolationsDetailsDTO.java @@ -0,0 +1,20 @@ +package com.elink.esua.epdc.dto; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @program: esua-epdc + * @description: 违规记录详情 + * @author: wangtong + * @create: 2020-07-10 11:05 + **/ +@Data +public class ViolationsDetailsDTO implements Serializable { + + + private static final long serialVersionUID = 1146695071941329751L; + + private String url; +} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-client/src/main/java/com/elink/esua/epdc/dto/ViolationsRecordsDTO.java b/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-client/src/main/java/com/elink/esua/epdc/dto/ViolationsRecordsDTO.java index 8ddd453cc..8d4349d2d 100644 --- a/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-client/src/main/java/com/elink/esua/epdc/dto/ViolationsRecordsDTO.java +++ b/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-client/src/main/java/com/elink/esua/epdc/dto/ViolationsRecordsDTO.java @@ -17,11 +17,12 @@ package com.elink.esua.epdc.dto; -import java.io.Serializable; -import java.util.Date; import lombok.Data; +import java.io.Serializable; import java.math.BigDecimal; +import java.util.Date; +import java.util.List; /** * 违规记录表 @@ -39,10 +40,6 @@ public class ViolationsRecordsDTO implements Serializable { */ private String id; - /** - * 用户ID - */ - private String userId; /** * 用户名称 @@ -54,10 +51,6 @@ public class ViolationsRecordsDTO implements Serializable { */ private String category; - /** - * 关联信息表ID - */ - private String relationId; /** * 判定方式:1系统2人工 @@ -79,16 +72,6 @@ public class ViolationsRecordsDTO implements Serializable { */ private String url; - /** - * 系统返回编码 - */ - private String code; - - /** - * 系统返回信息 - */ - private String msg; - /** * 审核状态 */ @@ -104,34 +87,26 @@ public class ViolationsRecordsDTO implements Serializable { */ private BigDecimal rate; - /** - * 删除标识：0未删除 1已删除 - */ - private String delFlag; - - /** - * 乐观锁 - */ - private Integer revision; /** - * 创建人 + * 提交时间 */ - private String createdBy; + private String createdTime; /** - * 创建时间 + * 审批时间 */ - private Date createdTime; + private String auditTime; - /** - * 更新人 - */ - private String updatedBy; /** * 更新时间 */ private Date updatedTime; + + private List imgUrls; + + + } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/controller/ViolationsRecordsController.java b/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/controller/ViolationsRecordsController.java index 132fe6ba9..b52f1ee87 100644 --- a/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/controller/ViolationsRecordsController.java +++ b/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/controller/ViolationsRecordsController.java @@ -57,7 +57,7 @@ public class ViolationsRecordsController { @GetMapping("{id}") public Result get(@PathVariable("id") String id){ - ViolationsRecordsDTO data = violationsRecordsService.get(id); + ViolationsRecordsDTO data = violationsRecordsService.getDetails(id); return new Result().ok(data); } diff --git a/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/dao/ViolationsRecordsDao.java b/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/dao/ViolationsRecordsDao.java index 767242935..7ae17da21 100644 --- a/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/dao/ViolationsRecordsDao.java +++ b/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/dao/ViolationsRecordsDao.java @@ -18,8 +18,13 @@ package com.elink.esua.epdc.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; +import com.elink.esua.epdc.dto.ViolationsRecordsDTO; import com.elink.esua.epdc.entity.ViolationsRecordsEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +import java.util.Map; /** * 违规记录表 @@ -29,5 +34,22 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface ViolationsRecordsDao extends BaseDao { - + + /** + * @describe: 违规记录列表 + * @author wangtong + * @date 2020/7/9 10:18 + * @param [params] + * @return java.util.List + */ + List getViolationsRecord(Map params); + + /** + * @describe: 违规记录详情 + * @author wangtong + * @date 2020/7/9 17:39 + * @param [id] + * @return com.elink.esua.epdc.dto.ViolationsRecordsDTO + */ + ViolationsRecordsDTO getDetails(@Param("id") String id); } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/entity/CheckRecordsEntity.java b/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/entity/CheckRecordsEntity.java index b07f25e5f..6effb4564 100644 --- a/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/entity/CheckRecordsEntity.java +++ b/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/entity/CheckRecordsEntity.java @@ -18,7 +18,6 @@ package com.elink.esua.epdc.entity; import com.baomidou.mybatisplus.annotation.TableName; - import com.elink.esua.epdc.commons.mybatis.entity.BaseEpdcEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -69,11 +68,6 @@ public class CheckRecordsEntity extends BaseEpdcEntity { */ private String content; - /** - * 图片地址 - */ - private String url; - /** * 系统返回编码 */ @@ -89,6 +83,11 @@ public class CheckRecordsEntity extends BaseEpdcEntity { */ private String suggestion; + /** + * 审核时间 + */ + private Date auditTime; + /** * 检测结果分类 */ diff --git a/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/entity/ViolationsRecordsEntity.java b/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/entity/ViolationsRecordsEntity.java index 1466dd5c6..409e2f5e5 100644 --- a/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/entity/ViolationsRecordsEntity.java +++ b/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/entity/ViolationsRecordsEntity.java @@ -23,6 +23,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import java.math.BigDecimal; +import java.util.Date; /** * 违规记录表 @@ -72,11 +73,6 @@ public class ViolationsRecordsEntity extends BaseEpdcEntity { */ private String content; - /** - * 图片地址 - */ - private String url; - /** * 系统返回编码 */ @@ -92,6 +88,11 @@ public class ViolationsRecordsEntity extends BaseEpdcEntity { */ private String suggestion; + /** + * 审核时间 + */ + private Date auditTime; + /** * 检测结果分类 */ diff --git a/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/service/ViolationsRecordsService.java b/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/service/ViolationsRecordsService.java index 418d14ba0..ccc2216c6 100644 --- a/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/service/ViolationsRecordsService.java +++ b/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/service/ViolationsRecordsService.java @@ -112,4 +112,13 @@ public interface ViolationsRecordsService extends BaseService page(Map params) { - IPage page = baseDao.selectPage( - getPage(params, FieldConstant.CREATED_TIME, false), - getWrapper(params) - ); - return getPageData(page, ViolationsRecordsDTO.class); + params.put("deptIdList", SecurityUser.getUser().getDeptIdList()); + params.put("creatUser",SecurityUser.getUser().getId()); + IPage page = getPage(params); + List list = baseDao.getViolationsRecord(params); + return new PageData<>(list, page.getTotal()); } @Override @@ -130,4 +131,9 @@ public class ViolationsRecordsServiceImpl extends BaseServiceImpl - @@ -25,6 +24,81 @@ + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file