diff --git a/lib/EmergencyBaseLib/EmergencyCommon/src/main/java/com/zdxt/common/util/IdCardCryptoUtil.java b/lib/EmergencyBaseLib/EmergencyCommon/src/main/java/com/zdxt/common/util/IdCardCryptoUtil.java index 216eeac1..15f2432b 100644 --- a/lib/EmergencyBaseLib/EmergencyCommon/src/main/java/com/zdxt/common/util/IdCardCryptoUtil.java +++ b/lib/EmergencyBaseLib/EmergencyCommon/src/main/java/com/zdxt/common/util/IdCardCryptoUtil.java @@ -30,13 +30,12 @@ public class IdCardCryptoUtil { public static void main(String[] args) { -// String userIdCode = IdCardCryptoUtil.symmetricEncryptIdCard("VRJHzFqJpsSZhwnsKTWNspv_GZMxTWl-bgH6DyE9Ty0", "1608644307579883522"); -// String userNameCode = IdCardCryptoUtil.symmetricEncryptIdCard("eWIzY3BMRVNEQXhvUUlXMA==", "汪鑫"); + String userIdCode = IdCardCryptoUtil.symmetricEncryptIdCard("VRJHzFqJpsSZhwnsKTWNspv_GZMxTWl-bgH6DyE9Ty0", "1608644307579883522"); + String userNameCode = IdCardCryptoUtil.symmetricEncryptIdCard("eWIzY3BMRVNEQXhvUUlXMA==", "汪鑫"); // String secret = IdCardCryptoUtil.symmetricEncryptIdCard("eWIzY3BMRVNEQXhvUUlXMA==", "ae739d8c-86ed-4898-b57d-eed3be42debf"); // String phone = IdCardCryptoUtil.symmetricDecryptIdCard("VRJHzFqJpsSZhwnsKTWNspv_GZMxTWl-bgH6DyE9Ty0", "3qQTst9aURL3pN5EzKtqVJnQv2Q0Ob3r+Gc9DXX/I30="); -// String phone = IdCardCryptoUtil.symmetricDecryptIdCard("VRJHzFqJpsSZhwnsKTWNspv_GZMxTWl-bgH6DyE9Ty0", "DAphKNsYj1EzQEjhGyPMLw=="); - String phone = IdCardCryptoUtil.symmetricDecryptIdCard("VRJHzFqJpsSZhwnsKTWNspv_GZMxTWl-bgH6DyE9Ty0", "vFMPp4yo/PS6+p4N2vKNAg=="); + String phone = IdCardCryptoUtil.symmetricDecryptIdCard("VRJHzFqJpsSZhwnsKTWNspv_GZMxTWl-bgH6DyE9Ty0", "67tS8WoU19KGYv2t5wSudg=="); // System.out.println(userIdCode); System.out.println(phone); diff --git a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseComplaintController.java b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseComplaintController.java index 8d28b084..3b523932 100644 --- a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseComplaintController.java +++ b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseComplaintController.java @@ -78,6 +78,7 @@ public class AppEnterpriseComplaintController extends BaseController { @GetMapping("/queryList") @ResponseBody public TableDataInfo queryList(EnterpriseComplaint enterpriseComplaint) { + startPage(); List list = enterpriseComplaintService.selectEnterpriseComplaintList(enterpriseComplaint); return getDataTable(list); } @@ -106,7 +107,7 @@ public class AppEnterpriseComplaintController extends BaseController { * 修改企业执法-在线投诉 */ @GetMapping("/edit/{id}") - public String edit(@PathVariable("id") String id, ModelMap mmap) { + public String edit(@PathVariable("id") String id, ModelMap mmap) throws Exception { EnterpriseComplaint enterpriseComplaint = enterpriseComplaintService.selectEnterpriseComplaintById(id); mmap.put("enterpriseComplaint", enterpriseComplaint); return prefix + "/edit"; diff --git a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseLawEnforcementController.java b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseLawEnforcementController.java index 154d611f..44d90380 100644 --- a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseLawEnforcementController.java +++ b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseLawEnforcementController.java @@ -196,12 +196,21 @@ public class AppEnterpriseLawEnforcementController extends BaseController if (StringUtils.isNotEmpty(enterpriseLawEnforcement.getId())) { resNum += enterpriseLawEnforcementService.updateEnterpriseLawEnforcement(enterpriseLawEnforcement); enterpriseLawEnforcement.setId(null); + //查询数据变更之前的原始数据 + EnterpriseLawEnforcement enterpriseLawEnforcement1 = + enterpriseLawEnforcementService.selectEnterpriseLawEnforcementById(enterpriseLawEnforcement.getId()); + //短信通知，限制为执法时间变更 + if(!enterpriseLawEnforcement1.getCheckTime().equals(enterpriseLawEnforcement.getCheckItem())){ + // 新增默认下发短信 + this.sendSms(enterpriseLawEnforcement); + } } else { resNum += enterpriseLawEnforcementService.insertEnterpriseLawEnforcement(enterpriseLawEnforcement); enterpriseLawEnforcement.setId(null); + // 新增默认下发短信 + this.sendSms(enterpriseLawEnforcement); } - // 下发短信 - this.sendSms(enterpriseLawEnforcement); + // 处理 联合执法 关联部门的json, 用于前端页面不同的展示效果 UserBean ub = new UserBean(); @@ -252,7 +261,7 @@ public class AppEnterpriseLawEnforcementController extends BaseController String smsStr = "【"+enterpriseLawEnforcement.getEnterpriseName()+"】" + "尊敬的" + enterpriseLawEnforcement.getLinkMan() +", 您有一条于: "+ enterpriseLawEnforcement.getCheckTime()+" 的执法预约信息, 请查收"; - zwSmsClient.sendMessage(enterpriseLawEnforcement.getLinkTel(),smsStr); + ZwSmsClient.sendMessage(enterpriseLawEnforcement.getLinkTel(),smsStr); } catch (Exception e) { System.out.println("短信下发异常"); e.printStackTrace(); @@ -407,7 +416,7 @@ public class AppEnterpriseLawEnforcementController extends BaseController public ZDResponse sendSmsTest(@PathVariable("tel") String tel) { try { String smsStr = "【测试短信】尊敬的 石磊先生 , 您有一条于: 今天 的执法预约信息, 请查收"; - zwSmsClient.sendMessage(tel,smsStr); + ZwSmsClient.sendMessage(tel,smsStr); } catch (Exception e) { System.out.println("短信下发异常"); e.printStackTrace(); diff --git a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/common/CommonController.java b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/common/CommonController.java index e8e7ebda..3322744a 100644 --- a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/common/CommonController.java +++ b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/common/CommonController.java @@ -3,6 +3,9 @@ package com.zdxt.auth.project.common; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import cn.hutool.core.io.FileTypeUtil; +import cn.hutool.core.io.FileUtil; +import com.google.common.collect.Lists; import com.zdxt.auth.common.constant.Constants; import com.zdxt.auth.common.utils.StringUtils; import com.zdxt.auth.common.utils.file.FileUploadUtils; @@ -13,6 +16,7 @@ import com.zdxt.auth.framework.config.ServerConfig; import com.zdxt.auth.framework.web.domain.AjaxResult; import com.zdxt.common.ZDResponse; import com.zdxt.common.config.RuoYiConfig; +import org.apache.commons.collections4.CollectionUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -22,6 +26,10 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.multipart.MultipartFile; +import java.io.InputStream; +import java.util.List; +import java.util.Locale; + /** * 通用请求处理 * @@ -37,6 +45,15 @@ public class CommonController @Autowired private UserApi userApi; + /** + * 默认允许的文件类型 + * + * @see cn.hutool.core.io.FileTypeUtil + */ + private List defaultAllowTypes = Lists.newArrayList( + "xlsx", "xls", "docx", "doc", "pdf", "txt", + "jpg", "jpeg", "png", "bmp", "mp4", + "zip"); /** * 通用下载请求 @@ -81,6 +98,27 @@ public class CommonController { try { + String fileNameTmp = file.getOriginalFilename(); + InputStream in = file.getInputStream(); + String type = FileTypeUtil.getType(in); + if (StringUtils.isBlank(type)) { + // 无法通过文件头或者扩展名识别文件类型。 + return AjaxResult.error("上传失败格式不符合要求"); + } + + String extType = FileUtil.extName(fileNameTmp); + if (StringUtils.isBlank(extType)) { + // 后缀读不到类型，直接拒绝 + return AjaxResult.error("无法读取文件类型"); + } + + // 文件头类型和后缀类型都要满足白名单 + if (!CollectionUtils.containsAll(defaultAllowTypes, + Lists.newArrayList(type.toLowerCase(Locale.ROOT), extType.toLowerCase(Locale.ROOT)))) { + + return AjaxResult.error("文件上传失败"); + } + // 上传文件路径 String filePath = RuoYiConfig.getUploadPath(); // 上传并返回新文件名称 diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/system/user/profile/profile.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/system/user/profile/profile.html index 585bfd2f..5b7b1c4b 100644 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/system/user/profile/profile.html +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/system/user/profile/profile.html @@ -102,7 +102,7 @@
  - +
diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnterpriseComplaintController.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnterpriseComplaintController.java index cf4aab0e..5460c9a1 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnterpriseComplaintController.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnterpriseComplaintController.java @@ -74,8 +74,7 @@ public class EnterpriseComplaintController extends BaseController * 修改企业执法-在线投诉 */ @GetMapping("/edit/{id}") - public String edit(@PathVariable("id") String id, ModelMap mmap) - { + public String edit(@PathVariable("id") String id, ModelMap mmap) throws Exception { EnterpriseComplaint enterpriseComplaint = enterpriseComplaintService.selectEnterpriseComplaintById(id); mmap.put("enterpriseComplaint", enterpriseComplaint); return prefix + "/edit"; @@ -111,8 +110,7 @@ public class EnterpriseComplaintController extends BaseController */ @GetMapping( "/queryById") @ResponseBody - public ZDResponse queryById(String id) - { + public ZDResponse queryById(String id) throws Exception { EnterpriseComplaint enterpriseComplaint = enterpriseComplaintService.selectEnterpriseComplaintById(id); return ZDResponse.success("投诉详情查询",enterpriseComplaint); } 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 6470f21f..fe796b41 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 @@ -97,6 +97,30 @@ public class EnterpriseComplaint extends BaseDomain public String enterpriseName; private List fileListObj; + /** + * 局级部门ID + */ + private String bureauDeptId; + /** + * 局级部门名称 + */ + private String bureauDeptName; + + /** + * 处理时间 + */ + private String disposeTime; + + /** + * 处理状态 + */ + private String disposeStatus; + + /** + * 民生诉求数据处置流程 + */ + private List mssqOrderFlows; + public String getEnterpriseAddress() { return enterpriseAddress; } @@ -232,6 +256,46 @@ public class EnterpriseComplaint extends BaseDomain this.evaluateTime = evaluateTime; } + public String getBureauDeptId() { + return bureauDeptId; + } + + public void setBureauDeptId(String bureauDeptId) { + this.bureauDeptId = bureauDeptId; + } + + public String getBureauDeptName() { + return bureauDeptName; + } + + public void setBureauDeptName(String bureauDeptName) { + this.bureauDeptName = bureauDeptName; + } + + public String getDisposeTime() { + return disposeTime; + } + + public void setDisposeTime(String disposeTime) { + this.disposeTime = disposeTime; + } + + public String getDisposeStatus() { + return disposeStatus; + } + + public void setDisposeStatus(String disposeStatus) { + this.disposeStatus = disposeStatus; + } + + public List getMssqOrderFlows() { + return mssqOrderFlows; + } + + public void setMssqOrderFlows(List mssqOrderFlows) { + this.mssqOrderFlows = mssqOrderFlows; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseEvaluate.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseEvaluate.java index 2f58961c..5856847e 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseEvaluate.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseEvaluate.java @@ -42,6 +42,27 @@ public class EnterpriseEvaluate extends BaseDomain /** 企业纳税识别号 */ private String enterpriseNumber; + /** + * 检查效率 + */ + private Integer inspectionEfficiency; + + /** + * 检查效果 + */ + private Integer checkEffect; + + /** + * 服务体验 + */ + private Integer serviceExperience; + + /** + * 检查质量 + */ + private Integer checkQuality; + + public void setId(String id) { this.id = id; @@ -122,6 +143,42 @@ public class EnterpriseEvaluate extends BaseDomain this.enterpriseNumber = enterpriseNumber; } + public static long getSerialVersionUID() { + return serialVersionUID; + } + + public Integer getInspectionEfficiency() { + return inspectionEfficiency; + } + + public void setInspectionEfficiency(Integer inspectionEfficiency) { + this.inspectionEfficiency = inspectionEfficiency; + } + + public Integer getCheckEffect() { + return checkEffect; + } + + public void setCheckEffect(Integer checkEffect) { + this.checkEffect = checkEffect; + } + + public Integer getServiceExperience() { + return serviceExperience; + } + + public void setServiceExperience(Integer serviceExperience) { + this.serviceExperience = serviceExperience; + } + + public Integer getCheckQuality() { + return checkQuality; + } + + public void setCheckQuality(Integer checkQuality) { + this.checkQuality = checkQuality; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseInformation.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseInformation.java index 58da7eeb..c91a23c1 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseInformation.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseInformation.java @@ -43,8 +43,12 @@ public class EnterpriseInformation extends BaseDomain /** 成立日期 */ private String establishmentTime; - /** 营业期限 */ + /** 营业期限-开始时间 */ private String operatingTerm; + /** + * 营业期限-结束时间 + */ + private String operatingTermEnd; /** 经营范围 */ private String businessScope; @@ -275,6 +279,14 @@ public class EnterpriseInformation extends BaseDomain this.industry = industry; } + public String getOperatingTermEnd() { + return operatingTermEnd; + } + + public void setOperatingTermEnd(String operatingTermEnd) { + this.operatingTermEnd = operatingTermEnd; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseLawEnforcement.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseLawEnforcement.java index faf13fe7..64e062b8 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseLawEnforcement.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseLawEnforcement.java @@ -108,6 +108,10 @@ public class EnterpriseLawEnforcement extends BaseDomain * 日期快捷查询 1 本月 2 本季度 3 本年 */ private Integer dateType; + /** + * 检查时间排序，1上午 2下午 + */ + private Integer checkTimeOrder; /** 临时用 */ private String lawCertificateNum; @@ -497,6 +501,14 @@ public class EnterpriseLawEnforcement extends BaseDomain this.bureauDeptName = bureauDeptName; } + public Integer getCheckTimeOrder() { + return checkTimeOrder; + } + + public void setCheckTimeOrder(Integer checkTimeOrder) { + this.checkTimeOrder = checkTimeOrder; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/MssqAddOrder.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/MssqAddOrder.java index a5d6ea31..238ad87d 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/MssqAddOrder.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/MssqAddOrder.java @@ -151,6 +151,11 @@ public class MssqAddOrder extends MssqBaseDomain { private List uploadPaths; private String uploadPath; + /** + * 获取工单流程信息-工单编码参数 + */ + private String orderCode; + public String getUploadPath() { return uploadPath; } @@ -479,6 +484,14 @@ public class MssqAddOrder extends MssqBaseDomain { public void setFileDatas(List fileDatas) { this.fileDatas = fileDatas; } + + public String getOrderCode() { + return orderCode; + } + + public void setOrderCode(String orderCode) { + this.orderCode = orderCode; + } } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/MssqOrderFlow.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/MssqOrderFlow.java new file mode 100644 index 00000000..0e4953f9 --- /dev/null +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/MssqOrderFlow.java @@ -0,0 +1,123 @@ +package com.zdxt.code.domain; + +import com.zdxt.common.BaseDomain; + +public class MssqOrderFlow extends BaseDomain { + + /** + * 审批部门 + */ + private String appOrgName; + + /** + * 审批人名称 + */ + private String approveUserName; + + /** + * 审批时间 + */ + private String approveTime; + + /** + * 审批意见 + */ + private String approveContent; + /** + * 操作类型名 + */ + private String operName; + + /** + * 状态 + */ + private Integer state; + + /** + * 文件 + */ + private AppFiles appFiles; + + public String getAppOrgName() { + return appOrgName; + } + + public void setAppOrgName(String appOrgName) { + this.appOrgName = appOrgName; + } + + public String getApproveUserName() { + return approveUserName; + } + + public void setApproveUserName(String approveUserName) { + this.approveUserName = approveUserName; + } + + public String getApproveTime() { + return approveTime; + } + + public void setApproveTime(String approveTime) { + this.approveTime = approveTime; + } + + public String getApproveContent() { + return approveContent; + } + + public void setApproveContent(String approveContent) { + this.approveContent = approveContent; + } + + public String getOperName() { + return operName; + } + + public void setOperName(String operName) { + this.operName = operName; + } + + public Integer getState() { + return state; + } + + public void setState(Integer state) { + this.state = state; + } + + public AppFiles getAppFiles() { + return appFiles; + } + + public void setAppFiles(AppFiles appFiles) { + this.appFiles = appFiles; + } + class AppFiles { + /** + * 文件名称 + */ + private String fileName; + /** + * 文件地址 + */ + private String fileUrl; + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + + public String getFileUrl() { + return fileUrl; + } + + public void setFileUrl(String fileUrl) { + this.fileUrl = fileUrl; + } + } +} + diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/MssqApiService.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/MssqApiService.java index 8c854e5d..55984d11 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/MssqApiService.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/MssqApiService.java @@ -24,9 +24,47 @@ public interface MssqApiService { MssqBaseDomain getMssqToken() throws Exception; MssqBaseDomain getMssqHcpToken() throws Exception; + /** + * 诉求工单评价页面 + * @param mssqAddOrder + * @return + * @throws Exception + */ String mssqAppraise(MssqAddOrder mssqAddOrder) throws Exception; - String mssqQueryEndInfo(MssqAddOrder mssqAddOrder) throws Exception; + + /** + * 查询办结信息 + * @param mssqAddOrder + * @return + * @throws Exception + */ + String mssqQueryEndInfo(MssqAddOrder mssqAddOrder); + + /** + * 查询工单满意度 + * @param mssqAddOrder + * @return + * @throws Exception + */ String mssqQuerySatisfy(MssqAddOrder mssqAddOrder) throws Exception; + + /** + * 文件下载 + * @param mssqAddOrder + * @return + * @throws Exception + */ String mssqDownFile(MssqAddOrder mssqAddOrder) throws Exception; - String queryMssq(MssqAddOrder mssqAddOrder, String url) throws Exception; + + String queryMssq(MssqAddOrder mssqAddOrder, String url); + + /** + * 查询民生诉求公共类接口 + * @param mssqAddOrder + * @param url + * @return + * @throws Exception + */ +// String queryMssqOrderInfo(MssqAddOrder mssqAddOrder, String url) throws Exception; + } 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 71dfd5e6..2ca941c3 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 @@ -1,20 +1,16 @@ package com.zdxt.code.service.impl; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.LinkedHashMap; -import java.util.List; +import java.util.*; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.convert.Convert; import cn.hutool.core.util.IdUtil; +import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.zdxt.auth.dto.UserBean; import com.zdxt.auth.feign.UserApi; import com.zdxt.auth.feign.ZdxtFileCommonApi; -import com.zdxt.code.domain.EnforcementRegistration; -import com.zdxt.code.domain.FileData; -import com.zdxt.code.domain.MssqAddOrder; +import com.zdxt.code.domain.*; import com.zdxt.code.mapper.EnforcementRegistrationMapper; import com.zdxt.code.service.MssqApiService; import com.zdxt.common.util.DateUtils; @@ -23,7 +19,6 @@ import com.zdxt.common.zdxtFile.ZdxtFileCommon; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.zdxt.code.mapper.EnterpriseComplaintMapper; -import com.zdxt.code.domain.EnterpriseComplaint; import com.zdxt.code.service.IEnterpriseComplaintService; /** @@ -57,9 +52,40 @@ public class EnterpriseComplaintServiceImpl implements IEnterpriseComplaintServi * @return 企业执法-在线投诉 */ @Override - public EnterpriseComplaint selectEnterpriseComplaintById(String id) - { - return enterpriseComplaintMapper.selectEnterpriseComplaintById(id); + public EnterpriseComplaint selectEnterpriseComplaintById(String id){ + EnterpriseComplaint enterpriseComplaint = enterpriseComplaintMapper.selectEnterpriseComplaintById(id); + if(StringUtils.isNotEmpty(enterpriseComplaint.getRelId())){ + EnforcementRegistration enforcementRegistration = + enforcementRegistrationMapper.selectEnforcementRegistrationById(enterpriseComplaint.getRelId()); + //判断检查事件是否为空 + if(BeanUtil.isNotEmpty(enforcementRegistration) && StringUtils.isNotEmpty(enforcementRegistration.getBureauDeptName())){ + enterpriseComplaint.setBureauDeptName(enforcementRegistration.getBureauDeptName()); + enterpriseComplaint.setBureauDeptId(enforcementRegistration.getBureauDeptId()); + } + //查询民生诉求接口 获取处置进度,判断是否存在诉求工单编码 + if(StringUtils.isNotEmpty(enterpriseComplaint.getProWoCode())){ + + //查询工单处置流程信息 + MssqAddOrder mssqAddOrder = new MssqAddOrder(); + mssqAddOrder.setProWoCode(enterpriseComplaint.getProWoCode()); + String s = null; + try { + //查询进度详细信息 + s = mssqApiService.queryMssq(mssqAddOrder, "/api/API_YX/proProcess/queryAppInfo"); + JSONObject jsonObject = JSONObject.parseObject(s); + //获取进度数据 + List approveDatas1 = + JSONArray.parseArray(jsonObject.getString("approveDatas"), MssqOrderFlow.class); + //列表排序反转 + Collections.reverse(approveDatas1); + enterpriseComplaint.setMssqOrderFlows(approveDatas1); + } catch (Exception e) { + e.printStackTrace(); + } +// System.out.println(s); + } + } + return enterpriseComplaint; } /** diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/MssqApiServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/MssqApiServiceImpl.java index 991e11bf..fda5c211 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/MssqApiServiceImpl.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/MssqApiServiceImpl.java @@ -142,7 +142,7 @@ public class MssqApiServiceImpl implements MssqApiService { } @Override - public String mssqQueryEndInfo(MssqAddOrder mssqAddOrder) throws Exception { + public String mssqQueryEndInfo(MssqAddOrder mssqAddOrder) { mssqAddOrder.setAppid(appId); return this.queryMssq(mssqAddOrder, "/api/API_YX/proProcess/queryEndInfo"); } @@ -160,8 +160,13 @@ public class MssqApiServiceImpl implements MssqApiService { } @Override - public String queryMssq(MssqAddOrder mssqAddOrder, String url) throws Exception { - MssqBaseDomain mssqToken = this.getMssqToken(); + public String queryMssq(MssqAddOrder mssqAddOrder, String url) { + MssqBaseDomain mssqToken = null; + try { + mssqToken = this.getMssqToken(); + } catch (Exception e) { + e.printStackTrace(); + } mssqAddOrder.setAccessToken(mssqToken.getAccessToken()); //appId mssqAddOrder.setAppid(appId); @@ -174,8 +179,14 @@ public class MssqApiServiceImpl implements MssqApiService { String s = JSONObject.toJSONString(mssqAddOrder); log.info("民生诉求token：{}",JSONObject.toJSONString(mssqToken)); log.info("民生诉求查询工单状态，上传参数：{}",s); - JSONObject serviceJsonData = ServiceInvocation.httpRequestForInterface(mssqUrl + url, - mssqAddOrder.getInvokingServiceRequestMethod(), s, appId, mssqToken.getGatewayRtime(), mssqToken.getGatewaySig()); + JSONObject serviceJsonData = null; + try { + serviceJsonData = ServiceInvocation.httpRequestForInterface(mssqUrl + url, + mssqAddOrder.getInvokingServiceRequestMethod(), s, appId, mssqToken.getGatewayRtime(), mssqToken.getGatewaySig()); + } catch (Exception e) { + e.printStackTrace(); + } + log.info("民生诉求查询结果：{}",serviceJsonData.toJSONString()); String jsonRes = serviceJsonData.getString("result"); return jsonRes; } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/ThirdLoginServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/ThirdLoginServiceImpl.java index 294a934d..7f4c57a3 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/ThirdLoginServiceImpl.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/ThirdLoginServiceImpl.java @@ -193,8 +193,10 @@ public class ThirdLoginServiceImpl implements ThirdLoginService { } catch (Exception e) { termEnd = "永久"; } - //营业时间 - enterpriseInformation.setOperatingTerm(termStart+ "-" +termEnd); + //营业期限-开始时间 + enterpriseInformation.setOperatingTerm(termStart); + //营业期限-结束时间 为空表示 无固定期限 + enterpriseInformation.setOperatingTermEnd(termEnd); return enterpriseInformationService.insertEnterpriseInformation(enterpriseInformation) > 0 ? Boolean.TRUE : Boolean.FALSE; } 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 index 92285bd9..cf84a229 100644 --- 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 @@ -32,7 +32,8 @@ public class MssqTask { public void getMssqStatus() throws Exception { EnterpriseComplaint enterpriseComplaint = new EnterpriseComplaint(); - enterpriseComplaint.setStatus(15); + //判断状态不为2的工单都为未完成工单 + enterpriseComplaint.setStatus(2); List enterpriseComplaints = enterpriseComplaintMapper.selectByStatus(enterpriseComplaint); if(enterpriseComplaints.size() == 0 ){ return; @@ -69,7 +70,8 @@ public class MssqTask { //状态为 15 已完成 //状态为 20 办理中 //TODO 系统投诉工单状态 - //0 已受理 1 已办结 2 已归档 + //0 已受理 1 已办结 2 已归档 弃用 + //0 处理中 1 已处理 2 已办结 for (String string : strings) { EnterpriseComplaint enterpriseComplaintUpdate = new EnterpriseComplaint(); enterpriseComplaintUpdate.setProWoCode(string); diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseEvaluateMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseEvaluateMapper.xml index 392a598f..a5a3b918 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseEvaluateMapper.xml +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseEvaluateMapper.xml @@ -15,11 +15,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + select id, enforcement_name, enforcement_id, evaluate_description, linkman, linkman_tel, - authorization, create_time from enterprise_evaluate + authorization, create_time,inspection_efficiency ,check_effect,check_quality ,service_experience from enterprise_evaluate @@ -88,7 +89,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" legal_person, registered_capital, establishment_time, - operating_term, + operating_term, + operating_term_end, business_scope, create_time, create_by, @@ -110,6 +112,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{registeredCapital}, #{establishmentTime}, #{operatingTerm}, + #{operatingTermEnd}, #{businessScope}, #{createTime}, #{createBy}, @@ -134,6 +137,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" registered_capital = #{registeredCapital}, establishment_time = #{establishmentTime}, operating_term = #{operatingTerm}, + operating_term_end = #{operatingTermEnd}, business_scope = #{businessScope}, create_time = #{createTime}, create_by = #{createBy}, diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseLawEnforcementMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseLawEnforcementMapper.xml index 01dd5866..aeb458ae 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseLawEnforcementMapper.xml +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseLawEnforcementMapper.xml @@ -35,6 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -42,7 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" create_time, create_by, law_enforcer, law_enforcer_id, law_enforcer_two, law_enforcer_two_id, remark, user_id, dept_id, is_delete, status, law_enforcement_code, link_man, link_tel, check_item, check_item_text, check_require, check_require_text, enterprise_number,is_submit, unite_check, is_unite, - is_reg, main_deputy_order, tmp_dept_json,bureau_dept_id,bureau_dept_name + is_reg, main_deputy_order, tmp_dept_json,bureau_dept_id,bureau_dept_name,check_time_order from enterprise_law_enforcement @@ -222,6 +223,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" tmp_dept_json, bureau_dept_name, bureau_dept_id, + check_time_order, #{id}, @@ -257,6 +259,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{tmpDeptJson}, #{bureauDeptName}, #{bureauDeptId}, + #{checkTimeOrder},