评价满意度附件信息拉取 . 同步用户和部门数据的定时任务拆开来

lib/EmergencyBaseLib/EmergencyCommon/src/main/java/com/zdxt/common/util/IdCardCryptoUtil.java

@@ -30,12 +30,13 @@ public class IdCardCryptoUtil {
 
     public static void main(String[] args) {
 
-        String userIdCode = IdCardCryptoUtil.symmetricEncryptIdCard("VRJHzFqJpsSZhwnsKTWNspv_GZMxTWl-bgH6DyE9Ty0", "1608644307579883522");
+//        String userIdCode = IdCardCryptoUtil.symmetricEncryptIdCard("VRJHzFqJpsSZhwnsKTWNspv_GZMxTWl-bgH6DyE9Ty0", "1608644307579883522");
-        String userNameCode = IdCardCryptoUtil.symmetricEncryptIdCard("eWIzY3BMRVNEQXhvUUlXMA==", "汪鑫");
+//        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", "Mi4URDD0cfD4kU4WK8t+sQ==");
+//        String phone = IdCardCryptoUtil.symmetricDecryptIdCard("VRJHzFqJpsSZhwnsKTWNspv_GZMxTWl-bgH6DyE9Ty0", "DAphKNsYj1EzQEjhGyPMLw==");
+        String phone = IdCardCryptoUtil.symmetricDecryptIdCard("VRJHzFqJpsSZhwnsKTWNspv_GZMxTWl-bgH6DyE9Ty0", "vFMPp4yo/PS6+p4N2vKNAg==");
 
 //        System.out.println(userIdCode);
         System.out.println(phone);

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

@@ -1,9 +1,15 @@
 package com.zdxt.app.controller;
 
+import java.util.ArrayList;
 import java.util.List;
 
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.zdxt.auth.common.utils.StringUtils;
 import com.zdxt.code.domain.EnterpriseComplaintSatisfy;
+import com.zdxt.code.domain.MssqAddOrder;
 import com.zdxt.code.service.IEnterpriseComplaintSatisfyService;
+import com.zdxt.code.service.MssqApiService;
 import com.zdxt.common.ZDResponse;
 import com.zdxt.common.controller.BaseController;
 import com.zdxt.common.util.TableDataInfo;
@@ -11,11 +17,7 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
 
 /**
  * 工单评价Controller
@@ -24,13 +26,15 @@ import org.springframework.web.bind.annotation.ResponseBody;
  * @date 2024-08-12
  */
 @Controller
-@RequestMapping("/system/satisfy")
+@RequestMapping("/app/satisfy")
 public class AppEnterpriseComplaintSatisfyController extends BaseController
 {
     private String prefix = "system/satisfy";
 
     @Autowired
     private IEnterpriseComplaintSatisfyService enterpriseComplaintSatisfyService;
+    @Autowired
+    private MssqApiService mssqApiService;
 
     @RequiresPermissions("system:satisfy:view")
     @GetMapping()
@@ -52,6 +56,15 @@ public class AppEnterpriseComplaintSatisfyController extends BaseController
         return getDataTable(list);
     }
 
+    @GetMapping("/getObjByKey/{proWoCode}")
+    @ResponseBody
+    public ZDResponse getObjByKey(@PathVariable("proWoCode") String proWoCode)
+    {
+
+        EnterpriseComplaintSatisfy enterpriseComplaintSatisfy = enterpriseComplaintSatisfyService.selectEnterpriseComplaintSatisfyByCode(proWoCode);
+        return ZDResponse.success("查询成功", enterpriseComplaintSatisfy);
+    }
+
     /**
      * 新增工单评价
      */
@@ -104,4 +117,27 @@ public class AppEnterpriseComplaintSatisfyController extends BaseController
     {
         return ZDResponse.success("success", enterpriseComplaintSatisfyService.deleteEnterpriseComplaintSatisfyByIds(ids));
     }
+
+    /**
+     * 下载附件接口
+     */
+    @PostMapping("/mssqDownFiles")
+    @ResponseBody
+    public ZDResponse mssqDownFiles(@RequestBody MssqAddOrder mssqAddOrder) throws Exception {
+        List<String> res = new ArrayList<>();
+        for (String path : mssqAddOrder.getUploadPaths()) {
+            MssqAddOrder params = new MssqAddOrder();
+            params.setUploadPath(path);
+            String result = mssqApiService.mssqDownFile(params);
+            res.add(result);
+        }
+        return ZDResponse.success("查询成功", res);
+    }
+
+    @PostMapping("/mssqDownFile")
+    @ResponseBody
+    public ZDResponse mssqDownFile(@RequestBody MssqAddOrder mssqAddOrder) throws Exception {
+        String result = mssqApiService.mssqDownFile(mssqAddOrder);
+        return ZDResponse.success("查询成功", result);
+    }
 }

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

@@ -77,6 +77,7 @@ public class AppSystemController extends BaseController {
     @GetMapping("/listApp")
     @ResponseBody
     public TableDataInfo listApp(User user) {
+        startPage();
         List<User> list = userService.selectUserList(user);
         //解密
 //        if(list.size() > 0){
@@ -86,21 +87,21 @@ public class AppSystemController extends BaseController {
 //            }
 //        }
         // 查询出职务
-        for (User userData : list) {
+//        for (User userData : list) {
-            List<PostBean> postBeanList = postApi.selectPostsByUserId(userData.getUserId());
+//            List<PostBean> postBeanList = postApi.selectPostsByUserId(userData.getUserId());
-            ArrayList<Post> postList = new ArrayList<>();
+//            ArrayList<Post> postList = new ArrayList<>();
-
+//
-            // 职务bean转成实体
+//            // 职务bean转成实体
-            for (PostBean postBean : postBeanList) {
+//            for (PostBean postBean : postBeanList) {
-                Post post = new Post();
+//                Post post = new Post();
-                BeanUtil.copyProperties(postBean, post);
+//                BeanUtil.copyProperties(postBean, post);
-                postList.add(post);
+//                postList.add(post);
-            }
+//            }
-
+//
-            if (!postList.isEmpty()) {
+//            if (!postList.isEmpty()) {
-                userData.setPostList(postList);
+//                userData.setPostList(postList);
-            }
+//            }
-        }
+//        }
         return getDataTable(list);
     }
 
@@ -109,21 +110,21 @@ public class AppSystemController extends BaseController {
     public ZDResponse listAApp(User user) {
         List<User> list = userService.selectUserList(user);
         // 查询出职务
-        for (User userData : list) {
+//        for (User userData : list) {
-            List<PostBean> postBeanList = postApi.selectPostsByUserId(userData.getUserId());
+//            List<PostBean> postBeanList = postApi.selectPostsByUserId(userData.getUserId());
-            ArrayList<Post> postList = new ArrayList<>();
+//            ArrayList<Post> postList = new ArrayList<>();
-
+//
-            // 职务bean转成实体
+//            // 职务bean转成实体
-            for (PostBean postBean : postBeanList) {
+//            for (PostBean postBean : postBeanList) {
-                Post post = new Post();
+//                Post post = new Post();
-                BeanUtil.copyProperties(postBean, post);
+//                BeanUtil.copyProperties(postBean, post);
-                postList.add(post);
+//                postList.add(post);
-            }
+//            }
-
+//
-            if (!postList.isEmpty()) {
+//            if (!postList.isEmpty()) {
-                userData.setPostList(postList);
+//                userData.setPostList(postList);
-            }
+//            }
-        }
+//        }
         return ZDResponse.success("查询成功",list);
     }
 

lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/task/ComplaintEvaluateTask.java

@@ -136,6 +136,23 @@ public class ComplaintEvaluateTask {
         ce.setOrgCode(satisfyJson.getString("orgCode"));
         /** 评价次数 */
         ce.setAssessNumber(satisfyJson.getInteger("assessNumber"));
+        /** 附件存储json */
+        ce.setAssessFiles(satisfyJson.getString("assessFiles"));
+
+        /** 获取机构中文 */
+        try {
+            MssqAddOrder mparams = new MssqAddOrder();
+            mparams.setProWoCode(ce.getProWoCode());
+            String resStr = mssqApiService.mssqQueryEndInfo(mparams);
+            JSONObject resObj = JSONObject.parseObject(resStr);
+            if ("0".equals(resObj.getString("resultCode"))) {
+                JSONObject endData = resObj.getJSONObject("endData");
+                ce.setOrgText(endData.getString("handleOrgName"));
+            }
+        } catch (Exception e) {
+            log.error("同步时, 获取机构中文, 出现异常");
+            e.printStackTrace();
+        }
         return ce;
     }
 }

lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/task/SynDeptTask.java

@@ -0,0 +1,195 @@
+package com.zdxt.app.task;
+
+import cn.hutool.core.map.MapUtil;
+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.project.system.dept.service.IDeptService;
+import com.zdxt.auth.project.system.dict.service.IDictDataService;
+import com.zdxt.auth.project.system.user.service.IUserService;
+import com.zdxt.domain.auth.DictData;
+import org.apache.http.HttpEntity;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.http.util.EntityUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.security.MessageDigest;
+import java.util.*;
+import java.util.stream.Collectors;
+
+
+/**
+ * @Author: kylin
+ * @Date: 2024/5/9 2:58 下午
+ * @Version: 1.0
+ * @Desc: TODO
+ */
+@Component("synDeptTask")
+public class SynDeptTask {
+
+    @Value("${srnwg.systemCode}")
+    private String systemCode;
+    @Value("${srnwg.integrationKey}")
+    private String integrationKey;
+    @Value("${srnwg.url}")
+    private String znwgUrl;
+    @Value("${srnwg.paasId}")
+    private String paasId;
+    @Value("${srnwg.paasToken}")
+    private String paasToken;
+
+    @Autowired private UserApi userApi;
+    @Autowired private IUserService userService;
+    @Autowired private IDeptService deptService;
+    @Autowired
+    private IDictDataService iDictDataService;
+
+    public static Map<String,String> params = new HashMap<>();
+
+    private static final Logger log = LoggerFactory.getLogger(SynDeptTask.class);
+
+
+    public void run(){
+        this.dept();
+    }
+
+    /** 同步部门数据 */
+    public void dept(){
+        List<DictData> srz_item = iDictDataService.selectDictDataByType("srz_item");
+        Map<String,String> map = srz_item.stream().collect(Collectors.toMap(DictData::getDictLabel,DictData::getDictValue));
+
+        if(MapUtil.isNotEmpty(map)){
+            params = map;
+        }
+        String token = "";
+        String destroyTken = "";
+        try {
+            // 获取 access_token
+            String tokenJson = connect("/ebus/sfrzhqxglmk/sysPullLogin?systemCode="+systemCode+"&integrationKey="+integrationKey);
+            JSONObject tokenObj = JSONObject.parseObject(tokenJson);
+            System.out.println("====================== access_token ======================");
+            System.out.println(tokenObj);
+            System.out.println("====================== access_token ======================");
+            token = tokenObj.getString("data");
+
+            // 获取 用户信息
+            int page = 0;
+            int pageSize = 500;
+            List<Map<String, Integer>> sumMap = new ArrayList<>();
+
+            int insertNum = 0;
+            int updateNum = 0;
+            page = 0;
+            // 获取 部门信息
+            while (true) {
+                String deptInfoJson = connect("/ebus/sfrzhqxglmk/sysPullOrg?token="+token+"&page="+page+"&pageSize="+pageSize+"&status=0");
+                JSONObject sourceObj = JSONObject.parseObject(deptInfoJson);
+                JSONObject tmpJsonObj = sourceObj.getJSONObject("data");
+                if(null==tmpJsonObj) {
+                    log.info("=====================> tmpJsonObj 为空");
+                    break;
+                }
+                JSONArray dataArr = tmpJsonObj.getJSONArray("data");
+                if (null == dataArr || dataArr.size()==0) { break; }
+                // 插入更新数据库
+                Map<String, Integer> resMap = deptService.addSrzDept(dataArr,token);
+                sumMap.add(resMap);
+                page++;
+            }
+
+            insertNum = 0;
+            updateNum = 0;
+            for (Map<String, Integer> item : sumMap) {
+                insertNum += item.get("insertNum");
+                updateNum += item.get("updateNum");
+            }
+            log.info("新增部门数量 : {}  /  更新部门数量 : {}", insertNum, updateNum);
+
+            // 注销token
+            destroyTken = connect("/ebus/sfrzhqxglmk/sysPullLogout?token="+token);
+            System.out.println("====================== destroyTken ======================");
+            System.out.println(destroyTken);
+            System.out.println("====================== destroyTken ======================");
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    private String connect(String apiPath) {
+        //各种参数
+
+        try {
+//        String params = "{\"uid\":\"5b07b3de672c4e999c4b04f4\"}"; //请求接⼝的参数
+            String params = ""; //请求接⼝的参数
+
+            long now = new Date().getTime();
+            String timestamp = Long.toString((long) Math.floor(now / 1000));
+            String nonce = Long.toHexString(now) + "-" + Long.toHexString((long) Math.floor(Math.random() * 0xFFFFFF));
+            String signature = toSHA256(timestamp + paasToken + nonce + timestamp);
+
+
+            //创建CloseableHttpClient
+            CloseableHttpClient client = HttpClientBuilder.create().build();
+            HttpPost httpPost = new HttpPost(znwgUrl + apiPath);
+            httpPost.setHeader("x-tif-paasid", paasId);
+            httpPost.setHeader("x-tif-timestamp", timestamp);
+            httpPost.setHeader("x-tif-signature", signature);
+            httpPost.setHeader("x-tif-nonce", nonce);
+            httpPost.setHeader("Content-Type", "application/json");
+            httpPost.setHeader("Cache-Control", "no-cache");
+            HttpEntity entity = new StringEntity(params);
+
+
+            httpPost.setEntity(entity);
+
+            CloseableHttpResponse response = client.execute(httpPost);
+
+            return EntityUtils.toString(response.getEntity());
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+
+
+    private String toSHA256(String str) throws Exception {
+        MessageDigest messageDigest;
+        String encodeStr = "";
+        try {
+            messageDigest = MessageDigest.getInstance("SHA-256");
+            messageDigest.update(str.getBytes("UTF-8"));
+            encodeStr = byte2Hex(messageDigest.digest());
+        } catch (Exception e) {
+            throw e;
+        }
+        return encodeStr;
+    }
+
+    // byte转换成16进制
+    private String byte2Hex(byte[] bytes) {
+        StringBuffer stringBuffer = new StringBuffer();
+        String temp = null;
+        for (int i = 0; i < bytes.length; i++) {
+            temp = Integer.toHexString(bytes[i] & 0xFF);
+            if (temp.length() == 1) {
+                stringBuffer.append("0");
+            }
+            stringBuffer.append(temp);
+        }
+        return stringBuffer.toString();
+    }
+}

lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/task/SynUserInfoTask.java

@@ -0,0 +1,187 @@
+package com.zdxt.app.task;
+
+import cn.hutool.core.map.MapUtil;
+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.project.system.dept.service.IDeptService;
+import com.zdxt.auth.project.system.dict.service.IDictDataService;
+import com.zdxt.auth.project.system.user.service.IUserService;
+import com.zdxt.domain.auth.DictData;
+import org.apache.http.HttpEntity;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.http.util.EntityUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.security.MessageDigest;
+import java.util.*;
+import java.util.stream.Collectors;
+
+
+/**
+ * @Author: kylin
+ * @Date: 2024/5/9 2:58 下午
+ * @Version: 1.0
+ * @Desc: TODO
+ */
+@Component("synUserInfoTask")
+public class SynUserInfoTask {
+
+    @Value("${srnwg.systemCode}")
+    private String systemCode;
+    @Value("${srnwg.integrationKey}")
+    private String integrationKey;
+    @Value("${srnwg.url}")
+    private String znwgUrl;
+    @Value("${srnwg.paasId}")
+    private String paasId;
+    @Value("${srnwg.paasToken}")
+    private String paasToken;
+
+    @Autowired private UserApi userApi;
+    @Autowired private IUserService userService;
+    @Autowired private IDeptService deptService;
+    @Autowired
+    private IDictDataService iDictDataService;
+
+    public static Map<String,String> params = new HashMap<>();
+
+    private static final Logger log = LoggerFactory.getLogger(SynUserInfoTask.class);
+
+
+    public void run(){
+        this.userInfo();
+    }
+
+    /** 同步用户数据 */
+    public void userInfo(){
+        List<DictData> srz_item = iDictDataService.selectDictDataByType("srz_item");
+        Map<String,String> map = srz_item.stream().collect(Collectors.toMap(DictData::getDictLabel,DictData::getDictValue));
+
+        if(MapUtil.isNotEmpty(map)){
+            params = map;
+        }
+        String token = "";
+        String destroyTken = "";
+        try {
+            // 获取 access_token
+            String tokenJson = connect("/ebus/sfrzhqxglmk/sysPullLogin?systemCode="+systemCode+"&integrationKey="+integrationKey);
+            JSONObject tokenObj = JSONObject.parseObject(tokenJson);
+            System.out.println("====================== access_token ======================");
+            System.out.println(tokenObj);
+            System.out.println("====================== access_token ======================");
+            token = tokenObj.getString("data");
+
+            // 获取 用户信息
+            int page = 0;
+            int pageSize = 500;
+            List<Map<String, Integer>> sumMap = new ArrayList<>();
+            while (true) {
+                String userInfoJson = connect("/ebus/sfrzhqxglmk/sysPullTacc?token="+token+"&page="+page+"&pageSize="+pageSize+"&status=0");
+                JSONObject sourceObj = JSONObject.parseObject(userInfoJson);
+                JSONObject tmpJsonObj = sourceObj.getJSONObject("data");
+                if(null==tmpJsonObj) {
+                    log.info("=====================> tmpJsonObj 为空");
+                    break;
+                }
+                JSONArray dataArr = tmpJsonObj.getJSONArray("data");
+                if (null == dataArr || dataArr.size()==0) { break; }
+                Map<String, Integer> resMap = userService.addSrzUser(dataArr, token);
+                sumMap.add(resMap);
+                page++;
+            }
+
+            int insertNum = 0;
+            int updateNum = 0;
+            for (Map<String, Integer> item : sumMap) {
+                insertNum += item.get("insertNum");
+                updateNum += item.get("updateNum");
+            }
+            log.info("新增用户数量 : {}  /  更新用户数量 : {}", insertNum, updateNum);
+
+            // 注销token
+            destroyTken = connect("/ebus/sfrzhqxglmk/sysPullLogout?token="+token);
+            System.out.println("====================== destroyTken ======================");
+            System.out.println(destroyTken);
+            System.out.println("====================== destroyTken ======================");
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    private String connect(String apiPath) {
+        //各种参数
+
+        try {
+//        String params = "{\"uid\":\"5b07b3de672c4e999c4b04f4\"}"; //请求接⼝的参数
+            String params = ""; //请求接⼝的参数
+
+            long now = new Date().getTime();
+            String timestamp = Long.toString((long) Math.floor(now / 1000));
+            String nonce = Long.toHexString(now) + "-" + Long.toHexString((long) Math.floor(Math.random() * 0xFFFFFF));
+            String signature = toSHA256(timestamp + paasToken + nonce + timestamp);
+
+
+            //创建CloseableHttpClient
+            CloseableHttpClient client = HttpClientBuilder.create().build();
+            HttpPost httpPost = new HttpPost(znwgUrl + apiPath);
+            httpPost.setHeader("x-tif-paasid", paasId);
+            httpPost.setHeader("x-tif-timestamp", timestamp);
+            httpPost.setHeader("x-tif-signature", signature);
+            httpPost.setHeader("x-tif-nonce", nonce);
+            httpPost.setHeader("Content-Type", "application/json");
+            httpPost.setHeader("Cache-Control", "no-cache");
+            HttpEntity entity = new StringEntity(params);
+
+
+            httpPost.setEntity(entity);
+
+            CloseableHttpResponse response = client.execute(httpPost);
+
+            return EntityUtils.toString(response.getEntity());
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    private String toSHA256(String str) throws Exception {
+        MessageDigest messageDigest;
+        String encodeStr = "";
+        try {
+            messageDigest = MessageDigest.getInstance("SHA-256");
+            messageDigest.update(str.getBytes("UTF-8"));
+            encodeStr = byte2Hex(messageDigest.digest());
+        } catch (Exception e) {
+            throw e;
+        }
+        return encodeStr;
+    }
+
+    // byte转换成16进制
+    private String byte2Hex(byte[] bytes) {
+        StringBuffer stringBuffer = new StringBuffer();
+        String temp = null;
+        for (int i = 0; i < bytes.length; i++) {
+            temp = Integer.toHexString(bytes[i] & 0xFF);
+            if (temp.length() == 1) {
+                stringBuffer.append("0");
+            }
+            stringBuffer.append(temp);
+        }
+        return stringBuffer.toString();
+    }
+}

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

@@ -2,6 +2,8 @@ package com.zdxt.code.domain;
 
 import com.zdxt.common.BaseDomain;
 
+import java.util.List;
+
 /**
  * 工单评价对象 enterprise_complaint_satisfy
  * 
@@ -45,10 +47,32 @@ public class EnterpriseComplaintSatisfy extends BaseDomain
     /** 机构code */
     private String orgCode;
 
+    /** 机构文字 */
+    private String orgText;
+
     /** 评价次数 */
     private Integer assessNumber;
 
-    public void setProWoId(String proWoId) 
+    /** 附件(存储时用) */
+    private String assessFiles;
+
+    public String getAssessFiles() {
+        return assessFiles;
+    }
+
+    public void setAssessFiles(String assessFiles) {
+        this.assessFiles = assessFiles;
+    }
+
+    public String getOrgText() {
+        return orgText;
+    }
+
+    public void setOrgText(String orgText) {
+        this.orgText = orgText;
+    }
+
+    public void setProWoId(String proWoId)
     {
         this.proWoId = proWoId;
     }

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

@@ -147,6 +147,25 @@ public class MssqAddOrder extends MssqBaseDomain {
     private String evaluatorName;
     /** 评价人联系号码 */
     private String evaluatorPapersPhone;
+    /** 附件地址 */
+    private List<String> uploadPaths;
+    private String uploadPath;
+
+    public String getUploadPath() {
+        return uploadPath;
+    }
+
+    public void setUploadPath(String uploadPath) {
+        this.uploadPath = uploadPath;
+    }
+
+    public List<String> getUploadPaths() {
+        return uploadPaths;
+    }
+
+    public void setUploadPaths(List<String> uploadPaths) {
+        this.uploadPaths = uploadPaths;
+    }
 
     public String getAppId() {
         return appId;

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnterpriseComplaintSatisfyMapper.java

@@ -19,6 +19,7 @@ public interface EnterpriseComplaintSatisfyMapper
      * @return 工单评价
      */
     public EnterpriseComplaintSatisfy selectEnterpriseComplaintSatisfyById(String proWoId);
+    public EnterpriseComplaintSatisfy selectEnterpriseComplaintSatisfyByCode(String proWoCode);
 
     /**
      * 查询工单评价列表

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

@@ -19,6 +19,7 @@ public interface IEnterpriseComplaintSatisfyService
      * @return 工单评价
      */
     public EnterpriseComplaintSatisfy selectEnterpriseComplaintSatisfyById(String proWoId);
+    public EnterpriseComplaintSatisfy selectEnterpriseComplaintSatisfyByCode(String proWoCode);
 
     /**
      * 查询工单评价列表

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

@@ -27,5 +27,6 @@ public interface MssqApiService {
     String mssqAppraise(MssqAddOrder mssqAddOrder) throws Exception;
     String mssqQueryEndInfo(MssqAddOrder mssqAddOrder) throws Exception;
     String mssqQuerySatisfy(MssqAddOrder mssqAddOrder) throws Exception;
+    String mssqDownFile(MssqAddOrder mssqAddOrder) throws Exception;
     String queryMssq(MssqAddOrder mssqAddOrder, String url) throws Exception;
 }

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

@@ -32,6 +32,11 @@ public class EnterpriseComplaintSatisfyServiceImpl implements IEnterpriseComplai
     {
         return enterpriseComplaintSatisfyMapper.selectEnterpriseComplaintSatisfyById(proWoId);
     }
+    @Override
+    public EnterpriseComplaintSatisfy selectEnterpriseComplaintSatisfyByCode(String proWoCode)
+    {
+        return enterpriseComplaintSatisfyMapper.selectEnterpriseComplaintSatisfyByCode(proWoCode);
+    }
 
     /**
      * 查询工单评价列表

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

@@ -153,6 +153,12 @@ public class MssqApiServiceImpl implements MssqApiService {
         return this.queryMssq(mssqAddOrder, "/api/API_YX/proProcess/querySatisfy");
     }
 
+    @Override
+    public String mssqDownFile(MssqAddOrder mssqAddOrder) throws Exception {
+        mssqAddOrder.setAppid(appId);
+        return this.queryMssq(mssqAddOrder, "/api/API_YX/fast/downFile");
+    }
+
     @Override
     public String queryMssq(MssqAddOrder mssqAddOrder, String url) throws Exception {
         MssqBaseDomain mssqToken = this.getMssqToken();

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

@@ -15,8 +15,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="serviceMetrics"    column="service_metrics"    />
         <result property="feedbackQualityMetrics"    column="feedback_quality_metrics"    />
         <result property="writingEvaluation"    column="writing_evaluation"    />
-        <result property="orgCode"    column="org_Code"    />
+        <result property="orgCode"    column="org_code"    />
-        <result property="assessNumber"    column="assess_Number"    />
+        <result property="orgText"    column="org_text"    />
+        <result property="assessNumber"    column="assess_number"    />
+        <result property="assessFiles"    column="assess_files"    />
         <result property="creator"    column="creator"    />
         <result property="createTime"    column="create_time"    />
         <result property="updator"    column="updator"    />
@@ -24,7 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectEnterpriseComplaintSatisfyVo">
-        select pro_wo_id, pro_wo_code, approve_code, approve_time, dis_approve_reason, deal_speed_metrics, deal_effect_metrics, service_metrics, feedback_quality_metrics, writing_evaluation, org_Code, assess_Number, creator, create_time, updator, update_time from enterprise_complaint_satisfy
+        select pro_wo_id, pro_wo_code, approve_code, approve_time, dis_approve_reason, deal_speed_metrics, deal_effect_metrics, service_metrics, feedback_quality_metrics, writing_evaluation, org_code, org_text, assess_number, assess_files, creator, create_time, updator, update_time from enterprise_complaint_satisfy
     </sql>
 
     <select id="selectEnterpriseComplaintSatisfyList" parameterType="EnterpriseComplaintSatisfy" resultMap="EnterpriseComplaintSatisfyResult">
@@ -39,8 +41,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="serviceMetrics != null "> and service_metrics = #{serviceMetrics}</if>
             <if test="feedbackQualityMetrics != null "> and feedback_quality_metrics = #{feedbackQualityMetrics}</if>
             <if test="writingEvaluation != null  and writingEvaluation != ''"> and writing_evaluation = #{writingEvaluation}</if>
-            <if test="orgCode != null  and orgCode != ''"> and org_Code = #{orgCode}</if>
+            <if test="orgCode != null  and orgCode != ''"> and org_code = #{orgCode}</if>
-            <if test="assessNumber != null "> and assess_Number = #{assessNumber}</if>
+            <if test="orgText != null  and orgText != ''"> and org_text = #{orgText}</if>
+            <if test="assessNumber != null "> and assess_number = #{assessNumber}</if>
+            <if test="assessFiles != null  and assessFiles != ''"> and assess_files = #{assessFiles}</if>
             <if test="creator != null  and creator != ''"> and creator = #{creator}</if>
             <if test="updator != null  and updator != ''"> and updator = #{updator}</if>
         </where>
@@ -50,6 +54,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectEnterpriseComplaintSatisfyVo"/>
         where pro_wo_id = #{proWoId}
     </select>
+    <select id="selectEnterpriseComplaintSatisfyByCode" parameterType="String" resultMap="EnterpriseComplaintSatisfyResult">
+        <include refid="selectEnterpriseComplaintSatisfyVo"/>
+        where pro_wo_code = #{proWoCode}
+    </select>
         
     <insert id="insertEnterpriseComplaintSatisfy" parameterType="EnterpriseComplaintSatisfy">
         insert into enterprise_complaint_satisfy
@@ -64,8 +72,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="serviceMetrics != null ">service_metrics,</if>
             <if test="feedbackQualityMetrics != null ">feedback_quality_metrics,</if>
             <if test="writingEvaluation != null  and writingEvaluation != ''">writing_evaluation,</if>
-            <if test="orgCode != null  and orgCode != ''">org_Code,</if>
+            <if test="orgCode != null  and orgCode != ''">org_code,</if>
-            <if test="assessNumber != null ">assess_Number,</if>
+            <if test="orgText != null  and orgText != ''">org_text,</if>
+            <if test="assessNumber != null ">assess_number,</if>
+            <if test="assessFiles != null  and assessFiles != ''">assess_files,</if>
             <if test="creator != null  and creator != ''">creator,</if>
             <if test="createTime != null ">create_time,</if>
             <if test="updator != null  and updator != ''">updator,</if>
@@ -83,7 +93,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="feedbackQualityMetrics != null ">#{feedbackQualityMetrics},</if>
             <if test="writingEvaluation != null  and writingEvaluation != ''">#{writingEvaluation},</if>
             <if test="orgCode != null  and orgCode != ''">#{orgCode},</if>
+            <if test="orgText != null  and orgText != ''">#{orgText},</if>
             <if test="assessNumber != null ">#{assessNumber},</if>
+            <if test="assessFiles != null  and assessFiles != ''">#{assessFiles},</if>
             <if test="creator != null  and creator != ''">#{creator},</if>
             <if test="createTime != null ">#{createTime},</if>
             <if test="updator != null  and updator != ''">#{updator},</if>
@@ -103,8 +115,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="serviceMetrics != null ">service_metrics = #{serviceMetrics},</if>
             <if test="feedbackQualityMetrics != null ">feedback_quality_metrics = #{feedbackQualityMetrics},</if>
             <if test="writingEvaluation != null  and writingEvaluation != ''">writing_evaluation = #{writingEvaluation},</if>
-            <if test="orgCode != null  and orgCode != ''">org_Code = #{orgCode},</if>
+            <if test="orgCode != null  and orgCode != ''">org_code = #{orgCode},</if>
-            <if test="assessNumber != null ">assess_Number = #{assessNumber},</if>
+            <if test="orgText != null  and orgText != ''">org_text = #{orgText},</if>
+            <if test="assessNumber != null ">assess_number = #{assessNumber},</if>
+            <if test="assessFiles != null  and assessFiles != ''">assess_files = #{assessFiles},</if>
             <if test="creator != null  and creator != ''">creator = #{creator},</if>
             <if test="createTime != null ">create_time = #{createTime},</if>
             <if test="updator != null  and updator != ''">updator = #{updator},</if>