修稿

src/main/java/com/steerinfo/dil/controller/BackgroundProcessingController.java

@@ -40,4 +40,14 @@ public class BackgroundProcessingController extends BaseRESTfulController {
     @Autowired
     private UniversalMapper universalMapper;
 
+    @ApiOperation("登录接口")
+    @PostMapping("bpLogin")
+    public RESTfulResult bpLogin(String userName,String password,String app_code) {
+
+        backgroundProcessingService.bpLogin(userName);
+        return success();
+    }
+
+
+
 }

src/main/java/com/steerinfo/dil/controller/SystemFileController.java

@@ -1,6 +1,7 @@
 package com.steerinfo.dil.controller;
 
 import com.google.common.collect.Iterators;
+import com.steerinfo.dil.mapper.SystemFileMapper;
 import com.steerinfo.dil.util.FtpFileUtil;
 import com.steerinfo.dil.util.IDutils;
 import com.steerinfo.framework.controller.BaseRESTfulController;
@@ -19,6 +20,7 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartRequest;
 
+import javax.annotation.Resource;
 import java.io.IOException;
 import java.io.InputStream;
 import java.text.SimpleDateFormat;
@@ -46,6 +48,10 @@ public class SystemFileController extends BaseRESTfulController {
     @Autowired
     ISystemFileService systemFileService;
 
+
+    @Resource
+    SystemFileMapper systemFileMapper;
+
     @Autowired
     private FtpFileUtil ftpFileUtil;
 //同一个信息包含多个上传文件信息
@@ -147,16 +153,21 @@ public class SystemFileController extends BaseRESTfulController {
 
         List<MultipartFile> files  = new ArrayList<>();
         int index=-1;
-        for(int i=0;i<21;i++) {
-            MultipartFile file = request.getFile("file" + i);
-            if (file != null) {
-                files.add(file);
-                if (index < 0) {
-                    index = i;
+        for(int j = 0 ; j < fileTypes.length ; j ++ ) {
+            for(int i=0;i<21;i++) {
+                MultipartFile file = request.getFile("file" +j +"" + i);
+                if (file != null) {
+                    files.add(file);
+                    if (index < 0) {
+                        index = i;
+                    }
                 }
             }
         }
 
+        if(files.size() == 0) {
+            return failed("传输失败");
+        }
         for (int i = 0; i < fileUuids.length; i++) {
             //获取系统时间
             SimpleDateFormat simpleDateFormat = new SimpleDateFormat("/yyyy/MM/dd");
@@ -209,7 +220,6 @@ public class SystemFileController extends BaseRESTfulController {
             e.getMessage();
             return failed();
         }
-
     }
 
 
@@ -262,5 +272,33 @@ public class SystemFileController extends BaseRESTfulController {
 
     }
 
+    @PostMapping("/previewfileList")
+    public RESTfulResult previewfileList(@RequestBody HashMap map) {
+        String uuid =  map.get("uuid").toString();
+        String[] uuidList = uuid.split(";");
+        //遍历数组，去找文件名称和路径
+        List<Map<String,Object>> mapList = systemFileMapper.getFileInfo(uuidList);
+        List<Map<String,Object>> resultList = new ArrayList<>();
+        for (Map<String,Object> parmas : mapList) {
+            String filename = parmas.get("FILENAME").toString();
+            String filepath = parmas.get("FILEPATH").toString();
+            if (filename == null ||filename.isEmpty()) {
+                return failed("该图片不存在！");
+            }
+            if (filepath == null ||filepath.isEmpty()) {
+                return failed("该图片地址不存在！");
+            }
+            try {
+                Map<String,Object> result = ftpFileUtil.downloadFileNew(filename, filepath);
+                resultList.add(result);
+            } catch (IOException e) {
+                e.getMessage();
+                continue;
+            }
+        }
+        return success(resultList);
+
+    }
+
 
 }

src/main/java/com/steerinfo/dil/feign/SSOFeign.java

@@ -0,0 +1,94 @@
+package com.steerinfo.dil.feign;
+
+
+import com.alibaba.fastjson.JSONObject;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+
+@FeignClient(value = "SSO",url = "${openfeign.SSOFeign.url}")
+public interface SSOFeign {
+
+    /**
+     * 登录
+     * @param loginName
+     * @param password
+     * @return
+     */
+    @PostMapping("/auth/login")
+    JSONObject login(@RequestParam String loginName,
+                     @RequestParam String password);
+
+    /**
+     * 新增用户
+     * @param token
+     * @param userCode
+     * @param userName
+     * @param orgCode
+     * @param orgName
+     * @param groupId
+     * @param companyId
+     * @param orgId
+     * @return
+     */
+    @PostMapping("/v1/sysusers/")
+    JSONObject addUser(@RequestHeader("Authorization") String token,
+//            @HeaderMap Map<String,Object> headerMap,
+                                @RequestParam String userName,
+                               @RequestParam String userCode,
+                               @RequestParam String orgName,
+                               @RequestParam String orgCode,
+                               @RequestParam String groupId,
+                               @RequestParam String companyId,
+                               @RequestParam String orgId);
+
+    @DeleteMapping("/v1/sysusers/{userId}")
+    JSONObject deleteUser(@RequestHeader("Authorization") String token,
+                          @PathVariable String userId);
+
+    @GetMapping("/v1/sysroles/getRolesUser")
+    JSONObject getRolesUser(@RequestHeader("Authorization") String token,
+                       @RequestParam String companyId);
+
+    /**
+     * 授权用户角色
+     * @param token
+     * @param userId
+     * @param userCode
+     * @param roleId
+     * @return
+     */
+    @PostMapping("/v1/sysuserroles/")
+    JSONObject addUserroles(@RequestHeader("Authorization") String token,
+                                    @RequestParam String userId,
+                                    @RequestParam String userCode,
+                                    @RequestParam String roleId);
+
+
+    /**
+     * 解除用户角色权限
+     * @param token
+     * @param userRoleId
+     * @return
+     */
+    @DeleteMapping("/v1/sysuserroles/{userRoleId}")
+    Map<String,Object> sysuserrole(@RequestHeader("Authorization") String token,
+                                   @PathVariable(name = "userRoleId") String userRoleId);
+
+    /**
+     * 获取用户角色权限
+     * @param token
+     * @param userId
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @GetMapping("/v1/sysuserroles/")
+    Map<String,Object> getSysuserrole(@RequestHeader("Authorization") String token,
+                                      @RequestParam("userId") String userId,
+                                      @RequestParam("pageNum") Integer pageNum,
+                                      @RequestParam("pageSize") Integer pageSize);
+
+}

src/main/java/com/steerinfo/dil/mapper/BackgroundProcessingMapper.java

@@ -79,4 +79,9 @@ public interface BackgroundProcessingMapper {
 
     //清空进厂信息
     int clearEnDetails(Map<String,Object> map);
+
+    Map<String, Object> getUserInfo(String userName);
+
+    List<Map<String, Object>> getCapacityList(BigDecimal personnelId);
+
 }

src/main/java/com/steerinfo/dil/mapper/SystemFileMapper.java

@@ -3,10 +3,16 @@ package com.steerinfo.dil.mapper;
 import com.steerinfo.dil.model.SystemFile;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import java.math.*;
+import java.util.List;
+import java.util.Map;
+
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper
 public interface SystemFileMapper extends IBaseMapper<SystemFile, String> {
 
     SystemFile insertAll(SystemFile systemFile);
+
+    List<Map<String, Object>> getFileInfo(String[] uuidList);
+
 }

src/main/java/com/steerinfo/dil/service/impl/BackgroundProcessingServiceImpl.java

@@ -137,4 +137,12 @@ public class BackgroundProcessingServiceImpl implements IBackgroundProcessServic
         int i = dilCidCapacityMapper.insertSelective(dilCidCapacity);
         return i;
     }
+
+    public Map<String,Object> bpLogin(String userName) {
+        Map<String,Object> map = backgroundProcessingMapper.getUserInfo(userName);
+        if("司机".equals(map.get("personnelPost"))) {
+            List<Map<String,Object>> capacityList = backgroundProcessingMapper.getCapacityList(DataChange.dataToBigDecimal(map.get("personnelId")));
+        }
+        return map;
+    }
 }

src/main/java/com/steerinfo/dil/util/FtpFileUtil.java

@@ -8,6 +8,8 @@ import org.springframework.stereotype.Component;
 import javax.servlet.http.HttpServletResponse;
 import java.io.*;
 import java.util.Base64;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * POIExcelToHtml 文件转换：
@@ -478,4 +480,104 @@ public class FtpFileUtil {
         }
         return true;
     }
+
+
+    //重写下载图片方法
+    public Map<String,Object> downloadFileNew(String fileName, String filePath) throws IOException {
+        InputStream inputStream;
+        String data = fileName + "预览失败";
+        String type = "";
+        String workhtml = null;
+        File temp = File.createTempFile("temp", ".temp");
+        try {
+            this.connectToServer();
+            // 设置传输二进制文件
+            this.setFileType(FTP.BINARY_FILE_TYPE);
+            ftpClient.enterLocalPassiveMode();
+            int reply = ftpClient.getReplyCode();
+            if (!FTPReply.isPositiveCompletion(reply)) {
+                ftpClient.disconnect();
+                throw new IOException("failed to connect to the FTP Server:" + FTP_ADDRESS);
+            }
+
+            String directory = filePath.substring(0, filePath.lastIndexOf("/") + 1);
+            // 进入文件所在目录，注意编码格式，以能够正确识别中文目录
+            boolean cdStatus = ftpClient.changeWorkingDirectory(directory);
+            if (!cdStatus) {
+                return new HashMap<>();
+            }
+            String file = filePath.substring(filePath.lastIndexOf("/") + 1);
+            // 检验文件是否存在
+            inputStream = ftpClient.retrieveFileStream(file);
+            String suffixName;
+            if (inputStream != null) {
+                if (file != null && file.contains(SPOT)) {
+                    POIWordToHtml poiWordToHtml = new POIWordToHtml();
+                    suffixName = file.substring(file.indexOf(".") + 1);
+                    switch (suffixName) {
+                        case "docx":
+                            data = poiWordToHtml.readWordImgToHtml(inputStream);
+                            type = suffixName;
+
+                            break;
+                        case "doc":
+                            data = poiWordToHtml.docToHtml(inputStream);
+                            type = suffixName;
+
+                            break;
+
+                        case "xlsx":
+                        case "xls":
+                            data = POIExcelToHtml.excelToHtml(inputStream);
+                            type = suffixName;
+
+                            break;
+                        case "pptx":
+                        case "ppt":
+                            data = POIPptToHtml.pptToHtml(inputStream, suffixName);
+                            type = suffixName;
+
+                            break;
+                        case "jpg":
+                        case "gif":
+                        case "png":
+                        case "jpeg":
+                        case "jpe":
+                            ByteArrayOutputStream stream = new ByteArrayOutputStream();
+                            IOUtils.copy(inputStream, stream);
+                            String imgStr = Base64.getEncoder().encodeToString(stream.toByteArray());
+                            data = "data:image/" + suffixName + ";base64," + imgStr;
+                            type = suffixName;
+                            stream.close();
+                            break;
+                        case "txt":
+                            ByteArrayOutputStream txtStream = new ByteArrayOutputStream();
+                            IOUtils.copy(inputStream, txtStream);
+                            data = txtStream.toString();
+                            type = suffixName;
+
+                            break;
+                        default:
+                            data = fileName + "文件暂时不支持预览。";
+                            break;
+                    }
+                }
+                inputStream.close();
+                ftpClient.completePendingCommand();
+            }
+        } catch (FTPConnectionClosedException e) {
+            System.out.println("ftp连接被关闭！");
+            throw e;
+        } catch (Exception e) {
+            System.out.println("ERR : upload file " + fileName + " from ftp : failed!" + e.getMessage());
+        } finally {
+            if (ftpClient.isConnected()) {
+                closeConnect();
+            }
+        }
+        Map<String, Object> map = new HashMap<>();
+        map.put("data",data);
+        map.put("type",type);
+        return map;
+    }
 }

src/main/resources/application-dev.yml

@@ -58,6 +58,8 @@ openfeign:
     url: ${OTMSFEIGN_URL:localhost:8038}
   EmsFeign:
     url: ${TMSFEIGN_URL:localhost:8096}
+  SSOFeign:
+    url: ${SSOFEIGN_URL:172.16.90.214:9001}
 
 
 #远程调用

src/main/resources/application-prod.yml

@@ -25,7 +25,7 @@ openfeign:
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.90.214:8083}
   AmsFeign:
-    url: ${AMSFEIGN_URL:172.16.90.214:8079}
+    url: ${AMSFEIGN_URL:localhost:8079}
   BmsFeign:
     url: ${BMSFEIGN_URL:172.16.90.214:8078}
   TmsFeign:
@@ -35,13 +35,15 @@ openfeign:
   OMSFeign:
     url: ${OMSFEIGN_URL:172.16.90.214:8095}
   RmsFeign:
-    url: ${RMSFEIGN_URL:localhost:8060}
+    url: ${RMSFEIGN_URL:172.16.90.214:8060}
   IntegrationFeign:
     url: ${INTEGRATIONFEIGN_URL:172.16.90.214:8066}
   OTMSFeign:
     url: ${OTMSFEIGN_URL:172.16.90.214:8038}
   EmsFeign:
     url: ${TMSFEIGN_URL:172.16.90.214:8096}
+  SSOFeign:
+    url: ${SSOFEIGN_URL:172.16.90.214:9001}
 
 
 #远程调用

src/main/resources/com/steerinfo/dil/mapper/BackgroundProcessingMapper.xml

@@ -2,301 +2,17 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.steerinfo.dil.mapper.BackgroundProcessingMapper">
 
-    <update id="closePurOrderMoreTrips" parameterType="string">
-        update AMS_PURCHASE_ORDER APO
-        set APO.IS_MORE_TRIPS = null
-        where APO.PURCHASE_ORDER_NO = #{purchaseOrderNo}
-    </update>
-
-    <update id="updatePurOrderOrgId" parameterType="java.util.Map">
-        update AMS_PURCHASE_ORDER APO
-        set APO.PURCHASING_ORGANIZATION_ID = #{orgId}
-        where APO.PURCHASE_ORDER_NO = #{purchaseOrderNo}
-    </update>
-    <update id="allowEnfactory">
-        UPDATE TMSTRUCK_ENFACTORY_RESULT TER
-        SET TER.INSERT_UPDATE_REMARK = 'OK'
-        WHERE TER.RESULT_ID = (SELECT TER.RESULT_ID FROM OMSTRUCK_ORDER OO
-            LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR ON TTR.ORDER_ID = OO.ORDER_ID
-            LEFT JOIN TMSTRUCK_ENFACTORY_RESULT TER ON TER.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
-            WHERE OO.ORDER_NUMBER = #{orderNumber})
-    </update>
-
-    <select id="getOrderType" resultType="java.lang.Integer" parameterType="java.lang.Integer">
-        select OO.ORDER_TYPE from OMSTRUCK_ORDER OO
-        where oo.ORDER_ID = #{orderId}
-    </select>
-
-    <select id="getOrderMesByOrderNum" resultType="java.util.Map">
-        select OO.ORDER_ID  "orderId",
-               OO.ORDER_TYPE    "orderType",
-               TTR.RESULT_TOTAL_ID  "resultTotalId"
-        from OMSTRUCK_ORDER OO
-                 left join TMSTRUCK_TOTAL_RESULT TTR on OO.ORDER_ID = TTR.ORDER_ID
-        where OO.ORDER_NUMBER = #{orderNumber}
-    </select>
-
-    <select id="getEnFactoryResult" resultType="java.util.Map">
-        select TER.RESULT_ID    "resultId",
-               TER.RESULT_ENTRY_GATE_TIME   "time"
-        from TMSTRUCK_ENFACTORY_RESULT TER
-        where TER.RESULT_TOTAL_ID = #{resultTotalId}
-          and  TER.SEGMEN_SQE = #{sqe}
-    </select>
-
-    <select id="loadResult" resultType="java.util.Map">
-        select T.RESULT_ID    "resultId",
-               T.RESULT_LOAD_END_TIME   "time"
-        from TMSTRUCK_LOAD_RESULT T
-        where T.RESULT_TOTAL_ID = #{resultTotalId}
-          and  T.SEGMENT_SQE = #{sqe}
-    </select>
-
-    <select id="unloadResult" resultType="java.util.Map">
-        select T.RESULT_ID    "resultId",
-               T.RESULT_END_TIME   "time"
-        from TMSTRUCK_UNLOAD_RESULT T
-        where T.RESULT_TOTAL_ID = #{resultTotalId}
-          and  T.SEGMENT_SQE = #{sqe}
-    </select>
-
-    <select id="weightResult" resultType="java.util.Map">
-        select T.WEIGHT_TASK_RESULT_ID    "resultId",
-               T.RESULT_TARE_WEIGHT_TIME   "time"
-        from TMSTRUCK_WEIGHT_RESULT T
-        where T.RESULT_TOTAL_ID = #{resultTotalId}
-          and  T.GROSS_SEGMENT_SQE = #{sqe}
-    </select>
-
-    <select id="outFactoryResult" resultType="java.util.Map">
-        select T.RESULT_ID    "resultId",
-               T.RESULT_OUT_GATE_TIME   "time"
-        from TMSTRUCK_LEAVE_FACTORY_RESULT T
-        where T.RESULT_TOTAL_ID = #{resultTotalId}
-          and  T.SEGMENT_SQE = #{sqe}
-    </select>
-
-    <select id="getAllPurOrder" resultType="java.lang.Integer">
-        select OO.ORDER_ID
-        from OMSTRUCK_ORDER OO
-        left join AMS_PURCHASE_ORDER APO
-            on OO.ORDER_PLAN_ID = APO.PURCHASE_ORDER_ID
-        where APO.PURCHASE_ORDER_NO = #{purchaseOrderNo}
-          and OO.ORDER_TYPE in (5,6,7,8,17,18)
-          and OO.ORDER_STATUS in (3,4)
-    </select>
-
-    <delete id="deleteOrders" parameterType="arraylist">
-        delete
-        from OMSTRUCK_ORDER OO
-        where OO.ORDER_ID in
-        <foreach collection="list" item="id" open="(" separator="," close=")" >
-            ${id}
-        </foreach>
-    </delete>
-
-    <delete id="deleteOrderMaterials" parameterType="arraylist">
-        delete
-        from OMSTRUCK_ORDER_MATERIAL OOM
-        where OOM.ORDER_ID in
-        <foreach collection="list" item="id" open="(" separator="," close=")" >
-            ${id}
-        </foreach>
-    </delete>
-
-    <delete id="batchByOrderIdForTotalDelete" parameterType="arraylist">
-        delete from TMSTRUCK_TOTAL_RESULT TTR
-        where TTR.ORDER_ID in
-        <foreach collection="list" item="id" open="(" close=")" separator=",">
-            #{id}
-        </foreach>
-    </delete>
-
-    <select id="enFactoryCheck" parameterType="decimal" resultType="int">
-        SELECT
-            TER.SEGMEN_SQE  "segmentSqe"
-        FROM
-            TMSTRUCK_ENFACTORY_RESULT TER
-        WHERE
-            TER.RESULT_TOTAL_ID = #{resultTotalId}
-        GROUP BY TER.SEGMEN_SQE
-        HAVING count( TER.SEGMEN_SQE ) > 1
+    <select id="getUserInfo" resultType="java.util.Map">
+        SELECT RP.PERSONNEL_ID "personnelId",
+               RP.IDENTITY_CARD "idCard",
+               RP.PERSONNEL_POST  "personnelPost"
+                   FROM RMS_PERSONNEL RP
+        WHERE RP.PERSONNEL_PHONE = #{userName}
     </select>
-
-    <select id="loadCheck" parameterType="decimal" resultType="int">
-        SELECT
-            T.SEGMENT_SQE  "segmentSqe"
-        FROM
-            TMSTRUCK_LOAD_RESULT T
-        WHERE
-            T.RESULT_TOTAL_ID = #{resultTotalId}
-        GROUP BY T.SEGMENT_SQE
-        HAVING count( T.SEGMENT_SQE ) > 1
-    </select>
-
-    <select id="unloadCheck" parameterType="decimal" resultType="int">
-        SELECT
-            T.SEGMENT_SQE  "segmentSqe"
-        FROM
-            TMSTRUCK_UNLOAD_RESULT T
-        WHERE
-            T.RESULT_TOTAL_ID = #{resultTotalId}
-        GROUP BY T.SEGMENT_SQE
-        HAVING count( T.SEGMENT_SQE ) > 1
-    </select>
-
-    <select id="weightCheck" parameterType="decimal" resultType="int">
-        SELECT
-            T.GROSS_SEGMENT_SQE   "segmentSqe"
-        FROM
-            TMSTRUCK_WEIGHT_RESULT T
-        WHERE
-            T.RESULT_TOTAL_ID = #{resultTotalId}
-        GROUP BY T.GROSS_SEGMENT_SQE
-        HAVING count( T.GROSS_SEGMENT_SQE  ) > 1
+    <select id="getCapacityList" resultType="java.util.Map">
+        SELECT RC.CAPACITY_NUMBER FROM RMS_CAPACITY_DRIVER RCD
+        LEFT JOIN RMS_CAPACITY RC on RCD.CAPACITY_ID = RC.CAPACITY_ID
+        WHERE RCD.PERSONNEL_ID = #{personnelId}
     </select>
 
-    <select id="outFactoryCheck" parameterType="decimal" resultType="int">
-        SELECT
-            T.SEGMENT_SQE  "segmentSqe"
-        FROM
-            TMSTRUCK_LEAVE_FACTORY_RESULT T
-        WHERE
-            T.RESULT_TOTAL_ID = #{resultTotalId}
-        GROUP BY T.SEGMENT_SQE
-        HAVING count( T.SEGMENT_SQE ) > 1
-    </select>
-    <select id="getDetailsForEnAndQue" resultType="java.util.Map">
-        SELECT OO .ORDER_ID "orderId",
-               TTR .RESULT_TOTAL_ID "resultTotalId",
-               OO .CAPACITY_ID "capacityId"
-        FROM OMSTRUCK_ORDER OO
-                 LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR ON OO .ORDER_ID = TTR .ORDER_ID
-                 LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR ON TWR .RESULT_TOTAL_ID = TTR .RESULT_TOTAL_ID  AND TWR .RESULT_NET_WEIGHT IS NOT NULL
-        WHERE  TWR .WEIGHT_TASK_RESULT_ID IS NULL AND OO .ORDER_TYPE = 1 AND OO .ORDER_STATUS = 5 AND OO .ORDER_NUMBER= #{orderNumber}
-        FETCH NEXT 1 ROWS ONLY
-    </select>
-
-    <delete id="deleteEnFactoryUnnecessaryResult">
-        delete from TMSTRUCK_ENFACTORY_RESULT where RESULT_ID in
-        <foreach collection="list" item="id" open="(" separator="," close=")">
-            ${id}
-        </foreach>
-    </delete>
-
-  <delete id="deleteLoadUnnecessaryResult">
-        delete from TMSTRUCK_LOAD_RESULT where RESULT_ID in
-        <foreach collection="list" item="id" open="(" separator="," close=")">
-            ${id}
-        </foreach>
-    </delete>
-
-    <delete id="deleteUnloadUnnecessaryResult">
-        delete from TMSTRUCK_UNLOAD_RESULT where RESULT_ID in
-        <foreach collection="list" item="id" open="(" separator="," close=")">
-            ${id}
-        </foreach>
-    </delete>
-
-    <delete id="deleteWeightUnnecessaryResult">
-        delete from TMSTRUCK_WEIGHT_RESULT where WEIGHT_TASK_RESULT_ID in
-        <foreach collection="list" item="id" open="(" separator="," close=")">
-            ${id}
-        </foreach>
-    </delete>
-
-    <delete id="deleteOutFactoryUnnecessaryResult">
-        delete from TMSTRUCK_LEAVE_FACTORY_RESULT where RESULT_ID in
-        <foreach collection="list" item="id" open="(" separator="," close=")">
-            ${id}
-        </foreach>
-    </delete>
-
-    <update id="updateOrderCanWork" parameterType="string">
-        update OMSTRUCK_ORDER OO
-        set oo.CAN_WORK = 2
-        where oo.ORDER_NUMBER = #{orderNumber}
-    </update>
-    <update id="updateOrderStatus" parameterType="java.util.Map">
-        update OMSTRUCK_ORDER OO
-        SET OO.ORDER_STATUS = #{orderStatus},
-            OO.INSERT_UPDATE_REMARK = '管理员操作修改状态'
-        WHERE OO.ORDER_NUMBER = #{orderNumber}
-    </update>
-    <delete id="deleteExtraWeight">
-        DELETE FROM TMSTRUCK_WEIGHT_RESULT WHERE WEIGHT_TASK_RESULT_ID IN
-         (
-             SELECT
-                 WEIGHT_TASK_RESULT_ID
-             FROM
-                 TMSTRUCK_WEIGHT_RESULT
-             WHERE RESULT_TOTAL_ID=#{resultTotalId}
-             FETCH NEXT
-                (
-                --查询需要删除的数量
-                SELECT COUNT(WEIGHT_TASK_RESULT_ID)-1
-                FROM TMSTRUCK_WEIGHT_RESULT
-                WHERE RESULT_TOTAL_ID=#{resultTotalId}
-                GROUP BY RESULT_TOTAL_ID
-                )
-            ROWS ONLY
-        )
-    </delete>
-    <delete id="deleteExtraLoad">
-        DELETE FROM TMSTRUCK_LOAD_RESULT WHERE RESULT_ID IN
-           (
-               SELECT
-                   RESULT_ID
-               FROM
-                   TMSTRUCK_LOAD_RESULT
-               WHERE RESULT_TOTAL_ID=#{resultTotalId}
-               FETCH NEXT
-                    (
-                    --查询需要删除的数量
-                    SELECT COUNT(RESULT_ID)-1
-                    FROM TMSTRUCK_LOAD_RESULT
-                    WHERE RESULT_TOTAL_ID=#{resultTotalId}
-                    GROUP BY RESULT_TOTAL_ID
-                    )
-                ROWS ONLY
-            )
-    </delete>
-    <delete id="deleteExtraUnload">
-        DELETE FROM TMSTRUCK_UNLOAD_RESULT WHERE RESULT_ID IN
-           (
-               SELECT
-                   RESULT_ID
-               FROM
-                   TMSTRUCK_UNLOAD_RESULT
-               WHERE RESULT_TOTAL_ID=#{resultTotalId}
-               FETCH NEXT
-                (
-                --查询需要删除的数量
-                SELECT COUNT(RESULT_ID)-1
-                FROM TMSTRUCK_UNLOAD_RESULT
-                WHERE RESULT_TOTAL_ID=#{resultTotalId}
-                GROUP BY RESULT_TOTAL_ID
-                )
-                ROWS ONLY
-            )
-    </delete>
-    <insert id="insertNotUpload">
-        INSERT INTO AMS_NOT_UPLOADED_EAS
-        ("ORDER_ID", "NO", "RESULT_POUND_NO", "CAPACITY_NUMBER", "RESULT_CROSS_CALCULATE_NUMBER", "RESULT_TARE_CALCULATE_NUMBER", "RESULT_CROSS_WEIGHT", "RESULT_TARE_WEIGHT", "RESULT_NET_WEIGHT", "RESULT_CROSS_WEIGHT_TIME", "RESULT_TARE_WEIGHT_TIME",
-         "EAS_ENTRY_ID", "INSERT_USERNAME", "INSERT_TIME", "UPDATE_USERNAME", "UPDATE_TIME", "INSERT_UPDATE_REMARK")
-        VALUES
-        (#{orderId}, #{purchaseOrderNo}, #{poundNo}, #{capacityNo}, #{grossTruckCalculateSecond}, #{tareTruckCalculateSecond}, #{grossWeightSecond}, #{tareWeightSecond}, #{netWeightSecond}, #{grossWeigtTimeSecond}, #{tareWeightTimeSecond},
-         (SELECT EAS_ENTRY_ID FROM AMS_PURCHASE_ORDER WHERE PURCHASE_ORDER_NO=#{purchaseOrderNo} AND DELETED=0), NULL, NULL, NULL, NULL, NULL)
-    </insert>
-    <update id="resetPrintNumber">
-        UPDATE OMSTRUCK_ORDER
-        SET PRINTNUMBER=0,
-            PRINTDATE = null
-        WHERE ORDER_ID = #{orderId}
-    </update>
-    <update id="clearEnDetails">
-        UPDATE TMSTRUCK_ENFACTORY_RESULT
-        SET RESULT_ENTRY_MODE = NULL ,RESULT_ENTRY_GATE_TIME = NULL,INSERT_TIME = NULL
-        WHERE RESULT_TOTAL_ID = #{resultTotalId}
-    </update>
 </mapper>

src/main/resources/com/steerinfo/dil/mapper/SystemFileMapper.xml

@@ -119,7 +119,7 @@
     <include refid="select"/>
     <include refid="whereLike"/>
   </select>
-  <insert id="batchInsert" parameterType="java.util.List">
+    <insert id="batchInsert" parameterType="java.util.List">
     insert into SYSTEM_FILE 
       (ID, 
       FILENAME, FILEPATH)
@@ -165,4 +165,15 @@
     values (#{id,jdbcType=VARCHAR}, #{filename,jdbcType=VARCHAR}, #{filepath,jdbcType=VARCHAR}
            )
   </insert>
+  <select id="getFileInfo" resultType="java.util.Map" parameterType="java.util.List">
+    SELECT
+    SF.FILENAME "FILENAME" ,
+    SF.FILEPATH "FILEPATH"
+    FROM SYSTEM_FILE SF
+    WHERE SF.ID IN
+    <foreach collection="uuidList" item="id" open="(" close=")" separator=",">
+      #{id}
+    </foreach>
+  </select>
+
 </mapper>

src/main/resources/com/steerinfo/dil/mapper/UniversalMapper.xml

@@ -253,10 +253,17 @@
             FROM RMS_CAPACITY RCA
             LEFT JOIN RMS_CAPACITY_CARRIER RCC ON RCA .CAPACITY_ID = RCC .CAPACITY_ID
             LEFT JOIN RMS_COMPANY RC ON RC .COMPANY_ID = RCC .COMPANY_ID
+            LEFT JOIN RMS_CAPACITY_TYPE RCT ON RCA.CAPACITY_TYPE_ID = RCT.CAPACITY_TYPE_ID
             WHERE RCA .DELETED = 0
             <if test="orgCode!=null and orgCode !='' and roleCodes.contains('chengyunshang')">
                 AND RC.SSO_CODE = #{orgCode}
             </if>
+            <if test="capacityType != null and capacityType != '' ">
+                AND RCT.CAPACITY_TYPE_NAME = #{capacityType}
+            </if>
+            <if test="capacityType == null">
+                AND RCT.CAPACITY_TYPE_NAME != '火车'
+            </if>
         )
         <where>
             <if test="index!=null and index!=''">