Browse Source

Merge remote-tracking branch 'origin/master'

main
sjh 1 year ago
parent
commit
a7709f913d
  1. 9
      src/main/java/com/biutag/supervision/constants/enums/BusinessTypeEnum.java
  2. 9
      src/main/java/com/biutag/supervision/constants/enums/ProblemSourcesEnum.java
  3. 61
      src/main/java/com/biutag/supervision/controller/sensitivePerception/RiskPersonalController.java
  4. 27
      src/main/java/com/biutag/supervision/controller/sensitivePerception/ScoreController.java
  5. 41
      src/main/java/com/biutag/supervision/controller/work/NegativeImportController.java
  6. 8
      src/main/java/com/biutag/supervision/mapper/RiskPersonalTagMapper.java
  7. 8
      src/main/java/com/biutag/supervision/pojo/dto/HdtNegativeImportDto.java
  8. 2
      src/main/java/com/biutag/supervision/pojo/entity/RiskPersonal.java
  9. 47
      src/main/java/com/biutag/supervision/pojo/entity/RiskPersonalTag.java
  10. 6
      src/main/java/com/biutag/supervision/pojo/param/RiskPersonalQueryParam.java
  11. 75
      src/main/java/com/biutag/supervision/pojo/vo/RiskPersonalVo.java
  12. 2
      src/main/java/com/biutag/supervision/pojo/vo/RiskScoreRuleTree.java
  13. 3
      src/main/java/com/biutag/supervision/service/NegativeService.java
  14. 14
      src/main/java/com/biutag/supervision/service/RiskPersonalTagService.java
  15. 10
      src/main/resources/application-prod.yml
  16. BIN
      src/main/resources/static/templates/黄赌问题问题下发模板.xls
  17. 2
      src/test/java/com/biutag/supervision/tools/GenCodeTests.java

9
src/main/java/com/biutag/supervision/constants/enums/BusinessTypeEnum.java

