From 335b623833561e6ad7521cdf05aaac809bf12e1e Mon Sep 17 00:00:00 2001 From: chenrui <1950717904@qq.com> Date: Mon, 5 Aug 2024 22:01:20 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B0=91=E7=94=9F=E8=AF=89=E6=B1=82=E5=90=8C?= =?UTF-8?q?=E6=AD=A5=E7=8A=B6=E6=80=81=20=E8=AF=84=E4=BB=B7=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E4=BF=AE=E6=94=B9=20=E6=8A=95=E8=AF=89=E9=99=90?= =?UTF-8?q?=E5=88=B6=E4=B8=BA=E6=9C=AC=E4=BA=BA=E5=8F=AF=E8=A7=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../code/domain/EnforcementRegistration.java | 13 +++ .../zdxt/code/domain/EnterpriseComplaint.java | 26 ++++++ .../mapper/EnterpriseComplaintMapper.java | 14 +++ .../code/mapper/EnterpriseEvaluateMapper.java | 7 ++ .../service/IEnterpriseEvaluateService.java | 7 ++ .../EnforcementRegistrationServiceImpl.java | 13 ++- .../impl/EnterpriseComplaintServiceImpl.java | 2 + .../impl/EnterpriseEvaluateServiceImpl.java | 6 ++ .../java/com/zdxt/code/task/MssqTask.java | 90 +++++++++++++++++++ .../mapper/EnterpriseComplaintMapper.xml | 26 +++++- .../mapper/EnterpriseEvaluateMapper.xml | 9 +- 11 files changed, 206 insertions(+), 7 deletions(-) create mode 100644 lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/task/MssqTask.java diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnforcementRegistration.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnforcementRegistration.java index 1f7d758e..6972e8bb 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnforcementRegistration.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnforcementRegistration.java @@ -182,6 +182,11 @@ public class EnforcementRegistration extends BaseDomain */ private String checkCategory; + /** + * 行政执法评价 + */ + private EnterpriseEvaluate enterpriseEvaluate; + public String getCheckCss() { return checkCss; @@ -584,4 +589,12 @@ public class EnforcementRegistration extends BaseDomain public void setIsEvaluate(Integer isEvaluate) { this.isEvaluate = isEvaluate; } + + public EnterpriseEvaluate getEnterpriseEvaluate() { + return enterpriseEvaluate; + } + + public void setEnterpriseEvaluate(EnterpriseEvaluate enterpriseEvaluate) { + this.enterpriseEvaluate = enterpriseEvaluate; + } } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseComplaint.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseComplaint.java index 5d3aa394..9559b244 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseComplaint.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseComplaint.java @@ -47,6 +47,16 @@ public class EnterpriseComplaint extends BaseDomain /** 关联工单 */ private String proWoCode; + /** + * 工单状态 + */ + private Integer status; + + /** + * 可评价 同步时间 + */ + private String evaluateTime; + public String getProWoCode() { return proWoCode; } @@ -193,6 +203,22 @@ public class EnterpriseComplaint extends BaseDomain this.fileList = fileList; } + public Integer getStatus() { + return status; + } + + public void setStatus(Integer status) { + this.status = status; + } + + public String getEvaluateTime() { + return evaluateTime; + } + + public void setEvaluateTime(String evaluateTime) { + this.evaluateTime = evaluateTime; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnterpriseComplaintMapper.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnterpriseComplaintMapper.java index 4c14838b..ddefe151 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnterpriseComplaintMapper.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnterpriseComplaintMapper.java @@ -27,6 +27,13 @@ public interface EnterpriseComplaintMapper */ public List selectEnterpriseComplaintList(EnterpriseComplaint enterpriseComplaint); + /** + * 查询工单数据 + * @param enterpriseComplaint + * @return + */ + public List selectByStatus(EnterpriseComplaint enterpriseComplaint); + /** * 新增企业执法-在线投诉 * @@ -43,6 +50,13 @@ public interface EnterpriseComplaintMapper */ public int updateEnterpriseComplaint(EnterpriseComplaint enterpriseComplaint); + /** + * 根据工单修改投诉数据 + * @param enterpriseComplaint + * @return + */ + public int updateEnterpriseComplaintByCode(EnterpriseComplaint enterpriseComplaint); + /** * 删除企业执法-在线投诉 * diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnterpriseEvaluateMapper.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnterpriseEvaluateMapper.java index 3e3fe621..5bad5204 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnterpriseEvaluateMapper.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnterpriseEvaluateMapper.java @@ -20,6 +20,13 @@ public interface EnterpriseEvaluateMapper */ public EnterpriseEvaluate selectEnterpriseEvaluateById(String id); + /** + * 查询执法评价 + * @param relId + * @return + */ + public EnterpriseEvaluate selectEnterpriseEvaluateByRelId(String relId); + /** * 查询企业端-执法评价列表 * diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnterpriseEvaluateService.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnterpriseEvaluateService.java index 2e043578..4096afa6 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnterpriseEvaluateService.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnterpriseEvaluateService.java @@ -19,6 +19,13 @@ public interface IEnterpriseEvaluateService * @return 企业端-执法评价 */ public EnterpriseEvaluate selectEnterpriseEvaluateById(String id); + /** + * 查询企业端-执法评价 + * + * @param relId 案件ID + * @return 企业端-执法评价 + */ + public EnterpriseEvaluate selectEnterpriseEvaluateByRelId(String relId); /** * 查询企业端-执法评价列表 diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementRegistrationServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementRegistrationServiceImpl.java index a911e187..e58d7b94 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementRegistrationServiceImpl.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementRegistrationServiceImpl.java @@ -13,9 +13,7 @@ import com.zdxt.auth.feign.UserApi; import com.zdxt.auth.feign.ZdxtFileCommonApi; import com.zdxt.code.domain.*; import com.zdxt.code.mapper.LinkageDictMapper; -import com.zdxt.code.service.ILawEnforcementWarningListService; -import com.zdxt.code.service.IRuleItemListService; -import com.zdxt.code.service.IRuleListService; +import com.zdxt.code.service.*; import com.zdxt.common.annotation.DataScope; import com.zdxt.common.config.RuoYiConfig; import com.zdxt.common.util.DateUtils; @@ -28,7 +26,6 @@ import org.dmg.pmml.association.Item; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.zdxt.code.mapper.EnforcementRegistrationMapper; -import com.zdxt.code.service.IEnforcementRegistrationService; /** * 执法端-执法登记Service业务层处理 @@ -57,6 +54,9 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat @Autowired private LinkageDictMapper linkageDictMapper; + @Autowired + private IEnterpriseEvaluateService enterpriseEvaluateService; + @Autowired private ILawEnforcementWarningListService lawEnforcementWarningListService; @@ -98,8 +98,13 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat enforcementRegistration.setLawEnforcementBasisText(linkageDict.getTitle()); } } + //查询行政检查评价 + EnterpriseEvaluate enterpriseEvaluate = + enterpriseEvaluateService.selectEnterpriseEvaluateByRelId(enforcementRegistration.getId()); + enforcementRegistration.setEnterpriseEvaluate(enterpriseEvaluate); return enforcementRegistration; } + @Override public EnforcementRegistration getEnforcementRegistrationById(String id) { diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseComplaintServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseComplaintServiceImpl.java index ed2c8863..328b0ead 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseComplaintServiceImpl.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseComplaintServiceImpl.java @@ -89,6 +89,8 @@ public class EnterpriseComplaintServiceImpl implements IEnterpriseComplaintServi System.out.println("========================"); enterpriseComplaint.setCreateTime(DateUtils.getNowDate()); enterpriseComplaint.setId(IdUtil.simpleUUID()); + //默认工单为已受理 + enterpriseComplaint.setStatus(0); int i = enterpriseComplaintMapper.insertEnterpriseComplaint(enterpriseComplaint); /*if (i > 0) { try { diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseEvaluateServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseEvaluateServiceImpl.java index c456812e..a0a5c720 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseEvaluateServiceImpl.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseEvaluateServiceImpl.java @@ -42,6 +42,12 @@ public class EnterpriseEvaluateServiceImpl implements IEnterpriseEvaluateService return enterpriseEvaluateMapper.selectEnterpriseEvaluateById(id); } + + @Override + public EnterpriseEvaluate selectEnterpriseEvaluateByRelId(String relId) { + return enterpriseEvaluateMapper.selectEnterpriseEvaluateByRelId(relId); + } + /** * 查询企业端-执法评价列表 * diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/task/MssqTask.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/task/MssqTask.java new file mode 100644 index 00000000..92285bd9 --- /dev/null +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/task/MssqTask.java @@ -0,0 +1,90 @@ +package com.zdxt.code.task; + +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.google.common.collect.Lists; +import com.zdxt.code.domain.EnterpriseComplaint; +import com.zdxt.code.domain.MssqAddOrder; +import com.zdxt.code.mapper.EnterpriseComplaintMapper; +import com.zdxt.code.service.IEnterpriseComplaintService; +import com.zdxt.code.service.MssqApiService; +import com.zdxt.common.util.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; +import org.springframework.stereotype.Service; + +import java.util.*; +import java.util.function.Function; +import java.util.stream.Collectors; + +/** + * 民生诉求接口定时获取工单状态 + */ +@Component("mssqTask") +public class MssqTask { + + @Autowired + private MssqApiService mssqApiService; + + @Autowired + private EnterpriseComplaintMapper enterpriseComplaintMapper; + + + public void getMssqStatus() throws Exception { + EnterpriseComplaint enterpriseComplaint = new EnterpriseComplaint(); + enterpriseComplaint.setStatus(15); + List enterpriseComplaints = enterpriseComplaintMapper.selectByStatus(enterpriseComplaint); + if(enterpriseComplaints.size() == 0 ){ + return; + } + //获取列表中所有工单 + List collect = enterpriseComplaints.stream().map(EnterpriseComplaint::getProWoCode).collect(Collectors.toList()); + + //集合数据拆分 + List> partition = Lists.partition(collect, 19); + + for (List stringList : partition) { + //查询民生诉求工单状态 + MssqAddOrder mssqAddOrder = new MssqAddOrder(); + mssqAddOrder.setProWoCodes(stringList); + String jsonStr = mssqApiService.queryMssq(mssqAddOrder, "/api/API_YX/proProcess/queryCurState"); + + //存储工单中的状态 + Map map = new HashMap<>(); + + JSONObject jsonObject = JSONObject.parseObject(jsonStr); + JSONArray formList = jsonObject.getJSONArray("formList"); + for (int i = 0; i < formList.size(); i++) { + JSONObject jsonObject1 = formList.getJSONObject(i); + //工单编码 + String proWoCode = jsonObject1.getString("proWoCode"); + //工单状态 + Integer state = jsonObject1.getInteger("state"); + map.put(proWoCode,state); + } + Set strings = map.keySet(); + + //TODO 民生诉求状态 + //状态为6 待评价 + //状态为 15 已完成 + //状态为 20 办理中 + //TODO 系统投诉工单状态 + //0 已受理 1 已办结 2 已归档 + for (String string : strings) { + EnterpriseComplaint enterpriseComplaintUpdate = new EnterpriseComplaint(); + enterpriseComplaintUpdate.setProWoCode(string); + if(map.get(string) == 6){ + enterpriseComplaintUpdate.setStatus(1); + enterpriseComplaintUpdate.setEvaluateTime(DateUtils.getDate()); + enterpriseComplaintMapper.updateEnterpriseComplaintByCode(enterpriseComplaintUpdate); + } + if(map.get(string) == 15){ + enterpriseComplaintUpdate.setStatus(2); +// enterpriseComplaintUpdate.setEvaluateTime(DateUtils.getDate()); + enterpriseComplaintMapper.updateEnterpriseComplaintByCode(enterpriseComplaintUpdate); + } + } + } + } + +} diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseComplaintMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseComplaintMapper.xml index 919e2ae8..4609c8df 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseComplaintMapper.xml +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseComplaintMapper.xml @@ -18,12 +18,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + select id, rel_id, enforce_type, problem_description, enterprise_address, linkman, linkman_tel, com_or_opi, authorization, create_time, pro_wo_code,enterprise_number, - enterprise_name + enterprise_name,status,evaluate_time from enterprise_complaint @@ -39,6 +41,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ORDER BY create_time DESC + @@ -38,6 +38,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where id = #{id} + + insert into enterprise_evaluate