意见评价

lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnforcementRegistrationController.java

@@ -3,10 +3,7 @@ package com.zdxt.app.controller;
 import cn.hutool.core.util.IdUtil;
 import com.zdxt.auth.dto.DeptBean;
 import com.zdxt.code.domain.*;
-import com.zdxt.code.service.IEnforcementRegistrationService;
+import com.zdxt.code.service.*;
-import com.zdxt.code.service.IEnterpriseLawEnforcementService;
-import com.zdxt.code.service.ILinkageDictService;
-import com.zdxt.code.service.IZqyjjdm137344Service;
 import com.zdxt.common.ZDResponse;
 import com.zdxt.common.controller.BaseController;
 import com.zdxt.common.util.StringUtils;
@@ -37,6 +34,7 @@ public class AppEnforcementRegistrationController extends BaseController
     @Autowired
     private IEnforcementRegistrationService enforcementRegistrationService;
     @Autowired private ILinkageDictService iLinkageDictService;
+    @Autowired private IEnterpriseComplaintService enterpriseComplaintService;
     @Autowired private IZqyjjdm137344Service iZqyjjdm137344Service;
 
     @RequiresPermissions("code:registration:view")
@@ -68,6 +66,17 @@ public class AppEnforcementRegistrationController extends BaseController
     public ZDResponse queryList(EnforcementRegistration enforcementRegistration)
     {
         List<EnforcementRegistration> list = enforcementRegistrationService.selectEnforcementRegistrationList(enforcementRegistration);
+        for (EnforcementRegistration ee : list) {
+            EnterpriseComplaint params = new EnterpriseComplaint();
+            params.setRelId(ee.getId());
+            params.setComOrOpi(1);
+            List<EnterpriseComplaint> enterpriseComplaints = enterpriseComplaintService.selectEnterpriseComplaintList(params);
+            if (null!=enterpriseComplaints && enterpriseComplaints.size()>0) {
+                ee.setComOrOpi(1);
+            } else {
+                ee.setComOrOpi(0);
+            }
+        }
         return ZDResponse.success("查询成功",list);
     }
 

lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseComplaintController.java

@@ -21,8 +21,7 @@ import java.util.List;
  */
 @Controller
 @RequestMapping("/app/code/complaint")