@ -38,6 +38,15 @@ public enum BusinessTypeEnum {
return null; return null;
} }
public static BusinessTypeEnum getByLabel(String label) {
for (BusinessTypeEnum businessTypeEnum : values()) {
if (businessTypeEnum.label.equals(label)) {
return businessTypeEnum;
}
}
return null;
}
public static boolean isBusinessVolume(String value) { public static boolean isBusinessVolume(String value) {
for (BusinessTypeEnum businessTypeEnum : values()) { for (BusinessTypeEnum businessTypeEnum : values()) {
if (businessTypeEnum.value.equals(value)) { if (businessTypeEnum.value.equals(value)) {

9
src/main/java/com/biutag/supervision/constants/enums/ProblemSourcesEnum.java

@ -42,4 +42,13 @@ public enum ProblemSourcesEnum {
} }
return null; return null;
} }
public static ProblemSourcesEnum getByLabel(String label) {
for (ProblemSourcesEnum problemSourcesEnum : values()) {
if (problemSourcesEnum.label.equals(label)) {
return problemSourcesEnum;
}
}
return null;
}
} }

61
src/main/java/com/biutag/supervision/controller/sensitivePerception/RiskPersonalController.java

@ -1,19 +1,15 @@
package com.biutag.supervision.controller.sensitivePerception; package com.biutag.supervision.controller.sensitivePerception;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.biutag.supervision.pojo.Result; import com.biutag.supervision.pojo.Result;
import com.biutag.supervision.pojo.domain.RiskPersonalDetail; import com.biutag.supervision.pojo.domain.RiskPersonalDetail;
import com.biutag.supervision.pojo.entity.Model; import com.biutag.supervision.pojo.entity.*;
import com.biutag.supervision.pojo.entity.RiskModelTaskClue;
import com.biutag.supervision.pojo.entity.RiskPersonal;
import com.biutag.supervision.pojo.entity.RiskScoreRule;
import com.biutag.supervision.pojo.param.RiskPersonalQueryParam; import com.biutag.supervision.pojo.param.RiskPersonalQueryParam;
import com.biutag.supervision.service.ModelService; import com.biutag.supervision.pojo.vo.RiskPersonalVo;
import com.biutag.supervision.service.RiskModelTaskClueService; import com.biutag.supervision.service.*;
import com.biutag.supervision.service.RiskPersonalService;
import com.biutag.supervision.service.RiskScoreRuleService;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
@ -21,8 +17,10 @@ import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Objects; import java.util.Objects;
import java.util.stream.Collectors;
/** /**
* @author wxc * @author wxc
@ -35,25 +33,47 @@ import java.util.Objects;
public class RiskPersonalController { public class RiskPersonalController {
private final RiskPersonalService riskPersonalService; private final RiskPersonalService riskPersonalService;
private final RiskScoreRuleService riskScoreRuleService;
private final RiskModelTaskClueService riskModelTaskClueService;
private final ModelService modelService;
private final RiskPersonalTagService riskPersonalTagService;
@GetMapping @GetMapping
public Result<Page<RiskPersonal>> list(RiskPersonalQueryParam param) { public Result<Page<RiskPersonalVo>> list(RiskPersonalQueryParam param) {
LambdaQueryWrapper<RiskPersonal> queryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<RiskPersonal> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.like(StrUtil.isNotBlank(param.getName()), RiskPersonal::getName, param.getName()) queryWrapper.like(StrUtil.isNotBlank(param.getName()), RiskPersonal::getName, param.getName())
.eq(StrUtil.isNotBlank(param.getGender()), RiskPersonal::getGender, param.getGender()) .like(StrUtil.isNotBlank(param.getMobileNumber()), RiskPersonal::getMobileNumber, param.getMobileNumber())
.like(StrUtil.isNotBlank(param.getIdCode()), RiskPersonal::getIdCode, param.getIdCode())
.eq(Objects.nonNull(param.getAge()), RiskPersonal::getAge, param.getAge()) .eq(Objects.nonNull(param.getAge()), RiskPersonal::getAge, param.getAge())
.eq(StrUtil.isNotBlank(param.getControlDepartId()), RiskPersonal::getControlDepartId, param.getControlDepartId()); .eq(StrUtil.isNotBlank(param.getControlDepartId()), RiskPersonal::getControlDepartId, param.getControlDepartId());
queryWrapper.orderByDesc(RiskPersonal::getRiskScore).orderByDesc(RiskPersonal::getCreateTime); queryWrapper.orderByDesc(RiskPersonal::getRiskScore).orderByDesc(RiskPersonal::getCreateTime);
return Result.success(riskPersonalService.page(Page.of(param.getCurrent(), param.getSize()), queryWrapper)); Page<RiskPersonal> page = riskPersonalService.page(Page.of(param.getCurrent(), param.getSize()), queryWrapper);
if (page.getRecords().isEmpty()) {
return Result.success(new Page<RiskPersonalVo>().setTotal(0).setRecords(new ArrayList<>()));
} }
private final RiskScoreRuleService riskScoreRuleService; List<RiskPersonalTag> tags = riskPersonalTagService.list(new LambdaQueryWrapper<RiskPersonalTag>()
.in(RiskPersonalTag::getIdCode, page.getRecords().stream().map(RiskPersonal::getIdCode).toList()));
private final RiskModelTaskClueService riskModelTaskClueService; List<RiskPersonalVo> list = page.getRecords().stream().map(item -> {
RiskPersonalVo riskPersonalVo = new RiskPersonalVo();
private final ModelService modelService; BeanUtil.copyProperties(item, riskPersonalVo);
riskPersonalVo.setSmallTags(tags.stream().filter(j -> item.getIdCode().equals(j.getIdCode())).map(RiskPersonalTag::getSmallTag).collect(Collectors.toSet()));
return riskPersonalVo;
}).toList();
return Result.success(new Page<RiskPersonalVo>().setTotal(page.getTotal()).setRecords(list));
}
/**
* 风险人员查看详情
* @param id
* @return
*/
@GetMapping("{id}") @GetMapping("{id}")
public Result<RiskPersonalDetail> list(@PathVariable Integer id) { public Result<RiskPersonalDetail> get(@PathVariable Integer id) {
List<RiskScoreRule> rules1 = riskScoreRuleService.list(new LambdaQueryWrapper<RiskScoreRule>().eq(RiskScoreRule::getLevel, 1)); List<RiskScoreRule> rules1 = riskScoreRuleService.list(new LambdaQueryWrapper<RiskScoreRule>().eq(RiskScoreRule::getLevel, 1));
RiskPersonal riskPersonal = riskPersonalService.getById(id); RiskPersonal riskPersonal = riskPersonalService.getById(id);
List<RiskPersonalDetail.RiskRule> list = rules1.stream().map(rule -> { List<RiskPersonalDetail.RiskRule> list = rules1.stream().map(rule -> {
@ -61,11 +81,12 @@ public class RiskPersonalController {
riskRule.setRiskName(rule.getRiskName()); riskRule.setRiskName(rule.getRiskName());
List<RiskScoreRule> rules2 = riskScoreRuleService.list(new LambdaQueryWrapper<RiskScoreRule>().eq(RiskScoreRule::getPid, rule.getId()) List<RiskScoreRule> rules2 = riskScoreRuleService.list(new LambdaQueryWrapper<RiskScoreRule>().eq(RiskScoreRule::getPid, rule.getId())
.eq(RiskScoreRule::getLevel, 2)); .eq(RiskScoreRule::getLevel, 2));
List<Model> models = modelService.list(new LambdaQueryWrapper<Model>().in(Model::getRiskScoreRuleId, rules2.stream().map(RiskScoreRule::getId))); List<Model> models = modelService.list(new LambdaQueryWrapper<Model>().in(Model::getRiskScoreRuleId, rules2.stream().map(RiskScoreRule::getId).toList()));
List<RiskModelTaskClue> records = riskModelTaskClueService.page(Page.of(1, 5), new LambdaQueryWrapper<RiskModelTaskClue>()
List<RiskModelTaskClue> records = models.isEmpty() ? new ArrayList<>() : riskModelTaskClueService.page(Page.of(1, 5), new LambdaQueryWrapper<RiskModelTaskClue>()
.eq(RiskModelTaskClue::getIdCode, riskPersonal.getIdCode()) .eq(RiskModelTaskClue::getIdCode, riskPersonal.getIdCode())
.in(RiskModelTaskClue::getModelId, models.stream().map(Model::getId).toList()) .in(RiskModelTaskClue::getModelId, models.stream().map(Model::getId).toList())
.eq(RiskModelTaskClue::getDel, "1") .eq(RiskModelTaskClue::getDel, "0")
.orderByDesc(RiskModelTaskClue::getScore) .orderByDesc(RiskModelTaskClue::getScore)
.orderByAsc(RiskModelTaskClue::getCreateTime)).getRecords(); .orderByAsc(RiskModelTaskClue::getCreateTime)).getRecords();
riskRule.setClues(records); riskRule.setClues(records);

27
src/main/java/com/biutag/supervision/controller/sensitivePerception/ScoreController.java

@ -38,6 +38,14 @@ public class ScoreController {
private final NegativeScoreService negativeScoreService; private final NegativeScoreService negativeScoreService;
private final RiskPersonalService riskPersonalService;
private final RiskScoreRuleService riskScoreRuleService;
private final ModelService modelService;
private final RiskModelTaskClueService riskModelTaskClueService;
@RequestMapping("police") @RequestMapping("police")
public Result<String> updatePoliceScore() { public Result<String> updatePoliceScore() {
List<SupPolice> supPolices = policeScoreMapper.listPolice(); List<SupPolice> supPolices = policeScoreMapper.listPolice();
@ -78,21 +86,16 @@ public class ScoreController {
return Result.success("success"); return Result.success("success");
} }
private final RiskPersonalService riskPersonalService;
private final RiskScoreRuleService riskScoreRuleService;
private final ModelService modelService;
private final RiskModelTaskClueService riskModelTaskClueService;
@RequestMapping("personal") @RequestMapping("personal")
public Result<String> updatePersonalScore(Integer size) { public Result<String> updatePersonalScore(Integer size) {
log.info("updatePersonalScore-----------------------------------");
if (Objects.isNull(size)) { if (Objects.isNull(size)) {
size = 1000000; size = 1000000;
} }
List<RiskPersonal> riskPersonals = riskPersonalService.page(Page.of(1, size), new LambdaQueryWrapper<RiskPersonal>().eq(RiskPersonal::getDel, "1") List<RiskPersonal> riskPersonals = riskPersonalService.page(Page.of(1, size), new LambdaQueryWrapper<RiskPersonal>().eq(RiskPersonal::getDel, "0")
.ne(RiskPersonal::getRiskScore, 0)).getRecords(); ).getRecords();
log.info("{}条数据正在打分", riskPersonals.size());
List<RiskScoreRule> rules1 = riskScoreRuleService.list(new LambdaQueryWrapper<RiskScoreRule>().eq(RiskScoreRule::getLevel, 1)); List<RiskScoreRule> rules1 = riskScoreRuleService.list(new LambdaQueryWrapper<RiskScoreRule>().eq(RiskScoreRule::getLevel, 1));
riskPersonals.forEach(personal -> { riskPersonals.forEach(personal -> {
log.info("{}-{} 开始打分--------------------------------------", personal.getName(), personal.getIdCode()); log.info("{}-{} 开始打分--------------------------------------", personal.getName(), personal.getIdCode());
@ -101,10 +104,14 @@ public class ScoreController {
.eq(RiskScoreRule::getLevel, 2)); .eq(RiskScoreRule::getLevel, 2));
double score2 = rules2.stream().mapToDouble(rule2 -> { double score2 = rules2.stream().mapToDouble(rule2 -> {
Model model = modelService.getOne(new LambdaQueryWrapper<Model>().eq(Model::getRiskScoreRuleId, rule2.getId())); Model model = modelService.getOne(new LambdaQueryWrapper<Model>().eq(Model::getRiskScoreRuleId, rule2.getId()));
if (Objects.isNull(model)) {
log.info("{} 分值 = {}", rule.getRiskName(), 0);
return 0;
}
double score3 = riskModelTaskClueService.list(new LambdaQueryWrapper<RiskModelTaskClue>() double score3 = riskModelTaskClueService.list(new LambdaQueryWrapper<RiskModelTaskClue>()
.eq(RiskModelTaskClue::getModelId, model.getId()) .eq(RiskModelTaskClue::getModelId, model.getId())
.eq(RiskModelTaskClue::getIdCode, personal.getIdCode()) .eq(RiskModelTaskClue::getIdCode, personal.getIdCode())
.eq(RiskModelTaskClue::getDel, "1")) .eq(RiskModelTaskClue::getDel, "0"))
.stream().mapToDouble(RiskModelTaskClue::getScore).sum(); .stream().mapToDouble(RiskModelTaskClue::getScore).sum();
score3 = Math.min(rule2.getScore(), score3); score3 = Math.min(rule2.getScore(), score3);
log.info("{} 分值 = {}", rule2.getRiskName(), score3); log.info("{} 分值 = {}", rule2.getRiskName(), score3);

41
src/main/java/com/biutag/supervision/controller/work/NegativeImportController.java

@ -1,5 +1,6 @@
package com.biutag.supervision.controller.work; package com.biutag.supervision.controller.work;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.alibaba.excel.EasyExcel; import com.alibaba.excel.EasyExcel;
import com.alibaba.excel.context.AnalysisContext; import com.alibaba.excel.context.AnalysisContext;
@ -11,9 +12,11 @@ import com.biutag.supervision.pojo.Result;
import com.biutag.supervision.pojo.dto.*; import com.biutag.supervision.pojo.dto.*;
import com.biutag.supervision.pojo.dto.flow.VerifyData; import com.biutag.supervision.pojo.dto.flow.VerifyData;
import com.biutag.supervision.pojo.entity.*; import com.biutag.supervision.pojo.entity.*;
import com.biutag.supervision.pojo.vo.FileVo;
import com.biutag.supervision.service.*; import com.biutag.supervision.service.*;
import com.biutag.supervision.util.SpringUtil; import com.biutag.supervision.util.SpringUtil;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
@ -21,6 +24,7 @@ import org.springframework.web.multipart.MultipartFile;
import java.io.IOException; import java.io.IOException;
import java.util.*; import java.util.*;
@Slf4j
@RequiredArgsConstructor @RequiredArgsConstructor
@RequestMapping("negative/import") @RequestMapping("negative/import")
@RestController @RestController
@ -49,14 +53,12 @@ public class NegativeImportController {
problemMaps.put("执法办案-接处警与现场处置-警情反馈不及时、不规范", "191"); problemMaps.put("执法办案-接处警与现场处置-警情反馈不及时、不规范", "191");
problemMaps.put("执法办案-案件办理-不及时、不如实受立案", "53"); problemMaps.put("执法办案-案件办理-不及时、不如实受立案", "53");
problemMaps.put("执法办案-案件办理-调查取证不及时、不全面", "54"); problemMaps.put("执法办案-案件办理-调查取证不及时、不全面", "54");
problemMaps.put("执法办案-接处警与现场处置-现场处置不规范", "336");
problemMaps.put("执法办案-执法办案场所管理-嫌疑人进、出执法场所违规", "200");
} }
@PostMapping @PostMapping
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public Result<List<PoliceImport>> importExcel(@RequestPart("file") MultipartFile file) throws IOException { public Result<List<PoliceImport>> importExcel(@RequestPart("file") MultipartFile file) throws IOException {
log.info("importExcel-----------------------------------------------");
List<HdtNegativeImportDto> negatives = new ArrayList<>(); List<HdtNegativeImportDto> negatives = new ArrayList<>();
List<HdtNegativeBlameImportDto> blames = new ArrayList<>(); List<HdtNegativeBlameImportDto> blames = new ArrayList<>();
@ -101,10 +103,11 @@ public class NegativeImportController {
String departId = depart.getId(); String departId = depart.getId();
String departName = depart.getShortName(); String departName = depart.getShortName();
NegativeDto negativeDto = new NegativeDto(); NegativeDto negativeDto = new NegativeDto();
negativeDto.setDiscoveryTime(item.getDiscoveryTime()); if (StrUtil.isNotBlank(item.getDiscoveryTime())) {
negativeDto.setDiscoveryTime(DateUtil.parseLocalDateTime(item.getDiscoveryTime(), "yyyy-MM-dd HH:mm:ss"));
}
negativeDto.setCaseNumber(item.getCaseNumber()); negativeDto.setCaseNumber(item.getCaseNumber());
negativeDto.setBusinessTypeCode(BusinessTypeEnum.JCJ_110.getValue());
negativeDto.setBusinessTypeName(BusinessTypeEnum.JCJ_110.getLabel());
if (StrUtil.isBlank(item.getThingDesc())) { if (StrUtil.isBlank(item.getThingDesc())) {
negativeDto.setThingDesc(item.getProType()); negativeDto.setThingDesc(item.getProType());
@ -112,9 +115,27 @@ public class NegativeImportController {
negativeDto.setThingDesc(item.getThingDesc()); negativeDto.setThingDesc(item.getThingDesc());
} }
negativeDto.setTimeLimit(TimeLimitEnum.WORK_137.getValue()); negativeDto.setTimeLimit(TimeLimitEnum.WORK_137.getValue());
negativeDto.setProblemSources(ProblemSourcesEnum.ZXDC.getLabel());
negativeDto.setProblemSourcesCode(ProblemSourcesEnum.ZXDC.getValue()); BusinessTypeEnum businessTypeEnum = BusinessTypeEnum.getByLabel(item.getBusinessTypeName());
if (businessTypeEnum != null) {
negativeDto.setBusinessTypeCode(businessTypeEnum.getValue());
negativeDto.setBusinessTypeName(businessTypeEnum.getLabel());
} else {
negativeDto.setBusinessTypeCode(BusinessTypeEnum.QT.getValue());
negativeDto.setBusinessTypeName(BusinessTypeEnum.QT.getLabel());
}
ProblemSourcesEnum problemSourcesEnum = ProblemSourcesEnum.getByLabel(item.getProblemSources());
if (problemSourcesEnum != null) {
negativeDto.setProblemSources(problemSourcesEnum.getLabel());
negativeDto.setProblemSourcesCode(problemSourcesEnum.getValue());
if (problemSourcesEnum.getValue().equals(ProblemSourcesEnum.ZXDC.getValue())) {
negativeDto.setSpecialSupervision("1");
}
} else {
negativeDto.setProblemSources(ProblemSourcesEnum.QT.getLabel());
negativeDto.setProblemSourcesCode(ProblemSourcesEnum.QT.getValue());
negativeDto.setSpecialSupervision("1"); negativeDto.setSpecialSupervision("1");
}
negativeDto.setDepartId(departId); negativeDto.setDepartId(departId);
negativeDto.setDepartName(departName); negativeDto.setDepartName(departName);
negativeDto.setInvolveDepartId(departId); negativeDto.setInvolveDepartId(departId);
@ -179,6 +200,10 @@ public class NegativeImportController {
verifyData.setAccountabilityTarget("1"); verifyData.setAccountabilityTarget("1");
verifyData.setCaseNumber(item.getCaseNumber()); verifyData.setCaseNumber(item.getCaseNumber());
verifyData.setBlames(blameList); verifyData.setBlames(blameList);
FileVo fileVo = new FileVo();
fileVo.setFileName("默认附件(可删除).txt");
fileVo.setFilePath("/group1/M00/0A/2F/QS8Gbmc2uAWAX6V2AAAABgEL2k516.txt");
verifyData.setFiles(List.of(fileVo));
ActionDto actionDto = new ActionDto() ActionDto actionDto = new ActionDto()
.setActionKey("save") .setActionKey("save")

8
src/main/java/com/biutag/supervision/mapper/RiskPersonalTagMapper.java

@ -0,0 +1,8 @@
package com.biutag.supervision.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.biutag.supervision.pojo.entity.RiskPersonalTag;
public interface RiskPersonalTagMapper extends BaseMapper<RiskPersonalTag> {
}

8
src/main/java/com/biutag/supervision/pojo/dto/HdtNegativeImportDto.java

@ -1,6 +1,7 @@
package com.biutag.supervision.pojo.dto; package com.biutag.supervision.pojo.dto;
import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.ExcelProperty;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
@ -33,7 +34,7 @@ public class HdtNegativeImportDto {
private String thingDesc; private String thingDesc;
@ExcelProperty("报警时间") @ExcelProperty("报警时间")
private LocalDateTime discoveryTime; private String discoveryTime;
@ExcelProperty("接警编号") @ExcelProperty("接警编号")
private String caseNumber; private String caseNumber;
@ -45,5 +46,10 @@ public class HdtNegativeImportDto {
@ExcelProperty("整改情况") @ExcelProperty("整改情况")
private String rectifyDesc; private String rectifyDesc;
@ExcelProperty("问题来源")
private String problemSources;
@ExcelProperty("业务类别")
private String businessTypeName;
} }

2
src/main/java/com/biutag/supervision/pojo/entity/RiskPersonal.java

@ -42,7 +42,7 @@ public class RiskPersonal {
// 风险指数 // 风险指数
@TableField("risk_score") @TableField("risk_score")
private Integer riskScore; private Double riskScore;
// 管控部门编号 // 管控部门编号
@TableField("control_depart_id") @TableField("control_depart_id")

47
src/main/java/com/biutag/supervision/pojo/entity/RiskPersonalTag.java

@ -0,0 +1,47 @@
package com.biutag.supervision.pojo.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Getter;
import lombok.Setter;
import java.time.LocalDateTime;
@Setter
@Getter
public class RiskPersonalTag {
// 主键
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
// 姓名
@TableField("name")
private String name;
// 证件号码
@TableField("id_code")
private String idCode;
// 大标签
@TableField("big_tag")
private String bigTag;
// 小标签
@TableField("small_tag")
private String smallTag;
// 标签时间
@TableField("tag_time")
private LocalDateTime tagTime;
// 创建时间
@TableField("create_time")
private LocalDateTime createTime;
// 逻辑删除键0-未删1已删
@TableField("del")
private Boolean del;
}

6
src/main/java/com/biutag/supervision/pojo/param/RiskPersonalQueryParam.java

@ -12,16 +12,14 @@ import lombok.Setter;
public class RiskPersonalQueryParam extends BasePage { public class RiskPersonalQueryParam extends BasePage {
private String name; private String name;
// 性别男1女2
private String gender;
// 年龄 // 年龄
private Integer age; private Integer age;
// 手机号 // 手机号
private String mobileNumber; private String mobileNumber;
private String idCode;
private String controlDepartId; private String controlDepartId;
} }

75
src/main/java/com/biutag/supervision/pojo/vo/RiskPersonalVo.java

@ -0,0 +1,75 @@
package com.biutag.supervision.pojo.vo;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Getter;
import lombok.Setter;
import java.time.LocalDateTime;
import java.util.HashSet;
import java.util.Set;
@Setter
@Getter
public class RiskPersonalVo {
// 主键
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
// 姓名
@TableField("name")
private String name;
// 性别男1女2
@TableField("gender")
private String gender;
// 年龄
@TableField("age")
private Integer age;
// 大标签预览
@TableField("tags")
private String tags;
// 证件号码
@TableField("id_code")
private String idCode;
// 手机号
@TableField("mobile_number")
private String mobileNumber;
// 风险指数
@TableField("risk_score")
private Double riskScore;
// 管控部门编号
@TableField("control_depart_id")
private String controlDepartId;
// 管控部门名称
@TableField("control_depart_name")
private String controlDepartName;
// 管控时间
@TableField("control_time")
private LocalDateTime controlTime;
// 创建时间
@TableField("create_time")
private LocalDateTime createTime;
// 异常信息
@TableField("error_msg")
private String errorMsg;
// 逻辑删除键0-未删1已删
@TableField("del")
private Boolean del;
private Set<String> smallTags = new HashSet<>();
}

2
src/main/java/com/biutag/supervision/pojo/vo/RiskScoreRuleTree.java

@ -24,7 +24,7 @@ public class RiskScoreRuleTree {
private String riskName; private String riskName;
// 分值 // 分值
private String score; private Double score;
// 规则描述 // 规则描述
private String ruleDesc; private String ruleDesc;

3
src/main/java/com/biutag/supervision/service/NegativeService.java

@ -234,6 +234,9 @@ public class NegativeService extends ServiceImpl<NegativeMapper, Negative> {
.setProblemSourcesCode(ProblemSourcesEnum.JWDC.getValue()) .setProblemSourcesCode(ProblemSourcesEnum.JWDC.getValue())
// 警务调查默认为137工作制 // 警务调查默认为137工作制
.setTimeLimit(TimeLimitEnum.WORK_137.getValue()) .setTimeLimit(TimeLimitEnum.WORK_137.getValue())
.setMaxSignDuration(TimeLimitEnum.WORK_137.getMaxSignDuration())
.setMaxHandleDuration(TimeLimitEnum.WORK_137.getMaxHandleDuration())
.setMaxExtensionDuration(TimeLimitEnum.WORK_137.getMaxHandleDuration())
.setApprovalFlow(ApprovalFlowEnum.SECOND_APPROVAL.getValue()) .setApprovalFlow(ApprovalFlowEnum.SECOND_APPROVAL.getValue())
// 下发时间 // 下发时间
.setFirstDistributeTime(now) .setFirstDistributeTime(now)

14
src/main/java/com/biutag/supervision/service/RiskPersonalTagService.java

@ -0,0 +1,14 @@
package com.biutag.supervision.service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.biutag.supervision.mapper.RiskPersonalTagMapper;
import com.biutag.supervision.pojo.entity.RiskPersonalTag;
import org.springframework.stereotype.Service;
/**
* @author wxc
* @date 2024/11/15
*/
@Service
public class RiskPersonalTagService extends ServiceImpl<RiskPersonalTagMapper, RiskPersonalTag> {
}

10
src/main/resources/application-prod.yml

@ -26,11 +26,11 @@ spring:
url: jdbc:dm://65.47.22.243:5236?SCHEMA=JSDZ_4GDB url: jdbc:dm://65.47.22.243:5236?SCHEMA=JSDZ_4GDB
username: DCZD username: DCZD
password: DCZD@2024 password: DCZD@2024
test1: # test1:
url: jdbc:sqlserver://65.47.6.114:1433;databaseName=VisitManage_CS # url: jdbc:sqlserver://65.47.6.114:1433;databaseName=VisitManage_CS
username: ck1112 # username: ck1112
password: CK@20241112 # password: CK@20241112
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver # driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
druid: druid:
min-evictable-idle-time-millis: 300000 min-evictable-idle-time-millis: 300000
test-on-borrow: false test-on-borrow: false

BIN
src/main/resources/static/templates/黄赌问题问题下发模板.xls

Binary file not shown.

2
src/test/java/com/biutag/supervision/tools/GenCodeTests.java

@ -25,7 +25,7 @@ public class GenCodeTests {
@Test @Test
public void genEntity() throws TemplateException, IOException { public void genEntity() throws TemplateException, IOException {
String tableName = "risk_model_task_clue"; String tableName = "risk_personal_tag";
String tableSchema = "negative"; String tableSchema = "negative";
boolean genMapper = true; boolean genMapper = true;
boolean genService = true; boolean genService = true;

Loading…
Cancel
Save