supervision
/
supervision-boot
5
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

1、修复大屏维权抚慰模块的选择日期bug 

2、优化灵敏感知模型代码
main
sjh 1 year ago
parent
311b95a25a
commit
079fd54d92
2 changed files with 53 additions and 108 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/main/java/com/biutag/supervision/mapper/RpcApplyMapper.java
  2. 131
      src/main/java/com/biutag/supervision/service/ModelClueService.java

2
src/main/java/com/biutag/supervision/mapper/RpcApplyMapper.java
Unescape View File

@ -19,7 +19,7 @@ public interface RpcApplyMapper extends BaseMapper<RpcApply> {
"WHERE b.apply_date BETWEEN #{beginTime} AND #{endTime} AND b.type = 2") "WHERE b.apply_date BETWEEN #{beginTime} AND #{endTime} AND b.type = 2")
List<String> getHitPeople(Date beginTime, Date endTime); List<String> getHitPeople(Date beginTime, Date endTime);
@Select("SELECT SUM(a.provide_relief) FROM rpc_apply_person a LEFT JOIN rpc_apply b ON a.rpc_id = b.rpc_id " + @Select("SELECT COALESCE(SUM(a.provide_relief), 0.0) FROM rpc_apply_person a LEFT JOIN rpc_apply b ON a.rpc_id = b.rpc_id " +
"WHERE b.apply_date BETWEEN #{beginTime} AND #{endTime} AND b.type = 2") "WHERE b.apply_date BETWEEN #{beginTime} AND #{endTime} AND b.type = 2")
Double countComfortMoney(Date beginTime, Date endTime); Double countComfortMoney(Date beginTime, Date endTime);

131
src/main/java/com/biutag/supervision/service/ModelClueService.java
Unescape View File

