Browse Source

【内容审核】-【后台管理-违规记录列表及详情】-(王童)-2020/07/10

feature/dangjian
Jackwang 5 years ago
parent
commit
433dfaf300
  1. 20
      esua-epdc/epdc-module/epdc-content-security/epdc-content-security-client/src/main/java/com/elink/esua/epdc/dto/ViolationsDetailsDTO.java
  2. 49
      esua-epdc/epdc-module/epdc-content-security/epdc-content-security-client/src/main/java/com/elink/esua/epdc/dto/ViolationsRecordsDTO.java
  3. 2
      esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/controller/ViolationsRecordsController.java
  4. 24
      esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/dao/ViolationsRecordsDao.java
  5. 11
      esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/entity/CheckRecordsEntity.java
  6. 11
      esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/entity/ViolationsRecordsEntity.java
  7. 9
      esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/service/ViolationsRecordsService.java
  8. 16
      esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/service/impl/ViolationsRecordsServiceImpl.java
  9. 76
      esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/resources/mapper/ViolationsRecordsDao.xml

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

49
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<ViolationsDetailsDTO> imgUrls;
}

2
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<ViolationsRecordsDTO> get(@PathVariable("id") String id){
ViolationsRecordsDTO data = violationsRecordsService.get(id);
ViolationsRecordsDTO data = violationsRecordsService.getDetails(id);
return new Result<ViolationsRecordsDTO>().ok(data);
}

24
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<ViolationsRecordsEntity> {
/**
* @describe: 违规记录列表
* @author wangtong
* @date 2020/7/9 10:18
* @param [params]
* @return java.util.List<com.elink.esua.epdc.entity.ViolationsRecordsEntity>
*/
List<ViolationsRecordsDTO> getViolationsRecord(Map<String, Object> 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);
}

11
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;
/**
* 检测结果分类
*/

11
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;
/**
* 检测结果分类
*/

9
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<ViolationsRecordsE
* @return com.elink.esua.epdc.commons.tools.utils.Result
*/
Result insertRecords(SaveCheckRecordsDTO formDto);
/**
* @describe: 获取违规记录详情
* @author wangtong
* @date 2020/7/9 17:38
* @param [id]
* @return com.elink.esua.epdc.dto.ViolationsRecordsDTO
*/
ViolationsRecordsDTO getDetails(String id);
}

16
esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/service/impl/ViolationsRecordsServiceImpl.java

@ -23,6 +23,7 @@ import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
import com.elink.esua.epdc.commons.tools.page.PageData;
import com.elink.esua.epdc.commons.tools.security.content.dto.form.SaveCheckRecordsDTO;
import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dao.ViolationsRecordsDao;
@ -61,11 +62,11 @@ public class ViolationsRecordsServiceImpl extends BaseServiceImpl<ViolationsReco
@Override
public PageData<ViolationsRecordsDTO> page(Map<String, Object> params) {
IPage<ViolationsRecordsEntity> 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<ViolationsRecordsDTO> page = getPage(params);
List<ViolationsRecordsDTO> list = baseDao.getViolationsRecord(params);
return new PageData<>(list, page.getTotal());
}
@Override
@ -130,4 +131,9 @@ public class ViolationsRecordsServiceImpl extends BaseServiceImpl<ViolationsReco
return new Result();
}
@Override
public ViolationsRecordsDTO getDetails(String id) {
return baseDao.getDetails(id);
}
}

76
esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/resources/mapper/ViolationsRecordsDao.xml

@ -12,7 +12,6 @@
<result property="decision" column="DECISION"/>
<result property="module" column="MODULE"/>
<result property="content" column="CONTENT"/>
<result property="url" column="URL"/>
<result property="code" column="CODE"/>
<result property="msg" column="MSG"/>
<result property="suggestion" column="SUGGESTION"/>
@ -25,6 +24,81 @@
<result property="updatedBy" column="UPDATED_BY"/>
<result property="updatedTime" column="UPDATED_TIME"/>
</resultMap>
<select id="getViolationsRecord" resultType="com.elink.esua.epdc.dto.ViolationsRecordsDTO">
SELECT evr.id,
evr.name,
IF(evr.CATEGORY=1,'居民','工作') category,
mo.DESCRIPTION as module,
evr.CONTENT,
evr.RATE,
la.DESCRIPTION as label,
IF(evr.DECISION=1,'系统判定','人工审核') decision,
date_format(evr.CREATED_TIME,'%Y-%m-%d %H:%m') as CREATED_TIME,
date_format(evr.AUDIT_TIME,'%Y-%m-%d %H:%m') as AUDIT_TIME
FROM `epdc_violations_records` evr
left join epdc_check_code mo on evr.MODULE=mo.`CODE`
left join epdc_check_code la on evr.LABEL=la.`CODE`
where evr.DEL_FLAG=0
<if test="name != null and name != ''">
and evr.name like '%${name}%'
</if>
<if test="category != null and category != ''">
and evr.CATEGORY = #{category}
</if>
<if test="decision != null and decision != ''">
and evr.DECISION = #{decision}
</if>
<if test="content != null and content != ''">
and evr.CONTENT like '%${content}%'
</if>
<if test="module != null and module != ''">
and mo.DESCRIPTION like '%${module}%'
</if>
<if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
AND DATE_FORMAT( evr.CREATED_TIME, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime}
</if>
</select>
<resultMap id="violations_detail" type="com.elink.esua.epdc.dto.ViolationsRecordsDTO">
<result property="id" column="id"/>
<result property="name" column="name"/>
<result property="category" column="category"/>
<result property="decision" column="decision"/>
<result property="module" column="module"/>
<result property="content" column="CONTENT"/>
<result property="suggestion" column="SUGGESTION"/>
<result property="label" column="LABEL"/>
<result property="rate" column="RATE"/>
<result property="createdTime" column="CREATED_TIME"/>
<result property="auditTime" column="AUDIT_TIME"/>
<collection property="imgUrls" ofType="com.elink.esua.epdc.dto.ViolationsDetailsDTO">
<result property="url" column="url"/>
</collection>
<!-- <collection property="imgUrls" select="getImgList" column="id"></collection>-->
</resultMap>
<!-- <select id="getImgList" resultType="java.lang.String">-->
<!-- select img. url-->
<!-- from `epdc_violations_records` evr-->
<!-- left join epdc_violations_records_imgs img on img.REFERENCE_ID=evr.ID-->
<!-- where evr.id=#{id}-->
<!-- </select>-->
<select id="getDetails" resultMap="violations_detail">
SELECT evr.id,
evr.name,
IF(evr.CATEGORY=1,'居民','工作') category,
mo.DESCRIPTION as module,
evr.CONTENT,
evr.RATE,
la.DESCRIPTION as label,
IF(evr.DECISION=1,'系统判定','人工审核') decision,
date_format(evr.CREATED_TIME,'%Y-%m-%d %H:%m') as CREATED_TIME,
date_format(evr.AUDIT_TIME,'%Y-%m-%d %H:%m') as AUDIT_TIME,
img.URL
FROM `epdc_violations_records` evr
left join epdc_check_code mo on evr.MODULE=mo.`CODE`
left join epdc_check_code la on evr.LABEL=la.`CODE`
left join epdc_violations_records_imgs img on img.REFERENCE_ID=evr.ID
where evr.ID=#{id}
</select>
</mapper>
Loading…
Cancel
Save