Browse Source

【内容审核】-【后台管理-待审核详情】-(王童)-2020/07/13

feature/dangjian
Jackwang 5 years ago
parent
commit
a460de61d1
  1. 19
      esua-epdc/epdc-module/epdc-content-security/epdc-content-security-client/src/main/java/com/elink/esua/epdc/dto/CheckImgsDetailsDTO.java
  2. 13
      esua-epdc/epdc-module/epdc-content-security/epdc-content-security-client/src/main/java/com/elink/esua/epdc/dto/CheckRecordsDTO.java
  3. 2
      esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/controller/CheckRecordsController.java
  4. 6
      esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/controller/HandleResultController.java
  5. 10
      esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/dao/CheckRecordsDao.java
  6. 20
      esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/service/CheckRecordsService.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. 19
      esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/service/impl/CheckRecordsServiceImpl.java
  9. 11
      esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/service/impl/ViolationsRecordsServiceImpl.java
  10. 58
      esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/resources/mapper/CheckRecordsDao.xml
  11. 1
      esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/resources/mapper/ViolationsRecordsDao.xml
  12. 4
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/feign/ContentSecurityFeignClient.java
  13. 4
      esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/feign/ContentSecurityFeignClient.java
  14. 4
      esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/ContentSecurityFeignClient.java

19
esua-epdc/epdc-module/epdc-content-security/epdc-content-security-client/src/main/java/com/elink/esua/epdc/dto/CheckImgsDetailsDTO.java

@ -0,0 +1,19 @@
package com.elink.esua.epdc.dto;
import lombok.Data;
import java.io.Serializable;
/**
* @program: esua-epdc
* @description: 待审核详情图片
* @author: wangtong
* @create: 2020-07-13 14:32
**/
@Data
public class CheckImgsDetailsDTO implements Serializable {
private static final long serialVersionUID = 889405718937714779L;
private String url;
}

13
esua-epdc/epdc-module/epdc-content-security/epdc-content-security-client/src/main/java/com/elink/esua/epdc/dto/CheckRecordsDTO.java

@ -21,6 +21,7 @@ import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.List;
/**
* 待审核记录
@ -85,9 +86,19 @@ public class CheckRecordsDTO implements Serializable {
/**
* 审核状态
*/
private String checkState;
/**
* 审核建议
*/
private String suggestion;
/**
* 审核状态编码
*/
private String suggestionCode;
/**
* 检测结果分类
*/
@ -133,4 +144,6 @@ public class CheckRecordsDTO implements Serializable {
*/
private String auditTime;
private List<CheckImgsDetailsDTO> imgUrls;
}

2
esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/controller/CheckRecordsController.java