@ -162,11 +162,9 @@ public class ModelClueService extends ServiceImpl<ModelClueMapper, ModelClue> {
public void generate(Integer modelId) { public void generate(Integer modelId) {
Model model = modelMapper.selectById(modelId); Model model = modelMapper.selectById(modelId);
List<ModelClue> modelClues = new ArrayList<>(); List<ModelClue> modelClues = new ArrayList<>();
if (!Objects.isNull(model)) { if (!Objects.isNull(model) && model.getModelSql() != null) {
if (model.getModelSql() != null) {
modelClues.addAll(getModelClueBySql(model.getModelSql(), modelId)); modelClues.addAll(getModelClueBySql(model.getModelSql(), modelId));
} }
}
if (!modelClues.isEmpty()) { if (!modelClues.isEmpty()) {
for (ModelClue modelClue : modelClues) { for (ModelClue modelClue : modelClues) {
modelClue.setModelId(modelId); modelClue.setModelId(modelId);
@ -219,7 +217,7 @@ public class ModelClueService extends ServiceImpl<ModelClueMapper, ModelClue> {
modelClue.setInvolveDepartId(supExternalDepart.getInternalId()); modelClue.setInvolveDepartId(supExternalDepart.getInternalId());
} }
setPerson(modelId, modelClue, data); setPerson(modelId, modelClue, data);
generateZFBAThingDesc(modelId, modelClue, data); generateThingDesc(modelId, modelClue, data);
break; break;
} }
} }
@ -229,48 +227,38 @@ public class ModelClueService extends ServiceImpl<ModelClueMapper, ModelClue> {
private void setPerson(Integer modelId, ModelClue modelClue, Map<String, Object> data) { private void setPerson(Integer modelId, ModelClue modelClue, Map<String, Object> data) {
if (modelId == 3) { // 执法区域人员表 if (modelId == 3) { // 执法区域人员表
if (data.get("bar1") != null && !data.get("bar1").equals("")) { String bar1 = (String) data.get("bar1");
if (data.get("bar2") != null && !data.get("bar2").equals("")) { String bar2 = (String) data.get("bar2");
modelClue.setInvolvePoliceName(data.get("bar1") + "，" + data.get("bar2")); String involvePoliceName = (bar1 != null && !bar1.isEmpty() && bar2 != null && !bar2.isEmpty())
} else { ? bar1 + "，" + bar2
modelClue.setInvolvePoliceName((String) data.get("bar1")); : (bar1 != null && !bar1.isEmpty()) ? bar1
} : (bar2 != null && !bar2.isEmpty()) ? bar2 : "无数据";
modelClue.setInvolvePoliceName(involvePoliceName);
String bar1jh = (String) data.get("bar1jh");
String bar2jh = (String) data.get("bar2jh");
if (bar1jh != null && !bar1jh.isEmpty()) {
if (bar2jh != null && !bar2jh.isEmpty()) {
modelClue.setInvolvePoliceEmpNo(bar1jh + "，" + bar2jh);
} else { } else {
if (data.get("bar2") != null && !data.get("bar2").equals("")) { modelClue.setInvolvePoliceEmpNo(bar1jh);
modelClue.setInvolvePoliceName((String) data.get("bar2"));
} else {
modelClue.setInvolvePoliceName("无数据");
}
} }
if (data.get("bar1jh") != null && !data.get("bar1jh").equals("")) { } else if (bar2jh != null && !bar2jh.isEmpty()) {
if (data.get("bar2jh") != null && !data.get("bar2jh").equals("")) { modelClue.setInvolvePoliceEmpNo(bar2jh);
modelClue.setInvolvePoliceEmpNo(data.get("bar1jh") + "，" + data.get("bar2jh"));
} else {
modelClue.setInvolvePoliceEmpNo((String) data.get("bar1jh"));
}
} else {
if (data.get("bar2jh") != null && !data.get("bar2jh").equals("")) {
modelClue.setInvolvePoliceEmpNo((String) data.get("bar2jh"));
} else { } else {
modelClue.setInvolvePoliceEmpNo("无数据"); modelClue.setInvolvePoliceEmpNo("无数据");
} }
} }
}
if (modelId == 10 || modelId == 11 || modelId == 12 || modelId == 13 || modelId == 14 || modelId == 15) { // 案件基本信息表 if (modelId == 10 || modelId == 11 || modelId == 12 || modelId == 13 || modelId == 14 || modelId == 15) { // 案件基本信息表
Map<String, Object> bar1; String bar1Id = (String) data.get("BAR1ID");
Map<String, Object> bar2; String bar2Id = (String) data.get("BAR2ID");
if (data.get("BAR1ID") != null && !data.get("BAR1ID").equals("")) { Map<String, Object> bar1 = bar1Id != null && !bar1Id.isEmpty() ? modelClueDataMapper.selectBAR(bar1Id) : null;
bar1 = modelClueDataMapper.selectBAR((String) data.get("BAR1ID")); Map<String, Object> bar2 = bar2Id != null && !bar2Id.isEmpty() ? modelClueDataMapper.selectBAR(bar2Id) : null;
if (data.get("BAR2ID") != null && !data.get("BAR2ID").equals("")) { if (bar1 != null && bar2 != null) {
bar2 = modelClueDataMapper.selectBAR((String) data.get("BAR2ID"));
if (bar1 != null) {
if (bar2 != null) {
modelClue.setInvolvePoliceEmpNo(bar1.get("JH") + "，" + bar2.get("JH")); modelClue.setInvolvePoliceEmpNo(bar1.get("JH") + "，" + bar2.get("JH"));
modelClue.setInvolvePoliceName(bar1.get("XM") + "，" + bar2.get("XM")); modelClue.setInvolvePoliceName(bar1.get("XM") + "，" + bar2.get("XM"));
} else { } else if (bar1 != null) {
modelClue.setInvolvePoliceEmpNo((String) bar1.get("JH")); modelClue.setInvolvePoliceEmpNo((String) bar1.get("JH"));
modelClue.setInvolvePoliceName((String) bar1.get("XM")); modelClue.setInvolvePoliceName((String) bar1.get("XM"));
}
} else if (bar2 != null) { } else if (bar2 != null) {
modelClue.setInvolvePoliceEmpNo((String) bar2.get("JH")); modelClue.setInvolvePoliceEmpNo((String) bar2.get("JH"));
modelClue.setInvolvePoliceName((String) bar2.get("XM")); modelClue.setInvolvePoliceName((String) bar2.get("XM"));
@ -278,34 +266,10 @@ public class ModelClueService extends ServiceImpl<ModelClueMapper, ModelClue> {
modelClue.setInvolvePoliceEmpNo("无数据"); modelClue.setInvolvePoliceEmpNo("无数据");
modelClue.setInvolvePoliceName("无数据"); modelClue.setInvolvePoliceName("无数据");
} }
} else {
if (bar1 != null) {
modelClue.setInvolvePoliceEmpNo((String) bar1.get("JH"));
modelClue.setInvolvePoliceName((String) bar1.get("XM"));
} else {
modelClue.setInvolvePoliceEmpNo("无数据");
modelClue.setInvolvePoliceName("无数据");
}
}
} else {
if (data.get("bar2jh") != null && !data.get("bar2jh").equals("")) {
bar2 = modelClueDataMapper.selectBAR((String) data.get("BAR2ID"));
if (bar2 != null) {
modelClue.setInvolvePoliceEmpNo((String) bar2.get("JH"));
modelClue.setInvolvePoliceName((String) bar2.get("XM"));
} else {
modelClue.setInvolvePoliceEmpNo("无数据");
modelClue.setInvolvePoliceName("无数据");
}
} else {
modelClue.setInvolvePoliceEmpNo("无数据");
modelClue.setInvolvePoliceName("无数据");
}
}
} }
} }
private static void generateZFBAThingDesc(Integer modelId, ModelClue modelClue, Map<String, Object> data) { private static void generateThingDesc(Integer modelId, ModelClue modelClue, Map<String, Object> data) {
if (modelId == 1) { // 1号模型：行政、刑事案件受理30天仍未立案问题监督模型 if (modelId == 1) { // 1号模型：行政、刑事案件受理30天仍未立案问题监督模型
String thingDesc = modelClue.getThingDesc(); String thingDesc = modelClue.getThingDesc();
modelClue.setThingDesc("该" + data.get("AJBZmc") modelClue.setThingDesc("该" + data.get("AJBZmc")
@ -378,13 +342,8 @@ public class ModelClueService extends ServiceImpl<ModelClueMapper, ModelClue> {
} }
private static String getAjbh(Map<String, Object> data) { private static String getAjbh(Map<String, Object> data) {
String AJBH; String ajbh = (String) data.get("AJBH");
if (data.get("AJBH") == null || data.get("AJBH").equals("")) { return ajbh == null || ajbh.isEmpty() ? "无数据" : ajbh;
AJBH = "空";
} else {
AJBH = (String) data.get("AJBH");
}
return AJBH;
} }
private List<ModelClue> getModelCluesForModel4(String param, List<ModelClue> modelClues) { private List<ModelClue> getModelCluesForModel4(String param, List<ModelClue> modelClues) {
@ -530,38 +489,32 @@ public class ModelClueService extends ServiceImpl<ModelClueMapper, ModelClue> {
} }
} }
} }
if (modelClue.get("bar1xm") != null) { if (modelClue.get("bar1xm") != null && modelClue.get("bar2xm") != null) {
if (modelClue.get("bar2xm") != null) {
newModelClue.setInvolvePoliceName(modelClue.get("bar1xm") + "、" + modelClue.get("bar2xm")); newModelClue.setInvolvePoliceName(modelClue.get("bar1xm") + "、" + modelClue.get("bar2xm"));
} else { } else if (modelClue.get("bar1xm") != null){
newModelClue.setInvolvePoliceName((String) modelClue.get("bar1xm")); newModelClue.setInvolvePoliceName((String) modelClue.get("bar1xm"));
} } else if (modelClue.get("bar2xm") != null){
} else {
if (modelClue.get("bar2xm") != null) {
newModelClue.setInvolvePoliceName((String) modelClue.get("bar2xm")); newModelClue.setInvolvePoliceName((String) modelClue.get("bar2xm"));
} else { } else {
newModelClue.setInvolvePoliceName("无数据"); newModelClue.setInvolvePoliceName("无数据");
} }
}
Map<String, Object> bar1 = modelClueDataMapper.selectBAR((String) modelClue.get("bar1id")); Map<String, Object> bar1 = modelClueDataMapper.selectBAR((String) modelClue.get("bar1id"));
Map<String, Object> bar2 = modelClueDataMapper.selectBAR((String) modelClue.get("bar2id")); Map<String, Object> bar2 = modelClueDataMapper.selectBAR((String) modelClue.get("bar2id"));
if (bar1 != null && bar1.get("JH") != null) { String jh1 = bar1 == null ? null : (String) bar1.get("JH");
if (bar2 != null && bar2.get("JH") != null) { String jh2 = bar2 == null ? null : (String) bar2.get("JH");
newModelClue.setInvolvePoliceEmpNo(bar1.get("JH") + "、" + bar2.get("JH")); if (jh1 != null && jh2 != null) {
} else { newModelClue.setInvolvePoliceEmpNo(jh1 + "、" + jh2);
newModelClue.setInvolvePoliceEmpNo((String) bar1.get("JH")); } else if (jh1 != null) {
} newModelClue.setInvolvePoliceEmpNo(jh1);
} else { } else if (jh2 != null) {
if (bar2 != null && bar2.get("JH") != null) { newModelClue.setInvolvePoliceEmpNo(jh2);
newModelClue.setInvolvePoliceEmpNo((String) bar2.get("JH"));
} else { } else {
newModelClue.setInvolvePoliceEmpNo("无数据"); newModelClue.setInvolvePoliceEmpNo("无数据");
} }
}
newModelClue.setData(JSONObject.toJSONString(modelClue)); newModelClue.setData(JSONObject.toJSONString(modelClue));
newModelClue.setStatus(0); newModelClue.setStatus(0);
newModelClue.setThingDesc("在" + params.get(0) + "到" + params.get(1) + "之间，" newModelClue.setThingDesc("在" + params.get(0) + "到" + params.get(1) + "之间，"
+ (String) modelClue.get("xm") + modelClue.get("xm")
+ "（身份证号：" + modelClue.get("sfzh") + "）的取保次数为" + "（身份证号：" + modelClue.get("sfzh") + "）的取保次数为"
+ sfzhMap.get((String) modelClue.get("sfzh")) + "次，大于2次，属于多次取保异常数据。"); + sfzhMap.get((String) modelClue.get("sfzh")) + "次，大于2次，属于多次取保异常数据。");
modelClues.add(newModelClue); modelClues.add(newModelClue);
@ -675,23 +628,15 @@ public class ModelClueService extends ServiceImpl<ModelClueMapper, ModelClue> {
List<ModelClue> modelClues1 = modelClueDataMapper.selectDataByDynamicSql(preSql + "盗" + postSql); List<ModelClue> modelClues1 = modelClueDataMapper.selectDataByDynamicSql(preSql + "盗" + postSql);
System.out.println("模型2开始查询数据库 骗"); System.out.println("模型2开始查询数据库 骗");
List<ModelClue> modelClues2 = modelClueDataMapper.selectDataByDynamicSql(preSql + "骗" + postSql); List<ModelClue> modelClues2 = modelClueDataMapper.selectDataByDynamicSql(preSql + "骗" + postSql);
System.out.println("模型2开始查询数据库 强奸");
List<ModelClue> modelClues3 = modelClueDataMapper.selectDataByDynamicSql(preSql + "强奸" + postSql); List<ModelClue> modelClues3 = modelClueDataMapper.selectDataByDynamicSql(preSql + "强奸" + postSql);
System.out.println("模型2开始查询数据库 抢");
List<ModelClue> modelClues4 = modelClueDataMapper.selectDataByDynamicSql(preSql + "抢" + postSql); List<ModelClue> modelClues4 = modelClueDataMapper.selectDataByDynamicSql(preSql + "抢" + postSql);
System.out.println("模型2开始查询数据库 10岁"); System.out.println("模型2开始查询数据库 10岁");
List<ModelClue> modelClues5 = modelClueDataMapper.selectDataByDynamicSql(preSql + "10岁" + postSql); List<ModelClue> modelClues5 = modelClueDataMapper.selectDataByDynamicSql(preSql + "10岁" + postSql);
System.out.println("模型2开始查询数据库 11岁");
List<ModelClue> modelClues6 = modelClueDataMapper.selectDataByDynamicSql(preSql + "11岁" + postSql); List<ModelClue> modelClues6 = modelClueDataMapper.selectDataByDynamicSql(preSql + "11岁" + postSql);
System.out.println("模型2开始查询数据库 12岁");
List<ModelClue> modelClues7 = modelClueDataMapper.selectDataByDynamicSql(preSql + "12岁" + postSql); List<ModelClue> modelClues7 = modelClueDataMapper.selectDataByDynamicSql(preSql + "12岁" + postSql);
System.out.println("模型2开始查询数据库 13岁");
List<ModelClue> modelClues8 = modelClueDataMapper.selectDataByDynamicSql(preSql + "13岁" + postSql); List<ModelClue> modelClues8 = modelClueDataMapper.selectDataByDynamicSql(preSql + "13岁" + postSql);
System.out.println("模型2开始查询数据库 14岁");
List<ModelClue> modelClues9 = modelClueDataMapper.selectDataByDynamicSql(preSql + "14岁" + postSql); List<ModelClue> modelClues9 = modelClueDataMapper.selectDataByDynamicSql(preSql + "14岁" + postSql);
System.out.println("模型2开始查询数据库 15岁");
List<ModelClue> modelClues10 = modelClueDataMapper.selectDataByDynamicSql(preSql + "15岁" + postSql); List<ModelClue> modelClues10 = modelClueDataMapper.selectDataByDynamicSql(preSql + "15岁" + postSql);
System.out.println("模型2开始查询数据库 16岁");
List<ModelClue> modelClues11 = modelClueDataMapper.selectDataByDynamicSql(preSql + "16岁" + postSql); List<ModelClue> modelClues11 = modelClueDataMapper.selectDataByDynamicSql(preSql + "16岁" + postSql);
System.out.println("模型2开始查询数据库 未成年"); System.out.println("模型2开始查询数据库 未成年");
List<ModelClue> modelClues12 = modelClueDataMapper.selectDataByDynamicSql(preSql + "未成年" + postSql); List<ModelClue> modelClues12 = modelClueDataMapper.selectDataByDynamicSql(preSql + "未成年" + postSql);

Write Preview
Loading…
Cancel
Save