-public class AppEnterpriseComplaintController extends BaseController
+public class AppEnterpriseComplaintController extends BaseController {
-{
     private String prefix = "code/complaint";
 
     @Autowired
@@ -30,8 +29,7 @@ public class AppEnterpriseComplaintController extends BaseController
 
     @RequiresPermissions("code:complaint:view")
     @GetMapping()
-    public String complaint()
+    public String complaint() {
-    {
         return prefix + "/complaint";
     }
 
@@ -41,8 +39,7 @@ public class AppEnterpriseComplaintController extends BaseController
     @RequiresPermissions("code:complaint:list")
     @PostMapping("/list")
     @ResponseBody
-    public TableDataInfo list(EnterpriseComplaint enterpriseComplaint)
+    public TableDataInfo list(EnterpriseComplaint enterpriseComplaint) {
-    {
         startPage();
         List<EnterpriseComplaint> list = enterpriseComplaintService.selectEnterpriseComplaintList(enterpriseComplaint);
         return getDataTable(list);
@@ -52,8 +49,7 @@ public class AppEnterpriseComplaintController extends BaseController
      * 新增企业执法-在线投诉
      */
     @GetMapping("/add")
-    public String add()
+    public String add() {
-    {
         return prefix + "/add";
     }
 
@@ -63,8 +59,7 @@ public class AppEnterpriseComplaintController extends BaseController
 //    @RequiresPermissions("code:complaint:add")
     @PostMapping("/add")
     @ResponseBody
-    public ZDResponse addSave(@RequestBody EnterpriseComplaint enterpriseComplaint)
+    public ZDResponse addSave(@RequestBody EnterpriseComplaint enterpriseComplaint) {
-    {
         return enterpriseComplaintService.insertEnterpriseComplaint(enterpriseComplaint) > 0 ?
                 ZDResponse.success("保存成功") : ZDResponse.error("保存失败");
     }
@@ -73,8 +68,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) {
-    {
         EnterpriseComplaint enterpriseComplaint = enterpriseComplaintService.selectEnterpriseComplaintById(id);
         mmap.put("enterpriseComplaint", enterpriseComplaint);
         return prefix + "/edit";
@@ -86,8 +80,7 @@ public class AppEnterpriseComplaintController extends BaseController
     @RequiresPermissions("code:complaint:edit")
     @PostMapping("/edit")
     @ResponseBody
-    public ZDResponse editSave(EnterpriseComplaint enterpriseComplaint)
+    public ZDResponse editSave(EnterpriseComplaint enterpriseComplaint) {
-    {
         return enterpriseComplaintService.updateEnterpriseComplaint(enterpriseComplaint) > 0 ?
                 ZDResponse.success("修改成功") : ZDResponse.error("修改失败");
     }
@@ -98,9 +91,22 @@ public class AppEnterpriseComplaintController extends BaseController
     @RequiresPermissions("code:complaint:remove")
     @PostMapping("/remove")
     @ResponseBody
-    public ZDResponse remove(String ids)
+    public ZDResponse remove(String ids) {
-    {
         return enterpriseComplaintService.deleteEnterpriseComplaintByIds(ids) > 0
                 ? ZDResponse.success("删除成功") : ZDResponse.error("删除失败");
     }
+
+    @GetMapping("/getById/{id}")
+    @ResponseBody
+    public ZDResponse getById(@PathVariable("id") String id) {
+//        return ZDResponse.success("查询成功", enterpriseComplaintService.selectEnterpriseComplaintById(id));
+        EnterpriseComplaint params = new EnterpriseComplaint();
+        params.setRelId(id);
+        params.setComOrOpi(1);
+        List<EnterpriseComplaint> enterpriseComplaints = enterpriseComplaintService.selectEnterpriseComplaintList(params);
+        if (null != enterpriseComplaints && enterpriseComplaints.size() > 0) {
+            return ZDResponse.success("查询成功", enterpriseComplaints.get(0));
+        }
+        return ZDResponse.success("查询成功", null);
+    }
 }

lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseLawEnforcementController.java

@@ -5,8 +5,10 @@ import cn.hutool.core.util.IdUtil;
 import com.zdxt.auth.dto.DeptBean;
 import com.zdxt.auth.dto.UserBean;
 import com.zdxt.auth.feign.UserApi;
+import com.zdxt.code.domain.EnterpriseComplaint;
 import com.zdxt.code.domain.EnterpriseLawEnforcement;
 import com.zdxt.code.domain.LinkageDict;
+import com.zdxt.code.service.IEnterpriseComplaintService;
 import com.zdxt.code.service.IEnterpriseLawEnforcementService;
 import com.zdxt.code.service.ILinkageDictService;
 import com.zdxt.common.ZDResponse;
@@ -36,6 +38,7 @@ public class AppEnterpriseLawEnforcementController extends BaseController
     @Autowired
     private IEnterpriseLawEnforcementService enterpriseLawEnforcementService;
     @Autowired private ILinkageDictService iLinkageDictService;
+    @Autowired private IEnterpriseComplaintService enterpriseComplaintService;
 
     @RequiresPermissions("code:enforcement:view")
     @GetMapping()
@@ -66,6 +69,16 @@ public class AppEnterpriseLawEnforcementController extends BaseController
     public ZDResponse queryList(EnterpriseLawEnforcement enterpriseLawEnforcement)
     {
         List<EnterpriseLawEnforcement> list = enterpriseLawEnforcementService.selectEnterpriseLawEnforcementList(enterpriseLawEnforcement);
+//        for (EnterpriseLawEnforcement ee : list) {
+//            EnterpriseComplaint params = new EnterpriseComplaint();
+//            params.setRelId(ee.getId());
+//            List<EnterpriseComplaint> enterpriseComplaints = enterpriseComplaintService.selectEnterpriseComplaintList(params);
+//            if (null!=enterpriseComplaints && enterpriseComplaints.size()>0) {
+//                ee.setComOrOpi(1);
+//            } else {
+//                ee.setComOrOpi(0);
+//            }
+//        }
         return ZDResponse.success("查询成功",list);
     }
 

lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/framework/config/CorsFilter.java

@@ -60,7 +60,7 @@ public class CorsFilter implements Filter {
 
     public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
         //配置可信域名
-        String[]  authhosts = {"http://10.132.108.3:85","http://jdm.szssfj.cn","http://localhost:85","http://192.168.31.146:3301","http://192.168.31.146:85"};
+        String[]  authhosts = {"http://10.132.108.3:85","http://jdm.szssfj.cn","http://localhost:85","http://192.168.31.196:3301","http://192.168.31.196:85","http://127.0.0.1:85"};
         String authost = "";
         HttpServletRequest httprequest = (HttpServletRequest) request;
         String origin = httprequest.getHeader("Origin");

lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/dept/service/DeptServiceImpl.java

@@ -447,8 +447,11 @@ public class DeptServiceImpl implements IDeptService
             try {
                 // 返回每条拉取的成功情况
                 String taskId = jsonObject.getString("taskId");
-                String params = "{\"token\":\"" + token + "\",[{\"taskId\":\"" + taskId + "\",\"result\":\"SUCCESS\"}]}";
+                String params = "{\"token\":\"" + token + "\",\"data\":[{\"taskId\":\"" + taskId + "\",\"result\":\"SUCCESS\"}]}";
-                connect("/ebus/sfrzhqxglmk/sysDoneTorg", params);
+                String doneStr = connect("/ebus/sfrzhqxglmk/sysDoneTorg", params);
+                JSONObject doneObj = JSONObject.parseObject(doneStr);
+                String done = doneObj.getString("success");
+                log.info("部门拉取完成结果 ========> ：{}", done);
             } catch (Exception e) {
                 log.info("部门数据下拉完成异常，异常任务id：{}",jsonObject.getString("taskId"));
                 e.printStackTrace();

lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/user/service/UserServiceImpl.java

@@ -634,8 +634,11 @@ public class UserServiceImpl implements IUserService {
                 try {
                     // 返回每条拉取的成功情况
                     String taskId = jsonObject.getString("taskId");
-                    String params = "{\"token\":\"" + token + "\",[{\"taskId\":\"" + taskId + "\",\"result\":\"SUCCESS\"}]}";
+                    String params = "{\"token\":\"" + token + "\",\"data\":[{\"taskId\":\"" + taskId + "\",\"result\":\"SUCCESS\"}]}";
-                    connect("/ebus/sfrzhqxglmk/sysDoneTacc", params);
+                    String doneStr = connect("/ebus/sfrzhqxglmk/sysDoneTacc", params);
+                    JSONObject doneObj = JSONObject.parseObject(doneStr);
+                    String done = doneObj.getString("success");
+                    log.info("用户拉取完成结果 ========> ：{}", done);
                 } catch (Exception e) {
                     log.info("用户数据下拉完成异常，异常任务id：{}", jsonObject.getString("taskId"));
                     e.printStackTrace();

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnforcementRegistration.java

@@ -139,9 +139,18 @@ public class EnforcementRegistration extends BaseDomain
     private String lawCertificateNumTwoText;
     private String subsidiaryerText;
     private String lawId;
+    private int comOrOpi;
     private String uniteCheck;
     private List fileListObj;
 
+    public int getComOrOpi() {
+        return comOrOpi;
+    }
+
+    public void setComOrOpi(int comOrOpi) {
+        this.comOrOpi = comOrOpi;
+    }
+
     public String getLawId() {
         return lawId;
     }

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseComplaint.java

@@ -29,6 +29,9 @@ public class EnterpriseComplaint extends BaseDomain
     /** 问题描述 */
     private String problemDescription;
 
+    /** 涉事地址 */
+    private String enterpriseAddress;
+
     /** 联系人 */
     private String linkman;
 
@@ -38,6 +41,17 @@ public class EnterpriseComplaint extends BaseDomain
     /** 是否授权 */
     private int authorization;
 
+    /** 投诉/意见 0:投诉; 1:意见 */
+    private int comOrOpi;
+
+    public int getComOrOpi() {
+        return comOrOpi;
+    }
+
+    public void setComOrOpi(int comOrOpi) {
+        this.comOrOpi = comOrOpi;
+    }
+
     /**
      * 文件几个
      */
@@ -49,6 +63,14 @@ public class EnterpriseComplaint extends BaseDomain
     public String enterpriseName;
     private List fileListObj;
 
+    public String getEnterpriseAddress() {
+        return enterpriseAddress;
+    }
+
+    public void setEnterpriseAddress(String enterpriseAddress) {
+        this.enterpriseAddress = enterpriseAddress;
+    }
+
     public int getAuthorization() {
         return authorization;
     }

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseLawEnforcement.java

@@ -107,6 +107,15 @@ public class EnterpriseLawEnforcement extends BaseDomain
     private List<DeptBean> deptObjs;
     private String uniteCheck;
     private String dataScopeId;
+    private int comOrOpi;
+
+    public int getComOrOpi() {
+        return comOrOpi;
+    }
+
+    public void setComOrOpi(int comOrOpi) {
+        this.comOrOpi = comOrOpi;
+    }
 
     public String getDataScopeId() {
         return dataScopeId;

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/FileData.java

@@ -0,0 +1,34 @@
+package com.zdxt.code.domain;
+
+/**
+ * @Author: kylin
+ * @Date: 2024/7/3 5:46 下午
+ * @Version: 1.0
+ * @Desc: TODO
+ */
+public class FileData {
+    /**
+     * 附件名称
+     */
+    private String fileName;
+    /**
+     * 附件数据流，需要转成Base64编码格式
+     */
+    private String fileBytes;
+
+    public String getFileName() {
+        return fileName;
+    }
+
+    public void setFileName(String fileName) {
+        this.fileName = fileName;
+    }
+
+    public String getFileBytes() {
+        return fileBytes;
+    }
+
+    public void setFileBytes(String fileBytes) {
+        this.fileBytes = fileBytes;
+    }
+}

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/MssqAddOrder.java

@@ -166,33 +166,6 @@ public class MssqAddOrder extends MssqBaseDomain {
         this.endTime = endTime;
     }
 
-    private class FileData{
-        /**
-         * 附件名称
-         */
-        private String fileName;
-        /**
-         * 附件数据流，需要转成Base64编码格式
-         */
-        private String fileBytes;
-
-        public String getFileName() {
-            return fileName;
-        }
-
-        public void setFileName(String fileName) {
-            this.fileName = fileName;
-        }
-
-        public String getFileBytes() {
-            return fileBytes;
-        }
-
-        public void setFileBytes(String fileBytes) {
-            this.fileBytes = fileBytes;
-        }
-    }
-
 
     public String getRequestTopic() {
         return requestTopic;

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseComplaintServiceImpl.java

@@ -1,5 +1,8 @@
 package com.zdxt.code.service.impl;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
 
 import cn.hutool.core.convert.Convert;
@@ -8,7 +11,10 @@ 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.mapper.EnforcementRegistrationMapper;
+import com.zdxt.code.service.MssqApiService;
 import com.zdxt.common.util.DateUtils;
 import com.zdxt.common.zdxtFile.ZdxtFileCommon;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -38,6 +44,9 @@ public class EnterpriseComplaintServiceImpl implements IEnterpriseComplaintServi
     @Autowired
     private EnforcementRegistrationMapper enforcementRegistrationMapper;
 
+    @Autowired
+    private MssqApiService mssqApiService;
+
     /**
      * 查询企业执法-在线投诉
      * 
@@ -80,6 +89,37 @@ public class EnterpriseComplaintServiceImpl implements IEnterpriseComplaintServi
         enterpriseComplaint.setCreateTime(DateUtils.getNowDate());
         enterpriseComplaint.setId(IdUtil.simpleUUID());
         int i = enterpriseComplaintMapper.insertEnterpriseComplaint(enterpriseComplaint);
+        if (i > 0) {
+            try {
+                // 新增民生诉求工单
+                MssqAddOrder mssqAddOrder = new MssqAddOrder();
+                mssqAddOrder.setRequestContent(enterpriseComplaint.getProblemDescription());
+                mssqAddOrder.setContactName(enterpriseComplaint.getLinkman());
+                mssqAddOrder.setContactTel(enterpriseComplaint.getLinkmanTel());
+                mssqAddOrder.setRequestArea(enterpriseComplaint.getEnterpriseAddress());
+                mssqAddOrder.setRequestFrom(46);
+                mssqAddOrder.setIsSecrecy(enterpriseComplaint.getAuthorization());
+                if (enterpriseComplaint.getFileListObj().size() > 0) {
+                    List<FileData> files = new ArrayList<>();
+                    for (int z=0; z<enterpriseComplaint.getFileListObj().size(); z++) {
+                        HashMap rest = (HashMap) enterpriseComplaint.getFileListObj().get(z);
+                        String fl = enterpriseComplaint.getFileList().get(z);
+                        String fileName = fl.substring(fl.lastIndexOf("/")+1, fl.length());
+                        String base64 = rest.get("content").toString();
+                        base64 = base64.replace("data:image/jpeg;base64,","");
+                        FileData fd = new FileData();
+                        fd.setFileName(fileName);
+                        fd.setFileBytes(base64);
+                        files.add(fd);
+                    }
+                    mssqAddOrder.setFileDatas(files);
+                }
+                String jsonStr = mssqApiService.addMssqOrder(mssqAddOrder);
+                System.out.println("===== 民生诉求新增工单 ====>: "+ jsonStr);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
         if(i > 0 && enterpriseComplaint.getFileList().size() > 0){
             enterpriseComplaint.getFileList().forEach(res ->{
                 ZdxtFileCommon zdxtFileCommon = new ZdxtFileCommon();

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseComplaintMapper.xml

@@ -9,14 +9,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="relId"    column="rel_id"    />
         <result property="enforceType"    column="enforce_type"    />
         <result property="problemDescription"    column="problem_description"    />
+        <result property="enterpriseAddress"    column="enterprise_address"    />
         <result property="linkman"    column="linkman"    />
         <result property="linkmanTel"    column="linkman_tel"    />
+        <result property="comOrOpi"    column="com_or_opi"    />
         <result property="authorization"    column="authorization"    />
         <result property="createTime"    column="create_time"    />
     </resultMap>
 
     <sql id="selectEnterpriseComplaintVo">
-        select id, rel_id, enforce_type, problem_description, linkman, linkman_tel, authorization, create_time from enterprise_complaint
+        select id, rel_id, enforce_type, problem_description, enterprise_address, linkman, linkman_tel, com_or_opi, authorization, create_time from enterprise_complaint
     </sql>
 
     <select id="selectEnterpriseComplaintList" parameterType="EnterpriseComplaint" resultMap="EnterpriseComplaintResult">
@@ -42,8 +44,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="relId != null  and relId != ''">rel_id,</if>
             <if test="enforceType != null ">enforce_type,</if>
             <if test="problemDescription != null  and problemDescription != ''">problem_description,</if>
+            <if test="enterpriseAddress != null  and enterpriseAddress != ''">enterprise_address,</if>
             <if test="linkman != null  and linkman != ''">linkman,</if>
             <if test="linkmanTel != null  and linkmanTel != ''">linkman_tel,</if>
+            <if test="comOrOpi != null  and comOrOpi != ''">com_or_opi,</if>
             <if test="authorization != null  and authorization != ''">authorization,</if>
             <if test="createTime != null ">create_time,</if>
          </trim>
@@ -52,8 +56,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="relId != null  and relId != ''">#{relId},</if>
             <if test="enforceType != null ">#{enforceType},</if>
             <if test="problemDescription != null  and problemDescription != ''">#{problemDescription},</if>
+            <if test="enterpriseAddress != null  and enterpriseAddress != ''">#{enterpriseAddress},</if>
             <if test="linkman != null  and linkman != ''">#{linkman},</if>
             <if test="linkmanTel != null  and linkmanTel != ''">#{linkmanTel},</if>
+            <if test="comOrOpi != null  and comOrOpi != ''">#{comOrOpi},</if>
             <if test="authorization != null  and authorization != ''">#{authorization},</if>
             <if test="createTime != null ">#{createTime},</if>
          </trim>
@@ -65,8 +71,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="relId != null  and relId != ''">rel_id = #{relId},</if>
             <if test="enforceType != null ">enforce_type = #{enforceType},</if>
             <if test="problemDescription != null  and problemDescription != ''">problem_description = #{problemDescription},</if>
+            <if test="enterpriseAddress != null  and enterpriseAddress != ''">enterprise_address = #{enterpriseAddress},</if>
             <if test="linkman != null  and linkman != ''">linkman = #{linkman},</if>
             <if test="linkmanTel != null  and linkmanTel != ''">linkman_tel = #{linkmanTel},</if>
+            <if test="comOrOpi != null  and comOrOpi != ''">com_or_opi = #{comOrOpi},</if>
             <if test="authorization != null  and authorization != ''">authorization = #{authorization},</if>
             <if test="createTime != null ">create_time = #{createTime},</if>
         </trim>