@ -57,7 +57,7 @@ public class CheckRecordsController {
@GetMapping("{id}")
public Result<CheckRecordsDTO> get(@PathVariable("id") String id){
CheckRecordsDTO data = checkRecordsService.get(id);
CheckRecordsDTO data = checkRecordsService.getDetails(id);
return new Result<CheckRecordsDTO>().ok(data);
}

6
esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/controller/HandleResultController.java

@ -2,6 +2,7 @@ package com.elink.esua.epdc.controller;
import com.elink.esua.epdc.commons.tools.security.content.dto.form.SaveCheckRecordsDTO;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.service.CheckRecordsService;
import com.elink.esua.epdc.service.ViolationsRecordsService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
@ -22,6 +23,9 @@ public class HandleResultController{
@Autowired
private ViolationsRecordsService violationsRecordsService;
@Autowired
private CheckRecordsService checkRecordsService;
/**
* @describe: 保存违规记录
* @author wangtong
@ -45,6 +49,6 @@ public class HandleResultController{
@PostMapping("insertRecords")
public Result insertRecords(@RequestBody SaveCheckRecordsDTO formDto) {
// ValidatorUtils.validateEntity(formDto);
return violationsRecordsService.insertRecords(formDto);
return checkRecordsService.insertRecords(formDto);
}
}

10
esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/dao/CheckRecordsDao.java

@ -21,6 +21,7 @@ import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
import com.elink.esua.epdc.dto.CheckRecordsDTO;
import com.elink.esua.epdc.entity.CheckRecordsEntity;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
import java.util.Map;
@ -42,4 +43,13 @@ public interface CheckRecordsDao extends BaseDao<CheckRecordsEntity> {
* @return java.util.List<com.elink.esua.epdc.dto.CheckRecordsDTO>
*/
List<CheckRecordsDTO> getCheckRecords(Map<String, Object> params);
/**
* @describe: 待审核详情
* @author wangtong
* @date 2020/7/13 14:13
* @param [id]
* @return com.elink.esua.epdc.dto.CheckRecordsDTO
*/
CheckRecordsDTO getDetails(@Param("id") String id);
}

20
esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/service/CheckRecordsService.java

@ -19,6 +19,8 @@ package com.elink.esua.epdc.service;
import com.elink.esua.epdc.commons.mybatis.service.BaseService;
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.utils.Result;
import com.elink.esua.epdc.dto.CheckRecordsDTO;
import com.elink.esua.epdc.entity.CheckRecordsEntity;
@ -92,4 +94,22 @@ public interface CheckRecordsService extends BaseService<CheckRecordsEntity> {
* @date 2020-07-03
*/
void delete(String[] ids);
/**
* @describe: 保存待审核记录
* @author wangtong
* @date 2020/7/7 10:39
* @param [formDto]
* @return com.elink.esua.epdc.commons.tools.utils.Result
*/
Result insertRecords(SaveCheckRecordsDTO formDto);
/**
* @describe: 待审核详情
* @author wangtong
* @date 2020/7/13 14:10
* @param [id]
* @return com.elink.esua.epdc.dto.CheckRecordsDTO
*/
CheckRecordsDTO getDetails(String id);
}

9
esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/service/ViolationsRecordsService.java

@ -104,14 +104,7 @@ public interface ViolationsRecordsService extends BaseService<ViolationsRecordsE
*/
Result insertViolationsRecord(SaveCheckRecordsDTO formDto);
/**
* @describe: 保存待审核记录
* @author wangtong
* @date 2020/7/7 10:39
* @param [formDto]
* @return com.elink.esua.epdc.commons.tools.utils.Result
*/
Result insertRecords(SaveCheckRecordsDTO formDto);
/**
* @describe: 获取违规记录详情

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

@ -22,11 +22,14 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
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.utils.ConvertUtils;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dao.CheckRecordsDao;
import com.elink.esua.epdc.dto.CheckRecordsDTO;
import com.elink.esua.epdc.entity.CheckRecordsEntity;
import com.elink.esua.epdc.redis.CheckRecordsRedis;
import com.elink.esua.epdc.service.CheckRecordsImgsService;
import com.elink.esua.epdc.service.CheckRecordsService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@ -49,6 +52,9 @@ public class CheckRecordsServiceImpl extends BaseServiceImpl<CheckRecordsDao, Ch
@Autowired
private CheckRecordsRedis checkRecordsRedis;
@Autowired
private CheckRecordsImgsService checkRecordsImgsService;
@Override
public PageData<CheckRecordsDTO> page(Map<String, Object> params) {
IPage<CheckRecordsDTO> page = getPage(params);
@ -99,4 +105,17 @@ public class CheckRecordsServiceImpl extends BaseServiceImpl<CheckRecordsDao, Ch
baseDao.deleteBatchIds(Arrays.asList(ids));
}
@Override
public Result insertRecords(SaveCheckRecordsDTO formDto) {
CheckRecordsEntity entity = ConvertUtils.sourceToTarget(formDto, CheckRecordsEntity.class);
insert(entity);
checkRecordsImgsService.insertImages(formDto.getImgUrls(),entity.getId());
return new Result();
}
@Override
public CheckRecordsDTO getDetails(String id) {
return baseDao.getDetails(id);
}
}

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

@ -29,7 +29,6 @@ import com.elink.esua.epdc.dao.ViolationsRecordsDao;
import com.elink.esua.epdc.dto.ViolationsRecordsDTO;
import com.elink.esua.epdc.entity.ViolationsRecordsEntity;
import com.elink.esua.epdc.redis.ViolationsRecordsRedis;
import com.elink.esua.epdc.service.CheckRecordsImgsService;
import com.elink.esua.epdc.service.ViolationsRecordsImgsService;
import com.elink.esua.epdc.service.ViolationsRecordsService;
import org.apache.commons.lang3.StringUtils;
@ -53,9 +52,6 @@ public class ViolationsRecordsServiceImpl extends BaseServiceImpl<ViolationsReco
@Autowired
private ViolationsRecordsRedis violationsRecordsRedis;
@Autowired
private CheckRecordsImgsService checkRecordsImgsService;
@Autowired
private ViolationsRecordsImgsService violationsRecordsImgsService;
@ -122,13 +118,6 @@ public class ViolationsRecordsServiceImpl extends BaseServiceImpl<ViolationsReco
return new Result();
}
@Override
public Result insertRecords(SaveCheckRecordsDTO formDto) {
ViolationsRecordsEntity entity = ConvertUtils.sourceToTarget(formDto, ViolationsRecordsEntity.class);
insert(entity);
checkRecordsImgsService.insertImages(formDto.getImgUrls(),entity.getId());
return new Result();
}
@Override
public ViolationsRecordsDTO getDetails(String id) {

58
esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/resources/mapper/CheckRecordsDao.xml

@ -34,6 +34,7 @@
ecr.RATE,
la.DESCRIPTION as label,
st.DESCRIPTION as SUGGESTION,
st.code as suggestionCode,
date_format(ecr.CREATED_TIME,'%Y-%m-%d %H:%m') as CREATED_TIME,
date_format(ecr.AUDIT_TIME,'%Y-%m-%d %H:%m') as AUDIT_TIME
FROM `epdc_check_records` ecr
@ -41,8 +42,65 @@
left join epdc_check_code la on ecr.LABEL=la.`CODE`
left join epdc_check_code st on ecr.SUGGESTION=st.`CODE`
where ecr.DEL_FLAG=0
<if test="name != null and name != ''">
and ecr.name like '%${name}%'
</if>
<if test="category != null and category != ''">
and ecr.CATEGORY = #{category}
</if>
<!-- <if test="decision != null and decision != ''">-->
<!-- and evr.DECISION = #{decision}-->
<!-- </if>-->
<if test="content != null and content != ''">
and ecr.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( ecr.CREATED_TIME, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime}
</if>
order by st.SORT asc,ecr.CREATED_TIME desc
</select>
<resultMap id="CheckRecords_detail" type="com.elink.esua.epdc.dto.CheckRecordsDTO">
<result property="id" column="id"/>
<result property="name" column="name"/>
<result property="category" column="category"/>
<result property="checkState" column="checkState"/>
<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.CheckImgsDetailsDTO">
<result property="url" column="url"/>
</collection>
</resultMap>
<select id="getDetails" resultMap="CheckRecords_detail">
SELECT ecr.id,
ecr.name,
IF(ecr.CATEGORY=1,'居民','工作') category,
mo.DESCRIPTION as module,
ecr.CONTENT,
ecr.RATE,
la.DESCRIPTION as label,
st.DESCRIPTION as checkState,
st.code as suggestionCode,
re.SUGGESTION,
date_format(ecr.CREATED_TIME,'%Y-%m-%d %H:%m') as CREATED_TIME,
date_format(ecr.AUDIT_TIME,'%Y-%m-%d %H:%m') as AUDIT_TIME,
img.URL
FROM `epdc_check_records` ecr
left join epdc_check_code mo on ecr.MODULE=mo.`CODE`
left join epdc_check_code la on ecr.LABEL=la.`CODE`
left join epdc_check_code st on ecr.SUGGESTION=st.`CODE`
left join epdc_check_result re on re.RECORD_ID=ecr.ID
left join epdc_check_records_imgs img on img.REFERENCE_ID=ecr.ID
where ecr.DEL_FLAG=0 and ecr.id=#{id}
order by img.sort asc
</select>
</mapper>

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

@ -99,6 +99,7 @@
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}
order by img.sort asc
</select>

4
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/feign/ContentSecurityFeignClient.java

@ -19,9 +19,9 @@ import org.springframework.web.bind.annotation.RequestBody;
@FeignClient(name = ServiceConstant.EPDC_CONTENT_SECURITY_SERVER, fallback = ContentSecurityFeignClientFallback.class)
public interface ContentSecurityFeignClient {
@PostMapping(value = "content-sercurity/handleResult/insertViolationsRecord", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
@PostMapping(value = "contentSecurity/handleResult/insertViolationsRecord", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
Result insertViolationsRecord(@RequestBody SaveCheckRecordsDTO record);
@PostMapping(value = "content-sercurity/handleResult/insertRecords", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
@PostMapping(value = "contentSecurity/handleResult/insertRecords", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
Result insertRecords(@RequestBody SaveCheckRecordsDTO record);
}

4
esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/feign/ContentSecurityFeignClient.java

@ -19,9 +19,9 @@ import org.springframework.web.bind.annotation.RequestBody;
@FeignClient(name = ServiceConstant.EPDC_CONTENT_SECURITY_SERVER, fallback = ContentSecurityFeignClientFallback.class)
public interface ContentSecurityFeignClient {
@PostMapping(value = "content-sercurity/handleResult/insertViolationsRecord", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
@PostMapping(value = "contentSecurity/handleResult/insertViolationsRecord", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
Result insertViolationsRecord(@RequestBody SaveCheckRecordsDTO record);
@PostMapping(value = "content-sercurity/handleResult/insertRecords", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
@PostMapping(value = "contentSecurity/handleResult/insertRecords", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
Result insertRecords(@RequestBody SaveCheckRecordsDTO record);
}

4
esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/ContentSecurityFeignClient.java

@ -19,9 +19,9 @@ import org.springframework.web.bind.annotation.RequestBody;
@FeignClient(name = ServiceConstant.EPDC_CONTENT_SECURITY_SERVER, fallback = ContentSecurityFeignClientFallback.class)
public interface ContentSecurityFeignClient {
@PostMapping(value = "content-sercurity/handleResult/insertViolationsRecord", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
@PostMapping(value = "contentSecurity/handleResult/insertViolationsRecord", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
Result insertViolationsRecord(@RequestBody SaveCheckRecordsDTO record);
@PostMapping(value = "content-sercurity/handleResult/insertRecords", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
@PostMapping(value = "contentSecurity/handleResult/insertRecords", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
Result insertRecords(@RequestBody SaveCheckRecordsDTO record);
}

Loading…
Cancel
Save