1

pom.xml

@@ -12,27 +12,27 @@
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
         <version>2.0.7.RELEASE</version>
-<!--        <version>2.1.13.RELEASE</version>-->
+        <!--        <version>2.1.13.RELEASE</version>-->
     </parent>
-<!--    <properties>-->
-<!--        <java.version>1.8</java.version>-->
-<!--    </properties>-->
+    <!--    <properties>-->
+    <!--        <java.version>1.8</java.version>-->
+    <!--    </properties>-->
 
     <dependencyManagement>
         <dependencies>
-<!--            <dependency>-->
-<!--                <groupId>com.alibaba.cloud</groupId>-->
-<!--                <artifactId>spring-cloud-alibaba-dependencies</artifactId>-->
-<!--                <version>2.1.4.RELEASE</version>-->
-<!--                <type>pom</type>-->
-<!--                <scope>import</scope>-->
-<!--            </dependency>-->
+            <!--            <dependency>-->
+            <!--                <groupId>com.alibaba.cloud</groupId>-->
+            <!--                <artifactId>spring-cloud-alibaba-dependencies</artifactId>-->
+            <!--                <version>2.1.4.RELEASE</version>-->
+            <!--                <type>pom</type>-->
+            <!--                <scope>import</scope>-->
+            <!--            </dependency>-->
             <dependency>
                 <groupId>org.springframework.cloud</groupId>
                 <artifactId>spring-cloud-dependencies</artifactId>
                 <!--Spring Cloud的版本-->
                 <version>Finchley.SR2</version>
-<!--                <version>Greenwich.SR6</version>-->
+                <!--                <version>Greenwich.SR6</version>-->
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -60,10 +60,10 @@
     </distributionManagement>
 
     <dependencies>
-<!--        <dependency>-->
-<!--            <groupId>com.alibaba.cloud</groupId>-->
-<!--            <artifactId>spring-cloud-starter-alibaba-seata</artifactId>-->
-<!--        </dependency>-->
+        <!--        <dependency>-->
+        <!--            <groupId>com.alibaba.cloud</groupId>-->
+        <!--            <artifactId>spring-cloud-starter-alibaba-seata</artifactId>-->
+        <!--        </dependency>-->
         <!--websocket-->
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -97,10 +97,10 @@
             <artifactId>commons-io</artifactId>
             <version>2.11.0</version>
         </dependency>
-<!--        <dependency>-->
-<!--            <groupId>org.springframework.boot</groupId>-->
-<!--            <artifactId>spring-boot-starter-security</artifactId>-->
-<!--        </dependency>-->
+        <!--        <dependency>-->
+        <!--            <groupId>org.springframework.boot</groupId>-->
+        <!--            <artifactId>spring-boot-starter-security</artifactId>-->
+        <!--        </dependency>-->
 
         <!--swagger-->
         <dependency>
@@ -209,7 +209,7 @@
                     <!--包名-->
                     <targetPackage>com.steerinfo.dil</targetPackage>
                     <tables>
-                        <param>DIL_APP_CID</param>
+                        <param>log_result</param>
                     </tables>
                 </configuration>
                 <executions>

src/main/java/com/steerinfo/DilApplicationMain.java

@@ -23,8 +23,9 @@ import org.springframework.scheduling.annotation.EnableScheduling;
 @EnableDiscoveryClient
 public class DilApplicationMain {
     public static void main(String[] args) {
-        SpringApplication.run(DilApplicationMain.class,args);
+        SpringApplication.run(DilApplicationMain.class, args);
     }
+
     @Bean
     public Retryer feignRetryer() {
         // 这里使用一个永不重试的Retryer

src/main/java/com/steerinfo/dil/annotaion/EnableExport.java

@@ -4,6 +4,7 @@ import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
+
 /**
  * 设置允许导出
  */

src/main/java/com/steerinfo/dil/annotaion/EnableExportField.java

@@ -4,6 +4,7 @@ import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
+
 /**
  * 设置该字段允许导出
  * 并且可以设置宽度
@@ -12,5 +13,6 @@ import java.lang.annotation.Target;
 @Retention(RetentionPolicy.RUNTIME)
 public @interface EnableExportField {
     int colWidth() default 100;
+
     String colName();
 }

src/main/java/com/steerinfo/dil/annotaion/ImportIndex.java

@@ -11,5 +11,5 @@ import java.lang.annotation.Target;
 @Target(ElementType.FIELD)
 @Retention(RetentionPolicy.RUNTIME)
 public @interface ImportIndex {
-    int index() ;
+    int index();
 }

src/main/java/com/steerinfo/dil/annotaion/LogAround.java

@@ -10,6 +10,8 @@ import java.lang.annotation.*;
 @Retention(RetentionPolicy.RUNTIME)
 public @interface LogAround {
     String[] foreignKeys();//日志表外键
+
     String[] foreignKeyTypes();//日志表外键类型
+
     String description() default "无";//日志描述
 }

src/main/java/com/steerinfo/dil/annotaion/RequestLimit.java

@@ -10,5 +10,6 @@ import java.lang.annotation.*;
 @Documented
 public @interface RequestLimit {
     int seconds() default 1;//秒
+
     int maxCount() default 100;//最大访问次数
 }

src/main/java/com/steerinfo/dil/aspect/LogAspect.java

@@ -37,20 +37,21 @@ public class LogAspect {
 
     static final Logger log = Logger.getLogger(LogAspect.class);
 
-    private DateFormat format =new SimpleDateFormat("yyyy-MM-dd");
+    private DateFormat format = new SimpleDateFormat("yyyy-MM-dd");
 
 
     /**
      * 定义切入点，所有该注解为切入点
      */
     @Pointcut("@annotation(com.steerinfo.dil.annotaion.LogAround)")
-    public void AroundPointCut(){}
+    public void AroundPointCut() {
+    }
 
     /**
      * 环绕通知 @Around，日志文件同时记录方法的入参出参，数据库只保留成功的出参
+     *
      * @param point
      * @return
-     *
      * @throws Throwable
      */
     @Around("AroundPointCut()")
@@ -59,14 +60,14 @@ public class LogAspect {
         Method method = ((MethodSignature) point.getSignature()).getMethod();
         Object[] requestParams = point.getArgs();
         JSONObject map = null;
-        for(Object param:requestParams){
-            if(param!=null && param instanceof Map){
+        for (Object param : requestParams) {
+            if (param != null && param instanceof Map) {
                 map = JSONObject.parseObject(JSONObject.toJSONString(param));
                 break;
             }
         }
-        if(map==null || map.get("userId")==null ||map.get("userName") ==null){
-            log.error("缺乏日志必要参数"+map);
+        if (map == null || map.get("userId") == null || map.get("userName") == null) {
+            log.error("缺乏日志必要参数" + map);
 //            Map<String,Object> resultMap = new HashMap<>();
 //            resultMap.put("code","500");
 //            resultMap.put("message","缺乏日志必要参数");
@@ -89,77 +90,88 @@ public class LogAspect {
         Date beginTime = new Date();
         //执行方法，并取得返回值
         Object response = null;
-        try{
+        try {
             response = point.proceed();
-        }catch (Exception e){
+        } catch (Exception e) {
             //记录错误日志
-            log.error("执行===" + methodName + "===异常："+ e.getClass().getName());
+            log.error("执行===" + methodName + "===异常：" + e.getClass().getName());
             log.error("方法描述：" + description);
             log.error("方法名：" + signature);
             log.error("方法参数：" + requestParams);
             throw e;
         }
         //解析返回值，记录日志
-        try{
-            RESTfulResult result = JSONObject.parseObject(JSONObject.toJSONString(response),RESTfulResult.class);
+        try {
+            RESTfulResult result = JSONObject.parseObject(JSONObject.toJSONString(response), RESTfulResult.class);
             //获取执行时间
             long exeCost = System.currentTimeMillis() - beginTime.getTime();
-            if(RESTfulResult.SUCCEED.equals(result.getStatus())){
+            if (RESTfulResult.SUCCEED.equals(result.getStatus())) {
                 //执行成功，记录正常日志
                 log.info("方法返回：" + JSON.toJSONString(result));
-                log.info("执行时间（ms）："+exeCost);
+                log.info("执行时间（ms）：" + exeCost);
                 log.info("执行===" + methodName + "===成功");
-                try{
+                try {
                     //data数组
-                    List<Map<String,Object>> datas = new ArrayList<>();
+                    List<Map<String, Object>> datas = new ArrayList<>();
                     //记录到数据库
-                    List<LogResult> logResults=new ArrayList<>();
+                    List<LogResult> logResults = new ArrayList<>();
                     //检查返回data类型
-                    if(result.getData() instanceof Map){
-                        Map<String,Object> data =(Map) result.getData();
+                    if (result.getData() instanceof Map) {
+                        Map<String, Object> data = (Map) result.getData();
                         datas.add(data);
-                    }else if(result.getData() instanceof List){
-                        datas =(List) result.getData();
-                    }else{
+                    } else if (result.getData() instanceof List) {
+                        datas = (List) result.getData();
+                    } else {
                         throw new Exception("无法处理的数据类型！");
                     }
                     //批量处理
-                    for(Map<String,Object> data : datas){
-                        for(int i=0 ; i<foreignKeys.length ; i++){
-                            if(data.get(foreignKeys[i]) != null){
-                                LogResult logResult=new LogResult();
+                    for (Map<String, Object> data : datas) {
+                        for (int i = 0; i < foreignKeys.length; i++) {
+                            if (data.get(foreignKeys[i]) != null) {
+                                LogResult logResult = new LogResult();
                                 logResult.setLogId(logResultMapper.nextId());
                                 logResult.setForeignKeyId(DataChange.dataToBigDecimal(data.get(foreignKeys[i])));
                                 logResult.setForeignKeyType(foreignKeyTypes[i]);
-                                logResult.setLogContent(map.get("userName")+":"+result.getMessage());
-                                logResult.setMethodName(""+signature);
+                                logResult.setLogContent(map.get("userName") + ":" + result.getMessage());
+                                logResult.setMethodName("" + signature);
                                 logResult.setMethodDescription(description);
                                 logResult.setInsertTime(beginTime);
                                 logResult.setExeCost(DataChange.dataToBigDecimal(exeCost));
-                                logResult.setFilePath(logPrefix+format.format(beginTime));
-                                logResult.setInsertUsername(""+map.get("userId"));
+                                logResult.setFilePath(logPrefix + format.format(beginTime));
+                                logResult.setInsertUsername("" + map.get("userId"));
                                 logResult.setRemark("自动记录");
+                                String resultStr = JSON.toJSONString(map);
+                                String info1 = null;
+                                String info2 = null;
+                                if (resultStr.length() > 3000) {
+                                    info1 = resultStr.substring(0,3000);
+                                    info2 = resultStr.substring(3000);
+                                }else{
+                                    info1 = resultStr.toString();
+                                }
+                                logResult.setDatagram1(info1);
+                                logResult.setDatagram2(info2);
                                 logResults.add(logResult);
                             }
                         }
                     }
-                    if(logResults.size() > 0){
+                    if (logResults.size() > 0) {
                         logResultMapper.batchInsert(logResults);
-                    }else{
+                    } else {
                         throw new Exception("目标foreignKey不存在！");
                     }
-                }catch (Exception e){
-                    log.info("记录日志失败："+e.getMessage());
+                } catch (Exception e) {
+                    log.info("记录日志失败：" + e.getMessage());
                 }
-            }else{
+            } else {
                 //记录失败日志
                 log.info("方法返回：" + JSON.toJSONString(result));
-                log.info("执行时间（ms）："+exeCost);
+                log.info("执行时间（ms）：" + exeCost);
                 log.info("执行===" + methodName + "===失败");
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             //记录错误日志
-            log.error("===日志解析、记录失败===：\n"+ e.getMessage());
+            log.error("===日志解析、记录失败===：\n" + e.getMessage());
         }
         return response;
     }

src/main/java/com/steerinfo/dil/config/CorsConfig1.java

@@ -14,7 +14,7 @@ public class CorsConfig1 implements WebMvcConfigurer {
     public void addCorsMappings(CorsRegistry registry) {
         registry.addMapping("/**")
                 .allowedOrigins("*")
-                .allowedMethods("GET","HEAD","POST","PUT","DELETE","OPTIONS")
+                .allowedMethods("GET", "HEAD", "POST", "PUT", "DELETE", "OPTIONS")
                 .allowCredentials(true)
                 .maxAge(3600)
                 .allowedHeaders("*");

src/main/java/com/steerinfo/dil/config/FileUtils.java

@@ -6,7 +6,7 @@ import java.util.List;
 
 public interface FileUtils {
 
-    public List<String> updateFiles(MultipartFile files[])throws Exception;
+    public List<String> updateFiles(MultipartFile files[]) throws Exception;
 
-     public Object downloadFile(String url) throws Exception;
+    public Object downloadFile(String url) throws Exception;
 }

src/main/java/com/steerinfo/dil/config/ImageFileUtils.java

@@ -15,9 +15,9 @@ import java.util.*;
 @Component
 public class ImageFileUtils implements FileUtils {
 
-    @Value(value = "${prefix.filePrefix}" )
+    @Value(value = "${prefix.filePrefix}")
     private String filePrefix;//文件前缀
-    @Value(value = "${filePath}" )
+    @Value(value = "${filePath}")
     private String path;//文件路径
 
     public static final HashMap fileTypes = new HashMap();
@@ -97,6 +97,7 @@ public class ImageFileUtils implements FileUtils {
 
     /**
      * 上传多张图片
+     *
      * @param files
      * @return
      * @throws Exception
@@ -104,14 +105,14 @@ public class ImageFileUtils implements FileUtils {
     @Override
     public synchronized List<String> updateFiles(MultipartFile files[]) throws Exception {
         //首先通过Calendard对象获得年月日
-        Calendar calendar= Calendar.getInstance();
+        Calendar calendar = Calendar.getInstance();
         int year = calendar.get(Calendar.YEAR);
         int month = calendar.get(Calendar.MONTH);
-        int day= calendar.get(Calendar.DAY_OF_MONTH);
+        int day = calendar.get(Calendar.DAY_OF_MONTH);
         //上传文件夹路径
-        List<String> urls=new ArrayList<>();
-        for (int i=0;i<files.length;i++){
-            String url = UploadUtils.uploadFile(files[i], path, File.separator+year+ File.separator+month+ File.separator+day+ File.separator);
+        List<String> urls = new ArrayList<>();
+        for (int i = 0; i < files.length; i++) {
+            String url = UploadUtils.uploadFile(files[i], path, File.separator + year + File.separator + month + File.separator + day + File.separator);
             urls.add(url);
         }
         return urls;
@@ -120,22 +121,24 @@ public class ImageFileUtils implements FileUtils {
 
     /**
      * 上传单个文件
+     *
      * @param file
      * @return
      * @throws Exception
      */
-    public String updateFile(MultipartFile file,long workerId) throws Exception {
+    public String updateFile(MultipartFile file, long workerId) throws Exception {
         //首先通过Calendard对象获得年月日
-        Calendar calendar= Calendar.getInstance();
+        Calendar calendar = Calendar.getInstance();
         int year = calendar.get(Calendar.YEAR);
         int month = calendar.get(Calendar.MONTH);
-        int day= calendar.get(Calendar.DAY_OF_MONTH);
-        String url = filePrefix + UploadUtils.uploadFile(file, path, File.separator+year+ File.separator+month+ File.separator+day+ File.separator);
+        int day = calendar.get(Calendar.DAY_OF_MONTH);
+        String url = filePrefix + UploadUtils.uploadFile(file, path, File.separator + year + File.separator + month + File.separator + day + File.separator);
         return url;
     }
 
     /**
      * 下载图片获得字节码
+     *
      * @param filePath
      * @return
      * @throws Exception
@@ -143,20 +146,18 @@ public class ImageFileUtils implements FileUtils {
     @Override
     public Object downloadFile(String filePath) throws Exception {
         File file = new File(filePath);
-        if(file.isDirectory()){
+        if (file.isDirectory()) {
 
             throw new RuntimeException("当前路径是目录");
 
         }
         byte[] b = bytes(file);
-        String type =getFileHeader(b);
-        String src="data:image/"+type+";base64,"+ Base64.getEncoder().encodeToString(b);
+        String type = getFileHeader(b);
+        String src = "data:image/" + type + ";base64," + Base64.getEncoder().encodeToString(b);
         return src;
     }
 
 
-
-
     /**
      * @return 文件头信息
      * @author liang.pan
@@ -173,9 +174,9 @@ public class ImageFileUtils implements FileUtils {
         //判断什么类型的
         Set set = fileTypes.keySet();
         Iterator iterator = set.iterator();
-        while(iterator.hasNext()){
-            String key=iterator.next().toString();
-            if (value.contains(key)){
+        while (iterator.hasNext()) {
+            String key = iterator.next().toString();
+            if (value.contains(key)) {
                 return fileTypes.get(key).toString();
             }
         }
@@ -211,15 +212,14 @@ public class ImageFileUtils implements FileUtils {
         FileInputStream fin = new FileInputStream(file);
         try {
             //可能溢出,简单起见就不考虑太多,如果太大就要另外想办法，比如一次传入固定长度byte[]
-            byte[] bytes  = new byte[fin.available()];
+            byte[] bytes = new byte[fin.available()];
             //将文件内容写入字节数组，提供测试的case
             fin.read(bytes);
             fin.close();
             return bytes;
-        }catch (Exception ex){
+        } catch (Exception ex) {
             throw ex;
-        }
-        finally {
+        } finally {
             if (null != fin) {
 
                 try {

src/main/java/com/steerinfo/dil/config/MyFeignRequestInterceptor.java

@@ -12,10 +12,10 @@ import org.springframework.context.annotation.Configuration;
  * @className MyFeignRequestInterceptor
  */
 @Configuration
-public class MyFeignRequestInterceptor  implements RequestInterceptor {
+public class MyFeignRequestInterceptor implements RequestInterceptor {
     @Override
     public void apply(RequestTemplate requestTemplate) {
         requestTemplate.header("userId", "lb");
-        requestTemplate.header("userName","lb");
+        requestTemplate.header("userName", "lb");
     }
 }

src/main/java/com/steerinfo/dil/config/RepeatRequestIntercept.java

@@ -20,6 +20,7 @@ import java.util.Objects;
 public class RepeatRequestIntercept extends HandlerInterceptorAdapter {
     @Autowired
     private RedisCache redisUtils;
+
     @Override
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
         //判断请求是否为方法的请求
@@ -37,7 +38,7 @@ public class RepeatRequestIntercept extends HandlerInterceptorAdapter {
             Object requestCountObj = redisUtils.get(key);
             if (Objects.isNull(requestCountObj)) {
                 //若为空则为第一次请求
-                redisUtils.setex(key, 1,"ok");
+                redisUtils.setex(key, 1, "ok");
             } else {
                 //限定时间内的第n次请求
                 int requestCount = Integer.parseInt(requestCountObj.toString());
@@ -54,6 +55,7 @@ public class RepeatRequestIntercept extends HandlerInterceptorAdapter {
         }
         return true;
     }
+
     /**
      * @param response
      * @date 2023-08-10 15:25

src/main/java/com/steerinfo/dil/config/RequestFilter.java

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.steerinfo.dil.aspect.LogAspect;
 import com.steerinfo.dil.mapper.BackgroundProcessingMapper;
+import com.steerinfo.dil.util.DisposeRoleData;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -18,6 +19,7 @@ import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.net.URLDecoder;
+import java.util.List;
 import java.util.Map;
 
 @Component
@@ -25,108 +27,114 @@ public class RequestFilter implements Filter {
     static final Logger log = Logger.getLogger(RequestFilter.class);
 
     @Override
-    public void destroy() {}
+    public void destroy() {
+    }
 
 
     @Resource
     private BackgroundProcessingMapper backgroundProcessingMapper;
 
+    @Resource
+    private DisposeRoleData disposeRoleData;
+
     @Override
-    public void doFilter(ServletRequest request, ServletResponse response,FilterChain chain) throws IOException, ServletException {
-       try{
-           HttpServletRequest httpRequest = (HttpServletRequest) request;
-           String url = httpRequest.getRequestURL().toString();
-           //获取参数，并校验
-           Cookie[] cookies = httpRequest.getCookies();
-           String userId = httpRequest.getHeader("userid");
-           String userName = httpRequest.getHeader("username");
-           String orgCode = httpRequest.getHeader("orgcode");
-           String roleCodes = httpRequest.getHeader("rolecodes");
-           String dilCompanyList = httpRequest.getHeader("dilCompanyList");
-           String rootCompanyMap = httpRequest.getHeader("rootCompanyMap");
-           String accessToken = httpRequest.getHeader("accessToken");
-           String urlFlag = httpRequest.getHeader("urlFlag");
-           //获取cookie用户数据
-           if (cookies != null && cookies.length > 0) {
-               for (Cookie cookie : cookies) {
-                   if (cookie.getName().equals("userId") && userId == null) {
-                       userId = cookie.getValue();
-                   } else if (cookie.getName().equals("userName") && userName == null) {
-                       userName = URLDecoder.decode(cookie.getValue(), "utf-8");
-                   } else if (cookie.getName().equals("orgCode") && orgCode == null) {
-                       orgCode = URLDecoder.decode(cookie.getValue(), "utf-8");
-                   } else if (cookie.getName().equals("roleCodes") && roleCodes == null) {
-                       roleCodes = URLDecoder.decode(cookie.getValue(), "utf-8");
-                   } else if (cookie.getName().equals("dilCompanyList") && dilCompanyList == null) {
-                       dilCompanyList = URLDecoder.decode(cookie.getValue(),"utf-8");
-                   } else if (cookie.getName().equals("rootCompanyMap") && rootCompanyMap == null) {
-                       rootCompanyMap = URLDecoder.decode(cookie.getValue(),"utf-8");
-                   } else if (cookie.getName().equals("accessToken") && accessToken == null) {
-                       accessToken = URLDecoder.decode(cookie.getValue(), "utf-8");
-                   }else if (cookie.getName().equals("urlFlag") && urlFlag == null) {
-                       urlFlag = URLDecoder.decode(cookie.getValue(), "utf-8");
-                   }
-                   else if (userId != null && userName != null && orgCode != null && roleCodes != null && dilCompanyList != null && rootCompanyMap != null && urlFlag != null && accessToken != null) {
-                       //都查到了，退出
-                       break;
-                   }
-               }
-           }
-           try {
-               userName = URLDecoder.decode(userName, "utf-8");
-               orgCode = URLDecoder.decode(orgCode, "utf-8");
-               roleCodes = URLDecoder.decode(roleCodes, "utf-8");
-               dilCompanyList = URLDecoder.decode(dilCompanyList,"UTF-8");
-               rootCompanyMap = URLDecoder.decode(rootCompanyMap,"utf-8");
-               urlFlag = URLDecoder.decode(urlFlag,"utf-8");
-               //System.out.println(dilCompanyList.getClass().toString());
-           }catch (Exception e){}
-           httpRequest.setAttribute("userId", userId);
-           httpRequest.setAttribute("userName", userName);
-           httpRequest.setAttribute("orgCode", orgCode);
-           Object roleCodesObject = JSONObject.parse(roleCodes);
-           httpRequest.setAttribute("roleCodes", roleCodesObject);
-           //Object dilCompanyListObject = JSONObject.parse(dilCompanyList);
-           Object dilCompanyListObject =  backgroundProcessingMapper.getCompanyList(userId);
-           httpRequest.setAttribute("dilCompanyList",dilCompanyListObject);
-           Object rootCompanyMapObject = JSONObject.parse(rootCompanyMap);
-           httpRequest.setAttribute("rootCompanyMap",rootCompanyMapObject);
-           httpRequest.setAttribute("urlFlag",urlFlag);
-           //获取RequestBody数据
-           BufferedReader streamReader = new BufferedReader(new InputStreamReader(request.getInputStream(), "UTF-8"));
-           StringBuilder strBuilder = new StringBuilder();
-           String inputStr;
-           while ((inputStr = streamReader.readLine()) != null) {
-               strBuilder.append(inputStr);
-           }
-           if (strBuilder != null && !"".equals(strBuilder.toString())) {
-               //有请求体则写入userId和userName，保存
-               JSONObject params = JSONObject.parseObject(strBuilder.toString());
-               params.put("userId", userId);
-               params.put("userName", userName);
-               params.put("orgCode", orgCode);
-               params.put("roleCodes",roleCodesObject);
-               params.put("dilCompanyList",dilCompanyListObject);
-               params.put("rootCompanyMap",rootCompanyMapObject);
-               params.put("accessToken",accessToken);
-               params.put("urlFlag",urlFlag);
-               log.debug("url:"+url);
-               log.debug("params:"+params.toJSONString());
-               //将新的RequestBody写入新的请求对象保存
-               ServletRequest requestWrapper = new RequestWrapper(httpRequest, params.toJSONString());
-               chain.doFilter(requestWrapper, response);
-           } else {
-               log.info("无请求体，使用原生请求处理!");
-               chain.doFilter(request, response);
-           }
-       } catch (Exception e) {
-           log.info("过滤失败，使用原生请求处理！");
-           log.info(e.getMessage());
-           e.printStackTrace();
-           chain.doFilter(request, response);
-       }
+    public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
+        try {
+            HttpServletRequest httpRequest = (HttpServletRequest) request;
+            String url = httpRequest.getRequestURL().toString();
+            //获取参数，并校验
+            Cookie[] cookies = httpRequest.getCookies();
+            String userId = httpRequest.getHeader("userid");
+            String userName = httpRequest.getHeader("username");
+            String orgCode = httpRequest.getHeader("orgcode");
+            String roleCodes = httpRequest.getHeader("rolecodes");
+            String dilCompanyList = httpRequest.getHeader("dilCompanyList");
+            String rootCompanyMap = httpRequest.getHeader("rootCompanyMap");
+            String accessToken = httpRequest.getHeader("accessToken");
+            String urlFlag = httpRequest.getHeader("urlFlag");
+            //获取cookie用户数据
+            if (cookies != null && cookies.length > 0) {
+                for (Cookie cookie : cookies) {
+                    if (cookie.getName().equals("userId") && userId == null) {
+                        userId = cookie.getValue();
+                    } else if (cookie.getName().equals("userName") && userName == null) {
+                        userName = URLDecoder.decode(cookie.getValue(), "utf-8");
+                    } else if (cookie.getName().equals("orgCode") && orgCode == null) {
+                        orgCode = URLDecoder.decode(cookie.getValue(), "utf-8");
+                    } else if (cookie.getName().equals("roleCodes") && roleCodes == null) {
+                        roleCodes = URLDecoder.decode(cookie.getValue(), "utf-8");
+                    } else if (cookie.getName().equals("dilCompanyList") && dilCompanyList == null) {
+                        dilCompanyList = URLDecoder.decode(cookie.getValue(), "utf-8");
+                    } else if (cookie.getName().equals("rootCompanyMap") && rootCompanyMap == null) {
+                        rootCompanyMap = URLDecoder.decode(cookie.getValue(), "utf-8");
+                    } else if (cookie.getName().equals("accessToken") && accessToken == null) {
+                        accessToken = URLDecoder.decode(cookie.getValue(), "utf-8");
+                    } else if (cookie.getName().equals("urlFlag") && urlFlag == null) {
+                        urlFlag = URLDecoder.decode(cookie.getValue(), "utf-8");
+                    } else if (userId != null && userName != null && orgCode != null && roleCodes != null && dilCompanyList != null && rootCompanyMap != null && urlFlag != null && accessToken != null) {
+                        //都查到了，退出
+                        break;
+                    }
+                }
+            }
+            try {
+                userName = URLDecoder.decode(userName, "utf-8");
+                orgCode = URLDecoder.decode(orgCode, "utf-8");
+                roleCodes = URLDecoder.decode(roleCodes, "utf-8");
+                dilCompanyList = URLDecoder.decode(dilCompanyList, "UTF-8");
+                rootCompanyMap = URLDecoder.decode(rootCompanyMap, "utf-8");
+                urlFlag = URLDecoder.decode(urlFlag, "utf-8");
+                //System.out.println(dilCompanyList.getClass().toString());
+            } catch (Exception e) {
+            }
+            httpRequest.setAttribute("userId", userId);
+            httpRequest.setAttribute("userName", userName);
+            httpRequest.setAttribute("orgCode", orgCode);
+            Object roleCodesObject = JSONObject.parse(roleCodes);
+            httpRequest.setAttribute("roleCodes", roleCodesObject);
+            //Object dilCompanyListObject = JSONObject.parse(dilCompanyList);
+            Object dilCompanyListObject = backgroundProcessingMapper.getCompanyList(userId);
+            httpRequest.setAttribute("dilCompanyList", dilCompanyListObject);
+            Object rootCompanyMapObject = JSONObject.parse(rootCompanyMap);
+            httpRequest.setAttribute("rootCompanyMap", rootCompanyMapObject);
+            httpRequest.setAttribute("urlFlag", urlFlag);
+            //获取RequestBody数据
+            BufferedReader streamReader = new BufferedReader(new InputStreamReader(request.getInputStream(), "UTF-8"));
+            StringBuilder strBuilder = new StringBuilder();
+            String inputStr;
+            while ((inputStr = streamReader.readLine()) != null) {
+                strBuilder.append(inputStr);
+            }
+            if (strBuilder != null && !"".equals(strBuilder.toString())) {
+                //有请求体则写入userId和userName，保存
+                JSONObject params = JSONObject.parseObject(strBuilder.toString());
+                params.put("userId", userId == null ? "无" : userId);
+                params.put("userName", userName == null ? "无" : userName);
+                params.put("orgCode", orgCode == null ? "无" : orgCode);
+                params.put("roleCodes", roleCodesObject);
+                params.put("dilCompanyList", dilCompanyListObject);
+                params.put("rootCompanyMap", rootCompanyMapObject);
+                params.put("accessToken", accessToken);
+                params.put("urlFlag", urlFlag);
+                log.debug("url:" + url);
+                log.debug("params:" + params.toJSONString());
+                //将新的RequestBody写入新的请求对象保存
+                ServletRequest requestWrapper = new RequestWrapper(httpRequest, params.toJSONString());
+                chain.doFilter(requestWrapper, response);
+            } else {
+                log.info("无请求体，使用原生请求处理!");
+                chain.doFilter(request, response);
+            }
+        } catch (Exception e) {
+            log.info("过滤失败，使用原生请求处理！");
+            log.info(e.getMessage());
+            e.printStackTrace();
+            chain.doFilter(request, response);
+        }
     }
+
     @Override
-    public void init(FilterConfig arg0) throws ServletException {}
+    public void init(FilterConfig arg0) throws ServletException {
+    }
 }
 

src/main/java/com/steerinfo/dil/config/RequestWrapper.java

@@ -11,13 +11,14 @@ public class RequestWrapper extends HttpServletRequestWrapper {
     //保存请求数据
     private final String body;
 
-    public RequestWrapper(HttpServletRequest request,String body){
+    public RequestWrapper(HttpServletRequest request, String body) {
         super(request);
         this.body = body;
     }
 
     /**
      * 重写流
+     *
      * @return
      * @throws IOException
      */
@@ -29,13 +30,16 @@ public class RequestWrapper extends HttpServletRequestWrapper {
             public boolean isFinished() {
                 return false;
             }
+
             @Override
             public boolean isReady() {
                 return false;
             }
+
             @Override
             public void setReadListener(ReadListener readListener) {
             }
+
             @Override
             public int read() throws IOException {
                 return byteArrayInputStream.read();

src/main/java/com/steerinfo/dil/config/SessionInterceptor.java

@@ -29,57 +29,57 @@ import java.util.Map;
 public class SessionInterceptor extends HandlerInterceptorAdapter {
 
     //暂时使用Map当做Redis缓存
-    private static Map<String,Integer> redisUtil = new HashMap<>();
+    private static Map<String, Integer> redisUtil = new HashMap<>();
 
     @Override
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
         HandlerMethod hm = (HandlerMethod) handler;
         String requestUrl = "" + request.getRequestURL();
-        if(!requestUrl.contains("/api/v1/bp/bpLogin")
+        if (!requestUrl.contains("/api/v1/bp/bpLogin")
                 && !requestUrl.contains("/api/v1/ams/dispatch")
                 && !requestUrl.contains("/api/v1/report/updateOperateDaily")
                 && !requestUrl.contains("/api/v1/uc/")
                 && !requestUrl.contains("/api/v1/systemfiles/")
                 && !requestUrl.contains("/api/v1/rms/insertPersonnel")
-                && (request.getAttribute("userId")==null || request.getAttribute("userName")==null)){
+                && (request.getAttribute("userId") == null || request.getAttribute("userName") == null)) {
             //无权访问
             response.setCharacterEncoding("UTF-8");
             response.setContentType("application/json; charset=utf-8");
-            RESTfulResult result =new RESTfulResult("500", "无权访问111", "无权访问");
+            RESTfulResult result = new RESTfulResult("500", "无权访问111", "无权访问");
             response.getWriter().write(JSONObject.toJSONString(result));
             return false;
         }
         //获取方法中的注解,看是否有该注解
         RequestLimit requestLimit = hm.getMethodAnnotation(RequestLimit.class);
-        if(requestLimit != null){
-            try{
+        if (requestLimit != null) {
+            try {
                 String userId = "" + request.getAttribute("userId");
                 String userName = "" + request.getAttribute("userName");
                 int seconds = requestLimit.seconds();
                 int maxCount = requestLimit.maxCount();
                 String methodName = hm.getMethod().getName();
                 //获取请求体
-                BufferedReader streamReader = new BufferedReader( new InputStreamReader(request.getInputStream(), "UTF-8"));
+                BufferedReader streamReader = new BufferedReader(new InputStreamReader(request.getInputStream(), "UTF-8"));
                 StringBuilder strBuilder = new StringBuilder();
                 String inputStr;
                 while ((inputStr = streamReader.readLine()) != null) {
                     strBuilder.append(inputStr);
                 }
-                Integer count = redisUtil.get(methodName+userId);
-                if(count ==null || count < maxCount){
+                Integer count = redisUtil.get(methodName + userId);
+                if (count == null || count < maxCount) {
                     //未超出，+1
-                    count = (count == null ?  0 : count+1);
-                    redisUtil.put( methodName+userId, count);
-                }else{
+                    count = (count == null ? 0 : count + 1);
+                    redisUtil.put(methodName + userId, count);
+                } else {
                     //超出访问次数
-                    log.info("访问"+methodName+"方法过快，用户  ===> " + userId + " 且在   " + seconds + " 秒内超过最大限制  ===> " + maxCount + " 次数达到    ====> " + count);
+                    //log.info("访问"+methodName+"方法过快，用户  ===> " + userId + " 且在   " + seconds + " 秒内超过最大限制  ===> " + maxCount + " 次数达到    ====> " + count);
                     response.setCharacterEncoding("UTF-8");
                     response.setContentType("application/json; charset=utf-8");
-                    RESTfulResult result =new RESTfulResult("500", "访问过快，请稍后再试", "访问过快，请稍后再试");
+                    RESTfulResult result = new RESTfulResult("500", "访问过快，请稍后再试", "访问过快，请稍后再试");
                     response.getWriter().write(JSONObject.toJSONString(result));
                     return false;
                 }
-            }catch (Exception e){
+            } catch (Exception e) {
                 e.printStackTrace();
             }
         }

src/main/java/com/steerinfo/dil/config/SqlInjectFilter.java

@@ -2,8 +2,10 @@ package com.steerinfo.filter;
 
 import java.io.IOException;
 import java.util.Enumeration;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import javax.servlet.Filter;
 import javax.servlet.FilterChain;
 import javax.servlet.FilterConfig;
@@ -13,6 +15,7 @@ import javax.servlet.ServletResponse;
 import javax.servlet.annotation.WebFilter;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.stereotype.Component;
 import com.alibaba.fastjson.JSONArray;
@@ -23,7 +26,6 @@ import com.steerinfo.framework.controller.RESTfulResult;
  * SQL注入过滤器
  *
  * @author CL
- *
  */
 /*@Component
 @ConfigurationProperties(prefix = "security.sql")
@@ -65,7 +67,7 @@ public class SqlInjectFilter implements Filter {
                 strparams = strparams + " " + value[i];
             }
         }
-        if (sqlValidate(sql) ) { //&& !requestUriMb.contains("executeSqlDataWf")
+        if (sqlValidate(sql)) { //&& !requestUriMb.contains("executeSqlDataWf")
             // res.sendRedirect("error.jsp");
             log.info("发现sql注入:" + strparams);
             String msg = "非法请求参数,请检查后再进行操作";

src/main/java/com/steerinfo/dil/config/WebExceptionHandler.java

@@ -13,16 +13,16 @@ public class WebExceptionHandler {
 
     static final Logger log = Logger.getLogger(WebExceptionHandler.class);
 
-    @ExceptionHandler(value =Exception.class)
+    @ExceptionHandler(value = Exception.class)
     @ResponseBody
-    public RESTfulResult exceptionHandler(Exception e){
-        log.error("全局异常捕获:"+e);
+    public RESTfulResult exceptionHandler(Exception e) {
+        log.error("全局异常捕获:" + e);
         e.printStackTrace();
-        if(e instanceof NullPointerException){
+        if (e instanceof NullPointerException) {
             return new RESTfulResult("500", "操作失败：缺乏必要参数！", e);
-        }else if(e instanceof ParseException){
+        } else if (e instanceof ParseException) {
             return new RESTfulResult("500", "操作失败：格式转换异常！", e);
         }
-        return new RESTfulResult("500", "操作失败:"+e.getMessage(), e);
+        return new RESTfulResult("500", "操作失败:" + e.getMessage(), e);
     }
 }

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

@@ -3,6 +3,7 @@ package com.steerinfo.dil.controller;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.steerinfo.dil.annotaion.LogAround;
 import com.steerinfo.dil.feign.AmsFeign;
+import com.steerinfo.dil.feign.TmsFeign;
 import com.steerinfo.dil.util.BaseRESTfulController;
 import com.steerinfo.dil.util.ExcelToolUtils;
 import com.steerinfo.framework.controller.RESTfulResult;
@@ -30,10 +31,13 @@ import java.util.Map;
  */
 @RestController
 @RequestMapping("${api.version}/ams")
-public class AMScontroller  extends BaseRESTfulController {
+public class AMScontroller extends BaseRESTfulController {
     @Autowired
     AmsFeign amsFeign;
 
+    @Autowired
+    TmsFeign tmsFeign;
+
     @ApiOperation(value = "展示采购订单详情")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "参数", required = false, dataType = "map"),
@@ -110,18 +114,18 @@ public class AMScontroller  extends BaseRESTfulController {
     @LogAround(foreignKeys = {"transRequirementId"}, foreignKeyTypes = {"采购需求"})
     public Map<String, Object> productionRequirementAdd(@RequestBody(required = false) Map<String, Object> map) throws ParseException {
         map.put("insertUsername", map.get("userName").toString());
-        if (map.containsKey("requirementStartTime")){
+        if (map.containsKey("requirementStartTime")) {
             SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             Date requirementStartTime = simpleDateFormat.parse(map.get("requirementStartTime").toString());
             map.put("requirementStartTime", requirementStartTime);
         }
 
-        if (map.containsKey("requirementEndTime")){
+        if (map.containsKey("requirementEndTime")) {
             SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             Date requirementEndTime = simpleDateFormat.parse(map.get("requirementEndTime").toString());
             map.put("requirementEndTime", requirementEndTime);
         }
-        if (map.containsKey("dueTime")){
+        if (map.containsKey("dueTime")) {
             SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             Date dueTime = simpleDateFormat.parse(map.get("dueTime").toString());
             map.put("dueTime", dueTime);
@@ -158,6 +162,7 @@ public class AMScontroller  extends BaseRESTfulController {
     public Map<String, Object> purchaseRequirementChange(@RequestBody(required = false) Map<String, Object> map) {
         return amsFeign.purchaseRequirementChange(map);
     }
+
     @ApiOperation(value = "生产需求修改接口", notes = "生产需求修改接口")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "map", value = "json格式具体参数", required = true, dataType = "Map<String,Object>")
@@ -177,18 +182,18 @@ public class AMScontroller  extends BaseRESTfulController {
     @PostMapping(value = "/productionRequirementBatchUpdate")
     public Map<String, Object> productionRequirementBatchUpdate(@RequestBody(required = false) Map<String, Object> map) throws ParseException {
         map.put("insertUsername", map.get("userName").toString());
-        if (map.containsKey("requirementStartTime")){
+        if (map.containsKey("requirementStartTime")) {
             SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             Date requirementStartTime = simpleDateFormat.parse(map.get("requirementStartTime").toString());
             map.put("requirementStartTime", requirementStartTime);
         }
 
-        if (map.containsKey("requirementEndTime")){
+        if (map.containsKey("requirementEndTime")) {
             SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             Date requirementEndTime = simpleDateFormat.parse(map.get("requirementEndTime").toString());
             map.put("requirementEndTime", requirementEndTime);
         }
-        if (map.containsKey("dueTime")){
+        if (map.containsKey("dueTime")) {
             SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             Date dueTime = simpleDateFormat.parse(map.get("dueTime").toString());
             map.put("dueTime", dueTime);
@@ -225,9 +230,9 @@ public class AMScontroller  extends BaseRESTfulController {
     })
     @PostMapping(value = "/getproductionRequirementList")
     Map<String, Object> getproductionRequirementList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                                   Integer apiId,
-                                                   Integer pageNum,
-                                                   Integer pageSize
+                                                     Integer apiId,
+                                                     Integer pageNum,
+                                                     Integer pageSize
     ) {
         return amsFeign.getproductionRequirementList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
     }
@@ -235,16 +240,16 @@ public class AMScontroller  extends BaseRESTfulController {
     @ApiOperation(value = "展示生产需求详情-大宗")
     @PostMapping(value = "/getProductionRequirementListDz")
     Map<String, Object> getProductionRequirementListDz(@RequestBody(required = false) Map<String, Object> mapValue,
-                                                     Integer apiId,
-                                                     Integer pageNum,
-                                                     Integer pageSize
+                                                       Integer apiId,
+                                                       Integer pageNum,
+                                                       Integer pageSize
     ) {
         return amsFeign.getProductionRequirementListDz(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
     }
 
     @ApiOperation(value = "修改通知单环保状态")
     @PostMapping(value = "/updateEnvironmentStatus")
-    @LogAround(foreignKeys = {"transRequirementId"},foreignKeyTypes = {"调拨通知单"},description = "修改通知单环保状态")
+    @LogAround(foreignKeys = {"transRequirementId"}, foreignKeyTypes = {"调拨通知单"}, description = "修改通知单环保状态")
     Map<String, Object> updateEnvironmentStatus(@RequestBody(required = false) Map<String, Object> mapValue) {
         return amsFeign.updateEnvironmentStatus(mapValue);
     }
@@ -252,7 +257,7 @@ public class AMScontroller  extends BaseRESTfulController {
 
     @ApiOperation(value = "修改通知单环保状态")
     @PostMapping(value = "/transProductRequirementFromDz")
-    @LogAround(foreignKeys = {"transRequirementId"},foreignKeyTypes = {"调拨通知单"},description = "修改通知单环保状态")
+    @LogAround(foreignKeys = {"transRequirementId"}, foreignKeyTypes = {"调拨通知单"}, description = "修改通知单环保状态")
     Map<String, Object> transProductRequirementFromDz(@RequestBody(required = false) Map<String, Object> mapValue) {
         return amsFeign.transProductRequirementFromDz(mapValue);
     }
@@ -299,13 +304,13 @@ public class AMScontroller  extends BaseRESTfulController {
         return amsFeign.purchasePlanAdd(map);
     }
 
-@ApiOperation(value = "采购计划修改接口", notes = "采购计划修改接口")
+    @ApiOperation(value = "采购计划修改接口", notes = "采购计划修改接口")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "map", value = "json格式具体参数", required = true, dataType = "Map<String,Object>")
     })
     @PostMapping(value = "/purchasePlanUpdate")
-    @LogAround(foreignKeys = {"transPlanId"},foreignKeyTypes = {"采购计划"})
-    public Map<String, Object> purchasePlanUpdate(@RequestBody(required = false) Map<String ,Object> map) {
+    @LogAround(foreignKeys = {"transPlanId"}, foreignKeyTypes = {"采购计划"})
+    public Map<String, Object> purchasePlanUpdate(@RequestBody(required = false) Map<String, Object> map) {
         return amsFeign.purchasePlanUpdate(map);
     }
 
@@ -314,8 +319,8 @@ public class AMScontroller  extends BaseRESTfulController {
             @ApiImplicitParam(name = "map", value = "json格式具体参数", required = true, dataType = "Map<String,Object>")
     })
     @PostMapping(value = "/purchasePlanChange")
-    @LogAround(foreignKeys = {"transPlanId"},foreignKeyTypes = {"采购计划"})
-    public Map<String, Object> purchasePlanChange(@RequestBody(required = false) Map<String ,Object> map) {
+    @LogAround(foreignKeys = {"transPlanId"}, foreignKeyTypes = {"采购计划"})
+    public Map<String, Object> purchasePlanChange(@RequestBody(required = false) Map<String, Object> map) {
         return amsFeign.purchasePlanChange(map);
     }
 
@@ -325,20 +330,21 @@ public class AMScontroller  extends BaseRESTfulController {
             @ApiImplicitParam(name = "map", value = "json格式具体参数", required = true, dataType = "Map<String,Object>")
     })
     @PostMapping(value = "/purchaseTrainPlanDelete")
-    @LogAround(foreignKeys = {"transPlanId"},foreignKeyTypes = {"采购计划"})
-    public Map<String, Object> purchaseTrainPlanDelete(@RequestBody(required = false) Map<String ,Object> map) {
+    @LogAround(foreignKeys = {"transPlanId"}, foreignKeyTypes = {"采购计划"})
+    public Map<String, Object> purchaseTrainPlanDelete(@RequestBody(required = false) Map<String, Object> map) {
         return amsFeign.purchaseTrainPlanDelete(map);
     }
 
 
     @ApiOperation(value = "采购火运计划批量删除接口", notes = "采购火运计划批量删除接口")
     @PostMapping(value = "/purchaseTrainPlanBatchDel")
-    @LogAround(foreignKeys = {"transPlanId"},foreignKeyTypes = {"采购计划"})
-    public Map<String, Object> purchaseTrainPlanBatchDel(@RequestBody(required = false) Map<String ,Object> map) {
+    @LogAround(foreignKeys = {"transPlanId"}, foreignKeyTypes = {"采购计划"})
+    public Map<String, Object> purchaseTrainPlanBatchDel(@RequestBody(required = false) Map<String, Object> map) {
         return amsFeign.purchaseTrainPlanBatchDel(map);
     }
 
-    @ApiOperation(value="同步销售订单")    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @ApiOperation(value = "同步销售订单")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
     @PostMapping(value = "/saleOrderSync")
     @LogAround(foreignKeys = {"orderId"}, foreignKeyTypes = {"销售订单"})
     public Map<String, Object> saleOrderSync(@RequestBody(required = false) Map<String, Object> map) {
@@ -364,7 +370,7 @@ public class AMScontroller  extends BaseRESTfulController {
     @LogAround(foreignKeys = {"priceId"}, foreignKeyTypes = {"承运合同"})
     @PostMapping("/addAmsTransPrice")
     public Map<String, Object> insertTransPrice(@RequestBody(required = false) Map<String, Object> map) throws ParseException {
-        if (map.containsKey("priceDate")){
+        if (map.containsKey("priceDate")) {
             SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             Date priceDate = simpleDateFormat.parse(map.get("priceDate").toString());
             map.put("priceDate", priceDate);
@@ -389,10 +395,10 @@ public class AMScontroller  extends BaseRESTfulController {
         return amsFeign.logicdelete(map);
     }
 
-    @ApiOperation(value="同步NC销售合同")
+    @ApiOperation(value = "同步NC销售合同")
     @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
     @PostMapping(value = "/saleContractSync")
-    @LogAround(foreignKeys = {"orderId"},foreignKeyTypes = {"销售合同"})
+    @LogAround(foreignKeys = {"orderId"}, foreignKeyTypes = {"销售合同"})
     public Map<String, Object> saleContractSync(@RequestBody(required = false) HashMap<String, Object> map) {
         return amsFeign.saleContractSync(map);
     }
@@ -407,10 +413,11 @@ public class AMScontroller  extends BaseRESTfulController {
     })
     @PostMapping(value = "/getSalaryContrac")
     public Map<String, Object> getAmsSalaryContracList(@RequestBody(required = false) Map<String, Object> map, Integer apiId,
-                                                    Integer pageNum,
-                                                    Integer pageSize) {
+                                                       Integer pageNum,
+                                                       Integer pageSize) {
         return amsFeign.getAmsSalaryContracList(map == null ? new HashMap<>() : map, apiId, pageNum, pageSize);
     }
+
     @ApiOperation(value = "新增工资合同")
     @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
     @LogAround(foreignKeys = {"contractId"}, foreignKeyTypes = {"工资合同"})
@@ -455,11 +462,11 @@ public class AMScontroller  extends BaseRESTfulController {
     }
 
     @PostMapping(value = "/readExcel")
-    public RESTfulResult readExcel(MultipartFile file,@RequestParam("userCode") String userCode)  {
+    public RESTfulResult readExcel(MultipartFile file, @RequestParam("userCode") String userCode) {
         return amsFeign.readExcel(file, userCode);
     }
 
-    @ApiOperation(value="展示销售需求")
+    @ApiOperation(value = "展示销售需求")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "参数", required = false, dataType = "map"),
             @ApiImplicitParam(name = "apiId()", value = "动态表头", required = false, dataType = "Integer"),
@@ -467,11 +474,11 @@ public class AMScontroller  extends BaseRESTfulController {
             @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
     })
     @PostMapping(value = "/selectDlivDirNo")
-    Map<String, Object> selectDlivDirNo(@RequestBody(required=false) HashMap<String,Object> mapValue,
+    Map<String, Object> selectDlivDirNo(@RequestBody(required = false) HashMap<String, Object> mapValue,
                                         Integer apiId,
                                         Integer pageNum,
-                                        Integer pageSize){
-        return amsFeign.selectDlivDirNo(mapValue == null ? new HashMap<>() : mapValue,apiId,pageNum,pageSize);
+                                        Integer pageSize) {
+        return amsFeign.selectDlivDirNo(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
     }
 
     @ApiOperation(value = "修改发货单状态", notes = "修改发货单状态")
@@ -517,7 +524,7 @@ public class AMScontroller  extends BaseRESTfulController {
     }
 
 
-    @ApiOperation(value="展示销售合同")
+    @ApiOperation(value = "展示销售合同")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "参数", required = false, dataType = "map"),
             @ApiImplicitParam(name = "apiId()", value = "动态表头", required = false, dataType = "Integer"),
@@ -525,15 +532,15 @@ public class AMScontroller  extends BaseRESTfulController {
             @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
     })
     @PostMapping(value = "/selectSaleContractPage")
-    Map<String, Object> selectSaleContractPage(@RequestBody(required=false) Map<String,Object> mapValue,
-                                                   Integer apiId,
-                                                   Integer pageNum,
-                                                   Integer pageSize){
-        return amsFeign.selectSaleContractPage(mapValue == null ? new HashMap<>() : mapValue,apiId,pageNum,pageSize);
+    Map<String, Object> selectSaleContractPage(@RequestBody(required = false) Map<String, Object> mapValue,
+                                               Integer apiId,
+                                               Integer pageNum,
+                                               Integer pageSize) {
+        return amsFeign.selectSaleContractPage(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
     }
 
 
-    @ApiOperation(value="展示销售订单")
+    @ApiOperation(value = "展示销售订单")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "参数", required = false, dataType = "map"),
             @ApiImplicitParam(name = "apiId()", value = "动态表头", required = false, dataType = "Integer"),
@@ -541,11 +548,11 @@ public class AMScontroller  extends BaseRESTfulController {
             @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
     })
     @PostMapping(value = "/selectSaleOrderPage")
-    Map<String, Object> selectSaleOrderPage(@RequestBody(required=false) Map<String,Object> mapValue,
-                                               Integer apiId,
-                                               Integer pageNum,
-                                               Integer pageSize){
-        return amsFeign.selectSaleOrderPage(mapValue == null ? new HashMap<>() : mapValue,apiId,pageNum,pageSize);
+    Map<String, Object> selectSaleOrderPage(@RequestBody(required = false) Map<String, Object> mapValue,
+                                            Integer apiId,
+                                            Integer pageNum,
+                                            Integer pageSize) {
+        return amsFeign.selectSaleOrderPage(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
     }
 
 
@@ -569,8 +576,6 @@ public class AMScontroller  extends BaseRESTfulController {
     }
 
 
-
-
     @ApiOperation(value = "展示生产订单详情")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "参数", required = false, dataType = "map"),
@@ -580,12 +585,13 @@ public class AMScontroller  extends BaseRESTfulController {
     })
     @PostMapping(value = "/getproductionPlanList")
     Map<String, Object> getproductionPlanList(@RequestBody(required = false) Map<String, Object> map,
-                                             Integer apiId,
-                                             Integer pageNum,
-                                             Integer pageSize
+                                              Integer apiId,
+                                              Integer pageNum,
+                                              Integer pageSize
     ) {
         return amsFeign.getproductionPlanList(map == null ? new HashMap<>() : map, apiId, pageNum, pageSize);
     }
+
     @ApiOperation(value = "生产计划新增接口", notes = "生产计划新增接口")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "map", value = "json格式具体参数", required = true, dataType = "Map<String,Object>")
@@ -595,6 +601,7 @@ public class AMScontroller  extends BaseRESTfulController {
     public Map<String, Object> productionPlanChange(@RequestBody(required = false) Map<String, Object> map) {
         return amsFeign.productionPlanChange(map);
     }
+
     @ApiOperation(value = "生产计划新增接口", notes = "生产计划新增接口")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "map", value = "json格式具体参数", required = true, dataType = "Map<String,Object>")
@@ -604,6 +611,7 @@ public class AMScontroller  extends BaseRESTfulController {
     public Map<String, Object> productionPlanlogicdelete(@RequestBody(required = false) Map<String, Object> map) {
         return amsFeign.productionPlanlogicdelete(map);
     }
+
     @ApiOperation(value = "生产需求逻辑删除", notes = "生产需求逻辑删除")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "map", value = "json格式具体参数", required = true, dataType = "Map<String,Object>")
@@ -653,9 +661,9 @@ public class AMScontroller  extends BaseRESTfulController {
     })
     @PostMapping(value = "/getSalePlanList")
     Map<String, Object> getSalePlanList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                            Integer apiId,
-                                            Integer pageNum,
-                                            Integer pageSize
+                                        Integer apiId,
+                                        Integer pageNum,
+                                        Integer pageSize
     ) {
         return amsFeign.getSalePlanList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
     }
@@ -687,8 +695,8 @@ public class AMScontroller  extends BaseRESTfulController {
     })
     @PostMapping(value = "/productionRequirementChanges/{id}")
     @LogAround(foreignKeys = {"transRequirementId"}, foreignKeyTypes = {"生产需求"})
-    public Map<String, Object> productionRequirementChanges(@PathVariable String id,@RequestBody(required = false) Map<String, Object> map) {
-        return amsFeign.productionRequirementChanges(id,map);
+    public Map<String, Object> productionRequirementChanges(@PathVariable String id, @RequestBody(required = false) Map<String, Object> map) {
+        return amsFeign.productionRequirementChanges(id, map);
     }
 
     @ApiOperation(value = "查询派单时需要的发运单信息", notes = "查询派单时需要的发运单信息")
@@ -699,6 +707,7 @@ public class AMScontroller  extends BaseRESTfulController {
     public RESTfulResult selectPlanChildById(@PathVariable("planChildId") String planChildId) {
         return amsFeign.selectPlanChildById(planChildId);
     }
+
     @ApiOperation(value = "展示生产订单审批详情")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "参数", required = false, dataType = "map"),
@@ -708,16 +717,16 @@ public class AMScontroller  extends BaseRESTfulController {
     })
     @PostMapping(value = "/getproductionRequirementworkflowList")
     Map<String, Object> getproductionRequirementworkflowList(@RequestBody(required = false) Map<String, Object> map,
-                                              Integer apiId,
-                                              Integer pageNum,
-                                              Integer pageSize
+                                                             Integer apiId,
+                                                             Integer pageNum,
+                                                             Integer pageSize
     ) {
         return amsFeign.getproductionRequirementworkflowList(map == null ? new HashMap<>() : map, apiId, pageNum, pageSize);
 
     }
 
 
-    @ApiOperation(value="展示销售合同")
+    @ApiOperation(value = "展示销售合同")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "参数", required = false, dataType = "map"),
             @ApiImplicitParam(name = "apiId()", value = "动态表头", required = false, dataType = "Integer"),
@@ -725,23 +734,23 @@ public class AMScontroller  extends BaseRESTfulController {
             @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
     })
     @PostMapping(value = "/getProductPlanList")
-    Map<String, Object> getProductPlanList(@RequestBody(required=false) Map<String,Object> mapValue,
-                                               Integer apiId,
-                                               Integer pageNum,
-                                               Integer pageSize){
-        return amsFeign.getProductPlanList(mapValue == null ? new HashMap<>() : mapValue,apiId,pageNum,pageSize);
+    Map<String, Object> getProductPlanList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                           Integer apiId,
+                                           Integer pageNum,
+                                           Integer pageSize) {
+        return amsFeign.getProductPlanList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
     }
 
 
     @ApiOperation("停用计划")
     @PostMapping("/deactivatedPlan")
-    Map<String,Object> deactivatedPlan(@RequestBody Map<String,Object> map) {
+    Map<String, Object> deactivatedPlan(@RequestBody Map<String, Object> map) {
         return amsFeign.deactivatedPlan(map);
     }
 
     @ApiOperation("需求审批详情")
     @PostMapping("/requirementApproveDetails")
-    Map<String,Object> requirementApproveDetails(@RequestBody Map<String,Object> map) {
+    Map<String, Object> requirementApproveDetails(@RequestBody Map<String, Object> map) {
         return amsFeign.requirementApproveDetails(map);
     }
 
@@ -754,9 +763,9 @@ public class AMScontroller  extends BaseRESTfulController {
     })
     @PostMapping(value = "/getOrderStatus")
     RESTfulResult getOrderStatus(@RequestBody(required = false) Map<String, Object> map,
-                                                             Integer apiId,
-                                                             Integer pageNum,
-                                                             Integer pageSize
+                                 Integer apiId,
+                                 Integer pageNum,
+                                 Integer pageSize
     ) {
         return amsFeign.getOrderStatus(map == null ? new HashMap<>() : map, apiId, pageNum, pageSize);
 
@@ -772,9 +781,9 @@ public class AMScontroller  extends BaseRESTfulController {
     })
     @PostMapping(value = "/getProductOrderList")
     Map<String, Object> getProductOrderList(@RequestBody(required = false) Map<String, Object> map,
-                                 Integer apiId,
-                                 Integer pageNum,
-                                 Integer pageSize
+                                            Integer apiId,
+                                            Integer pageNum,
+                                            Integer pageSize
     ) {
         return amsFeign.getProductOrderList(map == null ? new HashMap<>() : map, apiId, pageNum, pageSize);
 
@@ -799,7 +808,6 @@ public class AMScontroller  extends BaseRESTfulController {
     }
 
 
-
     @ApiOperation(value = "批量新增发运通知单", notes = "批量新增发运通知单")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "map", value = "json格式具体参数", required = true, dataType = "Map<String,Object>")
@@ -828,9 +836,9 @@ public class AMScontroller  extends BaseRESTfulController {
     })
     @PostMapping(value = "/selectcar")
     RESTfulResult selectcar(@RequestBody(required = false) Map<String, Object> map,
-                                            Integer apiId,
-                                            Integer pageNum,
-                                            Integer pageSize
+                            Integer apiId,
+                            Integer pageNum,
+                            Integer pageSize
     ) {
         return amsFeign.selectcar(map == null ? new HashMap<>() : map, apiId, pageNum, pageSize);
 
@@ -845,9 +853,9 @@ public class AMScontroller  extends BaseRESTfulController {
     })
     @PostMapping(value = "/selectcarList")
     RESTfulResult selectcarList(@RequestBody(required = false) Map<String, Object> map,
-                            Integer apiId,
-                            Integer pageNum,
-                            Integer pageSize
+                                Integer apiId,
+                                Integer pageNum,
+                                Integer pageSize
     ) {
         return amsFeign.selectcarList(map == null ? new HashMap<>() : map, apiId, pageNum, pageSize);
 
@@ -855,87 +863,98 @@ public class AMScontroller  extends BaseRESTfulController {
 
     @ApiOperation("上传凭证")
     @PostMapping("/transPlanupload")
-    Map<String,Object> transPlanupload(@RequestBody Map<String,Object> map) {
+    Map<String, Object> transPlanupload(@RequestBody Map<String, Object> map) {
         return amsFeign.transPlanupload(map);
     }
 
     @ApiOperation("新增生产需求编号")
     @PostMapping("/getSerialNumber")
-    Map<String,Object> addSerialNumber(@RequestBody Map<String,Object> map) {
+    Map<String, Object> addSerialNumber(@RequestBody Map<String, Object> map) {
         return amsFeign.getSerialNumber(map);
     }
 
     @ApiOperation("批量审批运输单价")
     @PostMapping("approvePriceData")
-    Map<String,Object> approvePriceData(@RequestBody Map<String,Object> map) {return amsFeign.approvePriceData(map);}
+    Map<String, Object> approvePriceData(@RequestBody Map<String, Object> map) {
+        return amsFeign.approvePriceData(map);
+    }
 
     @ApiOperation("匹配运输单价")
     @PostMapping("/selectUnitPrice")
-    Map<String,Object> selectUnitPrice(@RequestBody Map<String,Object> map) {return amsFeign.selectUnitPrice(map);}
+    Map<String, Object> selectUnitPrice(@RequestBody Map<String, Object> map) {
+        return amsFeign.selectUnitPrice(map);
+    }
 
     @ApiOperation("不分页查询派车证")
     @PostMapping(value = "/amsScheduleDispatchNoPage")
-    public Map<String, Object> amsScheduleDispatchNoPage(@RequestBody HashMap<String,Object> parmas){
+    public Map<String, Object> amsScheduleDispatchNoPage(@RequestBody HashMap<String, Object> parmas) {
         return amsFeign.amsScheduleDispatchNoPage(parmas);
     }
 
     @ApiOperation("查询司磅地点")
     @PostMapping("/getSBDDList")
-    RESTfulResult getMaterialOperation(@RequestBody Map<String,Object> map) {return amsFeign.getSBDDList(map);}
+    RESTfulResult getMaterialOperation(@RequestBody Map<String, Object> map) {
+        return amsFeign.getSBDDList(map);
+    }
 
     @ApiOperation("获取提货单打印备注")
     @PostMapping("/selectBalanceRemark")
-    RESTfulResult selectBalanceRemark(@RequestBody Map<String,Object> map) {
+    RESTfulResult selectBalanceRemark(@RequestBody Map<String, Object> map) {
         return amsFeign.selectBalanceRemark(map);
     }
 
     @ApiOperation("获取退货打印备注")
     @PostMapping("/selectReturnGoodsRemark")
-    RESTfulResult selectReturnGoodsRemark(@RequestBody Map<String,Object> map) {
+    RESTfulResult selectReturnGoodsRemark(@RequestBody Map<String, Object> map) {
         return amsFeign.selectReturnGoodsRemark(map);
     }
 
     @ApiOperation("销售物流单停用或启用")
     @PostMapping("/deactivateOrEnable")
-    RESTfulResult deactivateOrEnable(@RequestBody Map<String,Object> map) {
+    RESTfulResult deactivateOrEnable(@RequestBody Map<String, Object> map) {
         return amsFeign.deactivateOrEnable(map);
     }
 
     @ApiOperation("销售物流单停用或启用")
     @PostMapping("/updateBalancePl")
-    RESTfulResult updateBalancePl(@RequestBody Map<String,Object> map) {
+    RESTfulResult updateBalancePl(@RequestBody Map<String, Object> map) {
         return amsFeign.updateBalancePl(map);
     }
+
     @ApiOperation("重导WMS")
     @PostMapping("/addWMS")
-    RESTfulResult addWMS(@RequestBody Map<String,Object> map) {
+    RESTfulResult addWMS(@RequestBody Map<String, Object> map) {
         return amsFeign.addWMS(map);
     }
- @ApiOperation("固定需求新增")
+
+    @ApiOperation("固定需求新增")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "map", value = "json格式具体参数", required = true, dataType = "Map<String,Object>")
     })
     @LogAround(foreignKeys = {"fixedNeedsId"}, foreignKeyTypes = {"固定生产需求"})
     @PostMapping("/fixedNeedsAdd")
-    RESTfulResult fixedNeedsAdd(@RequestBody(required = false) Map<String,Object> map) throws ParseException {
+    RESTfulResult fixedNeedsAdd(@RequestBody(required = false) Map<String, Object> map) throws ParseException {
         map.put("insertUsername", map.get("userName").toString());
-        if (map.containsKey("requirementStartTime")){
+        if (map.containsKey("requirementStartTime")) {
             SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             Date requirementStartTime = simpleDateFormat.parse(map.get("requirementStartTime").toString());
             map.put("requirementStartTime", requirementStartTime);
         }
 
-        if (map.containsKey("requirementEndTime")){
+        if (map.containsKey("requirementEndTime")) {
             SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             Date requirementEndTime = simpleDateFormat.parse(map.get("requirementEndTime").toString());
             map.put("requirementEndTime", requirementEndTime);
         }
-        if (map.containsKey("dueTime")){
+        if (map.containsKey("dueTime")) {
             SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             Date dueTime = simpleDateFormat.parse(map.get("dueTime").toString());
             map.put("dueTime", dueTime);
         }
-        return amsFeign.fixedNeedsAdd(map);};
+        return amsFeign.fixedNeedsAdd(map);
+    }
+
+    ;
 
     @ApiOperation(value = "查询固定需求")
     @ApiImplicitParams({
@@ -946,9 +965,9 @@ public class AMScontroller  extends BaseRESTfulController {
     })
     @PostMapping(value = "/getfixdNeedsList")
     RESTfulResult getfixdNeedsList(@RequestBody(required = false) Map<String, Object> map,
-                                Integer apiId,
-                                Integer pageNum,
-                                Integer pageSize
+                                   Integer apiId,
+                                   Integer pageNum,
+                                   Integer pageSize
     ) {
         return amsFeign.getfixdNeedsList(map == null ? new HashMap<>() : map, apiId, pageNum, pageSize);
 
@@ -962,24 +981,25 @@ public class AMScontroller  extends BaseRESTfulController {
     @PostMapping(value = "/fixedNeedsUpdate")
     public Map<String, Object> fixedNeedsUpdate(@RequestBody(required = false) Map<String, Object> map) throws ParseException {
         map.put("insertUsername", map.get("userName").toString());
-        if (map.containsKey("requirementStartTime")){
+        if (map.containsKey("requirementStartTime")) {
             SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             Date requirementStartTime = simpleDateFormat.parse(map.get("requirementStartTime").toString());
             map.put("requirementStartTime", requirementStartTime);
         }
 
-        if (map.containsKey("requirementEndTime")){
+        if (map.containsKey("requirementEndTime")) {
             SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             Date requirementEndTime = simpleDateFormat.parse(map.get("requirementEndTime").toString());
             map.put("requirementEndTime", requirementEndTime);
         }
-        if (map.containsKey("dueTime")){
+        if (map.containsKey("dueTime")) {
             SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             Date dueTime = simpleDateFormat.parse(map.get("dueTime").toString());
             map.put("dueTime", dueTime);
         }
         return amsFeign.fixedNeedsUpdate(map);
     }
+
     @ApiOperation(value = "生产固定需求逻辑删除", notes = "生产固定需求逻辑删除")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "map", value = "json格式具体参数", required = true, dataType = "Map<String,Object>")
@@ -1013,22 +1033,22 @@ public class AMScontroller  extends BaseRESTfulController {
     @ApiOperation("导入")
     @PostMapping("/importTransPrice")
     public Map<String, Object> importTransPrice(@RequestBody MultipartFile file,
-                                                    String userId,
-                                                    String userName) throws Exception {
+                                                String userId,
+                                                String userName) throws Exception {
         Map<String, Object> map = new HashMap<>();
         //获取Excel中包含的对象数组
         List<Map<String, Object>> list = ExcelToolUtils.getExcelList(file, 0);
         map.put("list", list);
-        map.put("setList",list);
-        map.put("userId",userId);
-        map.put("userName",userName);
+        map.put("setList", list);
+        map.put("userId", userId);
+        map.put("userName", userName);
         return amsFeign.importTransPrice(map);
     }
 
     @ApiOperation("派车")
     @PostMapping("/dispatch")
     public Map<String, Object> dispatch() throws Exception {
-        return amsFeign.dispatch();
+        return tmsFeign.fixedDispatch();
     }
 
     @ApiOperation("强制修改")
@@ -1052,9 +1072,9 @@ public class AMScontroller  extends BaseRESTfulController {
     @ApiOperation(value = "展示生产需求详情-绑定")
     @PostMapping(value = "/getProductionRequirementListBind")
     Map<String, Object> getProductionRequirementListBind(@RequestBody(required = false) Map<String, Object> mapValue,
-                                                       Integer apiId,
-                                                       Integer pageNum,
-                                                       Integer pageSize) {
+                                                         Integer apiId,
+                                                         Integer pageNum,
+                                                         Integer pageSize) {
         return amsFeign.getProductionRequirementListBind(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
     }
 
@@ -1064,6 +1084,12 @@ public class AMScontroller  extends BaseRESTfulController {
         return amsFeign.updateBindRequirement(params);
     }
 
+    @ApiOperation("进入物流调度派车证")
+    @PostMapping("/addDispatchCard")
+    public Map<String, Object> addDispatchCard(@RequestBody Map<String, Object> params) throws Exception {
+        return amsFeign.addDispatchCard(params);
+    }
+
     @ApiOperation("汽运传火运清洁能源")
     @PostMapping("/qjnyChange")
     public Map<String, Object> qjnyChange(@RequestBody Map<String, Object> params) throws Exception {

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

@@ -14,8 +14,10 @@ import com.steerinfo.dil.util.BaseRESTfulController;
 import com.steerinfo.dil.util.DataChange;
 import com.steerinfo.framework.controller.RESTfulResult;
 import io.swagger.annotations.ApiOperation;
+import oracle.jdbc.proxy.annotation.Post;
 import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 import com.steerinfo.dil.util.SSOUtil;
@@ -46,45 +48,72 @@ public class BackgroundProcessingController extends BaseRESTfulController {
 
     @ApiOperation("登录接口")
     @PostMapping("bpLogin")
-    public Map<String,Object> bpLogin(@RequestParam String loginName, @RequestParam String password,  @RequestParam String app_code,@RequestParam(required = false) String urlFlag) {
-        Map<String,Object> resMap = ssoUtil.individualLogin(loginName,password,app_code);
-        if("succeed".equals(resMap.get("status"))) {
+    public Map<String, Object> bpLogin(@RequestParam String loginName, @RequestParam String password, @RequestParam String app_code, @RequestParam(required = false) String urlFlag) {
+        Map<String, Object> resMap = ssoUtil.individualLogin(loginName, password, app_code);
+        if ("succeed".equals(resMap.get("status"))) {
             Map<String, Object> dataMap = (Map<String, Object>) resMap.get("data");
             Map<String, Object> userInfo = (Map<String, Object>) dataMap.get("user");
+            String userId = userInfo.get("userId").toString();
+            List<Map<String, Object>> mapList = (List<Map<String, Object>>) userInfo.get("sysRoles");
             // 根据用户名去查询该用户绑定的公司及下属公司;7.2改为只查本单位因前端会报错
             List<Map<String, Object>> companyList = backgroundProcessingMapper.getCurrentCompanyList(loginName);
-            //List<Map<String, Object>> companyList = backgroundProcessingMapper.getCompanyList(loginName);
-            if(companyList != null && companyList.size() > 0) {
+            if (companyList != null && companyList.size() > 0) {
+
+            } else {
                 Map<String, Object> stringMap = new HashMap<>();
-                stringMap.put("companyId",-1);
+                stringMap.put("companyId", -1);
                 companyList.add(stringMap);
-            }else{
                 //resMap.put("status","failed");
                 //resMap.put("message","账号未与单位关联,联系管理人员");
                 //resMap.put("resultMessage","账号未与单位关联,联系管理人员");
                 //resMap.put("code","500");
                 //return resMap;
             }
-            Map<String,Object> rootCompanyMap = backgroundProcessingMapper.getCompanyRootMap(loginName);
-            userInfo.put("dilCompanyList", companyList);
+            //遍历角色,查看是否有业务单位权限
+            for (Map<String, Object> map : mapList) {
+                //如果角色包含业务单位
+                if ("businessCompany".equals(map.get("roleCode"))) {
+                    List<Map<String, Object>> businessCompanyList = backgroundProcessingMapper.getCompanyList(userId);
+                    if (businessCompanyList != null) {
+                        companyList.addAll(businessCompanyList);
+                    }
+                    break;
+                } else {
+                    continue;
+                }
+            }
+            //去重
+            HashSet<Object> objects = new HashSet<>();
+            for(Map<String,Object> map : companyList) {
+                objects.add(map.get("companyId"));
+            }
+            List<Map<String,Object>> companyList1 = new ArrayList<>();
+            for(Object set : objects) {
+                Map<String, Object> objectObjectHashMap = new HashMap<>();
+                objectObjectHashMap.put("companyId",set);
+                companyList1.add(objectObjectHashMap);
+            }
+            Map<String, Object> rootCompanyMap = backgroundProcessingMapper.getCompanyRootMap(loginName);
+            //根据companyList查询名字相同的
+            userInfo.put("dilCompanyList", companyList1);
             if (rootCompanyMap != null && rootCompanyMap.get("isListed") != null) {
-                userInfo.put("rootCompanyMap",rootCompanyMap);
+                userInfo.put("rootCompanyMap", rootCompanyMap);
             }
             if (urlFlag != null && urlFlag != "" && rootCompanyMap != null && !urlFlag.equals(rootCompanyMap.get("isListed"))) {
-                resMap.put("status","failed");
-                resMap.put("message","账号未在该平台注册,请检查账号");
-                resMap.put("resultMessage","账号未在该平台注册,请检查账号");
-                resMap.put("code","500");
+                resMap.put("status", "failed");
+                resMap.put("message", "账号未在该平台注册,请检查账号");
+                resMap.put("resultMessage", "账号未在该平台注册,请检查账号");
+                resMap.put("code", "500");
                 return resMap;
             }
             //查询车牌及排班司机id
-            Map<String,Object> capacityMap = backgroundProcessingMapper.getCapacityMap(loginName);
-            if(capacityMap != null){
+            Map<String, Object> capacityMap = backgroundProcessingMapper.getCapacityMap(loginName);
+            if (capacityMap != null) {
                 dataMap.putAll(capacityMap);
             }
             //查询登录账号人员id
-            Map<String,Object> personnelMap = backgroundProcessingMapper.getPersonnelMap(loginName);
-            if(personnelMap != null){
+            Map<String, Object> personnelMap = backgroundProcessingMapper.getPersonnelMap(loginName);
+            if (personnelMap != null) {
                 dataMap.putAll(personnelMap);
             }
             //注册cid
@@ -95,13 +124,13 @@ public class BackgroundProcessingController extends BaseRESTfulController {
 
     @ApiOperation("更新cid")
     @PostMapping("/insertAppCid")
-    public RESTfulResult  insertAppCid(@RequestBody DilAppCid dilAppCid) {
+    public RESTfulResult insertAppCid(@RequestBody DilAppCid dilAppCid) {
         try {
             Map<String, Object> searchMap = new HashMap<>();
-            searchMap.put("cid",dilAppCid.getCid());
-            searchMap.put("userCode",dilAppCid.getUserCode());
+            searchMap.put("cid", dilAppCid.getCid());
+            searchMap.put("userCode", dilAppCid.getUserCode());
             List<DilAppCid> mapList = dilAppCidMapper.selectByParameters(searchMap);
-            if(mapList != null && mapList.size() > 0 && mapList.get(0) != null) {
+            if (mapList != null && mapList.size() > 0 && mapList.get(0) != null) {
                 mapList.get(0).setUpdateTime(new Date());
                 dilAppCidMapper.updateByPrimaryKeySelective(mapList.get(0));
                 return success();
@@ -120,29 +149,36 @@ public class BackgroundProcessingController extends BaseRESTfulController {
 
     @ApiOperation("重置密码")
     @PostMapping("/resetPwd")
-    public RESTfulResult  resetPwd(@RequestBody Map<String,Object> map) {
+    public RESTfulResult resetPwd(@RequestBody Map<String, Object> map) {
         try {
-            if(map.get("ssoId") == null || map.get("ssoId").equals("")){
+            if (map.get("ssoId") == null || map.get("ssoId").equals("")) {
                 throw new Exception("用户账号不存在，请先联系管理员注册！");
             }
-            return success(ssoUtil.resetPwd(map.get("ssoId").toString(),map.get("ssoCode").toString()));
+            return success(ssoUtil.resetPwd(map.get("ssoId").toString(), map.get("ssoCode").toString()));
         } catch (Exception e) {
             e.printStackTrace();
-            return  failed(map,e.getMessage());
+            return failed(map, e.getMessage());
         }
     }
 
     @ApiOperation("解锁用户")
     @PostMapping("/unlockUser")
-    public RESTfulResult  unlockUser(@RequestBody Map<String,Object> map) {
+    public RESTfulResult unlockUser(@RequestBody Map<String, Object> map) {
         try {
-            if(map.get("ssoId") == null || map.get("ssoId").equals("")){
+            if (map.get("ssoId") == null || map.get("ssoId").equals("")) {
                 throw new Exception("用户账号不存在，请先联系管理员注册！");
             }
-            return success(ssoUtil.unlockUser(map.get("ssoId").toString(),map.get("ssoCode").toString()));
+            return success(ssoUtil.unlockUser(map.get("ssoId").toString(), map.get("ssoCode").toString()));
         } catch (Exception e) {
             e.printStackTrace();
-            return  failed(map,e.getMessage());
+            return failed(map, e.getMessage());
         }
     }
+
+    @ApiOperation("修改运输订单状态")
+    @PostMapping("/submitOrderStatus")
+    public RESTfulResult submitOrderStatus(@RequestBody Map<String, Object> map) {
+        int i = backgroundProcessingMapper.submitOrderStatus(map);
+        return success();
+    }
 }

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

@@ -3,7 +3,6 @@ package com.steerinfo.dil.controller;
 
 import com.steerinfo.dil.feign.DzFeign;
 import com.steerinfo.dil.util.BaseRESTfulController;
-import org.omg.CORBA.OBJ_ADAPTER;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -20,7 +19,7 @@ public class DzController extends BaseRESTfulController {
     DzFeign dzFeign;
 
     @PostMapping("/getDzData")
-    public Map<String,Object> getDzData(@RequestBody Map<String, Object> map) {
+    public Map<String, Object> getDzData(@RequestBody Map<String, Object> map) {
         return dzFeign.getDzData(map);
     }
 

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

@@ -135,6 +135,7 @@ public class EMSController extends BaseRESTfulController {
     public Map<String, Object> abnormal(@RequestBody(required = false) Map<String, Object> map) {
         return emsFeign.abnormal(map);
     }
+
     @ApiOperation(value = "展示工资绩效")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "参数", required = false, dataType = "map"),
@@ -185,9 +186,9 @@ public class EMSController extends BaseRESTfulController {
     })
     @PostMapping(value = "/getemssalarydetailsMonthyear")
     Map<String, Object> getemssalarydetailsMonthyear(@RequestBody(required = false) Map<String, Object> mapValue,
-                                             Integer apiId,
-                                             Integer pageNum,
-                                             Integer pageSize
+                                                     Integer apiId,
+                                                     Integer pageNum,
+                                                     Integer pageSize
     ) {
         return emsFeign.getemssalarydetailsMonthyear(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
     }
@@ -201,9 +202,9 @@ public class EMSController extends BaseRESTfulController {
     })
     @PostMapping(value = "/getemsticketmanagementslist")
     Map<String, Object> getemsticketmanagementslist(@RequestBody(required = false) Map<String, Object> mapValue,
-                                                     Integer apiId,
-                                                     Integer pageNum,
-                                                     Integer pageSize
+                                                    Integer apiId,
+                                                    Integer pageNum,
+                                                    Integer pageSize
     ) {
         return emsFeign.getemsticketmanagementslist(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
     }

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

@@ -20,7 +20,7 @@ public class ReportController {
     @Autowired
     ReportFeign reportFeign;
 
-    @ApiOperation(value="展示汽运监控")
+    @ApiOperation(value = "展示汽运监控")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "参数", required = false, dataType = "map"),
             @ApiImplicitParam(name = "apiId()", value = "动态表头", required = false, dataType = "Integer"),
@@ -28,23 +28,23 @@ public class ReportController {
             @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
     })
     @PostMapping(value = "/getQYMonitors")
-    Map<String, Object> getQYMonitors(@RequestBody(required=false) HashMap<String,Object> mapValue,
-                                        Integer apiId,
-                                        Integer pageNum,
-                                        Integer pageSize){
-        return reportFeign.getQYMonitors(mapValue == null ? new HashMap<>() : mapValue,apiId,pageNum,pageSize);
+    Map<String, Object> getQYMonitors(@RequestBody(required = false) HashMap<String, Object> mapValue,
+                                      Integer apiId,
+                                      Integer pageNum,
+                                      Integer pageSize) {
+        return reportFeign.getQYMonitors(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
     }
 
-    @ApiOperation(value="展示厂内车辆数")
+    @ApiOperation(value = "展示厂内车辆数")
     @PostMapping(value = "/getFactoryCarNum")
-    Map<String, Object> getFactoryCarNum(@RequestBody(required=false) HashMap<String,Object> mapValue,
-                                      Integer apiId,
-                                      Integer pageNum,
-                                      Integer pageSize){
-        return reportFeign.getFactoryCarNum(mapValue == null ? new HashMap<>() : mapValue,apiId,pageNum,pageSize);
+    Map<String, Object> getFactoryCarNum(@RequestBody(required = false) HashMap<String, Object> mapValue,
+                                         Integer apiId,
+                                         Integer pageNum,
+                                         Integer pageSize) {
+        return reportFeign.getFactoryCarNum(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
     }
 
-    @ApiOperation(value="展示型钢汽运销售去向")
+    @ApiOperation(value = "展示型钢汽运销售去向")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "参数", required = false, dataType = "map"),
             @ApiImplicitParam(name = "apiId()", value = "动态表头", required = false, dataType = "Integer"),
@@ -52,14 +52,14 @@ public class ReportController {
             @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
     })
     @PostMapping(value = "/getDestination")
-    Map<String, Object> getDestination(@RequestBody(required=false) HashMap<String,Object> mapValue,
-                                      Integer apiId,
-                                      Integer pageNum,
-                                      Integer pageSize){
-        return reportFeign.getDestination(mapValue == null ? new HashMap<>() : mapValue,apiId,pageNum,pageSize);
+    Map<String, Object> getDestination(@RequestBody(required = false) HashMap<String, Object> mapValue,
+                                       Integer apiId,
+                                       Integer pageNum,
+                                       Integer pageSize) {
+        return reportFeign.getDestination(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
     }
 
-    @ApiOperation(value="查询转库单报表")
+    @ApiOperation(value = "查询转库单报表")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "参数", required = false, dataType = "map"),
             @ApiImplicitParam(name = "apiId()", value = "动态表头", required = false, dataType = "Integer"),
@@ -67,14 +67,14 @@ public class ReportController {
             @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
     })
     @PostMapping(value = "/getTransferOrder")
-    Map<String, Object> getTransferOrder(@RequestBody(required=false) HashMap<String,Object> mapValue,
-                                      Integer apiId,
-                                      Integer pageNum,
-                                      Integer pageSize){
-        return reportFeign.getTransferOrder(mapValue == null ? new HashMap<>() : mapValue,apiId,pageNum,pageSize);
+    Map<String, Object> getTransferOrder(@RequestBody(required = false) HashMap<String, Object> mapValue,
+                                         Integer apiId,
+                                         Integer pageNum,
+                                         Integer pageSize) {
+        return reportFeign.getTransferOrder(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
     }
 
-    @ApiOperation(value="查询转库单明细")
+    @ApiOperation(value = "查询转库单明细")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "参数", required = false, dataType = "map"),
             @ApiImplicitParam(name = "apiId()", value = "动态表头", required = false, dataType = "Integer"),
@@ -82,80 +82,95 @@ public class ReportController {
             @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
     })
     @PostMapping(value = "/getTransferOrderDetails")
-    Map<String, Object> getTransferOrderDetails(@RequestBody(required=false) HashMap<String,Object> mapValue,
-                                      Integer apiId,
-                                      Integer pageNum,
-                                      Integer pageSize){
-        return reportFeign.getTransferOrderDetails(mapValue == null ? new HashMap<>() : mapValue,apiId,pageNum,pageSize);
+    Map<String, Object> getTransferOrderDetails(@RequestBody(required = false) HashMap<String, Object> mapValue,
+                                                Integer apiId,
+                                                Integer pageNum,
+                                                Integer pageSize) {
+        return reportFeign.getTransferOrderDetails(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
     }
 
-    @ApiOperation(value="查询发货四证")
+    @ApiOperation(value = "查询发货四证")
     @PostMapping(value = "/getSaleFourLicenceReport")
-    Map<String, Object> getSaleFourLicenceReport(@RequestBody(required=false) HashMap<String,Object> mapValue){
+    Map<String, Object> getSaleFourLicenceReport(@RequestBody(required = false) HashMap<String, Object> mapValue) {
         return reportFeign.getSaleFourLicenceReport(mapValue);
     }
 
 
-    @ApiOperation(value="承运商报表")
+    @ApiOperation(value = "承运商报表")
     @PostMapping(value = "/getTransReportCarrier")
-    Map<String, Object> getTransReportCarrier(@RequestBody(required=false) HashMap<String,Object> mapValue,
+    Map<String, Object> getTransReportCarrier(@RequestBody(required = false) HashMap<String, Object> mapValue,
                                               Integer apiId,
                                               Integer pageNum,
-                                              Integer pageSize){
-        return reportFeign.getTransReportCarrier(mapValue,apiId,pageNum,pageSize);
+                                              Integer pageSize) {
+        return reportFeign.getTransReportCarrier(mapValue, apiId, pageNum, pageSize);
     }
 
-    @ApiOperation(value="型钢报表")
+    @ApiOperation(value = "型钢报表")
     @PostMapping(value = "/getTransReportXG")
-    Map<String, Object> getTransReportXG(@RequestBody(required=false) HashMap<String,Object> mapValue,
-                                              Integer apiId,
-                                              Integer pageNum,
-                                              Integer pageSize){
-        return reportFeign.getTransReportXG(mapValue,apiId,pageNum,pageSize);
+    Map<String, Object> getTransReportXG(@RequestBody(required = false) HashMap<String, Object> mapValue,
+                                         Integer apiId,
+                                         Integer pageNum,
+                                         Integer pageSize) {
+        return reportFeign.getTransReportXG(mapValue, apiId, pageNum, pageSize);
     }
 
-    @ApiOperation(value="修改运价")
+    @ApiOperation(value = "修改运价")
     @PostMapping(value = "/updateTransUnitPrice")
-    Map<String, Object> updateTransUnitPrice(@RequestBody(required=false) HashMap<String,Object> map){
+    Map<String, Object> updateTransUnitPrice(@RequestBody(required = false) HashMap<String, Object> map) {
         return reportFeign.updateTransUnitPrice(map);
     }
 
-    @ApiOperation(value="发运单查询")
+    @ApiOperation(value = "发运单查询")
     @PostMapping(value = "/selecttype")
-    Map<String, Object> selecttype(@RequestBody(required=false) HashMap<String,Object> mapValue,
-                                         Integer apiId,
-                                         Integer pageNum,
-                                         Integer pageSize) {
+    Map<String, Object> selecttype(@RequestBody(required = false) HashMap<String, Object> mapValue,
+                                   Integer apiId,
+                                   Integer pageNum,
+                                   Integer pageSize) {
         return reportFeign.selecttype(mapValue, apiId, pageNum, pageSize);
     }
 
-    @ApiOperation(value="派车单查询")
+    @ApiOperation(value = "发运单汇总查询")
+    @PostMapping(value = "/selectSum")
+    Map<String, Object> selectSum(@RequestBody(required = false) HashMap<String, Object> mapValue) {
+        return reportFeign.selectSum(mapValue);
+    }
+
+    @ApiOperation(value = "派车单查询")
     @PostMapping(value = "/selecttype1")
-    Map<String, Object> selecttype1(@RequestBody(required=false) HashMap<String,Object> mapValue,
-                                   Integer apiId,
-                                   Integer pageNum,
-                                   Integer pageSize) {
+    Map<String, Object> selecttype1(@RequestBody(required = false) HashMap<String, Object> mapValue,
+                                    Integer apiId,
+                                    Integer pageNum,
+                                    Integer pageSize) {
         return reportFeign.selecttype1(mapValue, apiId, pageNum, pageSize);
     }
 
-    @ApiOperation(value="每日汇总")
+    @ApiOperation(value = "每日汇总")
     @PostMapping(value = "/dailySummary")
-    Map<String, Object> dailySummary(@RequestBody(required=false) Map<String,Object> params) {
+    Map<String, Object> dailySummary(@RequestBody(required = false) Map<String, Object> params) {
         return reportFeign.dailySummary(params);
     }
 
-    @ApiOperation(value="职工考勤数据管理")
+    @ApiOperation(value = "职工考勤数据管理")
     @PostMapping(value = "/staffAttendanceList")
-    Map<String, Object> staffAttendanceList(@RequestBody(required=false) Map<String,Object> mapValue,
+    Map<String, Object> staffAttendanceList(@RequestBody(required = false) Map<String, Object> mapValue,
                                             Integer apiId,
                                             Integer pageNum,
                                             Integer pageSize) {
         return reportFeign.staffAttendanceList(mapValue, apiId, pageNum, pageSize);
     }
 
-    @ApiOperation(value="日报表修改")
+    @ApiOperation(value = "日报表修改")
     @PostMapping(value = "/updateOperateDaily")
-    Map<String, Object> updateOperateDaily() {
-        return reportFeign.updateOperateDaily();
+    Map<String, Object> updateOperateDaily(@RequestBody Map<String,Object> map) {
+        return reportFeign.updateOperateDaily(map);
+    }
+
+    @ApiOperation("查询日报数据")
+    @PostMapping("getOperateDaily")
+    Map<String, Object> getOperateDaily(@RequestBody(required = false) Map<String, Object> mapValue,
+                                        Integer apiId,
+                                        Integer pageNum,
+                                        Integer pageSize) {
+        return reportFeign.getOperateDaily(mapValue, apiId, pageNum, pageSize);
     }
 }

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

@@ -235,21 +235,21 @@ public class SystemFileController extends BaseRESTfulController {
     @PostMapping("/previewfile2")
     public RESTfulResult previewfile2(@RequestBody HashMap parmas) {
         try {
-            if (parmas.get("id")==null) {
-                return failed(1,"当前详单没有图片");
+            if (parmas.get("id") == null) {
+                return failed(1, "当前详单没有图片");
+            }
+            SystemFile value = systemFileMapper.selectByPrimaryKey(parmas.get("id").toString());
+            if (value == null) {
+                return failed(1, "该文件不存在！请查验文件是否被清除或已损坏！");
+            }
+            String fileName = value.getFilename();
+            String filepath = value.getFilepath();
+            if (fileName == null || fileName.isEmpty()) {
+                return failed(1, "该文件不存在！");
+            }
+            if (filepath == null || filepath.isEmpty()) {
+                return failed(1, "该文件地址不存在！");
             }
-        SystemFile value = systemFileMapper.selectByPrimaryKey(parmas.get("id").toString());
-        if (value==null){
-            return failed(1,"该文件不存在！请查验文件是否被清除或已损坏！");
-        }
-        String fileName = value.getFilename();
-        String filepath = value.getFilepath();
-        if (fileName == null || fileName.isEmpty()) {
-            return failed(1,"该文件不存在！");
-        }
-        if (filepath == null || filepath.isEmpty()) {
-            return failed(1,"该文件地址不存在！");
-        }
             String result = ftpFileUtil.downloadFile(fileName, filepath);
             return success(result);
         } catch (IOException e) {
@@ -327,7 +327,7 @@ public class SystemFileController extends BaseRESTfulController {
             try {
                 Map<String, Object> result = ftpFileUtil.downloadFileNew(filename, filepath);
                 //如果是返回base64,则给这个;网络路径则给netUrl
-                result.put("dataType","base");
+                result.put("dataType", "base");
                 resultList.add(result);
             } catch (IOException e) {
                 e.getMessage();
@@ -363,7 +363,7 @@ public class SystemFileController extends BaseRESTfulController {
             String fileType = uuidType.split(";")[1];
             InputStream inputStream = file.getInputStream();
             if (fileMediaType != null && fileMediaType.contains("image")) {
-                newName = uuidType.split(";")[0] + "." +fileMediaType.split("/")[1];
+                newName = uuidType.split(";")[0] + "." + fileMediaType.split("/")[1];
                 ////如果是图片
                 //BufferedImage originalImage = ImageIO.read(inputStream);
                 //// 确保原始图片有效且可以读取
@@ -375,7 +375,7 @@ public class SystemFileController extends BaseRESTfulController {
                 //}
             }
             SimpleDateFormat simpleDateFormat = new SimpleDateFormat("/yyyy/MM/dd");
-            String filePath = "/" + fileType  + simpleDateFormat.format(new Date());
+            String filePath = "/" + fileType + simpleDateFormat.format(new Date());
             boolean result = ftpFileUtil.uploadToFtp(inputStream, filePath, newName, false);
             inputStream.close();
             if (result) {
@@ -393,7 +393,7 @@ public class SystemFileController extends BaseRESTfulController {
             index++;
         }
         return success();
-}
+    }
 
     //private InputStream addWatermark(BufferedImage originalImage) {
     //    int width = originalImage.getWidth();
@@ -431,5 +431,4 @@ public class SystemFileController extends BaseRESTfulController {
     }
 
 
-
 }

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

@@ -0,0 +1,30 @@
+package com.steerinfo.dil.controller;
+
+import com.steerinfo.dil.annotaion.LogAround;
+import com.steerinfo.dil.feign.RmsFeign;
+import com.steerinfo.dil.feign.TmiFeign;
+import com.steerinfo.dil.util.BaseRESTfulController;
+import com.steerinfo.dil.util.ExcelToolUtils;
+import com.steerinfo.framework.controller.RESTfulResult;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.math.BigDecimal;
+import java.util.*;
+
+@RestController
+@RequestMapping("${api.version}/tmi")
+public class TMIcontroller extends BaseRESTfulController {
+    @Autowired
+    TmiFeign tmiFeign;
+
+    @ApiOperation("将车号同步wms")
+    @PostMapping("addWmsCarNo")
+    public Map<String,Object> addWmsCarNo(@RequestBody Map<String,Object> map) {
+        return tmiFeign.addWmsCarNo(map);
+    }
+}

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

@@ -73,7 +73,7 @@ public class TMSController extends BaseRESTfulController {
     @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
     @LogAround(foreignKeys = {"resultId"}, foreignKeyTypes = {"计算公式"})
     @PostMapping("/addcomprehensiveresults")
-    public Map<String, Object> insertcomprehensiveresults(@RequestBody(required = false) Map<String, Object> map)  {
+    public Map<String, Object> insertcomprehensiveresults(@RequestBody(required = false) Map<String, Object> map) {
         return tmsFeign.addComprehensiveResult(map);
     }
 
@@ -98,7 +98,7 @@ public class TMSController extends BaseRESTfulController {
     @PostMapping(value = "/tmscomprehensiveresults/batchUpdate")
     @LogAround(foreignKeys = {"resultId"}, foreignKeyTypes = {"计算公式"})
     public Map<String, Object> tmscomprehensiveresultsBatchUpdate(@RequestBody(required = false) Map<String, Object> map) {
-        return tmsFeign.tmscomprehensiveresultsBatchUpdate((List)map.get("list"));
+        return tmsFeign.tmscomprehensiveresultsBatchUpdate((List) map.get("list"));
     }
 
     @ApiOperation(value = "派发运输订单")
@@ -198,8 +198,7 @@ public class TMSController extends BaseRESTfulController {
     }
 
 
-
-    @ApiOperation(value="计时")
+    @ApiOperation(value = "计时")
     @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
     @PostMapping(value = "/startend")
     @LogAround(foreignKeys = {"resultId"}, foreignKeyTypes = {"计时"})
@@ -208,21 +207,21 @@ public class TMSController extends BaseRESTfulController {
     }
 
 
-    @ApiOperation(value="计时")
+    @ApiOperation(value = "计时")
     @PostMapping(value = "/updCountResult")
     @LogAround(foreignKeys = {"transOrderId"}, foreignKeyTypes = {"计次"})
     public Map<String, Object> updCountResult(@RequestBody(required = false) Map<String, Object> map) {
         return tmsFeign.updCountResult(map);
     }
 
-    @ApiOperation(value="审批计时")
+    @ApiOperation(value = "审批计时")
     @PostMapping(value = "/approveTimeResult")
     @LogAround(foreignKeys = {"transOrderId"}, foreignKeyTypes = {"计次"})
     public Map<String, Object> approveTimeResult(@RequestBody(required = false) Map<String, Object> map) {
         return tmsFeign.approveTimeResult(map);
     }
 
-    @ApiOperation(value="计时复报")
+    @ApiOperation(value = "计时复报")
     @PostMapping(value = "/resendTimeResult")
     @LogAround(foreignKeys = {"transOrderId"}, foreignKeyTypes = {"计次"})
     public Map<String, Object> resendTimeResult(@RequestBody(required = false) Map<String, Object> map) {
@@ -241,9 +240,9 @@ public class TMSController extends BaseRESTfulController {
     @ApiOperation(value = "查询计时")
     @PostMapping("/getOrderTimeList")
     public Map<String, Object> getOrderTimeList(@RequestBody(required = false) Map<String, Object> map,
-                                                    Integer apiId,
-                                                    Integer pageNum,
-                                                    Integer pageSize) {
+                                                Integer apiId,
+                                                Integer pageNum,
+                                                Integer pageSize) {
         return tmsFeign.getOrderTimeList(map == null ? new HashMap<>() : map, apiId, pageNum, pageSize);
     }
 
@@ -478,63 +477,63 @@ public class TMSController extends BaseRESTfulController {
         String loadDate = null;
         for (Map<String, Object> item : list) {
             //校验行
-            if(item.get("通知单号")==null || item.get("通知单号").equals("")
-                    || item.get("车号")==null || item.get("车号").equals("")
-                    || item.get("发站")==null || item.get("发站").equals("")
-                    || item.get("到站")==null || item.get("到站").equals("")
-                    || item.get("装车日期")==null || item.get("装车日期").equals("")){
+            if (item.get("通知单号") == null || item.get("通知单号").equals("")
+                    || item.get("车号") == null || item.get("车号").equals("")
+                    || item.get("发站") == null || item.get("发站").equals("")
+                    || item.get("到站") == null || item.get("到站").equals("")
+                    || item.get("装车日期") == null || item.get("装车日期").equals("")) {
                 throw new Exception("单元格数据异常（通知单号/车号/装车日期/发站/到站），请检查模板或数据是否正确!");
             }
             BigDecimal tareWeight = DataChange.dataToBigDecimal(item.get("皮重"));
             BigDecimal grossWeight = DataChange.dataToBigDecimal(item.get("毛重"));
             BigDecimal netWeight = DataChange.dataToBigDecimal(item.get("净重"));
-            if(tareWeight.compareTo(BigDecimal.ZERO) > 0 && grossWeight.compareTo(BigDecimal.ZERO) > 0){
+            if (tareWeight.compareTo(BigDecimal.ZERO) > 0 && grossWeight.compareTo(BigDecimal.ZERO) > 0) {
                 item.put("净重", grossWeight.subtract(tareWeight));
-            }else if(netWeight.compareTo(BigDecimal.ZERO) > 0){
+            } else if (netWeight.compareTo(BigDecimal.ZERO) > 0) {
                 item.put("净重", netWeight);
-            }else {
+            } else {
                 throw new Exception("单元格数据异常：净重/皮重/毛重，请检查模板或数据是否正确!");
             }
             //通知单统计
             String requirementNumber = item.get("通知单号").toString();
             if (map.get(requirementNumber) != null) {
                 //已存在，修改
-                Map<String,Object> requirementMap =(Map<String, Object>) map.get(requirementNumber);
+                Map<String, Object> requirementMap = (Map<String, Object>) map.get(requirementNumber);
                 BigDecimal weight = DataChange.dataToBigDecimal(requirementMap.get("weight"));
                 BigDecimal truckNumber = DataChange.dataToBigDecimal(requirementMap.get("truckNumber"));
                 String loadTime = requirementMap.get("loadTime").toString();
-                List<Map<String,Object>> trainList = (ArrayList) requirementMap.get("trainList");
+                List<Map<String, Object>> trainList = (ArrayList) requirementMap.get("trainList");
                 weight = weight.add(DataChange.dataToBigDecimal(item.get("净重")));
                 truckNumber = truckNumber.add(new BigDecimal(1));
                 trainList.add(item);
                 requirementMap.put("weight", weight);
                 requirementMap.put("truckNumber", truckNumber);
-                requirementMap.put("trainList",trainList);
-                if(!loadTime.equals(item.get("装车日期").toString())){
+                requirementMap.put("trainList", trainList);
+                if (!loadTime.equals(item.get("装车日期").toString())) {
                     throw new Exception("同一个Excel只允许一批车辆，请检查装车日期！");
                 }
             } else {
                 //不存在，新增
-                Map<String,Object> requirementMap = new HashMap<>();
-                List<Map<String,Object>> trainList = new ArrayList<>();
+                Map<String, Object> requirementMap = new HashMap<>();
+                List<Map<String, Object>> trainList = new ArrayList<>();
                 trainList.add(item);
                 BigDecimal weight = DataChange.dataToBigDecimal(item.get("净重"));
                 BigDecimal truckNumber = new BigDecimal(1);
                 String loadTime = item.get("装车日期").toString();
-                if(loadDate == null){
+                if (loadDate == null) {
                     loadDate = loadTime;
-                    map.put("loadDate",loadDate);
-                }else if(!loadDate.equals(loadTime)){
+                    map.put("loadDate", loadDate);
+                } else if (!loadDate.equals(loadTime)) {
                     throw new Exception("同一个Excel只允许一批车辆，请检查装车日期！");
                 }
                 requirementMap.put("requirementNumber", requirementNumber);
                 requirementMap.put("weight", weight);
                 requirementMap.put("truckNumber", truckNumber);
-                requirementMap.put("loadTime",loadTime);
-                requirementMap.put("trainList",trainList);
-                requirementMap.put("userId",userId);
-                requirementMap.put("userName",userName);
-                requirementMap.put("businessType",businessType);
+                requirementMap.put("loadTime", loadTime);
+                requirementMap.put("trainList", trainList);
+                requirementMap.put("userId", userId);
+                requirementMap.put("userName", userName);
+                requirementMap.put("businessType", businessType);
                 requirementList.add(requirementNumber);
                 map.put(requirementNumber, requirementMap);
             }
@@ -547,7 +546,7 @@ public class TMSController extends BaseRESTfulController {
         }
         //新增火车运力资源
         String[] capacities = capacitySet.toArray(new String[0]);//车牌号
-        try{
+        try {
             new Runnable() {
                 @Override
                 public void run() {
@@ -558,12 +557,14 @@ public class TMSController extends BaseRESTfulController {
                     rmsFeign.batchInsertCapacityTrain(capacityMap);
                 }
             }.run();
-        }catch (Exception e){e.printStackTrace();}
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
         //新增AMS及TMS
-        map.put("userId",userId);
-        map.put("userName",userName);
-        map.put("businessType",businessType);
-        map.put("requirementList",requirementList);
+        map.put("userId", userId);
+        map.put("userName", userName);
+        map.put("businessType", businessType);
+        map.put("requirementList", requirementList);
         return tmsFeign.purchaseTrainLoad(map);
     }
 
@@ -580,28 +581,28 @@ public class TMSController extends BaseRESTfulController {
     @ApiOperation(value = "查询采购火运装货报表")
     @PostMapping("/purchaseTrainLoadReport")
     public Map<String, Object> purchaseTrainLoadReport(@RequestBody(required = false) Map<String, Object> map,
-                                                     Integer apiId,
-                                                     Integer pageNum,
-                                                     Integer pageSize) {
+                                                       Integer apiId,
+                                                       Integer pageNum,
+                                                       Integer pageSize) {
         return tmsFeign.purchaseTrainLoadReport(map == null ? new HashMap<>() : map, apiId, pageNum, pageSize);
     }
 
     @ApiOperation(value = "修改火运装车")
     @PostMapping("/updateTrainLoad")
-    public Map<String, Object> updateTrainLoad(@RequestBody(required = false) Map<String, Object> map){
+    public Map<String, Object> updateTrainLoad(@RequestBody(required = false) Map<String, Object> map) {
         return tmsFeign.updateTrainLoad(map);
     }
 
     @ApiOperation(value = "删除火运装车", notes = "删除火运装车")
     @PostMapping(value = "/deleteTrainLoad")
-    @LogAround(foreignKeys = {"transOrderId"},foreignKeyTypes = {"运输订单"})
-    public Map<String, Object> deleteTrainLoad(@RequestBody(required = false) Map<String ,Object> map) {
+    @LogAround(foreignKeys = {"transOrderId"}, foreignKeyTypes = {"运输订单"})
+    public Map<String, Object> deleteTrainLoad(@RequestBody(required = false) Map<String, Object> map) {
         return tmsFeign.deleteTrainLoad(map);
     }
 
     @ApiOperation(value = "修改火运装车序号")
     @PostMapping("/updateTrainLoadSeq")
-    public Map<String, Object> updateTrainLoadSeq(@RequestBody(required = false) Map<String, Object> map){
+    public Map<String, Object> updateTrainLoadSeq(@RequestBody(required = false) Map<String, Object> map) {
         return tmsFeign.updateTrainLoadSeq(map);
     }
 
@@ -610,9 +611,9 @@ public class TMSController extends BaseRESTfulController {
     @PostMapping(value = "/purchaseTrainWeight")
 //    @LogAround(foreignKeys = {"resultId"},foreignKeyTypes = {"计量实绩"})
     public Map<String, Object> purchaseTrainWeight(@RequestBody MultipartFile file,
-                                                 String businessType,
-                                                 String userId,
-                                                 String userName) throws Exception {
+                                                   String businessType,
+                                                   String userId,
+                                                   String userName) throws Exception {
         Map<String, Object> map = new HashMap<>();
         //获取Excel中包含的对象数组
         List<Map<String, Object>> list = ExcelToolUtils.getExcelList(file, 0);
@@ -621,12 +622,12 @@ public class TMSController extends BaseRESTfulController {
         String weightTime = null;
         for (Map<String, Object> item : list) {
             //校验行
-            if(item.get("通知单号")==null || item.get("通知单号").equals("")
-                    || item.get("车号")==null || item.get("车号").equals("")
-                    || item.get("计量日期")==null || item.get("计量日期").equals("")
-                    || item.get("皮重")==null || item.get("皮重").equals("")
-                    || item.get("毛重")==null || item.get("毛重").equals("")
-                    ||  item.get("磅单号")==null || item.get("磅单号").equals("")){
+            if (item.get("通知单号") == null || item.get("通知单号").equals("")
+                    || item.get("车号") == null || item.get("车号").equals("")
+                    || item.get("计量日期") == null || item.get("计量日期").equals("")
+                    || item.get("皮重") == null || item.get("皮重").equals("")
+                    || item.get("毛重") == null || item.get("毛重").equals("")
+                    || item.get("磅单号") == null || item.get("磅单号").equals("")) {
                 throw new Exception("单元格数据异常（通知单号/车号/计量日期/净重/皮重/毛重/磅单号），请检查模板或数据是否正确!");
             }
             item.put("净重", DataChange.dataToBigDecimal(item.get("毛重")).subtract(DataChange.dataToBigDecimal(item.get("皮重"))));
@@ -643,48 +644,48 @@ public class TMSController extends BaseRESTfulController {
         if (capacities.length != list.size()) {
             throw new Exception("车号不允许重复！");
         }
-        map.put("userId",userId);
-        map.put("userName",userName);
-        map.put("businessType",businessType);
+        map.put("userId", userId);
+        map.put("userName", userName);
+        map.put("businessType", businessType);
         //获取火车运单及计量详情
-        List<Map<String,Object>> orderListAll = universalMapper.findTrainWeight(map);
+        List<Map<String, Object>> orderListAll = universalMapper.findTrainWeight(map);
         if (orderListAll.size() <= 0) {
             throw new Exception("未查询到装车信息，请先上传装车作业！");
         }
         List<String> requireList = new ArrayList<>();
-        for(Map<String,Object> order : orderListAll){
-            if(order.get("unloadResultId") != null){
-                throw new Exception(order.get("capacityId")+"已卸车，不允许再上传计量！");
+        for (Map<String, Object> order : orderListAll) {
+            if (order.get("unloadResultId") != null) {
+                throw new Exception(order.get("capacityId") + "已卸车，不允许再上传计量！");
             }
             String requireNumber = order.get("requireNumber").toString();
-            Map<String,Object> requirementMap =(Map<String, Object>) map.get(requireNumber);
-            if(requirementMap!=null){
-                List<Map<String,Object>> orderList = (ArrayList) requirementMap.get("orderList");
+            Map<String, Object> requirementMap = (Map<String, Object>) map.get(requireNumber);
+            if (requirementMap != null) {
+                List<Map<String, Object>> orderList = (ArrayList) requirementMap.get("orderList");
                 orderList.add(order);
                 BigDecimal weight = DataChange.dataToBigDecimal(requirementMap.get("weight"));
-                requirementMap.put("weight",weight.add(DataChange.dataToBigDecimal(order.get("netWeight"))));
-                requirementMap.put("orderList",orderList);
-            }else{
+                requirementMap.put("weight", weight.add(DataChange.dataToBigDecimal(order.get("netWeight"))));
+                requirementMap.put("orderList", orderList);
+            } else {
                 requirementMap = new HashMap<>();
-                List<Map<String,Object>> orderList = new ArrayList<>();
+                List<Map<String, Object>> orderList = new ArrayList<>();
                 orderList.add(order);
                 BigDecimal weight = DataChange.dataToBigDecimal(order.get("netWeight"));
-                requirementMap.put("transPlanId",order.get("transPlanId"));
-                requirementMap.put("materialId",order.get("materialId"));
-                requirementMap.put("weight",weight);
-                requirementMap.put("weightTime",weightTime);
-                requirementMap.put("userId",userId);
-                requirementMap.put("userName",userName);
-                requirementMap.put("orderList",orderList);
+                requirementMap.put("transPlanId", order.get("transPlanId"));
+                requirementMap.put("materialId", order.get("materialId"));
+                requirementMap.put("weight", weight);
+                requirementMap.put("weightTime", weightTime);
+                requirementMap.put("userId", userId);
+                requirementMap.put("userName", userName);
+                requirementMap.put("orderList", orderList);
                 requireList.add(requireNumber);
             }
-            map.put(requireNumber,requirementMap);
+            map.put(requireNumber, requirementMap);
         }
-        Map<String,Object> result = null;
-        for(String requireNumber : requireList){
-            Map<String,Object> requirementMap =(Map<String, Object>) map.get(requireNumber);
-            List<Map<String,Object>> orderList = (ArrayList) requirementMap.get("orderList");
-            if(universalMapper.countTransOrder(requirementMap) != orderList.size()){
+        Map<String, Object> result = null;
+        for (String requireNumber : requireList) {
+            Map<String, Object> requirementMap = (Map<String, Object>) map.get(requireNumber);
+            List<Map<String, Object>> orderList = (ArrayList) requirementMap.get("orderList");
+            if (universalMapper.countTransOrder(requirementMap) != orderList.size()) {
                 throw new Exception("计量车数与装车车数不一致！");
             }
             result = tmsFeign.purchaseTrainWeight(requirementMap);
@@ -699,9 +700,9 @@ public class TMSController extends BaseRESTfulController {
     @ApiOperation(value = "查询采购火运计量")
     @PostMapping("/purchaseTrainWeightList")
     public Map<String, Object> purchaseTrainWeightList(@RequestBody(required = false) Map<String, Object> map,
-                                                     Integer apiId,
-                                                     Integer pageNum,
-                                                     Integer pageSize) {
+                                                       Integer apiId,
+                                                       Integer pageNum,
+                                                       Integer pageSize) {
         return tmsFeign.purchaseTrainWeightList(map == null ? new HashMap<>() : map, apiId, pageNum, pageSize);
     }
 
@@ -721,37 +722,37 @@ public class TMSController extends BaseRESTfulController {
         String unloadTime = null;
         for (Map<String, Object> item : list) {
             //校验行
-            if(item.get("通知单号")==null || item.get("通知单号").equals("")
-                    || item.get("车号")==null || item.get("车号").equals("")
-                    || item.get("卸车日期")==null || item.get("卸车日期").equals("")){
+            if (item.get("通知单号") == null || item.get("通知单号").equals("")
+                    || item.get("车号") == null || item.get("车号").equals("")
+                    || item.get("卸车日期") == null || item.get("卸车日期").equals("")) {
                 throw new Exception("单元格数据异常（通知单号/车号/卸车日期），请检查模板或数据是否正确!");
             }
-            if(item.get("净重") == null || item.get("净重").equals("")){
+            if (item.get("净重") == null || item.get("净重").equals("")) {
                 //净重为空
-                if(item.get("毛重") != null && !item.get("毛重").equals("")
-                        && item.get("皮重") != null && !item.get("皮重").equals("")){
+                if (item.get("毛重") != null && !item.get("毛重").equals("")
+                        && item.get("皮重") != null && !item.get("皮重").equals("")) {
                     item.put("净重", DataChange.dataToBigDecimal(item.get("毛重")).subtract(DataChange.dataToBigDecimal(item.get("皮重"))));
-                }else{
+                } else {
                     throw new Exception("单元格数据异常（净重），请检查模板或数据是否正确!");
                 }
             }
 
-            if(item.get("毛重") == null || item.get("毛重").equals("")){
+            if (item.get("毛重") == null || item.get("毛重").equals("")) {
                 //毛重为空
-                if(item.get("净重") != null && !item.get("净重").equals("")
-                        && item.get("皮重") != null && !item.get("皮重").equals("")){
+                if (item.get("净重") != null && !item.get("净重").equals("")
+                        && item.get("皮重") != null && !item.get("皮重").equals("")) {
                     item.put("毛重", DataChange.dataToBigDecimal(item.get("净重")).add(DataChange.dataToBigDecimal(item.get("皮重"))));
-                }else{
+                } else {
                     throw new Exception("单元格数据异常（毛重），请检查模板或数据是否正确!");
                 }
             }
 
-            if(item.get("皮重") == null || item.get("皮重").equals("")){
+            if (item.get("皮重") == null || item.get("皮重").equals("")) {
                 //毛重为空
-                if(item.get("净重") != null && !item.get("净重").equals("")
-                        && item.get("毛重") != null && !item.get("毛重").equals("")){
+                if (item.get("净重") != null && !item.get("净重").equals("")
+                        && item.get("毛重") != null && !item.get("毛重").equals("")) {
                     item.put("皮重", DataChange.dataToBigDecimal(item.get("毛重")).subtract(DataChange.dataToBigDecimal(item.get("净重"))));
-                }else{
+                } else {
                     throw new Exception("单元格数据异常（皮重），请检查模板或数据是否正确!");
                 }
             }
@@ -762,51 +763,53 @@ public class TMSController extends BaseRESTfulController {
 //                throw new Exception("同一个Excel只允许一批车辆，请检查卸车日期！");
 //            }
             //车牌号去重
-            capacitySet.add(item.get("车号").toString());
+            System.out.println(item.get("车号").toString());
+            Boolean b = capacitySet.add(item.get("车号").toString());
+            System.out.println(b);
         }
         String[] capacities = capacitySet.toArray(new String[0]);//车牌号
         if (capacities.length != list.size()) {
             throw new Exception("车号不允许重复！");
         }
-        map.put("userId",userId);
-        map.put("userName",userName);
-        map.put("businessType",businessType);
+        map.put("userId", userId);
+        map.put("userName", userName);
+        map.put("businessType", businessType);
         //获取火车运单及计量详情
-        List<Map<String,Object>> orderListAll = universalMapper.findTrainUnload(map);
+        List<Map<String, Object>> orderListAll = universalMapper.findTrainUnload(map);
         if (orderListAll.size() <= 0) {
             throw new Exception("未查询到装车信息，请先上传装车作业！");
         }
         List<String> requireList = new ArrayList<>();
-        for(Map<String,Object> order : orderListAll){
-            if(order.get("unloadResultId") != null){
-                throw new Exception(order.get("capacityId")+"已卸车，不允许再上传！");
+        for (Map<String, Object> order : orderListAll) {
+            if (order.get("unloadResultId") != null) {
+                throw new Exception(order.get("capacityId") + "已卸车，不允许再上传！");
             }
             String requireNumber = order.get("requireNumber").toString();
-            Map<String,Object> requirementMap =(Map<String, Object>) map.get(requireNumber);
-            if(requirementMap!=null){
-                List<Map<String,Object>> orderList = (ArrayList) requirementMap.get("orderList");
+            Map<String, Object> requirementMap = (Map<String, Object>) map.get(requireNumber);
+            if (requirementMap != null) {
+                List<Map<String, Object>> orderList = (ArrayList) requirementMap.get("orderList");
                 orderList.add(order);
-                requirementMap.put("orderList",orderList);
-            }else{
+                requirementMap.put("orderList", orderList);
+            } else {
                 requirementMap = new HashMap<>();
-                List<Map<String,Object>> orderList = new ArrayList<>();
+                List<Map<String, Object>> orderList = new ArrayList<>();
                 orderList.add(order);
-                requirementMap.put("transPlanId",order.get("transPlanId"));
-                requirementMap.put("materialId",order.get("materialId"));
-                requirementMap.put("unloadPointId",order.get("unloadPointId"));
-                requirementMap.put("unloadTime",unloadTime);
-                requirementMap.put("userId",userId);
-                requirementMap.put("userName",userName);
-                requirementMap.put("orderList",orderList);
-                requirementMap.put("requirementSerialNumber",requireNumber);
+                requirementMap.put("transPlanId", order.get("transPlanId"));
+                requirementMap.put("materialId", order.get("materialId"));
+                requirementMap.put("unloadPointId", order.get("unloadPointId"));
+                requirementMap.put("unloadTime", unloadTime);
+                requirementMap.put("userId", userId);
+                requirementMap.put("userName", userName);
+                requirementMap.put("orderList", orderList);
+                requirementMap.put("requirementSerialNumber", requireNumber);
                 requireList.add(requireNumber);
             }
-            map.put(requireNumber,requirementMap);
+            map.put(requireNumber, requirementMap);
         }
-        Map<String,Object> result = null;
-        for(String requireNumber : requireList){
-            Map<String,Object> requirementMap =(Map<String, Object>) map.get(requireNumber);
-            List<Map<String,Object>> orderList = (ArrayList) requirementMap.get("orderList");
+        Map<String, Object> result = null;
+        for (String requireNumber : requireList) {
+            Map<String, Object> requirementMap = (Map<String, Object>) map.get(requireNumber);
+            List<Map<String, Object>> orderList = (ArrayList) requirementMap.get("orderList");
 //            if(universalMapper.countTransOrder(requirementMap) != orderList.size()){
 //                throw new Exception("卸车车数与装车车数不一致！");
 //            }
@@ -839,27 +842,26 @@ public class TMSController extends BaseRESTfulController {
     @ApiOperation(value = "查询司机运输汇总")
     @PostMapping("/getDriverTotalResult")
     public Map<String, Object> getDriverTotalResult(@RequestBody(required = false) Map<String, Object> map,
-                                                       Integer apiId,
-                                                       Integer pageNum,
-                                                       Integer pageSize) {
+                                                    Integer apiId,
+                                                    Integer pageNum,
+                                                    Integer pageSize) {
         return tmsFeign.getDriverTotalResult(map == null ? new HashMap<>() : map, apiId, pageNum, pageSize);
     }
 
 
-
     @ApiOperation(value = "查询车辆运输汇总")
     @PostMapping("/getCapacityTotalResult")
     public Map<String, Object> getCapacityTotalResult(@RequestBody(required = false) Map<String, Object> map,
-                                                       Integer apiId,
-                                                       Integer pageNum,
-                                                       Integer pageSize) {
+                                                      Integer apiId,
+                                                      Integer pageNum,
+                                                      Integer pageSize) {
         return tmsFeign.getCapacityTotalResult(map == null ? new HashMap<>() : map, apiId, pageNum, pageSize);
     }
 
 
     @ApiOperation("生产物流-调度任务新增")
     @PostMapping("/dispatchTask")
-    Map<String,Object> dispatchTask(@RequestBody Map<String,Object> map) {
+    Map<String, Object> dispatchTask(@RequestBody Map<String, Object> map) {
         return tmsFeign.dispatchTask(map);
     }
 
@@ -872,38 +874,38 @@ public class TMSController extends BaseRESTfulController {
     @ApiOperation("修改销售派车单信息")
     @PostMapping("/updateDlivDirnoSeq")
     @LogAround(foreignKeys = {"planChildId"}, foreignKeyTypes = {"修改销售运单"})
-    public RESTfulResult updateDlivDirnoSeq(@RequestBody Map<String,Object> map) {
+    public RESTfulResult updateDlivDirnoSeq(@RequestBody Map<String, Object> map) {
         return tmsFeign.updateDlivDirnoSeq(map);
     }
 
     @ApiOperation("查询销售派车单装车信息")
     @PostMapping("/selectDlivDirnoSeqDetails")
-    public RESTfulResult selectDlivDirnoSeqDetails(@RequestBody  Map<String,Object> map) {
+    public RESTfulResult selectDlivDirnoSeqDetails(@RequestBody Map<String, Object> map) {
         return tmsFeign.selectDlivDirnoSeqDetails(map);
     }
 
     @ApiOperation("查询订单厂内轨迹")
     @PostMapping("/getPathByOrder")
-    public RESTfulResult getPathByOrder(@RequestBody  Map<String,Object> map) {
+    public RESTfulResult getPathByOrder(@RequestBody Map<String, Object> map) {
         return tmsFeign.getPathByOrder(map);
     }
 
     @ApiOperation("上传定位，更新路径")
     @PostMapping("/uploadLocation")
-    public RESTfulResult uploadLocation(@RequestBody  Map<String,Object> map) {
+    public RESTfulResult uploadLocation(@RequestBody Map<String, Object> map) {
         return tmsFeign.uploadLocation(map);
     }
 
     @ApiOperation("实收吨数")
     @PostMapping("/updateWeight")
-    public RESTfulResult updateWeight(@RequestBody  Map<String,Object> map) {
+    public RESTfulResult updateWeight(@RequestBody Map<String, Object> map) {
         return tmsFeign.updateWeight(map);
     }
 
     @ApiOperation("checkWeightResult")
     @PostMapping("/checkWeightResult")
     @LogAround(foreignKeys = {"resultId"}, foreignKeyTypes = {"计量实绩"})
-    public Map<String,Object> checkWeightResult(@RequestBody  Map<String,Object> map) {
+    public Map<String, Object> checkWeightResult(@RequestBody Map<String, Object> map) {
         return tmsFeign.checkWeightResult(map);
     }
 
@@ -918,20 +920,22 @@ public class TMSController extends BaseRESTfulController {
 
     @ApiOperation("多拼派车")
     @PostMapping("/saleDispatchDuoPin")
-    RESTfulResult saleDispatchDuoPin(@RequestBody Map<String,Object> map) {return tmsFeign.saleDispatchDuoPin(map);}
+    RESTfulResult saleDispatchDuoPin(@RequestBody Map<String, Object> map) {
+        return tmsFeign.saleDispatchDuoPin(map);
+    }
 
 
     @ApiOperation("同步生产实绩")
     @PostMapping("/syncProductionResult")
     @LogAround(foreignKeys = {"transOrderId"}, foreignKeyTypes = {"调拨实绩"})
-    RESTfulResult syncProductionResult(@RequestBody Map<String,Object> map) {
+    RESTfulResult syncProductionResult(@RequestBody Map<String, Object> map) {
         return tmsFeign.syncProductionResult(map);
     }
 
     @ApiOperation("获取司机日工作量")
     @PostMapping("/getDriverDayJobForApp")
-    RESTfulResult getDriverDayJobForApp(@RequestBody Map<String,Object> map,Integer apiId) {
-        return tmsFeign.getDriverDayJobForApp(map,apiId);
+    RESTfulResult getDriverDayJobForApp(@RequestBody Map<String, Object> map, Integer apiId) {
+        return tmsFeign.getDriverDayJobForApp(map, apiId);
     }
 
     @ApiOperation(value = "确认出库", notes = "确认出库")
@@ -956,23 +960,23 @@ public class TMSController extends BaseRESTfulController {
     @ApiOperation(value = "查询车辆登记单信息")
     @PostMapping("/likeTransitOrders")
     public Map<String, Object> likeTransitOrders(@RequestBody(required = false) Map<String, Object> map,
-                                                      Integer apiId,
-                                                      Integer pageNum,
-                                                      Integer pageSize) {
+                                                 Integer apiId,
+                                                 Integer pageNum,
+                                                 Integer pageSize) {
         return tmsFeign.likeTransitOrders(map == null ? new HashMap<>() : map, apiId, pageNum, pageSize);
     }
 
     @ApiOperation(value = "新增车辆登记单信息")
     @PostMapping("/insertTmsTransitOrder")
-    public Map<String,Object> insertTmsTransitOrder(@RequestBody Map<String,Object> map) {
+    public Map<String, Object> insertTmsTransitOrder(@RequestBody Map<String, Object> map) {
         return tmsFeign.insertTmsTransitOrder(map);
     }
 
     @ApiOperation("导入通行登记单")
     @PostMapping("/importTrasitOrder")
     public Map<String, Object> importTrasitOrder(@RequestBody MultipartFile file,
-                                       String userId,
-                                       String userName) throws Exception {
+                                                 String userId,
+                                                 String userName) throws Exception {
         Map<String, Object> map = new HashMap<>();
         //获取Excel中包含的对象数组
         List<Map<String, Object>> list = ExcelToolUtils.getExcelList(file, 0);
@@ -991,29 +995,29 @@ public class TMSController extends BaseRESTfulController {
     @ApiOperation(value = "查询请车批车")
     @PostMapping("/getPleaseApproveList")
     public Map<String, Object> getPleaseApproveList(@RequestBody(required = false) Map<String, Object> map,
-                                                 Integer apiId,
-                                                 Integer pageNum,
-                                                 Integer pageSize) {
+                                                    Integer apiId,
+                                                    Integer pageNum,
+                                                    Integer pageSize) {
         return tmsFeign.getPleaseApproveList(map == null ? new HashMap<>() : map, apiId, pageNum, pageSize);
     }
 
     @PostMapping("/addPleaseApprove")
-    public Map<String,Object> addPleaseApprove(@RequestBody Map<String,Object> map) {
+    public Map<String, Object> addPleaseApprove(@RequestBody Map<String, Object> map) {
         return tmsFeign.addPleaseApprove(map);
     }
 
     @PostMapping("/updPleaseApprove")
-    public Map<String,Object> updPleaseApprove(@RequestBody Map<String,Object> map) {
+    public Map<String, Object> updPleaseApprove(@RequestBody Map<String, Object> map) {
         return tmsFeign.updPleaseApprove(map);
     }
 
     @PostMapping("/delPleaseApprove")
-    public Map<String,Object> delPleaseApprove(@RequestBody Map<String,Object> map) {
+    public Map<String, Object> delPleaseApprove(@RequestBody Map<String, Object> map) {
         return tmsFeign.delPleaseApprove(map);
     }
 
     @PostMapping("/gatepostTransitManager")
-    public Map<String,Object> gatepostTransitManager(@RequestBody Map<String,Object> map) {
+    public Map<String, Object> gatepostTransitManager(@RequestBody Map<String, Object> map) {
         return tmsFeign.gatepostTransitManager(map);
     }
 
@@ -1021,9 +1025,9 @@ public class TMSController extends BaseRESTfulController {
     @ApiOperation("导入宏瑞综合实绩")
     @PostMapping("/importComprehensiveResult")
     public Map<String, Object> importComprehensiveResult(@RequestBody MultipartFile file,
-                                                 String userId,
-                                                 String userName,
-                                                 String resultType) throws Exception {
+                                                         String userId,
+                                                         String userName,
+                                                         String resultType) throws Exception {
         Map<String, Object> map = new HashMap<>();
         if (file.isEmpty()) {
             return new HashMap<>();
@@ -1034,7 +1038,7 @@ public class TMSController extends BaseRESTfulController {
         String extension = "." + FilenameUtils.getExtension(originalFilename);
         // 定义新路径
         String newPath = "/data/file/result/";
-        String newName = userName + "-" + originalFilename+ Util.RandomCreate(8) + ".xlsx";
+        String newName = userName + "-" + originalFilename + Util.RandomCreate(8) + ".xlsx";
         File dataFile = new File(newPath);
         if (!dataFile.exists()) {
             dataFile.mkdirs();
@@ -1046,104 +1050,110 @@ public class TMSController extends BaseRESTfulController {
         List<Map<String, Object>> list = new ArrayList<>();
         //获取Excel中包含的对象数组
         if ("维保".equals(resultType)) {
-            List<String> excelHeads = Arrays.asList("车属单位","车型","车号","大号","维修时间","维修内容","维修","电器","钣焊","补胎","其它","工时合计","配件费用","外修费用","总合计");
-            list = ExcelToolUtils.getExcelList(file,2,excelHeads);
-        }else{
+            List<String> excelHeads = Arrays.asList("车属单位", "车型", "车号", "大号", "维修时间", "维修内容", "维修", "电器", "钣焊", "补胎", "其它", "工时合计", "配件费用", "外修费用", "总合计");
+            list = ExcelToolUtils.getExcelList(file, 2, excelHeads);
+        } else {
             list = ExcelToolUtils.getExcelList(file, 0);
         }
         map.put("list", list);
         map.put("userId", userId);
         map.put("userName", userName);
         map.put("resultType", resultType);
-        map.put("filePath",newPath + newName);
+        map.put("filePath", newPath + newName);
         return tmsFeign.importComprehensiveResult(map);
     }
+
     @ApiOperation(value = "火运大宗销售订单 删除销售运输订单")
     @PostMapping("/changeTransOrderH")
-    public Map<String,Object> changeTransOrderH(@RequestBody Map<String,Object> map) {
+    public Map<String, Object> changeTransOrderH(@RequestBody Map<String, Object> map) {
         return tmsFeign.changeTransOrderH(map);
     }
 
     @ApiOperation(value = "火运出库后修改车号")
     @PostMapping("/updateCarNo")
-    public Map<String,Object> updateCarNo(@RequestBody Map<String,Object> map) {
+    public Map<String, Object> updateCarNo(@RequestBody Map<String, Object> map) {
         return tmsFeign.updateCarNo(map);
     }
 
     @ApiOperation(value = "查询排队网格信息")
     @PostMapping("/likeQueueGrid")
     public Map<String, Object> likeQueueGrid(@RequestBody(required = false) Map<String, Object> map,
-                                                 Integer apiId,
-                                                 Integer pageNum,
-                                                 Integer pageSize) {
+                                             Integer apiId,
+                                             Integer pageNum,
+                                             Integer pageSize) {
         return tmsFeign.likeQueueGrid(map == null ? new HashMap<>() : map, apiId, pageNum, pageSize);
     }
 
     @ApiOperation(value = "查询排队实绩信息")
     @PostMapping("/likeQueueResult")
     public Map<String, Object> likeQueueResult(@RequestBody(required = false) Map<String, Object> map,
-                                             Integer apiId,
-                                             Integer pageNum,
-                                             Integer pageSize) {
+                                               Integer apiId,
+                                               Integer pageNum,
+                                               Integer pageSize) {
         return tmsFeign.likeQueueResult(map == null ? new HashMap<>() : map, apiId, pageNum, pageSize);
     }
 
     @ApiOperation(value = "处理排队网格数据")
     @PostMapping("/disposeQueueGrid")
-    public Map<String,Object> disposeQueueGrid(@RequestBody Map<String,Object> map) {
+    public Map<String, Object> disposeQueueGrid(@RequestBody Map<String, Object> map) {
         return tmsFeign.disposeQueueGrid(map);
     }
 
 
     @ApiOperation(value = "获取网格数据")
     @PostMapping("/getGridAllData")
-    public Map<String,Object> getGridAllData(@RequestBody Map<String,Object> map) {
+    public Map<String, Object> getGridAllData(@RequestBody Map<String, Object> map) {
         return tmsFeign.getGridAllData(map);
     }
 
     @ApiOperation(value = "处理排队实绩数据")
     @PostMapping("/disposeQueueResult")
-    public Map<String,Object> disposeQueueResult(@RequestBody Map<String,Object> map) {
+    public Map<String, Object> disposeQueueResult(@RequestBody Map<String, Object> map) {
         return tmsFeign.disposeQueueResult(map);
     }
 
     @ApiOperation(value = "禁用/启用运输订单")
     @PostMapping("/banTransOrder")
     @LogAround(foreignKeys = {"transOrderId"}, foreignKeyTypes = {"运输订单"})
-    public Map<String,Object> banTransOrder(@RequestBody Map<String,Object> map) {
+    public Map<String, Object> banTransOrder(@RequestBody Map<String, Object> map) {
         return tmsFeign.banTransOrder(map);
     }
 
     @ApiOperation(value = "查询销售火运装货报表")
     @PostMapping("/loadingOperation")
     public Map<String, Object> loadingOperation(@RequestBody(required = false) Map<String, Object> map,
-                                                       Integer apiId,
-                                                       Integer pageNum,
-                                                       Integer pageSize) {
+                                                Integer apiId,
+                                                Integer pageNum,
+                                                Integer pageSize) {
         return tmsFeign.loadingOperation(map == null ? new HashMap<>() : map, apiId, pageNum, pageSize);
     }
 
     @ApiOperation(value = "修改火运装车列序号")
     @PostMapping("/updateTrainOrderSeq")
-    public Map<String,Object> updateTrainOrderSeq(@RequestBody Map<String,Object> map) {
+    public Map<String, Object> updateTrainOrderSeq(@RequestBody Map<String, Object> map) {
         return tmsFeign.updateTrainOrderSeq(map);
     }
 
     @ApiOperation(value = "查询销售火运装货报表明细")
     @PostMapping("/purchaseTrainsOrderList")
     public Map<String, Object> purchaseTrainsOrderList(@RequestBody(required = false) Map<String, Object> map,
-                                                Integer apiId,
-                                                Integer pageNum,
-                                                Integer pageSize) {
+                                                       Integer apiId,
+                                                       Integer pageNum,
+                                                       Integer pageSize) {
         return tmsFeign.purchaseTrainsOrderList(map == null ? new HashMap<>() : map, apiId, pageNum, pageSize);
     }
 
     @ApiOperation("吊装信息")
     @PostMapping("/disposeHandling")
-    public Map<String,Object> disposeHandling(@RequestBody Map<String,Object> map) {
+    public Map<String, Object> disposeHandling(@RequestBody Map<String, Object> map) {
         return tmsFeign.disposeHandling(map);
     }
 
+    @ApiOperation("同步报表数据")
+    @PostMapping("/getgenerateOperateDaily")
+    public Map<String,Object> generateOperateDaily(@RequestBody Map<String,Object> map) {
+        return tmsFeign.getgenerateOperateDaily(map);
+    }
     @ApiOperation(value = "保存WMS传递的内转出库数据", notes = "保存WMS传递的内转出库数据")
     @PostMapping(value = "/preserveMoveListIn")
     public RESTfulResult preserveMoveListIn(@RequestBody Map<String, Object> mapList) {
@@ -1174,4 +1184,34 @@ public class TMSController extends BaseRESTfulController {
         return tmsFeign.modifyChange(params);
     }
 
+
+    @ApiOperation(value = "纠错运输实绩")
+    @PostMapping("correctTransOrder")
+    public Map<String,Object> correctTransOrder(@RequestBody Map<String,Object> map) {
+        return tmsFeign.correctTransOrder(map);
+    }
+
+    @ApiOperation(value = "针对签到过期的计时单子重新赋权", notes = "针对签到过期的计时单子重新赋权")
+    @PostMapping(value = "/resartStartTimming")
+    public RESTfulResult resartStartTimming(@RequestBody Map<String, Object> params) {
+        return tmsFeign.resartStartTimming(params);
+    }
+
+    @ApiOperation(value = "查询派车规则", notes = "查询派车规则")
+    @PostMapping(value = "/getDispatchRules")
+    public RESTfulResult getDispatchRules(@RequestBody Map<String, Object> params) {
+        return success(tmsFeign.getDispatchRules(params));
+    }
+
+
+    @ApiOperation(value = "查询站台装卸实绩")
+    @PostMapping("/getZtZxShiji")
+    public Map<String, Object> getZtZxShiji(@RequestBody(required = false) Map<String, Object> map,
+                                                Integer apiId,
+                                                Integer pageNum,
+                                                Integer pageSize) {
+        return tmsFeign.getZtZxShiji(map == null ? new HashMap<>() : map, apiId, pageNum, pageSize);
+    }
+
+
 }

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

@@ -64,42 +64,41 @@ public class UniversalController extends BaseRESTfulController {
 
     @ApiModelProperty(value = "边输边查物资大类")
     @PostMapping("/getMaterialTypeByLike")
-    public RESTfulResult getMaterialTypeByLike(@RequestBody(required = false) Map<String,Object> map) {
+    public RESTfulResult getMaterialTypeByLike(@RequestBody(required = false) Map<String, Object> map) {
         List<Map<String, Object>> list = universalMapper.getMaterialTypeByLike(map);
         return success(list);
     }
 
     @ApiModelProperty(value = "边输边查物资")
     @PostMapping("/getMaterialByLike")
-    public RESTfulResult getMaterialByLike(@RequestBody(required = false) Map<String,Object> map) {
+    public RESTfulResult getMaterialByLike(@RequestBody(required = false) Map<String, Object> map) {
         List<Map<String, Object>> list = universalMapper.getMaterialByLike(map);
         return success(list);
     }
 
 
-
     @ApiModelProperty(value = "边输边查运力类型")
     @PostMapping("/getCapacityTypeByLike")
-    public RESTfulResult getCapacityTypeByLike(@RequestBody(required = false) Map<String,Object> map) {
+    public RESTfulResult getCapacityTypeByLike(@RequestBody(required = false) Map<String, Object> map) {
         List<Map<String, Object>> list = universalMapper.getCapacityTypeByLike(map);
         //处理多ID
-        for(Map<String,Object>  item : list){
-            List<Object>  fuelTypeIds = JSONObject.parseObject(item.get("fuelTypeIds").toString(),ArrayList.class);
-            item.put("fuelTypeIds",fuelTypeIds);
+        for (Map<String, Object> item : list) {
+            List<Object> fuelTypeIds = JSONObject.parseObject(item.get("fuelTypeIds").toString(), ArrayList.class);
+            item.put("fuelTypeIds", fuelTypeIds);
         }
         return success(list);
     }
 
     @ApiModelProperty(value = "边输边查公司单位")
     @PostMapping("/getCompanyMesByLike")
-    public RESTfulResult getCompanyMesByLike(@RequestBody(required = false) Map<String,Object> map) {
+    public RESTfulResult getCompanyMesByLike(@RequestBody(required = false) Map<String, Object> map) {
         List<Map<String, Object>> list = universalMapper.getCompanyMesByLike(map);
         return success(list);
     }
 
     @ApiModelProperty(value = "边输边查公司计划单位")
     @PostMapping("/getCompanyMesByPlanLike")
-    public RESTfulResult getCompanyMesByPlanLike(@RequestBody(required = false) Map<String,Object> map) {
+    public RESTfulResult getCompanyMesByPlanLike(@RequestBody(required = false) Map<String, Object> map) {
         List<Map<String, Object>> list = universalMapper.getCompanyMesByPlanLike(map);
         return success(list);
     }
@@ -107,14 +106,14 @@ public class UniversalController extends BaseRESTfulController {
 
     @ApiModelProperty(value = "边输边查环保标准")
     @PostMapping("/getEmissionStandardByLike")
-    public RESTfulResult getEmissionStandardByLike(@RequestBody(required = false) Map<String,Object> map) {
+    public RESTfulResult getEmissionStandardByLike(@RequestBody(required = false) Map<String, Object> map) {
         List<Map<String, Object>> list = universalMapper.getEmissionStandardByLike(map);
         return success(list);
     }
 
     @ApiModelProperty(value = "边输边查作业点")
     @PostMapping("/getOperationPointByLike")
-    public RESTfulResult getOperationPointByLike(@RequestBody(required = false) Map<String,Object> map) {
+    public RESTfulResult getOperationPointByLike(@RequestBody(required = false) Map<String, Object> map) {
         //System.out.println(map.get("id"));
         List<Map<String, Object>> list = universalMapper.getOperationPointByLike(map);
         return success(list);
@@ -122,7 +121,7 @@ public class UniversalController extends BaseRESTfulController {
 
     @ApiModelProperty(value = "边输边查作业点")
     @PostMapping("/getOperationPointByLikeNoCode")
-    public RESTfulResult getOperationPointByLikeNoCode(@RequestBody(required = false) Map<String,Object> map) {
+    public RESTfulResult getOperationPointByLikeNoCode(@RequestBody(required = false) Map<String, Object> map) {
         //System.out.println(map.get("id"));
         List<Map<String, Object>> list = universalMapper.getOperationPointByLikeNoCode(map);
         return success(list);
@@ -130,38 +129,51 @@ public class UniversalController extends BaseRESTfulController {
 
     @ApiModelProperty(value = "边输边查人员")
     @PostMapping("/getPersonnelByLike")
-    public RESTfulResult getPersonnelByLike(@RequestBody(required = false) Map<String,Object> map) {
-        if("司机".equals(map.get("personnelPost"))) {
+    public RESTfulResult getPersonnelByLike(@RequestBody(required = false) Map<String, Object> map) {
+        if ("司机".equals(map.get("personnelPost"))) {
             List<Map<String, Object>> list = universalMapper.getDriverByLike(map);
             return success(list);
         }
+        if ("指挥工".equals(map.get("personnelTest"))){
+            map.put("DiaoCar","11");
+            List<Map<String, Object>> list = universalMapper.getPersonnelByLike(map);
+            return success(list);
+        }
         List<Map<String, Object>> list = universalMapper.getPersonnelByLike(map);
         return success(list);
     }
 
     @ApiModelProperty(value = "边输边查车牌号")
     @PostMapping("/getCapacityByLike")
-    public RESTfulResult getCapacityByLike(@RequestBody(required = false) Map<String,Object> map) {
+    public RESTfulResult getCapacityByLike(@RequestBody(required = false) Map<String, Object> map) {
         List<Map<String, Object>> list = universalMapper.getCapacityByLike(map);
         return success(list);
     }
 
     @ApiModelProperty(value = "边输边查车牌号生产")
     @PostMapping("/getCapacityByLikeSc")
-    public RESTfulResult getCapacityByLikeSc(@RequestBody(required = false) Map<String,Object> map) {
+    public RESTfulResult getCapacityByLikeSc(@RequestBody(required = false) Map<String, Object> map) {
         List<Map<String, Object>> list = universalMapper.getCapacityByLikeSc(map);
         return success(list);
     }
 
+    @ApiModelProperty(value = "边输边查车牌号-内部")
+    @PostMapping("/getCapacityByLikeInner")
+    public RESTfulResult getCapacityByLikeInner(@RequestBody(required = false) Map<String, Object> map) {
+        List<Map<String, Object>> list = universalMapper.getCapacityByLikeInner(map);
+        return success(list);
+    }
+
     @ApiModelProperty(value = "边输边查快捷需求code")
     @PostMapping("/getCategoryCodeByLike")
-    public RESTfulResult getCategoryCodeByLike(@RequestBody(required = false) Map<String,Object> map) {
+    public RESTfulResult getCategoryCodeByLike(@RequestBody(required = false) Map<String, Object> map) {
         List<Map<String, Object>> list = universalMapper.getCategoryCodeByLike(map);
         return success(list);
     }
+
     @ApiModelProperty(value = "边输岗位信息")
     @PostMapping("/getJobInfosByLike")
-    public RESTfulResult getrmsrmsjobinfosBylike(@RequestBody(required = false) Map<String,Object> map) {
+    public RESTfulResult getrmsrmsjobinfosBylike(@RequestBody(required = false) Map<String, Object> map) {
         List<Map<String, Object>> list = universalMapper.getrmsrmsjobinfosBylike(map);
         return success(list);
     }
@@ -169,14 +181,14 @@ public class UniversalController extends BaseRESTfulController {
 
     @ApiModelProperty(value = "边输边查运输范围")
     @PostMapping("/getTransRangeByLike")
-    public RESTfulResult getTransRange(@RequestBody(required = false) Map<String,Object> map) {
+    public RESTfulResult getTransRange(@RequestBody(required = false) Map<String, Object> map) {
         List<Map<String, Object>> list = universalMapper.getTransRangeByLike(map);
         return success(list);
     }
 
     @ApiModelProperty(value = "边输边查作业路径")
     @PostMapping("/getLineByLike")
-    public RESTfulResult getLineByLike(@RequestBody(required = false) Map<String,Object> map) {
+    public RESTfulResult getLineByLike(@RequestBody(required = false) Map<String, Object> map) {
         List<Map<String, Object>> list = universalMapper.getLineByLike(map);
         return success(list);
     }
@@ -187,27 +199,27 @@ public class UniversalController extends BaseRESTfulController {
         //添加到files数组
         List<MultipartFile> files = request.getFiles("file");
         //没有上传
-        if(files.size() == 0){
-            return  success("","没有上传任何文件！");
+        if (files.size() == 0) {
+            return success("", "没有上传任何文件！");
         }
-        try{
+        try {
             //上传图片,拼接在一个url里
-            String url="";
-            for (int i=0;i<files.size();i++){
-                MultipartFile file=files.get(i);
-                url += imageFileUtils.updateFile(file,i + new Date().getTime())+';';
+            String url = "";
+            for (int i = 0; i < files.size(); i++) {
+                MultipartFile file = files.get(i);
+                url += imageFileUtils.updateFile(file, i + new Date().getTime()) + ';';
             }
-            return success(url,"上传成功！");
-        }catch (Exception e){
+            return success(url, "上传成功！");
+        } catch (Exception e) {
             e.printStackTrace();
-            return  failed(e.getMessage(),"上传失败！");
+            return failed(e.getMessage(), "上传失败！");
         }
     }
 
     @ApiOperation("水印测试")
     @PostMapping("/paintTest")
-    public RESTfulResult uploadFile(MultipartFile file,HttpServletResponse response) throws Exception {
-        File targetFile = DataChange.paintWater(file,"地点：xxxx省市县\n时间："+new Date(),50,-100);
+    public RESTfulResult uploadFile(MultipartFile file, HttpServletResponse response) throws Exception {
+        File targetFile = DataChange.paintWater(file, "地点：xxxx省市县\n时间：" + new Date(), 50, -100);
         Thread.sleep(10000);
         targetFile.delete();
         return success("上传成功");
@@ -216,20 +228,20 @@ public class UniversalController extends BaseRESTfulController {
 
     @ApiOperation("表格查询显示和隐藏")
     @PostMapping("/getColumnShowHidden")
-    public Map<String,Object> getColumnShowHidden(@RequestBody(required = false) Map<String,Object> map) {
-        Map<String,Object>  responseMap = universalService.getColumnShowHidden(map);
+    public Map<String, Object> getColumnShowHidden(@RequestBody(required = false) Map<String, Object> map) {
+        Map<String, Object> responseMap = universalService.getColumnShowHidden(map);
         return responseMap;
     }
 
     @ApiOperation("切换列的显示与隐藏")
     @PostMapping("updateColumnShowHidden")
-    public RESTfulResult updateColumnShowHidden(@RequestBody Map<String,Object> map){
+    public RESTfulResult updateColumnShowHidden(@RequestBody Map<String, Object> map) {
         return success(universalService.updateColumnShowHidden(map));
     }
 
     @ApiOperation("查询列的显示隐藏方案")
     @PostMapping("getColumShowHideScheme")
-    public RESTfulResult getColumShowHideScheme(@RequestBody Map<String,Object> map) {
+    public RESTfulResult getColumShowHideScheme(@RequestBody Map<String, Object> map) {
         return success(universalService.getColumShowHideScheme(map));
     }
 
@@ -240,43 +252,43 @@ public class UniversalController extends BaseRESTfulController {
 
     @ApiModelProperty(value = "边输边查业务类型")
     @PostMapping("/getBusinessTypeLike")
-    public RESTfulResult getBusinessTypeLike(@RequestBody(required = false) Map<String,Object> map) {
+    public RESTfulResult getBusinessTypeLike(@RequestBody(required = false) Map<String, Object> map) {
         List<Map<String, Object>> list = universalMapper.getBusinessTypeLike(map);
         return success(list);
     }
 
     @ApiModelProperty(value = "边输边查燃料类型")
     @PostMapping("/getFuelTypeByLike")
-    public RESTfulResult getFuelTypeByLike(@RequestBody(required = false) Map<String,Object> map) {
+    public RESTfulResult getFuelTypeByLike(@RequestBody(required = false) Map<String, Object> map) {
         List<Map<String, Object>> list = universalMapper.getFuelTypeByLike(map);
         return success(list);
     }
 
     @ApiOperation(value = "查询是否有正在执行的运单")
     @PostMapping("/getReceivedTransOrder")
-    public RESTfulResult getReceivedTransOrder(@RequestBody(required = false)Map<String,Object> map) {
-        List<Map<String,Object>> orderIds= universalMapper.getOrderIds(map);
+    public RESTfulResult getReceivedTransOrder(@RequestBody(required = false) Map<String, Object> map) {
+        List<Map<String, Object>> orderIds = universalMapper.getOrderIds(map);
         return success(orderIds);
     }
 
     @ApiOperation(value = "需求快捷编码")
     @PostMapping("/getDemandRulesCode")
-    public RESTfulResult getDemandRulesCode(@RequestBody(required = false) Map<String,Object> map) {
+    public RESTfulResult getDemandRulesCode(@RequestBody(required = false) Map<String, Object> map) {
         List<Map<String, Object>> demandRules = universalMapper.getDemandRulesCode(map);
         return success(demandRules);
     }
 
     @ApiOperation("获取身份证内码,用于判断该车辆是否有")
     @PostMapping("/getIdCardCode")
-    public RESTfulResult getIdCardCode(@RequestBody Map<String,Object> map) {
+    public RESTfulResult getIdCardCode(@RequestBody Map<String, Object> map) {
         String idCardCode = universalMapper.getIdCardCode(map);
         return success(idCardCode);
     }
 
     @ApiOperation("根据物料编码获取物料信息")
     @PostMapping("/getMaterial")
-    public RESTfulResult getMaterial(@RequestBody Map<String,Object>
-                                                 map, Integer apiId,
+    public RESTfulResult getMaterial(@RequestBody Map<String, Object>
+                                             map, Integer apiId,
                                      Integer pageNum,
                                      Integer pageSize) {
         PageHelper.startPage(pageNum, pageSize);
@@ -287,21 +299,21 @@ public class UniversalController extends BaseRESTfulController {
 
     @ApiOperation("根据车型获取剩余车辆")
     @PostMapping("/getcountCar")
-    public RESTfulResult getcountCar(@RequestBody Map<String,Object> map) {
+    public RESTfulResult getcountCar(@RequestBody Map<String, Object> map) {
         List<Map<String, Object>> material = universalMapper.getcountCar(map);
         return success(material);
     }
 
     @ApiOperation("getShipContainer")
     @PostMapping("/getShipContainer")
-    public RESTfulResult getShipContainer(@RequestBody Map<String,Object> map) {
-        List<Map<String,Object>> containerList = universalMapper.getContainerList(map);
+    public RESTfulResult getShipContainer(@RequestBody Map<String, Object> map) {
+        List<Map<String, Object>> containerList = universalMapper.getContainerList(map);
         return success(containerList);
     }
 
     @ApiOperation("获取通知单号")
     @PostMapping("/getRequirementNo")
-    public RESTfulResult getRequirementNo(@RequestBody Map<String,Object> map) {
+    public RESTfulResult getRequirementNo(@RequestBody Map<String, Object> map) {
         Map<String, Object> requireMap = new HashMap<>();
         BigDecimal requirementId = universalMapper.transRequirementId();
         if (map.get("businessFlag").toString().equals("XS")) {
@@ -320,7 +332,7 @@ public class UniversalController extends BaseRESTfulController {
 
     @ApiOperation("通知单边输边查")
     @PostMapping("/getRequirementByLike")
-    public RESTfulResult getRequirementByLike(@RequestBody Map<String,Object> map) {
+    public RESTfulResult getRequirementByLike(@RequestBody Map<String, Object> map) {
         List<Map<String, Object>> list = universalMapper.getRequirementByLike(map);
         return success(list);
     }
@@ -328,34 +340,34 @@ public class UniversalController extends BaseRESTfulController {
     @ApiOperation("查询APP版本更新")
     @PostMapping("/getAppVersion")
     public RESTfulResult getAppVersion() {
-        Map<String,Object> config = universalMapper.getConfigByName("APP最新版本");
+        Map<String, Object> config = universalMapper.getConfigByName("APP最新版本");
         return success(config.get("valueString"));
     }
 
     @ApiOperation("查询运单中最近的司机排班")
     @PostMapping("/getCapacityDriver")
-    public RESTfulResult getCapacityDriver(@RequestBody Map<String,Object> map) {
+    public RESTfulResult getCapacityDriver(@RequestBody Map<String, Object> map) {
         return success(universalMapper.getCapacityDriver(map));
     }
 
 
     @ApiOperation("查询运单中所有的司机排班")
     @PostMapping("/getCapacityDriverSelect")
-    public RESTfulResult getCapacityDriverSelect(@RequestBody Map<String,Object> map) {
-        List<Map<String,Object>> list = universalMapper.getCapacityDriverSelect(map);
-        List<Map<String,Object>> result = new ArrayList<>();
+    public RESTfulResult getCapacityDriverSelect(@RequestBody Map<String, Object> map) {
+        List<Map<String, Object>> list = universalMapper.getCapacityDriverSelect(map);
+        List<Map<String, Object>> result = new ArrayList<>();
         Set<String> set = new HashSet<>();
         //对list去重
-        for (Map<String,Object> item : list) {
+        for (Map<String, Object> item : list) {
             //只保留5条
-            if(result.size() >= 5){
+            if (result.size() >= 5) {
                 break;
             }
             //去重
-            String key = item.get("capacityId") + "-" +item.get("driverId");
-            if(set.contains(key)){
+            String key = item.get("capacityId") + "-" + item.get("driverId");
+            if (set.contains(key)) {
                 continue;
-            }else{
+            } else {
                 set.add(key);
                 result.add(item);
             }
@@ -365,72 +377,89 @@ public class UniversalController extends BaseRESTfulController {
 
     @ApiOperation("获取车辆信息")
     @PostMapping("/getCapacityInfo")
-    public RESTfulResult getCapacityInfo(@RequestBody Map<String,Object> map) {
+    public RESTfulResult getCapacityInfo(@RequestBody Map<String, Object> map) {
         return success(universalMapper.getCapacityInfo(map));
     }
 
     @ApiOperation("获取司机信息")
     @PostMapping("/getDriverInfo")
-    public RESTfulResult getDriverInfo(@RequestBody Map<String,Object> map) {
+    public RESTfulResult getDriverInfo(@RequestBody Map<String, Object> map) {
         return success(universalMapper.getDriverInfo(map));
     }
 
     @ApiOperation("需求边输边查")
     @PostMapping("/getRequireByLike")
-    public RESTfulResult getRequireByLike(@RequestBody Map<String,Object> map) {
+    public RESTfulResult getRequireByLike(@RequestBody Map<String, Object> map) {
         return success(universalMapper.getRequireByLike(map));
     }
 
 
     @ApiOperation("通用导出")
     @PostMapping("/excleExport")
-    public RESTfulResult excleExport(@RequestBody Map<String,Object> map, HttpServletRequest httpServletRequest) throws IOException {
+    public RESTfulResult excleExport(@RequestBody Map<String, Object> map, HttpServletRequest httpServletRequest) throws IOException {
         JSONObject jsonObject = JSONObject.parseObject(JSONObject.toJSONString(map));
-        jsonObject.putAll( JSONObject.parseObject(JSONObject.toJSONString(map.get("requestQuery"))));
-        String url  =  "http://172.16.90.202:80"+map.get("requestUrl").toString() + "&pageNum=1&pageSize=10000";
-        JSONObject json = HttpUtil.sendPost(url,jsonObject,httpServletRequest.getHeader("cookie"));
+        jsonObject.putAll(JSONObject.parseObject(JSONObject.toJSONString(map.get("requestQuery"))));
+        String url = "http://172.16.90.202:80" + map.get("requestUrl").toString() + "&pageNum=1&pageSize=10000";
+        JSONObject json = HttpUtil.sendPost(url, jsonObject, httpServletRequest.getHeader("cookie"));
         Map<String, Object> data = (Map<String, Object>) json.get("data");
-        List<Map<String,Object>> listMap = (List<Map<String, Object>>) data.get("list");
-        List<Map<String,Object>> columnData = (List<Map<String, Object>>) data.get("columnData");
+        List<Map<String, Object>> listMap = (List<Map<String, Object>>) data.get("list");
+        List<Map<String, Object>> columnData = (List<Map<String, Object>>) data.get("columnData");
         LinkedHashMap<String, String> columnMaps = Maps.newLinkedHashMap();
-        for (int i = 0; i <columnData.size() ; i++) {
-            columnMaps.put(columnData.get(i).get("prop").toString(),columnData.get(i).get("label").toString());
+        for (int i = 0; i < columnData.size(); i++) {
+            columnMaps.put(columnData.get(i).get("prop").toString(), columnData.get(i).get("label").toString());
         }
         byte[] stream1 = exportExcelFile(columnMaps, listMap);
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
         String path = "/data/file/exportExcel/" + simpleDateFormat.format(new Date()) + "/";
         File datFile = new File(path);
-        if(!datFile.exists()) {
+        if (!datFile.exists()) {
             datFile.mkdirs();
         }
-        String name = map.get("userName") + "-" + map.get("exclename").toString()+ Util.RandomCreate(8) + ".xlsx";
+        String name = map.get("userName") + "-" + map.get("exclename").toString() + Util.RandomCreate(8) + ".xlsx";
         FileOutputStream outputStream1 = new FileOutputStream(new File(path + name));
         outputStream1.write(stream1);
         outputStream1.flush();
         outputStream1.close();
         Map<String, Object> response = new HashMap<>();
-        response.put("fileName",name);
-        response.put("filePath",path + name);
+        response.put("fileName", name);
+        response.put("filePath", path + name);
         return success(response);
     }
+
     @ApiModelProperty(value = "边输边查公司单位审批流程使用")
     @PostMapping("/getCompanyMesByLike2")
-    public RESTfulResult getCompanyMesByLike2(@RequestBody(required = false) Map<String,Object> map) {
+    public RESTfulResult getCompanyMesByLike2(@RequestBody(required = false) Map<String, Object> map) {
         List<Map<String, Object>> list = universalMapper.getCompanyMesByLike2(map);
         return success(list);
     }
 
     @ApiOperation(value = "获取排队网格")
     @PostMapping("/getQueueGridList")
-    public RESTfulResult getQueueGridList(@RequestBody(required = false) Map<String,Object> map) {
-        List<Map<String,Object>> list = universalMapper.getQueueGridList(map);
+    public RESTfulResult getQueueGridList(@RequestBody(required = false) Map<String, Object> map) {
+        List<Map<String, Object>> list = universalMapper.getQueueGridList(map);
         return success(list);
     }
 
     @PostMapping("/getTransOrderByJobNumber")
     @ApiOperation("根据手机号查询运单")
-    public RESTfulResult getTransOrderByJobNumber(@RequestBody Map<String,Object> map) {
-        List<Map<String,Object>> list = universalMapper.getTransOrderByJobNumber(map);
+    public RESTfulResult getTransOrderByJobNumber(@RequestBody Map<String, Object> map) {
+        List<Map<String, Object>> list = universalMapper.getTransOrderByJobNumber(map);
         return success(list);
     }
+
+    @ApiModelProperty(value = "边输边查库存名称及信息")
+    @PostMapping("/getInventoryByLike")
+    public RESTfulResult getInventoryByLike(@RequestBody(required = false) Map<String, Object> map) {
+        List<Map<String, Object>> list = universalMapper.getInventoryByLike(map);
+        return success(list);
+    }
+
+
+    @ApiModelProperty(value = "根据运单号查询运单信息")
+    @PostMapping("/getTransOrderInFoByNo")
+    public RESTfulResult getTransOrderInFoByNo(@RequestBody(required = false) Map<String, Object> map) {
+        List<Map<String, Object>> list = universalMapper.getTransOrderInFoByNo(map);
+        return success(list);
+    }
+
 }

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

@@ -119,6 +119,7 @@ public class WMSController extends BaseRESTfulController {
     public RESTfulResult editButton(@RequestBody(required = false) HashMap<String, Object> params) {
         return wmsFeign.editButton(params);
     }
+
     //实时库存
     @ApiOperation(value = "实时库存")
     @ApiImplicitParams({
@@ -133,6 +134,7 @@ public class WMSController extends BaseRESTfulController {
                                                        Integer pageSize) {
         return wmsFeign.list(map == null ? new HashMap<>() : map, apiId, pageNum, pageSize);
     }
+
     @ApiOperation(value = "新增实时库存")
     @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
     @LogAround(foreignKeys = {"gridMaterialId"}, foreignKeyTypes = {"实时库存"})
@@ -168,18 +170,17 @@ public class WMSController extends BaseRESTfulController {
     })
     @PostMapping(value = "/getGridMaterialList")
     public Map<String, Object> getGridMaterialList(@RequestBody(required = false) Map<String, Object> map, Integer apiId,
-                                                       Integer pageNum,
-                                                       Integer pageSize) {
+                                                   Integer pageNum,
+                                                   Integer pageSize) {
         return wmsFeign.getGridMaterialList(map == null ? new HashMap<>() : map, apiId, pageNum, pageSize);
     }
 
 
-
     @ApiOperation(value = "修改库存")
     @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
     @LogAround(foreignKeys = {"gridMaterialId"}, foreignKeyTypes = {"入库实绩"})
     @PostMapping("/updateGridMaterial")
-    public Map<String, Object> updateGridMaterial(@RequestBody(required = false) Map<String, Object> map){
+    public Map<String, Object> updateGridMaterial(@RequestBody(required = false) Map<String, Object> map) {
         return wmsFeign.updateGridMaterial(map);
     }
 
@@ -192,13 +193,12 @@ public class WMSController extends BaseRESTfulController {
     })
     @PostMapping(value = "/getGridMaterialDailyReport")
     public Map<String, Object> getGridMaterialDailyReport(@RequestBody(required = false) Map<String, Object> map, Integer apiId,
-                                                   Integer pageNum,
-                                                   Integer pageSize) {
+                                                          Integer pageNum,
+                                                          Integer pageSize) {
         return wmsFeign.getGridMaterialDailyReport(map == null ? new HashMap<>() : map, apiId, pageNum, pageSize);
     }
 
 
-
     @ApiOperation(value = "查询入库实绩")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "map", value = "参数", required = false, dataType = "map"),
@@ -208,8 +208,8 @@ public class WMSController extends BaseRESTfulController {
     })
     @PostMapping(value = "/getInboundList")
     public Map<String, Object> getInboundList(@RequestBody(required = false) Map<String, Object> map, Integer apiId,
-                                                   Integer pageNum,
-                                                   Integer pageSize) {
+                                              Integer pageNum,
+                                              Integer pageSize) {
         return wmsFeign.getInboundList(map == null ? new HashMap<>() : map, apiId, pageNum, pageSize);
     }
 
@@ -217,7 +217,7 @@ public class WMSController extends BaseRESTfulController {
     @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
     @LogAround(foreignKeys = {"inboundResultId"}, foreignKeyTypes = {"入库实绩"})
     @PostMapping("/inbound")
-    public Map<String, Object> inbound(@RequestBody(required = false) Map<String, Object> map){
+    public Map<String, Object> inbound(@RequestBody(required = false) Map<String, Object> map) {
         return wmsFeign.inbound(map);
     }
 
@@ -225,7 +225,7 @@ public class WMSController extends BaseRESTfulController {
     @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
     @LogAround(foreignKeys = {"inboundResultId"}, foreignKeyTypes = {"入库实绩"})
     @PostMapping("/updateInbound")
-    public Map<String, Object> updateInbound(@RequestBody(required = false) Map<String, Object> map){
+    public Map<String, Object> updateInbound(@RequestBody(required = false) Map<String, Object> map) {
         return wmsFeign.updateInbound(map);
     }
 
@@ -238,8 +238,8 @@ public class WMSController extends BaseRESTfulController {
     })
     @PostMapping(value = "/getOutboundList")
     public Map<String, Object> getOutboundList(@RequestBody(required = false) Map<String, Object> map, Integer apiId,
-                                              Integer pageNum,
-                                              Integer pageSize) {
+                                               Integer pageNum,
+                                               Integer pageSize) {
         return wmsFeign.getOutboundList(map == null ? new HashMap<>() : map, apiId, pageNum, pageSize);
     }
 
@@ -247,7 +247,7 @@ public class WMSController extends BaseRESTfulController {
     @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
     @LogAround(foreignKeys = {"outboundResultId"}, foreignKeyTypes = {"出库实绩"})
     @PostMapping("/outbound")
-    public Map<String, Object> outbound(@RequestBody(required = false) Map<String, Object> map){
+    public Map<String, Object> outbound(@RequestBody(required = false) Map<String, Object> map) {
         return wmsFeign.outbound(map);
     }
 
@@ -255,110 +255,110 @@ public class WMSController extends BaseRESTfulController {
     @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
     @LogAround(foreignKeys = {"outboundResultId"}, foreignKeyTypes = {"出库实绩"})
     @PostMapping("/updateOutbound")
-    public Map<String, Object> updateOutbound(@RequestBody(required = false) Map<String, Object> map){
+    public Map<String, Object> updateOutbound(@RequestBody(required = false) Map<String, Object> map) {
         return wmsFeign.updateOutbound(map);
     }
 
     @PostMapping("/selectkcmx")
     public RESTfulResult selectkcmx(@RequestBody HashMap map,
-                             Integer apiId,
-                             Integer pageNum,
-                             Integer pageSize){
+                                    Integer apiId,
+                                    Integer pageNum,
+                                    Integer pageSize) {
 
         if (map.get("createTime") != null) {
-            ArrayList arrayList = (ArrayList)map.get("createTime");
+            ArrayList arrayList = (ArrayList) map.get("createTime");
             map.put("starttime", arrayList.get(0).toString());
             map.put("endtime", arrayList.get(1).toString());
         }
 
-         if (map.get("inDt") != null) {
-                ArrayList arrayList = (ArrayList)map.get("inDt");
-                map.put("indtstart", arrayList.get(0).toString());
-                map.put("indtend", arrayList.get(1).toString());
+        if (map.get("inDt") != null) {
+            ArrayList arrayList = (ArrayList) map.get("inDt");
+            map.put("indtstart", arrayList.get(0).toString());
+            map.put("indtend", arrayList.get(1).toString());
         }
         RESTfulResult selectkcmx = atWmsFeign.wuliuSelectkcmx(map, pageNum, pageSize);
-        Map<String, Object> data = (Map<String, Object>)selectkcmx.getData();
-        List<Map<String, Object>> list = (List<Map<String,Object>>)data.get("list");
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId,list);
-        pageList.setTotal((int)data.get("total"));
+        Map<String, Object> data = (Map<String, Object>) selectkcmx.getData();
+        List<Map<String, Object>> list = (List<Map<String, Object>>) data.get("list");
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, list);
+        pageList.setTotal((int) data.get("total"));
         return success(pageList);
     }
 
     @PostMapping("/selectbybatchno")
     public RESTfulResult selectbybatchno(@RequestBody HashMap map,
-                             Integer apiId,
-                             Integer pageNum,
-                             Integer pageSize){
+                                         Integer apiId,
+                                         Integer pageNum,
+                                         Integer pageSize) {
 
         if (map.get("createTime") != null) {
-            ArrayList arrayList = (ArrayList)map.get("createTime");
+            ArrayList arrayList = (ArrayList) map.get("createTime");
             map.put("starttime", arrayList.get(0).toString());
             map.put("endtime", arrayList.get(1).toString());
         }
 
         if (map.get("inDt") != null) {
-            ArrayList arrayList = (ArrayList)map.get("inDt");
+            ArrayList arrayList = (ArrayList) map.get("inDt");
             map.put("indtstart", arrayList.get(0).toString());
             map.put("indtend", arrayList.get(1).toString());
         }
 
         RESTfulResult selectkcmx = atWmsFeign.wuliuSelectbybatchno(map, pageNum, pageSize);
-        Map<String, Object> data = (Map<String, Object>)selectkcmx.getData();
-        List<Map<String, Object>> list = (List<Map<String,Object>>)data.get("list");
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId,list);
-        pageList.setTotal((int)data.get("total"));
+        Map<String, Object> data = (Map<String, Object>) selectkcmx.getData();
+        List<Map<String, Object>> list = (List<Map<String, Object>>) data.get("list");
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, list);
+        pageList.setTotal((int) data.get("total"));
         return success(pageList);
     }
 
     @PostMapping("/selectbyprod")
     public RESTfulResult selectbyprod(@RequestBody HashMap map,
-                                         Integer apiId,
-                                         Integer pageNum,
-                                         Integer pageSize){
+                                      Integer apiId,
+                                      Integer pageNum,
+                                      Integer pageSize) {
 
         if (map.get("createTime") != null) {
-            ArrayList arrayList = (ArrayList)map.get("createTime");
+            ArrayList arrayList = (ArrayList) map.get("createTime");
             map.put("starttime", arrayList.get(0).toString());
             map.put("endtime", arrayList.get(1).toString());
         }
 
         if (map.get("inDt") != null) {
-            ArrayList arrayList = (ArrayList)map.get("inDt");
+            ArrayList arrayList = (ArrayList) map.get("inDt");
             map.put("indtstart", arrayList.get(0).toString());
             map.put("indtend", arrayList.get(1).toString());
         }
 
         RESTfulResult selectkcmx = atWmsFeign.wuliuSelectbyprod(map, pageNum, pageSize);
-        Map<String, Object> data = (Map<String, Object>)selectkcmx.getData();
-        List<Map<String, Object>> list = (List<Map<String,Object>>)data.get("list");
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId,list);
-        pageList.setTotal((int)data.get("total"));
+        Map<String, Object> data = (Map<String, Object>) selectkcmx.getData();
+        List<Map<String, Object>> list = (List<Map<String, Object>>) data.get("list");
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, list);
+        pageList.setTotal((int) data.get("total"));
         return success(pageList);
     }
 
     @PostMapping("/selectbybuttress")
     public RESTfulResult selectbybuttress(@RequestBody HashMap map,
-                                      Integer apiId,
-                                      Integer pageNum,
-                                      Integer pageSize){
+                                          Integer apiId,
+                                          Integer pageNum,
+                                          Integer pageSize) {
 
         if (map.get("createTime") != null) {
-            ArrayList arrayList = (ArrayList)map.get("createTime");
+            ArrayList arrayList = (ArrayList) map.get("createTime");
             map.put("starttime", arrayList.get(0).toString());
             map.put("endtime", arrayList.get(1).toString());
         }
 
         if (map.get("inDt") != null) {
-            ArrayList arrayList = (ArrayList)map.get("inDt");
+            ArrayList arrayList = (ArrayList) map.get("inDt");
             map.put("indtstart", arrayList.get(0).toString());
             map.put("indtend", arrayList.get(1).toString());
         }
 
         RESTfulResult selectkcmx = atWmsFeign.wuliuSelectbybuttress(map, pageNum, pageSize);
-        Map<String, Object> data = (Map<String, Object>)selectkcmx.getData();
-        List<Map<String, Object>> list = (List<Map<String,Object>>)data.get("list");
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId,list);
-        pageList.setTotal((int)data.get("total"));
+        Map<String, Object> data = (Map<String, Object>) selectkcmx.getData();
+        List<Map<String, Object>> list = (List<Map<String, Object>>) data.get("list");
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, list);
+        pageList.setTotal((int) data.get("total"));
         return success(pageList);
     }
 

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

@@ -22,38 +22,39 @@ import java.util.Map;
 public class WebSocketController {
     @Autowired
     WebSocketFeign webSocketFeign;
+
     @PostMapping("/readWebsocket/{id}")
-    public RESTfulResult readWebsocket(@PathVariable("id") String sendId){
+    public RESTfulResult readWebsocket(@PathVariable("id") String sendId) {
         return webSocketFeign.readWebsocket(sendId);
     }
 
     @PostMapping("/readingWebsockets")
-    public RESTfulResult readingWebsockets(@RequestBody HashMap<String,Object> map){
+    public RESTfulResult readingWebsockets(@RequestBody HashMap<String, Object> map) {
         return webSocketFeign.readingWebsockets((List<HashMap<String, Object>>) map.get("list"));
     }
 
     @PostMapping("/sendWebsocket/{id}")
-    public RESTfulResult sendWebsocket(@PathVariable("id") String webSocketId, @RequestBody HashMap<String,Object> map, HttpServletRequest request){
-        return webSocketFeign.sendWebsocket(webSocketId,map);
+    public RESTfulResult sendWebsocket(@PathVariable("id") String webSocketId, @RequestBody HashMap<String, Object> map, HttpServletRequest request) {
+        return webSocketFeign.sendWebsocket(webSocketId, map);
     }
 
     @GetMapping(value = "/")
-    public RESTfulResult list(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
+    public RESTfulResult list(@RequestParam HashMap parmas, Integer pageNum, Integer pageSize) {
         return webSocketFeign.list(parmas, pageNum, pageSize);
     }
 
     @GetMapping("/getMessageCount/{id}")
-    public RESTfulResult getMessageCount(@PathVariable String id,@RequestParam()String readFlag){
-        return webSocketFeign.getMessageCount(id,readFlag);
+    public RESTfulResult getMessageCount(@PathVariable String id, @RequestParam() String readFlag) {
+        return webSocketFeign.getMessageCount(id, readFlag);
     }
 
     @GetMapping("/getBaseWebsocketPush")
-    public RESTfulResult getBaseWebsocketPush(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
-        return webSocketFeign.basewebsocketpushsList(parmas,pageNum,pageSize);
+    public RESTfulResult getBaseWebsocketPush(@RequestParam HashMap parmas, Integer pageNum, Integer pageSize) {
+        return webSocketFeign.basewebsocketpushsList(parmas, pageNum, pageSize);
     }
 
     @GetMapping(value = "/getUserByOrgCode/{orgCode}")//String
-    public RESTfulResult getUserByOrgCode(@PathVariable("orgCode") String orgCode){
+    public RESTfulResult getUserByOrgCode(@PathVariable("orgCode") String orgCode) {
         return webSocketFeign.getUserByOrgCode(orgCode);
     }
 }

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

@@ -16,6 +16,4 @@ import java.io.IOException;
 public class systemOaController extends BaseRESTfulController {
 
 
-
-
 }

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

@@ -13,20 +13,21 @@ public interface ATWmsFeign {
 
     /**
      * 库存查询
+     *
      * @param parmas
      * @param pageNum
      * @param pageSize
      * @return
      */
     @GetMapping(value = "antai.maketx/v1/wmsproductdetails/wuliuSelectkcmx")
-    RESTfulResult wuliuSelectkcmx(@RequestBody HashMap parmas, @RequestParam Integer pageNum,@RequestParam Integer pageSize);
+    RESTfulResult wuliuSelectkcmx(@RequestBody HashMap parmas, @RequestParam Integer pageNum, @RequestParam Integer pageSize);
 
     @GetMapping(value = "antai.maketx/v1/wmsproductdetails/wuliuSelectbybatchno")
-    RESTfulResult wuliuSelectbybatchno(@RequestBody HashMap parmas, @RequestParam Integer pageNum,@RequestParam Integer pageSize);
+    RESTfulResult wuliuSelectbybatchno(@RequestBody HashMap parmas, @RequestParam Integer pageNum, @RequestParam Integer pageSize);
 
     @GetMapping(value = "antai.maketx/v1/wmsproductdetails/wuliuSelectbyprod")
-    RESTfulResult wuliuSelectbyprod(@RequestBody HashMap parmas, @RequestParam Integer pageNum,@RequestParam Integer pageSize);
+    RESTfulResult wuliuSelectbyprod(@RequestBody HashMap parmas, @RequestParam Integer pageNum, @RequestParam Integer pageSize);
 
     @GetMapping(value = "antai.maketx/v1/wmsproductdetails/wuliuSelectbybuttress")
-    RESTfulResult wuliuSelectbybuttress(@RequestBody HashMap parmas, @RequestParam Integer pageNum,@RequestParam Integer pageSize);
+    RESTfulResult wuliuSelectbybuttress(@RequestBody HashMap parmas, @RequestParam Integer pageNum, @RequestParam Integer pageSize);
 }

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

@@ -1,4 +1,5 @@
 package com.steerinfo.dil.feign;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.steerinfo.dil.config.MyFeignRequestInterceptor;
 import com.steerinfo.framework.controller.RESTfulResult;
@@ -18,7 +19,7 @@ import java.util.List;
 import java.util.Map;
 
 
-@FeignClient(value = "ANTAI-AMS-API", url = "${openfeign.AmsFeign.url}",configuration = MyFeignRequestInterceptor.class)
+@FeignClient(value = "ANTAI-AMS-API", url = "${openfeign.AmsFeign.url}", configuration = MyFeignRequestInterceptor.class)
 public interface AmsFeign {
 
     @PostMapping(value = "api/v1/ams/amsorders/purchaseOrderSync")
@@ -39,7 +40,8 @@ public interface AmsFeign {
                                              @RequestParam Integer pageNum,
                                              @RequestParam Integer pageSize
     );
-//===================>需求
+
+    //===================>需求
     @PostMapping(value = "api/v1/ams/amstransrequirements/purchaseRequirementAdd")
     Map<String, Object> purchaseRequirementAdd(Map<String, Object> map);
 
@@ -52,23 +54,23 @@ public interface AmsFeign {
 
 
     @PostMapping(value = "api/v1/ams/amstransrequirements/getproductionRequirementList")
-    Map<String, Object> getproductionRequirementList(@RequestBody(required=false) Map<String,Object> mapValue,
-                                                   @RequestParam  Integer apiId,
-                                                   @RequestParam  Integer pageNum,
-                                                   @RequestParam  Integer pageSize);
+    Map<String, Object> getproductionRequirementList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                     @RequestParam Integer apiId,
+                                                     @RequestParam Integer pageNum,
+                                                     @RequestParam Integer pageSize);
 
     @PostMapping(value = "api/v1/ams/amstransrequirements/getProductionRequirementListDz")
-    Map<String, Object> getProductionRequirementListDz(@RequestBody(required=false) Map<String,Object> mapValue,
-                                                     @RequestParam  Integer apiId,
-                                                     @RequestParam  Integer pageNum,
-                                                     @RequestParam  Integer pageSize);
+    Map<String, Object> getProductionRequirementListDz(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                       @RequestParam Integer apiId,
+                                                       @RequestParam Integer pageNum,
+                                                       @RequestParam Integer pageSize);
 
     @PostMapping(value = "api/v1/ams/amstransrequirements/updateEnvironmentStatus")
-    Map<String, Object> updateEnvironmentStatus(@RequestBody(required=false) Map<String,Object> mapValue);
+    Map<String, Object> updateEnvironmentStatus(@RequestBody(required = false) Map<String, Object> mapValue);
 
 
     @PostMapping(value = "api/v1/ams/amstransrequirements/transProductRequirementFromDz")
-    Map<String, Object> transProductRequirementFromDz(@RequestBody(required=false) Map<String,Object> mapValue);
+    Map<String, Object> transProductRequirementFromDz(@RequestBody(required = false) Map<String, Object> mapValue);
 
     @PostMapping(value = "api/v1/ams/amstransrequirements/productionStatusUpdate")
     Map<String, Object> productionStatusUpdate(Map<String, Object> map);
@@ -112,7 +114,7 @@ public interface AmsFeign {
     Map<String, Object> purchasePlanUpdate(Map<String, Object> map);
 
     @PostMapping(value = "api/v1/ams/amstransplans/purchaseTrainPlanAdd")
-    Map<String, Object> purchaseTrainPlanAdd(Map<String,Map<String,Object>> map);
+    Map<String, Object> purchaseTrainPlanAdd(Map<String, Map<String, Object>> map);
 
     @PostMapping(value = "api/v1/ams/amstransplans/purchasePlanChange")
     Map<String, Object> purchasePlanChange(Map<String, Object> map);
@@ -142,7 +144,7 @@ public interface AmsFeign {
 
 
     @PostMapping("api/v1/ams/amssalecontracts/saleContractSync")
-            Map<String, Object> saleContractSync(@RequestBody(required = false) HashMap<String, Object> map);
+    Map<String, Object> saleContractSync(@RequestBody(required = false) HashMap<String, Object> map);
 
     @PostMapping("api/v1/ams/amssalecontracts/selectSaleContractPage")
     Map<String, Object> selectSaleContractPage(@RequestBody(required = false) Map<String, Object> mapValue,
@@ -152,26 +154,26 @@ public interface AmsFeign {
 
     @PostMapping("api/v1/ams/amsorders/selectSaleOrderPage")
     Map<String, Object> selectSaleOrderPage(@RequestBody(required = false) Map<String, Object> mapValue,
-                                               @RequestParam Integer apiId,
-                                               @RequestParam Integer pageNum,
-                                               @RequestParam Integer pageSize);
+                                            @RequestParam Integer apiId,
+                                            @RequestParam Integer pageNum,
+                                            @RequestParam Integer pageSize);
 
-   // 工资合同
-   @PostMapping("api/v1/ams/amssalarycontracts/getSalaryContrac")
-   Map<String, Object> getAmsSalaryContracList(@RequestBody(required = false) Map<String, Object> map,@RequestParam  Integer apiId,
-                            @RequestParam  Integer pageNum,
-                            @RequestParam  Integer pageSize);
+    // 工资合同
+    @PostMapping("api/v1/ams/amssalarycontracts/getSalaryContrac")
+    Map<String, Object> getAmsSalaryContracList(@RequestBody(required = false) Map<String, Object> map, @RequestParam Integer apiId,
+                                                @RequestParam Integer pageNum,
+                                                @RequestParam Integer pageSize);
 
     @PostMapping("api/v1/ams/amssalarycontracts/insert")
     Map<String, Object> insertAmsSalaryContrac(@RequestBody(required = false) Map<String, Object> map);
 
     @PutMapping("api/v1/ams/amssalarycontracts/{id}")
-    Map<String, Object> updateAmsSalaryContrac(@PathVariable BigDecimal id,@RequestBody(required = false) Map<String, Object> map);
+    Map<String, Object> updateAmsSalaryContrac(@PathVariable BigDecimal id, @RequestBody(required = false) Map<String, Object> map);
 
     @PutMapping("api/v1/ams/amssalarycontracts/logicdelete")
     Map<String, Object> logicdeleteAmsSaalryContrac(@RequestBody(required = false) Map<String, Object> map);
-	
-	@PostMapping(value = "api/v1/ams/amstransrequirements/saleAdd")
+
+    @PostMapping(value = "api/v1/ams/amstransrequirements/saleAdd")
     Map<String, Object> saleAdd(@RequestBody(required = false) Map<String, Object> map);
 
     @PostMapping(value = "api/v1/ams/amstransrequirements/readExcel", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
@@ -179,9 +181,9 @@ public interface AmsFeign {
 
     @PostMapping(value = "api/v1/ams/amstransrequirements/selectDlivDirNo")
     Map<String, Object> selectDlivDirNo(@RequestBody(required = false) HashMap<String, Object> map,
-                                        @RequestParam  Integer apiId,
-                                        @RequestParam  Integer pageNum,
-                                        @RequestParam  Integer pageSize);
+                                        @RequestParam Integer apiId,
+                                        @RequestParam Integer pageNum,
+                                        @RequestParam Integer pageSize);
 
     @PostMapping(value = "api/v1/ams/amsrequirementchilds/udpateOrder")
     RESTfulResult udpateOrder(@RequestBody(required = false) HashMap<String, Object> params);
@@ -202,36 +204,36 @@ public interface AmsFeign {
     RESTfulResult deleteDlivDirno(@RequestBody(required = false) Map<String, Object> params);
 
     @PostMapping(value = "api/v1/ams/amstransplans/productionPlanAdd")
-    Map<String, Object> productionPlanAdd(@RequestBody(required = false)Map<String, Object> map);
+    Map<String, Object> productionPlanAdd(@RequestBody(required = false) Map<String, Object> map);
 
     @PostMapping(value = "api/v1/ams/amstransplans/productionPlanAddList")
     Map<String, Object> productionPlanAddList(@RequestBody Map<String, Object> map);
 
 
-
-
-
     @PostMapping("api/v1/ams/amstransplans/getproductionPlanList")
     Map<String, Object> getproductionPlanList(@RequestBody(required = false) Map<String, Object> map,
-                                             @RequestParam Integer apiId,
-                                             @RequestParam Integer pageNum,
-                                             @RequestParam Integer pageSize
+                                              @RequestParam Integer apiId,
+                                              @RequestParam Integer pageNum,
+                                              @RequestParam Integer pageSize
     );
+
     @PostMapping(value = "api/v1/ams/amstransplans/productionPlanChange")
-    Map<String, Object> productionPlanChange(@RequestBody(required = false)Map<String, Object> map);
+    Map<String, Object> productionPlanChange(@RequestBody(required = false) Map<String, Object> map);
+
     @PutMapping(value = "api/v1/ams/amstransplans/logicdelete")
-    Map<String, Object> productionPlanlogicdelete(@RequestBody(required = false)Map<String, Object> map);
+    Map<String, Object> productionPlanlogicdelete(@RequestBody(required = false) Map<String, Object> map);
+
     @PostMapping(value = "api/v1/ams/amstransrequirements/getProductiveRequirementDelete")
-    Map<String, Object> getProductiveRequirementDelete(@RequestBody(required = false)Map<String, Object> map);
+    Map<String, Object> getProductiveRequirementDelete(@RequestBody(required = false) Map<String, Object> map);
 
     @PostMapping(value = "api/v1/ams/amstransplans/salePlanAdd")
-    Map<String, Object> salePlanAdd(@RequestBody(required = false)Map<String, Object> map);
+    Map<String, Object> salePlanAdd(@RequestBody(required = false) Map<String, Object> map);
 
     @PostMapping(value = "api/v1/ams/amstransplans/salePlanUpdate")
-    Map<String, Object> salePlanUpdate(@RequestBody(required = false)Map<String, Object> map);
+    Map<String, Object> salePlanUpdate(@RequestBody(required = false) Map<String, Object> map);
 
     @PostMapping(value = "api/v1/ams/amstransplans/salePlanDelete")
-    Map<String, Object> salePlanDelete(@RequestBody(required = false)Map<String, Object> map);
+    Map<String, Object> salePlanDelete(@RequestBody(required = false) Map<String, Object> map);
 
     @PostMapping(value = "api/v1/ams/amstransplans/getSalePlanList")
     Map<String, Object> getSalePlanList(@RequestBody(required = false) Map<String, Object> map,
@@ -239,8 +241,8 @@ public interface AmsFeign {
                                         @RequestParam Integer pageNum,
                                         @RequestParam Integer pageSize);
 
-    @PostMapping(value =  "api/v1/ams/amstransrequirements/bindSale")
-    RESTfulResult bindSale(@RequestBody(required = false)Map<String, Object> map);
+    @PostMapping(value = "api/v1/ams/amstransrequirements/bindSale")
+    RESTfulResult bindSale(@RequestBody(required = false) Map<String, Object> map);
 
     @PostMapping(value = "api/v1/ams/amsplanchilds/getMaterial")
     RESTfulResult getMaterial(@RequestParam String prodCode,
@@ -249,17 +251,17 @@ public interface AmsFeign {
                               @RequestParam Integer pageSize);
 
     @PostMapping(value = "api/v1/ams/amstransrequirements/productionRequirementChanges/{id}")
-    Map<String, Object> productionRequirementChanges(@PathVariable String id,@RequestBody Map<String, Object> map);
+    Map<String, Object> productionRequirementChanges(@PathVariable String id, @RequestBody Map<String, Object> map);
 
 
     @PostMapping(value = "api/v1/ams/amsplanchilds/selectPlanChildById/{planChildId}")
     RESTfulResult selectPlanChildById(@PathVariable("planChildId") String planChildId);
 
     @PostMapping(value = "api/v1/ams/amstransrequirements/getproductionRequirementworkflowList")
-    Map<String, Object> getproductionRequirementworkflowList(@RequestBody(required=false) Map<String,Object> mapValue,
-                                                     @RequestParam  Integer apiId,
-                                                     @RequestParam  Integer pageNum,
-                                                     @RequestParam  Integer pageSize);
+    Map<String, Object> getproductionRequirementworkflowList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                             @RequestParam Integer apiId,
+                                                             @RequestParam Integer pageNum,
+                                                             @RequestParam Integer pageSize);
 
 
     @PostMapping(value = "api/v1/ams/amstransplans/getProductPlanList")
@@ -283,9 +285,9 @@ public interface AmsFeign {
 
     @PostMapping(value = "api/v1/ams/amsorders/getProductOrderList")
     Map<String, Object> getProductOrderList(@RequestBody Map<String, Object> objectMap,
-                                 @RequestParam Integer apiId,
-                                 @RequestParam Integer pageNum,
-                                 @RequestParam Integer pageSize);
+                                            @RequestParam Integer apiId,
+                                            @RequestParam Integer pageNum,
+                                            @RequestParam Integer pageSize);
 
     @PostMapping(value = "api/v1/ams/amstransrequirements/getUpdateDlivDirno")
     RESTfulResult getUpdateDlivDirno(@RequestBody Map<String, Object> map);
@@ -304,16 +306,16 @@ public interface AmsFeign {
 
     @PostMapping(value = "api/v1/ams/amstransrequirements/selectcar")
     RESTfulResult selectcar(@RequestBody Map<String, Object> objectMap,
-                                 @RequestParam Integer apiId,
-                                 @RequestParam Integer pageNum,
-                                 @RequestParam Integer pageSize);
-
-    @PostMapping(value = "api/v1/ams/amstransrequirements/selectcarList")
-    RESTfulResult selectcarList(@RequestBody Map<String, Object> objectMap,
                             @RequestParam Integer apiId,
                             @RequestParam Integer pageNum,
                             @RequestParam Integer pageSize);
 
+    @PostMapping(value = "api/v1/ams/amstransrequirements/selectcarList")
+    RESTfulResult selectcarList(@RequestBody Map<String, Object> objectMap,
+                                @RequestParam Integer apiId,
+                                @RequestParam Integer pageNum,
+                                @RequestParam Integer pageSize);
+
     @PostMapping(value = "api/v1/ams/amstransplans/transPlanupload")
     Map<String, Object> transPlanupload(@RequestBody(required = false) Map<String, Object> map);
 
@@ -330,7 +332,7 @@ public interface AmsFeign {
     Map<String, Object> amsScheduleDispatchNoPage(@RequestBody Map<String, Object> map);
 
     @PostMapping(value = "api/v1/ams/amstransrequirements/getSBDDList")
-    RESTfulResult getSBDDList(@RequestBody Map<String,Object> map);
+    RESTfulResult getSBDDList(@RequestBody Map<String, Object> map);
 
     @PostMapping(value = "api/v1/ams/amstransrequirements/selectBalanceRemark")
     RESTfulResult selectBalanceRemark(@RequestBody Map<String, Object> map);
@@ -343,21 +345,24 @@ public interface AmsFeign {
 
     @PostMapping(value = "api/v1/ams/amstransrequirements/updateBalancePl")
     RESTfulResult updateBalancePl(@RequestBody Map<String, Object> map);
+
     @PostMapping(value = "api/v1/ams/amstransrequirements/addWMS")
-    RESTfulResult addWMS(@RequestBody Map<String, Object> map);  @PostMapping(value = "api/v1/ams/amsfixedneedss/fixedNeedsAdd")
+    RESTfulResult addWMS(@RequestBody Map<String, Object> map);
+
+    @PostMapping(value = "api/v1/ams/amsfixedneedss/fixedNeedsAdd")
     RESTfulResult fixedNeedsAdd(@RequestBody Map<String, Object> map);
 
     @PostMapping(value = "api/v1/ams/amsfixedneedss/getfixdNeedsList")
     RESTfulResult getfixdNeedsList(@RequestBody Map<String, Object> objectMap,
-                                @RequestParam Integer apiId,
-                                @RequestParam Integer pageNum,
-                                @RequestParam Integer pageSize);
+                                   @RequestParam Integer apiId,
+                                   @RequestParam Integer pageNum,
+                                   @RequestParam Integer pageSize);
 
     @PostMapping(value = "api/v1/ams/amsfixedneedss/fixedNeedsUpdate")
     Map<String, Object> fixedNeedsUpdate(Map<String, Object> map);
 
     @PostMapping(value = "api/v1/ams/amsfixedneedss/getfixedNeedsDelete")
-    Map<String, Object> getfixedNeedsDelete(@RequestBody(required = false)Map<String, Object> map);
+    Map<String, Object> getfixedNeedsDelete(@RequestBody(required = false) Map<String, Object> map);
 
 
     @PostMapping(value = "api/v1/ams/amsfixedneedss/fixedNeedsChangeList")
@@ -365,7 +370,7 @@ public interface AmsFeign {
 
 
     @PostMapping(value = "api/v1/ams/amsfixedneedss/readFixedNeedsExcel", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
-    Map<String, Object> readFixedNeedsExcel(MultipartFile file );
+    Map<String, Object> readFixedNeedsExcel(MultipartFile file);
 
     @PostMapping(value = "api/v1/ams/amstransprices/importTransPrice")
     Map<String, Object> importTransPrice(Map<String, Object> map);
@@ -383,14 +388,18 @@ public interface AmsFeign {
     Map<String, Object> withdrawRequirement(@RequestBody Map<String, Object> map);
 
     @PostMapping(value = "api/v1/ams/amstransrequirements/getProductionRequirementListBind")
-    Map<String, Object> getProductionRequirementListBind(@RequestBody(required=false) Map<String,Object> mapValue,
-                                                       @RequestParam  Integer apiId,
-                                                       @RequestParam  Integer pageNum,
-                                                       @RequestParam  Integer pageSize);
+    Map<String, Object> getProductionRequirementListBind(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                         @RequestParam Integer apiId,
+                                                         @RequestParam Integer pageNum,
+                                                         @RequestParam Integer pageSize);
 
     @PostMapping(value = "api/v1/ams/amstransrequirements/updateBindRequirement")
     Map<String, Object> updateBindRequirement(@RequestBody Map<String, Object> map);
 
     @PostMapping(value = "api/v1/ams/amstransrequirements/qjnyChange")
     Map<String, Object> qjnyChange(@RequestBody Map<String, Object> map);
+
+    @PostMapping(value = "api/v1/ams/amstransrequirements/addDispatchCard")
+    Map<String, Object> addDispatchCard(@RequestBody Map<String, Object> params);
+
 }

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

@@ -13,11 +13,11 @@ import java.util.Map;
  * @Date 2021/6/23 9:58
  * @Version 1.0
  */
-@FeignClient(value = "ANTAI-COLUMN-DATA",url = "${openfeign.ColumnDataFeign.url}",configuration = MyFeignRequestInterceptor.class)
+@FeignClient(value = "ANTAI-COLUMN-DATA", url = "${openfeign.ColumnDataFeign.url}", configuration = MyFeignRequestInterceptor.class)
 public interface ColumnDataFeign {
     @RequestMapping("getColumnData")
-    List<Map<String,Object>> getColumnData(@RequestParam("apiId") Integer apiId);
+    List<Map<String, Object>> getColumnData(@RequestParam("apiId") Integer apiId);
 
     @RequestMapping("getColumnData")
-    List<Map<String,Object>> getColumnDataByUserId(@RequestParam("apiId") Integer apiId,@RequestParam(required = false,value = "userId") String userId);
+    List<Map<String, Object>> getColumnDataByUserId(@RequestParam("apiId") Integer apiId, @RequestParam(required = false, value = "userId") String userId);
 }

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

@@ -10,37 +10,37 @@ import java.util.Map;
 @FeignClient(name = "ANTAI-DZ-API", url = "${openfeign.DzFeign.url}")
 public interface DzFeign {
     @PostMapping("/api/v1/dz/test/getUnloadDetails")
-    Map<String, Object> getUnloadDetails(@RequestBody(required = false) Map<String,Object> map);
+    Map<String, Object> getUnloadDetails(@RequestBody(required = false) Map<String, Object> map);
 
     @PostMapping("/api/v1/dz/test/getUnUploadOrder")
     Map<String, Object> getUnUploadOrder();
 
     @PostMapping("/api/v1/dz/test/getCapacityDetails")
-    Map<String, Object> getCapacityDetails(@RequestBody(required = false) Map<String,Object> map);
+    Map<String, Object> getCapacityDetails(@RequestBody(required = false) Map<String, Object> map);
 
     @PostMapping("/api/v1/dz/test/getTransOrderDz")
     List<Map<String, Object>> getTransOrderDz();
 
     @PostMapping("/api/v1/dz/test/getTransResult")
-    Map<String,Object> getTransResult(@RequestBody Map<String,Object> map);
+    Map<String, Object> getTransResult(@RequestBody Map<String, Object> map);
 
     @PostMapping("/api/v1/dz/test/getTransResultList")
-    List<Map<String, Object>> getTransResultList(@RequestBody Map<String,Object> map);
+    List<Map<String, Object>> getTransResultList(@RequestBody Map<String, Object> map);
 
     @PostMapping("/api/v1/dz/test/getSignList")
-    List<Map<String, Object>> getSignList(@RequestBody Map<String,Object> map);
+    List<Map<String, Object>> getSignList(@RequestBody Map<String, Object> map);
 
     @PostMapping("/api/v1/dz/test/getInnerCode")
-    Map<String,Object> getInnerCode(@RequestBody Map<String,Object> map);
+    Map<String, Object> getInnerCode(@RequestBody Map<String, Object> map);
 
     @PostMapping("/api/v1/dz/test/getProductionResultList")
-    List<Map<String, Object>> getProductionResultList(@RequestBody Map<String,Object> map);
+    List<Map<String, Object>> getProductionResultList(@RequestBody Map<String, Object> map);
 
     @PostMapping("/api/v1/dz/test/restartWeightResult")
     int restartWeightResult(@RequestBody List<String> ysddList);
 
     @PostMapping("/api/v1/dz/test/getErrorRequirement")
-    Map<String,Object> getErrorRequirement( @RequestBody Map<String,Object> map);
+    Map<String, Object> getErrorRequirement(@RequestBody Map<String, Object> map);
 
 
     @PostMapping("/api/v1/dz/test/getDzData")

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

@@ -22,17 +22,19 @@ public interface EmsFeign {
 
     @PostMapping("api/v1/ems/emssettlementorders/emssettlementordersAdd")
     Map<String, Object> emssettlementordersAdd(@RequestBody Map<String, Object> map);
+
     @PutMapping("api/v1/ems/emsdetailsorders/emsdetailsordersupdate/{id}")
-    Map<String, Object> emsdetailsordersupdate(@PathVariable BigDecimal id,@RequestBody(required = false) Map<String, Object> map);
+    Map<String, Object> emsdetailsordersupdate(@PathVariable BigDecimal id, @RequestBody(required = false) Map<String, Object> map);
 
 
     @PostMapping("api/v1/ems/emsdetailsorders/abnormal")
     Map<String, Object> abnormal(@RequestBody(required = false) Map<String, Object> map);
+
     @PutMapping("api/v1/ems/emssettlementorders/emssettlementorderupdate/{id}")
-    Map<String, Object> emssettlementorderupdate(@PathVariable BigDecimal id,@RequestBody(required = false) Map<String, Object> map);
+    Map<String, Object> emssettlementorderupdate(@PathVariable BigDecimal id, @RequestBody(required = false) Map<String, Object> map);
 
     @PutMapping("api/v1/ems/emsdetailsorders/emsdetailsordersdelete/{id}")
-    Map<String, Object> emsdetailsordersdelete(@PathVariable BigDecimal id,@RequestBody(required = false) Map<String, Object> map);
+    Map<String, Object> emsdetailsordersdelete(@PathVariable BigDecimal id, @RequestBody(required = false) Map<String, Object> map);
 
 
     @PostMapping("api/v1/ems/emsdetailsorders/emsdetailsordersList")
@@ -41,12 +43,14 @@ public interface EmsFeign {
                                              @RequestParam Integer pageNum,
                                              @RequestParam Integer pageSize
     );
+
     @PostMapping("api/v1/ems/emssettlementorders/emssettlementordersList")
     Map<String, Object> emssettlementordersList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                             @RequestParam Integer apiId,
-                                             @RequestParam Integer pageNum,
-                                             @RequestParam Integer pageSize
+                                                @RequestParam Integer apiId,
+                                                @RequestParam Integer pageNum,
+                                                @RequestParam Integer pageSize
     );
+
     @PostMapping("api/v1/ems/emssalarydetailss/emssalarydetailsList")
     Map<String, Object> emssalarydetailsList(@RequestBody(required = false) Map<String, Object> mapValue,
                                              @RequestParam Integer apiId,
@@ -58,7 +62,7 @@ public interface EmsFeign {
     Map<String, Object> emsdetailsordersAdd2(@RequestBody(required = false) Map<String, Object> map);
 
     @PutMapping("api/v1/ems/emsdetailsorders/emsdetailsordersapprove/{id}")
-    Map<String, Object> emsdetailsordersapprove(@PathVariable String id,@RequestBody(required = false) Map<String, Object> map);
+    Map<String, Object> emsdetailsordersapprove(@PathVariable String id, @RequestBody(required = false) Map<String, Object> map);
 
     @PostMapping("api/v1/ems/emsdetailsorders/faildMsg")
     Map<String, Object> faildMsg();
@@ -66,17 +70,17 @@ public interface EmsFeign {
 
     @PostMapping("api/v1/ems/emssalarydetailss/getemssalarydetailsMonthyear")
     Map<String, Object> getemssalarydetailsMonthyear(@RequestBody(required = false) Map<String, Object> mapValue,
-                                             @RequestParam Integer apiId,
-                                             @RequestParam Integer pageNum,
-                                             @RequestParam Integer pageSize
+                                                     @RequestParam Integer apiId,
+                                                     @RequestParam Integer pageNum,
+                                                     @RequestParam Integer pageSize
     );
 
 
     @PostMapping("api/v1/ems/emsticketmanagements/getemsticketmanagementslist")
     Map<String, Object> getemsticketmanagementslist(@RequestBody(required = false) Map<String, Object> mapValue,
-                                                     @RequestParam Integer apiId,
-                                                     @RequestParam Integer pageNum,
-                                                     @RequestParam Integer pageSize
+                                                    @RequestParam Integer apiId,
+                                                    @RequestParam Integer pageNum,
+                                                    @RequestParam Integer pageSize
     );
 
     @PostMapping("api/v1/ems/emsticketmanagements/insertemsticketmanagements")

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

@@ -1,5 +1,6 @@
 package com.steerinfo.dil.feign;
 
+import com.sun.corba.se.spi.ior.ObjectKey;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -15,31 +16,33 @@ public interface ReportFeign {
 
     @PostMapping(value = "api/v1/report/monitors/getQYMonitors")
     Map<String, Object> getQYMonitors(@RequestBody(required = false) HashMap<String, Object> map,
-                                        @RequestParam Integer apiId,
-                                        @RequestParam  Integer pageNum,
-                                        @RequestParam  Integer pageSize);
+                                      @RequestParam Integer apiId,
+                                      @RequestParam Integer pageNum,
+                                      @RequestParam Integer pageSize);
 
     @PostMapping(value = "api/v1/report/monitors/getFactoryCarNum")
     Map<String, Object> getFactoryCarNum(@RequestBody(required = false) HashMap<String, Object> map,
                                          @RequestParam Integer apiId,
-                                         @RequestParam  Integer pageNum,
-                                         @RequestParam  Integer pageSize);
+                                         @RequestParam Integer pageNum,
+                                         @RequestParam Integer pageSize);
 
     @PostMapping(value = "api/v1/report/destination/getDestination")
     Map<String, Object> getDestination(@RequestBody(required = false) HashMap<String, Object> map,
-                                      @RequestParam Integer apiId,
-                                      @RequestParam  Integer pageNum,
-                                      @RequestParam  Integer pageSize);
+                                       @RequestParam Integer apiId,
+                                       @RequestParam Integer pageNum,
+                                       @RequestParam Integer pageSize);
+
     @PostMapping(value = "api/v1/report/transferOrder/getTransferOrder")
     Map<String, Object> getTransferOrder(@RequestBody(required = false) HashMap<String, Object> map,
-                                      @RequestParam Integer apiId,
-                                      @RequestParam  Integer pageNum,
-                                      @RequestParam  Integer pageSize);
+                                         @RequestParam Integer apiId,
+                                         @RequestParam Integer pageNum,
+                                         @RequestParam Integer pageSize);
+
     @PostMapping(value = "api/v1/report/transferOrder/getTransferOrderDetails")
     Map<String, Object> getTransferOrderDetails(@RequestBody(required = false) HashMap<String, Object> map,
-                                      @RequestParam Integer apiId,
-                                      @RequestParam  Integer pageNum,
-                                      @RequestParam  Integer pageSize);
+                                                @RequestParam Integer apiId,
+                                                @RequestParam Integer pageNum,
+                                                @RequestParam Integer pageSize);
 
 
     @PostMapping(value = "api/v1/report/saleReports/getSaleFourLicenceReport")
@@ -48,29 +51,32 @@ public interface ReportFeign {
     @PostMapping(value = "api/v1/report/saleReports/getTransReportCarrier")
     Map<String, Object> getTransReportCarrier(@RequestBody(required = false) HashMap<String, Object> map,
                                               @RequestParam Integer apiId,
-                                              @RequestParam  Integer pageNum,
-                                              @RequestParam  Integer pageSize);
+                                              @RequestParam Integer pageNum,
+                                              @RequestParam Integer pageSize);
 
     @PostMapping(value = "api/v1/report/saleReports/getTransReportXG")
     Map<String, Object> getTransReportXG(@RequestBody(required = false) HashMap<String, Object> map,
-                                              @RequestParam Integer apiId,
-                                              @RequestParam  Integer pageNum,
-                                              @RequestParam  Integer pageSize);
+                                         @RequestParam Integer apiId,
+                                         @RequestParam Integer pageNum,
+                                         @RequestParam Integer pageSize);
 
     @PostMapping(value = "api/v1/report/saleReports/updateTransUnitPrice")
     Map<String, Object> updateTransUnitPrice(HashMap<String, Object> map);
 
     @PostMapping(value = "api/v1/report/destination/selecttype")
     Map<String, Object> selecttype(@RequestBody(required = false) HashMap<String, Object> map,
-                                         @RequestParam Integer apiId,
-                                         @RequestParam  Integer pageNum,
-                                         @RequestParam  Integer pageSize);
+                                   @RequestParam Integer apiId,
+                                   @RequestParam Integer pageNum,
+                                   @RequestParam Integer pageSize);
+
+    @PostMapping(value = "api/v1/report/destination/selectSum")
+    Map<String, Object> selectSum(@RequestBody(required = false) HashMap<String, Object> map);
 
     @PostMapping(value = "api/v1/report/destination/selecttype1")
     Map<String, Object> selecttype1(@RequestBody(required = false) HashMap<String, Object> map,
-                                   @RequestParam Integer apiId,
-                                   @RequestParam  Integer pageNum,
-                                   @RequestParam  Integer pageSize);
+                                    @RequestParam Integer apiId,
+                                    @RequestParam Integer pageNum,
+                                    @RequestParam Integer pageSize);
 
     @PostMapping(value = "api/v1/report/dailySummary/dailySummary")
     Map<String, Object> dailySummary(Map<String, Object> map);
@@ -78,9 +84,15 @@ public interface ReportFeign {
     @PostMapping(value = "api/v1/report/productReports/staffAttendanceList")
     Map<String, Object> staffAttendanceList(@RequestBody(required = false) Map<String, Object> map,
                                             @RequestParam Integer apiId,
-                                            @RequestParam  Integer pageNum,
-                                            @RequestParam  Integer pageSize);
+                                            @RequestParam Integer pageNum,
+                                            @RequestParam Integer pageSize);
 
     @PostMapping(value = "api/v1/report/reportDaily/updateOperateDaily")
-    Map<String, Object> updateOperateDaily();
+    Map<String, Object> updateOperateDaily(@RequestBody Map<String, Object> map);
+
+    @PostMapping(value = "/api/v1/report/reportDaily/getOperateDaily")
+    Map<String, Object> getOperateDaily(@RequestBody(required = false) Map<String, Object> map,
+                                        @RequestParam Integer apiId,
+                                        @RequestParam Integer pageNum,
+                                        @RequestParam Integer pageSize);
 }

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

@@ -16,7 +16,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-@FeignClient(value = "ANTAI-RMS-API", url = "${openfeign.RmsFeign.url}",configuration = MyFeignRequestInterceptor.class)
+@FeignClient(value = "ANTAI-RMS-API", url = "${openfeign.RmsFeign.url}", configuration = MyFeignRequestInterceptor.class)
 public interface RmsFeign {
 
 
@@ -82,12 +82,13 @@ public interface RmsFeign {
                                             @RequestParam Integer pageSize,
                                             @RequestParam Integer apiId,
                                             @RequestParam String con);
+
     @PostMapping(value = "api/v1/rms/rmsmaterialtype/getMaterialTypeListByCompany")
     Map<String, Object> getMaterialTypeListByCompany(@RequestBody(required = false) Map<String, Object> mapValue,
-                                            @RequestParam Integer pageNum,
-                                            @RequestParam Integer pageSize,
-                                            @RequestParam Integer apiId,
-                                            @RequestParam String con);
+                                                     @RequestParam Integer pageNum,
+                                                     @RequestParam Integer pageSize,
+                                                     @RequestParam Integer apiId,
+                                                     @RequestParam String con);
 
     //新增物资种类
     @PostMapping("api/v1/rms/rmsmaterialtype/insertMaterialType")
@@ -121,61 +122,66 @@ public interface RmsFeign {
                                         @RequestParam("apiId") Integer apiId,
                                         @RequestParam("pageNum") Integer pageNum,
                                         @RequestParam("pageSize") Integer pageSize);
+
     //查询物料产量
     @PostMapping(value = "api/v1/rms/rmsmaterialyields/getMaterialYieldList")
     Map<String, Object> getMaterialYieldList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                        @RequestParam("apiId") Integer apiId,
-                                        @RequestParam("pageNum") Integer pageNum,
-                                        @RequestParam("pageSize") Integer pageSize);
+                                             @RequestParam("apiId") Integer apiId,
+                                             @RequestParam("pageNum") Integer pageNum,
+                                             @RequestParam("pageSize") Integer pageSize);
+
     @PostMapping(value = "api/v1/rms/rmsbaseproductioncosts/getRmsBaseProductionCostList")
     Map<String, Object> getRmsBaseProductionCostList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                        @RequestParam("apiId") Integer apiId,
-                                        @RequestParam("pageNum") Integer pageNum,
-                                        @RequestParam("pageSize") Integer pageSize);
+                                                     @RequestParam("apiId") Integer apiId,
+                                                     @RequestParam("pageNum") Integer pageNum,
+                                                     @RequestParam("pageSize") Integer pageSize);
+
     //新增生产成本数据
     @PostMapping(value = "api/v1/rms/rmsbaseproductioncosts/insertRmsBaseProductionCost")
-    Map<String, Object> insertRmsBaseProductionCost(@RequestBody(required = false) Map<String,Object> model);
+    Map<String, Object> insertRmsBaseProductionCost(@RequestBody(required = false) Map<String, Object> model);
 
     @PostMapping(value = "api/v1/rms/rmsbaseproductioncosts/updateRmsBaseProductionCost")
-    Map<String, Object> updateRmsBaseProductionCost(@RequestBody(required = false) Map<String,Object> model);
+    Map<String, Object> updateRmsBaseProductionCost(@RequestBody(required = false) Map<String, Object> model);
 
     @PostMapping(value = "api/v1/rms/rmsbaseproductioncosts/deleteRmsBaseProductionCost")
-    Map<String, Object> deleteRmsBaseProductionCost(@RequestBody(required = false) Map<String,Object> model);
+    Map<String, Object> deleteRmsBaseProductionCost(@RequestBody(required = false) Map<String, Object> model);
 
 
     @PostMapping(value = "api/v1/rms/rmsbasepurchasecosts/getRmsBasePurchaseCostList")
     Map<String, Object> getRmsBasePurchaseCostList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                                     @RequestParam("apiId") Integer apiId,
-                                                     @RequestParam("pageNum") Integer pageNum,
-                                                     @RequestParam("pageSize") Integer pageSize);
+                                                   @RequestParam("apiId") Integer apiId,
+                                                   @RequestParam("pageNum") Integer pageNum,
+                                                   @RequestParam("pageSize") Integer pageSize);
+
     //新增生产成本数据
     @PostMapping(value = "api/v1/rms/rmsbasepurchasecosts/insertRmsBasePurchaseCost")
-    Map<String, Object> insertRmsBasePurchaseCost(@RequestBody(required = false) Map<String,Object> model);
+    Map<String, Object> insertRmsBasePurchaseCost(@RequestBody(required = false) Map<String, Object> model);
 
     @PostMapping(value = "api/v1/rms/rmsbasepurchasecosts/updateRmsBasePurchaseCost")
-    Map<String, Object> updateRmsBasePurchaseCost(@RequestBody(required = false) Map<String,Object> model);
+    Map<String, Object> updateRmsBasePurchaseCost(@RequestBody(required = false) Map<String, Object> model);
 
     @PostMapping(value = "api/v1/rms/rmsbasepurchasecosts/deleteRmsBasePurchaseCost")
-    Map<String, Object> deleteRmsBasePurchaseCost(@RequestBody(required = false) Map<String,Object> model);
+    Map<String, Object> deleteRmsBasePurchaseCost(@RequestBody(required = false) Map<String, Object> model);
 
     @PostMapping(value = "api/v1/rms/rmsbasesalecosts/getRmsBaseSaleCostList")
     Map<String, Object> getRmsBaseSaleCostList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                                   @RequestParam("apiId") Integer apiId,
-                                                   @RequestParam("pageNum") Integer pageNum,
-                                                   @RequestParam("pageSize") Integer pageSize);
+                                               @RequestParam("apiId") Integer apiId,
+                                               @RequestParam("pageNum") Integer pageNum,
+                                               @RequestParam("pageSize") Integer pageSize);
+
     //新增生产成本数据
     @PostMapping(value = "api/v1/rms/rmsbasesalecosts/insertRmsBaseSaleCost")
-    Map<String, Object> insertRmsBaseSaleCost(@RequestBody(required = false) Map<String,Object> model);
+    Map<String, Object> insertRmsBaseSaleCost(@RequestBody(required = false) Map<String, Object> model);
 
     @PostMapping(value = "api/v1/rms/rmsbasesalecosts/updateRmsBaseSaleCost")
-    Map<String, Object> updateRmsBaseSaleCost(@RequestBody(required = false) Map<String,Object> model);
+    Map<String, Object> updateRmsBaseSaleCost(@RequestBody(required = false) Map<String, Object> model);
 
     @PostMapping(value = "api/v1/rms/rmsbasesalecosts/deleteRmsBaseSaleCost")
-    Map<String, Object> deleteRmsBaseSaleCost(@RequestBody(required = false) Map<String,Object> model);
+    Map<String, Object> deleteRmsBaseSaleCost(@RequestBody(required = false) Map<String, Object> model);
 
     //新增物料产量
     @PostMapping(value = "api/v1/rms/rmsmaterialyields/insertMaterialYield")
-    Map<String, Object> insertMaterialYield(@RequestBody(required = false) Map<String,Object> model);
+    Map<String, Object> insertMaterialYield(@RequestBody(required = false) Map<String, Object> model);
 
     //新增物资
     @PostMapping(value = "api/v1/rms/rmsmaterial/insertMaterial")
@@ -263,7 +269,7 @@ public interface RmsFeign {
     Map<String, Object> syncPersonnel(@RequestBody(required = false) Map<String, Object> map);
 
     @PostMapping(value = "api/v1/rms/rmspersonnel/importPersonnel")
-    RESTfulResult importPersonnel(@RequestBody(required = false)Map<String, Object> map);
+    RESTfulResult importPersonnel(@RequestBody(required = false) Map<String, Object> map);
 
     //============公司
     //展示公司列表
@@ -301,7 +307,6 @@ public interface RmsFeign {
     RESTfulResult importCompany(@RequestBody(required = false) Map<String, Object> map);
 
 
-
     //===========运力
     //新增运力
     @PostMapping(value = "api/v1/rms/rmscapacity/insertCapacity")
@@ -380,9 +385,9 @@ public interface RmsFeign {
 
     @PostMapping(value = "api/v1/rms/rmscapacitydrivers/getCapacityDriverListWithCarNo")
     Map<String, Object> getCapacityDriverListWithCarNo(@RequestBody(required = false) Map<String, Object> mapValue,
-                                              @RequestParam("apiId") Integer apiId,
-                                              @RequestParam("pageNum") Integer pageNum,
-                                              @RequestParam("pageSize") Integer pageSize);
+                                                       @RequestParam("apiId") Integer apiId,
+                                                       @RequestParam("pageNum") Integer pageNum,
+                                                       @RequestParam("pageSize") Integer pageSize);
 
     //新增司机排班信息
     @PostMapping(value = "api/v1/rms/rmscapacitydrivers/insertCapacityDriver")
@@ -397,7 +402,6 @@ public interface RmsFeign {
     Map<String, Object> deleteCapacityDriver(@RequestBody(required = false) Map<String, Object> map);
 
 
-
     //================作业点
     //获取门岗信息列表
     @PostMapping(value = "api/v1/rms/rmsgatepost/getGatepostList")
@@ -647,6 +651,7 @@ public interface RmsFeign {
 
     @PostMapping(value = "api/v1/rms/rmscapacitytype/insertCapacityType")
     Map<String, Object> insertCapacityType(@RequestBody(required = false) Map<String, Object> map);
+
     @PostMapping(value = "api/v1/rms/rmscapacitytype/updateCapacityType")
     Map<String, Object> updateCapacityType(@RequestBody(required = false) Map<String, Object> map);
 
@@ -659,12 +664,13 @@ public interface RmsFeign {
                                           @RequestParam("apiId") Integer apiId,
                                           @RequestParam("pageNum") Integer pageNum,
                                           @RequestParam("pageSize") Integer pageSize);
+
     //运输范围
     @PostMapping(value = "/api/v1/rms/rmstransrange/getTransRangeListByCompany")
     Map<String, Object> getTransRangeListByCompany(@RequestBody(required = false) Map<String, Object> map,
-                                          @RequestParam("apiId") Integer apiId,
-                                          @RequestParam("pageNum") Integer pageNum,
-                                          @RequestParam("pageSize") Integer pageSize);
+                                                   @RequestParam("apiId") Integer apiId,
+                                                   @RequestParam("pageNum") Integer pageNum,
+                                                   @RequestParam("pageSize") Integer pageSize);
 
 
     @PostMapping(value = "api/v1/rms/rmstransrange/insertTransRange")
@@ -678,6 +684,7 @@ public interface RmsFeign {
 
     @PostMapping("api/v1/rms/rmstransrange/queryInsertTransRange")
     Map<String, Object> queryInsertTransRange(@RequestBody(required = false) Map<String, Object> map);
+
     /**
      * 集装箱的相关方法
      *
@@ -764,8 +771,8 @@ public interface RmsFeign {
 
     @PostMapping("api/v1/rms/rmsexpansecategorys/rmsexpansecategorysList")
     Map<String, Object> rmsexpansecategorysList(@RequestBody(required = false) Map<String, Object> map, @RequestParam Integer apiId,
-                                    @RequestParam Integer pageNum,
-                                    @RequestParam Integer pageSize);
+                                                @RequestParam Integer pageNum,
+                                                @RequestParam Integer pageSize);
 
     @PostMapping("api/v1/rms/rmsexpansecategorys/rmsexpansecategorysInsert")
     Map<String, Object> addrmsexpansecategorys(@RequestBody(required = false) Map<String, Object> map);
@@ -781,22 +788,26 @@ public interface RmsFeign {
     Map<String, Object> getBusinessType(@RequestBody(required = false) Map<String, Object> map, @RequestParam Integer apiId,
                                         @RequestParam Integer pageNum,
                                         @RequestParam Integer pageSize);
+
     @PostMapping("/api/v1/rms/dilbusinesstypes/getBusinessTypeByCompany")
     Map<String, Object> getBusinessTypeByCompany(@RequestBody(required = false) Map<String, Object> map, @RequestParam Integer apiId,
-                                        @RequestParam Integer pageNum,
-                                        @RequestParam Integer pageSize);
+                                                 @RequestParam Integer pageNum,
+                                                 @RequestParam Integer pageSize);
 
     @PostMapping("api/v1/rms/dilbusinesstypes/insertBusinessType")
     Map<String, Object> insertBusinessType(@RequestBody(required = false) Map<String, Object> map);
 
     @PostMapping("/api/v1/rms/rmsapprovelines/getapprovelines")
     Map<String, Object> getrmsapprovelines(@RequestBody(required = false) Map<String, Object> mapValue, @RequestParam Integer pageNum,
-                                        @RequestParam Integer pageSize,
-                                        @RequestParam Integer apiId);
+                                           @RequestParam Integer pageSize,
+                                           @RequestParam Integer apiId);
+
     @PostMapping("api/v1/rms/rmsapprovelines/addapprovelines")
     Map<String, Object> addapprovelines(@RequestBody(required = false) Map<String, Object> map);
+
     @PostMapping("api/v1/rms/rmsapprovelines/updateapprovelines")
     Map<String, Object> updateapprovelines(@RequestBody(required = false) Map<String, Object> map);
+
     @PostMapping("api/v1/rms/rmsapprovelines/approvelinesdelete")
     Map<String, Object> approvelinesdelete(@RequestBody(required = false) Map<String, Object> map);
 
@@ -830,25 +841,26 @@ public interface RmsFeign {
 
     @PostMapping(value = "api/v1/rms/rmsmapvertexs/navigation")
     Map<String, Object> navigation(@RequestBody(required = false) Map<String, Object> map);
+
     //修改物料产量
     @PostMapping(value = "api/v1/rms/rmsmaterialyields/updateMaterialYield")
-    Map<String, Object> updateMaterialYield(@RequestBody(required = false) Map<String,Object> model);
+    Map<String, Object> updateMaterialYield(@RequestBody(required = false) Map<String, Object> model);
 
     @PostMapping(value = "api/v1/rms/rmsmaterialyields/deleteMaterialYield")
-    Map<String, Object> deleteMaterialYield(@RequestBody(required = false) Map<String,Object> model);
+    Map<String, Object> deleteMaterialYield(@RequestBody(required = false) Map<String, Object> model);
 
     @PostMapping(value = "api/v1/rms/rmsstandardinfos/getPublicCode")
     Map<String, Object> getPublicCode(@RequestBody(required = false) Map<String, Object> mapValue,
-                                        @RequestParam("apiId") Integer apiId,
-                                        @RequestParam("pageNum") Integer pageNum,
-                                        @RequestParam("pageSize") Integer pageSize);
-
-    @PostMapping(value = "api/v1/rms/rmsstandardinfos/getStandardInfo")
-    Map<String, Object> getStandardInfo(@RequestBody(required = false) Map<String, Object> mapValue,
                                       @RequestParam("apiId") Integer apiId,
                                       @RequestParam("pageNum") Integer pageNum,
                                       @RequestParam("pageSize") Integer pageSize);
 
+    @PostMapping(value = "api/v1/rms/rmsstandardinfos/getStandardInfo")
+    Map<String, Object> getStandardInfo(@RequestBody(required = false) Map<String, Object> mapValue,
+                                        @RequestParam("apiId") Integer apiId,
+                                        @RequestParam("pageNum") Integer pageNum,
+                                        @RequestParam("pageSize") Integer pageSize);
+
     @PostMapping(value = "api/v1/rms/rmsstandardinfos/addStandardInfo")
     Map<String, Object> addStandardInfo(@RequestBody(required = false) Map<String, Object> map);
 
@@ -861,9 +873,9 @@ public interface RmsFeign {
     //油价
     @PostMapping(value = "api/v1/rms/rmsoilprice/getOilPrice")
     Map<String, Object> getOilPrice(@RequestBody(required = false) Map<String, Object> mapValue,
-                                        @RequestParam("apiId") Integer apiId,
-                                        @RequestParam("pageNum") Integer pageNum,
-                                        @RequestParam("pageSize") Integer pageSize);
+                                    @RequestParam("apiId") Integer apiId,
+                                    @RequestParam("pageNum") Integer pageNum,
+                                    @RequestParam("pageSize") Integer pageSize);
 
     @PostMapping(value = "api/v1/rms/rmsoilprice/addOilPrice")
     Map<String, Object> addOilPrice(@RequestBody(required = false) Map<String, Object> map);
@@ -879,9 +891,9 @@ public interface RmsFeign {
 
     @PostMapping(value = "api/v1/rms/rmsbusinesstypecontrols/getBusinessTypeControlList")
     Map<String, Object> getBusinessTypeControlList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                              @RequestParam("apiId") Integer apiId,
-                                              @RequestParam("pageNum") Integer pageNum,
-                                              @RequestParam("pageSize") Integer pageSize);
+                                                   @RequestParam("apiId") Integer apiId,
+                                                   @RequestParam("pageNum") Integer pageNum,
+                                                   @RequestParam("pageSize") Integer pageSize);
 
     @PostMapping(value = "api/v1/rms/rmsbusinesstypecontrols/addBusinessTypeControl")
     Map<String, Object> addBusinessTypeControl(@RequestBody(required = false) Map<String, Object> map);
@@ -894,25 +906,27 @@ public interface RmsFeign {
 
     @PostMapping(value = "api/v1/rms/rmsbusinesstypecontrols/getBusinessTypeControl")
     Map<String, Object> getBusinessTypeControl(@RequestBody(required = false) Map<String, Object> mapValue);
+
     @PostMapping(value = "api/v1/rms/rmscompanybmts/relevance")
     Map<String, Object> relevance(@RequestBody(required = false) Map<String, Object> mapValue);
+
     @PostMapping(value = "api/v1/rms/rmscompanybmts/cancelRelevance")
     Map<String, Object> cancelRelevance(@RequestBody(required = false) Map<String, Object> mapValue);
 
     @PostMapping(value = "api/v1/rms/rmspersonnel/importPersonnelSyncSSO")
-    RESTfulResult importPersonnelSyncSSO(@RequestBody(required = false)Map<String, Object> map);
+    RESTfulResult importPersonnelSyncSSO(@RequestBody(required = false) Map<String, Object> map);
 
     @PostMapping(value = "api/v1/rms/rmsmaterial/getMaterialMapList")
-    RESTfulResult getMaterialMapList(@RequestBody(required = false)Map<String, Object> map,
+    RESTfulResult getMaterialMapList(@RequestBody(required = false) Map<String, Object> map,
                                      @RequestParam("apiId") Integer apiId,
                                      @RequestParam("pageNum") Integer pageNum,
                                      @RequestParam("pageSize") Integer pageSize);
 
     @PostMapping(value = "api/v1/rms/rmscompanyarrivals/getCompanyArrivalList")
     Map<String, Object> getCompanyArrivalList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                       @RequestParam("apiId") Integer apiId,
-                                       @RequestParam("pageNum") Integer pageNum,
-                                       @RequestParam("pageSize") Integer pageSize);
+                                              @RequestParam("apiId") Integer apiId,
+                                              @RequestParam("pageNum") Integer pageNum,
+                                              @RequestParam("pageSize") Integer pageSize);
 
     @PostMapping(value = "api/v1/rms/rmscompanyarrivals/insertCompanyArrival")
     Map<String, Object> insertCompanyArrival(@RequestBody(required = false) Map<String, Object> map);

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

@@ -8,11 +8,12 @@ import org.springframework.web.bind.annotation.*;
 import java.util.Map;
 
 
-@FeignClient(value = "SSO",url = "${openfeign.SSOFeign.url}")
+@FeignClient(value = "SSO", url = "${openfeign.SSOFeign.url}")
 public interface SSOFeign {
 
     /**
      * 登录
+     *
      * @param loginName
      * @param password
      * @return
@@ -24,6 +25,7 @@ public interface SSOFeign {
 
     /**
      * 新增用户
+     *
      * @param token
      * @param userCode
      * @param userName
@@ -37,13 +39,13 @@ public interface SSOFeign {
     @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);
+                       @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,
@@ -52,34 +54,36 @@ public interface SSOFeign {
 
     @PutMapping("/v1/sysusers/resetPassword/{userId}")
     JSONObject resetPassword(@RequestHeader("Authorization") String token,
-                       @PathVariable String userId,
-                       @RequestParam String password,
-                       @RequestBody(required = true) Map<String,Object> map);
+                             @PathVariable String userId,
+                             @RequestParam String password,
+                             @RequestBody(required = true) Map<String, Object> map);
 
     @PutMapping("/v1/sysuserlogins/resetLoginInfo/{userCode}")
     JSONObject resetLoginInfo(@RequestHeader("Authorization") String token,
-                             @PathVariable String userCode);
+                              @PathVariable String userCode);
 
     /**
      * 激活账号
+     *
      * @param token
      * @param userId
-     * @param status 1-启用
+     * @param status      1-启用
      * @param loginStatus 1-激活
      * @return
      */
     @PostMapping("/v1/sysusers/updateUser/{userId}")
     JSONObject reActive(@RequestHeader("Authorization") String token,
-                              @PathVariable String userId,
-                              @RequestParam(defaultValue = "1") String status,
-                              @RequestParam(defaultValue = "1") String loginStatus);
+                        @PathVariable String userId,
+                        @RequestParam(defaultValue = "1") String status,
+                        @RequestParam(defaultValue = "1") String loginStatus);
 
     @GetMapping("/v1/sysroles/getRolesUser")
     JSONObject getRolesUser(@RequestHeader("Authorization") String token,
-                       @RequestParam String companyId);
+                            @RequestParam String companyId);
 
     /**
      * 授权用户角色
+     *
      * @param token
      * @param userId
      * @param userCode
@@ -88,23 +92,25 @@ public interface SSOFeign {
      */
     @PostMapping("/v1/sysuserroles/")
     JSONObject addUserroles(@RequestHeader("Authorization") String token,
-                                    @RequestParam String userId,
-                                    @RequestParam String userCode,
-                                    @RequestParam String roleId);
+                            @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);
+    Map<String, Object> sysuserrole(@RequestHeader("Authorization") String token,
+                                    @PathVariable(name = "userRoleId") String userRoleId);
 
     /**
      * 获取用户角色权限
+     *
      * @param token
      * @param userId
      * @param pageNum
@@ -112,9 +118,9 @@ public interface SSOFeign {
      * @return
      */
     @GetMapping("/v1/sysuserroles/")
-    Map<String,Object> getSysuserrole(@RequestHeader("Authorization") String token,
-                                      @RequestParam("userId") String userId,
-                                      @RequestParam("pageNum") Integer pageNum,
-                                      @RequestParam("pageSize") Integer pageSize);
+    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/feign/TmiFeign.java

@@ -0,0 +1,21 @@
+package com.steerinfo.dil.feign;
+
+import com.steerinfo.dil.config.MyFeignRequestInterceptor;
+import com.steerinfo.framework.controller.RESTfulResult;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.Map;
+
+
+@FeignClient(value = "ANTAI-TMI-API", url = "${openfeign.TmiFeigh.url}", configuration = MyFeignRequestInterceptor.class)
+public interface TmiFeign {
+
+    @PostMapping(value = "/api/v1/tmi/test/addWmsCarNo")
+    Map<String,Object> addWmsCarNo(@RequestBody Map<String,Object> map);
+
+}

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

@@ -21,7 +21,7 @@ import java.util.Map;
  * @ time      :2021/9/28 9:30
  */
 
-@FeignClient(name = "ANTAI-TMS-API", url = "${openfeign.TmsFeign.url}",configuration = MyFeignRequestInterceptor.class)
+@FeignClient(name = "ANTAI-TMS-API", url = "${openfeign.TmsFeign.url}", configuration = MyFeignRequestInterceptor.class)
 public interface TmsFeign {
 
     //======================>车辆综合实绩
@@ -35,6 +35,7 @@ public interface TmsFeign {
 
     @PostMapping("api/v1/tms/tmscomprehensiveresults/tmscomprehensiveresultsupdate")
     Map<String, Object> updateAmsSalaryContrac(@RequestBody(required = false) Map<String, Object> map);
+
     @PostMapping("api/v1/tms/tmscomprehensiveresults/batchUpdate")
     Map<String, Object> tmscomprehensiveresultsBatchUpdate(@RequestBody(required = false) List<Map<String, Object>> map);
 
@@ -96,7 +97,6 @@ public interface TmsFeign {
 
 
     @PostMapping("api/v1/tms/tmstimingresults/tmstimingresultsList")
-
     Map<String, Object> tmstimingresultsList(@RequestBody(required = false) Map<String, Object> map,
                                              @RequestParam Integer apiId,
                                              @RequestParam Integer pageNum,
@@ -104,9 +104,9 @@ public interface TmsFeign {
 
     @PostMapping("api/v1/tms/tmstimingresults/getOrderTimeList")
     Map<String, Object> getOrderTimeList(@RequestBody(required = false) Map<String, Object> map,
-                                             @RequestParam Integer apiId,
-                                             @RequestParam Integer pageNum,
-                                             @RequestParam Integer pageSize);
+                                         @RequestParam Integer apiId,
+                                         @RequestParam Integer pageNum,
+                                         @RequestParam Integer pageSize);
 
     @PostMapping("api/v1/tms/tmstimingresults/getTimeList")
     Map<String, Object> getTimeList(@RequestBody(required = false) Map<String, Object> map);
@@ -118,7 +118,7 @@ public interface TmsFeign {
     Map<String, Object> saleDispatchOrderList(@RequestBody(required = false) Map<String, Object> map);
 
     @PostMapping("api/v1/tms/omstransorders/getSaleTransOrderList")
-    Map<String, Object> getSaleTransOrderList(@RequestBody(required = false) Map<String, Object> map,  @RequestParam Integer apiId,
+    Map<String, Object> getSaleTransOrderList(@RequestBody(required = false) Map<String, Object> map, @RequestParam Integer apiId,
                                               @RequestParam Integer pageNum,
                                               @RequestParam Integer pageSiz);
 
@@ -192,9 +192,9 @@ public interface TmsFeign {
 
     @PostMapping("api/v1/tms/tmsloadresults/purchaseTrainLoadReport")
     Map<String, Object> purchaseTrainLoadReport(@RequestBody(required = false) Map<String, Object> map,
-                                              @RequestParam Integer apiId,
-                                              @RequestParam Integer pageNum,
-                                              @RequestParam Integer pageSize);
+                                                @RequestParam Integer apiId,
+                                                @RequestParam Integer pageNum,
+                                                @RequestParam Integer pageSize);
 
     @PostMapping("api/v1/tms/tmsloadresults/updateTrainLoad")
     Map<String, Object> updateTrainLoad(@RequestBody(required = false) Map<String, Object> map);
@@ -208,9 +208,9 @@ public interface TmsFeign {
 
     @PostMapping("api/v1/tms/tmsweightresults/purchaseTrainWeightList")
     Map<String, Object> purchaseTrainWeightList(@RequestBody(required = false) Map<String, Object> map,
-                                              @RequestParam Integer apiId,
-                                              @RequestParam Integer pageNum,
-                                              @RequestParam Integer pageSize);
+                                                @RequestParam Integer apiId,
+                                                @RequestParam Integer pageNum,
+                                                @RequestParam Integer pageSize);
 
 
     @PostMapping("api/v1/tms/tmsunloadresults/purchaseTrainUnloadList")
@@ -274,9 +274,9 @@ public interface TmsFeign {
 
     @PostMapping("api/v1/tms/omstransorders/getCapacityTotalResult")
     Map<String, Object> getCapacityTotalResult(@RequestBody(required = false) Map<String, Object> map,
-                                             @RequestParam Integer apiId,
-                                             @RequestParam Integer pageNum,
-                                             @RequestParam Integer pageSize);
+                                               @RequestParam Integer apiId,
+                                               @RequestParam Integer pageNum,
+                                               @RequestParam Integer pageSize);
 
     @PostMapping(value = "/api/v1/tms/omstransorders/dispatchTask")
     Map<String, Object> dispatchTask(@RequestBody Map<String, Object> map);
@@ -335,9 +335,9 @@ public interface TmsFeign {
 
     @PostMapping(value = "api/v1/tms/tmspleaseapproves/getPleaseApproveList")
     Map<String, Object> getPleaseApproveList(@RequestBody Map<String, Object> objectMap,
-                                          @RequestParam Integer apiId,
-                                          @RequestParam Integer pageNum,
-                                          @RequestParam Integer pageSize);
+                                             @RequestParam Integer apiId,
+                                             @RequestParam Integer pageNum,
+                                             @RequestParam Integer pageSize);
 
     @PostMapping(value = "api/v1/tms/tmspleaseapproves/addPleaseApprove")
     Map<String, Object> addPleaseApprove(Map<String, Object> map);
@@ -387,23 +387,24 @@ public interface TmsFeign {
 
     @PostMapping("api/v1/tms/omstransorders/loadingOperation")
     Map<String, Object> loadingOperation(@RequestBody(required = false) Map<String, Object> map,
-                                                @RequestParam Integer apiId,
-                                                @RequestParam Integer pageNum,
-                                                @RequestParam Integer pageSize);
+                                         @RequestParam Integer apiId,
+                                         @RequestParam Integer pageNum,
+                                         @RequestParam Integer pageSize);
 
     @PostMapping("api/v1/tms/omstransorders/updateTrainOrderSeq")
     Map<String, Object> updateTrainOrderSeq(@RequestBody(required = false) Map<String, Object> map);
 
     @PostMapping("api/v1/tms/omstransorders/purchaseTrainsOrderList")
     Map<String, Object> purchaseTrainsOrderList(@RequestBody(required = false) Map<String, Object> map,
-                                         @RequestParam Integer apiId,
-                                         @RequestParam Integer pageNum,
-                                         @RequestParam Integer pageSize);
+                                                @RequestParam Integer apiId,
+                                                @RequestParam Integer pageNum,
+                                                @RequestParam Integer pageSize);
 
     @PostMapping("/api/v1/tms/tmsloadresults/disposeHandling")
     Map<String, Object> disposeHandling(@RequestBody Map<String, Object> map);
 
-    @PostMapping("/api/v1/tms/tmsloadresults/preserveMoveListIn")
+    @PostMapping("/api/v1/tms/omstransorders/getgenerateOperateDaily")
+    Map<String, Object> getgenerateOperateDaily(@RequestBody Map<String, Object> map);   @PostMapping("/api/v1/tms/tmsloadresults/preserveMoveListIn")
     RESTfulResult preserveMoveListIn(@RequestBody Map<String, Object> map);
 
     @PostMapping("/api/v1/tms/tmsunloadresults/preserveMoveListOut")
@@ -417,6 +418,24 @@ public interface TmsFeign {
 
     @PostMapping("/api/v1/tms/omstransorders/modifyChange")
     RESTfulResult modifyChange(@RequestBody Map<String, Object> map);
+
+    @PostMapping("/api/v1/tms/tmstimingresults/resartStartTimming")
+    RESTfulResult resartStartTimming(@RequestBody Map<String, Object> map);
+
+    @PostMapping("/api/v1/tms/omstransorders/correctTransOrder")
+    Map<String, Object> correctTransOrder(Map<String, Object> map);
+
+    @PostMapping("/api/v1/tms/omstransorders/fixedDispatch")
+    Map<String, Object> fixedDispatch();
+
+    @PostMapping("/api/v1/tms/omstransorders/getDispatchRules")
+    Map<String, Object> getDispatchRules(@RequestBody Map<String, Object> params);
+
+    @PostMapping("/api/v1/tms/omstransorders/getZtZxShiji")
+    Map<String, Object> getZtZxShiji(@RequestBody(required = false) Map<String, Object> map,
+                                     @RequestParam Integer apiId,
+                                     @RequestParam Integer pageNum,
+                                     @RequestParam Integer pageSize);
 }
 
 

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

@@ -18,23 +18,23 @@ import java.util.Map;
  * @author luobang
  * @create 2021-09-17 14:13
  */
-@FeignClient(value = "ANTAI-WMS-API",url = "${openfeign.WMSFeign.url}",configuration = MyFeignRequestInterceptor.class)
+@FeignClient(value = "ANTAI-WMS-API", url = "${openfeign.WMSFeign.url}", configuration = MyFeignRequestInterceptor.class)
 public interface WMSFeign {
 
     @PostMapping("api/v1/wms/wmsslmdlivdirs/selectSaleOrderPage")
     Map<String, Object> selectSaleOrderPage(@RequestBody(required = false) HashMap parmas,
-                                                   @RequestParam("apiId") Integer apiId,
-                                                   @RequestParam("pageNum") Integer pageNum,
-                                                   @RequestParam("pageSize") Integer pageSize);
+                                            @RequestParam("apiId") Integer apiId,
+                                            @RequestParam("pageNum") Integer pageNum,
+                                            @RequestParam("pageSize") Integer pageSize);
 
     @PostMapping("api/v1/wms/wmsslmdlivdirs/add")
     RESTfulResult addet(@RequestBody HashMap params);
 
     @PostMapping(value = "api/v1/wms/wmsslmdlivdirs/selectDlivDirNo")
     Map<String, Object> selectDlivDirNo(@RequestBody(required = false) HashMap params,
-                                             @RequestParam("apiId") Integer apiId,
-                                             @RequestParam("pageNum") Integer pageNum,
-                                             @RequestParam("pageSize") Integer pageSize);
+                                        @RequestParam("apiId") Integer apiId,
+                                        @RequestParam("pageNum") Integer pageNum,
+                                        @RequestParam("pageSize") Integer pageSize);
 
 
     @PostMapping(value = "api/v1/wms/wmsslmdlivdirs/udpateOrder")
@@ -58,8 +58,8 @@ public interface WMSFeign {
     //实时库存
     @PostMapping("api/v1/wms/wmsgridmaterials/wmsgridmaterialsList")
     Map<String, Object> list(@RequestBody(required = false) Map<String, Object> map, @RequestParam Integer apiId,
-                                    @RequestParam Integer pageNum,
-                                    @RequestParam Integer pageSize);
+                             @RequestParam Integer pageNum,
+                             @RequestParam Integer pageSize);
 
     @PostMapping("api/v1/wms/wmsgridmaterials/wmsgridmaterialsinsert")
     Map<String, Object> insert(@RequestBody(required = false) Map<String, Object> map);
@@ -68,13 +68,13 @@ public interface WMSFeign {
     Map<String, Object> delete(@RequestBody(required = false) Map<String, Object> map);
 
     @PutMapping("api/v1/wms/wmsgridmaterials/wmsgridmaterialsUpdate/{id}")
-    Map<String, Object> update(@PathVariable BigDecimal id,@RequestBody(required = false) Map<String, Object> map);
+    Map<String, Object> update(@PathVariable BigDecimal id, @RequestBody(required = false) Map<String, Object> map);
 
 
     @PostMapping("api/v1/wms/wmsgridmaterials/getGridMaterialList")
     Map<String, Object> getGridMaterialList(@RequestBody(required = false) Map<String, Object> map, @RequestParam Integer apiId,
-                             @RequestParam Integer pageNum,
-                             @RequestParam Integer pageSize);
+                                            @RequestParam Integer pageNum,
+                                            @RequestParam Integer pageSize);
 
     @PostMapping("api/v1/wms/wmsgridmaterials/updateGridMaterial")
     Map<String, Object> updateGridMaterial(@RequestBody(required = false) Map<String, Object> map);
@@ -82,8 +82,8 @@ public interface WMSFeign {
 
     @PostMapping("api/v1/wms/wmsgridmaterials/getGridMaterialDailyReport")
     Map<String, Object> getGridMaterialDailyReport(@RequestBody(required = false) Map<String, Object> map, @RequestParam Integer apiId,
-                                            @RequestParam Integer pageNum,
-                                            @RequestParam Integer pageSize);
+                                                   @RequestParam Integer pageNum,
+                                                   @RequestParam Integer pageSize);
 
     @PostMapping("api/v1/wms/wmsinboundresults/getInboundList")
     Map<String, Object> getInboundList(@RequestBody(required = false) Map<String, Object> map, @RequestParam Integer apiId,
@@ -98,11 +98,11 @@ public interface WMSFeign {
 
     @PostMapping("api/v1/wms/wmsoutboundresults/getOutboundList")
     Map<String, Object> getOutboundList(@RequestBody(required = false) Map<String, Object> map, @RequestParam Integer apiId,
-                                       @RequestParam Integer pageNum,
-                                       @RequestParam Integer pageSize);
+                                        @RequestParam Integer pageNum,
+                                        @RequestParam Integer pageSize);
 
     @PostMapping("api/v1/wms/wmsoutboundresults/outbound")
-    Map<String, Object>outbound(@RequestBody(required = false) Map<String, Object> map);
+    Map<String, Object> outbound(@RequestBody(required = false) Map<String, Object> map);
 
 
     @PostMapping("api/v1/wms/wmsoutboundresults/updateOutbound")

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

@@ -20,22 +20,32 @@ import java.util.List;
 public interface WebSocketFeign {
     @PostMapping("api/v1/websocket/basewebsocketsends/readWebsocket/{id}")
     RESTfulResult readWebsocket(@PathVariable("id") String sendId);
+
     @PostMapping("api/v1/websocket/basewebsocketsends/readingWebsockets")
-    RESTfulResult readingWebsockets(@RequestBody() List<HashMap<String,Object>> list);
+    RESTfulResult readingWebsockets(@RequestBody() List<HashMap<String, Object>> list);
+
     @PostMapping("api/v1/websocket/basewebsocketsends/sendWebsocket/{id}")
-    RESTfulResult sendWebsocket(@PathVariable("id") String webSocketId, @RequestBody HashMap<String,Object> map);
+    RESTfulResult sendWebsocket(@PathVariable("id") String webSocketId, @RequestBody HashMap<String, Object> map);
+
     @GetMapping("api/v1/websocket/basewebsocketsends/")
-    RESTfulResult list(@RequestParam("parmas")HashMap<String,Object> parmas,@RequestParam("pageNum") Integer pageNum, @RequestParam("pageSize") Integer pageSize);
+    RESTfulResult list(@RequestParam("parmas") HashMap<String, Object> parmas, @RequestParam("pageNum") Integer pageNum, @RequestParam("pageSize") Integer pageSize);
+
     @GetMapping("api/v1/websocket/basewebsocketsends/getMessageCount/{id}")
-    RESTfulResult getMessageCount(@PathVariable String id,@RequestParam()String readFlag);
+    RESTfulResult getMessageCount(@PathVariable String id, @RequestParam() String readFlag);
+
     @GetMapping("api/v1/websocket/basewebsocketpushs/")
-    RESTfulResult basewebsocketpushsList(@RequestParam("parmas")HashMap<String,Object> parmas,@RequestParam("pageNum") Integer pageNum, @RequestParam("pageSize") Integer pageSize);
+    RESTfulResult basewebsocketpushsList(@RequestParam("parmas") HashMap<String, Object> parmas, @RequestParam("pageNum") Integer pageNum, @RequestParam("pageSize") Integer pageSize);
+
     @GetMapping("api/v1/websocket/basewebsocketpushs/noPage")
-    RESTfulResult noPage(@RequestParam HashMap<String,Object> parmas);
+    RESTfulResult noPage(@RequestParam HashMap<String, Object> parmas);
+
     @GetMapping("api/v1/websocket/basewebsocketpushs/{id}")
     RESTfulResult get(@PathVariable String id);
-    @GetMapping("api/v1/websocket/basewebsocketpushs/getUserByOrgCode/{orgCode}")//String
+
+    @GetMapping("api/v1/websocket/basewebsocketpushs/getUserByOrgCode/{orgCode}")
+//String
     RESTfulResult getUserByOrgCode(@PathVariable("orgCode") String orgCode);
+
     @PostMapping("/sendWebsocketByIds/{ids}")
-    RESTfulResult sendWebsocketByIds(@PathVariable("ids") String webSocketIds, @RequestBody HashMap<String,Object> map);
+    RESTfulResult sendWebsocketByIds(@PathVariable("ids") String webSocketIds, @RequestBody HashMap<String, Object> map);
 }

src/main/java/com/steerinfo/dil/interceptors/MyLocaleChangeInterceptor.java

@@ -15,7 +15,7 @@ public class MyLocaleChangeInterceptor {
 
     //国际化配置
     @Bean
-    public LocaleChangeInterceptor localeChangeInterceptor(){
+    public LocaleChangeInterceptor localeChangeInterceptor() {
         return new LocaleChangeInterceptor();
     }
 

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

@@ -18,13 +18,16 @@ public interface BackgroundProcessingMapper {
 
     Map<String, Object> selectCompanyId(String orgName, String roleName);
 
-    List<Map<String,Object>> getCompanyList(String userName);
+    List<Map<String, Object>> getCompanyList(String userName);
 
     List<Map<String, Object>> getCurrentCompanyList(String loginName);
 
-    Map<String,Object> getCompanyRootMap(String loginName);
+    Map<String, Object> getCompanyRootMap(String loginName);
 
-    Map<String,Object> getCapacityMap(String loginName);
+    Map<String, Object> getCapacityMap(String loginName);
 
     Map<String, Object> getPersonnelMap(String loginName);
+
+    int submitOrderStatus(Map<String, Object> map);
+
 }

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

@@ -2,7 +2,9 @@ package com.steerinfo.dil.mapper;
 
 import com.steerinfo.dil.model.DilCidCapacity;
 import com.steerinfo.framework.mapper.IBaseMapper;
+
 import java.math.*;
+
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Select;
 

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

@@ -2,7 +2,9 @@ package com.steerinfo.dil.mapper;
 
 import com.steerinfo.dil.model.LogResult;
 import com.steerinfo.framework.mapper.IBaseMapper;
+
 import java.math.*;
+
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Options;
 import org.apache.ibatis.annotations.Select;

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

@@ -55,7 +55,7 @@ public interface OmstruckOrderMapper extends IBaseMapper<OmstruckOrder, BigDecim
 
     //司机接单调用接口 通过运力Id匹配  /  通过运单ID查询运单信息 APP
     //查询所有接单或拒绝接单的订单 PC -- 采购
-    List<Map<String, Object>>   getTruckOrderByCapacityNum(Map<String, Object> map);
+    List<Map<String, Object>> getTruckOrderByCapacityNum(Map<String, Object> map);
 
     //查询所有接单或拒绝接单的订单 PC -- 销售
     List<Map<String, Object>> getSaleTruckOrderByCapacityNum(Map<String, Object> map);
@@ -179,7 +179,7 @@ public interface OmstruckOrderMapper extends IBaseMapper<OmstruckOrder, BigDecim
     // 根据运力id查询司机排班id
     BigDecimal getDriverCapacityId(BigDecimal capacityId);
 
-    List<Map<String,Object>> getCapacityAndDriver(Map<String,Object> mapValue);
+    List<Map<String, Object>> getCapacityAndDriver(Map<String, Object> mapValue);
 
     List<BigDecimal> getNullOrNotNull(BigDecimal dispatchId);
 
@@ -200,13 +200,13 @@ public interface OmstruckOrderMapper extends IBaseMapper<OmstruckOrder, BigDecim
     Map<String, Object> getInwardOrderMap(BigDecimal orderId);
 
     //通过订单Id查询该订单下所有的物资
-    List<Map<String,Object>> getMaterialMes(@Param("orderId") BigDecimal orderId, @Param("steelJudge") String steelJudge);
+    List<Map<String, Object>> getMaterialMes(@Param("orderId") BigDecimal orderId, @Param("steelJudge") String steelJudge);
 
     //通过订单Id查询该订单下所有的物资
-    List<Map<String,Object>> getMaterialMesForGrossWeight(BigDecimal orderId, String steelJudge);
+    List<Map<String, Object>> getMaterialMesForGrossWeight(BigDecimal orderId, String steelJudge);
 
     //通过订单Id查询该订单下所有的物资
-    List<Map<String,Object>> getMaterialMesNew(@Param("orderId") BigDecimal orderId, @Param("steelJudge") String steelJudge);
+    List<Map<String, Object>> getMaterialMesNew(@Param("orderId") BigDecimal orderId, @Param("steelJudge") String steelJudge);
 
     //根据运输订单查询车牌号
     String selectCapacityNumber(BigDecimal orderId);
@@ -223,7 +223,7 @@ public interface OmstruckOrderMapper extends IBaseMapper<OmstruckOrder, BigDecim
     Map<String, Object> getNZOrderMessageToApp(Map<String, Object> map);
 
     //查询采购零星物资订单给app 12 13 14
-    Map<String,Object>  getSporadicOrder(Map<String, Object> map);
+    Map<String, Object> getSporadicOrder(Map<String, Object> map);
 
     //查询发运计划运输订单给APP  2 3 4
     Map<String, Object> getFYJHOrderMessageToApp(Map<String, Object> map);
@@ -271,12 +271,11 @@ public interface OmstruckOrderMapper extends IBaseMapper<OmstruckOrder, BigDecim
     List<Map<String, Object>> getOrderMaterialList(BigDecimal orderId);
 
     //通过订单查询趟次
-    Map<String,Object> getSporadicOrderTimes(BigDecimal orderId);
-
+    Map<String, Object> getSporadicOrderTimes(BigDecimal orderId);
 
 
     //根据运输订单id查找所有实绩id
-    List<Map<String,Object>> getAllResultId(BigDecimal orderId);
+    List<Map<String, Object>> getAllResultId(BigDecimal orderId);
 
     //查询订单是否确认
     Integer getDriverConfirmation(BigDecimal orderId);
@@ -298,39 +297,41 @@ public interface OmstruckOrderMapper extends IBaseMapper<OmstruckOrder, BigDecim
 
     //通过定向派单ID查询车序号表中的priceId
     BigDecimal getPriceIdByDispatchId(BigDecimal dispatchId);
-//
+
+    //
 //    //通过订单查询趟次
 //    Integer getSporadicOrderTimes(BigDecimal orderId);
-   //删除计重实绩
-   int deleteWeightResult(BigDecimal resultTotalId);
+    //删除计重实绩
+    int deleteWeightResult(BigDecimal resultTotalId);
 
-   //删除装货实绩
-   int deleteLoadResult(BigDecimal resultTotalId);
+    //删除装货实绩
+    int deleteLoadResult(BigDecimal resultTotalId);
 
-   //删除出厂实绩
-   int deleteLeaveResult(BigDecimal resultTotalId);
+    //删除出厂实绩
+    int deleteLeaveResult(BigDecimal resultTotalId);
 
-   //删除卸货实绩
-   int deleteUnloadResult(BigDecimal resultTotalId);
+    //删除卸货实绩
+    int deleteUnloadResult(BigDecimal resultTotalId);
 
-   //删除进厂实绩
-   int deleteEnResult(BigDecimal resultTotalId);
+    //删除进厂实绩
+    int deleteEnResult(BigDecimal resultTotalId);
 
-   //判断计时实绩是否已经存在
+    //判断计时实绩是否已经存在
     int getTimeTaskByTotalId(BigDecimal resultTotalId);
 
-   List<Map<String, Object>> getPurInwardOrderList(Map<String, Object> mapValue);
+    List<Map<String, Object>> getPurInwardOrderList(Map<String, Object> mapValue);
 
-   Map<String, Object> selectOrderMap(BigDecimal orderId);
+    Map<String, Object> selectOrderMap(BigDecimal orderId);
 
     int refuseCtrlZ(Map<String, Object> map);
 
     Map<String, Object> getInwardOrderMessageToApp(Map<String, Object> map);
 
     //计时订单
-    Map<String, Object> getInwardTimeOrderMessageToApp(Map<String, Object> map) throws Exception ;
+    Map<String, Object> getInwardTimeOrderMessageToApp(Map<String, Object> map) throws Exception;
+
     //根据运输订单号查找需要用车时长
-    Map<String,Object>  selectInwardTimeByOrderId(BigDecimal orderId);
+    Map<String, Object> selectInwardTimeByOrderId(BigDecimal orderId);
 
     List<Map<String, Object>> getTimeTaskEndDetail(Map<String, Object> map);
 
@@ -338,7 +339,7 @@ public interface OmstruckOrderMapper extends IBaseMapper<OmstruckOrder, BigDecim
 
     Map<String, Object> getInwardOrderMessage(Map<String, Object> map);
 
-     //删除计时实绩
+    //删除计时实绩
     int deleteTimeTaskByTotalId(BigDecimal resultTotalId);
 
     int closeTruckOrder(BigDecimal orderId);
@@ -346,6 +347,7 @@ public interface OmstruckOrderMapper extends IBaseMapper<OmstruckOrder, BigDecim
     Map<String, Object> getSteelOrderMessageToApp(Map<String, Object> map);
 
     List<Map<String, Object>> getLoadForLoadCarResult(Map<String, Object> map);
+
     // 查询路段顺序号
     BigDecimal getLineSeq(BigDecimal orderId);
 
@@ -357,7 +359,7 @@ public interface OmstruckOrderMapper extends IBaseMapper<OmstruckOrder, BigDecim
     List<Map<String, Object>> getTransportOrder(Map<String, Object> mapValue);
 
     //判断是否为达钢厂区内转
-    Map<String,Object> isInwardLine(BigDecimal orderId);
+    Map<String, Object> isInwardLine(BigDecimal orderId);
 
     // 通过运单id或者运单号查询车辆是否放行
     String canCapacityEnfactory(Map<String, Object> mapValue);
@@ -376,7 +378,7 @@ public interface OmstruckOrderMapper extends IBaseMapper<OmstruckOrder, BigDecim
     List<Map<String, Object>> getMulInwardMaterials(Map<String, Object> map);
 
     //查询出订单的钢材长度
-    List<Map<String,Object>> getMaterialId(BigDecimal orderId);
+    List<Map<String, Object>> getMaterialId(BigDecimal orderId);
 
 
     int getGoBeyondCount(Object orderId);

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

@@ -15,6 +15,7 @@ import java.util.List;
 public interface RmsReceivingCompanyMapper extends IBaseMapper<RmsReceivingCompany, BigDecimal> {
     /**
      * 查询所有收款客户
+     *
      * @return 收款客户列表
      */
     List<RmsReceivingCompany> selectAll();

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

@@ -2,6 +2,7 @@ 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;

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

@@ -11,6 +11,7 @@ import java.util.Map;
 
 /**
  * 通用接口
+ *
  * @ author    :TXF
  * @ time      :2021/10/19 18:03
  */
@@ -23,6 +24,7 @@ public interface UniversalMapper {
     List<Map<String, Object>> getCompanyMesByPlanLike(Map<String, Object> map);
 
     List<Map<String, Object>> getMaterialTypeByLike(Map<String, Object> map);
+
     List<Map<String, Object>> getMaterialByLike(Map<String, Object> map);
 
     List<Map<String, Object>> getCapacityTypeByLike(Map<String, Object> map);
@@ -40,10 +42,13 @@ public interface UniversalMapper {
     List<Map<String, Object>> getPersonnelByLike(Map<String, Object> map);
 
     List<Map<String, Object>> getCapacityByLike(Map<String, Object> map);
+
     List<Map<String, Object>> getCapacityByLikeSc(Map<String, Object> map);
 
     List<Map<String, Object>> getTransRangeByLike(Map<String, Object> map);
+
     List<Map<String, Object>> getLineByLike(Map<String, Object> map);
+
     List<Map<String, Object>> getrmsrmsjobinfosBylike(Map<String, Object> map);
 
 
@@ -63,10 +68,10 @@ public interface UniversalMapper {
     int countTrainLoad(Map<String, Object> map);
 
     //查询采购火运对应运单及计量实绩
-    List<Map<String, Object>>  findTrainWeight(Map<String, Object> map);
+    List<Map<String, Object>> findTrainWeight(Map<String, Object> map);
 
     //查询采购火运对应运单及卸货实绩
-    List<Map<String, Object>>  findTrainUnload(Map<String, Object> map);
+    List<Map<String, Object>> findTrainUnload(Map<String, Object> map);
 
     //查询火运计划下的运单数量
     int countTransOrder(Map<String, Object> map);
@@ -87,7 +92,7 @@ public interface UniversalMapper {
     //获取车型剩余的空闲车辆和已经派车的数量
     List<Map<String, Object>> getcountCar(Map<String, Object> map);
 
-    List<Map<String, Object>> getContainerList(Map<String,Object> map);
+    List<Map<String, Object>> getContainerList(Map<String, Object> map);
 
     String getRequirementNo(Map<String, Object> map);
 
@@ -97,15 +102,15 @@ public interface UniversalMapper {
 
     List<Map<String, Object>> getDriverByLike(Map<String, Object> map);
 
-    Map<String,Object> getConfigByName(String configName);
+    Map<String, Object> getConfigByName(String configName);
 
-    Map<String,Object> getCapacityDriver(Map<String, Object> map);
+    Map<String, Object> getCapacityDriver(Map<String, Object> map);
 
     List<Map<String, Object>> getCapacityDriverSelect(Map<String, Object> map);
 
-    Map<String,Object> getCapacityInfo(Map<String, Object> map);
+    Map<String, Object> getCapacityInfo(Map<String, Object> map);
 
-    Map<String,Object> getDriverInfo(Map<String, Object> map);
+    Map<String, Object> getDriverInfo(Map<String, Object> map);
 
     List<Map<String, Object>> getRequireByLike(Map<String, Object> map);
 
@@ -119,4 +124,10 @@ public interface UniversalMapper {
 
     List<Map<String, Object>> getTransOrderByJobNumber(Map<String, Object> map);
 
+    List<Map<String, Object>> getCapacityByLikeInner(Map<String, Object> map);
+
+    List<Map<String, Object>> getInventoryByLike(Map<String, Object> map);
+
+    List<Map<String, Object>> getTransOrderInFoByNo(Map<String, Object> map);
+
 }

src/main/java/com/steerinfo/dil/model/DilAppCid.java

@@ -7,108 +7,108 @@ import io.swagger.annotations.ApiModelProperty;
 import java.math.BigDecimal;
 import java.util.Date;
 
-@ApiModel(value="null")
+@ApiModel(value = "null")
 public class DilAppCid implements IBasePO<BigDecimal> {
     /**
      * 主键ID(PRIMARY_ID,DECIMAL,38)
      */
-    @ApiModelProperty(value="主键ID",required=true)
+    @ApiModelProperty(value = "主键ID", required = true)
     private BigDecimal primaryId;
 
     /**
      * 用户(USER_CODE,VARCHAR,255)
      */
-    @ApiModelProperty(value="用户",required=false)
+    @ApiModelProperty(value = "用户", required = false)
     private String userCode;
 
     /**
      * 推送ID(CID,VARCHAR,255)
      */
-    @ApiModelProperty(value="推送ID",required=false)
+    @ApiModelProperty(value = "推送ID", required = false)
     private String cid;
 
     /**
      * 新增时间(INSERT_TIME,TIMESTAMP,7)
      */
-    @ApiModelProperty(value="新增时间",required=false)
+    @ApiModelProperty(value = "新增时间", required = false)
     private Date insertTime;
 
     /**
      * 新增用户(INSERT_USERNAME,VARCHAR,255)
      */
-    @ApiModelProperty(value="新增用户",required=false)
+    @ApiModelProperty(value = "新增用户", required = false)
     private String insertUsername;
 
     /**
      * 修改时间(UPDATE_TIME,TIMESTAMP,7)
      */
-    @ApiModelProperty(value="修改时间",required=false)
+    @ApiModelProperty(value = "修改时间", required = false)
     private Date updateTime;
 
     /**
      * 修改用户(UPDATE_USERNAME,VARCHAR,255)
      */
-    @ApiModelProperty(value="修改用户",required=false)
+    @ApiModelProperty(value = "修改用户", required = false)
     private String updateUsername;
 
     /**
      * 备注(INSERT_UPDATE_REMARK,VARCHAR,255)
      */
-    @ApiModelProperty(value="备注",required=false)
+    @ApiModelProperty(value = "备注", required = false)
     private String insertUpdateRemark;
 
     /**
      * 逻辑删除（0正常，1删除）(DELETED,DECIMAL,8)
      */
-    @ApiModelProperty(value="逻辑删除（0正常，1删除）",required=true)
+    @ApiModelProperty(value = "逻辑删除（0正常，1删除）", required = true)
     private Integer deleted;
 
     /**
      * 备用字段1(ALTERNATE_FIELDS1,VARCHAR,255)
      */
-    @ApiModelProperty(value="备用字段1",required=false)
+    @ApiModelProperty(value = "备用字段1", required = false)
     private String alternateFields1;
 
     /**
      * 备用字段2(ALTERNATE_FIELDS2,VARCHAR,255)
      */
-    @ApiModelProperty(value="备用字段2",required=false)
+    @ApiModelProperty(value = "备用字段2", required = false)
     private String alternateFields2;
 
     /**
      * 备用字段3(ALTERNATE_FIELDS3,VARCHAR,255)
      */
-    @ApiModelProperty(value="备用字段3",required=false)
+    @ApiModelProperty(value = "备用字段3", required = false)
     private String alternateFields3;
 
     /**
      * 备用字段4(ALTERNATE_FIELDS4,VARCHAR,255)
      */
-    @ApiModelProperty(value="备用字段4",required=false)
+    @ApiModelProperty(value = "备用字段4", required = false)
     private String alternateFields4;
 
     /**
      * 备用字段5(ALTERNATE_FIELDS5,VARCHAR,255)
      */
-    @ApiModelProperty(value="备用字段5",required=false)
+    @ApiModelProperty(value = "备用字段5", required = false)
     private String alternateFields5;
 
     /**
      * 备用字段6(ALTERNATE_FIELDS6,VARCHAR,255)
      */
-    @ApiModelProperty(value="备用字段6",required=false)
+    @ApiModelProperty(value = "备用字段6", required = false)
     private String alternateFields6;
 
     /**
      * 备用字段7(ALTERNATE_FIELDS7,VARCHAR,255)
      */
-    @ApiModelProperty(value="备用字段7",required=false)
+    @ApiModelProperty(value = "备用字段7", required = false)
     private String alternateFields7;
 
     /**
      * 备用字段8(ALTERNATE_FIELDS8,VARCHAR,255)
      */
-    @ApiModelProperty(value="备用字段8",required=false)
+    @ApiModelProperty(value = "备用字段8", required = false)
     private String alternateFields8;
 
     private static final long serialVersionUID = 1L;

src/main/java/com/steerinfo/dil/model/DilCidCapacity.java

@@ -3,57 +3,58 @@ package com.steerinfo.dil.model;
 import com.steerinfo.framework.model.IBasePO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+
 import java.math.BigDecimal;
 import java.util.Date;
 
-@ApiModel(value="运力与cid的关系表")
+@ApiModel(value = "运力与cid的关系表")
 public class DilCidCapacity implements IBasePO<BigDecimal> {
     /**
      * 主键ID(CID_CAPACITY_ID,DECIMAL,38)
      */
-    @ApiModelProperty(value="主键ID",required=true)
+    @ApiModelProperty(value = "主键ID", required = true)
     private BigDecimal cidCapacityId;
 
     /**
      * 用户cid(CID,VARCHAR,200)
      */
-    @ApiModelProperty(value="用户cid",required=false)
+    @ApiModelProperty(value = "用户cid", required = false)
     private String cid;
 
     /**
      * 车牌号(CAPACITY_NUMBER,VARCHAR,20)
      */
-    @ApiModelProperty(value="车牌号",required=false)
+    @ApiModelProperty(value = "车牌号", required = false)
     private String capacityNumber;
 
     /**
      * 记录创建人(INSERT_USERNAME,VARCHAR,20)
      */
-    @ApiModelProperty(value="记录创建人",required=false)
+    @ApiModelProperty(value = "记录创建人", required = false)
     private String insertUsername;
 
     /**
      * 记录创建时间(INSERT_TIME,TIMESTAMP,7)
      */
-    @ApiModelProperty(value="记录创建时间",required=false)
+    @ApiModelProperty(value = "记录创建时间", required = false)
     private Date insertTime;
 
     /**
      * 记录修改人(UPDATE_USERNAME,VARCHAR,20)
      */
-    @ApiModelProperty(value="记录修改人",required=false)
+    @ApiModelProperty(value = "记录修改人", required = false)
     private String updateUsername;
 
     /**
      * 记录修改时间(UPDATE_TIME,TIMESTAMP,7)
      */
-    @ApiModelProperty(value="记录修改时间",required=false)
+    @ApiModelProperty(value = "记录修改时间", required = false)
     private Date updateTime;
 
     /**
      * 记录创建或修改备注(INSERT_UPDATE_REMARK,VARCHAR,100)
      */
-    @ApiModelProperty(value="记录创建或修改备注",required=false)
+    @ApiModelProperty(value = "记录创建或修改备注", required = false)
     private String insertUpdateRemark;
 
     private static final long serialVersionUID = 1L;

src/main/java/com/steerinfo/dil/model/DilRoleOrgcodeTable.java

@@ -3,44 +3,45 @@ package com.steerinfo.dil.model;
 import com.steerinfo.framework.model.IBasePO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+
 import java.math.BigDecimal;
 
-@ApiModel(value="机构与列的展示关系")
+@ApiModel(value = "机构与列的展示关系")
 public class DilRoleOrgcodeTable implements IBasePO<BigDecimal> {
     /**
      * 主键ID(PRIMARY_ID,DECIMAL,38)
      */
-    @ApiModelProperty(value="主键ID",required=true)
+    @ApiModelProperty(value = "主键ID", required = true)
     private BigDecimal primaryId;
 
     /**
      * 机构关系(ORG_CODE,VARCHAR,200)
      */
-    @ApiModelProperty(value="机构关系",required=false)
+    @ApiModelProperty(value = "机构关系", required = false)
     private String orgCode;
 
     /**
      * 用户名称(USER_NAME,VARCHAR,50)
      */
-    @ApiModelProperty(value="用户名称",required=false)
+    @ApiModelProperty(value = "用户名称", required = false)
     private String userName;
 
     /**
      * 列ID(COLUMN_ID,DECIMAL,38)
      */
-    @ApiModelProperty(value="列ID",required=false)
+    @ApiModelProperty(value = "列ID", required = false)
     private BigDecimal columnId;
 
     /**
      * 方案名称(PRIMARY_NAME,VARCHAR,200)
      */
-    @ApiModelProperty(value="方案名称",required=false)
+    @ApiModelProperty(value = "方案名称", required = false)
     private String primaryName;
 
     /**
      * 启用状态,0 未启用；1，启用(ENABLE_STATUS,DECIMAL,0)
      */
-    @ApiModelProperty(value="启用状态,0 未启用；1，启用",required=false)
+    @ApiModelProperty(value = "启用状态,0 未启用；1，启用", required = false)
     private BigDecimal enableStatus;
 
     private static final long serialVersionUID = 1L;

src/main/java/com/steerinfo/dil/model/DilTableColumnRole.java

@@ -6,24 +6,24 @@ import io.swagger.annotations.ApiModelProperty;
 
 import java.math.BigDecimal;
 
-@ApiModel(value="表列权限")
+@ApiModel(value = "表列权限")
 public class DilTableColumnRole implements IBasePO<BigDecimal> {
     /**
      * 主键ID(PRIMARY_ID,DECIMAL,38)
      */
-    @ApiModelProperty(value="主键ID",required=true)
+    @ApiModelProperty(value = "主键ID", required = true)
     private BigDecimal primaryId;
 
     /**
      * 表名(TABLE_NAME,VARCHAR,50)
      */
-    @ApiModelProperty(value="表名",required=false)
+    @ApiModelProperty(value = "表名", required = false)
     private String tableName;
 
     /**
      * 列名(COLUMN_NAME,VARCHAR,50)
      */
-    @ApiModelProperty(value="列名",required=false)
+    @ApiModelProperty(value = "列名", required = false)
     private String columnName;
 
     private static final long serialVersionUID = 1L;

src/main/java/com/steerinfo/dil/model/DilVersion.java

@@ -3,57 +3,58 @@ package com.steerinfo.dil.model;
 import com.steerinfo.framework.model.IBasePO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+
 import java.math.BigDecimal;
 import java.util.Date;
 
-@ApiModel(value="app版本号")
+@ApiModel(value = "app版本号")
 public class DilVersion implements IBasePO<BigDecimal> {
     /**
      * 主键ID(VERSION_ID,DECIMAL,38)
      */
-    @ApiModelProperty(value="主键ID",required=true)
+    @ApiModelProperty(value = "主键ID", required = true)
     private BigDecimal versionId;
 
     /**
      * 版本号(VERSION_VALUE,VARCHAR,20)
      */
-    @ApiModelProperty(value="版本号",required=false)
+    @ApiModelProperty(value = "版本号", required = false)
     private String versionValue;
 
     /**
      * 记录创建人(INSERT_USERNAME,VARCHAR,20)
      */
-    @ApiModelProperty(value="记录创建人",required=false)
+    @ApiModelProperty(value = "记录创建人", required = false)
     private String insertUsername;
 
     /**
      * 记录创建时间(INSERT_TIME,TIMESTAMP,7)
      */
-    @ApiModelProperty(value="记录创建时间",required=false)
+    @ApiModelProperty(value = "记录创建时间", required = false)
     private Date insertTime;
 
     /**
      * 记录修改人(UPDATE_USERNAME,VARCHAR,20)
      */
-    @ApiModelProperty(value="记录修改人",required=false)
+    @ApiModelProperty(value = "记录修改人", required = false)
     private String updateUsername;
 
     /**
      * 记录修改时间(UPDATE_TIME,TIMESTAMP,7)
      */
-    @ApiModelProperty(value="记录修改时间",required=false)
+    @ApiModelProperty(value = "记录修改时间", required = false)
     private Date updateTime;
 
     /**
      * 记录创建或修改备注(INSERT_UPDATE_REMARK,VARCHAR,100)
      */
-    @ApiModelProperty(value="记录创建或修改备注",required=false)
+    @ApiModelProperty(value = "记录创建或修改备注", required = false)
     private String insertUpdateRemark;
 
     /**
      * 版本类型（0：APP   1：PDA)(VERSION_TYPE,DECIMAL,0)
      */
-    @ApiModelProperty(value="版本类型（0：APP   1：PDA)",required=false)
+    @ApiModelProperty(value = "版本类型（0：APP   1：PDA)", required = false)
     private Short versionType;
 
     private static final long serialVersionUID = 1L;

src/main/java/com/steerinfo/dil/model/LogResult.java

@@ -74,6 +74,24 @@ public class LogResult implements IBasePO<BigDecimal> {
     @ApiModelProperty(value="备注",required=false)
     private String remark;
 
+    /**
+     * 报文1(DATAGRAM1,VARCHAR,4000)
+     */
+    @ApiModelProperty(value="报文1",required=false)
+    private String datagram1;
+
+    /**
+     * 报文2(DATAGRAM2,VARCHAR,4000)
+     */
+    @ApiModelProperty(value="报文2",required=false)
+    private String datagram2;
+
+    /**
+     * 报文3(DATAGRAM3,VARCHAR,4000)
+     */
+    @ApiModelProperty(value="报文3",required=false)
+    private String datagram3;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -174,6 +192,30 @@ public class LogResult implements IBasePO<BigDecimal> {
         this.remark = remark == null ? null : remark.trim();
     }
 
+    public String getDatagram1() {
+        return datagram1;
+    }
+
+    public void setDatagram1(String datagram1) {
+        this.datagram1 = datagram1 == null ? null : datagram1.trim();
+    }
+
+    public String getDatagram2() {
+        return datagram2;
+    }
+
+    public void setDatagram2(String datagram2) {
+        this.datagram2 = datagram2 == null ? null : datagram2.trim();
+    }
+
+    public String getDatagram3() {
+        return datagram3;
+    }
+
+    public void setDatagram3(String datagram3) {
+        this.datagram3 = datagram3 == null ? null : datagram3.trim();
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -191,6 +233,9 @@ public class LogResult implements IBasePO<BigDecimal> {
         sb.append(", insertTime=").append(insertTime);
         sb.append(", insertUsername=").append(insertUsername);
         sb.append(", remark=").append(remark);
+        sb.append(", datagram1=").append(datagram1);
+        sb.append(", datagram2=").append(datagram2);
+        sb.append(", datagram3=").append(datagram3);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

src/main/java/com/steerinfo/dil/model/OmstruckOrder.java

@@ -7,174 +7,174 @@ import io.swagger.annotations.ApiModelProperty;
 import java.math.BigDecimal;
 import java.util.Date;
 
-@ApiModel(value="汽运运输订单")
+@ApiModel(value = "汽运运输订单")
 public class OmstruckOrder implements IBasePO<BigDecimal> {
     /**
      * 运输订单id(ORDER_ID,DECIMAL,0)
      */
-    @ApiModelProperty(value="运输订单id",required=true)
+    @ApiModelProperty(value = "运输订单id", required = true)
     private BigDecimal orderId;
 
     /**
      * 车序号表ID/发运计划ID/采购订单ID/内转物流计划ID/零星订单ID(ORDER_PLAN_ID,DECIMAL,0)
      */
-    @ApiModelProperty(value="车序号表ID/发运计划ID/采购订单ID/内转物流计划ID/零星订单ID",required=false)
+    @ApiModelProperty(value = "车序号表ID/发运计划ID/采购订单ID/内转物流计划ID/零星订单ID", required = false)
     private BigDecimal orderPlanId;
 
     /**
      * 运输订单号（WYSDD-年月日-8位数的顺序号）(ORDER_NUMBER,VARCHAR,50)
      */
-    @ApiModelProperty(value="运输订单号（WYSDD-年月日-8位数的顺序号）",required=false)
+    @ApiModelProperty(value = "运输订单号（WYSDD-年月日-8位数的顺序号）", required = false)
     private String orderNumber;
 
     /**
      * 运力ID(CAPACITY_ID,DECIMAL,0)
      */
-    @ApiModelProperty(value="运力ID",required=false)
+    @ApiModelProperty(value = "运力ID", required = false)
     private BigDecimal capacityId;
 
     /**
      * 订单下发时间(ORDER_ISSUE_TIME,TIMESTAMP,7)
      */
-    @ApiModelProperty(value="订单下发时间",required=false)
+    @ApiModelProperty(value = "订单下发时间", required = false)
     private Date orderIssueTime;
 
     /**
      * 司机操作订单行为：0：拒绝；1：接收(ORDER_RECEIVE_STATUS,DECIMAL,0)
      */
-    @ApiModelProperty(value="司机操作订单行为：0：拒绝；1：接收",required=false)
+    @ApiModelProperty(value = "司机操作订单行为：0：拒绝；1：接收", required = false)
     private BigDecimal orderReceiveStatus;
 
     /**
      * 司机接收/拒绝订单时间(ORDER_RECEIVE_REFUSE_TIME,TIMESTAMP,7)
      */
-    @ApiModelProperty(value="司机接收/拒绝订单时间",required=false)
+    @ApiModelProperty(value = "司机接收/拒绝订单时间", required = false)
     private Date orderReceiveRefuseTime;
 
     /**
      * 通信时长=司机接单/拒绝时间-订单下发时间(ORDER_COMMUNICATION_DURATION,DECIMAL,0)
      */
-    @ApiModelProperty(value="通信时长=司机接单/拒绝时间-订单下发时间",required=false)
+    @ApiModelProperty(value = "通信时长=司机接单/拒绝时间-订单下发时间", required = false)
     private BigDecimal orderCommunicationDuration;
 
     /**
      * 运单状态 ：0：待运输，1：执行中，2：已结束，3：未下发，4：已下发，5：已接收，6：已拒绝，7：逻辑删除 8: 关闭  9：退货关闭 10：不可作业(ORDER_STATUS,DECIMAL,0)
      */
-    @ApiModelProperty(value="运单状态 ：0：待运输，1：执行中，2：已结束，3：未下发，4：已下发，5：已接收，6：已拒绝，7：逻辑删除 8: 关闭  9：退货关闭 10：不可作业",required=false)
+    @ApiModelProperty(value = "运单状态 ：0：待运输，1：执行中，2：已结束，3：未下发，4：已下发，5：已接收，6：已拒绝，7：逻辑删除 8: 关闭  9：退货关闭 10：不可作业", required = false)
     private BigDecimal orderStatus;
 
     /**
      * 记录创建人(INSERT_USERNAME,VARCHAR,200)
      */
-    @ApiModelProperty(value="记录创建人",required=false)
+    @ApiModelProperty(value = "记录创建人", required = false)
     private String insertUsername;
 
     /**
      * 记录创建时间(INSERT_TIME,TIMESTAMP,7)
      */
-    @ApiModelProperty(value="记录创建时间",required=false)
+    @ApiModelProperty(value = "记录创建时间", required = false)
     private Date insertTime;
 
     /**
      * 记录修改人(UPDATE_USERNAME,VARCHAR,20)
      */
-    @ApiModelProperty(value="记录修改人",required=false)
+    @ApiModelProperty(value = "记录修改人", required = false)
     private String updateUsername;
 
     /**
      * 记录修改时间(UPDATE_TIME,TIMESTAMP,7)
      */
-    @ApiModelProperty(value="记录修改时间",required=false)
+    @ApiModelProperty(value = "记录修改时间", required = false)
     private Date updateTime;
 
     /**
      * 记录创建或修改备注(INSERT_UPDATE_REMARK,VARCHAR,100)
      */
-    @ApiModelProperty(value="记录创建或修改备注",required=false)
+    @ApiModelProperty(value = "记录创建或修改备注", required = false)
     private String insertUpdateRemark;
 
     /**
      * 逻辑删除(DELETED,DECIMAL,0)
      */
-    @ApiModelProperty(value="逻辑删除",required=false)
+    @ApiModelProperty(value = "逻辑删除", required = false)
     private BigDecimal deleted;
 
     /**
      * 订单类型（1：销售订单；2：焦炭发运计划；3：水渣发运计划；4：内转到异地库；5：采购辅料订单；6：采购老区燃料订单；7：采购新区燃料订单；8：采购进口矿(万州-厂内)；9：内转钢坯车 ; 10：采购内转(老区-厂内)； 11：厂内内转；12：零星物资进厂、13：零星物资出厂:14：钢材退货 ;15 内转精煤进厂；16 内转精煤出厂；17 采购化工材料新区订单； 18 采购化工材料老区订单）(ORDER_TYPE,DECIMAL,0)
      */
-    @ApiModelProperty(value="订单类型（1：销售订单；2：焦炭发运计划；3：水渣发运计划；4：内转到异地库；5：采购辅料订单；6：采购老区燃料订单；7：采购新区燃料订单；8：采购进口矿(万州-厂内)；9：内转钢坯车 ; 10：采购内转(老区-厂内)； 11：厂内内转；12：零星物资进厂、13：零星物资出厂:14：钢材退货 ;15 内转精煤进厂；16 内转精煤出厂；17 采购化工材料新区订单； 18 采购化工材料老区订单）",required=false)
+    @ApiModelProperty(value = "订单类型（1：销售订单；2：焦炭发运计划；3：水渣发运计划；4：内转到异地库；5：采购辅料订单；6：采购老区燃料订单；7：采购新区燃料订单；8：采购进口矿(万州-厂内)；9：内转钢坯车 ; 10：采购内转(老区-厂内)； 11：厂内内转；12：零星物资进厂、13：零星物资出厂:14：钢材退货 ;15 内转精煤进厂；16 内转精煤出厂；17 采购化工材料新区订单； 18 采购化工材料老区订单）", required = false)
     private BigDecimal orderType;
 
     /**
      * 路段顺序号：（1：进厂 ； 2：计毛；3：卸货；4：计皮；5：出厂；6：装货）(ORDER_LINE_SEQUENCE,DECIMAL,0)
      */
-    @ApiModelProperty(value="路段顺序号：（1：进厂 ； 2：计毛；3：卸货；4：计皮；5：出厂；6：装货）",required=false)
+    @ApiModelProperty(value = "路段顺序号：（1：进厂 ； 2：计毛；3：卸货；4：计皮；5：出厂；6：装货）", required = false)
     private BigDecimal orderLineSequence;
 
     /**
      * 运输路线ID(LINE_ID,DECIMAL,0)
      */
-    @ApiModelProperty(value="运输路线ID",required=false)
+    @ApiModelProperty(value = "运输路线ID", required = false)
     private BigDecimal lineId;
 
     /**
      * 预计进厂时间(ORDER_ENTRY_TIME,TIMESTAMP,7)
      */
-    @ApiModelProperty(value="预计进厂时间",required=false)
+    @ApiModelProperty(value = "预计进厂时间", required = false)
     private Date orderEntryTime;
 
     /**
      * 卸货点ID(UNLOAD_POINT_ID,DECIMAL,0)
      */
-    @ApiModelProperty(value="卸货点ID",required=false)
+    @ApiModelProperty(value = "卸货点ID", required = false)
     private BigDecimal unloadPointId;
 
     /**
      * 司机确认订单（1：已确认）(DRIVER_CONFIRMATION,DECIMAL,0)
      */
-    @ApiModelProperty(value="司机确认订单（1：已确认）",required=false)
+    @ApiModelProperty(value = "司机确认订单（1：已确认）", required = false)
     private BigDecimal driverConfirmation;
 
     /**
      * 运输单价ID(PRICE_ID,DECIMAL,0)
      */
-    @ApiModelProperty(value="运输单价ID",required=false)
+    @ApiModelProperty(value = "运输单价ID", required = false)
     private BigDecimal priceId;
 
     /**
      * 订单所属承运商ID(CARRIER_ID,DECIMAL,0)
      */
-    @ApiModelProperty(value="订单所属承运商ID",required=false)
+    @ApiModelProperty(value = "订单所属承运商ID", required = false)
     private BigDecimal carrierId;
 
     /**
      * 行程ID(TRIP_ID,VARCHAR,200)
      */
-    @ApiModelProperty(value="行程ID",required=false)
+    @ApiModelProperty(value = "行程ID", required = false)
     private String tripId;
 
     /**
      * 打印状态(ORDER_PRINT_STATUS,DECIMAL,0)
      */
-    @ApiModelProperty(value="打印状态",required=false)
+    @ApiModelProperty(value = "打印状态", required = false)
     private BigDecimal orderPrintStatus;
 
     /**
      * 司机电话号码(DRIVER_TEL,VARCHAR,36)
      */
-    @ApiModelProperty(value="司机电话号码",required=false)
+    @ApiModelProperty(value = "司机电话号码", required = false)
     private String driverTel;
 
     /**
      * 操作人员组织(OPTIONER_CODE,VARCHAR,255)
      */
-    @ApiModelProperty(value="操作人员组织",required=false)
+    @ApiModelProperty(value = "操作人员组织", required = false)
     private String optionerCode;
 
     /**
      * 是否可作业(CAN_WORK,DECIMAL,0)
      */
-    @ApiModelProperty(value="是否可作业",required=false)
+    @ApiModelProperty(value = "是否可作业", required = false)
     private BigDecimal canWork;
 
     private static final long serialVersionUID = 1L;

src/main/java/com/steerinfo/dil/model/RmsReceivingCompany.java

@@ -8,6 +8,7 @@ import java.util.Date;
 
 /**
  * 收款客户 rms_receiving_company
+ *
  * @author xiaosh
  */
 public class RmsReceivingCompany implements IBasePO<BigDecimal> {

src/main/java/com/steerinfo/dil/model/SystemFile.java

@@ -4,15 +4,15 @@ import com.steerinfo.framework.model.IBasePO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-@ApiModel(value="null")
+@ApiModel(value = "null")
 public class SystemFile implements IBasePO<String> {
-    @ApiModelProperty(value="",required=true)
+    @ApiModelProperty(value = "", required = true)
     private String id;
 
-    @ApiModelProperty(value="",required=false)
+    @ApiModelProperty(value = "", required = false)
     private String filename;
 
-    @ApiModelProperty(value="",required=false)
+    @ApiModelProperty(value = "", required = false)
     private String filepath;
 
     private static final long serialVersionUID = 1L;

src/main/java/com/steerinfo/dil/model/WmsSlmDlivDir.java

@@ -7,345 +7,345 @@ import io.swagger.annotations.ApiModelProperty;
 import java.math.BigDecimal;
 import java.util.Date;
 
-@ApiModel(value="发货管理-出库计划表")
+@ApiModel(value = "发货管理-出库计划表")
 public class WmsSlmDlivDir implements IBasePO<String> {
     /**
      * 发运计划号(DLIV_DIRNO,VARCHAR,40)
      */
-    @ApiModelProperty(value="发运计划号",required=true)
+    @ApiModelProperty(value = "发运计划号", required = true)
     private String dlivDirno;
 
-    @ApiModelProperty(value="",required=false)
+    @ApiModelProperty(value = "", required = false)
     private String seq;
 
     /**
      * 合同号/订单编号(ORDER_NO,VARCHAR,40)
      */
-    @ApiModelProperty(value="合同号/订单编号",required=false)
+    @ApiModelProperty(value = "合同号/订单编号", required = false)
     private String orderNo;
 
     /**
      * 行号(ORDER_SEQ,VARCHAR,10)
      */
-    @ApiModelProperty(value="行号",required=false)
+    @ApiModelProperty(value = "行号", required = false)
     private String orderSeq;
 
     /**
      * 客户编码(CUSTOMER_NO,VARCHAR,20)
      */
-    @ApiModelProperty(value="客户编码",required=false)
+    @ApiModelProperty(value = "客户编码", required = false)
     private String customerNo;
 
     /**
      * 客户名称(CUSTOMER_NM,VARCHAR,100)
      */
-    @ApiModelProperty(value="客户名称",required=false)
+    @ApiModelProperty(value = "客户名称", required = false)
     private String customerNm;
 
     /**
      * 产线(PROD_LINE,VARCHAR,20)
      */
-    @ApiModelProperty(value="产线",required=false)
+    @ApiModelProperty(value = "产线", required = false)
     private String prodLine;
 
     /**
      * 物料名称(PROD_NAME,VARCHAR,50)
      */
-    @ApiModelProperty(value="物料名称",required=false)
+    @ApiModelProperty(value = "物料名称", required = false)
     private String prodName;
 
     /**
      * 标准代码(SPEC_ABBSYM,VARCHAR,20)
      */
-    @ApiModelProperty(value="标准代码",required=false)
+    @ApiModelProperty(value = "标准代码", required = false)
     private String specAbbsym;
 
     /**
      * 钢级(牌号)代码(STEEL_CODE,VARCHAR,20)
      */
-    @ApiModelProperty(value="钢级(牌号)代码",required=false)
+    @ApiModelProperty(value = "钢级(牌号)代码", required = false)
     private String steelCode;
 
     /**
      * 计划件数(QUANTITY,DECIMAL,38)
      */
-    @ApiModelProperty(value="计划件数",required=false)
+    @ApiModelProperty(value = "计划件数", required = false)
     private BigDecimal quantity;
 
     /**
      * 计划重量(WEIGHT,DECIMAL,13)
      */
-    @ApiModelProperty(value="计划重量",required=false)
+    @ApiModelProperty(value = "计划重量", required = false)
     private BigDecimal weight;
 
     /**
      * 金额(MONEY,DECIMAL,14)
      */
-    @ApiModelProperty(value="金额",required=false)
+    @ApiModelProperty(value = "金额", required = false)
     private BigDecimal money;
 
     /**
      * 运费(TRANSMONEY,DECIMAL,0)
      */
-    @ApiModelProperty(value="运费",required=false)
+    @ApiModelProperty(value = "运费", required = false)
     private Short transmoney;
 
     /**
      * 指示状态(0未允许发货1允许发货2正在执行3执行完毕)(DLIV_PROG_CD,VARCHAR,1)
      */
-    @ApiModelProperty(value="指示状态(0未允许发货1允许发货2正在执行3执行完毕)",required=false)
+    @ApiModelProperty(value = "指示状态(0未允许发货1允许发货2正在执行3执行完毕)", required = false)
     private String dlivProgCd;
 
     /**
      * 创建人(CREATE_NAME,VARCHAR,20)
      */
-    @ApiModelProperty(value="创建人",required=false)
+    @ApiModelProperty(value = "创建人", required = false)
     private String createName;
 
     /**
      * 创建时间(CREATE_TIME,TIMESTAMP,7)
      */
-    @ApiModelProperty(value="创建时间",required=false)
+    @ApiModelProperty(value = "创建时间", required = false)
     private Date createTime;
 
     /**
      * 修改人(UPDATE_NAME,VARCHAR,20)
      */
-    @ApiModelProperty(value="修改人",required=false)
+    @ApiModelProperty(value = "修改人", required = false)
     private String updateName;
 
     /**
      * 修改时间(UPDATE_TIME,TIMESTAMP,7)
      */
-    @ApiModelProperty(value="修改时间",required=false)
+    @ApiModelProperty(value = "修改时间", required = false)
     private Date updateTime;
 
     /**
      * 有效标识(VALIDFLAG,VARCHAR,1)
      */
-    @ApiModelProperty(value="有效标识",required=false)
+    @ApiModelProperty(value = "有效标识", required = false)
     private String validflag;
 
     /**
      * 合同行号(ORDER_LINE_NO,VARCHAR,60)
      */
-    @ApiModelProperty(value="合同行号",required=false)
+    @ApiModelProperty(value = "合同行号", required = false)
     private String orderLineNo;
 
     /**
      * 直径(DIAMETER,DECIMAL,0)
      */
-    @ApiModelProperty(value="直径",required=false)
+    @ApiModelProperty(value = "直径", required = false)
     private Short diameter;
 
     /**
      * 收货单位(FINAL_USER,VARCHAR,50)
      */
-    @ApiModelProperty(value="收货单位",required=false)
+    @ApiModelProperty(value = "收货单位", required = false)
     private String finalUser;
 
     /**
      * 目的地(收货地址)(DESTINATION,VARCHAR,100)
      */
-    @ApiModelProperty(value="目的地(收货地址)",required=false)
+    @ApiModelProperty(value = "目的地(收货地址)", required = false)
     private String destination;
 
     /**
      * 贸易类型2018(ISOUT,VARCHAR,1)
      */
-    @ApiModelProperty(value="贸易类型2018",required=false)
+    @ApiModelProperty(value = "贸易类型2018", required = false)
     private String isout;
 
     /**
      * 申请人(APPLICANT_NAME,VARCHAR,20)
      */
-    @ApiModelProperty(value="申请人",required=false)
+    @ApiModelProperty(value = "申请人", required = false)
     private String applicantName;
 
     /**
      * 申请时间(APPLICANT_TIME,TIMESTAMP,7)
      */
-    @ApiModelProperty(value="申请时间",required=false)
+    @ApiModelProperty(value = "申请时间", required = false)
     private Date applicantTime;
 
     /**
      * 确认人(AFFRIM_NAME,VARCHAR,20)
      */
-    @ApiModelProperty(value="确认人",required=false)
+    @ApiModelProperty(value = "确认人", required = false)
     private String affrimName;
 
     /**
      * 确认时间(AFFRIM_TIME,TIMESTAMP,7)
      */
-    @ApiModelProperty(value="确认时间",required=false)
+    @ApiModelProperty(value = "确认时间", required = false)
     private Date affrimTime;
 
     /**
      * 交货日期(DELVRY_EDATE,TIMESTAMP,7)
      */
-    @ApiModelProperty(value="交货日期",required=false)
+    @ApiModelProperty(value = "交货日期", required = false)
     private Date delvryEdate;
 
     /**
      * 收货单位描述(FINAL_USER_DESC,VARCHAR,100)
      */
-    @ApiModelProperty(value="收货单位描述",required=false)
+    @ApiModelProperty(value = "收货单位描述", required = false)
     private String finalUserDesc;
 
     /**
      * 运输方式('2010')(TRANSIT_TYP,VARCHAR,20)
      */
-    @ApiModelProperty(value="运输方式('2010')",required=false)
+    @ApiModelProperty(value = "运输方式('2010')", required = false)
     private String transitTyp;
 
     /**
      * 车船号(SHIP_CAR_NO,VARCHAR,50)
      */
-    @ApiModelProperty(value="车船号",required=false)
+    @ApiModelProperty(value = "车船号", required = false)
     private String shipCarNo;
 
     /**
      * 备注(MEMO,VARCHAR,500)
      */
-    @ApiModelProperty(value="备注",required=false)
+    @ApiModelProperty(value = "备注", required = false)
     private String memo;
 
     /**
      * 打印次数,提货单打印状态(0未打印1打印2作废)(PRINT_NUMBER,DECIMAL,0)
      */
-    @ApiModelProperty(value="打印次数,提货单打印状态(0未打印1打印2作废)",required=false)
+    @ApiModelProperty(value = "打印次数,提货单打印状态(0未打印1打印2作废)", required = false)
     private Short printNumber;
 
     /**
      * 审批人(PLAN_SEND_MAN,VARCHAR,20)
      */
-    @ApiModelProperty(value="审批人",required=false)
+    @ApiModelProperty(value = "审批人", required = false)
     private String planSendMan;
 
     /**
      * 审批时间(PLAN_SEND_TIME,TIMESTAMP,7)
      */
-    @ApiModelProperty(value="审批时间",required=false)
+    @ApiModelProperty(value = "审批时间", required = false)
     private Date planSendTime;
 
     /**
      * 退货人(PLAN_RECEIVE_MAN,VARCHAR,20)
      */
-    @ApiModelProperty(value="退货人",required=false)
+    @ApiModelProperty(value = "退货人", required = false)
     private String planReceiveMan;
 
     /**
      * 退货时间(PLAN_RECEIVE_TIME,TIMESTAMP,7)
      */
-    @ApiModelProperty(value="退货时间",required=false)
+    @ApiModelProperty(value = "退货时间", required = false)
     private Date planReceiveTime;
 
     /**
      * 单据完成人(PLAN_OVER_MAN,VARCHAR,20)
      */
-    @ApiModelProperty(value="单据完成人",required=false)
+    @ApiModelProperty(value = "单据完成人", required = false)
     private String planOverMan;
 
     /**
      * 单据完成时间(PLAN_OVER_TIME,TIMESTAMP,7)
      */
-    @ApiModelProperty(value="单据完成时间",required=false)
+    @ApiModelProperty(value = "单据完成时间", required = false)
     private Date planOverTime;
 
     /**
      * 承运单位('1109')(CARRIER_UNIT,VARCHAR,20)
      */
-    @ApiModelProperty(value="承运单位('1109')",required=false)
+    @ApiModelProperty(value = "承运单位('1109')", required = false)
     private String carrierUnit;
 
     /**
      * 订货价(牌价)(ORDER_PRICE,DECIMAL,0)
      */
-    @ApiModelProperty(value="订货价(牌价)",required=false)
+    @ApiModelProperty(value = "订货价(牌价)", required = false)
     private Short orderPrice;
 
     /**
      * 供货单位(SUPPLY_UNIT,VARCHAR,10)
      */
-    @ApiModelProperty(value="供货单位",required=false)
+    @ApiModelProperty(value = "供货单位", required = false)
     private String supplyUnit;
 
     /**
      * 物料编号(PROD_CODE,VARCHAR,50)
      */
-    @ApiModelProperty(value="物料编号",required=false)
+    @ApiModelProperty(value = "物料编号", required = false)
     private String prodCode;
 
     /**
      * 已出件数(OUTQUANTITY,DECIMAL,38)
      */
-    @ApiModelProperty(value="已出件数",required=false)
+    @ApiModelProperty(value = "已出件数", required = false)
     private BigDecimal outquantity;
 
     /**
      * 已出重量(OUTWEIGHT,DECIMAL,13)
      */
-    @ApiModelProperty(value="已出重量",required=false)
+    @ApiModelProperty(value = "已出重量", required = false)
     private BigDecimal outweight;
 
     /**
      * 退货件数(OVERQUANTITY,DECIMAL,38)
      */
-    @ApiModelProperty(value="退货件数",required=false)
+    @ApiModelProperty(value = "退货件数", required = false)
     private BigDecimal overquantity;
 
     /**
      * 单价(PRICE,DECIMAL,12)
      */
-    @ApiModelProperty(value="单价",required=false)
+    @ApiModelProperty(value = "单价", required = false)
     private BigDecimal price;
 
     /**
      * 成品牌号(STEEL_NAME,VARCHAR,50)
      */
-    @ApiModelProperty(value="成品牌号",required=false)
+    @ApiModelProperty(value = "成品牌号", required = false)
     private String steelName;
 
     /**
      * 成品规格(SPEC_NAME,VARCHAR,50)
      */
-    @ApiModelProperty(value="成品规格",required=false)
+    @ApiModelProperty(value = "成品规格", required = false)
     private String specName;
 
     /**
      * 公司名字(BODYNAME,VARCHAR,50)
      */
-    @ApiModelProperty(value="公司名字",required=false)
+    @ApiModelProperty(value = "公司名字", required = false)
     private String bodyname;
 
     /**
      * 业务类型(BUSINAME,VARCHAR,50)
      */
-    @ApiModelProperty(value="业务类型",required=false)
+    @ApiModelProperty(value = "业务类型", required = false)
     private String businame;
 
     /**
      * 退货重量(OVERWEIGHT,DECIMAL,13)
      */
-    @ApiModelProperty(value="退货重量",required=false)
+    @ApiModelProperty(value = "退货重量", required = false)
     private BigDecimal overweight;
 
     /**
      * 退货原因(OVERMEMO,VARCHAR,100)
      */
-    @ApiModelProperty(value="退货原因",required=false)
+    @ApiModelProperty(value = "退货原因", required = false)
     private String overmemo;
 
     /**
      * 老系统编码备注(WMEMO,VARCHAR,100)
      */
-    @ApiModelProperty(value="老系统编码备注",required=false)
+    @ApiModelProperty(value = "老系统编码备注", required = false)
     private String wmemo;
 
     /**
      * NC订单唯一码(CORDER_BID,VARCHAR,100)
      */
-    @ApiModelProperty(value="NC订单唯一码",required=false)
+    @ApiModelProperty(value = "NC订单唯一码", required = false)
     private String corderBid;
 
     private static final long serialVersionUID = 1L;

src/main/java/com/steerinfo/dil/service/IDilVersionService.java

@@ -2,6 +2,7 @@ package com.steerinfo.dil.service;
 
 /**
  * DilVersion服务接口：
+ *
  * @author generator
  * @version 1.0-SNAPSHORT 2021-12-14 10:05
  * 类描述
@@ -10,10 +11,10 @@ package com.steerinfo.dil.service;
  * 作者：generator
  * 参考：
  * 描述：DilVersion服务接口
- * @see null
  * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ * @see null
  */
-public interface IDilVersionService{
+public interface IDilVersionService {
 
     String getAppVersion();
 

src/main/java/com/steerinfo/dil/service/ISystemFileService.java

@@ -9,6 +9,7 @@ import java.math.BigDecimal;
 
 /**
  * SystemFile服务接口：
+ *
  * @author generator
  * @version 1.0-SNAPSHORT 2023-10-30 09:19
  * 类描述
@@ -17,10 +18,10 @@ import java.math.BigDecimal;
  * 作者：generator
  * 参考：
  * 描述：SystemFile服务接口
- * @see null
  * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ * @see null
  */
-public interface ISystemFileService extends IBaseService<SystemFile, String>{
+public interface ISystemFileService extends IBaseService<SystemFile, String> {
 
     SystemFile insertFile(SystemFile systemFile);
 

src/main/java/com/steerinfo/dil/service/RmsReceivingCompanyService.java

@@ -9,12 +9,14 @@ import java.util.Map;
 public interface RmsReceivingCompanyService {
     /**
      * 查询收款客户
+     *
      * @return 名称列表
      */
     List<String> queryRmsReceivingCompanyName();
 
     /**
      * 查询收款客户
+     *
      * @return 编号名称列表
      */
     List<Map<String, Object>> queryRmsReceivingCompanyMap();

src/main/java/com/steerinfo/dil/service/UniversalService.java

@@ -15,5 +15,5 @@ public interface UniversalService {
 
     int updateColumnShowHidden(Map<String, Object> map);
 
-    Map<String,Object> getColumShowHideScheme(Map<String, Object> map);
+    Map<String, Object> getColumShowHideScheme(Map<String, Object> map);
 }

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

@@ -15,5 +15,4 @@ import java.util.*;
 public class BackgroundProcessingServiceImpl implements IBackgroundProcessService {
 
 
-
 }

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

@@ -10,6 +10,7 @@ import java.util.Date;
 
 /**
  * DilVersion服务实现：
+ *
  * @author generator
  * @version 1.0-SNAPSHORT 2021-12-14 10:05
  * 类描述
@@ -18,8 +19,8 @@ import java.util.Date;
  * 作者：generator
  * 参考：
  * 描述：DilVersion服务实现
- * @see null
  * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ * @see null
  */
 @Service(value = "dilVersionService")
 public class DilVersionServiceImpl implements IDilVersionService {
@@ -30,31 +31,34 @@ public class DilVersionServiceImpl implements IDilVersionService {
 
     /**
      * 查询最新版本号
+     *
      * @return 版本号
      */
-    public String getAppVersion(){
+    public String getAppVersion() {
         //查找当前最新版本号
-        return  dilVersionMapper.getAppVersion();
+        return dilVersionMapper.getAppVersion();
     }
 
     /**
      * 查询PDA最新版本号
+     *
      * @return
      */
-    public String getPDAVersion(){
+    public String getPDAVersion() {
         //查询PDA当前最新版本号
         return dilVersionMapper.getPDAVersion();
     }
 
     /**
      * 添加APP版本号
+     *
      * @param version
      * @return
      */
-    public String addAppVersion(String version){
+    public String addAppVersion(String version) {
         //判断该版本号是否已存在
         Integer versionId = dilVersionMapper.getVersionId(version);
-        if(versionId != null){
+        if (versionId != null) {
             return "版本号已存在";
         }
         DilVersion dilVersion = new DilVersion();

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

@@ -24,7 +24,7 @@ public class RmsReceivingCompanyServiceImpl implements RmsReceivingCompanyServic
     public List<String> queryRmsReceivingCompanyName() {
         List<String> receivingCompany = new ArrayList<>();
         List<RmsReceivingCompany> list = rmsReceivingCompanyMapper.selectAll();
-        if(null != list && !list.isEmpty()){
+        if (null != list && !list.isEmpty()) {
             for (RmsReceivingCompany rmsReceivingCompany : list) {
                 receivingCompany.add(rmsReceivingCompany.getCompanyName());
             }
@@ -36,7 +36,7 @@ public class RmsReceivingCompanyServiceImpl implements RmsReceivingCompanyServic
     public List<Map<String, Object>> queryRmsReceivingCompanyMap() {
         List<Map<String, Object>> receivingCompany = new ArrayList<>();
         List<RmsReceivingCompany> list = rmsReceivingCompanyMapper.selectAll();
-        if(null != list && !list.isEmpty()){
+        if (null != list && !list.isEmpty()) {
             for (RmsReceivingCompany rmsReceivingCompany : list) {
                 Map<String, Object> map = new HashMap<>(4);
                 map.put("values1", rmsReceivingCompany.getCompanyCode());

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

@@ -7,11 +7,13 @@ import com.steerinfo.dil.mapper.SystemFileMapper;
 import com.steerinfo.dil.service.ISystemFileService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+
 import java.util.Date;
 import java.math.BigDecimal;
 
 /**
  * SystemFile服务实现：
+ *
  * @author generator
  * @version 1.0-SNAPSHORT 2023-10-30 09:19
  * 类描述
@@ -20,8 +22,8 @@ import java.math.BigDecimal;
  * 作者：generator
  * 参考：
  * 描述：SystemFile服务实现
- * @see null
  * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ * @see null
  */
 @Service(value = "systemFileService")
 public class SystemFileServiceImpl extends BaseServiceImpl<SystemFile, String> implements ISystemFileService {
@@ -37,9 +39,9 @@ public class SystemFileServiceImpl extends BaseServiceImpl<SystemFile, String> i
     @Override
     public SystemFile insertFile(SystemFile systemFile) {
         SystemFile s = systemFileMapper.insertAll(systemFile);
-        if (s!=null){
+        if (s != null) {
             return s;
-        }else {
+        } else {
             return null;
         }
 

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

@@ -1,4 +1,5 @@
 package com.steerinfo.dil.service.impl;
+
 import com.alibaba.fastjson.JSON;
 import com.steerinfo.dil.feign.AmsFeign;
 import com.steerinfo.dil.mapper.DilRoleOrgcodeTableMapper;
@@ -39,7 +40,6 @@ public class UniversalServiceImpl implements UniversalService {
     private DilTableColumnRoleMapper dilTableColumnRoleMapper;
 
 
-
     @Autowired
     private AmsFeign amsFeign;
 
@@ -47,20 +47,20 @@ public class UniversalServiceImpl implements UniversalService {
     @Override
     public Map<String, Object> getColumnShowHidden(Map<String, Object> map) {
         Map<String, Object> responseMap = new HashMap<>();
-        List<Map<String,Object>> columnShowData = universalMapper.getColumnShowData(map);
-        List<Map<String,Object>> columnAllData = universalMapper.getColumnAllData(map);
+        List<Map<String, Object>> columnShowData = universalMapper.getColumnShowData(map);
+        List<Map<String, Object>> columnAllData = universalMapper.getColumnAllData(map);
         List<String> columnHiddenData = universalMapper.getColumnHiddenData(map);
-        responseMap.put("columnShowData",columnShowData);
-        responseMap.put("columnAllData",columnAllData);
-        responseMap.put("columnHiddenData",columnHiddenData);
+        responseMap.put("columnShowData", columnShowData);
+        responseMap.put("columnAllData", columnAllData);
+        responseMap.put("columnHiddenData", columnHiddenData);
         return responseMap;
     }
 
     @Override
     public synchronized int updateColumnShowHidden(Map<String, Object> map) {
-        int i = 0 ;
+        int i = 0;
         //首先删除原来的列
-        if("默认方案".equals(map.get("schemeName"))) {
+        if ("默认方案".equals(map.get("schemeName"))) {
             dilRoleOrgcodeTableMapper.updateEnableStatus(map);
             return 0;
         }
@@ -69,7 +69,7 @@ public class UniversalServiceImpl implements UniversalService {
         List<DilRoleOrgcodeTable> mapList = new ArrayList<>();
         for (String s : columnHiddenData) {
             DilRoleOrgcodeTable dilRoleOrgcodeTable = new DilRoleOrgcodeTable();
-            BigDecimal columnId = dilTableColumnRoleMapper.selectColumnId(s,map.get("tableName").toString());
+            BigDecimal columnId = dilTableColumnRoleMapper.selectColumnId(s, map.get("tableName").toString());
             dilRoleOrgcodeTable.setColumnId(columnId);
             dilRoleOrgcodeTable.setUserName(map.get("userName").toString());
             dilRoleOrgcodeTable.setOrgCode(map.get("orgCode").toString());
@@ -80,7 +80,7 @@ public class UniversalServiceImpl implements UniversalService {
         }
         //将该用户的所有方案都变成未启用状
         dilRoleOrgcodeTableMapper.updateEnableStatus(map);
-        if(mapList.size() > 0) {
+        if (mapList.size() > 0) {
             //然后再批量新增进去
             i += dilRoleOrgcodeTableMapper.batchInsert(mapList);
         }
@@ -88,45 +88,45 @@ public class UniversalServiceImpl implements UniversalService {
     }
 
     @Override
-    public Map<String,Object> getColumShowHideScheme(Map<String, Object> map) {
+    public Map<String, Object> getColumShowHideScheme(Map<String, Object> map) {
         Map<String, Object> responseMap = new HashMap<>();
-        List<Map<String,Object>> schemeList = new ArrayList<>();
+        List<Map<String, Object>> schemeList = new ArrayList<>();
         //每一个map;
-        Map<String,Object> schemeMap = new HashMap<>();
+        Map<String, Object> schemeMap = new HashMap<>();
         //作为传值用的map
-        Map<String,Object> attrMap = new HashMap<>();
+        Map<String, Object> attrMap = new HashMap<>();
         //当前启用状态的值
         String activeName = "默认方案";
         //以下是方案的标题和名字
-        schemeMap.put("title","默认方案");
-        schemeMap.put("name","默认方案");
+        schemeMap.put("title", "默认方案");
+        schemeMap.put("name", "默认方案");
         //以下是方案的显示数据和隐藏数据
-        List<Map<String,Object>> columnAllData = universalMapper.getColumnAllData(map);
-        schemeMap.put("columnAllData",columnAllData);
-        responseMap.put("columnAllData",columnAllData);
-        attrMap.put("tableName",map.get("tableName"));
-        map.put("schemeName",activeName);
+        List<Map<String, Object>> columnAllData = universalMapper.getColumnAllData(map);
+        schemeMap.put("columnAllData", columnAllData);
+        responseMap.put("columnAllData", columnAllData);
+        attrMap.put("tableName", map.get("tableName"));
+        map.put("schemeName", activeName);
         List<String> columnHiddenData = universalMapper.getColumnHiddenData(map);
-        schemeMap.put("columnHiddenData",columnHiddenData);
+        schemeMap.put("columnHiddenData", columnHiddenData);
         schemeList.add(schemeMap);
-        responseMap.put("activeName",activeName);
-        responseMap.put("columnHiddenData",columnHiddenData);
+        responseMap.put("activeName", activeName);
+        responseMap.put("columnHiddenData", columnHiddenData);
         //然后根据用户名和报表名称,去查询方案名称和启用状态
-        List<Map<String,Object>> schemeMapAnotherData = universalMapper.getColumnAllScheme(map);
-        for(Map<String,Object> schemeMapAnotherDataMap : schemeMapAnotherData) {
-                Map<String, Object> itemMap = new HashMap<>();
-                itemMap.put("title",schemeMapAnotherDataMap.get("schemeName"));
-                itemMap.put("name",schemeMapAnotherDataMap.get("schemeName"));
-                itemMap.put("columnAllData",columnAllData);
-                List<String> itemColumnHiddenData = universalMapper.getColumnHiddenData(schemeMapAnotherDataMap);
-                itemMap.put("columnHiddenData",itemColumnHiddenData);
-                schemeList.add(itemMap);
-                if(DataChange.dataToBigDecimal(schemeMapAnotherDataMap.get("enableStatus")).compareTo(new BigDecimal(1)) == 0){
-                    responseMap.put("activeName",schemeMapAnotherDataMap.get("schemeName"));
-                    responseMap.put("columnHiddenData",itemColumnHiddenData);
-                }
+        List<Map<String, Object>> schemeMapAnotherData = universalMapper.getColumnAllScheme(map);
+        for (Map<String, Object> schemeMapAnotherDataMap : schemeMapAnotherData) {
+            Map<String, Object> itemMap = new HashMap<>();
+            itemMap.put("title", schemeMapAnotherDataMap.get("schemeName"));
+            itemMap.put("name", schemeMapAnotherDataMap.get("schemeName"));
+            itemMap.put("columnAllData", columnAllData);
+            List<String> itemColumnHiddenData = universalMapper.getColumnHiddenData(schemeMapAnotherDataMap);
+            itemMap.put("columnHiddenData", itemColumnHiddenData);
+            schemeList.add(itemMap);
+            if (DataChange.dataToBigDecimal(schemeMapAnotherDataMap.get("enableStatus")).compareTo(new BigDecimal(1)) == 0) {
+                responseMap.put("activeName", schemeMapAnotherDataMap.get("schemeName"));
+                responseMap.put("columnHiddenData", itemColumnHiddenData);
+            }
         }
-        responseMap.put("schemeList",schemeList);
+        responseMap.put("schemeList", schemeList);
         return responseMap;
     }
 }

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

@@ -45,11 +45,11 @@ public class BaseRESTfulController extends BaseController {
     }
 
     protected RESTfulResult failed() {
-        return this.failed((Object)null);
+        return this.failed((Object) null);
     }
 
     protected RESTfulResult failed(Object obj) {
-        RESTfulResult result = new RESTfulResult("201", (String)null);
+        RESTfulResult result = new RESTfulResult("201", (String) null);
         result.setMessage(result.getResultMessage());
         result.setData(obj);
         return result;
@@ -69,7 +69,7 @@ public class BaseRESTfulController extends BaseController {
     }
 
     protected RESTfulResult loginFailed(String msg) {
-        RESTfulResult result = new RESTfulResult("500",msg);
+        RESTfulResult result = new RESTfulResult("500", msg);
         return result;
     }
 }

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

@@ -25,7 +25,7 @@ public class ColumnDataUtil {
         return setString;
     }
 
-    public PageListAdd tableColumnData(Integer apiId, List<Map<String,Object>> data) {
+    public PageListAdd tableColumnData(Integer apiId, List<Map<String, Object>> data) {
         List<Map<String, Object>> columnDataList = columnDataFeign.getColumnData(apiId);
         for (Map<String, Object> columnData : columnDataList) {
             //每个表头字段的过滤条件
@@ -36,8 +36,8 @@ public class ColumnDataUtil {
         return pageList;
     }
 
-    public PageListAdd tableColumnDataByUserId(Integer apiId, List<Map<String, Object>> list, List<Map<String,Object>> data, String userId) {
-        List<Map<String, Object>> columnDataList = columnDataFeign.getColumnDataByUserId(apiId,userId);
+    public PageListAdd tableColumnDataByUserId(Integer apiId, List<Map<String, Object>> list, List<Map<String, Object>> data, String userId) {
+        List<Map<String, Object>> columnDataList = columnDataFeign.getColumnDataByUserId(apiId, userId);
 //        for (Map<String, Object> columnData : columnDataList) {
 //            //每个表头字段的过滤条
 //            columnData.put("filters", setListMap(data, columnData.get("prop").toString()));

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

@@ -25,38 +25,40 @@ import java.util.regex.Pattern;
 public class DataChange {
 
     static String tempDir = "/temp/";
+
     /**
      * 时间转换类
      * 处理了三种类型 yyyy-MM-dd HH:mm:ss  yyyy/MM/dd HH:mm:ss  时间戳类型（带毫秒数时间戳13位）
+     *
      * @param vueDate
      * @return
      */
-    public static Date dataToDate(Object vueDate){
-        if(vueDate instanceof Date){
+    public static Date dataToDate(Object vueDate) {
+        if (vueDate instanceof Date) {
             return (Date) vueDate;
-        } else if(vueDate instanceof Long){
-            return  new Date((Long)vueDate);
+        } else if (vueDate instanceof Long) {
+            return new Date((Long) vueDate);
         } else {
             try {
                 String str = String.valueOf(vueDate);
-                if(judgeNumber(str) && str.length() == 13){
+                if (judgeNumber(str) && str.length() == 13) {
                     return new Date(Long.parseLong(str));
-                }else if(str.contains("-")){
-                    if(str.length() == "yyyy-MM-dd".length()){
+                } else if (str.contains("-")) {
+                    if (str.length() == "yyyy-MM-dd".length()) {
                         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
                         return sdf.parse(str);
                     }
                     SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                     return sdf.parse(str);
-                }else if(str.contains("/")){
-                    if(str.length() == "yyyy/MM/dd".length()){
+                } else if (str.contains("/")) {
+                    if (str.length() == "yyyy/MM/dd".length()) {
                         SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd");
                         return sdf.parse(str);
                     }
                     SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
                     return sdf.parse(str);
                 }
-            }catch (Exception e){
+            } catch (Exception e) {
                 System.out.println("时间解析错误！返回null");
                 return null;
             }
@@ -66,10 +68,11 @@ public class DataChange {
 
     /**
      * 判断是否纯数字（不带小数点）仅供上面方法使用
+     *
      * @param str
      * @return
      */
-    public static boolean judgeNumber(String str){
+    public static boolean judgeNumber(String str) {
         Pattern pattern = Pattern.compile("^[-\\+]?[\\d]*$");
         return pattern.matcher(str).matches();
     }
@@ -77,17 +80,18 @@ public class DataChange {
 
     /**
      * 数据转换成BigDecimal
+     *
      * @param data
      * @return
      */
-    public static BigDecimal dataToBigDecimal(Object data){
-        if (data != null){
-            if(data instanceof BigDecimal){
+    public static BigDecimal dataToBigDecimal(Object data) {
+        if (data != null) {
+            if (data instanceof BigDecimal) {
                 return (BigDecimal) data;
-            }else{
+            } else {
                 String str = String.valueOf(data);
                 BigDecimal decimal = BigDecimal.ZERO;
-                if(!"".equals(str)){
+                if (!"".equals(str)) {
                     try {
                         decimal = new BigDecimal(str);
                     } catch (Exception e) {
@@ -103,18 +107,19 @@ public class DataChange {
 
     /**
      * 将时间截取到天  为字符串类型 用于前端只显示到天
+     *
      * @param date 传入时间
      * @return
      */
     public static Date dataToDayDate(Object date) {
-        try{
+        try {
             Date origin = dataToDate(date);
             SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-            if(origin == null) {
+            if (origin == null) {
                 return null;
             }
             return sdf.parse(sdf.format(origin));
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return null;
         }
@@ -122,17 +127,18 @@ public class DataChange {
 
     /**
      * 查询日期是否过期,过期则返回 true
+     *
      * @param day 传入时间
      * @return
      */
     public static boolean isExpireDay(Object day) {
-        try{
-            if(dataToDayDate(day).getTime() < dataToDayDate(new Date()).getTime()){
+        try {
+            if (dataToDayDate(day).getTime() < dataToDayDate(new Date()).getTime()) {
                 return true;
-            }else{
+            } else {
                 return false;
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return true;
         }
@@ -141,11 +147,12 @@ public class DataChange {
 
     /**
      * 遍历列表使只显示两位小数
+     *
      * @param list
      * @param key
      */
-    public static void dataTo2Number(List<Map<String, Object>> list, String ...key){
-        DecimalFormat df =  new DecimalFormat("0.00");
+    public static void dataTo2Number(List<Map<String, Object>> list, String... key) {
+        DecimalFormat df = new DecimalFormat("0.00");
         //遍历List
         for (Map<String, Object> map : list) {
             for (String s : key) {
@@ -163,13 +170,14 @@ public class DataChange {
 
     /**
      * 计算相差时间  日时分秒
+     *
      * @param
      * @return
      */
-    public static String calculatedTimeDifference(Date time1, Date time2){
+    public static String calculatedTimeDifference(Date time1, Date time2) {
         long t1 = time1.getTime();
         long t2 = time2.getTime();
-        if(t1 > t2){
+        if (t1 > t2) {
             long temp = t1;
             t1 = t2;
             t2 = temp;
@@ -179,16 +187,17 @@ public class DataChange {
         long hour = (between / (60 * 60 * 1000) - day * 24);
         long min = ((between / (60 * 1000)) - day * 24 * 60 - hour * 60);
         long s = (between / 1000 - day * 24 * 60 * 60 - hour * 60 * 60 - min * 60);
-        return day + "天"+  + hour+ "时" + min + "分"  + s + "秒";
+        return day + "天" + +hour + "时" + min + "分" + s + "秒";
     }
 
     /**
      * 生成带时间的八位数顺序号
+     *
      * @param start 前缀
-     * @param id 顺序号  主键Id
+     * @param id    顺序号  主键Id
      * @return
      */
-    public static String generateEightDigitsNumber(String start, Integer id){
+    public static String generateEightDigitsNumber(String start, Integer id) {
         id = id % 100000000; //保证不超过
         SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
         StringBuilder sb = new StringBuilder(start + sdf.format(new Date()));
@@ -207,15 +216,16 @@ public class DataChange {
 
     /**
      * 根据时间段查询数据 支持只选择单个时间
-     * @Author TXF
-     * @Date 2022/1/10 23:21
+     *
      * @param startTime
      * @param endTime
      * @param map
      * @param sdf
      * @return
+     * @Author TXF
+     * @Date 2022/1/10 23:21
      **/
-    public static void queryDataByDate(String startTime, String endTime, Map<String, Object> map, SimpleDateFormat sdf){
+    public static void queryDataByDate(String startTime, String endTime, Map<String, Object> map, SimpleDateFormat sdf) {
         if (startTime != null && !"null".equals(startTime) && endTime != null && !"null".equals(endTime)) {
             map.put("startDate", sdf.format(new Date(Long.parseLong(startTime))));
             map.put("endDate", sdf.format(new Date(Long.parseLong(endTime) + 86400000)));
@@ -230,28 +240,29 @@ public class DataChange {
 
     /**
      * 只支持两个时间查询
-     * @Author TXF
-     * @Date 2022/1/15 9:08
+     *
      * @param startTime
      * @param endTime
      * @param sdf
      * @return
+     * @Author TXF
+     * @Date 2022/1/15 9:08
      **/
-    public static void queryDataByDateTime(String startTime, String endTime, Map<String, Object> map,SimpleDateFormat sdf){
+    public static void queryDataByDateTime(String startTime, String endTime, Map<String, Object> map, SimpleDateFormat sdf) {
         SimpleDateFormat sdfDate = new SimpleDateFormat("yyyy-MM-dd");
         if (startTime != null && !"null".equals(startTime) && endTime != null && !"null".equals(endTime)) {
             map.put("startDate", sdf.format(new Date(Long.parseLong(startTime))));
             map.put("endDate", sdf.format(new Date(Long.parseLong(endTime))));
         }
         //如果开始时间和结束时间有且只有一个为空 则只查那天的数据
-        else if((startTime != null && !"null".equals(startTime)) || (endTime != null && !"null".equals(endTime))){
-            if(startTime != null && !"null".equals(startTime)){
+        else if ((startTime != null && !"null".equals(startTime)) || (endTime != null && !"null".equals(endTime))) {
+            if (startTime != null && !"null".equals(startTime)) {
                 queryDataByTwoDateSon(map, startTime, sdfDate);
             }
-            if(endTime != null && !"null".equals(endTime)){
+            if (endTime != null && !"null".equals(endTime)) {
                 queryDataByTwoDateSon(map, endTime, sdfDate);
             }
-        }else {
+        } else {
             //如果两者时间都为空，则查询当天数据
             String nowDate = sdfDate.format(new Date());
             map.put("oneDate", nowDate + " 00:00:00");
@@ -260,14 +271,15 @@ public class DataChange {
 
     /**
      * 上面方法的儿子方法 如果只传入了一个时间 则查询那天的数据
-     * @Author TXF
-     * @Date 2022/1/17 16:17
+     *
      * @param map
      * @param time
      * @param sdfDate
      * @return
+     * @Author TXF
+     * @Date 2022/1/17 16:17
      **/
-    private static void queryDataByTwoDateSon(Map<String, Object> map, String time, SimpleDateFormat sdfDate){
+    private static void queryDataByTwoDateSon(Map<String, Object> map, String time, SimpleDateFormat sdfDate) {
         Date date1 = new Date(Long.parseLong(time));
         Date date2 = new Date(Long.parseLong(time) + 86400000);
         String dayStartTime = sdfDate.format(date1);
@@ -276,7 +288,7 @@ public class DataChange {
         map.put("endDate", dayEndTime + " 00:00:00");
     }
 
-    public static void getMonthStartEnd(Map<String,Object> map) {
+    public static void getMonthStartEnd(Map<String, Object> map) {
         //
         Calendar cale = Calendar.getInstance();
 
@@ -293,12 +305,12 @@ public class DataChange {
         cale.set(Calendar.DAY_OF_MONTH, 0);
         lastDay = format.format(cale.getTime());
         System.out.println("本月第一天和最后一天分别是 ： " + firstDay + " and " + lastDay);
-        map.put("firstDay",firstDay);
-        map.put("lastDay",lastDay);
+        map.put("firstDay", firstDay);
+        map.put("lastDay", lastDay);
 
     }
 
-    public static File paintWater(MultipartFile file, String text,int xOffset ,int yOffset)  throws Exception{
+    public static File paintWater(MultipartFile file, String text, int xOffset, int yOffset) throws Exception {
         //将文件对象转化为图片对象
         Image srcImg = ImageIO.read(file.getInputStream());
         //获取图片的宽
@@ -312,20 +324,20 @@ public class DataChange {
         //srcImg 为上面获取到的原始图片的图片对象
         graphics.drawImage(srcImg, 0, 0, srcImgWidth, srcImgHeight, null);
         //根据图片的背景设置水印颜色
-        graphics.setColor(new Color(255,0,0,255));
+        graphics.setColor(new Color(255, 0, 0, 255));
         //设置字体  画笔字体样式为微软雅黑，加粗，文字大小为60pt
         graphics.setFont(new Font("微软雅黑", Font.BOLD, 40));
         //设置水印的坐标
         int x = 0;
-        if(xOffset >= 0){
+        if (xOffset >= 0) {
             x = xOffset;
-        }else{
+        } else {
             x = srcImgWidth + (xOffset % srcImgWidth);
         }
         int y = 0;
-        if(yOffset >= 0){
+        if (yOffset >= 0) {
             y = yOffset;
-        }else {
+        } else {
             y = srcImgHeight + (yOffset % srcImgWidth);
         }
         //自定义水印 第一个参数是水印内容，第二个参数是x轴坐标，第三个参数是y轴坐标
@@ -336,7 +348,7 @@ public class DataChange {
         graphics.dispose();
         //待存储的地址
         File fileDir = new File(tempDir);
-        if(!fileDir.exists() || !fileDir.isDirectory()){
+        if (!fileDir.exists() || !fileDir.isDirectory()) {
             fileDir.mkdir();
         }
         String tarImgPath = tempDir + file.getOriginalFilename();

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

@@ -30,6 +30,7 @@ public class DateUtils {
         String str = new SimpleDateFormat("yyyy-mm-dd").format(date);
         return str;
     }
+
     /**
      * 字符串转换为日期 格式自定义
      *
@@ -38,7 +39,7 @@ public class DateUtils {
      * @return
      */
     public static Date StrDate(String date) {
-        SimpleDateFormat dateTimeFormat = new SimpleDateFormat ("yyyy-MM-dd");
+        SimpleDateFormat dateTimeFormat = new SimpleDateFormat("yyyy-MM-dd");
         String str = new SimpleDateFormat("yyyy-mm-dd").format(date);
         try {
             Date date1 = dateTimeFormat.parse(date);
@@ -52,10 +53,10 @@ public class DateUtils {
     /**
      * 时间戳转标准时间
      *
-     * @param stap   时间戳
+     * @param stap 时间戳
      * @return
      */
-    public static String stampToDate(String stap){
+    public static String stampToDate(String stap) {
         String time;
         try {
             if (stap == null || stap.length() == 0) {
@@ -64,11 +65,10 @@ public class DateUtils {
                 SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                 Date date = null;
                 try {
-                	long lt = new Long(stap);
-                	date = new Date(lt);
-                }
-                catch(Exception e) {
-                	date = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(stap);
+                    long lt = new Long(stap);
+                    date = new Date(lt);
+                } catch (Exception e) {
+                    date = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(stap);
                 }
                 time = simpleDateFormat.format(date);
             }
@@ -86,15 +86,15 @@ public class DateUtils {
      * @param offsetinfo 偏移量
      * @return
      */
-    public static Date offsetDate(Date time,String offsetinfo) {
+    public static Date offsetDate(Date time, String offsetinfo) {
         String[] offsetinfoarray = offsetinfo.split(",");
         Calendar cal = Calendar.getInstance();
         cal.setTime(time);
-        for (int i =0;i < offsetinfoarray.length;i++){
-            if(offsetinfoarray[i] != null && !"".equals(offsetinfoarray[i])){
+        for (int i = 0; i < offsetinfoarray.length; i++) {
+            if (offsetinfoarray[i] != null && !"".equals(offsetinfoarray[i])) {
                 String timegran = offsetinfoarray[i].substring(0, offsetinfoarray[i].length() - 2);
                 int offset = Integer.parseInt(offsetinfoarray[i].substring(offsetinfoarray[i].length() - 2));
-                switch (timegran){
+                switch (timegran) {
                     case "ss":
                         cal.add(Calendar.SECOND, offset);
                         break;
@@ -121,27 +121,24 @@ public class DateUtils {
 
     public static List<String> getMonitortime(String timegran, String time, String starttime) {
         List<String> list = new ArrayList<String>();
-        if("YEAR".equals(timegran)){
+        if ("YEAR".equals(timegran)) {
             list.add(time);
-        }
-        else{
+        } else {
             try {
                 Date d1 = new SimpleDateFormat("yyyy-MM-dd").parse(starttime);//定义开始日期
                 Date d2 = new SimpleDateFormat("yyyy-MM-dd").parse((Integer.parseInt(time) + 1) + "-01-01");//定义结束日期
                 Calendar dd = Calendar.getInstance();//定义日期实例
                 dd.setTime(d1);//设置日期起始时间
-                while(dd.getTime().before(d2)) {//判断是否到结束日期
+                while (dd.getTime().before(d2)) {//判断是否到结束日期
                     if ("MONTH".equals(timegran)) {
                         list.add(dateStr(dd.getTime(), "yyyy-MM"));
                         dd.add(Calendar.MONTH, 1);
-                    }
-                    else{
+                    } else {
                         list.add(dateStr(dd.getTime(), "yyyy-MM-dd"));
                         dd.add(Calendar.DAY_OF_YEAR, 1);
                     }
                 }
-            }
-            catch (ParseException e){
+            } catch (ParseException e) {
                 e.printStackTrace();
             }
         }
@@ -151,46 +148,48 @@ public class DateUtils {
     /**
      * 自动补全日期并返回新日期 偏移量自定义
      *
-     * @param time 时间
+     * @param time     时间
      * @param interval 偏移量
      * @return
      */
-    public static String changeTime(String time,int interval){
+    public static String changeTime(String time, int interval) {
         Calendar dd = Calendar.getInstance();
-        try{
-            if(time.length() == 4){
-                Date d = new SimpleDateFormat("yyyy-MM-dd").parse(time+"-01-01");
+        try {
+            if (time.length() == 4) {
+                Date d = new SimpleDateFormat("yyyy-MM-dd").parse(time + "-01-01");
                 dd.setTime(d);
                 dd.add(Calendar.YEAR, interval);
             }
-            if(time.length() == 7){
-                Date d = new SimpleDateFormat("yyyy-MM-dd").parse(time+"-01");
+            if (time.length() == 7) {
+                Date d = new SimpleDateFormat("yyyy-MM-dd").parse(time + "-01");
                 dd.setTime(d);
                 dd.add(Calendar.MONTH, interval);
             }
-            if(time.length() == 10){
+            if (time.length() == 10) {
                 Date d = new SimpleDateFormat("yyyy-MM-dd").parse(time);
                 dd.setTime(d);
                 dd.add(Calendar.DATE, interval);
             }
-        }
-        catch (ParseException e){
+        } catch (ParseException e) {
             e.printStackTrace();
         }
         return dateStr(dd.getTime(), "yyyy-MM-dd");
     }
+
     /**
      * 获取现在时间
+     *
      * @Param timeformat 时间格式
      * @return（String）格式自定义
      */
-    public static String getCurrentTime(String timeformat){
+    public static String getCurrentTime(String timeformat) {
         Date time = new Date();
         return dateStr(time, timeformat);
     }
 
     /**
      * 获取现在时间
+     *
      * @Param timeformat 时间格式
      * @return（Date）格式自定义
      */
@@ -200,8 +199,7 @@ public class DateUtils {
             String datestr = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(date);
             Date time = new SimpleDateFormat(timeformat).parse(datestr);
             return time;
-        }
-        catch (ParseException e){
+        } catch (ParseException e) {
             e.printStackTrace();
             return null;
         }
@@ -217,19 +215,20 @@ public class DateUtils {
     public static String dateToString(String date, String timeformat) {
         String Strtime = "";
         try {
-            if(date != null && !"".equals(date)) {
+            if (date != null && !"".equals(date)) {
                 Date parse = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(date + " 00:00:00");
                 Strtime = new SimpleDateFormat(timeformat).format(parse);
             }
-        }
-        catch (ParseException e) {
+        } catch (ParseException e) {
             e.printStackTrace();
         }
         return Strtime;
     }
+
     /**
      * 判断某天是否是该月的第一天
-     * @param  date
+     *
+     * @param date
      * @return
      */
     public static boolean isFirstDayOfMonth(Date date) {
@@ -238,25 +237,27 @@ public class DateUtils {
         System.out.println(calendar.get(Calendar.MONTH));
         return calendar.get(Calendar.DAY_OF_MONTH) == 1;
     }
-    public static String getDate(){
+
+    public static String getDate() {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         Date dt = null;
         String reStr = null;
         try {
-            dt = sdf.parse(DateUtils.dateStr(new Date(),"yyyy-MM-dd"));
+            dt = sdf.parse(DateUtils.dateStr(new Date(), "yyyy-MM-dd"));
             Calendar rightNow = Calendar.getInstance();
             rightNow.setTime(dt);
             rightNow.add(Calendar.DAY_OF_MONTH, -3);
             Date dt1 = rightNow.getTime();
-             reStr = sdf.format(dt1);
+            reStr = sdf.format(dt1);
         } catch (ParseException e) {
             e.printStackTrace();
         }
-        return reStr ;
+        return reStr;
     }
 
     /**
      * 根据月份得到当月天数
+     *
      * @param date
      * @return
      * @throws ParseException
@@ -267,8 +268,10 @@ public class DateUtils {
         calendar.setTime(sdf.parse(date));
         return calendar.getActualMaximum(Calendar.DAY_OF_MONTH);
     }
+
     /**
      * 根据月份得到当月天数
+     *
      * @param date
      * @return
      * @throws ParseException

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

@@ -0,0 +1,30 @@
+package com.steerinfo.dil.util;
+
+
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+@Component
+public class DisposeRoleData {
+
+    private static List<String> list = Arrays.asList("businessCompany", "approveBusinessCompany", "admin", "siji", "chengYunShang");
+
+
+    public List<String> disposeRoleData(Object roleCodes, Object companyList) {
+        //转数组
+        List<String> roleCodeList = (List<String>) roleCodes;
+        //
+        List<String> roleFinalList = new ArrayList<>();
+        //遍历数组
+        for (String roleCode : roleCodeList) {
+            if (list.contains(roleCode)) {
+                roleFinalList.add(roleCode);
+            }
+        }
+        return roleFinalList;
+    }
+}

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

@@ -9,13 +9,13 @@ import java.util.Map;
 public class ESUtil {
 
     // totalMap
-    public final Map<String,Object> totalMap = new HashMap<>();
+    public final Map<String, Object> totalMap = new HashMap<>();
     // context
-    public final Map<String,Object> context = new HashMap<>();
+    public final Map<String, Object> context = new HashMap<>();
     public final boolean logError = true;
     public final boolean logData = true;
     // context
-    public final Map<String,Object> login = new HashMap<>();
+    public final Map<String, Object> login = new HashMap<>();
     public final String password = "dgjt@kingdee";
     public final String dcName = "FDDGEAS85";
     public final String dbType = "1";
@@ -25,42 +25,46 @@ public class ESUtil {
 
     /**
      * 得到context的map
+     *
      * @return
      */
-    public Map<String,Object> getContext(){
-        this.context.put("logError",logError);
-        this.context.put("logData",logData);
+    public Map<String, Object> getContext() {
+        this.context.put("logError", logError);
+        this.context.put("logData", logData);
         return this.context;
     }
 
     /**
      * 得到login的map
+     *
      * @return
      */
-    public Map<String,Object> getLogin(){
-        this.login.put("password",password);
-        this.login.put("dcName",dcName);
-        this.login.put("dbType",dbType);
-        this.login.put("userName",userName);
+    public Map<String, Object> getLogin() {
+        this.login.put("password", password);
+        this.login.put("dcName", dcName);
+        this.login.put("dbType", dbType);
+        this.login.put("userName", userName);
         return this.login;
     }
 
     /**
      * 得到command字符串
+     *
      * @return
      */
-    public String getCommand(){
+    public String getCommand() {
         return this.command;
     }
 
     /**
      * 将所有的配置放入到totalMap的map里面
+     *
      * @return
      */
-    public Map<String,Object> getTotalMap() {
-        totalMap.put("context",getContext());
-        totalMap.put("login",getLogin());
-        totalMap.put("command",getCommand());
+    public Map<String, Object> getTotalMap() {
+        totalMap.put("context", getContext());
+        totalMap.put("login", getLogin());
+        totalMap.put("command", getCommand());
         return this.totalMap;
     }
 }

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

@@ -23,13 +23,14 @@ public class EasyExcelUitl {
 
     /**
      * 生成文件
+     *
      * @param excelHead
      * @param excelRows
      * @return
      */
-    private static byte[] createExcelFile(List<List<String>> excelHead, List<List<Object>> excelRows){
+    private static byte[] createExcelFile(List<List<String>> excelHead, List<List<Object>> excelRows) {
         try {
-            if(CollectionUtils.isNotEmpty(excelHead)){
+            if (CollectionUtils.isNotEmpty(excelHead)) {
                 ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
                 EasyExcel.write(outputStream).registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
                         .head(excelHead)
@@ -42,13 +43,15 @@ public class EasyExcelUitl {
         }
         return null;
     }
+
     /**
      * 生成文件（自定义头部排列）
+     *
      * @param rowHeads
      * @param excelRows
      * @return
      */
-    public static byte[] customerExportExcelFile(List<List<String>> rowHeads, List<List<Object>> excelRows){
+    public static byte[] customerExportExcelFile(List<List<String>> rowHeads, List<List<Object>> excelRows) {
         //将行头部转成easyexcel能识别的部分
         List<List<String>> excelHead = transferHead(rowHeads);
         return createExcelFile(excelHead, excelRows);
@@ -57,41 +60,46 @@ public class EasyExcelUitl {
 
     /**
      * 动态生成导出模版(单表头)
+     *
      * @param headColumns 列名称
-     * @return            excel文件流
+     * @return excel文件流
      */
-    public static byte[] exportTemplateExcelFile(List<String> headColumns){
+    public static byte[] exportTemplateExcelFile(List<String> headColumns) {
         List<List<String>> excelHead = Lists.newArrayList();
-        headColumns.forEach(columnName -> { excelHead.add(Lists.newArrayList(columnName)); });
+        headColumns.forEach(columnName -> {
+            excelHead.add(Lists.newArrayList(columnName));
+        });
         byte[] stream = createExcelFile(excelHead, new ArrayList<>());
         return stream;
     }
 
     /**
      * 动态生成模版(复杂表头)
-     * @param excelHead   列名称
+     *
+     * @param excelHead 列名称
      * @return
      */
-    public static byte[] exportTemplateExcelFileCustomHead(List<List<String>> excelHead){
+    public static byte[] exportTemplateExcelFileCustomHead(List<List<String>> excelHead) {
         byte[] stream = createExcelFile(excelHead, new ArrayList<>());
         return stream;
     }
 
     /**
      * 将行头部转成easyexcel能识别的部分
+     *
      * @param rowHeads
      * @return
      */
-    public static List<List<String>> transferHead(List<List<String>> rowHeads){
+    public static List<List<String>> transferHead(List<List<String>> rowHeads) {
         //将头部列进行反转
         List<List<String>> realHead = new ArrayList<>();
-        if(CollectionUtils.isNotEmpty(rowHeads)){
+        if (CollectionUtils.isNotEmpty(rowHeads)) {
             Map<Integer, List<String>> cellMap = new LinkedHashMap<>();
             //遍历行
             for (List<String> cells : rowHeads) {
                 //遍历列
                 for (int i = 0; i < cells.size(); i++) {
-                    if(cellMap.containsKey(i)){
+                    if (cellMap.containsKey(i)) {
                         cellMap.get(i).add(cells.get(i));
                     } else {
                         cellMap.put(i, Lists.newArrayList(cells.get(i)));
@@ -106,25 +114,26 @@ public class EasyExcelUitl {
 
     /**
      * 动态导出文件（通过map方式计算）
-     * @param headColumnMap  有序列头部
-     * @param dataList       数据体
+     *
+     * @param headColumnMap 有序列头部
+     * @param dataList      数据体
      * @return
      */
-    public static byte[] exportExcelFile(LinkedHashMap<String, String> headColumnMap, List<Map<String, Object>> dataList){
+    public static byte[] exportExcelFile(LinkedHashMap<String, String> headColumnMap, List<Map<String, Object>> dataList) {
         //获取列名称
         List<List<String>> excelHead = new ArrayList<>();
-        if(MapUtils.isNotEmpty(headColumnMap)){
+        if (MapUtils.isNotEmpty(headColumnMap)) {
             //key为匹配符，value为列名，如果多级列名用逗号隔开
             headColumnMap.entrySet().forEach(entry -> {
                 excelHead.add(Lists.newArrayList(entry.getValue().split(",")));
             });
         }
         List<List<Object>> excelRows = new ArrayList<>();
-        if(MapUtils.isNotEmpty(headColumnMap) && CollectionUtils.isNotEmpty(dataList)){
+        if (MapUtils.isNotEmpty(headColumnMap) && CollectionUtils.isNotEmpty(dataList)) {
             for (Map<String, Object> dataMap : dataList) {
                 List<Object> rows = new ArrayList<>();
                 headColumnMap.entrySet().forEach(headColumnEntry -> {
-                    if(dataMap.containsKey(headColumnEntry.getKey())){
+                    if (dataMap.containsKey(headColumnEntry.getKey())) {
                         Object data = dataMap.get(headColumnEntry.getKey());
                         rows.add(data);
                     }

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

@@ -21,7 +21,7 @@ import java.util.*;
 
 /**
  * @Author fubo
- * @Description  excel导入
+ * @Description excel导入
  * @Date 2020/6/10 8:46
  **/
 public class ExcelToolUtils {
@@ -168,30 +168,30 @@ public class ExcelToolUtils {
         Row row = null;
         Cell cell = null;
         // 循环读取
-        try{
-        for (int rowNum = startRow; rowNum <= lastRowNum; rowNum++) {
-            row = sheet.getRow(rowNum);
-            // 获取当前行的第一列和最后一列的标记(列数)
-            short firstCellNum = row.getFirstCellNum();//第一列从0开始
-            short lastCellNum = row.getLastCellNum();//最后一列
-            if (lastCellNum != 0) {
-                String[] rowArray = new String[lastCellNum];
-                for (int cellNum = firstCellNum; cellNum < lastCellNum; cellNum++) {
-                    cell = row.getCell(cellNum);
-                    // 判断单元格是否有数据
-                    if (cell == null) {
-                        rowArray[cellNum] = null;
-                    } else {
-                        rowArray[cellNum] = parseCell(cell);
+        try {
+            for (int rowNum = startRow; rowNum <= lastRowNum; rowNum++) {
+                row = sheet.getRow(rowNum);
+                // 获取当前行的第一列和最后一列的标记(列数)
+                short firstCellNum = row.getFirstCellNum();//第一列从0开始
+                short lastCellNum = row.getLastCellNum();//最后一列
+                if (lastCellNum != 0) {
+                    String[] rowArray = new String[lastCellNum];
+                    for (int cellNum = firstCellNum; cellNum < lastCellNum; cellNum++) {
+                        cell = row.getCell(cellNum);
+                        // 判断单元格是否有数据
+                        if (cell == null) {
+                            rowArray[cellNum] = null;
+                        } else {
+                            rowArray[cellNum] = parseCell(cell);
+                        }
+                    }
+                    if (rowArray[0] != null || !rowArray[0].equals("")) {
+                        result.add(rowArray);
                     }
-                }
-                if(rowArray[0] != null || !rowArray[0].equals("")){
-                    result.add(rowArray);
                 }
             }
-        }
 
-        } catch (Exception e){
+        } catch (Exception e) {
             throw new Exception("文件存在隐藏行或合并列！");
         }
         return result;
@@ -203,7 +203,7 @@ public class ExcelToolUtils {
      * @param inputStream 文件输入流, 要解析的Excel文件输入流
      * @param fileName    文件名.
      * @param startRow    从第几行开始读取数据.
-     * @return List<String []> 集合中的一个元素对应一行解析的数据.
+     * @return List<String [ ]> 集合中的一个元素对应一行解析的数据.
      * 元素为字符串数组类型. 数组中的每个元素对应一列数据.
      * @throws IOException
      */
@@ -228,7 +228,7 @@ public class ExcelToolUtils {
             throw new Exception("请选择xls或者xlsx文件!");
         }
         List<List<String[]>> result = new ArrayList<>();
-        for (int k = 0; k < workbook.getNumberOfSheets();k++) {
+        for (int k = 0; k < workbook.getNumberOfSheets(); k++) {
             // 获取工作表  excel分为若干个表. sheet
             Sheet sheet = workbook.getSheetAt(k);
 
@@ -287,7 +287,7 @@ public class ExcelToolUtils {
      */
     private static String parseCell(Cell cell) {
         //空返回空
-        if(cell == null){
+        if (cell == null) {
             return null;
         }
 
@@ -359,12 +359,6 @@ public class ExcelToolUtils {
     }
 
 
-   
-
-  
-   
-
-
     /**
      * 生成随机数：当前年月日时分秒+四位随机数
      *
@@ -411,8 +405,8 @@ public class ExcelToolUtils {
     }
 
     //截取字符串中数字-按MEs规则来（前八位位年月日，后面拼编号和英文做辨识）
-    public static String getNumberText(String str){
-        if(StringUtils.isBlank(str)){
+    public static String getNumberText(String str) {
+        if (StringUtils.isBlank(str)) {
             throw new RuntimeException("参数str不能为空");
         }
         StringBuffer number = new StringBuffer("");
@@ -423,18 +417,19 @@ public class ExcelToolUtils {
             //    number.append(string);
             //}
         }
-        return number.toString()+"XG";
+        return number.toString() + "XG";
     }
 
 
     /**
      * 获取Excel中的对象数组
+     *
      * @param file
      * @param startRow 默认0
      * @return
      * @throws Exception
      */
-    public static List<Map<String,Object>> getExcelList(MultipartFile file, int startRow)
+    public static List<Map<String, Object>> getExcelList(MultipartFile file, int startRow)
             throws Exception {
         File excel = multipartFileToFile(file);
         FileInputStream inputStream = null;
@@ -446,18 +441,18 @@ public class ExcelToolUtils {
             inputStream = new FileInputStream(excel);
         }
         //构建返回数组
-        List<Map<String,Object>> list = new ArrayList<>();
+        List<Map<String, Object>> list = new ArrayList<>();
         // 1. 创建工作簿
         Workbook workbook = null;
         // 2. 根据格式解析文件
         if (fileName.endsWith(".xls")) {
             workbook = new HSSFWorkbook(inputStream);
-        }else if(fileName.endsWith(".xlsx")){
+        } else if (fileName.endsWith(".xlsx")) {
             workbook = new XSSFWorkbook(inputStream);
-        }else {
+        } else {
             throw new Exception("请选择xls或者xlsx文件!");
         }
-        for (int sheetIndex = 0; sheetIndex < workbook.getNumberOfSheets();sheetIndex++) {
+        for (int sheetIndex = 0; sheetIndex < workbook.getNumberOfSheets(); sheetIndex++) {
             // 获取工作表  excel分为若干个表. sheet
             Sheet sheet = workbook.getSheetAt(sheetIndex);
             if (sheet == null) {
@@ -466,7 +461,7 @@ public class ExcelToolUtils {
             // 获取表格中最后一行的行号
             int lastRowNum = sheet.getLastRowNum();
             if (lastRowNum <= startRow) {
-                throw new Exception("第"+(sheetIndex+1)+"个工作簿无数据！请检查Excel！");
+                throw new Exception("第" + (sheetIndex + 1) + "个工作簿无数据！请检查Excel！");
             }
             // 定义行变量和单元格变量
             Row row = null;
@@ -487,27 +482,27 @@ public class ExcelToolUtils {
                         titles[cellNum] = parseCell(cell);
                     }
                 }
-            }else {
-                throw new Exception("第"+sheetIndex+"个工作簿无表头数据！请检查Excel！");
+            } else {
+                throw new Exception("第" + sheetIndex + "个工作簿无表头数据！请检查Excel！");
             }
             try {
                 //遍历除表头外的所有行
-                for (int rowNum = startRow+1; rowNum <= lastRowNum; rowNum++) {
+                for (int rowNum = startRow + 1; rowNum <= lastRowNum; rowNum++) {
                     row = sheet.getRow(rowNum);
-                    if(row == null){
+                    if (row == null) {
                         continue;
                     }
                     //遍历行的所有列
-                    Map<String,Object> item = new HashMap<>();
+                    Map<String, Object> item = new HashMap<>();
                     for (int cellNum = firstCellNum; cellNum < lastCellNum; cellNum++) {
                         cell = row.getCell(cellNum);
                         //获取表头对应数据
                         if (titles[cellNum] != null && !titles[cellNum].equals("")
-                                && cell !=null && !cell.toString().equals("")) {
-                            item.put(titles[cellNum],parseCell(cell));
+                                && cell != null && !cell.toString().equals("")) {
+                            item.put(titles[cellNum], parseCell(cell));
                         }
                     }
-                    if(item.keySet().toArray().length >0 ){
+                    if (item.keySet().toArray().length > 0) {
                         list.add(item);
                     }
                 }
@@ -519,7 +514,7 @@ public class ExcelToolUtils {
         return list;
     }
 
-    public static List<Map<String,Object>> getExcelList(MultipartFile file, int startRow,List<String> excelHead)
+    public static List<Map<String, Object>> getExcelList(MultipartFile file, int startRow, List<String> excelHead)
             throws Exception {
         File excel = multipartFileToFile(file);
         FileInputStream inputStream = null;
@@ -531,18 +526,18 @@ public class ExcelToolUtils {
             inputStream = new FileInputStream(excel);
         }
         //构建返回数组
-        List<Map<String,Object>> list = new ArrayList<>();
+        List<Map<String, Object>> list = new ArrayList<>();
         // 1. 创建工作簿
         Workbook workbook = null;
         // 2. 根据格式解析文件
         if (fileName.endsWith(".xls")) {
             workbook = new HSSFWorkbook(inputStream);
-        }else if(fileName.endsWith(".xlsx")){
+        } else if (fileName.endsWith(".xlsx")) {
             workbook = new XSSFWorkbook(inputStream);
-        }else {
+        } else {
             throw new Exception("请选择xls或者xlsx文件!");
         }
-        for (int sheetIndex = 0; sheetIndex < workbook.getNumberOfSheets();sheetIndex++) {
+        for (int sheetIndex = 0; sheetIndex < workbook.getNumberOfSheets(); sheetIndex++) {
             // 获取工作表  excel分为若干个表. sheet
             Sheet sheet = workbook.getSheetAt(sheetIndex);
             if (sheet == null) {
@@ -551,7 +546,7 @@ public class ExcelToolUtils {
             // 获取表格中最后一行的行号
             int lastRowNum = sheet.getLastRowNum();
             if (lastRowNum < startRow) {
-                throw new Exception("第"+(sheetIndex+1)+"个工作簿无数据！请检查Excel！");
+                throw new Exception("第" + (sheetIndex + 1) + "个工作簿无数据！请检查Excel！");
             }
             // 定义行变量和单元格变量
             Row row = null;
@@ -563,22 +558,22 @@ public class ExcelToolUtils {
             int lastCellNum = excelHead.size();//最后一列
             try {
                 //遍历除表头外的所有行
-                for (int rowNum = startRow+1; rowNum <= lastRowNum; rowNum++) {
+                for (int rowNum = startRow + 1; rowNum <= lastRowNum; rowNum++) {
                     row = sheet.getRow(rowNum);
-                    if(row == null){
+                    if (row == null) {
                         continue;
                     }
                     //遍历行的所有列
-                    Map<String,Object> item = new HashMap<>();
+                    Map<String, Object> item = new HashMap<>();
                     for (int cellNum = firstCellNum; cellNum < lastCellNum; cellNum++) {
                         cell = row.getCell(cellNum);
                         //获取表头对应数据
                         if (excelHead.get(cellNum) != null && !excelHead.get(cellNum).equals("")
-                                && cell !=null && !cell.toString().equals("")) {
-                            item.put(excelHead.get(cellNum),parseCell(cell));
+                                && cell != null && !cell.toString().equals("")) {
+                            item.put(excelHead.get(cellNum), parseCell(cell));
                         }
                     }
-                    if(item.keySet().toArray().length >0 ){
+                    if (item.keySet().toArray().length > 0) {
                         list.add(item);
                     }
                 }

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

@@ -483,7 +483,7 @@ public class FtpFileUtil {
 
 
     //重写下载图片方法
-    public Map<String,Object> downloadFileNew(String fileName, String filePath) throws IOException {
+    public Map<String, Object> downloadFileNew(String fileName, String filePath) throws IOException {
         InputStream inputStream;
         String data = fileName + "预览失败";
         String type = "";
@@ -576,8 +576,8 @@ public class FtpFileUtil {
             }
         }
         Map<String, Object> map = new HashMap<>();
-        map.put("data",data);
-        map.put("type",type);
+        map.put("data", data);
+        map.put("type", type);
         return map;
     }
 }

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

@@ -20,8 +20,9 @@ import java.net.URLConnection;
 public class HTTPRequestUtils {
     /**
      * 发送post请求
-     * @param url  路径
-     * @param json  参数(json类型)
+     *
+     * @param url      路径
+     * @param json     参数(json类型)
      * @param encoding 编码格式
      * @return
      * @throws ParseException
@@ -37,7 +38,7 @@ public class HTTPRequestUtils {
 
         //装填参数
         StringEntity s = new StringEntity(json.toString(), "utf-8");
-        s.setContentEncoding(new BasicHeader(HTTP.CONTENT_TYPE,"application/json"));
+        s.setContentEncoding(new BasicHeader(HTTP.CONTENT_TYPE, "application/json"));
         //设置参数到请求对象中
         httpPost.setEntity(s);
         System.out.println("请求地址：" + url);
@@ -62,8 +63,8 @@ public class HTTPRequestUtils {
     }
 
 
-    public static String getJsonData(JSONObject jsonParam,String urls) {
-        StringBuffer sb=new StringBuffer();
+    public static String getJsonData(JSONObject jsonParam, String urls) {
+        StringBuffer sb = new StringBuffer();
         try {
             // 创建url资源
             URL url = new URL(urls);
@@ -89,7 +90,7 @@ public class HTTPRequestUtils {
             conn.setRequestProperty("Content-Type", "application/json");
             // 开始连接请求
             conn.connect();
-            OutputStream out = new DataOutputStream(conn.getOutputStream()) ;
+            OutputStream out = new DataOutputStream(conn.getOutputStream());
             // 写入请求的字符串
             out.write((jsonParam.toString()).getBytes());
             out.flush();
@@ -97,14 +98,14 @@ public class HTTPRequestUtils {
             System.out.println(conn.getResponseCode());
 
             // 请求返回的状态
-            if (HttpURLConnection.HTTP_OK == conn.getResponseCode()){
+            if (HttpURLConnection.HTTP_OK == conn.getResponseCode()) {
                 System.out.println("连接成功");
                 // 请求返回的数据
                 InputStream in1 = conn.getInputStream();
                 try {
                     String readLine = new String();
-                    BufferedReader responseReader=new BufferedReader(new InputStreamReader(in1,"UTF-8"));
-                    while((readLine=responseReader.readLine())!=null){
+                    BufferedReader responseReader = new BufferedReader(new InputStreamReader(in1, "UTF-8"));
+                    while ((readLine = responseReader.readLine()) != null) {
                         sb.append(readLine).append("\n");
                     }
                     responseReader.close();
@@ -126,10 +127,8 @@ public class HTTPRequestUtils {
     /**
      * 向指定 URL 发送POST方法的请求
      *
-     * @param url
-     *            发送请求的 URL
-     * @param param
-     *            请求参数，请求参数应该是 name1=value1&name2=value2 的形式。
+     * @param url   发送请求的 URL
+     * @param param 请求参数，请求参数应该是 name1=value1&name2=value2 的形式。
      * @return 所代表远程资源的响应结果
      */
     public static String sendPost(String url, String param) {
@@ -164,20 +163,19 @@ public class HTTPRequestUtils {
                 result += line;
             }
         } catch (Exception e) {
-            System.out.println("发送 POST 请求出现异常！"+e);
+            System.out.println("发送 POST 请求出现异常！" + e);
             e.printStackTrace();
         }
         //使用finally块来关闭输出流、输入流
-        finally{
-            try{
-                if(out!=null){
+        finally {
+            try {
+                if (out != null) {
                     out.close();
                 }
-                if(in!=null){
+                if (in != null) {
                     in.close();
                 }
-            }
-            catch(IOException ex){
+            } catch (IOException ex) {
                 ex.printStackTrace();
             }
         }
@@ -185,5 +183,4 @@ public class HTTPRequestUtils {
     }
 
 
-
 }

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

@@ -18,7 +18,7 @@ public class HttpUtil {
         httpClient.getHttpConnectionManager().getParams().setConnectionTimeout(connectTimeout);
         // 设置socket.timeout时间
         httpClient.getHttpConnectionManager().getParams().setSoTimeout(socketTimeout);
-        if(postMethod.getRequestHeader("Content-Type") == null){
+        if (postMethod.getRequestHeader("Content-Type") == null) {
             postMethod.addRequestHeader("Content-Type", "application/json;charset=utf-8");
         }
         httpClient.executeMethod(postMethod);
@@ -31,7 +31,7 @@ public class HttpUtil {
         HttpClient httpClient = new HttpClient();
         httpClient.getHttpConnectionManager().getParams().setConnectionTimeout(connectTimeout);
         httpClient.getHttpConnectionManager().getParams().setSoTimeout(socketTimeout);
-        if(deleteMethod.getRequestHeader("Content-Type") == null){
+        if (deleteMethod.getRequestHeader("Content-Type") == null) {
             deleteMethod.addRequestHeader("Content-Type", "application/json;charset=utf-8");
         }
         httpClient.executeMethod(deleteMethod);
@@ -41,7 +41,7 @@ public class HttpUtil {
     }
 
 
-    public static JSONObject sendPost(String url,JSONObject param,@RequestParam(required = false) String headerValue) throws HttpException, IOException {
+    public static JSONObject sendPost(String url, JSONObject param, @RequestParam(required = false) String headerValue) throws HttpException, IOException {
         // 创建httpClient实例对象
         HttpClient httpClient = new HttpClient();
         // 设置httpClient连接/执行超时时间(ms)
@@ -50,9 +50,9 @@ public class HttpUtil {
         // 创建post请求方法实例对象
         PostMethod postMethod = new PostMethod(url);
         postMethod.addRequestHeader("Content-Type", "application/json;charset=utf-8");
-        postMethod.setRequestHeader("Cookie",headerValue);
+        postMethod.setRequestHeader("Cookie", headerValue);
         // 构建参数
-        RequestEntity entity = new StringRequestEntity(param.toJSONString(),"application/json", "UTF-8");
+        RequestEntity entity = new StringRequestEntity(param.toJSONString(), "application/json", "UTF-8");
         postMethod.setRequestEntity(entity);
         //执行并处理返回
         httpClient.executeMethod(postMethod);
@@ -61,7 +61,7 @@ public class HttpUtil {
         return JSONObject.parseObject(result);
     }
 
-    public static JSONObject sendPostObject(String url,JSONObject param,String accessToken) throws HttpException, IOException {
+    public static JSONObject sendPostObject(String url, JSONObject param, String accessToken) throws HttpException, IOException {
         // 创建httpClient实例对象
         HttpClient httpClient = new HttpClient();
         // 设置httpClient连接/执行超时时间(ms)
@@ -71,8 +71,8 @@ public class HttpUtil {
         PostMethod postMethod = new PostMethod(url);
         postMethod.addRequestHeader("Content-Type", "application/json;charset=utf-8");
         // 构建参数
-        postMethod.setRequestHeader("Authorization",accessToken);
-        RequestEntity entity = new StringRequestEntity(param.toJSONString(),"application/json", "UTF-8");
+        postMethod.setRequestHeader("Authorization", accessToken);
+        RequestEntity entity = new StringRequestEntity(param.toJSONString(), "application/json", "UTF-8");
         postMethod.setRequestEntity(entity);
         //执行并处理返回
         httpClient.executeMethod(postMethod);
@@ -81,7 +81,7 @@ public class HttpUtil {
         return JSONObject.parseObject(result);
     }
 
-    public static JSONObject sendPostArray(String url, JSONArray array,String accessToken) throws HttpException, IOException {
+    public static JSONObject sendPostArray(String url, JSONArray array, String accessToken) throws HttpException, IOException {
         // 创建httpClient实例对象
         HttpClient httpClient = new HttpClient();
         // 设置httpClient连接/执行超时时间(ms)
@@ -91,9 +91,9 @@ public class HttpUtil {
         PostMethod postMethod = new PostMethod(url);
         postMethod.addRequestHeader("Content-Type", "application/json;charset=utf-8");
         // 构建参数
-        postMethod.setRequestHeader("Authorization",accessToken);
+        postMethod.setRequestHeader("Authorization", accessToken);
         //postMethod.setRequestHeader("Cookie",accessToken);
-        RequestEntity entity = new StringRequestEntity(array.toJSONString(),"application/json", "UTF-8");
+        RequestEntity entity = new StringRequestEntity(array.toJSONString(), "application/json", "UTF-8");
         postMethod.setRequestEntity(entity);
         //执行并处理返回
         httpClient.executeMethod(postMethod);
@@ -119,6 +119,7 @@ public class HttpUtil {
         getMethod.releaseConnection();
         return result;
     }
+
     public static void main(String[] args) throws HttpException, IOException {
 
     }

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

@@ -19,6 +19,7 @@ import java.util.Map;
 
 /**
  * POIExcelToHtml 文件转换：
+ *
  * @author generator
  * @version 1.0-SNAPSHORT 2021-08-09 18:06
  * 类描述
@@ -27,398 +28,400 @@ import java.util.Map;
  * 作者：shadow
  * 参考：
  * 描述：Execl转HTML
- * @see null
  * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ * @see null
  */
 public class POIExcelToHtml {
 
-	public static String excelToHtml(InputStream is) {
-
-		String htmlExcel = "预览文件失败";
-		try {
-			Workbook wb = WorkbookFactory.create(is);
-			if (wb instanceof XSSFWorkbook) {
-				XSSFWorkbook xWb = (XSSFWorkbook) wb;
-				htmlExcel = POIExcelToHtml.getExcelInfo(xWb);
-			} else if (wb instanceof HSSFWorkbook) {
-				HSSFWorkbook hWb = (HSSFWorkbook) wb;
-				htmlExcel = POIExcelToHtml.getExcelInfo(hWb);
-			}
-		} catch (Exception e) {
-			e.printStackTrace();
-		} finally {
-			try {
-				is.close();
-			} catch (IOException e) {
-				e.printStackTrace();
-			}
-		}
-		return htmlExcel;
-	}
-
-	private static String getExcelInfo(Workbook wb) {
-		StringBuffer sb = new StringBuffer();
-		int sheetCounts = wb.getNumberOfSheets();
-		// sb.append("<!DOCTYPE html> <html> <head> <meta charset='utf-8'
-		// /><title>HTML实例</title></head> ");
-
-		for (int i = 0; i < sheetCounts; i++) {
-			Sheet sheet = wb.getSheetAt(i);// 获取第一个Sheet的内容
-			int lastRowNum = sheet.getLastRowNum();
-			Map<String, String> map[] = getRowSpanColSpanMap(sheet);
-			// sb.append("<br><br>");
-			sb.append(sheet.getSheetName());
-			sb.append("<table style='border-collapse:collapse;' width='100%'>");
-			Row row = null; // 兼容
-			Cell cell = null; // 兼容
-			for (int rowNum = sheet.getFirstRowNum(); rowNum <= lastRowNum; rowNum++) {
-				row = sheet.getRow(rowNum);
-				if (row == null) {
-					sb.append("<tr><td > &nbsp;</td></tr>");
-					continue;
-				}
-				sb.append("<tr>");
-				int lastColNum = row.getLastCellNum();
-				for (int colNum = 0; colNum < lastColNum; colNum++) {
-					cell = row.getCell(colNum);
-					if (cell == null) { // 特殊情况 空白的单元格会返回null
-						sb.append("<td>&nbsp;</td>");
-						continue;
-					}
-
-					String stringValue = getCellValue(cell);//````````````
-					if (map[0].containsKey(rowNum + "," + colNum)) {
-						String pointString = map[0].get(rowNum + "," + colNum);
-						map[0].remove(rowNum + "," + colNum);
-						int bottomeRow = Integer.valueOf(pointString.split(",")[0]);
-						int bottomeCol = Integer.valueOf(pointString.split(",")[1]);
-						int rowSpan = bottomeRow - rowNum + 1;
-						int colSpan = bottomeCol - colNum + 1;
-						sb.append("<td rowspan= '" + rowSpan + "' colspan= '" + colSpan + "' ");
-					} else if (map[1].containsKey(rowNum + "," + colNum)) {
-						map[1].remove(rowNum + "," + colNum);
-						continue;
-					} else {
-						sb.append("<td ");
-					}
-
-					dealExcelStyle(wb, sheet, cell, sb);// 处理单元格样式
-					sb.append(">");
-					if (stringValue == null || "".equals(stringValue.trim())) {
-						sb.append(" &nbsp; ");
-					} else {
-						// 将ascii码为160的空格转换为html下的空格（&nbsp;）
-						sb.append(stringValue.replace(String.valueOf((char) 160), "&nbsp;"));
-					}
-					sb.append("</td>");
-				}
-				sb.append("</tr>");
-			}
-			sb.append("</table>");
-		}
-
-		// sb.append("</body></html> ");
-		return sb.toString();
-	}
-
-	private static Map<String, String>[] getRowSpanColSpanMap(Sheet sheet) {
-		Map<String, String> map0 = new HashMap<String, String>();
-		Map<String, String> map1 = new HashMap<String, String>();
-		int mergedNum = sheet.getNumMergedRegions();
-		CellRangeAddress range = null;
-		for (int i = 0; i < mergedNum; i++) {
-			range = sheet.getMergedRegion(i);
-			int topRow = range.getFirstRow();
-			int topCol = range.getFirstColumn();
-			int bottomRow = range.getLastRow();
-			int bottomCol = range.getLastColumn();
-			map0.put(topRow + "," + topCol, bottomRow + "," + bottomCol);
-			// System.out.println(topRow + "," + topCol + "," + bottomRow + ","
-			// + bottomCol);
-			int tempRow = topRow;
-			while (tempRow <= bottomRow) {
-				int tempCol = topCol;
-				while (tempCol <= bottomCol) {
-					map1.put(tempRow + "," + tempCol, "");
-					tempCol++;
-				}
-				tempRow++;
-			}
-			map1.remove(topRow + "," + topCol);
-		}
-		Map[] map = { map0, map1 };
-		return map;
-	}
-
-	/**
-	 * 200 * 获取表格单元格Cell内容 201 * @param cell 202 * @return 203
-	 */
-	private static String getCellValue(Cell cell) {
-		String result = new String();
-		switch (cell.getCellType()) {
-			case Cell.CELL_TYPE_NUMERIC:// 数字类型
-				if (HSSFDateUtil.isCellDateFormatted(cell)) {// 处理日期格式、时间格式
-					SimpleDateFormat sdf = null;
-					if (cell.getCellStyle().getDataFormat() == HSSFDataFormat.getBuiltinFormat("hh:mm")) {
-						sdf = new SimpleDateFormat("HH:mm");
-					} else if (cell.getCellStyle().getDataFormat() == HSSFDataFormat
-							.getBuiltinFormat("yyyy-MM-dd HH:mm:ss")) {// 日期
-						sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-					} else {
-						sdf = new SimpleDateFormat("yyyy-MM-dd");
-					}
-					Date date = cell.getDateCellValue();
-					result = sdf.format(date);
-				} else if (cell.getCellStyle().getDataFormat() == 58) {
-					// 处理自定义日期格式：m月d日(通过判断单元格的格式id解决，id的值是58)
-					SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-					double value = cell.getNumericCellValue();
-					Date date = DateUtil.getJavaDate(value);
-					result = sdf.format(date);
-				} else {
-					double value = cell.getNumericCellValue();
-					CellStyle style = cell.getCellStyle();
-					DecimalFormat format = new DecimalFormat();
-					String temp = style.getDataFormatString();
-					// 单元格设置成常规
-					if (temp.equals("General")) {
-						format.applyPattern("#");
-					}
-					result = format.format(value);
-				}
-				break;
-			case Cell.CELL_TYPE_STRING:// String类型
-				result = cell.getRichStringCellValue().toString();
-				break;
-			case Cell.CELL_TYPE_BLANK:
-				result = "";
-				break;
-			default:
-				result = "";
-				break;
-		}
-		return result;
-	}
-
-	/**
-	 * 251 * 处理表格样式 252 * @param wb 253 * @param sheet 254 * @param cell 255
-	 * * @param sb 256
-	 */
-	private static void dealExcelStyle(Workbook wb, Sheet sheet, Cell cell, StringBuffer sb) {
-
-		CellStyle cellStyle = cell.getCellStyle();
-		if (cellStyle != null) {
-			//short alignment = cellStyle.getAlignment();旧写法获取枚举数字；新写法获取枚举
-
-			sb.append("align='" + convertAlignToHtml(cellStyle.getAlignmentEnum()) + "' ");// 单元格内容的水平对齐方式
-			//short verticalAlignment = cellStyle.getVerticalAlignment();
-			//short verticalAlignment = cellStyle.getVerticalAlignmentEnum().getCode();
-			sb.append("valign='" + convertVerticalAlignToHtml(cellStyle.getVerticalAlignmentEnum()) + "' ");// 单元格中内容的垂直排列方式
-
-			if (wb instanceof XSSFWorkbook) {
-				XSSFFont xf = ((XSSFCellStyle) cellStyle).getFont();
-				Boolean boldWeight = xf.getBold();
-				//short boldWeight = xf.getBoldweight();
-				String fontfamily = xf.getFontName();
-				int underline = xf.getUnderline();
-				boolean Italic = xf.getItalic();
-
-				sb.append("style='");
-				if (underline >= 1) {
-					sb.append("text-decoration:underline;"); // 字体型号
-				}
-				if (Italic) {
-					sb.append("font-style: italic;"); // 字体型号
-				}
-				sb.append("font-family:" + fontfamily + ";"); // 字体型号
-				sb.append("font-weight:" + (boldWeight ? "bold" : "100") + ";"); // 字体加粗
-				sb.append("font-size: " + xf.getFontHeight() / 2 + "%;"); // 字体大小
-				int columnWidth = sheet.getColumnWidth(cell.getColumnIndex());
-				sb.append("width:" + columnWidth + "px;");
-
-				XSSFColor xc = xf.getXSSFColor();
-				if (xc != null && !"".equals(xc)) {
-					sb.append("color:#" + xc.getARGBHex().substring(2) + ";"); // 字体颜色
-				}
-
-				XSSFColor bgColor = (XSSFColor) cellStyle.getFillForegroundColorColor();
-				if (bgColor != null && !"".equals(bgColor)) {
-					sb.append("background-color:#" + bgColor.getARGBHex().substring(2) + ";"); // 背景颜色
-				}
-				sb.append(getBorderStyle(0, cellStyle.getBorderTop(),
-						((XSSFCellStyle) cellStyle).getTopBorderXSSFColor()));
-				sb.append(getBorderStyle(1, cellStyle.getBorderRight(),
-						((XSSFCellStyle) cellStyle).getRightBorderXSSFColor()));
-				sb.append(getBorderStyle(2, cellStyle.getBorderBottom(),
-						((XSSFCellStyle) cellStyle).getBottomBorderXSSFColor()));
-				sb.append(getBorderStyle(3, cellStyle.getBorderLeft(),
-						((XSSFCellStyle) cellStyle).getLeftBorderXSSFColor()));
-
-			} else if (wb instanceof HSSFWorkbook) {
-
-				HSSFFont hf = ((HSSFCellStyle) cellStyle).getFont(wb);
-				short fontColor = hf.getColor();
-				Boolean boldWeight = hf.getBold();
-				//short boldWeight = hf.getBoldweight();
-				String fontfamily = hf.getFontName();
-				int underline = hf.getUnderline();
-				boolean Italic = hf.getItalic();
-
-				sb.append("style='");
-				if (underline >= 1) {
-					// 字体型号
-					sb.append("text-decoration:underline;");
-				}
-				if (Italic) {
-					// 字体型号
-					sb.append("font-style: italic;");
-				}
-				// 类HSSFPalette用于求的颜色的国际标准形式
-				HSSFPalette palette = ((HSSFWorkbook) wb).getCustomPalette();
-				HSSFColor hc = palette.getColor(fontColor);
-				// 字体加粗
-				sb.append("font-weight:" + (boldWeight ? "bold" : "100") + ";");
-				// 字体型号
-				sb.append("font-family:" + fontfamily + ";");
-				// 字体大小
-				sb.append("font-size: " + hf.getFontHeight() / 2 + "%;");
-				String fontColorStr = convertToStardColor(hc);
-				// 字体颜色
-				if (fontColorStr != null && !"".equals(fontColorStr.trim())) {
-					sb.append("color:" + fontColorStr + ";");
-				}
-				int columnWidth = sheet.getColumnWidth(cell.getColumnIndex());
-				sb.append("width:" + columnWidth + "px;");
-				short bgColor = cellStyle.getFillForegroundColor();
-				//short bgColor = cellStyle.getFillBackgroundColor();
-				hc = palette.getColor(bgColor);
-				String bgColorStr = convertToStardColor(hc);
-				if (bgColorStr != null && !"".equals(bgColorStr.trim())) {
-					// 背景颜色
-					sb.append("background-color:" + bgColorStr + ";");
-				}
-				/**
-				 * 旧版本 cellStyle.getBorderTop()
-				 * 新版本 cellStyle.getBorderTopEnum()
-				 */
-				sb.append(getBorderStyle(palette, 0, cellStyle.getBorderTop(), cellStyle.getTopBorderColor()));
-				sb.append(getBorderStyle(palette, 1, cellStyle.getBorderRight(), cellStyle.getRightBorderColor()));
-				sb.append(getBorderStyle(palette, 3, cellStyle.getBorderLeft(), cellStyle.getLeftBorderColor()));
-				sb.append(getBorderStyle(palette, 2, cellStyle.getBorderBottom(), cellStyle.getBottomBorderColor()));
-			}
-
-			sb.append("' ");
-		}
-	}
-
-	/**
-	 * 330 * 单元格内容的水平对齐方式 331 * @param alignment 332 * @return 333
-	 * @param alignment
-	 */
-	private static String convertAlignToHtml( HorizontalAlignment alignment) {
-
-		String align = "left";
-		/**
-		 * CellStyle.ALIGN_CENTER:旧写法
-		 * HorizontalAlignment.LEFT:新写法
-		 */
-		switch (alignment) {
-			case LEFT:
-				align = "left";
-				break;
-			case CENTER:
-				align = "center";
-				break;
-			case RIGHT:
-				align = "right";
-				break;
-			default:
-				break;
-		}
-		return align;
-	}
-
-	/**
-	 * 354 * 单元格中内容的垂直排列方式 355 * @param verticalAlignment 356 * @return 357
-	 * @param verticalAlignment
-	 */
-	private static String convertVerticalAlignToHtml(VerticalAlignment verticalAlignment) {
-
-		/**
-		 * 旧写法CellStyle.VERTICAL_BOTTOM:
-		 * 新写法VerticalAlignment.BOTTOM:
-		 */
-		String valign = "middle";
-		switch (verticalAlignment) {
-			case BOTTOM:
-				valign = "bottom";
-				break;
-			case CENTER:
-				valign = "center";
-				break;
-			case TOP:
-				valign = "top";
-				break;
-			default:
-				break;
-		}
-		return valign;
-	}
-
-	private static String convertToStardColor(HSSFColor hc) {
-
-		/**
-		 * 颜色定义变化
-		 * 旧版本 : HSSFColor.BLACK.index
-		 * 新版本 : IndexedColors.BLACK.index
-		 */
-		StringBuffer sb = new StringBuffer("");
-		if (hc != null) {
-			if (IndexedColors.AUTOMATIC.index == hc.getIndex()) {
-				return null;
-			}
-			sb.append("#");
-			for (int i = 0; i < hc.getTriplet().length; i++) {
-				sb.append(fillWithZero(Integer.toHexString(hc.getTriplet()[i])));
-			}
-		}
-
-		return sb.toString();
-	}
-
-	private static String fillWithZero(String str) {
-		if (str != null && str.length() < 2) {
-			return "0" + str;
-		}
-		return str;
-	}
-
-	static String[] bordesr = { "border-top:", "border-right:", "border-bottom:", "border-left:" };
-	static String[] borderStyles = { "solid ", "solid ", "solid ", "solid ", "solid ", "solid ", "solid ", "solid ",
-			"solid ", "solid", "solid", "solid", "solid", "solid" };
-
-	private static String getBorderStyle(HSSFPalette palette, int b, short s, short t) {
-		if (s == 0) {
-			return bordesr[b] + borderStyles[s] + "#d0d7e5 1px;";
-		}
-		String borderColorStr = convertToStardColor(palette.getColor(t));
-		borderColorStr = borderColorStr == null || borderColorStr.length() < 1 ? "#000000" : borderColorStr;
-		return bordesr[b] + borderStyles[s] + borderColorStr + " 1px;";
-
-	}
-
-	private static String getBorderStyle(int b, short s, XSSFColor xc) {
-		if (s == 0) {
-			return bordesr[b] + borderStyles[s] + "#d0d7e5 1px;";
-		}
-		if (xc != null && !"".equals(xc)) {
-			// t.getARGBHex();
-			String borderColorStr = xc.getARGBHex();
-			borderColorStr = borderColorStr == null || borderColorStr.length() < 1 ? "#000000"
-					: borderColorStr.substring(2);
-			return bordesr[b] + borderStyles[s] + borderColorStr + " 1px;";
-		}
-		return "";
-	}
+    public static String excelToHtml(InputStream is) {
+
+        String htmlExcel = "预览文件失败";
+        try {
+            Workbook wb = WorkbookFactory.create(is);
+            if (wb instanceof XSSFWorkbook) {
+                XSSFWorkbook xWb = (XSSFWorkbook) wb;
+                htmlExcel = POIExcelToHtml.getExcelInfo(xWb);
+            } else if (wb instanceof HSSFWorkbook) {
+                HSSFWorkbook hWb = (HSSFWorkbook) wb;
+                htmlExcel = POIExcelToHtml.getExcelInfo(hWb);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            try {
+                is.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+        return htmlExcel;
+    }
+
+    private static String getExcelInfo(Workbook wb) {
+        StringBuffer sb = new StringBuffer();
+        int sheetCounts = wb.getNumberOfSheets();
+        // sb.append("<!DOCTYPE html> <html> <head> <meta charset='utf-8'
+        // /><title>HTML实例</title></head> ");
+
+        for (int i = 0; i < sheetCounts; i++) {
+            Sheet sheet = wb.getSheetAt(i);// 获取第一个Sheet的内容
+            int lastRowNum = sheet.getLastRowNum();
+            Map<String, String> map[] = getRowSpanColSpanMap(sheet);
+            // sb.append("<br><br>");
+            sb.append(sheet.getSheetName());
+            sb.append("<table style='border-collapse:collapse;' width='100%'>");
+            Row row = null; // 兼容
+            Cell cell = null; // 兼容
+            for (int rowNum = sheet.getFirstRowNum(); rowNum <= lastRowNum; rowNum++) {
+                row = sheet.getRow(rowNum);
+                if (row == null) {
+                    sb.append("<tr><td > &nbsp;</td></tr>");
+                    continue;
+                }
+                sb.append("<tr>");
+                int lastColNum = row.getLastCellNum();
+                for (int colNum = 0; colNum < lastColNum; colNum++) {
+                    cell = row.getCell(colNum);
+                    if (cell == null) { // 特殊情况 空白的单元格会返回null
+                        sb.append("<td>&nbsp;</td>");
+                        continue;
+                    }
+
+                    String stringValue = getCellValue(cell);//````````````
+                    if (map[0].containsKey(rowNum + "," + colNum)) {
+                        String pointString = map[0].get(rowNum + "," + colNum);
+                        map[0].remove(rowNum + "," + colNum);
+                        int bottomeRow = Integer.valueOf(pointString.split(",")[0]);
+                        int bottomeCol = Integer.valueOf(pointString.split(",")[1]);
+                        int rowSpan = bottomeRow - rowNum + 1;
+                        int colSpan = bottomeCol - colNum + 1;
+                        sb.append("<td rowspan= '" + rowSpan + "' colspan= '" + colSpan + "' ");
+                    } else if (map[1].containsKey(rowNum + "," + colNum)) {
+                        map[1].remove(rowNum + "," + colNum);
+                        continue;
+                    } else {
+                        sb.append("<td ");
+                    }
+
+                    dealExcelStyle(wb, sheet, cell, sb);// 处理单元格样式
+                    sb.append(">");
+                    if (stringValue == null || "".equals(stringValue.trim())) {
+                        sb.append(" &nbsp; ");
+                    } else {
+                        // 将ascii码为160的空格转换为html下的空格（&nbsp;）
+                        sb.append(stringValue.replace(String.valueOf((char) 160), "&nbsp;"));
+                    }
+                    sb.append("</td>");
+                }
+                sb.append("</tr>");
+            }
+            sb.append("</table>");
+        }
+
+        // sb.append("</body></html> ");
+        return sb.toString();
+    }
+
+    private static Map<String, String>[] getRowSpanColSpanMap(Sheet sheet) {
+        Map<String, String> map0 = new HashMap<String, String>();
+        Map<String, String> map1 = new HashMap<String, String>();
+        int mergedNum = sheet.getNumMergedRegions();
+        CellRangeAddress range = null;
+        for (int i = 0; i < mergedNum; i++) {
+            range = sheet.getMergedRegion(i);
+            int topRow = range.getFirstRow();
+            int topCol = range.getFirstColumn();
+            int bottomRow = range.getLastRow();
+            int bottomCol = range.getLastColumn();
+            map0.put(topRow + "," + topCol, bottomRow + "," + bottomCol);
+            // System.out.println(topRow + "," + topCol + "," + bottomRow + ","
+            // + bottomCol);
+            int tempRow = topRow;
+            while (tempRow <= bottomRow) {
+                int tempCol = topCol;
+                while (tempCol <= bottomCol) {
+                    map1.put(tempRow + "," + tempCol, "");
+                    tempCol++;
+                }
+                tempRow++;
+            }
+            map1.remove(topRow + "," + topCol);
+        }
+        Map[] map = {map0, map1};
+        return map;
+    }
+
+    /**
+     * 200 * 获取表格单元格Cell内容 201 * @param cell 202 * @return 203
+     */
+    private static String getCellValue(Cell cell) {
+        String result = new String();
+        switch (cell.getCellType()) {
+            case Cell.CELL_TYPE_NUMERIC:// 数字类型
+                if (HSSFDateUtil.isCellDateFormatted(cell)) {// 处理日期格式、时间格式
+                    SimpleDateFormat sdf = null;
+                    if (cell.getCellStyle().getDataFormat() == HSSFDataFormat.getBuiltinFormat("hh:mm")) {
+                        sdf = new SimpleDateFormat("HH:mm");
+                    } else if (cell.getCellStyle().getDataFormat() == HSSFDataFormat
+                            .getBuiltinFormat("yyyy-MM-dd HH:mm:ss")) {// 日期
+                        sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                    } else {
+                        sdf = new SimpleDateFormat("yyyy-MM-dd");
+                    }
+                    Date date = cell.getDateCellValue();
+                    result = sdf.format(date);
+                } else if (cell.getCellStyle().getDataFormat() == 58) {
+                    // 处理自定义日期格式：m月d日(通过判断单元格的格式id解决，id的值是58)
+                    SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+                    double value = cell.getNumericCellValue();
+                    Date date = DateUtil.getJavaDate(value);
+                    result = sdf.format(date);
+                } else {
+                    double value = cell.getNumericCellValue();
+                    CellStyle style = cell.getCellStyle();
+                    DecimalFormat format = new DecimalFormat();
+                    String temp = style.getDataFormatString();
+                    // 单元格设置成常规
+                    if (temp.equals("General")) {
+                        format.applyPattern("#");
+                    }
+                    result = format.format(value);
+                }
+                break;
+            case Cell.CELL_TYPE_STRING:// String类型
+                result = cell.getRichStringCellValue().toString();
+                break;
+            case Cell.CELL_TYPE_BLANK:
+                result = "";
+                break;
+            default:
+                result = "";
+                break;
+        }
+        return result;
+    }
+
+    /**
+     * 251 * 处理表格样式 252 * @param wb 253 * @param sheet 254 * @param cell 255
+     * * @param sb 256
+     */
+    private static void dealExcelStyle(Workbook wb, Sheet sheet, Cell cell, StringBuffer sb) {
+
+        CellStyle cellStyle = cell.getCellStyle();
+        if (cellStyle != null) {
+            //short alignment = cellStyle.getAlignment();旧写法获取枚举数字；新写法获取枚举
+
+            sb.append("align='" + convertAlignToHtml(cellStyle.getAlignmentEnum()) + "' ");// 单元格内容的水平对齐方式
+            //short verticalAlignment = cellStyle.getVerticalAlignment();
+            //short verticalAlignment = cellStyle.getVerticalAlignmentEnum().getCode();
+            sb.append("valign='" + convertVerticalAlignToHtml(cellStyle.getVerticalAlignmentEnum()) + "' ");// 单元格中内容的垂直排列方式
+
+            if (wb instanceof XSSFWorkbook) {
+                XSSFFont xf = ((XSSFCellStyle) cellStyle).getFont();
+                Boolean boldWeight = xf.getBold();
+                //short boldWeight = xf.getBoldweight();
+                String fontfamily = xf.getFontName();
+                int underline = xf.getUnderline();
+                boolean Italic = xf.getItalic();
+
+                sb.append("style='");
+                if (underline >= 1) {
+                    sb.append("text-decoration:underline;"); // 字体型号
+                }
+                if (Italic) {
+                    sb.append("font-style: italic;"); // 字体型号
+                }
+                sb.append("font-family:" + fontfamily + ";"); // 字体型号
+                sb.append("font-weight:" + (boldWeight ? "bold" : "100") + ";"); // 字体加粗
+                sb.append("font-size: " + xf.getFontHeight() / 2 + "%;"); // 字体大小
+                int columnWidth = sheet.getColumnWidth(cell.getColumnIndex());
+                sb.append("width:" + columnWidth + "px;");
+
+                XSSFColor xc = xf.getXSSFColor();
+                if (xc != null && !"".equals(xc)) {
+                    sb.append("color:#" + xc.getARGBHex().substring(2) + ";"); // 字体颜色
+                }
+
+                XSSFColor bgColor = (XSSFColor) cellStyle.getFillForegroundColorColor();
+                if (bgColor != null && !"".equals(bgColor)) {
+                    sb.append("background-color:#" + bgColor.getARGBHex().substring(2) + ";"); // 背景颜色
+                }
+                sb.append(getBorderStyle(0, cellStyle.getBorderTop(),
+                        ((XSSFCellStyle) cellStyle).getTopBorderXSSFColor()));
+                sb.append(getBorderStyle(1, cellStyle.getBorderRight(),
+                        ((XSSFCellStyle) cellStyle).getRightBorderXSSFColor()));
+                sb.append(getBorderStyle(2, cellStyle.getBorderBottom(),
+                        ((XSSFCellStyle) cellStyle).getBottomBorderXSSFColor()));
+                sb.append(getBorderStyle(3, cellStyle.getBorderLeft(),
+                        ((XSSFCellStyle) cellStyle).getLeftBorderXSSFColor()));
+
+            } else if (wb instanceof HSSFWorkbook) {
+
+                HSSFFont hf = ((HSSFCellStyle) cellStyle).getFont(wb);
+                short fontColor = hf.getColor();
+                Boolean boldWeight = hf.getBold();
+                //short boldWeight = hf.getBoldweight();
+                String fontfamily = hf.getFontName();
+                int underline = hf.getUnderline();
+                boolean Italic = hf.getItalic();
+
+                sb.append("style='");
+                if (underline >= 1) {
+                    // 字体型号
+                    sb.append("text-decoration:underline;");
+                }
+                if (Italic) {
+                    // 字体型号
+                    sb.append("font-style: italic;");
+                }
+                // 类HSSFPalette用于求的颜色的国际标准形式
+                HSSFPalette palette = ((HSSFWorkbook) wb).getCustomPalette();
+                HSSFColor hc = palette.getColor(fontColor);
+                // 字体加粗
+                sb.append("font-weight:" + (boldWeight ? "bold" : "100") + ";");
+                // 字体型号
+                sb.append("font-family:" + fontfamily + ";");
+                // 字体大小
+                sb.append("font-size: " + hf.getFontHeight() / 2 + "%;");
+                String fontColorStr = convertToStardColor(hc);
+                // 字体颜色
+                if (fontColorStr != null && !"".equals(fontColorStr.trim())) {
+                    sb.append("color:" + fontColorStr + ";");
+                }
+                int columnWidth = sheet.getColumnWidth(cell.getColumnIndex());
+                sb.append("width:" + columnWidth + "px;");
+                short bgColor = cellStyle.getFillForegroundColor();
+                //short bgColor = cellStyle.getFillBackgroundColor();
+                hc = palette.getColor(bgColor);
+                String bgColorStr = convertToStardColor(hc);
+                if (bgColorStr != null && !"".equals(bgColorStr.trim())) {
+                    // 背景颜色
+                    sb.append("background-color:" + bgColorStr + ";");
+                }
+                /**
+                 * 旧版本 cellStyle.getBorderTop()
+                 * 新版本 cellStyle.getBorderTopEnum()
+                 */
+                sb.append(getBorderStyle(palette, 0, cellStyle.getBorderTop(), cellStyle.getTopBorderColor()));
+                sb.append(getBorderStyle(palette, 1, cellStyle.getBorderRight(), cellStyle.getRightBorderColor()));
+                sb.append(getBorderStyle(palette, 3, cellStyle.getBorderLeft(), cellStyle.getLeftBorderColor()));
+                sb.append(getBorderStyle(palette, 2, cellStyle.getBorderBottom(), cellStyle.getBottomBorderColor()));
+            }
+
+            sb.append("' ");
+        }
+    }
+
+    /**
+     * 330 * 单元格内容的水平对齐方式 331 * @param alignment 332 * @return 333
+     *
+     * @param alignment
+     */
+    private static String convertAlignToHtml(HorizontalAlignment alignment) {
+
+        String align = "left";
+        /**
+         * CellStyle.ALIGN_CENTER:旧写法
+         * HorizontalAlignment.LEFT:新写法
+         */
+        switch (alignment) {
+            case LEFT:
+                align = "left";
+                break;
+            case CENTER:
+                align = "center";
+                break;
+            case RIGHT:
+                align = "right";
+                break;
+            default:
+                break;
+        }
+        return align;
+    }
+
+    /**
+     * 354 * 单元格中内容的垂直排列方式 355 * @param verticalAlignment 356 * @return 357
+     *
+     * @param verticalAlignment
+     */
+    private static String convertVerticalAlignToHtml(VerticalAlignment verticalAlignment) {
+
+        /**
+         * 旧写法CellStyle.VERTICAL_BOTTOM:
+         * 新写法VerticalAlignment.BOTTOM:
+         */
+        String valign = "middle";
+        switch (verticalAlignment) {
+            case BOTTOM:
+                valign = "bottom";
+                break;
+            case CENTER:
+                valign = "center";
+                break;
+            case TOP:
+                valign = "top";
+                break;
+            default:
+                break;
+        }
+        return valign;
+    }
+
+    private static String convertToStardColor(HSSFColor hc) {
+
+        /**
+         * 颜色定义变化
+         * 旧版本 : HSSFColor.BLACK.index
+         * 新版本 : IndexedColors.BLACK.index
+         */
+        StringBuffer sb = new StringBuffer("");
+        if (hc != null) {
+            if (IndexedColors.AUTOMATIC.index == hc.getIndex()) {
+                return null;
+            }
+            sb.append("#");
+            for (int i = 0; i < hc.getTriplet().length; i++) {
+                sb.append(fillWithZero(Integer.toHexString(hc.getTriplet()[i])));
+            }
+        }
+
+        return sb.toString();
+    }
+
+    private static String fillWithZero(String str) {
+        if (str != null && str.length() < 2) {
+            return "0" + str;
+        }
+        return str;
+    }
+
+    static String[] bordesr = {"border-top:", "border-right:", "border-bottom:", "border-left:"};
+    static String[] borderStyles = {"solid ", "solid ", "solid ", "solid ", "solid ", "solid ", "solid ", "solid ",
+            "solid ", "solid", "solid", "solid", "solid", "solid"};
+
+    private static String getBorderStyle(HSSFPalette palette, int b, short s, short t) {
+        if (s == 0) {
+            return bordesr[b] + borderStyles[s] + "#d0d7e5 1px;";
+        }
+        String borderColorStr = convertToStardColor(palette.getColor(t));
+        borderColorStr = borderColorStr == null || borderColorStr.length() < 1 ? "#000000" : borderColorStr;
+        return bordesr[b] + borderStyles[s] + borderColorStr + " 1px;";
+
+    }
+
+    private static String getBorderStyle(int b, short s, XSSFColor xc) {
+        if (s == 0) {
+            return bordesr[b] + borderStyles[s] + "#d0d7e5 1px;";
+        }
+        if (xc != null && !"".equals(xc)) {
+            // t.getARGBHex();
+            String borderColorStr = xc.getARGBHex();
+            borderColorStr = borderColorStr == null || borderColorStr.length() < 1 ? "#000000"
+                    : borderColorStr.substring(2);
+            return bordesr[b] + borderStyles[s] + borderColorStr + " 1px;";
+        }
+        return "";
+    }
 
 }

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

@@ -14,142 +14,141 @@ import java.io.InputStream;
 import java.util.Base64;
 
 /**
- *
  * @author ruand http://blog.csdn.net/emoven/article/details/52683215
  */
 public class POIPptToHtml {
 
-	private final static String PPT = "ppt";
-	private final static String PPTX = "pptx";
-
-	public static String pptToHtml(InputStream is, String type) {
-		String htmlStr = "预览失败";
-		try {
-				if (PPT.equals(type)) {
-					 htmlStr = toImage2003(is);
-				} else if (PPTX.equals(type)) {
-					 htmlStr = toImage2007(is);
-				} else {
-					htmlStr = "the file is not a ppt";
-				}
-
-			} catch (Exception e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-		return htmlStr;
-	}
-
-	public static String toImage2007(InputStream is) throws Exception {
-		String htmlStr = "预览失败";
-		XMLSlideShow ppt = new XMLSlideShow(is);
-		is.close();
-		Dimension pgsize = ppt.getPageSize();
-		System.out.println(pgsize.width + "--" + pgsize.height);
-
-		StringBuffer sb = new StringBuffer();
-		for (int i = 0; i < ppt.getSlides().size(); i++) {
-			try {
-				// 防止中文乱码
-				for (XSLFShape shape : ppt.getSlides().get(i).getShapes()) {
-					if (shape instanceof XSLFTextShape) {
-						XSLFTextShape tsh = (XSLFTextShape) shape;
-						for (XSLFTextParagraph p : tsh) {
-							for (XSLFTextRun r : p) {
-								r.setFontFamily("宋体");
-							}
-						}
-					}
-				}
-				BufferedImage img = new BufferedImage(pgsize.width, pgsize.height, BufferedImage.TYPE_INT_RGB);
-				Graphics2D graphics = img.createGraphics();
-				// clear the drawing area
-				graphics.setPaint(Color.white);
-				graphics.fill(new Rectangle2D.Float(0, 0, pgsize.width, pgsize.height));
-				// render
-				ppt.getSlides().get(i).draw(graphics);
-				ByteArrayOutputStream stream = new ByteArrayOutputStream();
-				ImageIO.write(img, "png", stream);
-				String imgStr = Base64.getEncoder().encodeToString(stream.toByteArray());
-				// save the output
-				sb.append("<br>");
-				sb.append("<img src=" + "\"data:image/png;base64," + imgStr + "\"" + "/>");
-				stream.close();
-			} catch (Exception e) {
-				System.out.println("第" + i + "张ppt转换出错");
-			}
-		}
-		System.out.println("success");
-		htmlStr = sb.toString();
-
-		return htmlStr;
-	}
-
-	public static String toImage2003(InputStream is) {
-		String htmlStr = "预览失败";
-		try {
-			HSLFSlideShow ppt = new HSLFSlideShow(is);
-			Dimension pgsize = ppt.getPageSize();
-			StringBuffer sb = new StringBuffer();
-			for (int i = 0; i < ppt.getSlides().size(); i++) {
-				// 防止中文乱码
-				for (HSLFShape shape : ppt.getSlides().get(i).getShapes()) {
-					if (shape instanceof HSLFTextShape) {
-						HSLFTextShape tsh = (HSLFTextShape) shape;
-						for (HSLFTextParagraph p : tsh) {
-							for (HSLFTextRun r : p) {
-								r.setFontFamily("宋体");
-							}
-						}
-					}
-				}
-				BufferedImage img = new BufferedImage(pgsize.width, pgsize.height, BufferedImage.TYPE_INT_RGB);
-				Graphics2D graphics = img.createGraphics();
-				// clear the drawing area
-				graphics.setPaint(Color.white);
-				graphics.fill(new Rectangle2D.Float(0, 0, pgsize.width, pgsize.height));
-				// render
-				ppt.getSlides().get(i).draw(graphics);
-				ByteArrayOutputStream stream = new ByteArrayOutputStream();
-				//String imageDir = targetDir + "/" + pptFileName + "/";
-				//FileUtils.createDir(imageDir);// create image dir
-				//String imagePath = imageDir + pptFileName + "-" + (i + 1) + ".png";
-				ImageIO.write(img, "png", stream);
-				String imgStr = Base64.getEncoder().encodeToString(stream.toByteArray());
-				sb.append("<br>");
-				sb.append("<img src=" + "\"data:image/png;base64," + imgStr + "\"" + "/>");
-				stream.close();
-
-			}
-			System.out.println("success");
-			htmlStr = sb.toString();
-		} catch (Exception e) {
-
-		}
-		return htmlStr;
-	}
-
-	/***
-	 * 功能 :调整图片大小
-	 *
-	 * @param srcImgPath
-	 *            原图片路径
-	 * @param distImgPath
-	 *            转换大小后图片路径
-	 * @param width
-	 *            转换后图片宽度
-	 * @param height
-	 *            转换后图片高度
-	 */
-	public static void resizeImage(String srcImgPath, String distImgPath, int width, int height) throws IOException {
-
-		File srcFile = new File(srcImgPath);
-		Image srcImg = ImageIO.read(srcFile);
-		BufferedImage buffImg = null;
-		buffImg = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);
-		buffImg.getGraphics().drawImage(srcImg.getScaledInstance(width, height, Image.SCALE_SMOOTH), 0, 0, null);
-
-		ImageIO.write(buffImg, "JPEG", new File(distImgPath));
-
-	}
+    private final static String PPT = "ppt";
+    private final static String PPTX = "pptx";
+
+    public static String pptToHtml(InputStream is, String type) {
+        String htmlStr = "预览失败";
+        try {
+            if (PPT.equals(type)) {
+                htmlStr = toImage2003(is);
+            } else if (PPTX.equals(type)) {
+                htmlStr = toImage2007(is);
+            } else {
+                htmlStr = "the file is not a ppt";
+            }
+
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return htmlStr;
+    }
+
+    public static String toImage2007(InputStream is) throws Exception {
+        String htmlStr = "预览失败";
+        XMLSlideShow ppt = new XMLSlideShow(is);
+        is.close();
+        Dimension pgsize = ppt.getPageSize();
+        System.out.println(pgsize.width + "--" + pgsize.height);
+
+        StringBuffer sb = new StringBuffer();
+        for (int i = 0; i < ppt.getSlides().size(); i++) {
+            try {
+                // 防止中文乱码
+                for (XSLFShape shape : ppt.getSlides().get(i).getShapes()) {
+                    if (shape instanceof XSLFTextShape) {
+                        XSLFTextShape tsh = (XSLFTextShape) shape;
+                        for (XSLFTextParagraph p : tsh) {
+                            for (XSLFTextRun r : p) {
+                                r.setFontFamily("宋体");
+                            }
+                        }
+                    }
+                }
+                BufferedImage img = new BufferedImage(pgsize.width, pgsize.height, BufferedImage.TYPE_INT_RGB);
+                Graphics2D graphics = img.createGraphics();
+                // clear the drawing area
+                graphics.setPaint(Color.white);
+                graphics.fill(new Rectangle2D.Float(0, 0, pgsize.width, pgsize.height));
+                // render
+                ppt.getSlides().get(i).draw(graphics);
+                ByteArrayOutputStream stream = new ByteArrayOutputStream();
+                ImageIO.write(img, "png", stream);
+                String imgStr = Base64.getEncoder().encodeToString(stream.toByteArray());
+                // save the output
+                sb.append("<br>");
+                sb.append("<img src=" + "\"data:image/png;base64," + imgStr + "\"" + "/>");
+                stream.close();
+            } catch (Exception e) {
+                System.out.println("第" + i + "张ppt转换出错");
+            }
+        }
+        System.out.println("success");
+        htmlStr = sb.toString();
+
+        return htmlStr;
+    }
+
+    public static String toImage2003(InputStream is) {
+        String htmlStr = "预览失败";
+        try {
+            HSLFSlideShow ppt = new HSLFSlideShow(is);
+            Dimension pgsize = ppt.getPageSize();
+            StringBuffer sb = new StringBuffer();
+            for (int i = 0; i < ppt.getSlides().size(); i++) {
+                // 防止中文乱码
+                for (HSLFShape shape : ppt.getSlides().get(i).getShapes()) {
+                    if (shape instanceof HSLFTextShape) {
+                        HSLFTextShape tsh = (HSLFTextShape) shape;
+                        for (HSLFTextParagraph p : tsh) {
+                            for (HSLFTextRun r : p) {
+                                r.setFontFamily("宋体");
+                            }
+                        }
+                    }
+                }
+                BufferedImage img = new BufferedImage(pgsize.width, pgsize.height, BufferedImage.TYPE_INT_RGB);
+                Graphics2D graphics = img.createGraphics();
+                // clear the drawing area
+                graphics.setPaint(Color.white);
+                graphics.fill(new Rectangle2D.Float(0, 0, pgsize.width, pgsize.height));
+                // render
+                ppt.getSlides().get(i).draw(graphics);
+                ByteArrayOutputStream stream = new ByteArrayOutputStream();
+                //String imageDir = targetDir + "/" + pptFileName + "/";
+                //FileUtils.createDir(imageDir);// create image dir
+                //String imagePath = imageDir + pptFileName + "-" + (i + 1) + ".png";
+                ImageIO.write(img, "png", stream);
+                String imgStr = Base64.getEncoder().encodeToString(stream.toByteArray());
+                sb.append("<br>");
+                sb.append("<img src=" + "\"data:image/png;base64," + imgStr + "\"" + "/>");
+                stream.close();
+
+            }
+            System.out.println("success");
+            htmlStr = sb.toString();
+        } catch (Exception e) {
+
+        }
+        return htmlStr;
+    }
+
+    /***
+     * 功能 :调整图片大小
+     *
+     * @param srcImgPath
+     *            原图片路径
+     * @param distImgPath
+     *            转换大小后图片路径
+     * @param width
+     *            转换后图片宽度
+     * @param height
+     *            转换后图片高度
+     */
+    public static void resizeImage(String srcImgPath, String distImgPath, int width, int height) throws IOException {
+
+        File srcFile = new File(srcImgPath);
+        Image srcImg = ImageIO.read(srcFile);
+        BufferedImage buffImg = null;
+        buffImg = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);
+        buffImg.getGraphics().drawImage(srcImg.getScaledInstance(width, height, Image.SCALE_SMOOTH), 0, 0, null);
+
+        ImageIO.write(buffImg, "JPEG", new File(distImgPath));
+
+    }
 }

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

@@ -45,33 +45,33 @@ public class POIWordToHtml {
     public String docToHtml(InputStream input) throws Exception {
         String htmlData = "预览失败";
         try {
-        HWPFDocumentCore wordDocument = WordToHtmlUtils.loadDoc(input);
-        WordToHtmlConverter wordToHtmlConverter = new ImageConverter(
-                DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument()
-        );
-        //wordToHtmlConverter.setPicturesManager(new PicturesManager() {
-        //    @Override
-        //    public String savePicture(byte[] content,
-        //                              PictureType pictureType, String suggestedName,
-        //                              float widthInches, float heightInches) {
-        //            //给生成的页面写图片的路径
-        //            return "word/media/" + suggestedName;
-        //    }
-        //});
-        wordToHtmlConverter.processDocument(wordDocument);
-        Document htmlDocument = wordToHtmlConverter.getDocument();
-        ByteArrayOutputStream outStream = new ByteArrayOutputStream();
-        DOMSource domSource = new DOMSource(htmlDocument);
-        StreamResult streamResult = new StreamResult(outStream);
-        TransformerFactory tf = TransformerFactory.newInstance();
-        Transformer serializer = tf.newTransformer();
-        serializer.setOutputProperty(OutputKeys.ENCODING, "utf-8");
-        serializer.setOutputProperty(OutputKeys.INDENT, "yes");
-        serializer.setOutputProperty(OutputKeys.METHOD, "html");
-        serializer.transform(domSource, streamResult);
-        htmlData =  outStream.toString();
-        outStream.close();
-        } catch (Exception e){
+            HWPFDocumentCore wordDocument = WordToHtmlUtils.loadDoc(input);
+            WordToHtmlConverter wordToHtmlConverter = new ImageConverter(
+                    DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument()
+            );
+            //wordToHtmlConverter.setPicturesManager(new PicturesManager() {
+            //    @Override
+            //    public String savePicture(byte[] content,
+            //                              PictureType pictureType, String suggestedName,
+            //                              float widthInches, float heightInches) {
+            //            //给生成的页面写图片的路径
+            //            return "word/media/" + suggestedName;
+            //    }
+            //});
+            wordToHtmlConverter.processDocument(wordDocument);
+            Document htmlDocument = wordToHtmlConverter.getDocument();
+            ByteArrayOutputStream outStream = new ByteArrayOutputStream();
+            DOMSource domSource = new DOMSource(htmlDocument);
+            StreamResult streamResult = new StreamResult(outStream);
+            TransformerFactory tf = TransformerFactory.newInstance();
+            Transformer serializer = tf.newTransformer();
+            serializer.setOutputProperty(OutputKeys.ENCODING, "utf-8");
+            serializer.setOutputProperty(OutputKeys.INDENT, "yes");
+            serializer.setOutputProperty(OutputKeys.METHOD, "html");
+            serializer.transform(domSource, streamResult);
+            htmlData = outStream.toString();
+            outStream.close();
+        } catch (Exception e) {
             e.printStackTrace();
         }
         return htmlData;
@@ -79,37 +79,37 @@ public class POIWordToHtml {
 
     public String docxToHtml(InputStream inputStream) throws IOException {
         String htmlData = "预览失败";
-        try{
-        XWPFDocument docxDocument = new XWPFDocument(inputStream);
-        XHTMLOptions options = XHTMLOptions.create().indent(4);
+        try {
+            XWPFDocument docxDocument = new XWPFDocument(inputStream);
+            XHTMLOptions options = XHTMLOptions.create().indent(4);
             //获取文档中的图片
-        //List<XWPFPictureData> allPictures = docxDocument.getAllPictures();
-        //for (XWPFPictureData xwpfPictureData : allPictures) {
-        //    String name = xwpfPictureData.getFileName();
-        //    byte[] data = xwpfPictureData.getData();
-        //    InputStream input = new ByteArrayInputStream(data);
-        //    TODO 图片处理
-        //
-        //}
-        //final String imageUrl = "";
-        //不把图片生成出来
-        options.setExtractor(null);
-        options.setIgnoreStylesIfUnused(false);
-        options.setFragment(true);
-        //options.URIResolver(new IURIResolver() {
-        //    @Override
-        //    public String resolve(String uri) {
-        //        return imageUrl + uri;
-        //    }
-        //});
-        // 图片转base64 新版本支持
-        options.setImageManager(new Base64EmbedImgManager());
-         //转换htm1
-        ByteArrayOutputStream htmlStream = new ByteArrayOutputStream();
-        XHTMLConverter.getInstance().convert(docxDocument, htmlStream, options);
-        htmlData = htmlStream.toString();
-        htmlStream.close();
-        } catch(Exception e) {
+            //List<XWPFPictureData> allPictures = docxDocument.getAllPictures();
+            //for (XWPFPictureData xwpfPictureData : allPictures) {
+            //    String name = xwpfPictureData.getFileName();
+            //    byte[] data = xwpfPictureData.getData();
+            //    InputStream input = new ByteArrayInputStream(data);
+            //    TODO 图片处理
+            //
+            //}
+            //final String imageUrl = "";
+            //不把图片生成出来
+            options.setExtractor(null);
+            options.setIgnoreStylesIfUnused(false);
+            options.setFragment(true);
+            //options.URIResolver(new IURIResolver() {
+            //    @Override
+            //    public String resolve(String uri) {
+            //        return imageUrl + uri;
+            //    }
+            //});
+            // 图片转base64 新版本支持
+            options.setImageManager(new Base64EmbedImgManager());
+            //转换htm1
+            ByteArrayOutputStream htmlStream = new ByteArrayOutputStream();
+            XHTMLConverter.getInstance().convert(docxDocument, htmlStream, options);
+            htmlData = htmlStream.toString();
+            htmlStream.close();
+        } catch (Exception e) {
             e.printStackTrace();
         }
         return htmlData;
@@ -118,8 +118,6 @@ public class POIWordToHtml {
 
     /**
      * 图片处理
-     *
-     *
      */
     public class ImageConverter extends WordToHtmlConverter {
 
@@ -141,24 +139,25 @@ public class POIWordToHtml {
 
     /**
      * 读取word中的文本内容（段落、表格、图片分开处理）转HTML docx后缀名的Word
+     *
      * @param
      * @throws IOException
      */
-    public  String readWordImgToHtml(InputStream inputStream) throws IOException{
+    public String readWordImgToHtml(InputStream inputStream) throws IOException {
         String htmlData = "预览失败";
         XWPFDocument document = new XWPFDocument(inputStream);
-        String htmlText="";
+        String htmlText = "";
         try {
             // 获取word中的所有段落与表格
             List<IBodyElement> elements = document.getBodyElements();
             for (IBodyElement element : elements) {
                 // 段落
                 if (element instanceof XWPFParagraph) {
-                    htmlText+=getParagraphHtmlText((XWPFParagraph) element);
+                    htmlText += getParagraphHtmlText((XWPFParagraph) element);
                 }
                 // 表格
                 else if (element instanceof XWPFTable) {
-                    htmlText+=getTabelHtmlText((XWPFTable) element);
+                    htmlText += getTabelHtmlText((XWPFTable) element);
                 }
             }
 
@@ -174,8 +173,8 @@ public class POIWordToHtml {
             htmlData = htmlStream.toString();
             htmlStream.close();
             //获取word中的所有图片
-            List<XWPFPictureData> picLists= document.getAllPictures();
-            for(XWPFPictureData pic:picLists) {
+            List<XWPFPictureData> picLists = document.getAllPictures();
+            for (XWPFPictureData pic : picLists) {
                 System.out.println("图片名称:\t" + pic.getFileName());
                 System.out.println("图片类型：\t" + pic.getPictureType());
                 byte[] data = pic.getData();
@@ -186,14 +185,15 @@ public class POIWordToHtml {
                 //组装img
                 htmlText += "<p><img alt='' src='" + imgUrl + "'></p>";
             }
-            }
-        catch (Exception e) {
+        } catch (Exception e) {
             e.printStackTrace();
         }
-        return  htmlData;
+        return htmlData;
     }
+
     /**
      * 获取段落内容并组装段落HTML
+     *
      * @param paragraph
      */
     private static String getParagraphHtmlText(XWPFParagraph paragraph) {
@@ -206,50 +206,54 @@ public class POIWordToHtml {
         for (XWPFRun run : runs) {
             runText.append(run.text());
         }
-        return "<p style='margin:unset;text-align:"+paragraph.getAlignment().name()+"'>"+runText.toString()+"</p>";
+        return "<p style='margin:unset;text-align:" + paragraph.getAlignment().name() + "'>" + runText.toString() + "</p>";
     }
+
     /**
      * 获取表格内容并组装表格HTML
+     *
      * @param table
      */
     private static String getTabelHtmlText(XWPFTable table) {
-        String result="";
+        String result = "";
         //获取表格数据行
         List<XWPFTableRow> rows = table.getRows();
 
-        if(rows.size()>0){
-            result+="<table border='1' cellspacing=0 style='border-collapse: collapse;'>";
+        if (rows.size() > 0) {
+            result += "<table border='1' cellspacing=0 style='border-collapse: collapse;'>";
             //遍历
-            for (int i=0;i<rows.size();i++) {
+            for (int i = 0; i < rows.size(); i++) {
                 XWPFTableRow row = rows.get(i);
-                result+="<tr style='font-weight: bold;'>";
+                result += "<tr style='font-weight: bold;'>";
                 //获取每行的数据列
                 List<XWPFTableCell> cells = row.getTableCells();
                 for (XWPFTableCell cell : cells) {
                     //获取单元格跨列个数
                     BigInteger gridSpanNum = getCellGridSpanNum(cell);
 
-                    result+="<td colspan="+gridSpanNum+" valign=center style='text-align: center;vertical-align: middle;'>";
-                    String cellText="";
+                    result += "<td colspan=" + gridSpanNum + " valign=center style='text-align: center;vertical-align: middle;'>";
+                    String cellText = "";
                     // 简单获取内容（简单方式是不能获取字体对齐方式的）
                     // System.out.println(cell.getText());
                     // 一个单元格可以理解为一个word文档，单元格里也可以加段落与表格
                     List<XWPFParagraph> paragraphs = cell.getParagraphs();
                     for (XWPFParagraph paragraph : paragraphs) {
-                        cellText+="<p style='margin: unset;text-align:"+paragraph.getAlignment().name()+"'>"+getParagraphText(paragraph)+"</p>";
+                        cellText += "<p style='margin: unset;text-align:" + paragraph.getAlignment().name() + "'>" + getParagraphText(paragraph) + "</p>";
                     }
-                    result+=cellText;
-                    result+="</td>";
+                    result += cellText;
+                    result += "</td>";
                 }
 
-                result+="</tr>";
+                result += "</tr>";
             }
-            result+="</table>";
+            result += "</table>";
         }
         return result;
     }
+
     /**
      * 获取段落内容（ docx后缀名的Word）
+     *
      * @param paragraph
      */
     private static String getParagraphText(XWPFParagraph paragraph) {
@@ -272,20 +276,21 @@ public class POIWordToHtml {
 
     /**
      * 字节流图片上传
+     *
      * @param data:图片字节流
      * @param fileName:图片名称
      */
-    public static String getImageUrl(byte[] data,String fileName) throws Exception{
-        String imgUrl="";
-        Long res =new Date().getTime();
+    public static String getImageUrl(byte[] data, String fileName) throws Exception {
+        String imgUrl = "";
+        Long res = new Date().getTime();
         //设置文件存储路径，可以存放在你想要指定的路径里面
-        String rootPath="D:/mimi/"+File.separator+"upload/images/";
+        String rootPath = "D:/mimi/" + File.separator + "upload/images/";
         // 新文件名
-        String newFileName =res + fileName.substring(fileName.lastIndexOf("."));
+        String newFileName = res + fileName.substring(fileName.lastIndexOf("."));
         //新文件
-        File newFile=new File(rootPath+File.separator+newFileName);
+        File newFile = new File(rootPath + File.separator + newFileName);
         //判断文件目录是否存在
-        if(!newFile.getParentFile().exists()){
+        if (!newFile.getParentFile().exists()) {
             //如果目标文件所在的目录不存在，则创建父目录
             newFile.getParentFile().mkdirs();
         }
@@ -297,25 +302,26 @@ public class POIWordToHtml {
         //-------把图片文件写入磁盘 end ----------------
         //服务器图片地址
         String baseURL = "http://192.168.0.76:8080/mimi/upload/images/";
-        imgUrl=baseURL+newFileName;
+        imgUrl = baseURL + newFileName;
 
         return imgUrl;
     }
+
     /**
      * 获取单元格跨列个数
+     *
      * @return
      */
-    public static BigInteger getCellGridSpanNum(XWPFTableCell cell){
-        BigInteger gridSpanNum =null;
+    public static BigInteger getCellGridSpanNum(XWPFTableCell cell) {
+        BigInteger gridSpanNum = null;
         //获取单元格跨列
         CTDecimalNumber gridSpanXml = cell.getCTTc().getTcPr().getGridSpan();
-        if(gridSpanXml!=null){
+        if (gridSpanXml != null) {
             gridSpanNum = gridSpanXml.getVal();
-            System.out.println("gridSpanNum:"+gridSpanNum);
+            System.out.println("gridSpanNum:" + gridSpanNum);
         }
         return gridSpanNum;
     }
 
 
-
 }

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

@@ -19,164 +19,171 @@ public class SSOUtil {
     static final Logger log = Logger.getLogger(SSOUtil.class);
 
 
-    @Value(value = "${sso.userName}" )
+    @Value(value = "${sso.userName}")
     private String userName;
 
-    @Value(value = "${sso.password}" )
+    @Value(value = "${sso.password}")
     private String password;
 
-    @Value(value = "${sso.orgId}" )
+    @Value(value = "${sso.orgId}")
     private String orgId;
 
-    @Value(value = "${sso.groupId}" )
+    @Value(value = "${sso.groupId}")
     private String groupId;
 
-    @Value(value = "${sso.companyId}" )
+    @Value(value = "${sso.companyId}")
     private String companyId;
 
     /**
      * 登录并返回token
+     *
      * @return
      */
-    public  String login(){
-        try{
-            JSONObject result = ssoFeign.login(userName,password,"web");
+    public String login() {
+        try {
+            JSONObject result = ssoFeign.login(userName, password, "web");
             String token = "Bearer " + result.getJSONObject("data").getString("accessToken");
             log.debug(token);
-            return  token;
-        }catch (Exception e){
+            return token;
+        } catch (Exception e) {
             e.printStackTrace();
-            log.error("登录SSO失败！"+e.getMessage());
+            log.error("登录SSO失败！" + e.getMessage());
         }
         return null;
     }
 
     /**
      * 新增SSO用户
+     *
      * @return
      */
-    public  JSONObject addUser(String userName,String userCode ,String orgName,String orgCode){
-        try{
+    public JSONObject addUser(String userName, String userCode, String orgName, String orgCode) {
+        try {
             String token = login();
-            if(token == null){
+            if (token == null) {
                 throw new Exception("登录SSO失败，无法新增角色！");
             }
-            JSONObject result =  ssoFeign.addUser(token,userName,userCode,orgName,orgCode,groupId,companyId,orgId);
+            JSONObject result = ssoFeign.addUser(token, userName, userCode, orgName, orgCode, groupId, companyId, orgId);
             log.debug(result);
             return result;
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            log.error("登录SSO失败！"+e.getMessage());
+            log.error("登录SSO失败！" + e.getMessage());
         }
         return null;
     }
 
     /**
      * 删除SSO用户
+     *
      * @return
      */
-    public  JSONObject deleteUser(String userId){
-        try{
+    public JSONObject deleteUser(String userId) {
+        try {
             String token = login();
-            if(token == null){
+            if (token == null) {
                 throw new Exception("登录SSO失败，无法新增角色！");
             }
-            JSONObject result =  ssoFeign.deleteUser(token,userId);
+            JSONObject result = ssoFeign.deleteUser(token, userId);
             log.debug(result);
             return result;
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            log.error("登录SSO失败！"+e.getMessage());
+            log.error("登录SSO失败！" + e.getMessage());
         }
         return null;
     }
 
     /**
      * 查询SSO角色
+     *
      * @return
      */
-    public  JSONObject getRolesUser(){
-        try{
+    public JSONObject getRolesUser() {
+        try {
             String token = login();
-            if(token == null){
+            if (token == null) {
                 throw new Exception("登录SSO失败！");
             }
-            JSONObject result =  ssoFeign.getRolesUser(token,companyId);
+            JSONObject result = ssoFeign.getRolesUser(token, companyId);
             return result;
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            log.error("登录SSO失败！"+e.getMessage());
+            log.error("登录SSO失败！" + e.getMessage());
         }
         return null;
     }
 
     /**
      * 授权SSO用户
+     *
      * @return
      */
-    public  JSONObject addUserroles(String userId ,String userCode,String roleId){
-        try{
+    public JSONObject addUserroles(String userId, String userCode, String roleId) {
+        try {
             String token = login();
-            if(token == null){
+            if (token == null) {
                 throw new Exception("登录SSO失败，无法新增角色！");
             }
-            JSONObject result =  ssoFeign.addUserroles(token,userId,userCode,roleId);
+            JSONObject result = ssoFeign.addUserroles(token, userId, userCode, roleId);
             log.debug(result);
             return result;
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            log.error("登录SSO失败！"+e.getMessage());
+            log.error("登录SSO失败！" + e.getMessage());
         }
         return null;
     }
 
 
-    public Map<String,Object> individualLogin(String userName, String password,String app_code){
-        try{
-            JSONObject result = ssoFeign.login(userName,password,app_code);
+    public Map<String, Object> individualLogin(String userName, String password, String app_code) {
+        try {
+            JSONObject result = ssoFeign.login(userName, password, app_code);
             return result;
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            log.error("登录SSO失败！"+e.getMessage());
+            log.error("登录SSO失败！" + e.getMessage());
         }
         return new HashMap<>();
     }
 
     /**
      * 重置密码
+     *
      * @param userId
      * @return
      */
-    public JSONObject resetPwd(String userId,String userCode) throws Exception {
+    public JSONObject resetPwd(String userId, String userCode) throws Exception {
         String token = login();
-        if(token == null){
+        if (token == null) {
             throw new Exception("登录SSO失败！");
         }
-        Map<String,Object> params = new HashMap<>();
-        params.put("userId",userId);
-        params.put("password","At123456");
+        Map<String, Object> params = new HashMap<>();
+        params.put("userId", userId);
+        params.put("password", "At123456");
         //重置密码
-        JSONObject result =  ssoFeign.resetPassword(token,userId,"At123456",params);
+        JSONObject result = ssoFeign.resetPassword(token, userId, "At123456", params);
         //解锁用户并激活账号
-        unlockUser(userId,userCode);
+        unlockUser(userId, userCode);
         return result;
     }
 
 
     /**
      * 解锁用户并激活账号
+     *
      * @param userId
      * @param userCode
      * @return
      * @throws Exception
      */
-    public JSONObject unlockUser(String userId,String userCode) throws Exception {
+    public JSONObject unlockUser(String userId, String userCode) throws Exception {
         String token = login();
-        if(token == null){
+        if (token == null) {
             throw new Exception("登录SSO失败！");
         }
-        JSONObject result =  ssoFeign.resetLoginInfo(token,userCode);//解锁用户
-        ssoFeign.reActive(token,userId,"1","1");//激活账户
+        JSONObject result = ssoFeign.resetLoginInfo(token, userCode);//解锁用户
+        ssoFeign.reActive(token, userId, "1", "1");//激活账户
         return result;
     }
 }

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

@@ -23,58 +23,58 @@ import java.io.IOException;
  * @Version:1.0
  */
 
-    public class UploadUtils {
-        public  static IdGenerator idGenerator = new IdGenerator(1,1);
-        private static final Logger log = Logger.getLogger(UploadUtils.class);
+public class UploadUtils {
+    public static IdGenerator idGenerator = new IdGenerator(1, 1);
+    private static final Logger log = Logger.getLogger(UploadUtils.class);
 
-        public UploadUtils() {
-        }
-
-        public static String uploadFile(MultipartFile file, String uploadPath, String imgPath) {
-            String profilePhoto = null;
-            if (file != null) {
-                String fileId = idGenerator.getNextStr();
-                String fileName = file.getOriginalFilename();
-                String ext = Files.getFileExtension(fileName.toLowerCase());
-                try {
-                    String filePath = uploadPath + imgPath + fileId + "." + ext;
-                    File newFile = new File(filePath);
-                    FileUtils.makesureParentDirExists(newFile);
-                    Files.write(file.getBytes(), newFile);
-                } catch (IOException var10) {
-                    throw new BaseException("上传文件为空:" + var10.getMessage());
-                }
+    public UploadUtils() {
+    }
 
-                profilePhoto = uploadPath + imgPath + fileId + "." + ext;
+    public static String uploadFile(MultipartFile file, String uploadPath, String imgPath) {
+        String profilePhoto = null;
+        if (file != null) {
+            String fileId = idGenerator.getNextStr();
+            String fileName = file.getOriginalFilename();
+            String ext = Files.getFileExtension(fileName.toLowerCase());
+            try {
+                String filePath = uploadPath + imgPath + fileId + "." + ext;
+                File newFile = new File(filePath);
+                FileUtils.makesureParentDirExists(newFile);
+                Files.write(file.getBytes(), newFile);
+            } catch (IOException var10) {
+                throw new BaseException("上传文件为空:" + var10.getMessage());
             }
 
-            return profilePhoto;
+            profilePhoto = uploadPath + imgPath + fileId + "." + ext;
         }
 
-        public static byte[] imageToByte(String imgUrl) {
-            if (StringUtils.isEmpty(imgUrl)) {
-                return null;
-            } else {
-                File file = new File(imgUrl);
-                byte[] data = null;
-                if (file.exists()) {
-                    String ext = Files.getFileExtension(imgUrl.toLowerCase());
-                    ByteArrayOutputStream out = new ByteArrayOutputStream();
+        return profilePhoto;
+    }
 
-                    try {
-                        BufferedImage bi = ImageIO.read(file);
-                        ImageIO.write(bi, ext, out);
-                        data = out.toByteArray();
-                    } catch (FileNotFoundException var7) {
-                        var7.printStackTrace();
-                    } catch (IOException var8) {
-                        var8.printStackTrace();
-                    }
-                }
+    public static byte[] imageToByte(String imgUrl) {
+        if (StringUtils.isEmpty(imgUrl)) {
+            return null;
+        } else {
+            File file = new File(imgUrl);
+            byte[] data = null;
+            if (file.exists()) {
+                String ext = Files.getFileExtension(imgUrl.toLowerCase());
+                ByteArrayOutputStream out = new ByteArrayOutputStream();
 
-                return data;
+                try {
+                    BufferedImage bi = ImageIO.read(file);
+                    ImageIO.write(bi, ext, out);
+                    data = out.toByteArray();
+                } catch (FileNotFoundException var7) {
+                    var7.printStackTrace();
+                } catch (IOException var8) {
+                    var8.printStackTrace();
+                }
             }
+
+            return data;
         }
     }
+}
 
 

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

@@ -9,7 +9,6 @@ import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 
 
-
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
 import java.io.*;
@@ -173,6 +172,4 @@ public class poiutil {
     }
 
 
-
-
 }

src/main/resources/application-prod.yml

@@ -26,16 +26,16 @@ openfeign:
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.90.202:80}
   AmsFeign:
-#    url: ${AMSFEIGN_URL:172.16.90.202:80}
-    url: ${AMSFEIGN_URL:localhost:8079}
+    url: ${AMSFEIGN_URL:172.16.90.202:8079}
+#      url: ${AMSFEIGN_URL:localhost:8079}
   TmsFeign:
-#    url: ${TMSFEIGN_URL:172.16.90.202:80}
-    url: ${TMSFEIGN_URL:localhost:8086}
+    url: ${TMSFEIGN_URL:172.16.90.202:8086}
+#    url: ${TMSFEIGN_URL:localhost:8086}
   WMSFeign:
-    url: ${WMSFEIGN_URL:172.16.90.202:80}
+    url: ${WMSFEIGN_URL:172.16.90.202:8093}
   RmsFeign:
-    url: ${RMSFEIGN_URL:172.16.90.202:80}
-#    url: ${RMSFEIGN_URL:localhost:8060}
+#    url: ${RMSFEIGN_URL:172.16.90.202:8060}
+      url: ${RMSFEIGN_URL:172.16.90.202:8060}
   EmsFeign:
     url: ${EMSFEIGN_URL:172.16.90.202:80}
   SSOFeign:
@@ -43,10 +43,13 @@ openfeign:
   WebSocketFeign:
     url: ${WEBSOCKETFEIGN_URL:172.16.90.202:80}
   REPORTFeign:
-#    url: ${REPORTFEIGN_URL:172.16.90.202:80}
-    url: ${REPORTFEIGN_URL:localhost:8055}
+    url: ${REPORTFEIGN_URL:172.16.90.202:8055}
+#      url: ${REPORTFEIGN_URL:localhost:8055}
+  TmiFeigh:
+    url: ${TMI_URL:172.16.90.202:8018}
+#    url: ${TMI_URL:localhost:8018}
   DzFeign:
-    url: ${DZFEIGN_URL:172.16.90.202:80}
+    url: ${DZFEIGN_URL:172.16.90.202:8056}
 #    url: ${DZFEIGN_URL:localhost:8056}
 
 

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

@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!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">
-
     <select id="getUserInfo" resultType="java.util.Map">
         SELECT RP.PERSONNEL_ID "personnelId",
-               RP.IDENTITY_CARD "idCard",
-               RP.PERSONNEL_POST  "personnelPost"
-                   FROM RMS_PERSONNEL RP
+        RP.IDENTITY_CARD "idCard",
+        RP.PERSONNEL_POST "personnelPost"
+        FROM RMS_PERSONNEL RP
         WHERE RP.PERSONNEL_PHONE = #{userName}
     </select>
     <select id="getCapacityList" resultType="java.util.Map">
@@ -20,25 +19,32 @@
         AND RC.COMPANY_TYPE = #{roleName}
     </select>
     <select id="getCompanyList" resultType="java.util.Map">
-        select "companyId" from (
-        SELECT DISTINCT
-        rc.company_id "companyId",
-        level	"level"
-        FROM
-        RMS_COMPANY RC START WITH RC.COMPANY_ID IN (
-            SELECT RPC.COMPANY_ID
-            FROM RMS_PERSONNEL RP
-                     LEFT JOIN RMS_PERSONNEL_COMPANY RPC ON RP.PERSONNEL_ID = RPC.PERSONNEL_ID
-            WHERE RPC.DELETED = 0
-              AND RP.SSO_ID = #{userId}
-              AND nvl(RP.PERSONNEL_POST,'无') != '司机'
+        SELECT rc.company_id "companyId"
+        FROM RMS_COMPANY rc
+        WHERE rc.COMPANY_NAME IN (
+        SELECT "companyName"
+        FROM (
+        SELECT DISTINCT rc.COMPANY_NAME "companyName",
+        LEVEL "level"
+        FROM RMS_COMPANY RC
+        START WITH RC.COMPANY_ID IN (
+        SELECT RPC.COMPANY_ID
+        FROM RMS_PERSONNEL RP
+        LEFT JOIN RMS_PERSONNEL_COMPANY RPC ON RP.PERSONNEL_ID = RPC.PERSONNEL_ID
+        WHERE RPC.DELETED = 0
+        AND RP.SSO_ID = #{userId}
+        AND nvl(RP.PERSONNEL_POST, '无') != '司机'
         )
         CONNECT BY PRIOR RC.COMPANY_ID = rc.PARENT_COMPANY_ID
         )
-        order by "level"
+        )
     </select>
     <select id="getCurrentCompanyList" resultType="java.util.Map">
-        SELECT distinct rc.company_id "companyId"
+        SELECT
+        RC.COMPANY_ID "companyId"
+        FROM RMS_COMPANY RC
+        WHERE RC.COMPANY_NAME IN (
+        SELECT distinct rc.COMPANY_NAME
         FROM RMS_PERSONNEL RP
         LEFT JOIN RMS_PERSONNEL_COMPANY RPC
         on RP.PERSONNEL_ID = RPC.PERSONNEL_ID
@@ -47,52 +53,62 @@
         WHERE
         RPC.DELETED = 0
         AND
-        RP.PERSONNEL_JOB_NUMBER = #{userName}
+        RP.PERSONNEL_JOB_NUMBER = #{userName})
     </select>
     <select id="getCompanyRootMap" resultType="java.util.Map">
         SELECT DISTINCT
-            rc.company_id "rootCompanyId",
-            rc.COMPANY_NAME "rootCompanyName",
-            rc.IS_LISTED    "isListed"
+        rc.company_id "rootCompanyId",
+        rc.COMPANY_NAME "rootCompanyName",
+        rc.IS_LISTED "isListed"
         FROM
-            RMS_COMPANY RC START WITH RC.COMPANY_ID IN (
-            SELECT
-                RPC.COMPANY_ID
-            FROM
-                RMS_PERSONNEL RP
-                    LEFT JOIN RMS_PERSONNEL_COMPANY RPC ON RP.PERSONNEL_ID = RPC.PERSONNEL_ID
-            WHERE
-                RPC.DELETED = 0
-              AND RP.PERSONNEL_JOB_NUMBER = #{userName}
+        RMS_COMPANY RC START WITH RC.COMPANY_ID IN (
+        SELECT
+        RPC.COMPANY_ID
+        FROM
+        RMS_PERSONNEL RP
+        LEFT JOIN RMS_PERSONNEL_COMPANY RPC ON RP.PERSONNEL_ID = RPC.PERSONNEL_ID
+        WHERE
+        RPC.DELETED = 0
+        AND RP.PERSONNEL_JOB_NUMBER = #{userName}
 
         ) CONNECT BY PRIOR rc.PARENT_COMPANY_ID = RC.COMPANY_ID
         ORDER BY LEVEL DESC FETCH NEXT 1 ROW ONLY
     </select>
     <select id="getCapacityMap" resultType="java.util.Map">
         SELECT DISTINCT
-            RCA.CAPACITY_ID "capacityId",
-            RCA.CAPACITY_NUMBER "capacityNumber",
-            RP.PERSONNEL_ID "driverId",
-            RP.PERSONNEL_NAME "driverName"
+        RCA.CAPACITY_ID "capacityId",
+        RCA.CAPACITY_NUMBER "capacityNumber",
+        RP.PERSONNEL_ID "driverId",
+        RP.PERSONNEL_NAME "driverName"
         FROM
-            RMS_CAPACITY RCA
-                LEFT JOIN RMS_CAPACITY_DRIVER RCD ON RCD.CAPACITY_ID = RCA.CAPACITY_ID
-                LEFT JOIN RMS_PERSONNEL RP ON RP.PERSONNEL_ID = RCD.PERSONNEL_ID
-                AND RP.DELETED = 0
+        RMS_CAPACITY RCA
+        LEFT JOIN RMS_CAPACITY_DRIVER RCD ON RCD.CAPACITY_ID = RCA.CAPACITY_ID
+        LEFT JOIN RMS_PERSONNEL RP ON RP.PERSONNEL_ID = RCD.PERSONNEL_ID
+        AND RP.DELETED = 0
         WHERE
-            RCA.DELETED = 0
-          AND (RP.PERSONNEL_JOB_NUMBER = #{loginName} OR RCA .CAPACITY_NUMBER = #{loginName})
-            FETCH NEXT 1 ROWS ONLY
+        RCA.DELETED = 0
+        AND (RP.PERSONNEL_JOB_NUMBER = #{loginName} OR RCA .CAPACITY_NUMBER = #{loginName})
+        AND RCD.DELETED = 0
+        FETCH NEXT 1 ROWS ONLY
     </select>
     <select id="getPersonnelMap" resultType="java.util.Map">
         SELECT DISTINCT
-            RP.PERSONNEL_ID "personnelId",
-            RP.PERSONNEL_NAME "personnelName",
-            RP.PERSONNEL_POST "personnelPost",
-            RP.PERSONNEL_TEAM "personnelTeam"
-        FROM RMS_PERSONNEL  RP
+        RP.PERSONNEL_ID "personnelId",
+        RP.PERSONNEL_NAME "personnelName",
+        RP.PERSONNEL_POST "personnelPost",
+        RP.PERSONNEL_TEAM "personnelTeam"
+        FROM RMS_PERSONNEL RP
         WHERE RP.DELETED != -1
-          AND RP.PERSONNEL_JOB_NUMBER = #{loginName}
+        AND RP.PERSONNEL_JOB_NUMBER = #{loginName}
         FETCH NEXT 1 ROWS ONLY
     </select>
+    <update id="submitOrderStatus">
+        UPDATE OMS_TRANS_ORDER
+        SET DELETED = #{orderStatus},
+        INSERT_UPDATE_REMARK = #{remark}
+        WHERE 1 != 1
+        <if test="transOrderNumber != null">
+            OR SERIAL_NUMBER = #{transOrderNumber}
+        </if>
+    </update>
 </mapper>

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

@@ -14,11 +14,11 @@
     </sql>
     <sql id="rootCompanyFilter">
         <if test="rootCompanyMap != null and urlFlag != null and urlFlag != 'null' and urlFlag != ''">
-            AND   #{urlFlag} = (SELECT IS_LISTED FROM RMS_COMPANY WHERE COMPANY_ID = "rootCompanyId")
+            AND #{urlFlag} = (SELECT IS_LISTED FROM RMS_COMPANY WHERE COMPANY_ID = "rootCompanyId")
         </if>
     </sql>
     <sql id="filterCompanyData">
-        <if test="roleCodes != null and roleCodes.size > 0  and dilCompanyList != null and dilCompanyList.size > 0" >
+        <if test="roleCodes != null and roleCodes.size > 0  and dilCompanyList != null and dilCompanyList.size > 0">
             AND
             <foreach collection="roleCodes" index="index" item="item" separator="or" close=")" open="(">
                 <choose>
@@ -26,7 +26,8 @@
                         (
                         "carrierId"
                         in
-                        <foreach collection="dilCompanyList" open="(" close=")" separator=" UNION " item="item" index="index">
+                        <foreach collection="dilCompanyList" open="(" close=")" separator=" UNION " item="item"
+                                 index="index">
                             SELECT
                             COMPANY_ID
                             FROM
@@ -36,26 +37,31 @@
                         OR
                         "shippingCompanyId"
                         in
-                        <foreach collection="dilCompanyList" open="(" close=")" separator=" UNION " item="item" index="index">
+                        <foreach collection="dilCompanyList" open="(" close=")" separator=" UNION " item="item"
+                                 index="index">
                             SELECT
                             COMPANY_ID
                             FROM
-                            RMS_COMPANY WHERE COMPANY_NAME IN ( SELECT COMPANY_NAME FROM RMS_COMPANY WHERE COMPANY_ID = #{item.companyId})
+                            RMS_COMPANY WHERE COMPANY_NAME IN ( SELECT COMPANY_NAME FROM RMS_COMPANY WHERE COMPANY_ID =
+                            #{item.companyId})
                         </foreach>
                         OR
                         "receivingCompanyId"
                         in
-                        <foreach collection="dilCompanyList" open="(" close=")" separator=" UNION " item="item" index="index">
+                        <foreach collection="dilCompanyList" open="(" close=")" separator=" UNION " item="item"
+                                 index="index">
                             SELECT
                             COMPANY_ID
                             FROM
-                            RMS_COMPANY WHERE COMPANY_NAME IN ( SELECT COMPANY_NAME FROM RMS_COMPANY WHERE COMPANY_ID = #{item.companyId})
+                            RMS_COMPANY WHERE COMPANY_NAME IN ( SELECT COMPANY_NAME FROM RMS_COMPANY WHERE COMPANY_ID =
+                            #{item.companyId})
                         </foreach>
                         )
                     </when>
                     <when test="item == 'businessCompany'">
                         "businessCompanyId" in(
-                        select COMPANY_ID from RMS_COMPANY where COMPANY_NAME in(select COMPANY_NAME FROM RMS_COMPANY where COMPANY_ID in
+                        select COMPANY_ID from RMS_COMPANY where COMPANY_NAME in(select COMPANY_NAME FROM RMS_COMPANY
+                        where COMPANY_ID in
                         <foreach collection="dilCompanyList" open="(" close=")" separator="," item="item" index="index">
                             #{item.companyId}
                         </foreach>

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

@@ -1,525 +1,532 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.steerinfo.dil.mapper.DilAppCidMapper">
-  <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.DilAppCid">
-    <id column="PRIMARY_ID" jdbcType="DECIMAL" property="primaryId" />
-    <result column="USER_CODE" jdbcType="VARCHAR" property="userCode" />
-    <result column="CID" jdbcType="VARCHAR" property="cid" />
-    <result column="INSERT_TIME" jdbcType="TIMESTAMP" property="insertTime" />
-    <result column="INSERT_USERNAME" jdbcType="VARCHAR" property="insertUsername" />
-    <result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime" />
-    <result column="UPDATE_USERNAME" jdbcType="VARCHAR" property="updateUsername" />
-    <result column="INSERT_UPDATE_REMARK" jdbcType="VARCHAR" property="insertUpdateRemark" />
-    <result column="DELETED" jdbcType="DECIMAL" property="deleted" />
-    <result column="ALTERNATE_FIELDS1" jdbcType="VARCHAR" property="alternateFields1" />
-    <result column="ALTERNATE_FIELDS2" jdbcType="VARCHAR" property="alternateFields2" />
-    <result column="ALTERNATE_FIELDS3" jdbcType="VARCHAR" property="alternateFields3" />
-    <result column="ALTERNATE_FIELDS4" jdbcType="VARCHAR" property="alternateFields4" />
-    <result column="ALTERNATE_FIELDS5" jdbcType="VARCHAR" property="alternateFields5" />
-    <result column="ALTERNATE_FIELDS6" jdbcType="VARCHAR" property="alternateFields6" />
-    <result column="ALTERNATE_FIELDS7" jdbcType="VARCHAR" property="alternateFields7" />
-    <result column="ALTERNATE_FIELDS8" jdbcType="VARCHAR" property="alternateFields8" />
-  </resultMap>
-  <sql id="columns">
-    PRIMARY_ID, USER_CODE, CID, INSERT_TIME, INSERT_USERNAME, UPDATE_TIME, UPDATE_USERNAME, 
-    INSERT_UPDATE_REMARK, DELETED, ALTERNATE_FIELDS1, ALTERNATE_FIELDS2, ALTERNATE_FIELDS3, 
-    ALTERNATE_FIELDS4, ALTERNATE_FIELDS5, ALTERNATE_FIELDS6, ALTERNATE_FIELDS7, ALTERNATE_FIELDS8
-  </sql>
-  <sql id="columns_alias">
-    t.PRIMARY_ID, t.USER_CODE, t.CID, t.INSERT_TIME, t.INSERT_USERNAME, t.UPDATE_TIME, 
-    t.UPDATE_USERNAME, t.INSERT_UPDATE_REMARK, t.DELETED, t.ALTERNATE_FIELDS1, t.ALTERNATE_FIELDS2, 
-    t.ALTERNATE_FIELDS3, t.ALTERNATE_FIELDS4, t.ALTERNATE_FIELDS5, t.ALTERNATE_FIELDS6, 
-    t.ALTERNATE_FIELDS7, t.ALTERNATE_FIELDS8
-  </sql>
-  <sql id="select">
-    SELECT <include refid="columns"/> FROM DIL_APP_CID
-  </sql>
-  <sql id="select_alias">
-    SELECT <include refid="columns_alias"/> FROM DIL_APP_CID t
-  </sql>
-  <sql id="where">
-    <where> 
-      <if test="primaryId != null">
-        and PRIMARY_ID = #{primaryId}
-      </if>
-      <if test="userCode != null and userCode != ''">
-        and USER_CODE = #{userCode}
-      </if>
-      <if test="cid != null and cid != ''">
-        and CID = #{cid}
-      </if>
-      <if test="insertTime != null">
-        and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
-      </if>
-      <if test="insertUsername != null and insertUsername != ''">
-        and INSERT_USERNAME = #{insertUsername}
-      </if>
-      <if test="updateTime != null">
-        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
-      </if>
-      <if test="updateUsername != null and updateUsername != ''">
-        and UPDATE_USERNAME = #{updateUsername}
-      </if>
-      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
-        and INSERT_UPDATE_REMARK = #{insertUpdateRemark}
-      </if>
-      <if test="deleted != null">
-        and DELETED = #{deleted}
-      </if>
-      <if test="alternateFields1 != null and alternateFields1 != ''">
-        and ALTERNATE_FIELDS1 = #{alternateFields1}
-      </if>
-      <if test="alternateFields2 != null and alternateFields2 != ''">
-        and ALTERNATE_FIELDS2 = #{alternateFields2}
-      </if>
-      <if test="alternateFields3 != null and alternateFields3 != ''">
-        and ALTERNATE_FIELDS3 = #{alternateFields3}
-      </if>
-      <if test="alternateFields4 != null and alternateFields4 != ''">
-        and ALTERNATE_FIELDS4 = #{alternateFields4}
-      </if>
-      <if test="alternateFields5 != null and alternateFields5 != ''">
-        and ALTERNATE_FIELDS5 = #{alternateFields5}
-      </if>
-      <if test="alternateFields6 != null and alternateFields6 != ''">
-        and ALTERNATE_FIELDS6 = #{alternateFields6}
-      </if>
-      <if test="alternateFields7 != null and alternateFields7 != ''">
-        and ALTERNATE_FIELDS7 = #{alternateFields7}
-      </if>
-      <if test="alternateFields8 != null and alternateFields8 != ''">
-        and ALTERNATE_FIELDS8 = #{alternateFields8}
-      </if>
-    </where>
-  </sql>
-  <sql id="whereLike">
-    <where> 
-      <if test="primaryId != null">
-        and PRIMARY_ID = #{primaryId}
-      </if>
-      <if test="userCode != null and userCode != ''">
-        and USER_CODE LIKE '%${userCode}%'
-      </if>
-      <if test="cid != null and cid != ''">
-        and CID LIKE '%${cid}%'
-      </if>
-      <if test="insertTime != null">
-        and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
-      </if>
-      <if test="insertUsername != null and insertUsername != ''">
-        and INSERT_USERNAME LIKE '%${insertUsername}%'
-      </if>
-      <if test="updateTime != null">
-        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
-      </if>
-      <if test="updateUsername != null and updateUsername != ''">
-        and UPDATE_USERNAME LIKE '%${updateUsername}%'
-      </if>
-      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
-        and INSERT_UPDATE_REMARK LIKE '%${insertUpdateRemark}%'
-      </if>
-      <if test="deleted != null">
-        and DELETED = #{deleted}
-      </if>
-      <if test="alternateFields1 != null and alternateFields1 != ''">
-        and ALTERNATE_FIELDS1 LIKE '%${alternateFields1}%'
-      </if>
-      <if test="alternateFields2 != null and alternateFields2 != ''">
-        and ALTERNATE_FIELDS2 LIKE '%${alternateFields2}%'
-      </if>
-      <if test="alternateFields3 != null and alternateFields3 != ''">
-        and ALTERNATE_FIELDS3 LIKE '%${alternateFields3}%'
-      </if>
-      <if test="alternateFields4 != null and alternateFields4 != ''">
-        and ALTERNATE_FIELDS4 LIKE '%${alternateFields4}%'
-      </if>
-      <if test="alternateFields5 != null and alternateFields5 != ''">
-        and ALTERNATE_FIELDS5 LIKE '%${alternateFields5}%'
-      </if>
-      <if test="alternateFields6 != null and alternateFields6 != ''">
-        and ALTERNATE_FIELDS6 LIKE '%${alternateFields6}%'
-      </if>
-      <if test="alternateFields7 != null and alternateFields7 != ''">
-        and ALTERNATE_FIELDS7 LIKE '%${alternateFields7}%'
-      </if>
-      <if test="alternateFields8 != null and alternateFields8 != ''">
-        and ALTERNATE_FIELDS8 LIKE '%${alternateFields8}%'
-      </if>
-    </where>
-  </sql>
-  <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
-    delete from DIL_APP_CID
-    where PRIMARY_ID = #{primaryId,jdbcType=DECIMAL}
-  </delete>
-  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
-    delete from DIL_APP_CID
-    where 1!=1 
-      <if test="userCode != null and userCode != ''">
-        or USER_CODE = #{userCode}
-      </if>
-      <if test="cid != null and cid != ''">
-        or CID = #{cid}
-      </if>
-      <if test="insertTime != null">
-        or TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = '#{insertTime}'
-      </if>
-      <if test="insertUsername != null and insertUsername != ''">
-        or INSERT_USERNAME = #{insertUsername}
-      </if>
-      <if test="updateTime != null">
-        or TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = '#{updateTime}'
-      </if>
-      <if test="updateUsername != null and updateUsername != ''">
-        or UPDATE_USERNAME = #{updateUsername}
-      </if>
-      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
-        or INSERT_UPDATE_REMARK = #{insertUpdateRemark}
-      </if>
-      <if test="deleted != null">
-        or DELETED = #{deleted}
-      </if>
-      <if test="alternateFields1 != null and alternateFields1 != ''">
-        or ALTERNATE_FIELDS1 = #{alternateFields1}
-      </if>
-      <if test="alternateFields2 != null and alternateFields2 != ''">
-        or ALTERNATE_FIELDS2 = #{alternateFields2}
-      </if>
-      <if test="alternateFields3 != null and alternateFields3 != ''">
-        or ALTERNATE_FIELDS3 = #{alternateFields3}
-      </if>
-      <if test="alternateFields4 != null and alternateFields4 != ''">
-        or ALTERNATE_FIELDS4 = #{alternateFields4}
-      </if>
-      <if test="alternateFields5 != null and alternateFields5 != ''">
-        or ALTERNATE_FIELDS5 = #{alternateFields5}
-      </if>
-      <if test="alternateFields6 != null and alternateFields6 != ''">
-        or ALTERNATE_FIELDS6 = #{alternateFields6}
-      </if>
-      <if test="alternateFields7 != null and alternateFields7 != ''">
-        or ALTERNATE_FIELDS7 = #{alternateFields7}
-      </if>
-      <if test="alternateFields8 != null and alternateFields8 != ''">
-        or ALTERNATE_FIELDS8 = #{alternateFields8}
-      </if>
-  </delete>
-  <insert id="insert" parameterType="com.steerinfo.dil.model.DilAppCid">
-    insert into DIL_APP_CID (PRIMARY_ID, USER_CODE, CID, 
-      INSERT_TIME, INSERT_USERNAME, UPDATE_TIME, 
-      UPDATE_USERNAME, INSERT_UPDATE_REMARK, DELETED, 
-      ALTERNATE_FIELDS1, ALTERNATE_FIELDS2, ALTERNATE_FIELDS3, 
-      ALTERNATE_FIELDS4, ALTERNATE_FIELDS5, ALTERNATE_FIELDS6, 
-      ALTERNATE_FIELDS7, ALTERNATE_FIELDS8)
-    values (#{primaryId,jdbcType=DECIMAL}, #{userCode,jdbcType=VARCHAR}, #{cid,jdbcType=VARCHAR}, 
-      #{insertTime,jdbcType=TIMESTAMP}, #{insertUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, 
-      #{updateUsername,jdbcType=VARCHAR}, #{insertUpdateRemark,jdbcType=VARCHAR}, #{deleted,jdbcType=DECIMAL}, 
-      #{alternateFields1,jdbcType=VARCHAR}, #{alternateFields2,jdbcType=VARCHAR}, #{alternateFields3,jdbcType=VARCHAR}, 
-      #{alternateFields4,jdbcType=VARCHAR}, #{alternateFields5,jdbcType=VARCHAR}, #{alternateFields6,jdbcType=VARCHAR}, 
-      #{alternateFields7,jdbcType=VARCHAR}, #{alternateFields8,jdbcType=VARCHAR})
-  </insert>
-  <insert id="insertSelective" parameterType="com.steerinfo.dil.model.DilAppCid">
-    insert into DIL_APP_CID
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="primaryId != null">
-        PRIMARY_ID,
-      </if>
-      <if test="userCode != null">
-        USER_CODE,
-      </if>
-      <if test="cid != null">
-        CID,
-      </if>
-      <if test="insertTime != null">
-        INSERT_TIME,
-      </if>
-      <if test="insertUsername != null">
-        INSERT_USERNAME,
-      </if>
-      <if test="updateTime != null">
-        UPDATE_TIME,
-      </if>
-      <if test="updateUsername != null">
-        UPDATE_USERNAME,
-      </if>
-      <if test="insertUpdateRemark != null">
-        INSERT_UPDATE_REMARK,
-      </if>
-      <if test="deleted != null">
-        DELETED,
-      </if>
-      <if test="alternateFields1 != null">
-        ALTERNATE_FIELDS1,
-      </if>
-      <if test="alternateFields2 != null">
-        ALTERNATE_FIELDS2,
-      </if>
-      <if test="alternateFields3 != null">
-        ALTERNATE_FIELDS3,
-      </if>
-      <if test="alternateFields4 != null">
-        ALTERNATE_FIELDS4,
-      </if>
-      <if test="alternateFields5 != null">
-        ALTERNATE_FIELDS5,
-      </if>
-      <if test="alternateFields6 != null">
-        ALTERNATE_FIELDS6,
-      </if>
-      <if test="alternateFields7 != null">
-        ALTERNATE_FIELDS7,
-      </if>
-      <if test="alternateFields8 != null">
-        ALTERNATE_FIELDS8,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="primaryId != null">
-        #{primaryId,jdbcType=DECIMAL},
-      </if>
-      <if test="userCode != null">
-        #{userCode,jdbcType=VARCHAR},
-      </if>
-      <if test="cid != null">
-        #{cid,jdbcType=VARCHAR},
-      </if>
-      <if test="insertTime != null">
-        #{insertTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="insertUsername != null">
-        #{insertUsername,jdbcType=VARCHAR},
-      </if>
-      <if test="updateTime != null">
-        #{updateTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="updateUsername != null">
-        #{updateUsername,jdbcType=VARCHAR},
-      </if>
-      <if test="insertUpdateRemark != null">
-        #{insertUpdateRemark,jdbcType=VARCHAR},
-      </if>
-      <if test="deleted != null">
-        #{deleted,jdbcType=DECIMAL},
-      </if>
-      <if test="alternateFields1 != null">
-        #{alternateFields1,jdbcType=VARCHAR},
-      </if>
-      <if test="alternateFields2 != null">
-        #{alternateFields2,jdbcType=VARCHAR},
-      </if>
-      <if test="alternateFields3 != null">
+    <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.DilAppCid">
+        <id column="PRIMARY_ID" jdbcType="DECIMAL" property="primaryId"/>
+        <result column="USER_CODE" jdbcType="VARCHAR" property="userCode"/>
+        <result column="CID" jdbcType="VARCHAR" property="cid"/>
+        <result column="INSERT_TIME" jdbcType="TIMESTAMP" property="insertTime"/>
+        <result column="INSERT_USERNAME" jdbcType="VARCHAR" property="insertUsername"/>
+        <result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime"/>
+        <result column="UPDATE_USERNAME" jdbcType="VARCHAR" property="updateUsername"/>
+        <result column="INSERT_UPDATE_REMARK" jdbcType="VARCHAR" property="insertUpdateRemark"/>
+        <result column="DELETED" jdbcType="DECIMAL" property="deleted"/>
+        <result column="ALTERNATE_FIELDS1" jdbcType="VARCHAR" property="alternateFields1"/>
+        <result column="ALTERNATE_FIELDS2" jdbcType="VARCHAR" property="alternateFields2"/>
+        <result column="ALTERNATE_FIELDS3" jdbcType="VARCHAR" property="alternateFields3"/>
+        <result column="ALTERNATE_FIELDS4" jdbcType="VARCHAR" property="alternateFields4"/>
+        <result column="ALTERNATE_FIELDS5" jdbcType="VARCHAR" property="alternateFields5"/>
+        <result column="ALTERNATE_FIELDS6" jdbcType="VARCHAR" property="alternateFields6"/>
+        <result column="ALTERNATE_FIELDS7" jdbcType="VARCHAR" property="alternateFields7"/>
+        <result column="ALTERNATE_FIELDS8" jdbcType="VARCHAR" property="alternateFields8"/>
+    </resultMap>
+    <sql id="columns">
+        PRIMARY_ID, USER_CODE, CID, INSERT_TIME, INSERT_USERNAME, UPDATE_TIME, UPDATE_USERNAME,
+        INSERT_UPDATE_REMARK, DELETED, ALTERNATE_FIELDS1, ALTERNATE_FIELDS2, ALTERNATE_FIELDS3,
+        ALTERNATE_FIELDS4, ALTERNATE_FIELDS5, ALTERNATE_FIELDS6, ALTERNATE_FIELDS7, ALTERNATE_FIELDS8
+    </sql>
+    <sql id="columns_alias">
+        t.PRIMARY_ID, t.USER_CODE, t.CID, t.INSERT_TIME, t.INSERT_USERNAME, t.UPDATE_TIME,
+        t.UPDATE_USERNAME, t.INSERT_UPDATE_REMARK, t.DELETED, t.ALTERNATE_FIELDS1, t.ALTERNATE_FIELDS2,
+        t.ALTERNATE_FIELDS3, t.ALTERNATE_FIELDS4, t.ALTERNATE_FIELDS5, t.ALTERNATE_FIELDS6,
+        t.ALTERNATE_FIELDS7, t.ALTERNATE_FIELDS8
+    </sql>
+    <sql id="select">
+        SELECT
+        <include refid="columns"/>
+        FROM DIL_APP_CID
+    </sql>
+    <sql id="select_alias">
+        SELECT
+        <include refid="columns_alias"/>
+        FROM DIL_APP_CID t
+    </sql>
+    <sql id="where">
+        <where>
+            <if test="primaryId != null">
+                and PRIMARY_ID = #{primaryId}
+            </if>
+            <if test="userCode != null and userCode != ''">
+                and USER_CODE = #{userCode}
+            </if>
+            <if test="cid != null and cid != ''">
+                and CID = #{cid}
+            </if>
+            <if test="insertTime != null">
+                and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
+            </if>
+            <if test="insertUsername != null and insertUsername != ''">
+                and INSERT_USERNAME = #{insertUsername}
+            </if>
+            <if test="updateTime != null">
+                and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+            </if>
+            <if test="updateUsername != null and updateUsername != ''">
+                and UPDATE_USERNAME = #{updateUsername}
+            </if>
+            <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+                and INSERT_UPDATE_REMARK = #{insertUpdateRemark}
+            </if>
+            <if test="deleted != null">
+                and DELETED = #{deleted}
+            </if>
+            <if test="alternateFields1 != null and alternateFields1 != ''">
+                and ALTERNATE_FIELDS1 = #{alternateFields1}
+            </if>
+            <if test="alternateFields2 != null and alternateFields2 != ''">
+                and ALTERNATE_FIELDS2 = #{alternateFields2}
+            </if>
+            <if test="alternateFields3 != null and alternateFields3 != ''">
+                and ALTERNATE_FIELDS3 = #{alternateFields3}
+            </if>
+            <if test="alternateFields4 != null and alternateFields4 != ''">
+                and ALTERNATE_FIELDS4 = #{alternateFields4}
+            </if>
+            <if test="alternateFields5 != null and alternateFields5 != ''">
+                and ALTERNATE_FIELDS5 = #{alternateFields5}
+            </if>
+            <if test="alternateFields6 != null and alternateFields6 != ''">
+                and ALTERNATE_FIELDS6 = #{alternateFields6}
+            </if>
+            <if test="alternateFields7 != null and alternateFields7 != ''">
+                and ALTERNATE_FIELDS7 = #{alternateFields7}
+            </if>
+            <if test="alternateFields8 != null and alternateFields8 != ''">
+                and ALTERNATE_FIELDS8 = #{alternateFields8}
+            </if>
+        </where>
+    </sql>
+    <sql id="whereLike">
+        <where>
+            <if test="primaryId != null">
+                and PRIMARY_ID = #{primaryId}
+            </if>
+            <if test="userCode != null and userCode != ''">
+                and USER_CODE LIKE '%${userCode}%'
+            </if>
+            <if test="cid != null and cid != ''">
+                and CID LIKE '%${cid}%'
+            </if>
+            <if test="insertTime != null">
+                and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
+            </if>
+            <if test="insertUsername != null and insertUsername != ''">
+                and INSERT_USERNAME LIKE '%${insertUsername}%'
+            </if>
+            <if test="updateTime != null">
+                and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+            </if>
+            <if test="updateUsername != null and updateUsername != ''">
+                and UPDATE_USERNAME LIKE '%${updateUsername}%'
+            </if>
+            <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+                and INSERT_UPDATE_REMARK LIKE '%${insertUpdateRemark}%'
+            </if>
+            <if test="deleted != null">
+                and DELETED = #{deleted}
+            </if>
+            <if test="alternateFields1 != null and alternateFields1 != ''">
+                and ALTERNATE_FIELDS1 LIKE '%${alternateFields1}%'
+            </if>
+            <if test="alternateFields2 != null and alternateFields2 != ''">
+                and ALTERNATE_FIELDS2 LIKE '%${alternateFields2}%'
+            </if>
+            <if test="alternateFields3 != null and alternateFields3 != ''">
+                and ALTERNATE_FIELDS3 LIKE '%${alternateFields3}%'
+            </if>
+            <if test="alternateFields4 != null and alternateFields4 != ''">
+                and ALTERNATE_FIELDS4 LIKE '%${alternateFields4}%'
+            </if>
+            <if test="alternateFields5 != null and alternateFields5 != ''">
+                and ALTERNATE_FIELDS5 LIKE '%${alternateFields5}%'
+            </if>
+            <if test="alternateFields6 != null and alternateFields6 != ''">
+                and ALTERNATE_FIELDS6 LIKE '%${alternateFields6}%'
+            </if>
+            <if test="alternateFields7 != null and alternateFields7 != ''">
+                and ALTERNATE_FIELDS7 LIKE '%${alternateFields7}%'
+            </if>
+            <if test="alternateFields8 != null and alternateFields8 != ''">
+                and ALTERNATE_FIELDS8 LIKE '%${alternateFields8}%'
+            </if>
+        </where>
+    </sql>
+    <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
+        delete from DIL_APP_CID
+        where PRIMARY_ID = #{primaryId,jdbcType=DECIMAL}
+    </delete>
+    <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+        delete from DIL_APP_CID
+        where 1!=1
+        <if test="userCode != null and userCode != ''">
+            or USER_CODE = #{userCode}
+        </if>
+        <if test="cid != null and cid != ''">
+            or CID = #{cid}
+        </if>
+        <if test="insertTime != null">
+            or TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = '#{insertTime}'
+        </if>
+        <if test="insertUsername != null and insertUsername != ''">
+            or INSERT_USERNAME = #{insertUsername}
+        </if>
+        <if test="updateTime != null">
+            or TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = '#{updateTime}'
+        </if>
+        <if test="updateUsername != null and updateUsername != ''">
+            or UPDATE_USERNAME = #{updateUsername}
+        </if>
+        <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+            or INSERT_UPDATE_REMARK = #{insertUpdateRemark}
+        </if>
+        <if test="deleted != null">
+            or DELETED = #{deleted}
+        </if>
+        <if test="alternateFields1 != null and alternateFields1 != ''">
+            or ALTERNATE_FIELDS1 = #{alternateFields1}
+        </if>
+        <if test="alternateFields2 != null and alternateFields2 != ''">
+            or ALTERNATE_FIELDS2 = #{alternateFields2}
+        </if>
+        <if test="alternateFields3 != null and alternateFields3 != ''">
+            or ALTERNATE_FIELDS3 = #{alternateFields3}
+        </if>
+        <if test="alternateFields4 != null and alternateFields4 != ''">
+            or ALTERNATE_FIELDS4 = #{alternateFields4}
+        </if>
+        <if test="alternateFields5 != null and alternateFields5 != ''">
+            or ALTERNATE_FIELDS5 = #{alternateFields5}
+        </if>
+        <if test="alternateFields6 != null and alternateFields6 != ''">
+            or ALTERNATE_FIELDS6 = #{alternateFields6}
+        </if>
+        <if test="alternateFields7 != null and alternateFields7 != ''">
+            or ALTERNATE_FIELDS7 = #{alternateFields7}
+        </if>
+        <if test="alternateFields8 != null and alternateFields8 != ''">
+            or ALTERNATE_FIELDS8 = #{alternateFields8}
+        </if>
+    </delete>
+    <insert id="insert" parameterType="com.steerinfo.dil.model.DilAppCid">
+        insert into DIL_APP_CID (PRIMARY_ID, USER_CODE, CID,
+        INSERT_TIME, INSERT_USERNAME, UPDATE_TIME,
+        UPDATE_USERNAME, INSERT_UPDATE_REMARK, DELETED,
+        ALTERNATE_FIELDS1, ALTERNATE_FIELDS2, ALTERNATE_FIELDS3,
+        ALTERNATE_FIELDS4, ALTERNATE_FIELDS5, ALTERNATE_FIELDS6,
+        ALTERNATE_FIELDS7, ALTERNATE_FIELDS8)
+        values (#{primaryId,jdbcType=DECIMAL}, #{userCode,jdbcType=VARCHAR}, #{cid,jdbcType=VARCHAR},
+        #{insertTime,jdbcType=TIMESTAMP}, #{insertUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP},
+        #{updateUsername,jdbcType=VARCHAR}, #{insertUpdateRemark,jdbcType=VARCHAR}, #{deleted,jdbcType=DECIMAL},
+        #{alternateFields1,jdbcType=VARCHAR}, #{alternateFields2,jdbcType=VARCHAR},
         #{alternateFields3,jdbcType=VARCHAR},
-      </if>
-      <if test="alternateFields4 != null">
-        #{alternateFields4,jdbcType=VARCHAR},
-      </if>
-      <if test="alternateFields5 != null">
-        #{alternateFields5,jdbcType=VARCHAR},
-      </if>
-      <if test="alternateFields6 != null">
+        #{alternateFields4,jdbcType=VARCHAR}, #{alternateFields5,jdbcType=VARCHAR},
         #{alternateFields6,jdbcType=VARCHAR},
-      </if>
-      <if test="alternateFields7 != null">
-        #{alternateFields7,jdbcType=VARCHAR},
-      </if>
-      <if test="alternateFields8 != null">
-        #{alternateFields8,jdbcType=VARCHAR},
-      </if>
-    </trim>
-  </insert>
-  <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.DilAppCid">
-    update DIL_APP_CID
-    set USER_CODE = #{userCode,jdbcType=VARCHAR},
-      CID = #{cid,jdbcType=VARCHAR},
-      INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
-      INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
-      UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
-      UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
-      INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
-      DELETED = #{deleted,jdbcType=DECIMAL},
-      ALTERNATE_FIELDS1 = #{alternateFields1,jdbcType=VARCHAR},
-      ALTERNATE_FIELDS2 = #{alternateFields2,jdbcType=VARCHAR},
-      ALTERNATE_FIELDS3 = #{alternateFields3,jdbcType=VARCHAR},
-      ALTERNATE_FIELDS4 = #{alternateFields4,jdbcType=VARCHAR},
-      ALTERNATE_FIELDS5 = #{alternateFields5,jdbcType=VARCHAR},
-      ALTERNATE_FIELDS6 = #{alternateFields6,jdbcType=VARCHAR},
-      ALTERNATE_FIELDS7 = #{alternateFields7,jdbcType=VARCHAR},
-      ALTERNATE_FIELDS8 = #{alternateFields8,jdbcType=VARCHAR}
-    where PRIMARY_ID = #{primaryId,jdbcType=DECIMAL}
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.DilAppCid">
-    update DIL_APP_CID
-    <set>
-      <if test="userCode != null">
-        USER_CODE = #{userCode,jdbcType=VARCHAR},
-      </if>
-      <if test="cid != null">
+        #{alternateFields7,jdbcType=VARCHAR}, #{alternateFields8,jdbcType=VARCHAR})
+    </insert>
+    <insert id="insertSelective" parameterType="com.steerinfo.dil.model.DilAppCid">
+        insert into DIL_APP_CID
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="primaryId != null">
+                PRIMARY_ID,
+            </if>
+            <if test="userCode != null">
+                USER_CODE,
+            </if>
+            <if test="cid != null">
+                CID,
+            </if>
+            <if test="insertTime != null">
+                INSERT_TIME,
+            </if>
+            <if test="insertUsername != null">
+                INSERT_USERNAME,
+            </if>
+            <if test="updateTime != null">
+                UPDATE_TIME,
+            </if>
+            <if test="updateUsername != null">
+                UPDATE_USERNAME,
+            </if>
+            <if test="insertUpdateRemark != null">
+                INSERT_UPDATE_REMARK,
+            </if>
+            <if test="deleted != null">
+                DELETED,
+            </if>
+            <if test="alternateFields1 != null">
+                ALTERNATE_FIELDS1,
+            </if>
+            <if test="alternateFields2 != null">
+                ALTERNATE_FIELDS2,
+            </if>
+            <if test="alternateFields3 != null">
+                ALTERNATE_FIELDS3,
+            </if>
+            <if test="alternateFields4 != null">
+                ALTERNATE_FIELDS4,
+            </if>
+            <if test="alternateFields5 != null">
+                ALTERNATE_FIELDS5,
+            </if>
+            <if test="alternateFields6 != null">
+                ALTERNATE_FIELDS6,
+            </if>
+            <if test="alternateFields7 != null">
+                ALTERNATE_FIELDS7,
+            </if>
+            <if test="alternateFields8 != null">
+                ALTERNATE_FIELDS8,
+            </if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="primaryId != null">
+                #{primaryId,jdbcType=DECIMAL},
+            </if>
+            <if test="userCode != null">
+                #{userCode,jdbcType=VARCHAR},
+            </if>
+            <if test="cid != null">
+                #{cid,jdbcType=VARCHAR},
+            </if>
+            <if test="insertTime != null">
+                #{insertTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="insertUsername != null">
+                #{insertUsername,jdbcType=VARCHAR},
+            </if>
+            <if test="updateTime != null">
+                #{updateTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="updateUsername != null">
+                #{updateUsername,jdbcType=VARCHAR},
+            </if>
+            <if test="insertUpdateRemark != null">
+                #{insertUpdateRemark,jdbcType=VARCHAR},
+            </if>
+            <if test="deleted != null">
+                #{deleted,jdbcType=DECIMAL},
+            </if>
+            <if test="alternateFields1 != null">
+                #{alternateFields1,jdbcType=VARCHAR},
+            </if>
+            <if test="alternateFields2 != null">
+                #{alternateFields2,jdbcType=VARCHAR},
+            </if>
+            <if test="alternateFields3 != null">
+                #{alternateFields3,jdbcType=VARCHAR},
+            </if>
+            <if test="alternateFields4 != null">
+                #{alternateFields4,jdbcType=VARCHAR},
+            </if>
+            <if test="alternateFields5 != null">
+                #{alternateFields5,jdbcType=VARCHAR},
+            </if>
+            <if test="alternateFields6 != null">
+                #{alternateFields6,jdbcType=VARCHAR},
+            </if>
+            <if test="alternateFields7 != null">
+                #{alternateFields7,jdbcType=VARCHAR},
+            </if>
+            <if test="alternateFields8 != null">
+                #{alternateFields8,jdbcType=VARCHAR},
+            </if>
+        </trim>
+    </insert>
+    <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.DilAppCid">
+        update DIL_APP_CID
+        set USER_CODE = #{userCode,jdbcType=VARCHAR},
         CID = #{cid,jdbcType=VARCHAR},
-      </if>
-      <if test="insertTime != null">
         INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="insertUsername != null">
         INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
-      </if>
-      <if test="updateTime != null">
         UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="updateUsername != null">
         UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
-      </if>
-      <if test="insertUpdateRemark != null">
         INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
-      </if>
-      <if test="deleted != null">
         DELETED = #{deleted,jdbcType=DECIMAL},
-      </if>
-      <if test="alternateFields1 != null">
         ALTERNATE_FIELDS1 = #{alternateFields1,jdbcType=VARCHAR},
-      </if>
-      <if test="alternateFields2 != null">
         ALTERNATE_FIELDS2 = #{alternateFields2,jdbcType=VARCHAR},
-      </if>
-      <if test="alternateFields3 != null">
         ALTERNATE_FIELDS3 = #{alternateFields3,jdbcType=VARCHAR},
-      </if>
-      <if test="alternateFields4 != null">
         ALTERNATE_FIELDS4 = #{alternateFields4,jdbcType=VARCHAR},
-      </if>
-      <if test="alternateFields5 != null">
         ALTERNATE_FIELDS5 = #{alternateFields5,jdbcType=VARCHAR},
-      </if>
-      <if test="alternateFields6 != null">
         ALTERNATE_FIELDS6 = #{alternateFields6,jdbcType=VARCHAR},
-      </if>
-      <if test="alternateFields7 != null">
         ALTERNATE_FIELDS7 = #{alternateFields7,jdbcType=VARCHAR},
-      </if>
-      <if test="alternateFields8 != null">
-        ALTERNATE_FIELDS8 = #{alternateFields8,jdbcType=VARCHAR},
-      </if>
-    </set>
-    where PRIMARY_ID = #{primaryId,jdbcType=DECIMAL}
-  </update>
-  <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
-    <include refid="select"/>
-    where PRIMARY_ID = #{primaryId,jdbcType=DECIMAL}
-  </select>
-  <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
-    <include refid="select"/>
-    <include refid="where"/>
-  </select>
-  <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
-    <include refid="select"/>
-    <include refid="whereLike"/>
-  </select>
-  <insert id="batchInsert" parameterType="java.util.List">
-    insert into DIL_APP_CID 
-      (PRIMARY_ID, 
-      USER_CODE, CID, INSERT_TIME, 
-      INSERT_USERNAME, UPDATE_TIME, 
-      UPDATE_USERNAME, INSERT_UPDATE_REMARK, 
-      DELETED, ALTERNATE_FIELDS1, ALTERNATE_FIELDS2, 
-      ALTERNATE_FIELDS3, ALTERNATE_FIELDS4, 
-      ALTERNATE_FIELDS5, ALTERNATE_FIELDS6, 
-      ALTERNATE_FIELDS7, ALTERNATE_FIELDS8
-      )
-    ( <foreach collection="list" item="item" separator="union all"> 
-   select  
-      #{item.primaryId,jdbcType=DECIMAL}, 
-      #{item.userCode,jdbcType=VARCHAR}, #{item.cid,jdbcType=VARCHAR}, #{item.insertTime,jdbcType=TIMESTAMP}, 
-      #{item.insertUsername,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP}, 
-      #{item.updateUsername,jdbcType=VARCHAR}, #{item.insertUpdateRemark,jdbcType=VARCHAR}, 
-      #{item.deleted,jdbcType=DECIMAL}, #{item.alternateFields1,jdbcType=VARCHAR}, #{item.alternateFields2,jdbcType=VARCHAR}, 
-      #{item.alternateFields3,jdbcType=VARCHAR}, #{item.alternateFields4,jdbcType=VARCHAR}, 
-      #{item.alternateFields5,jdbcType=VARCHAR}, #{item.alternateFields6,jdbcType=VARCHAR}, 
-      #{item.alternateFields7,jdbcType=VARCHAR}, #{item.alternateFields8,jdbcType=VARCHAR}
-       from dual  
-   </foreach> )
-  </insert>
-  <update id="batchUpdate" parameterType="java.util.List">
-     update DIL_APP_CID
-     set
-       PRIMARY_ID=
-       <foreach collection="list" item="item" index="index" separator=" " open="case PRIMARY_ID" close="end">
-          when #{item.primaryId,jdbcType=DECIMAL} then #{item.primaryId,jdbcType=DECIMAL}
-       </foreach>
-       ,USER_CODE=
-       <foreach collection="list" item="item" index="index" separator=" " open="case PRIMARY_ID" close="end">
-          when #{item.primaryId,jdbcType=DECIMAL} then #{item.userCode,jdbcType=VARCHAR}
-       </foreach>
-       ,CID=
-       <foreach collection="list" item="item" index="index" separator=" " open="case PRIMARY_ID" close="end">
-          when #{item.primaryId,jdbcType=DECIMAL} then #{item.cid,jdbcType=VARCHAR}
-       </foreach>
-       ,INSERT_TIME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case PRIMARY_ID" close="end">
-          when #{item.primaryId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,INSERT_USERNAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case PRIMARY_ID" close="end">
-          when #{item.primaryId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
-       </foreach>
-       ,UPDATE_TIME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case PRIMARY_ID" close="end">
-          when #{item.primaryId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,UPDATE_USERNAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case PRIMARY_ID" close="end">
-          when #{item.primaryId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
-       </foreach>
-       ,INSERT_UPDATE_REMARK=
-       <foreach collection="list" item="item" index="index" separator=" " open="case PRIMARY_ID" close="end">
-          when #{item.primaryId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
-       </foreach>
-       ,DELETED=
-       <foreach collection="list" item="item" index="index" separator=" " open="case PRIMARY_ID" close="end">
-          when #{item.primaryId,jdbcType=DECIMAL} then #{item.deleted,jdbcType=DECIMAL}
-       </foreach>
-       ,ALTERNATE_FIELDS1=
-       <foreach collection="list" item="item" index="index" separator=" " open="case PRIMARY_ID" close="end">
-          when #{item.primaryId,jdbcType=DECIMAL} then #{item.alternateFields1,jdbcType=VARCHAR}
-       </foreach>
-       ,ALTERNATE_FIELDS2=
-       <foreach collection="list" item="item" index="index" separator=" " open="case PRIMARY_ID" close="end">
-          when #{item.primaryId,jdbcType=DECIMAL} then #{item.alternateFields2,jdbcType=VARCHAR}
-       </foreach>
-       ,ALTERNATE_FIELDS3=
-       <foreach collection="list" item="item" index="index" separator=" " open="case PRIMARY_ID" close="end">
-          when #{item.primaryId,jdbcType=DECIMAL} then #{item.alternateFields3,jdbcType=VARCHAR}
-       </foreach>
-       ,ALTERNATE_FIELDS4=
-       <foreach collection="list" item="item" index="index" separator=" " open="case PRIMARY_ID" close="end">
-          when #{item.primaryId,jdbcType=DECIMAL} then #{item.alternateFields4,jdbcType=VARCHAR}
-       </foreach>
-       ,ALTERNATE_FIELDS5=
-       <foreach collection="list" item="item" index="index" separator=" " open="case PRIMARY_ID" close="end">
-          when #{item.primaryId,jdbcType=DECIMAL} then #{item.alternateFields5,jdbcType=VARCHAR}
-       </foreach>
-       ,ALTERNATE_FIELDS6=
-       <foreach collection="list" item="item" index="index" separator=" " open="case PRIMARY_ID" close="end">
-          when #{item.primaryId,jdbcType=DECIMAL} then #{item.alternateFields6,jdbcType=VARCHAR}
-       </foreach>
-       ,ALTERNATE_FIELDS7=
-       <foreach collection="list" item="item" index="index" separator=" " open="case PRIMARY_ID" close="end">
-          when #{item.primaryId,jdbcType=DECIMAL} then #{item.alternateFields7,jdbcType=VARCHAR}
-       </foreach>
-       ,ALTERNATE_FIELDS8=
-       <foreach collection="list" item="item" index="index" separator=" " open="case PRIMARY_ID" close="end">
-          when #{item.primaryId,jdbcType=DECIMAL} then #{item.alternateFields8,jdbcType=VARCHAR}
-       </foreach>
-     where PRIMARY_ID in 
-     <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
-    #{item.primaryId,jdbcType=DECIMAL}
-     </foreach> 
-  </update>
-  <delete id="batchDelete" parameterType="java.util.List">
-    delete from DIL_APP_CID
-    where PRIMARY_ID in 
-    <foreach collection="list" item="id" open="(" close=")" separator=",">
-      #{id}
-    </foreach>
-  </delete>
-  <!-- 友情提示！！！-->
-  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
-  
+        ALTERNATE_FIELDS8 = #{alternateFields8,jdbcType=VARCHAR}
+        where PRIMARY_ID = #{primaryId,jdbcType=DECIMAL}
+    </update>
+    <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.DilAppCid">
+        update DIL_APP_CID
+        <set>
+            <if test="userCode != null">
+                USER_CODE = #{userCode,jdbcType=VARCHAR},
+            </if>
+            <if test="cid != null">
+                CID = #{cid,jdbcType=VARCHAR},
+            </if>
+            <if test="insertTime != null">
+                INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="insertUsername != null">
+                INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
+            </if>
+            <if test="updateTime != null">
+                UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="updateUsername != null">
+                UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
+            </if>
+            <if test="insertUpdateRemark != null">
+                INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
+            </if>
+            <if test="deleted != null">
+                DELETED = #{deleted,jdbcType=DECIMAL},
+            </if>
+            <if test="alternateFields1 != null">
+                ALTERNATE_FIELDS1 = #{alternateFields1,jdbcType=VARCHAR},
+            </if>
+            <if test="alternateFields2 != null">
+                ALTERNATE_FIELDS2 = #{alternateFields2,jdbcType=VARCHAR},
+            </if>
+            <if test="alternateFields3 != null">
+                ALTERNATE_FIELDS3 = #{alternateFields3,jdbcType=VARCHAR},
+            </if>
+            <if test="alternateFields4 != null">
+                ALTERNATE_FIELDS4 = #{alternateFields4,jdbcType=VARCHAR},
+            </if>
+            <if test="alternateFields5 != null">
+                ALTERNATE_FIELDS5 = #{alternateFields5,jdbcType=VARCHAR},
+            </if>
+            <if test="alternateFields6 != null">
+                ALTERNATE_FIELDS6 = #{alternateFields6,jdbcType=VARCHAR},
+            </if>
+            <if test="alternateFields7 != null">
+                ALTERNATE_FIELDS7 = #{alternateFields7,jdbcType=VARCHAR},
+            </if>
+            <if test="alternateFields8 != null">
+                ALTERNATE_FIELDS8 = #{alternateFields8,jdbcType=VARCHAR},
+            </if>
+        </set>
+        where PRIMARY_ID = #{primaryId,jdbcType=DECIMAL}
+    </update>
+    <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
+        <include refid="select"/>
+        where PRIMARY_ID = #{primaryId,jdbcType=DECIMAL}
+    </select>
+    <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+        <include refid="select"/>
+        <include refid="where"/>
+    </select>
+    <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+        <include refid="select"/>
+        <include refid="whereLike"/>
+    </select>
+    <insert id="batchInsert" parameterType="java.util.List">
+        insert into DIL_APP_CID
+        (PRIMARY_ID,
+        USER_CODE, CID, INSERT_TIME,
+        INSERT_USERNAME, UPDATE_TIME,
+        UPDATE_USERNAME, INSERT_UPDATE_REMARK,
+        DELETED, ALTERNATE_FIELDS1, ALTERNATE_FIELDS2,
+        ALTERNATE_FIELDS3, ALTERNATE_FIELDS4,
+        ALTERNATE_FIELDS5, ALTERNATE_FIELDS6,
+        ALTERNATE_FIELDS7, ALTERNATE_FIELDS8
+        )
+        ( <foreach collection="list" item="item" separator="union all">
+        select
+        #{item.primaryId,jdbcType=DECIMAL},
+        #{item.userCode,jdbcType=VARCHAR}, #{item.cid,jdbcType=VARCHAR}, #{item.insertTime,jdbcType=TIMESTAMP},
+        #{item.insertUsername,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP},
+        #{item.updateUsername,jdbcType=VARCHAR}, #{item.insertUpdateRemark,jdbcType=VARCHAR},
+        #{item.deleted,jdbcType=DECIMAL}, #{item.alternateFields1,jdbcType=VARCHAR},
+        #{item.alternateFields2,jdbcType=VARCHAR},
+        #{item.alternateFields3,jdbcType=VARCHAR}, #{item.alternateFields4,jdbcType=VARCHAR},
+        #{item.alternateFields5,jdbcType=VARCHAR}, #{item.alternateFields6,jdbcType=VARCHAR},
+        #{item.alternateFields7,jdbcType=VARCHAR}, #{item.alternateFields8,jdbcType=VARCHAR}
+        from dual
+    </foreach> )
+    </insert>
+    <update id="batchUpdate" parameterType="java.util.List">
+        update DIL_APP_CID
+        set
+        PRIMARY_ID=
+        <foreach collection="list" item="item" index="index" separator=" " open="case PRIMARY_ID" close="end">
+            when #{item.primaryId,jdbcType=DECIMAL} then #{item.primaryId,jdbcType=DECIMAL}
+        </foreach>
+        ,USER_CODE=
+        <foreach collection="list" item="item" index="index" separator=" " open="case PRIMARY_ID" close="end">
+            when #{item.primaryId,jdbcType=DECIMAL} then #{item.userCode,jdbcType=VARCHAR}
+        </foreach>
+        ,CID=
+        <foreach collection="list" item="item" index="index" separator=" " open="case PRIMARY_ID" close="end">
+            when #{item.primaryId,jdbcType=DECIMAL} then #{item.cid,jdbcType=VARCHAR}
+        </foreach>
+        ,INSERT_TIME=
+        <foreach collection="list" item="item" index="index" separator=" " open="case PRIMARY_ID" close="end">
+            when #{item.primaryId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
+        </foreach>
+        ,INSERT_USERNAME=
+        <foreach collection="list" item="item" index="index" separator=" " open="case PRIMARY_ID" close="end">
+            when #{item.primaryId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
+        </foreach>
+        ,UPDATE_TIME=
+        <foreach collection="list" item="item" index="index" separator=" " open="case PRIMARY_ID" close="end">
+            when #{item.primaryId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
+        </foreach>
+        ,UPDATE_USERNAME=
+        <foreach collection="list" item="item" index="index" separator=" " open="case PRIMARY_ID" close="end">
+            when #{item.primaryId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
+        </foreach>
+        ,INSERT_UPDATE_REMARK=
+        <foreach collection="list" item="item" index="index" separator=" " open="case PRIMARY_ID" close="end">
+            when #{item.primaryId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
+        </foreach>
+        ,DELETED=
+        <foreach collection="list" item="item" index="index" separator=" " open="case PRIMARY_ID" close="end">
+            when #{item.primaryId,jdbcType=DECIMAL} then #{item.deleted,jdbcType=DECIMAL}
+        </foreach>
+        ,ALTERNATE_FIELDS1=
+        <foreach collection="list" item="item" index="index" separator=" " open="case PRIMARY_ID" close="end">
+            when #{item.primaryId,jdbcType=DECIMAL} then #{item.alternateFields1,jdbcType=VARCHAR}
+        </foreach>
+        ,ALTERNATE_FIELDS2=
+        <foreach collection="list" item="item" index="index" separator=" " open="case PRIMARY_ID" close="end">
+            when #{item.primaryId,jdbcType=DECIMAL} then #{item.alternateFields2,jdbcType=VARCHAR}
+        </foreach>
+        ,ALTERNATE_FIELDS3=
+        <foreach collection="list" item="item" index="index" separator=" " open="case PRIMARY_ID" close="end">
+            when #{item.primaryId,jdbcType=DECIMAL} then #{item.alternateFields3,jdbcType=VARCHAR}
+        </foreach>
+        ,ALTERNATE_FIELDS4=
+        <foreach collection="list" item="item" index="index" separator=" " open="case PRIMARY_ID" close="end">
+            when #{item.primaryId,jdbcType=DECIMAL} then #{item.alternateFields4,jdbcType=VARCHAR}
+        </foreach>
+        ,ALTERNATE_FIELDS5=
+        <foreach collection="list" item="item" index="index" separator=" " open="case PRIMARY_ID" close="end">
+            when #{item.primaryId,jdbcType=DECIMAL} then #{item.alternateFields5,jdbcType=VARCHAR}
+        </foreach>
+        ,ALTERNATE_FIELDS6=
+        <foreach collection="list" item="item" index="index" separator=" " open="case PRIMARY_ID" close="end">
+            when #{item.primaryId,jdbcType=DECIMAL} then #{item.alternateFields6,jdbcType=VARCHAR}
+        </foreach>
+        ,ALTERNATE_FIELDS7=
+        <foreach collection="list" item="item" index="index" separator=" " open="case PRIMARY_ID" close="end">
+            when #{item.primaryId,jdbcType=DECIMAL} then #{item.alternateFields7,jdbcType=VARCHAR}
+        </foreach>
+        ,ALTERNATE_FIELDS8=
+        <foreach collection="list" item="item" index="index" separator=" " open="case PRIMARY_ID" close="end">
+            when #{item.primaryId,jdbcType=DECIMAL} then #{item.alternateFields8,jdbcType=VARCHAR}
+        </foreach>
+        where PRIMARY_ID in
+        <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
+            #{item.primaryId,jdbcType=DECIMAL}
+        </foreach>
+    </update>
+    <delete id="batchDelete" parameterType="java.util.List">
+        delete from DIL_APP_CID
+        where PRIMARY_ID in
+        <foreach collection="list" item="id" open="(" close=")" separator=",">
+            #{id}
+        </foreach>
+    </delete>
+    <!-- 友情提示！！！-->
+    <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+
 </mapper>

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

@@ -1,297 +1,301 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.steerinfo.dil.mapper.DilCidCapacityMapper">
-  <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.DilCidCapacity">
-    <id column="CID_CAPACITY_ID" jdbcType="DECIMAL" property="cidCapacityId" />
-    <result column="CID" jdbcType="VARCHAR" property="cid" />
-    <result column="CAPACITY_NUMBER" jdbcType="VARCHAR" property="capacityNumber" />
-    <result column="INSERT_USERNAME" jdbcType="VARCHAR" property="insertUsername" />
-    <result column="INSERT_TIME" jdbcType="TIMESTAMP" property="insertTime" />
-    <result column="UPDATE_USERNAME" jdbcType="VARCHAR" property="updateUsername" />
-    <result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime" />
-    <result column="INSERT_UPDATE_REMARK" jdbcType="VARCHAR" property="insertUpdateRemark" />
-  </resultMap>
-  <sql id="columns">
-    CID_CAPACITY_ID, CID, CAPACITY_NUMBER, INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, 
-    UPDATE_TIME, INSERT_UPDATE_REMARK
-  </sql>
-  <sql id="columns_alias">
-    t.CID_CAPACITY_ID, t.CID, t.CAPACITY_NUMBER, t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME, 
-    t.UPDATE_TIME, t.INSERT_UPDATE_REMARK
-  </sql>
-  <sql id="select">
-    SELECT <include refid="columns"/> FROM DIL_CID_CAPACITY
-  </sql>
-  <sql id="select_alias">
-    SELECT <include refid="columns_alias"/> FROM DIL_CID_CAPACITY t
-  </sql>
-  <sql id="where">
-    <where> 
-      <if test="cidCapacityId != null">
-        and CID_CAPACITY_ID = #{cidCapacityId}
-      </if>
-      <if test="cid != null and cid != ''">
-        and CID = #{cid}
-      </if>
-      <if test="capacityNumber != null and capacityNumber != ''">
-        and CAPACITY_NUMBER = #{capacityNumber}
-      </if>
-      <if test="insertUsername != null and insertUsername != ''">
-        and INSERT_USERNAME = #{insertUsername}
-      </if>
-      <if test="insertTime != null">
-        and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
-      </if>
-      <if test="updateUsername != null and updateUsername != ''">
-        and UPDATE_USERNAME = #{updateUsername}
-      </if>
-      <if test="updateTime != null">
-        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
-      </if>
-      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
-        and INSERT_UPDATE_REMARK = #{insertUpdateRemark}
-      </if>
-    </where>
-  </sql>
-  <sql id="whereLike">
-    <where> 
-      <if test="cidCapacityId != null">
-        and CID_CAPACITY_ID = #{cidCapacityId}
-      </if>
-      <if test="cid != null and cid != ''">
-        and CID LIKE '%${cid}%'
-      </if>
-      <if test="capacityNumber != null and capacityNumber != ''">
-        and CAPACITY_NUMBER LIKE '%${capacityNumber}%'
-      </if>
-      <if test="insertUsername != null and insertUsername != ''">
-        and INSERT_USERNAME LIKE '%${insertUsername}%'
-      </if>
-      <if test="insertTime != null">
-        and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
-      </if>
-      <if test="updateUsername != null and updateUsername != ''">
-        and UPDATE_USERNAME LIKE '%${updateUsername}%'
-      </if>
-      <if test="updateTime != null">
-        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
-      </if>
-      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
-        and INSERT_UPDATE_REMARK LIKE '%${insertUpdateRemark}%'
-      </if>
-    </where>
-  </sql>
-  <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
-    delete from DIL_CID_CAPACITY
-    where CID_CAPACITY_ID = #{cidCapacityId,jdbcType=DECIMAL}
-  </delete>
-  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
-    delete from DIL_CID_CAPACITY
-    where 1!=1 
-      <if test="cid != null and cid != ''">
-        or CID = #{cid}
-      </if>
-      <if test="capacityNumber != null and capacityNumber != ''">
-        or CAPACITY_NUMBER = #{capacityNumber}
-      </if>
-      <if test="insertUsername != null and insertUsername != ''">
-        or INSERT_USERNAME = #{insertUsername}
-      </if>
-      <if test="insertTime != null">
-        or TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = '#{insertTime}'
-      </if>
-      <if test="updateUsername != null and updateUsername != ''">
-        or UPDATE_USERNAME = #{updateUsername}
-      </if>
-      <if test="updateTime != null">
-        or TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = '#{updateTime}'
-      </if>
-      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
-        or INSERT_UPDATE_REMARK = #{insertUpdateRemark}
-      </if>
-  </delete>
-  <insert id="insert" parameterType="com.steerinfo.dil.model.DilCidCapacity">
-    insert into DIL_CID_CAPACITY (CID_CAPACITY_ID, CID, CAPACITY_NUMBER, 
-      INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, 
-      UPDATE_TIME, INSERT_UPDATE_REMARK)
-    values (#{cidCapacityId,jdbcType=DECIMAL}, #{cid,jdbcType=VARCHAR}, #{capacityNumber,jdbcType=VARCHAR}, 
-      #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR}, 
-      #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR})
-  </insert>
-  <insert id="insertSelective" parameterType="com.steerinfo.dil.model.DilCidCapacity">
-    insert into DIL_CID_CAPACITY
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="cidCapacityId != null">
-        CID_CAPACITY_ID,
-      </if>
-      <if test="cid != null">
-        CID,
-      </if>
-      <if test="capacityNumber != null">
-        CAPACITY_NUMBER,
-      </if>
-      <if test="insertUsername != null">
-        INSERT_USERNAME,
-      </if>
-      <if test="insertTime != null">
-        INSERT_TIME,
-      </if>
-      <if test="updateUsername != null">
-        UPDATE_USERNAME,
-      </if>
-      <if test="updateTime != null">
-        UPDATE_TIME,
-      </if>
-      <if test="insertUpdateRemark != null">
-        INSERT_UPDATE_REMARK,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="cidCapacityId != null">
-        #{cidCapacityId,jdbcType=DECIMAL},
-      </if>
-      <if test="cid != null">
-        #{cid,jdbcType=VARCHAR},
-      </if>
-      <if test="capacityNumber != null">
-        #{capacityNumber,jdbcType=VARCHAR},
-      </if>
-      <if test="insertUsername != null">
-        #{insertUsername,jdbcType=VARCHAR},
-      </if>
-      <if test="insertTime != null">
-        #{insertTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="updateUsername != null">
-        #{updateUsername,jdbcType=VARCHAR},
-      </if>
-      <if test="updateTime != null">
-        #{updateTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="insertUpdateRemark != null">
-        #{insertUpdateRemark,jdbcType=VARCHAR},
-      </if>
-    </trim>
-  </insert>
-  <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.DilCidCapacity">
-    update DIL_CID_CAPACITY
-    set CID = #{cid,jdbcType=VARCHAR},
-      CAPACITY_NUMBER = #{capacityNumber,jdbcType=VARCHAR},
-      INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
-      INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
-      UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
-      UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
-      INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR}
-    where CID_CAPACITY_ID = #{cidCapacityId,jdbcType=DECIMAL}
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.DilCidCapacity">
-    update DIL_CID_CAPACITY
-    <set>
-      <if test="cid != null">
-        CID = #{cid,jdbcType=VARCHAR},
-      </if>
-      <if test="capacityNumber != null">
+    <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.DilCidCapacity">
+        <id column="CID_CAPACITY_ID" jdbcType="DECIMAL" property="cidCapacityId"/>
+        <result column="CID" jdbcType="VARCHAR" property="cid"/>
+        <result column="CAPACITY_NUMBER" jdbcType="VARCHAR" property="capacityNumber"/>
+        <result column="INSERT_USERNAME" jdbcType="VARCHAR" property="insertUsername"/>
+        <result column="INSERT_TIME" jdbcType="TIMESTAMP" property="insertTime"/>
+        <result column="UPDATE_USERNAME" jdbcType="VARCHAR" property="updateUsername"/>
+        <result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime"/>
+        <result column="INSERT_UPDATE_REMARK" jdbcType="VARCHAR" property="insertUpdateRemark"/>
+    </resultMap>
+    <sql id="columns">
+        CID_CAPACITY_ID, CID, CAPACITY_NUMBER, INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME,
+        UPDATE_TIME, INSERT_UPDATE_REMARK
+    </sql>
+    <sql id="columns_alias">
+        t.CID_CAPACITY_ID, t.CID, t.CAPACITY_NUMBER, t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME,
+        t.UPDATE_TIME, t.INSERT_UPDATE_REMARK
+    </sql>
+    <sql id="select">
+        SELECT
+        <include refid="columns"/>
+        FROM DIL_CID_CAPACITY
+    </sql>
+    <sql id="select_alias">
+        SELECT
+        <include refid="columns_alias"/>
+        FROM DIL_CID_CAPACITY t
+    </sql>
+    <sql id="where">
+        <where>
+            <if test="cidCapacityId != null">
+                and CID_CAPACITY_ID = #{cidCapacityId}
+            </if>
+            <if test="cid != null and cid != ''">
+                and CID = #{cid}
+            </if>
+            <if test="capacityNumber != null and capacityNumber != ''">
+                and CAPACITY_NUMBER = #{capacityNumber}
+            </if>
+            <if test="insertUsername != null and insertUsername != ''">
+                and INSERT_USERNAME = #{insertUsername}
+            </if>
+            <if test="insertTime != null">
+                and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
+            </if>
+            <if test="updateUsername != null and updateUsername != ''">
+                and UPDATE_USERNAME = #{updateUsername}
+            </if>
+            <if test="updateTime != null">
+                and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+            </if>
+            <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+                and INSERT_UPDATE_REMARK = #{insertUpdateRemark}
+            </if>
+        </where>
+    </sql>
+    <sql id="whereLike">
+        <where>
+            <if test="cidCapacityId != null">
+                and CID_CAPACITY_ID = #{cidCapacityId}
+            </if>
+            <if test="cid != null and cid != ''">
+                and CID LIKE '%${cid}%'
+            </if>
+            <if test="capacityNumber != null and capacityNumber != ''">
+                and CAPACITY_NUMBER LIKE '%${capacityNumber}%'
+            </if>
+            <if test="insertUsername != null and insertUsername != ''">
+                and INSERT_USERNAME LIKE '%${insertUsername}%'
+            </if>
+            <if test="insertTime != null">
+                and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
+            </if>
+            <if test="updateUsername != null and updateUsername != ''">
+                and UPDATE_USERNAME LIKE '%${updateUsername}%'
+            </if>
+            <if test="updateTime != null">
+                and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+            </if>
+            <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+                and INSERT_UPDATE_REMARK LIKE '%${insertUpdateRemark}%'
+            </if>
+        </where>
+    </sql>
+    <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
+        delete from DIL_CID_CAPACITY
+        where CID_CAPACITY_ID = #{cidCapacityId,jdbcType=DECIMAL}
+    </delete>
+    <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+        delete from DIL_CID_CAPACITY
+        where 1!=1
+        <if test="cid != null and cid != ''">
+            or CID = #{cid}
+        </if>
+        <if test="capacityNumber != null and capacityNumber != ''">
+            or CAPACITY_NUMBER = #{capacityNumber}
+        </if>
+        <if test="insertUsername != null and insertUsername != ''">
+            or INSERT_USERNAME = #{insertUsername}
+        </if>
+        <if test="insertTime != null">
+            or TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = '#{insertTime}'
+        </if>
+        <if test="updateUsername != null and updateUsername != ''">
+            or UPDATE_USERNAME = #{updateUsername}
+        </if>
+        <if test="updateTime != null">
+            or TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = '#{updateTime}'
+        </if>
+        <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+            or INSERT_UPDATE_REMARK = #{insertUpdateRemark}
+        </if>
+    </delete>
+    <insert id="insert" parameterType="com.steerinfo.dil.model.DilCidCapacity">
+        insert into DIL_CID_CAPACITY (CID_CAPACITY_ID, CID, CAPACITY_NUMBER,
+        INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME,
+        UPDATE_TIME, INSERT_UPDATE_REMARK)
+        values (#{cidCapacityId,jdbcType=DECIMAL}, #{cid,jdbcType=VARCHAR}, #{capacityNumber,jdbcType=VARCHAR},
+        #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR},
+        #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR})
+    </insert>
+    <insert id="insertSelective" parameterType="com.steerinfo.dil.model.DilCidCapacity">
+        insert into DIL_CID_CAPACITY
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="cidCapacityId != null">
+                CID_CAPACITY_ID,
+            </if>
+            <if test="cid != null">
+                CID,
+            </if>
+            <if test="capacityNumber != null">
+                CAPACITY_NUMBER,
+            </if>
+            <if test="insertUsername != null">
+                INSERT_USERNAME,
+            </if>
+            <if test="insertTime != null">
+                INSERT_TIME,
+            </if>
+            <if test="updateUsername != null">
+                UPDATE_USERNAME,
+            </if>
+            <if test="updateTime != null">
+                UPDATE_TIME,
+            </if>
+            <if test="insertUpdateRemark != null">
+                INSERT_UPDATE_REMARK,
+            </if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="cidCapacityId != null">
+                #{cidCapacityId,jdbcType=DECIMAL},
+            </if>
+            <if test="cid != null">
+                #{cid,jdbcType=VARCHAR},
+            </if>
+            <if test="capacityNumber != null">
+                #{capacityNumber,jdbcType=VARCHAR},
+            </if>
+            <if test="insertUsername != null">
+                #{insertUsername,jdbcType=VARCHAR},
+            </if>
+            <if test="insertTime != null">
+                #{insertTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="updateUsername != null">
+                #{updateUsername,jdbcType=VARCHAR},
+            </if>
+            <if test="updateTime != null">
+                #{updateTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="insertUpdateRemark != null">
+                #{insertUpdateRemark,jdbcType=VARCHAR},
+            </if>
+        </trim>
+    </insert>
+    <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.DilCidCapacity">
+        update DIL_CID_CAPACITY
+        set CID = #{cid,jdbcType=VARCHAR},
         CAPACITY_NUMBER = #{capacityNumber,jdbcType=VARCHAR},
-      </if>
-      <if test="insertUsername != null">
         INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
-      </if>
-      <if test="insertTime != null">
         INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="updateUsername != null">
         UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
-      </if>
-      <if test="updateTime != null">
         UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="insertUpdateRemark != null">
-        INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
-      </if>
-    </set>
-    where CID_CAPACITY_ID = #{cidCapacityId,jdbcType=DECIMAL}
-  </update>
-  <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
-    <include refid="select"/>
-    where CID_CAPACITY_ID = #{cidCapacityId,jdbcType=DECIMAL}
-  </select>
-  <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
-    <include refid="select"/>
-    <include refid="where"/>
-  </select>
-  <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
-    <include refid="select"/>
-    <include refid="whereLike"/>
-  </select>
+        INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR}
+        where CID_CAPACITY_ID = #{cidCapacityId,jdbcType=DECIMAL}
+    </update>
+    <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.DilCidCapacity">
+        update DIL_CID_CAPACITY
+        <set>
+            <if test="cid != null">
+                CID = #{cid,jdbcType=VARCHAR},
+            </if>
+            <if test="capacityNumber != null">
+                CAPACITY_NUMBER = #{capacityNumber,jdbcType=VARCHAR},
+            </if>
+            <if test="insertUsername != null">
+                INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
+            </if>
+            <if test="insertTime != null">
+                INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="updateUsername != null">
+                UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
+            </if>
+            <if test="updateTime != null">
+                UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="insertUpdateRemark != null">
+                INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
+            </if>
+        </set>
+        where CID_CAPACITY_ID = #{cidCapacityId,jdbcType=DECIMAL}
+    </update>
+    <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
+        <include refid="select"/>
+        where CID_CAPACITY_ID = #{cidCapacityId,jdbcType=DECIMAL}
+    </select>
+    <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+        <include refid="select"/>
+        <include refid="where"/>
+    </select>
+    <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+        <include refid="select"/>
+        <include refid="whereLike"/>
+    </select>
 
-  <insert id="batchInsert" parameterType="java.util.List">
-    insert into DIL_CID_CAPACITY 
-      (CID_CAPACITY_ID, 
-      CID, CAPACITY_NUMBER, INSERT_USERNAME, 
-      INSERT_TIME, UPDATE_USERNAME, 
-      UPDATE_TIME, INSERT_UPDATE_REMARK
-      )
-    ( <foreach collection="list" item="item" separator="union all"> 
-   select  
-      #{item.cidCapacityId,jdbcType=DECIMAL}, 
-      #{item.cid,jdbcType=VARCHAR}, #{item.capacityNumber,jdbcType=VARCHAR}, #{item.insertUsername,jdbcType=VARCHAR}, 
-      #{item.insertTime,jdbcType=TIMESTAMP}, #{item.updateUsername,jdbcType=VARCHAR}, 
-      #{item.updateTime,jdbcType=TIMESTAMP}, #{item.insertUpdateRemark,jdbcType=VARCHAR}
-       from dual  
-   </foreach> )
-  </insert>
-  <update id="batchUpdate" parameterType="java.util.List">
-     update DIL_CID_CAPACITY
-     set
-       CID_CAPACITY_ID=
-       <foreach collection="list" item="item" index="index" separator=" " open="case CID_CAPACITY_ID" close="end">
-          when #{item.cidCapacityId,jdbcType=DECIMAL} then #{item.cidCapacityId,jdbcType=DECIMAL}
-       </foreach>
-       ,CID=
-       <foreach collection="list" item="item" index="index" separator=" " open="case CID_CAPACITY_ID" close="end">
-          when #{item.cidCapacityId,jdbcType=DECIMAL} then #{item.cid,jdbcType=VARCHAR}
-       </foreach>
-       ,CAPACITY_NUMBER=
-       <foreach collection="list" item="item" index="index" separator=" " open="case CID_CAPACITY_ID" close="end">
-          when #{item.cidCapacityId,jdbcType=DECIMAL} then #{item.capacityNumber,jdbcType=VARCHAR}
-       </foreach>
-       ,INSERT_USERNAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case CID_CAPACITY_ID" close="end">
-          when #{item.cidCapacityId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
-       </foreach>
-       ,INSERT_TIME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case CID_CAPACITY_ID" close="end">
-          when #{item.cidCapacityId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,UPDATE_USERNAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case CID_CAPACITY_ID" close="end">
-          when #{item.cidCapacityId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
-       </foreach>
-       ,UPDATE_TIME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case CID_CAPACITY_ID" close="end">
-          when #{item.cidCapacityId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,INSERT_UPDATE_REMARK=
-       <foreach collection="list" item="item" index="index" separator=" " open="case CID_CAPACITY_ID" close="end">
-          when #{item.cidCapacityId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
-       </foreach>
-     where CID_CAPACITY_ID in 
-     <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
-    #{item.cidCapacityId,jdbcType=DECIMAL}
-     </foreach> 
-  </update>
-  <delete id="batchDelete" parameterType="java.util.List">
-    delete from DIL_CID_CAPACITY
-    where CID_CAPACITY_ID in 
-    <foreach collection="list" item="id" open="(" close=")" separator=",">
-      #{id}
-    </foreach>
-  </delete>
-  <!-- 友情提示！！！-->
-  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
-  <select id="selectByCidAndCapacityNo" resultType="java.lang.Integer" parameterType="string">
-    select count(DCC.CAPACITY_NUMBER) from DIL_CID_CAPACITY DCC
-    WHERE DCC.CAPACITY_NUMBER = #{capacityNo}
-    AND DCC.CID = #{cid}
-  </select>
+    <insert id="batchInsert" parameterType="java.util.List">
+        insert into DIL_CID_CAPACITY
+        (CID_CAPACITY_ID,
+        CID, CAPACITY_NUMBER, INSERT_USERNAME,
+        INSERT_TIME, UPDATE_USERNAME,
+        UPDATE_TIME, INSERT_UPDATE_REMARK
+        )
+        ( <foreach collection="list" item="item" separator="union all">
+        select
+        #{item.cidCapacityId,jdbcType=DECIMAL},
+        #{item.cid,jdbcType=VARCHAR}, #{item.capacityNumber,jdbcType=VARCHAR}, #{item.insertUsername,jdbcType=VARCHAR},
+        #{item.insertTime,jdbcType=TIMESTAMP}, #{item.updateUsername,jdbcType=VARCHAR},
+        #{item.updateTime,jdbcType=TIMESTAMP}, #{item.insertUpdateRemark,jdbcType=VARCHAR}
+        from dual
+    </foreach> )
+    </insert>
+    <update id="batchUpdate" parameterType="java.util.List">
+        update DIL_CID_CAPACITY
+        set
+        CID_CAPACITY_ID=
+        <foreach collection="list" item="item" index="index" separator=" " open="case CID_CAPACITY_ID" close="end">
+            when #{item.cidCapacityId,jdbcType=DECIMAL} then #{item.cidCapacityId,jdbcType=DECIMAL}
+        </foreach>
+        ,CID=
+        <foreach collection="list" item="item" index="index" separator=" " open="case CID_CAPACITY_ID" close="end">
+            when #{item.cidCapacityId,jdbcType=DECIMAL} then #{item.cid,jdbcType=VARCHAR}
+        </foreach>
+        ,CAPACITY_NUMBER=
+        <foreach collection="list" item="item" index="index" separator=" " open="case CID_CAPACITY_ID" close="end">
+            when #{item.cidCapacityId,jdbcType=DECIMAL} then #{item.capacityNumber,jdbcType=VARCHAR}
+        </foreach>
+        ,INSERT_USERNAME=
+        <foreach collection="list" item="item" index="index" separator=" " open="case CID_CAPACITY_ID" close="end">
+            when #{item.cidCapacityId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
+        </foreach>
+        ,INSERT_TIME=
+        <foreach collection="list" item="item" index="index" separator=" " open="case CID_CAPACITY_ID" close="end">
+            when #{item.cidCapacityId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
+        </foreach>
+        ,UPDATE_USERNAME=
+        <foreach collection="list" item="item" index="index" separator=" " open="case CID_CAPACITY_ID" close="end">
+            when #{item.cidCapacityId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
+        </foreach>
+        ,UPDATE_TIME=
+        <foreach collection="list" item="item" index="index" separator=" " open="case CID_CAPACITY_ID" close="end">
+            when #{item.cidCapacityId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
+        </foreach>
+        ,INSERT_UPDATE_REMARK=
+        <foreach collection="list" item="item" index="index" separator=" " open="case CID_CAPACITY_ID" close="end">
+            when #{item.cidCapacityId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
+        </foreach>
+        where CID_CAPACITY_ID in
+        <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
+            #{item.cidCapacityId,jdbcType=DECIMAL}
+        </foreach>
+    </update>
+    <delete id="batchDelete" parameterType="java.util.List">
+        delete from DIL_CID_CAPACITY
+        where CID_CAPACITY_ID in
+        <foreach collection="list" item="id" open="(" close=")" separator=",">
+            #{id}
+        </foreach>
+    </delete>
+    <!-- 友情提示！！！-->
+    <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+    <select id="selectByCidAndCapacityNo" resultType="java.lang.Integer" parameterType="string">
+        select count(DCC.CAPACITY_NUMBER) from DIL_CID_CAPACITY DCC
+        WHERE DCC.CAPACITY_NUMBER = #{capacityNo}
+        AND DCC.CID = #{cid}
+    </select>
 </mapper>

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

@@ -1,257 +1,261 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.steerinfo.dil.mapper.DilRoleOrgcodeTableMapper">
-  <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.DilRoleOrgcodeTable">
-    <id column="PRIMARY_ID" jdbcType="DECIMAL" property="primaryId" />
-    <result column="ORG_CODE" jdbcType="VARCHAR" property="orgCode" />
-    <result column="USER_NAME" jdbcType="VARCHAR" property="userName" />
-    <result column="COLUMN_ID" jdbcType="DECIMAL" property="columnId" />
-    <result column="PRIMARY_NAME" jdbcType="VARCHAR" property="primaryName" />
-    <result column="ENABLE_STATUS" jdbcType="DECIMAL" property="enableStatus" />
-  </resultMap>
-  <sql id="columns">
-    PRIMARY_ID, ORG_CODE, USER_NAME, COLUMN_ID, PRIMARY_NAME, ENABLE_STATUS
-  </sql>
-  <sql id="columns_alias">
-    t.PRIMARY_ID, t.ORG_CODE, t.USER_NAME, t.COLUMN_ID, t.PRIMARY_NAME, t.ENABLE_STATUS
-  </sql>
-  <sql id="select">
-    SELECT <include refid="columns"/> FROM DIL_ROLE_ORGCODE_TABLE
-  </sql>
-  <sql id="select_alias">
-    SELECT <include refid="columns_alias"/> FROM DIL_ROLE_ORGCODE_TABLE t
-  </sql>
-  <sql id="where">
-    <where>
-      <if test="primaryId != null">
-        and PRIMARY_ID = #{primaryId}
-      </if>
-      <if test="orgCode != null and orgCode != ''">
-        and ORG_CODE = #{orgCode}
-      </if>
-      <if test="userName != null and userName != ''">
-        and USER_NAME = #{userName}
-      </if>
-      <if test="columnId != null">
-        and COLUMN_ID = #{columnId}
-      </if>
-      <if test="primaryName != null and primaryName != ''">
-        and PRIMARY_NAME = #{primaryName}
-      </if>
-      <if test="enableStatus != null">
-        and ENABLE_STATUS = #{enableStatus}
-      </if>
-    </where>
-  </sql>
-  <sql id="whereLike">
-    <where>
-      <if test="primaryId != null">
-        and PRIMARY_ID = #{primaryId}
-      </if>
-      <if test="orgCode != null and orgCode != ''">
-        and ORG_CODE LIKE '%${orgCode}%'
-      </if>
-      <if test="userName != null and userName != ''">
-        and USER_NAME LIKE '%${userName}%'
-      </if>
-      <if test="columnId != null">
-        and COLUMN_ID = #{columnId}
-      </if>
-      <if test="primaryName != null and primaryName != ''">
-        and PRIMARY_NAME LIKE '%${primaryName}%'
-      </if>
-      <if test="enableStatus != null">
-        and ENABLE_STATUS = #{enableStatus}
-      </if>
-    </where>
-  </sql>
-  <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
-    delete from DIL_ROLE_ORGCODE_TABLE
-    where PRIMARY_ID = #{primaryId,jdbcType=DECIMAL}
-  </delete>
-  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
-    delete from DIL_ROLE_ORGCODE_TABLE
-    where 1!=1
-    <if test="orgCode != null and orgCode != ''">
-      or ORG_CODE = #{orgCode}
-    </if>
-    <if test="userName != null and userName != ''">
-      or USER_NAME = #{userName}
-    </if>
-    <if test="columnId != null">
-      or COLUMN_ID = #{columnId}
-    </if>
-    <if test="primaryName != null and primaryName != ''">
-      or PRIMARY_NAME = #{primaryName}
-    </if>
-    <if test="enableStatus != null">
-      or ENABLE_STATUS = #{enableStatus}
-    </if>
-  </delete>
-  <insert id="insert" parameterType="com.steerinfo.dil.model.DilRoleOrgcodeTable">
-    insert into DIL_ROLE_ORGCODE_TABLE (PRIMARY_ID, ORG_CODE, USER_NAME,
-                                        COLUMN_ID, PRIMARY_NAME, ENABLE_STATUS
-    )
-    values (#{primaryId,jdbcType=DECIMAL}, #{orgCode,jdbcType=VARCHAR}, #{userName,jdbcType=VARCHAR},
-            #{columnId,jdbcType=DECIMAL}, #{primaryName,jdbcType=VARCHAR}, #{enableStatus,jdbcType=DECIMAL}
-           )
-  </insert>
-  <insert id="insertSelective" parameterType="com.steerinfo.dil.model.DilRoleOrgcodeTable">
-    insert into DIL_ROLE_ORGCODE_TABLE
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="primaryId != null">
-        PRIMARY_ID,
-      </if>
-      <if test="orgCode != null">
-        ORG_CODE,
-      </if>
-      <if test="userName != null">
-        USER_NAME,
-      </if>
-      <if test="columnId != null">
-        COLUMN_ID,
-      </if>
-      <if test="primaryName != null">
-        PRIMARY_NAME,
-      </if>
-      <if test="enableStatus != null">
-        ENABLE_STATUS,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="primaryId != null">
-        #{primaryId,jdbcType=DECIMAL},
-      </if>
-      <if test="orgCode != null">
-        #{orgCode,jdbcType=VARCHAR},
-      </if>
-      <if test="userName != null">
-        #{userName,jdbcType=VARCHAR},
-      </if>
-      <if test="columnId != null">
-        #{columnId,jdbcType=DECIMAL},
-      </if>
-      <if test="primaryName != null">
-        #{primaryName,jdbcType=VARCHAR},
-      </if>
-      <if test="enableStatus != null">
-        #{enableStatus,jdbcType=DECIMAL},
-      </if>
-    </trim>
-  </insert>
-  <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.DilRoleOrgcodeTable">
-    update DIL_ROLE_ORGCODE_TABLE
-    set ORG_CODE = #{orgCode,jdbcType=VARCHAR},
+    <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.DilRoleOrgcodeTable">
+        <id column="PRIMARY_ID" jdbcType="DECIMAL" property="primaryId"/>
+        <result column="ORG_CODE" jdbcType="VARCHAR" property="orgCode"/>
+        <result column="USER_NAME" jdbcType="VARCHAR" property="userName"/>
+        <result column="COLUMN_ID" jdbcType="DECIMAL" property="columnId"/>
+        <result column="PRIMARY_NAME" jdbcType="VARCHAR" property="primaryName"/>
+        <result column="ENABLE_STATUS" jdbcType="DECIMAL" property="enableStatus"/>
+    </resultMap>
+    <sql id="columns">
+        PRIMARY_ID, ORG_CODE, USER_NAME, COLUMN_ID, PRIMARY_NAME, ENABLE_STATUS
+    </sql>
+    <sql id="columns_alias">
+        t.PRIMARY_ID, t.ORG_CODE, t.USER_NAME, t.COLUMN_ID, t.PRIMARY_NAME, t.ENABLE_STATUS
+    </sql>
+    <sql id="select">
+        SELECT
+        <include refid="columns"/>
+        FROM DIL_ROLE_ORGCODE_TABLE
+    </sql>
+    <sql id="select_alias">
+        SELECT
+        <include refid="columns_alias"/>
+        FROM DIL_ROLE_ORGCODE_TABLE t
+    </sql>
+    <sql id="where">
+        <where>
+            <if test="primaryId != null">
+                and PRIMARY_ID = #{primaryId}
+            </if>
+            <if test="orgCode != null and orgCode != ''">
+                and ORG_CODE = #{orgCode}
+            </if>
+            <if test="userName != null and userName != ''">
+                and USER_NAME = #{userName}
+            </if>
+            <if test="columnId != null">
+                and COLUMN_ID = #{columnId}
+            </if>
+            <if test="primaryName != null and primaryName != ''">
+                and PRIMARY_NAME = #{primaryName}
+            </if>
+            <if test="enableStatus != null">
+                and ENABLE_STATUS = #{enableStatus}
+            </if>
+        </where>
+    </sql>
+    <sql id="whereLike">
+        <where>
+            <if test="primaryId != null">
+                and PRIMARY_ID = #{primaryId}
+            </if>
+            <if test="orgCode != null and orgCode != ''">
+                and ORG_CODE LIKE '%${orgCode}%'
+            </if>
+            <if test="userName != null and userName != ''">
+                and USER_NAME LIKE '%${userName}%'
+            </if>
+            <if test="columnId != null">
+                and COLUMN_ID = #{columnId}
+            </if>
+            <if test="primaryName != null and primaryName != ''">
+                and PRIMARY_NAME LIKE '%${primaryName}%'
+            </if>
+            <if test="enableStatus != null">
+                and ENABLE_STATUS = #{enableStatus}
+            </if>
+        </where>
+    </sql>
+    <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
+        delete from DIL_ROLE_ORGCODE_TABLE
+        where PRIMARY_ID = #{primaryId,jdbcType=DECIMAL}
+    </delete>
+    <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+        delete from DIL_ROLE_ORGCODE_TABLE
+        where 1!=1
+        <if test="orgCode != null and orgCode != ''">
+            or ORG_CODE = #{orgCode}
+        </if>
+        <if test="userName != null and userName != ''">
+            or USER_NAME = #{userName}
+        </if>
+        <if test="columnId != null">
+            or COLUMN_ID = #{columnId}
+        </if>
+        <if test="primaryName != null and primaryName != ''">
+            or PRIMARY_NAME = #{primaryName}
+        </if>
+        <if test="enableStatus != null">
+            or ENABLE_STATUS = #{enableStatus}
+        </if>
+    </delete>
+    <insert id="insert" parameterType="com.steerinfo.dil.model.DilRoleOrgcodeTable">
+        insert into DIL_ROLE_ORGCODE_TABLE (PRIMARY_ID, ORG_CODE, USER_NAME,
+        COLUMN_ID, PRIMARY_NAME, ENABLE_STATUS
+        )
+        values (#{primaryId,jdbcType=DECIMAL}, #{orgCode,jdbcType=VARCHAR}, #{userName,jdbcType=VARCHAR},
+        #{columnId,jdbcType=DECIMAL}, #{primaryName,jdbcType=VARCHAR}, #{enableStatus,jdbcType=DECIMAL}
+        )
+    </insert>
+    <insert id="insertSelective" parameterType="com.steerinfo.dil.model.DilRoleOrgcodeTable">
+        insert into DIL_ROLE_ORGCODE_TABLE
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="primaryId != null">
+                PRIMARY_ID,
+            </if>
+            <if test="orgCode != null">
+                ORG_CODE,
+            </if>
+            <if test="userName != null">
+                USER_NAME,
+            </if>
+            <if test="columnId != null">
+                COLUMN_ID,
+            </if>
+            <if test="primaryName != null">
+                PRIMARY_NAME,
+            </if>
+            <if test="enableStatus != null">
+                ENABLE_STATUS,
+            </if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="primaryId != null">
+                #{primaryId,jdbcType=DECIMAL},
+            </if>
+            <if test="orgCode != null">
+                #{orgCode,jdbcType=VARCHAR},
+            </if>
+            <if test="userName != null">
+                #{userName,jdbcType=VARCHAR},
+            </if>
+            <if test="columnId != null">
+                #{columnId,jdbcType=DECIMAL},
+            </if>
+            <if test="primaryName != null">
+                #{primaryName,jdbcType=VARCHAR},
+            </if>
+            <if test="enableStatus != null">
+                #{enableStatus,jdbcType=DECIMAL},
+            </if>
+        </trim>
+    </insert>
+    <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.DilRoleOrgcodeTable">
+        update DIL_ROLE_ORGCODE_TABLE
+        set ORG_CODE = #{orgCode,jdbcType=VARCHAR},
         USER_NAME = #{userName,jdbcType=VARCHAR},
         COLUMN_ID = #{columnId,jdbcType=DECIMAL},
         PRIMARY_NAME = #{primaryName,jdbcType=VARCHAR},
         ENABLE_STATUS = #{enableStatus,jdbcType=DECIMAL}
-    where PRIMARY_ID = #{primaryId,jdbcType=DECIMAL}
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.DilRoleOrgcodeTable">
-    update DIL_ROLE_ORGCODE_TABLE
-    <set>
-      <if test="orgCode != null">
-        ORG_CODE = #{orgCode,jdbcType=VARCHAR},
-      </if>
-      <if test="userName != null">
-        USER_NAME = #{userName,jdbcType=VARCHAR},
-      </if>
-      <if test="columnId != null">
-        COLUMN_ID = #{columnId,jdbcType=DECIMAL},
-      </if>
-      <if test="primaryName != null">
-        PRIMARY_NAME = #{primaryName,jdbcType=VARCHAR},
-      </if>
-      <if test="enableStatus != null">
-        ENABLE_STATUS = #{enableStatus,jdbcType=DECIMAL},
-      </if>
-    </set>
-    where PRIMARY_ID = #{primaryId,jdbcType=DECIMAL}
-  </update>
-  <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
-    <include refid="select"/>
-    where PRIMARY_ID = #{primaryId,jdbcType=DECIMAL}
-  </select>
-  <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
-    <include refid="select"/>
-    <include refid="where"/>
-  </select>
-  <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
-    <include refid="select"/>
-    <include refid="whereLike"/>
-  </select>
-  <insert id="batchInsert" parameterType="java.util.List">
-    insert into DIL_ROLE_ORGCODE_TABLE
-    (PRIMARY_ID,
-    ORG_CODE, USER_NAME, COLUMN_ID,
-    PRIMARY_NAME, ENABLE_STATUS)
-    ( <foreach collection="list" item="item" separator="union all">
-    select
-    #{item.primaryId,jdbcType=DECIMAL},
-    #{item.orgCode,jdbcType=VARCHAR}, #{item.userName,jdbcType=VARCHAR}, #{item.columnId,jdbcType=DECIMAL},
-    #{item.primaryName,jdbcType=VARCHAR}, #{item.enableStatus,jdbcType=DECIMAL} from dual
-  </foreach> )
-  </insert>
-  <update id="batchUpdate" parameterType="java.util.List">
-    update DIL_ROLE_ORGCODE_TABLE
-    set
-    PRIMARY_ID=
-    <foreach collection="list" item="item" index="index" separator=" " open="case PRIMARY_ID" close="end">
-      when #{item.primaryId,jdbcType=DECIMAL} then #{item.primaryId,jdbcType=DECIMAL}
-    </foreach>
-    ,ORG_CODE=
-    <foreach collection="list" item="item" index="index" separator=" " open="case PRIMARY_ID" close="end">
-      when #{item.primaryId,jdbcType=DECIMAL} then #{item.orgCode,jdbcType=VARCHAR}
-    </foreach>
-    ,USER_NAME=
-    <foreach collection="list" item="item" index="index" separator=" " open="case PRIMARY_ID" close="end">
-      when #{item.primaryId,jdbcType=DECIMAL} then #{item.userName,jdbcType=VARCHAR}
-    </foreach>
-    ,COLUMN_ID=
-    <foreach collection="list" item="item" index="index" separator=" " open="case PRIMARY_ID" close="end">
-      when #{item.primaryId,jdbcType=DECIMAL} then #{item.columnId,jdbcType=DECIMAL}
-    </foreach>
-    ,PRIMARY_NAME=
-    <foreach collection="list" item="item" index="index" separator=" " open="case PRIMARY_ID" close="end">
-      when #{item.primaryId,jdbcType=DECIMAL} then #{item.primaryName,jdbcType=VARCHAR}
-    </foreach>
-    ,ENABLE_STATUS=
-    <foreach collection="list" item="item" index="index" separator=" " open="case PRIMARY_ID" close="end">
-      when #{item.primaryId,jdbcType=DECIMAL} then #{item.enableStatus,jdbcType=DECIMAL}
-    </foreach>
-    where PRIMARY_ID in
-    <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
-      #{item.primaryId,jdbcType=DECIMAL}
-    </foreach>
-  </update>
+        where PRIMARY_ID = #{primaryId,jdbcType=DECIMAL}
+    </update>
+    <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.DilRoleOrgcodeTable">
+        update DIL_ROLE_ORGCODE_TABLE
+        <set>
+            <if test="orgCode != null">
+                ORG_CODE = #{orgCode,jdbcType=VARCHAR},
+            </if>
+            <if test="userName != null">
+                USER_NAME = #{userName,jdbcType=VARCHAR},
+            </if>
+            <if test="columnId != null">
+                COLUMN_ID = #{columnId,jdbcType=DECIMAL},
+            </if>
+            <if test="primaryName != null">
+                PRIMARY_NAME = #{primaryName,jdbcType=VARCHAR},
+            </if>
+            <if test="enableStatus != null">
+                ENABLE_STATUS = #{enableStatus,jdbcType=DECIMAL},
+            </if>
+        </set>
+        where PRIMARY_ID = #{primaryId,jdbcType=DECIMAL}
+    </update>
+    <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
+        <include refid="select"/>
+        where PRIMARY_ID = #{primaryId,jdbcType=DECIMAL}
+    </select>
+    <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+        <include refid="select"/>
+        <include refid="where"/>
+    </select>
+    <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+        <include refid="select"/>
+        <include refid="whereLike"/>
+    </select>
+    <insert id="batchInsert" parameterType="java.util.List">
+        insert into DIL_ROLE_ORGCODE_TABLE
+        (PRIMARY_ID,
+        ORG_CODE, USER_NAME, COLUMN_ID,
+        PRIMARY_NAME, ENABLE_STATUS)
+        ( <foreach collection="list" item="item" separator="union all">
+        select
+        #{item.primaryId,jdbcType=DECIMAL},
+        #{item.orgCode,jdbcType=VARCHAR}, #{item.userName,jdbcType=VARCHAR}, #{item.columnId,jdbcType=DECIMAL},
+        #{item.primaryName,jdbcType=VARCHAR}, #{item.enableStatus,jdbcType=DECIMAL} from dual
+    </foreach> )
+    </insert>
+    <update id="batchUpdate" parameterType="java.util.List">
+        update DIL_ROLE_ORGCODE_TABLE
+        set
+        PRIMARY_ID=
+        <foreach collection="list" item="item" index="index" separator=" " open="case PRIMARY_ID" close="end">
+            when #{item.primaryId,jdbcType=DECIMAL} then #{item.primaryId,jdbcType=DECIMAL}
+        </foreach>
+        ,ORG_CODE=
+        <foreach collection="list" item="item" index="index" separator=" " open="case PRIMARY_ID" close="end">
+            when #{item.primaryId,jdbcType=DECIMAL} then #{item.orgCode,jdbcType=VARCHAR}
+        </foreach>
+        ,USER_NAME=
+        <foreach collection="list" item="item" index="index" separator=" " open="case PRIMARY_ID" close="end">
+            when #{item.primaryId,jdbcType=DECIMAL} then #{item.userName,jdbcType=VARCHAR}
+        </foreach>
+        ,COLUMN_ID=
+        <foreach collection="list" item="item" index="index" separator=" " open="case PRIMARY_ID" close="end">
+            when #{item.primaryId,jdbcType=DECIMAL} then #{item.columnId,jdbcType=DECIMAL}
+        </foreach>
+        ,PRIMARY_NAME=
+        <foreach collection="list" item="item" index="index" separator=" " open="case PRIMARY_ID" close="end">
+            when #{item.primaryId,jdbcType=DECIMAL} then #{item.primaryName,jdbcType=VARCHAR}
+        </foreach>
+        ,ENABLE_STATUS=
+        <foreach collection="list" item="item" index="index" separator=" " open="case PRIMARY_ID" close="end">
+            when #{item.primaryId,jdbcType=DECIMAL} then #{item.enableStatus,jdbcType=DECIMAL}
+        </foreach>
+        where PRIMARY_ID in
+        <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
+            #{item.primaryId,jdbcType=DECIMAL}
+        </foreach>
+    </update>
 
-  <delete id="batchDelete" parameterType="java.util.List">
-    delete from DIL_ROLE_ORGCODE_TABLE
-    where PRIMARY_ID in
-    <foreach collection="list" item="id" open="(" close=")" separator=",">
-      #{id}
-    </foreach>
-  </delete>
+    <delete id="batchDelete" parameterType="java.util.List">
+        delete from DIL_ROLE_ORGCODE_TABLE
+        where PRIMARY_ID in
+        <foreach collection="list" item="id" open="(" close=")" separator=",">
+            #{id}
+        </foreach>
+    </delete>
 
-  <!-- 友情提示！！！-->
-  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
-  <delete id="deleteSchmenLColumnData" parameterType="map">
-    delete from DIL_ROLE_ORGCODE_TABLE DROT
-    where DROT.USER_NAME = #{userName}
-    and DROT.ORG_CODE = #{orgCode}
-    and DROT.PRIMARY_NAME = #{schemeName}
-    AND DROT.COLUMN_ID IN (SELECT DTCR.PRIMARY_ID FROM DIL_TABLE_COLUMN_ROLE DTCR
-    WHERE DTCR.TABLE_NAME = #{tableName})
-  </delete>
-  <update id="updateEnableStatus" parameterType="map">
-    UPDATE DIL_ROLE_ORGCODE_TABLE DROT
-    SET DROT.ENABLE_STATUS = 0
-    where
-    DROT.USER_NAME = #{userName}
-    AND DROT.COLUMN_ID IN
-    (SELECT DTCR.PRIMARY_ID FROM DIL_TABLE_COLUMN_ROLE DTCR
-    WHERE DTCR.TABLE_NAME = #{tableName})
-    AND DROT.ORG_CODE = #{orgCode}
-  </update>
+    <!-- 友情提示！！！-->
+    <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+    <delete id="deleteSchmenLColumnData" parameterType="map">
+        delete from DIL_ROLE_ORGCODE_TABLE DROT
+        where DROT.USER_NAME = #{userName}
+        and DROT.ORG_CODE = #{orgCode}
+        and DROT.PRIMARY_NAME = #{schemeName}
+        AND DROT.COLUMN_ID IN (SELECT DTCR.PRIMARY_ID FROM DIL_TABLE_COLUMN_ROLE DTCR
+        WHERE DTCR.TABLE_NAME = #{tableName})
+    </delete>
+    <update id="updateEnableStatus" parameterType="map">
+        UPDATE DIL_ROLE_ORGCODE_TABLE DROT
+        SET DROT.ENABLE_STATUS = 0
+        where
+        DROT.USER_NAME = #{userName}
+        AND DROT.COLUMN_ID IN
+        (SELECT DTCR.PRIMARY_ID FROM DIL_TABLE_COLUMN_ROLE DTCR
+        WHERE DTCR.TABLE_NAME = #{tableName})
+        AND DROT.ORG_CODE = #{orgCode}
+    </update>
 </mapper>

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

@@ -1,167 +1,171 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.steerinfo.dil.mapper.DilTableColumnRoleMapper">
-  <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.DilTableColumnRole">
-    <id column="PRIMARY_ID" jdbcType="DECIMAL" property="primaryId" />
-    <result column="TABLE_NAME" jdbcType="VARCHAR" property="tableName" />
-    <result column="COLUMN_NAME" jdbcType="VARCHAR" property="columnName" />
-  </resultMap>
-  <sql id="columns">
-    PRIMARY_ID, TABLE_NAME, COLUMN_NAME
-  </sql>
-  <sql id="columns_alias">
-    t.PRIMARY_ID, t.TABLE_NAME, t.COLUMN_NAME
-  </sql>
-  <sql id="select">
-    SELECT <include refid="columns"/> FROM DIL_TABLE_COLUMN_ROLE
-  </sql>
-  <sql id="select_alias">
-    SELECT <include refid="columns_alias"/> FROM DIL_TABLE_COLUMN_ROLE t
-  </sql>
-  <sql id="where">
-    <where> 
-      <if test="primaryId != null">
-        and PRIMARY_ID = #{primaryId}
-      </if>
-      <if test="tableName != null and tableName != ''">
-        and TABLE_NAME = #{tableName}
-      </if>
-      <if test="columnName != null and columnName != ''">
-        and COLUMN_NAME = #{columnName}
-      </if>
-    </where>
-  </sql>
-  <sql id="whereLike">
-    <where> 
-      <if test="primaryId != null">
-        and PRIMARY_ID = #{primaryId}
-      </if>
-      <if test="tableName != null and tableName != ''">
-        and TABLE_NAME LIKE '%${tableName}%'
-      </if>
-      <if test="columnName != null and columnName != ''">
-        and COLUMN_NAME LIKE '%${columnName}%'
-      </if>
-    </where>
-  </sql>
-  <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
-    delete from DIL_TABLE_COLUMN_ROLE
-    where PRIMARY_ID = #{primaryId,jdbcType=DECIMAL}
-  </delete>
-  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
-    delete from DIL_TABLE_COLUMN_ROLE
-    where 1!=1 
-      <if test="tableName != null and tableName != ''">
-        or TABLE_NAME = #{tableName}
-      </if>
-      <if test="columnName != null and columnName != ''">
-        or COLUMN_NAME = #{columnName}
-      </if>
-  </delete>
-  <insert id="insert" parameterType="com.steerinfo.dil.model.DilTableColumnRole">
-    insert into DIL_TABLE_COLUMN_ROLE (PRIMARY_ID, TABLE_NAME, COLUMN_NAME
-      )
-    values (#{primaryId,jdbcType=DECIMAL}, #{tableName,jdbcType=VARCHAR}, #{columnName,jdbcType=VARCHAR}
-      )
-  </insert>
-  <insert id="insertSelective" parameterType="com.steerinfo.dil.model.DilTableColumnRole">
-    insert into DIL_TABLE_COLUMN_ROLE
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="primaryId != null">
-        PRIMARY_ID,
-      </if>
-      <if test="tableName != null">
-        TABLE_NAME,
-      </if>
-      <if test="columnName != null">
-        COLUMN_NAME,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="primaryId != null">
-        #{primaryId,jdbcType=DECIMAL},
-      </if>
-      <if test="tableName != null">
-        #{tableName,jdbcType=VARCHAR},
-      </if>
-      <if test="columnName != null">
-        #{columnName,jdbcType=VARCHAR},
-      </if>
-    </trim>
-  </insert>
-  <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.DilTableColumnRole">
-    update DIL_TABLE_COLUMN_ROLE
-    set TABLE_NAME = #{tableName,jdbcType=VARCHAR},
-      COLUMN_NAME = #{columnName,jdbcType=VARCHAR}
-    where PRIMARY_ID = #{primaryId,jdbcType=DECIMAL}
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.DilTableColumnRole">
-    update DIL_TABLE_COLUMN_ROLE
-    <set>
-      <if test="tableName != null">
-        TABLE_NAME = #{tableName,jdbcType=VARCHAR},
-      </if>
-      <if test="columnName != null">
-        COLUMN_NAME = #{columnName,jdbcType=VARCHAR},
-      </if>
-    </set>
-    where PRIMARY_ID = #{primaryId,jdbcType=DECIMAL}
-  </update>
-  <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
-    <include refid="select"/>
-    where PRIMARY_ID = #{primaryId,jdbcType=DECIMAL}
-  </select>
-  <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
-    <include refid="select"/>
-    <include refid="where"/>
-  </select>
-  <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
-    <include refid="select"/>
-    <include refid="whereLike"/>
-  </select>
+    <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.DilTableColumnRole">
+        <id column="PRIMARY_ID" jdbcType="DECIMAL" property="primaryId"/>
+        <result column="TABLE_NAME" jdbcType="VARCHAR" property="tableName"/>
+        <result column="COLUMN_NAME" jdbcType="VARCHAR" property="columnName"/>
+    </resultMap>
+    <sql id="columns">
+        PRIMARY_ID, TABLE_NAME, COLUMN_NAME
+    </sql>
+    <sql id="columns_alias">
+        t.PRIMARY_ID, t.TABLE_NAME, t.COLUMN_NAME
+    </sql>
+    <sql id="select">
+        SELECT
+        <include refid="columns"/>
+        FROM DIL_TABLE_COLUMN_ROLE
+    </sql>
+    <sql id="select_alias">
+        SELECT
+        <include refid="columns_alias"/>
+        FROM DIL_TABLE_COLUMN_ROLE t
+    </sql>
+    <sql id="where">
+        <where>
+            <if test="primaryId != null">
+                and PRIMARY_ID = #{primaryId}
+            </if>
+            <if test="tableName != null and tableName != ''">
+                and TABLE_NAME = #{tableName}
+            </if>
+            <if test="columnName != null and columnName != ''">
+                and COLUMN_NAME = #{columnName}
+            </if>
+        </where>
+    </sql>
+    <sql id="whereLike">
+        <where>
+            <if test="primaryId != null">
+                and PRIMARY_ID = #{primaryId}
+            </if>
+            <if test="tableName != null and tableName != ''">
+                and TABLE_NAME LIKE '%${tableName}%'
+            </if>
+            <if test="columnName != null and columnName != ''">
+                and COLUMN_NAME LIKE '%${columnName}%'
+            </if>
+        </where>
+    </sql>
+    <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
+        delete from DIL_TABLE_COLUMN_ROLE
+        where PRIMARY_ID = #{primaryId,jdbcType=DECIMAL}
+    </delete>
+    <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+        delete from DIL_TABLE_COLUMN_ROLE
+        where 1!=1
+        <if test="tableName != null and tableName != ''">
+            or TABLE_NAME = #{tableName}
+        </if>
+        <if test="columnName != null and columnName != ''">
+            or COLUMN_NAME = #{columnName}
+        </if>
+    </delete>
+    <insert id="insert" parameterType="com.steerinfo.dil.model.DilTableColumnRole">
+        insert into DIL_TABLE_COLUMN_ROLE (PRIMARY_ID, TABLE_NAME, COLUMN_NAME
+        )
+        values (#{primaryId,jdbcType=DECIMAL}, #{tableName,jdbcType=VARCHAR}, #{columnName,jdbcType=VARCHAR}
+        )
+    </insert>
+    <insert id="insertSelective" parameterType="com.steerinfo.dil.model.DilTableColumnRole">
+        insert into DIL_TABLE_COLUMN_ROLE
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="primaryId != null">
+                PRIMARY_ID,
+            </if>
+            <if test="tableName != null">
+                TABLE_NAME,
+            </if>
+            <if test="columnName != null">
+                COLUMN_NAME,
+            </if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="primaryId != null">
+                #{primaryId,jdbcType=DECIMAL},
+            </if>
+            <if test="tableName != null">
+                #{tableName,jdbcType=VARCHAR},
+            </if>
+            <if test="columnName != null">
+                #{columnName,jdbcType=VARCHAR},
+            </if>
+        </trim>
+    </insert>
+    <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.DilTableColumnRole">
+        update DIL_TABLE_COLUMN_ROLE
+        set TABLE_NAME = #{tableName,jdbcType=VARCHAR},
+        COLUMN_NAME = #{columnName,jdbcType=VARCHAR}
+        where PRIMARY_ID = #{primaryId,jdbcType=DECIMAL}
+    </update>
+    <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.DilTableColumnRole">
+        update DIL_TABLE_COLUMN_ROLE
+        <set>
+            <if test="tableName != null">
+                TABLE_NAME = #{tableName,jdbcType=VARCHAR},
+            </if>
+            <if test="columnName != null">
+                COLUMN_NAME = #{columnName,jdbcType=VARCHAR},
+            </if>
+        </set>
+        where PRIMARY_ID = #{primaryId,jdbcType=DECIMAL}
+    </update>
+    <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
+        <include refid="select"/>
+        where PRIMARY_ID = #{primaryId,jdbcType=DECIMAL}
+    </select>
+    <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+        <include refid="select"/>
+        <include refid="where"/>
+    </select>
+    <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+        <include refid="select"/>
+        <include refid="whereLike"/>
+    </select>
 
-  <insert id="batchInsert" parameterType="java.util.List">
-    insert into DIL_TABLE_COLUMN_ROLE 
-      (PRIMARY_ID, 
-      TABLE_NAME, COLUMN_NAME)
-    ( <foreach collection="list" item="item" separator="union all"> 
-   select  
-      #{item.primaryId,jdbcType=DECIMAL}, 
-      #{item.tableName,jdbcType=VARCHAR}, #{item.columnName,jdbcType=VARCHAR} from dual  
-   </foreach> )
-  </insert>
-  <update id="batchUpdate" parameterType="java.util.List">
-     update DIL_TABLE_COLUMN_ROLE
-     set
-       PRIMARY_ID=
-       <foreach collection="list" item="item" index="index" separator=" " open="case PRIMARY_ID" close="end">
-          when #{item.primaryId,jdbcType=DECIMAL} then #{item.primaryId,jdbcType=DECIMAL}
-       </foreach>
-       ,TABLE_NAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case PRIMARY_ID" close="end">
-          when #{item.primaryId,jdbcType=DECIMAL} then #{item.tableName,jdbcType=VARCHAR}
-       </foreach>
-       ,COLUMN_NAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case PRIMARY_ID" close="end">
-          when #{item.primaryId,jdbcType=DECIMAL} then #{item.columnName,jdbcType=VARCHAR}
-       </foreach>
-     where PRIMARY_ID in 
-     <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
-    #{item.primaryId,jdbcType=DECIMAL}
-     </foreach> 
-  </update>
-  <delete id="batchDelete" parameterType="java.util.List">
-    delete from DIL_TABLE_COLUMN_ROLE
-    where PRIMARY_ID in 
-    <foreach collection="list" item="id" open="(" close=")" separator=",">
-      #{id}
-    </foreach>
-  </delete>
-  <!-- 友情提示！！！-->
-  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
-  <select id="selectColumnId" resultType="java.math.BigDecimal" parameterType="string">
-    SELECT PRIMARY_ID FROM DIL_TABLE_COLUMN_ROLE
-    WHERE TABLE_NAME = #{tableName}
-    AND COLUMN_NAME = #{s}
-  </select>
+    <insert id="batchInsert" parameterType="java.util.List">
+        insert into DIL_TABLE_COLUMN_ROLE
+        (PRIMARY_ID,
+        TABLE_NAME, COLUMN_NAME)
+        ( <foreach collection="list" item="item" separator="union all">
+        select
+        #{item.primaryId,jdbcType=DECIMAL},
+        #{item.tableName,jdbcType=VARCHAR}, #{item.columnName,jdbcType=VARCHAR} from dual
+    </foreach> )
+    </insert>
+    <update id="batchUpdate" parameterType="java.util.List">
+        update DIL_TABLE_COLUMN_ROLE
+        set
+        PRIMARY_ID=
+        <foreach collection="list" item="item" index="index" separator=" " open="case PRIMARY_ID" close="end">
+            when #{item.primaryId,jdbcType=DECIMAL} then #{item.primaryId,jdbcType=DECIMAL}
+        </foreach>
+        ,TABLE_NAME=
+        <foreach collection="list" item="item" index="index" separator=" " open="case PRIMARY_ID" close="end">
+            when #{item.primaryId,jdbcType=DECIMAL} then #{item.tableName,jdbcType=VARCHAR}
+        </foreach>
+        ,COLUMN_NAME=
+        <foreach collection="list" item="item" index="index" separator=" " open="case PRIMARY_ID" close="end">
+            when #{item.primaryId,jdbcType=DECIMAL} then #{item.columnName,jdbcType=VARCHAR}
+        </foreach>
+        where PRIMARY_ID in
+        <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
+            #{item.primaryId,jdbcType=DECIMAL}
+        </foreach>
+    </update>
+    <delete id="batchDelete" parameterType="java.util.List">
+        delete from DIL_TABLE_COLUMN_ROLE
+        where PRIMARY_ID in
+        <foreach collection="list" item="id" open="(" close=")" separator=",">
+            #{id}
+        </foreach>
+    </delete>
+    <!-- 友情提示！！！-->
+    <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+    <select id="selectColumnId" resultType="java.math.BigDecimal" parameterType="string">
+        SELECT PRIMARY_ID FROM DIL_TABLE_COLUMN_ROLE
+        WHERE TABLE_NAME = #{tableName}
+        AND COLUMN_NAME = #{s}
+    </select>
 </mapper>

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

@@ -1,320 +1,324 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.steerinfo.dil.mapper.DilVersionMapper">
-  <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.DilVersion">
-    <id column="VERSION_ID" jdbcType="DECIMAL" property="versionId" />
-    <result column="VERSION_VALUE" jdbcType="VARCHAR" property="versionValue" />
-    <result column="INSERT_USERNAME" jdbcType="VARCHAR" property="insertUsername" />
-    <result column="INSERT_TIME" jdbcType="TIMESTAMP" property="insertTime" />
-    <result column="UPDATE_USERNAME" jdbcType="VARCHAR" property="updateUsername" />
-    <result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime" />
-    <result column="INSERT_UPDATE_REMARK" jdbcType="VARCHAR" property="insertUpdateRemark" />
-    <result column="VERSION_TYPE" jdbcType="DECIMAL" property="versionType" />
-  </resultMap>
-  <sql id="columns">
-    VERSION_ID, VERSION_VALUE, INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, 
-    INSERT_UPDATE_REMARK, VERSION_TYPE
-  </sql>
-  <sql id="columns_alias">
-    t.VERSION_ID, t.VERSION_VALUE, t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME, 
-    t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, t.VERSION_TYPE
-  </sql>
-  <sql id="select">
-    SELECT <include refid="columns" /> FROM DIL_VERSION
-  </sql>
-  <sql id="select_alias">
-    SELECT <include refid="columns_alias" /> FROM DIL_VERSION t
-  </sql>
-  <sql id="where">
-    <where>
-      <if test="versionId != null">
-        and VERSION_ID = #{versionId}
-      </if>
-      <if test="versionValue != null and versionValue != ''">
-        and VERSION_VALUE = #{versionValue}
-      </if>
-      <if test="insertUsername != null and insertUsername != ''">
-        and INSERT_USERNAME = #{insertUsername}
-      </if>
-      <if test="insertTime != null">
-        and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
-      </if>
-      <if test="updateUsername != null and updateUsername != ''">
-        and UPDATE_USERNAME = #{updateUsername}
-      </if>
-      <if test="updateTime != null">
-        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
-      </if>
-      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
-        and INSERT_UPDATE_REMARK = #{insertUpdateRemark}
-      </if>
-      <if test="versionType != null">
-        and VERSION_TYPE = #{versionType}
-      </if>
-    </where>
-  </sql>
-  <sql id="whereLike">
-    <where>
-      <if test="versionId != null">
-        and VERSION_ID = #{versionId}
-      </if>
-      <if test="versionValue != null and versionValue != ''">
-        and VERSION_VALUE LIKE '%${versionValue}%'
-      </if>
-      <if test="insertUsername != null and insertUsername != ''">
-        and INSERT_USERNAME LIKE '%${insertUsername}%'
-      </if>
-      <if test="insertTime != null">
-        and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
-      </if>
-      <if test="updateUsername != null and updateUsername != ''">
-        and UPDATE_USERNAME LIKE '%${updateUsername}%'
-      </if>
-      <if test="updateTime != null">
-        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
-      </if>
-      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
-        and INSERT_UPDATE_REMARK LIKE '%${insertUpdateRemark}%'
-      </if>
-      <if test="versionType != null">
-        and VERSION_TYPE = #{versionType}
-      </if>
-    </where>
-  </sql>
-  <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
-    delete from DIL_VERSION
-    where VERSION_ID = #{versionId,jdbcType=DECIMAL}
-  </delete>
-  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
-    delete from DIL_VERSION
-    where 1!=1
-    <if test="versionValue != null and versionValue != ''">
-      or VERSION_VALUE = #{versionValue}
-    </if>
-    <if test="insertUsername != null and insertUsername != ''">
-      or INSERT_USERNAME = #{insertUsername}
-    </if>
-    <if test="insertTime != null">
-      or TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = '#{insertTime}'
-    </if>
-    <if test="updateUsername != null and updateUsername != ''">
-      or UPDATE_USERNAME = #{updateUsername}
-    </if>
-    <if test="updateTime != null">
-      or TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = '#{updateTime}'
-    </if>
-    <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
-      or INSERT_UPDATE_REMARK = #{insertUpdateRemark}
-    </if>
-    <if test="versionType != null">
-      or VERSION_TYPE = #{versionType}
-    </if>
-  </delete>
-  <insert id="insert" parameterType="com.steerinfo.dil.model.DilVersion">
-    insert into DIL_VERSION (VERSION_ID, VERSION_VALUE, INSERT_USERNAME,
-                             INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME,
-                             INSERT_UPDATE_REMARK, VERSION_TYPE)
-    values (#{versionId,jdbcType=DECIMAL}, #{versionValue,jdbcType=VARCHAR}, #{insertUsername,jdbcType=VARCHAR},
-            #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP},
-            #{insertUpdateRemark,jdbcType=VARCHAR}, #{versionType,jdbcType=DECIMAL})
-  </insert>
-  <insert id="insertSelective" parameterType="com.steerinfo.dil.model.DilVersion">
-    insert into DIL_VERSION
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="versionId != null">
-        VERSION_ID,
-      </if>
-      <if test="versionValue != null">
-        VERSION_VALUE,
-      </if>
-      <if test="insertUsername != null">
-        INSERT_USERNAME,
-      </if>
-      <if test="insertTime != null">
-        INSERT_TIME,
-      </if>
-      <if test="updateUsername != null">
-        UPDATE_USERNAME,
-      </if>
-      <if test="updateTime != null">
-        UPDATE_TIME,
-      </if>
-      <if test="insertUpdateRemark != null">
-        INSERT_UPDATE_REMARK,
-      </if>
-      <if test="versionType != null">
-        VERSION_TYPE,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="versionId != null">
-        #{versionId,jdbcType=DECIMAL},
-      </if>
-      <if test="versionValue != null">
-        #{versionValue,jdbcType=VARCHAR},
-      </if>
-      <if test="insertUsername != null">
-        #{insertUsername,jdbcType=VARCHAR},
-      </if>
-      <if test="insertTime != null">
-        #{insertTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="updateUsername != null">
-        #{updateUsername,jdbcType=VARCHAR},
-      </if>
-      <if test="updateTime != null">
-        #{updateTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="insertUpdateRemark != null">
-        #{insertUpdateRemark,jdbcType=VARCHAR},
-      </if>
-      <if test="versionType != null">
-        #{versionType,jdbcType=DECIMAL},
-      </if>
-    </trim>
-  </insert>
-  <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.DilVersion">
-    update DIL_VERSION
-    set VERSION_VALUE = #{versionValue,jdbcType=VARCHAR},
+    <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.DilVersion">
+        <id column="VERSION_ID" jdbcType="DECIMAL" property="versionId"/>
+        <result column="VERSION_VALUE" jdbcType="VARCHAR" property="versionValue"/>
+        <result column="INSERT_USERNAME" jdbcType="VARCHAR" property="insertUsername"/>
+        <result column="INSERT_TIME" jdbcType="TIMESTAMP" property="insertTime"/>
+        <result column="UPDATE_USERNAME" jdbcType="VARCHAR" property="updateUsername"/>
+        <result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime"/>
+        <result column="INSERT_UPDATE_REMARK" jdbcType="VARCHAR" property="insertUpdateRemark"/>
+        <result column="VERSION_TYPE" jdbcType="DECIMAL" property="versionType"/>
+    </resultMap>
+    <sql id="columns">
+        VERSION_ID, VERSION_VALUE, INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME,
+        INSERT_UPDATE_REMARK, VERSION_TYPE
+    </sql>
+    <sql id="columns_alias">
+        t.VERSION_ID, t.VERSION_VALUE, t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME,
+        t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, t.VERSION_TYPE
+    </sql>
+    <sql id="select">
+        SELECT
+        <include refid="columns"/>
+        FROM DIL_VERSION
+    </sql>
+    <sql id="select_alias">
+        SELECT
+        <include refid="columns_alias"/>
+        FROM DIL_VERSION t
+    </sql>
+    <sql id="where">
+        <where>
+            <if test="versionId != null">
+                and VERSION_ID = #{versionId}
+            </if>
+            <if test="versionValue != null and versionValue != ''">
+                and VERSION_VALUE = #{versionValue}
+            </if>
+            <if test="insertUsername != null and insertUsername != ''">
+                and INSERT_USERNAME = #{insertUsername}
+            </if>
+            <if test="insertTime != null">
+                and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
+            </if>
+            <if test="updateUsername != null and updateUsername != ''">
+                and UPDATE_USERNAME = #{updateUsername}
+            </if>
+            <if test="updateTime != null">
+                and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+            </if>
+            <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+                and INSERT_UPDATE_REMARK = #{insertUpdateRemark}
+            </if>
+            <if test="versionType != null">
+                and VERSION_TYPE = #{versionType}
+            </if>
+        </where>
+    </sql>
+    <sql id="whereLike">
+        <where>
+            <if test="versionId != null">
+                and VERSION_ID = #{versionId}
+            </if>
+            <if test="versionValue != null and versionValue != ''">
+                and VERSION_VALUE LIKE '%${versionValue}%'
+            </if>
+            <if test="insertUsername != null and insertUsername != ''">
+                and INSERT_USERNAME LIKE '%${insertUsername}%'
+            </if>
+            <if test="insertTime != null">
+                and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
+            </if>
+            <if test="updateUsername != null and updateUsername != ''">
+                and UPDATE_USERNAME LIKE '%${updateUsername}%'
+            </if>
+            <if test="updateTime != null">
+                and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+            </if>
+            <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+                and INSERT_UPDATE_REMARK LIKE '%${insertUpdateRemark}%'
+            </if>
+            <if test="versionType != null">
+                and VERSION_TYPE = #{versionType}
+            </if>
+        </where>
+    </sql>
+    <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
+        delete from DIL_VERSION
+        where VERSION_ID = #{versionId,jdbcType=DECIMAL}
+    </delete>
+    <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+        delete from DIL_VERSION
+        where 1!=1
+        <if test="versionValue != null and versionValue != ''">
+            or VERSION_VALUE = #{versionValue}
+        </if>
+        <if test="insertUsername != null and insertUsername != ''">
+            or INSERT_USERNAME = #{insertUsername}
+        </if>
+        <if test="insertTime != null">
+            or TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = '#{insertTime}'
+        </if>
+        <if test="updateUsername != null and updateUsername != ''">
+            or UPDATE_USERNAME = #{updateUsername}
+        </if>
+        <if test="updateTime != null">
+            or TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = '#{updateTime}'
+        </if>
+        <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+            or INSERT_UPDATE_REMARK = #{insertUpdateRemark}
+        </if>
+        <if test="versionType != null">
+            or VERSION_TYPE = #{versionType}
+        </if>
+    </delete>
+    <insert id="insert" parameterType="com.steerinfo.dil.model.DilVersion">
+        insert into DIL_VERSION (VERSION_ID, VERSION_VALUE, INSERT_USERNAME,
+        INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME,
+        INSERT_UPDATE_REMARK, VERSION_TYPE)
+        values (#{versionId,jdbcType=DECIMAL}, #{versionValue,jdbcType=VARCHAR}, #{insertUsername,jdbcType=VARCHAR},
+        #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP},
+        #{insertUpdateRemark,jdbcType=VARCHAR}, #{versionType,jdbcType=DECIMAL})
+    </insert>
+    <insert id="insertSelective" parameterType="com.steerinfo.dil.model.DilVersion">
+        insert into DIL_VERSION
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="versionId != null">
+                VERSION_ID,
+            </if>
+            <if test="versionValue != null">
+                VERSION_VALUE,
+            </if>
+            <if test="insertUsername != null">
+                INSERT_USERNAME,
+            </if>
+            <if test="insertTime != null">
+                INSERT_TIME,
+            </if>
+            <if test="updateUsername != null">
+                UPDATE_USERNAME,
+            </if>
+            <if test="updateTime != null">
+                UPDATE_TIME,
+            </if>
+            <if test="insertUpdateRemark != null">
+                INSERT_UPDATE_REMARK,
+            </if>
+            <if test="versionType != null">
+                VERSION_TYPE,
+            </if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="versionId != null">
+                #{versionId,jdbcType=DECIMAL},
+            </if>
+            <if test="versionValue != null">
+                #{versionValue,jdbcType=VARCHAR},
+            </if>
+            <if test="insertUsername != null">
+                #{insertUsername,jdbcType=VARCHAR},
+            </if>
+            <if test="insertTime != null">
+                #{insertTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="updateUsername != null">
+                #{updateUsername,jdbcType=VARCHAR},
+            </if>
+            <if test="updateTime != null">
+                #{updateTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="insertUpdateRemark != null">
+                #{insertUpdateRemark,jdbcType=VARCHAR},
+            </if>
+            <if test="versionType != null">
+                #{versionType,jdbcType=DECIMAL},
+            </if>
+        </trim>
+    </insert>
+    <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.DilVersion">
+        update DIL_VERSION
+        set VERSION_VALUE = #{versionValue,jdbcType=VARCHAR},
         INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
         INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
         UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
         UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
         INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
         VERSION_TYPE = #{versionType,jdbcType=DECIMAL}
-    where VERSION_ID = #{versionId,jdbcType=DECIMAL}
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.DilVersion">
-    update DIL_VERSION
-    <set>
-      <if test="versionValue != null">
-        VERSION_VALUE = #{versionValue,jdbcType=VARCHAR},
-      </if>
-      <if test="insertUsername != null">
-        INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
-      </if>
-      <if test="insertTime != null">
-        INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="updateUsername != null">
-        UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
-      </if>
-      <if test="updateTime != null">
-        UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="insertUpdateRemark != null">
-        INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
-      </if>
-      <if test="versionType != null">
-        VERSION_TYPE = #{versionType,jdbcType=DECIMAL},
-      </if>
-    </set>
-    where VERSION_ID = #{versionId,jdbcType=DECIMAL}
-  </update>
-  <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
-    <include refid="select" />
-    where VERSION_ID = #{versionId,jdbcType=DECIMAL}
-  </select>
-  <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
-    <include refid="select" />
-    <include refid="where" />
-  </select>
-  <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
-    <include refid="select" />
-    <include refid="whereLike" />
-  </select>
-  <insert id="batchInsert" parameterType="java.util.List">
-    insert into DIL_VERSION
-    (VERSION_ID,
-    VERSION_VALUE, INSERT_USERNAME,
-    INSERT_TIME, UPDATE_USERNAME,
-    UPDATE_TIME, INSERT_UPDATE_REMARK,
-    VERSION_TYPE)
-    ( <foreach collection="list" item="item" separator="union all">
-    select
-    #{item.versionId,jdbcType=DECIMAL},
-    #{item.versionValue,jdbcType=VARCHAR}, #{item.insertUsername,jdbcType=VARCHAR},
-    #{item.insertTime,jdbcType=TIMESTAMP}, #{item.updateUsername,jdbcType=VARCHAR},
-    #{item.updateTime,jdbcType=TIMESTAMP}, #{item.insertUpdateRemark,jdbcType=VARCHAR},
-    #{item.versionType,jdbcType=DECIMAL} from dual
-  </foreach> )
-  </insert>
-  <update id="batchUpdate" parameterType="java.util.List">
-    update DIL_VERSION
-    set
-    VERSION_ID=
-    <foreach close="end" collection="list" index="index" item="item" open="case VERSION_ID" separator=" ">
-      when #{item.versionId,jdbcType=DECIMAL} then #{item.versionId,jdbcType=DECIMAL}
-    </foreach>
-    ,VERSION_VALUE=
-    <foreach close="end" collection="list" index="index" item="item" open="case VERSION_ID" separator=" ">
-      when #{item.versionId,jdbcType=DECIMAL} then #{item.versionValue,jdbcType=VARCHAR}
-    </foreach>
-    ,INSERT_USERNAME=
-    <foreach close="end" collection="list" index="index" item="item" open="case VERSION_ID" separator=" ">
-      when #{item.versionId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
-    </foreach>
-    ,INSERT_TIME=
-    <foreach close="end" collection="list" index="index" item="item" open="case VERSION_ID" separator=" ">
-      when #{item.versionId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
-    </foreach>
-    ,UPDATE_USERNAME=
-    <foreach close="end" collection="list" index="index" item="item" open="case VERSION_ID" separator=" ">
-      when #{item.versionId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
-    </foreach>
-    ,UPDATE_TIME=
-    <foreach close="end" collection="list" index="index" item="item" open="case VERSION_ID" separator=" ">
-      when #{item.versionId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
-    </foreach>
-    ,INSERT_UPDATE_REMARK=
-    <foreach close="end" collection="list" index="index" item="item" open="case VERSION_ID" separator=" ">
-      when #{item.versionId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
-    </foreach>
-    ,VERSION_TYPE=
-    <foreach close="end" collection="list" index="index" item="item" open="case VERSION_ID" separator=" ">
-      when #{item.versionId,jdbcType=DECIMAL} then #{item.versionType,jdbcType=DECIMAL}
-    </foreach>
-    where VERSION_ID in
-    <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
-      #{item.versionId,jdbcType=DECIMAL}
-    </foreach>
-  </update>
-  <delete id="batchDelete" parameterType="java.util.List">
-    delete from DIL_VERSION
-    where VERSION_ID in
-    <foreach close=")" collection="list" item="id" open="(" separator=",">
-      #{id}
-    </foreach>
-  </delete>
-  <!-- 友情提示！！！-->
-  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
-  <select id="getAppVersion" resultType="string">
-    select *
-    from (
-           select DV.VERSION_VALUE
-           from DIL_VERSION DV
-           where DV.VERSION_TYPE = 0
-           order by DV.VERSION_ID desc
-         )
-    where ROWNUM = 1
-  </select>
+        where VERSION_ID = #{versionId,jdbcType=DECIMAL}
+    </update>
+    <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.DilVersion">
+        update DIL_VERSION
+        <set>
+            <if test="versionValue != null">
+                VERSION_VALUE = #{versionValue,jdbcType=VARCHAR},
+            </if>
+            <if test="insertUsername != null">
+                INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
+            </if>
+            <if test="insertTime != null">
+                INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="updateUsername != null">
+                UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
+            </if>
+            <if test="updateTime != null">
+                UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="insertUpdateRemark != null">
+                INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
+            </if>
+            <if test="versionType != null">
+                VERSION_TYPE = #{versionType,jdbcType=DECIMAL},
+            </if>
+        </set>
+        where VERSION_ID = #{versionId,jdbcType=DECIMAL}
+    </update>
+    <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
+        <include refid="select"/>
+        where VERSION_ID = #{versionId,jdbcType=DECIMAL}
+    </select>
+    <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+        <include refid="select"/>
+        <include refid="where"/>
+    </select>
+    <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+        <include refid="select"/>
+        <include refid="whereLike"/>
+    </select>
+    <insert id="batchInsert" parameterType="java.util.List">
+        insert into DIL_VERSION
+        (VERSION_ID,
+        VERSION_VALUE, INSERT_USERNAME,
+        INSERT_TIME, UPDATE_USERNAME,
+        UPDATE_TIME, INSERT_UPDATE_REMARK,
+        VERSION_TYPE)
+        ( <foreach collection="list" item="item" separator="union all">
+        select
+        #{item.versionId,jdbcType=DECIMAL},
+        #{item.versionValue,jdbcType=VARCHAR}, #{item.insertUsername,jdbcType=VARCHAR},
+        #{item.insertTime,jdbcType=TIMESTAMP}, #{item.updateUsername,jdbcType=VARCHAR},
+        #{item.updateTime,jdbcType=TIMESTAMP}, #{item.insertUpdateRemark,jdbcType=VARCHAR},
+        #{item.versionType,jdbcType=DECIMAL} from dual
+    </foreach> )
+    </insert>
+    <update id="batchUpdate" parameterType="java.util.List">
+        update DIL_VERSION
+        set
+        VERSION_ID=
+        <foreach close="end" collection="list" index="index" item="item" open="case VERSION_ID" separator=" ">
+            when #{item.versionId,jdbcType=DECIMAL} then #{item.versionId,jdbcType=DECIMAL}
+        </foreach>
+        ,VERSION_VALUE=
+        <foreach close="end" collection="list" index="index" item="item" open="case VERSION_ID" separator=" ">
+            when #{item.versionId,jdbcType=DECIMAL} then #{item.versionValue,jdbcType=VARCHAR}
+        </foreach>
+        ,INSERT_USERNAME=
+        <foreach close="end" collection="list" index="index" item="item" open="case VERSION_ID" separator=" ">
+            when #{item.versionId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
+        </foreach>
+        ,INSERT_TIME=
+        <foreach close="end" collection="list" index="index" item="item" open="case VERSION_ID" separator=" ">
+            when #{item.versionId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
+        </foreach>
+        ,UPDATE_USERNAME=
+        <foreach close="end" collection="list" index="index" item="item" open="case VERSION_ID" separator=" ">
+            when #{item.versionId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
+        </foreach>
+        ,UPDATE_TIME=
+        <foreach close="end" collection="list" index="index" item="item" open="case VERSION_ID" separator=" ">
+            when #{item.versionId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
+        </foreach>
+        ,INSERT_UPDATE_REMARK=
+        <foreach close="end" collection="list" index="index" item="item" open="case VERSION_ID" separator=" ">
+            when #{item.versionId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
+        </foreach>
+        ,VERSION_TYPE=
+        <foreach close="end" collection="list" index="index" item="item" open="case VERSION_ID" separator=" ">
+            when #{item.versionId,jdbcType=DECIMAL} then #{item.versionType,jdbcType=DECIMAL}
+        </foreach>
+        where VERSION_ID in
+        <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
+            #{item.versionId,jdbcType=DECIMAL}
+        </foreach>
+    </update>
+    <delete id="batchDelete" parameterType="java.util.List">
+        delete from DIL_VERSION
+        where VERSION_ID in
+        <foreach close=")" collection="list" item="id" open="(" separator=",">
+            #{id}
+        </foreach>
+    </delete>
+    <!-- 友情提示！！！-->
+    <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+    <select id="getAppVersion" resultType="string">
+        select *
+        from (
+        select DV.VERSION_VALUE
+        from DIL_VERSION DV
+        where DV.VERSION_TYPE = 0
+        order by DV.VERSION_ID desc
+        )
+        where ROWNUM = 1
+    </select>
 
 
-  <select id="getVersionId" parameterType="string" resultType="java.lang.Integer">
-    select DV.VERSION_ID from DIL_VERSION DV
-    where DV.VERSION_VALUE = #{versionValue}
-  </select>
+    <select id="getVersionId" parameterType="string" resultType="java.lang.Integer">
+        select DV.VERSION_ID from DIL_VERSION DV
+        where DV.VERSION_VALUE = #{versionValue}
+    </select>
 
 
-  <select id="getPDAVersion" resultType="java.lang.String">
-    select *
-    from (
-           select DV.VERSION_VALUE
-           from DIL_VERSION DV
-           where DV.VERSION_TYPE = 1
-           order by DV.VERSION_ID desc
-         )
-    where ROWNUM = 1
-  </select>
+    <select id="getPDAVersion" resultType="java.lang.String">
+        select *
+        from (
+        select DV.VERSION_VALUE
+        from DIL_VERSION DV
+        where DV.VERSION_TYPE = 1
+        order by DV.VERSION_ID desc
+        )
+        where ROWNUM = 1
+    </select>
 
 </mapper>

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

@@ -1,366 +1,444 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.steerinfo.dil.mapper.LogResultMapper">
-  <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.LogResult">
-    <id column="LOG_ID" jdbcType="DECIMAL" property="logId" />
-    <result column="LOG_CONTENT" jdbcType="VARCHAR" property="logContent" />
-    <result column="FOREIGN_KEY_ID" jdbcType="DECIMAL" property="foreignKeyId" />
-    <result column="FOREIGN_KEY_TYPE" jdbcType="VARCHAR" property="foreignKeyType" />
-    <result column="METHOD_NAME" jdbcType="VARCHAR" property="methodName" />
-    <result column="METHOD_DESCRIPTION" jdbcType="VARCHAR" property="methodDescription" />
-    <result column="EXE_COST" jdbcType="DECIMAL" property="exeCost" />
-    <result column="FILE_PATH" jdbcType="TIMESTAMP" property="filePath" />
-    <result column="INSERT_TIME" jdbcType="TIMESTAMP" property="insertTime" />
-    <result column="INSERT_USERNAME" jdbcType="VARCHAR" property="insertUsername" />
-    <result column="REMARK" jdbcType="VARCHAR" property="remark" />
-  </resultMap>
-  <sql id="columns">
-    LOG_ID, LOG_CONTENT, FOREIGN_KEY_ID, FOREIGN_KEY_TYPE, METHOD_NAME, METHOD_DESCRIPTION,
-    EXE_COST, FILE_PATH, INSERT_TIME, INSERT_USERNAME, REMARK
-  </sql>
-  <sql id="columns_alias">
-    t.LOG_ID, t.LOG_CONTENT, t.FOREIGN_KEY_ID, t.FOREIGN_KEY_TYPE, t.METHOD_NAME, t.METHOD_DESCRIPTION,
-    t.EXE_COST, t.FILE_PATH, t.INSERT_TIME, t.INSERT_USERNAME, t.REMARK
-  </sql>
-  <sql id="select">
-    SELECT <include refid="columns" /> FROM LOG_RESULT
-  </sql>
-  <sql id="select_alias">
-    SELECT <include refid="columns_alias" /> FROM LOG_RESULT t
-  </sql>
-  <sql id="where">
-    <where>
-      <if test="logId != null">
-        and LOG_ID = #{logId}
-      </if>
-      <if test="logContent != null and logContent != ''">
-        and LOG_CONTENT = #{logContent}
-      </if>
-      <if test="foreignKeyId != null">
-        and FOREIGN_KEY_ID = #{foreignKeyId}
-      </if>
-      <if test="foreignKeyType != null and foreignKeyType != ''">
-        and FOREIGN_KEY_TYPE = #{foreignKeyType}
-      </if>
-      <if test="methodName != null and methodName != ''">
-        and METHOD_NAME = #{methodName}
-      </if>
-      <if test="methodDescription != null and methodDescription != ''">
-        and METHOD_DESCRIPTION = #{methodDescription}
-      </if>
-      <if test="exeCost != null">
-        and EXE_COST = #{exeCost}
-      </if>
-      <if test="filePath != null">
-        and TO_CHAR(FILE_PATH,'yyyy-MM-dd') = #{filePath}
-      </if>
-      <if test="insertTime != null">
-        and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
-      </if>
-      <if test="insertUsername != null and insertUsername != ''">
-        and INSERT_USERNAME = #{insertUsername}
-      </if>
-      <if test="remark != null and remark != ''">
-        and REMARK = #{remark}
-      </if>
-    </where>
-  </sql>
-  <sql id="whereLike">
-    <where>
-      <if test="logId != null">
-        and LOG_ID = #{logId}
-      </if>
-      <if test="logContent != null and logContent != ''">
-        and LOG_CONTENT LIKE '%${logContent}%'
-      </if>
-      <if test="foreignKeyId != null">
-        and FOREIGN_KEY_ID = #{foreignKeyId}
-      </if>
-      <if test="foreignKeyType != null and foreignKeyType != ''">
-        and FOREIGN_KEY_TYPE LIKE '%${foreignKeyType}%'
-      </if>
-      <if test="methodName != null and methodName != ''">
-        and METHOD_NAME LIKE '%${methodName}%'
-      </if>
-      <if test="methodDescription != null and methodDescription != ''">
-        and METHOD_DESCRIPTION LIKE '%${methodDescription}%'
-      </if>
-      <if test="exeCost != null">
-        and EXE_COST = #{exeCost}
-      </if>
-      <if test="filePath != null">
-        and TO_CHAR(FILE_PATH,'yyyy-MM-dd') = #{filePath}
-      </if>
-      <if test="insertTime != null">
-        and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
-      </if>
-      <if test="insertUsername != null and insertUsername != ''">
-        and INSERT_USERNAME LIKE '%${insertUsername}%'
-      </if>
-      <if test="remark != null and remark != ''">
-        and REMARK LIKE '%${remark}%'
-      </if>
-    </where>
-  </sql>
-  <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
-    delete from LOG_RESULT
-    where LOG_ID = #{logId,jdbcType=DECIMAL}
-  </delete>
-  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
-    delete from LOG_RESULT
-    where 1!=1
-    <if test="logContent != null and logContent != ''">
-      or LOG_CONTENT = #{logContent}
-    </if>
-    <if test="foreignKeyId != null">
-      or FOREIGN_KEY_ID = #{foreignKeyId}
-    </if>
-    <if test="foreignKeyType != null and foreignKeyType != ''">
-      or FOREIGN_KEY_TYPE = #{foreignKeyType}
-    </if>
-    <if test="methodName != null and methodName != ''">
-      or METHOD_NAME = #{methodName}
-    </if>
-    <if test="methodDescription != null and methodDescription != ''">
-      or METHOD_DESCRIPTION = #{methodDescription}
-    </if>
-    <if test="exeCost != null">
-      or EXE_COST = #{exeCost}
-    </if>
-    <if test="filePath != null">
-      or TO_CHAR(FILE_PATH,'yyyy-MM-dd') = '#{filePath}'
-    </if>
-    <if test="insertTime != null">
-      or TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = '#{insertTime}'
-    </if>
-    <if test="insertUsername != null and insertUsername != ''">
-      or INSERT_USERNAME = #{insertUsername}
-    </if>
-    <if test="remark != null and remark != ''">
-      or REMARK = #{remark}
-    </if>
-  </delete>
-  <insert id="insert" parameterType="com.steerinfo.dil.model.LogResult">
-    insert into LOG_RESULT (LOG_ID, LOG_CONTENT, FOREIGN_KEY_ID,
-                            FOREIGN_KEY_TYPE, METHOD_NAME, METHOD_DESCRIPTION,
-                            EXE_COST, FILE_PATH, INSERT_TIME,
-                            INSERT_USERNAME, REMARK)
-    values (#{logId,jdbcType=DECIMAL}, #{logContent,jdbcType=VARCHAR}, #{foreignKeyId,jdbcType=DECIMAL},
-            #{foreignKeyType,jdbcType=VARCHAR}, #{methodName,jdbcType=VARCHAR}, #{methodDescription,jdbcType=VARCHAR},
-            #{exeCost,jdbcType=DECIMAL}, #{filePath,jdbcType=TIMESTAMP}, #{insertTime,jdbcType=TIMESTAMP},
-            #{insertUsername,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR})
-  </insert>
-  <insert id="insertSelective" parameterType="com.steerinfo.dil.model.LogResult">
-    insert into LOG_RESULT
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="logId != null">
-        LOG_ID,
-      </if>
-      <if test="logContent != null">
-        LOG_CONTENT,
-      </if>
-      <if test="foreignKeyId != null">
-        FOREIGN_KEY_ID,
-      </if>
-      <if test="foreignKeyType != null">
-        FOREIGN_KEY_TYPE,
-      </if>
-      <if test="methodName != null">
-        METHOD_NAME,
-      </if>
-      <if test="methodDescription != null">
-        METHOD_DESCRIPTION,
-      </if>
-      <if test="exeCost != null">
-        EXE_COST,
-      </if>
-      <if test="filePath != null">
-        FILE_PATH,
-      </if>
-      <if test="insertTime != null">
-        INSERT_TIME,
-      </if>
-      <if test="insertUsername != null">
-        INSERT_USERNAME,
-      </if>
-      <if test="remark != null">
-        REMARK,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="logId != null">
-        #{logId,jdbcType=DECIMAL},
-      </if>
-      <if test="logContent != null">
-        #{logContent,jdbcType=VARCHAR},
-      </if>
-      <if test="foreignKeyId != null">
-        #{foreignKeyId,jdbcType=DECIMAL},
-      </if>
-      <if test="foreignKeyType != null">
-        #{foreignKeyType,jdbcType=VARCHAR},
-      </if>
-      <if test="methodName != null">
-        #{methodName,jdbcType=VARCHAR},
-      </if>
-      <if test="methodDescription != null">
-        #{methodDescription,jdbcType=VARCHAR},
-      </if>
-      <if test="exeCost != null">
-        #{exeCost,jdbcType=DECIMAL},
-      </if>
-      <if test="filePath != null">
-        #{filePath,jdbcType=TIMESTAMP},
-      </if>
-      <if test="insertTime != null">
-        #{insertTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="insertUsername != null">
-        #{insertUsername,jdbcType=VARCHAR},
-      </if>
-      <if test="remark != null">
-        #{remark,jdbcType=VARCHAR},
-      </if>
-    </trim>
-  </insert>
-  <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.LogResult">
-    update LOG_RESULT
-    set LOG_CONTENT = #{logContent,jdbcType=VARCHAR},
-        FOREIGN_KEY_ID = #{foreignKeyId,jdbcType=DECIMAL},
-        FOREIGN_KEY_TYPE = #{foreignKeyType,jdbcType=VARCHAR},
-        METHOD_NAME = #{methodName,jdbcType=VARCHAR},
-        METHOD_DESCRIPTION = #{methodDescription,jdbcType=VARCHAR},
-        EXE_COST = #{exeCost,jdbcType=DECIMAL},
-        FILE_PATH = #{filePath,jdbcType=TIMESTAMP},
-        INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
-        INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
-        REMARK = #{remark,jdbcType=VARCHAR}
-    where LOG_ID = #{logId,jdbcType=DECIMAL}
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.LogResult">
-    update LOG_RESULT
-    <set>
-      <if test="logContent != null">
-        LOG_CONTENT = #{logContent,jdbcType=VARCHAR},
-      </if>
-      <if test="foreignKeyId != null">
-        FOREIGN_KEY_ID = #{foreignKeyId,jdbcType=DECIMAL},
-      </if>
-      <if test="foreignKeyType != null">
-        FOREIGN_KEY_TYPE = #{foreignKeyType,jdbcType=VARCHAR},
-      </if>
-      <if test="methodName != null">
-        METHOD_NAME = #{methodName,jdbcType=VARCHAR},
-      </if>
-      <if test="methodDescription != null">
-        METHOD_DESCRIPTION = #{methodDescription,jdbcType=VARCHAR},
-      </if>
-      <if test="exeCost != null">
-        EXE_COST = #{exeCost,jdbcType=DECIMAL},
-      </if>
-      <if test="filePath != null">
-        FILE_PATH = #{filePath,jdbcType=TIMESTAMP},
-      </if>
-      <if test="insertTime != null">
-        INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="insertUsername != null">
-        INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
-      </if>
-      <if test="remark != null">
-        REMARK = #{remark,jdbcType=VARCHAR},
-      </if>
-    </set>
-    where LOG_ID = #{logId,jdbcType=DECIMAL}
-  </update>
-  <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
-    <include refid="select" />
-    where LOG_ID = #{logId,jdbcType=DECIMAL}
-  </select>
-  <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
-    <include refid="select" />
-    <include refid="where" />
-  </select>
-  <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
-    <include refid="select" />
-    <include refid="whereLike" />
-  </select>
-  <insert id="batchInsert" parameterType="java.util.List">
-    insert into LOG_RESULT
-    (LOG_ID,
-    LOG_CONTENT, FOREIGN_KEY_ID, FOREIGN_KEY_TYPE,
-    METHOD_NAME, METHOD_DESCRIPTION,
-    EXE_COST, FILE_PATH, INSERT_TIME,
-    INSERT_USERNAME, REMARK)
-    ( <foreach collection="list" item="item" separator="union all">
-    select
-    #{item.logId,jdbcType=DECIMAL},
-    #{item.logContent,jdbcType=VARCHAR}, #{item.foreignKeyId,jdbcType=DECIMAL}, #{item.foreignKeyType,jdbcType=VARCHAR},
-    #{item.methodName,jdbcType=VARCHAR}, #{item.methodDescription,jdbcType=VARCHAR},
-    #{item.exeCost,jdbcType=DECIMAL}, #{item.filePath,jdbcType=TIMESTAMP}, #{item.insertTime,jdbcType=TIMESTAMP},
-    #{item.insertUsername,jdbcType=VARCHAR}, #{item.remark,jdbcType=VARCHAR} from dual
-  </foreach> )
-  </insert>
-  <update id="batchUpdate" parameterType="java.util.List">
-    update LOG_RESULT
-    set
-    LOG_ID=
-    <foreach close="end" collection="list" index="index" item="item" open="case LOG_ID" separator=" ">
-      when #{item.logId,jdbcType=DECIMAL} then #{item.logId,jdbcType=DECIMAL}
-    </foreach>
-    ,LOG_CONTENT=
-    <foreach close="end" collection="list" index="index" item="item" open="case LOG_ID" separator=" ">
-      when #{item.logId,jdbcType=DECIMAL} then #{item.logContent,jdbcType=VARCHAR}
-    </foreach>
-    ,FOREIGN_KEY_ID=
-    <foreach close="end" collection="list" index="index" item="item" open="case LOG_ID" separator=" ">
-      when #{item.logId,jdbcType=DECIMAL} then #{item.foreignKeyId,jdbcType=DECIMAL}
-    </foreach>
-    ,FOREIGN_KEY_TYPE=
-    <foreach close="end" collection="list" index="index" item="item" open="case LOG_ID" separator=" ">
-      when #{item.logId,jdbcType=DECIMAL} then #{item.foreignKeyType,jdbcType=VARCHAR}
-    </foreach>
-    ,METHOD_NAME=
-    <foreach close="end" collection="list" index="index" item="item" open="case LOG_ID" separator=" ">
-      when #{item.logId,jdbcType=DECIMAL} then #{item.methodName,jdbcType=VARCHAR}
-    </foreach>
-    ,METHOD_DESCRIPTION=
-    <foreach close="end" collection="list" index="index" item="item" open="case LOG_ID" separator=" ">
-      when #{item.logId,jdbcType=DECIMAL} then #{item.methodDescription,jdbcType=VARCHAR}
-    </foreach>
-    ,EXE_COST=
-    <foreach close="end" collection="list" index="index" item="item" open="case LOG_ID" separator=" ">
-      when #{item.logId,jdbcType=DECIMAL} then #{item.exeCost,jdbcType=DECIMAL}
-    </foreach>
-    ,FILE_PATH=
-    <foreach close="end" collection="list" index="index" item="item" open="case LOG_ID" separator=" ">
-      when #{item.logId,jdbcType=DECIMAL} then #{item.filePath,jdbcType=TIMESTAMP}
-    </foreach>
-    ,INSERT_TIME=
-    <foreach close="end" collection="list" index="index" item="item" open="case LOG_ID" separator=" ">
-      when #{item.logId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
-    </foreach>
-    ,INSERT_USERNAME=
-    <foreach close="end" collection="list" index="index" item="item" open="case LOG_ID" separator=" ">
-      when #{item.logId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
-    </foreach>
-    ,REMARK=
-    <foreach close="end" collection="list" index="index" item="item" open="case LOG_ID" separator=" ">
-      when #{item.logId,jdbcType=DECIMAL} then #{item.remark,jdbcType=VARCHAR}
-    </foreach>
-    where LOG_ID in
-    <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
-      #{item.logId,jdbcType=DECIMAL}
-    </foreach>
-  </update>
-  <delete id="batchDelete" parameterType="java.util.List">
-    delete from LOG_RESULT
-    where LOG_ID in
-    <foreach close=")" collection="list" item="id" open="(" separator=",">
-      #{id}
-    </foreach>
-  </delete>
-  <!-- 友情提示！！！-->
-  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+    <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.LogResult">
+        <id column="LOG_ID" jdbcType="DECIMAL" property="logId" />
+        <result column="LOG_CONTENT" jdbcType="VARCHAR" property="logContent" />
+        <result column="FOREIGN_KEY_ID" jdbcType="DECIMAL" property="foreignKeyId" />
+        <result column="FOREIGN_KEY_TYPE" jdbcType="VARCHAR" property="foreignKeyType" />
+        <result column="METHOD_NAME" jdbcType="VARCHAR" property="methodName" />
+        <result column="METHOD_DESCRIPTION" jdbcType="VARCHAR" property="methodDescription" />
+        <result column="EXE_COST" jdbcType="DECIMAL" property="exeCost" />
+        <result column="FILE_PATH" jdbcType="VARCHAR" property="filePath" />
+        <result column="INSERT_TIME" jdbcType="TIMESTAMP" property="insertTime" />
+        <result column="INSERT_USERNAME" jdbcType="VARCHAR" property="insertUsername" />
+        <result column="REMARK" jdbcType="VARCHAR" property="remark" />
+        <result column="DATAGRAM1" jdbcType="VARCHAR" property="datagram1" />
+        <result column="DATAGRAM2" jdbcType="VARCHAR" property="datagram2" />
+        <result column="DATAGRAM3" jdbcType="VARCHAR" property="datagram3" />
+    </resultMap>
+    <sql id="columns">
+        LOG_ID, LOG_CONTENT, FOREIGN_KEY_ID, FOREIGN_KEY_TYPE, METHOD_NAME, METHOD_DESCRIPTION,
+    EXE_COST, FILE_PATH, INSERT_TIME, INSERT_USERNAME, REMARK, DATAGRAM1, DATAGRAM2,
+    DATAGRAM3
+    </sql>
+    <sql id="columns_alias">
+        t.LOG_ID, t.LOG_CONTENT, t.FOREIGN_KEY_ID, t.FOREIGN_KEY_TYPE, t.METHOD_NAME, t.METHOD_DESCRIPTION,
+    t.EXE_COST, t.FILE_PATH, t.INSERT_TIME, t.INSERT_USERNAME, t.REMARK, t.DATAGRAM1,
+    t.DATAGRAM2, t.DATAGRAM3
+    </sql>
+    <sql id="select">
+        SELECT <include refid="columns"/> FROM LOG_RESULT
+    </sql>
+    <sql id="select_alias">
+        SELECT <include refid="columns_alias"/> FROM LOG_RESULT t
+    </sql>
+    <sql id="where">
+        <where>
+            <if test="logId != null">
+                and LOG_ID = #{logId}
+            </if>
+            <if test="logContent != null and logContent != ''">
+                and LOG_CONTENT = #{logContent}
+            </if>
+            <if test="foreignKeyId != null">
+                and FOREIGN_KEY_ID = #{foreignKeyId}
+            </if>
+            <if test="foreignKeyType != null and foreignKeyType != ''">
+                and FOREIGN_KEY_TYPE = #{foreignKeyType}
+            </if>
+            <if test="methodName != null and methodName != ''">
+                and METHOD_NAME = #{methodName}
+            </if>
+            <if test="methodDescription != null and methodDescription != ''">
+                and METHOD_DESCRIPTION = #{methodDescription}
+            </if>
+            <if test="exeCost != null">
+                and EXE_COST = #{exeCost}
+            </if>
+            <if test="filePath != null and filePath != ''">
+                and FILE_PATH = #{filePath}
+            </if>
+            <if test="insertTime != null">
+                and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
+            </if>
+            <if test="insertUsername != null and insertUsername != ''">
+                and INSERT_USERNAME = #{insertUsername}
+            </if>
+            <if test="remark != null and remark != ''">
+                and REMARK = #{remark}
+            </if>
+            <if test="datagram1 != null and datagram1 != ''">
+                and DATAGRAM1 = #{datagram1}
+            </if>
+            <if test="datagram2 != null and datagram2 != ''">
+                and DATAGRAM2 = #{datagram2}
+            </if>
+            <if test="datagram3 != null and datagram3 != ''">
+                and DATAGRAM3 = #{datagram3}
+            </if>
+        </where>
+    </sql>
+    <sql id="whereLike">
+        <where>
+            <if test="logId != null">
+                and LOG_ID = #{logId}
+            </if>
+            <if test="logContent != null and logContent != ''">
+                and LOG_CONTENT LIKE '%${logContent}%'
+            </if>
+            <if test="foreignKeyId != null">
+                and FOREIGN_KEY_ID = #{foreignKeyId}
+            </if>
+            <if test="foreignKeyType != null and foreignKeyType != ''">
+                and FOREIGN_KEY_TYPE LIKE '%${foreignKeyType}%'
+            </if>
+            <if test="methodName != null and methodName != ''">
+                and METHOD_NAME LIKE '%${methodName}%'
+            </if>
+            <if test="methodDescription != null and methodDescription != ''">
+                and METHOD_DESCRIPTION LIKE '%${methodDescription}%'
+            </if>
+            <if test="exeCost != null">
+                and EXE_COST = #{exeCost}
+            </if>
+            <if test="filePath != null and filePath != ''">
+                and FILE_PATH LIKE '%${filePath}%'
+            </if>
+            <if test="insertTime != null">
+                and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
+            </if>
+            <if test="insertUsername != null and insertUsername != ''">
+                and INSERT_USERNAME LIKE '%${insertUsername}%'
+            </if>
+            <if test="remark != null and remark != ''">
+                and REMARK LIKE '%${remark}%'
+            </if>
+            <if test="datagram1 != null and datagram1 != ''">
+                and DATAGRAM1 LIKE '%${datagram1}%'
+            </if>
+            <if test="datagram2 != null and datagram2 != ''">
+                and DATAGRAM2 LIKE '%${datagram2}%'
+            </if>
+            <if test="datagram3 != null and datagram3 != ''">
+                and DATAGRAM3 LIKE '%${datagram3}%'
+            </if>
+        </where>
+    </sql>
+    <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
+        delete from LOG_RESULT
+        where LOG_ID = #{logId,jdbcType=DECIMAL}
+    </delete>
+    <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+        delete from LOG_RESULT
+        where 1!=1
+        <if test="logContent != null and logContent != ''">
+            or LOG_CONTENT = #{logContent}
+        </if>
+        <if test="foreignKeyId != null">
+            or FOREIGN_KEY_ID = #{foreignKeyId}
+        </if>
+        <if test="foreignKeyType != null and foreignKeyType != ''">
+            or FOREIGN_KEY_TYPE = #{foreignKeyType}
+        </if>
+        <if test="methodName != null and methodName != ''">
+            or METHOD_NAME = #{methodName}
+        </if>
+        <if test="methodDescription != null and methodDescription != ''">
+            or METHOD_DESCRIPTION = #{methodDescription}
+        </if>
+        <if test="exeCost != null">
+            or EXE_COST = #{exeCost}
+        </if>
+        <if test="filePath != null and filePath != ''">
+            or FILE_PATH = #{filePath}
+        </if>
+        <if test="insertTime != null">
+            or TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = '#{insertTime}'
+        </if>
+        <if test="insertUsername != null and insertUsername != ''">
+            or INSERT_USERNAME = #{insertUsername}
+        </if>
+        <if test="remark != null and remark != ''">
+            or REMARK = #{remark}
+        </if>
+        <if test="datagram1 != null and datagram1 != ''">
+            or DATAGRAM1 = #{datagram1}
+        </if>
+        <if test="datagram2 != null and datagram2 != ''">
+            or DATAGRAM2 = #{datagram2}
+        </if>
+        <if test="datagram3 != null and datagram3 != ''">
+            or DATAGRAM3 = #{datagram3}
+        </if>
+    </delete>
+    <insert id="insert" parameterType="com.steerinfo.dil.model.LogResult">
+        insert into LOG_RESULT (LOG_ID, LOG_CONTENT, FOREIGN_KEY_ID,
+                                FOREIGN_KEY_TYPE, METHOD_NAME, METHOD_DESCRIPTION,
+                                EXE_COST, FILE_PATH, INSERT_TIME,
+                                INSERT_USERNAME, REMARK, DATAGRAM1,
+                                DATAGRAM2, DATAGRAM3)
+        values (#{logId,jdbcType=DECIMAL}, #{logContent,jdbcType=VARCHAR}, #{foreignKeyId,jdbcType=DECIMAL},
+                #{foreignKeyType,jdbcType=VARCHAR}, #{methodName,jdbcType=VARCHAR}, #{methodDescription,jdbcType=VARCHAR},
+                #{exeCost,jdbcType=DECIMAL}, #{filePath,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP},
+                #{insertUsername,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, #{datagram1,jdbcType=VARCHAR},
+                #{datagram2,jdbcType=VARCHAR}, #{datagram3,jdbcType=VARCHAR})
+    </insert>
+    <insert id="insertSelective" parameterType="com.steerinfo.dil.model.LogResult">
+        insert into LOG_RESULT
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="logId != null">
+                LOG_ID,
+            </if>
+            <if test="logContent != null">
+                LOG_CONTENT,
+            </if>
+            <if test="foreignKeyId != null">
+                FOREIGN_KEY_ID,
+            </if>
+            <if test="foreignKeyType != null">
+                FOREIGN_KEY_TYPE,
+            </if>
+            <if test="methodName != null">
+                METHOD_NAME,
+            </if>
+            <if test="methodDescription != null">
+                METHOD_DESCRIPTION,
+            </if>
+            <if test="exeCost != null">
+                EXE_COST,
+            </if>
+            <if test="filePath != null">
+                FILE_PATH,
+            </if>
+            <if test="insertTime != null">
+                INSERT_TIME,
+            </if>
+            <if test="insertUsername != null">
+                INSERT_USERNAME,
+            </if>
+            <if test="remark != null">
+                REMARK,
+            </if>
+            <if test="datagram1 != null">
+                DATAGRAM1,
+            </if>
+            <if test="datagram2 != null">
+                DATAGRAM2,
+            </if>
+            <if test="datagram3 != null">
+                DATAGRAM3,
+            </if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="logId != null">
+                #{logId,jdbcType=DECIMAL},
+            </if>
+            <if test="logContent != null">
+                #{logContent,jdbcType=VARCHAR},
+            </if>
+            <if test="foreignKeyId != null">
+                #{foreignKeyId,jdbcType=DECIMAL},
+            </if>
+            <if test="foreignKeyType != null">
+                #{foreignKeyType,jdbcType=VARCHAR},
+            </if>
+            <if test="methodName != null">
+                #{methodName,jdbcType=VARCHAR},
+            </if>
+            <if test="methodDescription != null">
+                #{methodDescription,jdbcType=VARCHAR},
+            </if>
+            <if test="exeCost != null">
+                #{exeCost,jdbcType=DECIMAL},
+            </if>
+            <if test="filePath != null">
+                #{filePath,jdbcType=VARCHAR},
+            </if>
+            <if test="insertTime != null">
+                #{insertTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="insertUsername != null">
+                #{insertUsername,jdbcType=VARCHAR},
+            </if>
+            <if test="remark != null">
+                #{remark,jdbcType=VARCHAR},
+            </if>
+            <if test="datagram1 != null">
+                #{datagram1,jdbcType=VARCHAR},
+            </if>
+            <if test="datagram2 != null">
+                #{datagram2,jdbcType=VARCHAR},
+            </if>
+            <if test="datagram3 != null">
+                #{datagram3,jdbcType=VARCHAR},
+            </if>
+        </trim>
+    </insert>
+    <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.LogResult">
+        update LOG_RESULT
+        set LOG_CONTENT = #{logContent,jdbcType=VARCHAR},
+            FOREIGN_KEY_ID = #{foreignKeyId,jdbcType=DECIMAL},
+            FOREIGN_KEY_TYPE = #{foreignKeyType,jdbcType=VARCHAR},
+            METHOD_NAME = #{methodName,jdbcType=VARCHAR},
+            METHOD_DESCRIPTION = #{methodDescription,jdbcType=VARCHAR},
+            EXE_COST = #{exeCost,jdbcType=DECIMAL},
+            FILE_PATH = #{filePath,jdbcType=VARCHAR},
+            INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
+            INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
+            REMARK = #{remark,jdbcType=VARCHAR},
+            DATAGRAM1 = #{datagram1,jdbcType=VARCHAR},
+            DATAGRAM2 = #{datagram2,jdbcType=VARCHAR},
+            DATAGRAM3 = #{datagram3,jdbcType=VARCHAR}
+        where LOG_ID = #{logId,jdbcType=DECIMAL}
+    </update>
+    <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.LogResult">
+        update LOG_RESULT
+        <set>
+            <if test="logContent != null">
+                LOG_CONTENT = #{logContent,jdbcType=VARCHAR},
+            </if>
+            <if test="foreignKeyId != null">
+                FOREIGN_KEY_ID = #{foreignKeyId,jdbcType=DECIMAL},
+            </if>
+            <if test="foreignKeyType != null">
+                FOREIGN_KEY_TYPE = #{foreignKeyType,jdbcType=VARCHAR},
+            </if>
+            <if test="methodName != null">
+                METHOD_NAME = #{methodName,jdbcType=VARCHAR},
+            </if>
+            <if test="methodDescription != null">
+                METHOD_DESCRIPTION = #{methodDescription,jdbcType=VARCHAR},
+            </if>
+            <if test="exeCost != null">
+                EXE_COST = #{exeCost,jdbcType=DECIMAL},
+            </if>
+            <if test="filePath != null">
+                FILE_PATH = #{filePath,jdbcType=VARCHAR},
+            </if>
+            <if test="insertTime != null">
+                INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="insertUsername != null">
+                INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
+            </if>
+            <if test="remark != null">
+                REMARK = #{remark,jdbcType=VARCHAR},
+            </if>
+            <if test="datagram1 != null">
+                DATAGRAM1 = #{datagram1,jdbcType=VARCHAR},
+            </if>
+            <if test="datagram2 != null">
+                DATAGRAM2 = #{datagram2,jdbcType=VARCHAR},
+            </if>
+            <if test="datagram3 != null">
+                DATAGRAM3 = #{datagram3,jdbcType=VARCHAR},
+            </if>
+        </set>
+        where LOG_ID = #{logId,jdbcType=DECIMAL}
+    </update>
+    <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
+        <include refid="select"/>
+        where LOG_ID = #{logId,jdbcType=DECIMAL}
+    </select>
+    <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+        <include refid="select"/>
+        <include refid="where"/>
+    </select>
+    <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+        <include refid="select"/>
+        <include refid="whereLike"/>
+    </select>
+    <insert id="batchInsert" parameterType="java.util.List">
+        insert into LOG_RESULT
+        (LOG_ID,
+        LOG_CONTENT, FOREIGN_KEY_ID, FOREIGN_KEY_TYPE,
+        METHOD_NAME, METHOD_DESCRIPTION,
+        EXE_COST, FILE_PATH, INSERT_TIME,
+        INSERT_USERNAME, REMARK, DATAGRAM1,
+        DATAGRAM2, DATAGRAM3)
+        ( <foreach collection="list" item="item" separator="union all">
+        select
+        #{item.logId,jdbcType=DECIMAL},
+        #{item.logContent,jdbcType=VARCHAR}, #{item.foreignKeyId,jdbcType=DECIMAL}, #{item.foreignKeyType,jdbcType=VARCHAR},
+        #{item.methodName,jdbcType=VARCHAR}, #{item.methodDescription,jdbcType=VARCHAR},
+        #{item.exeCost,jdbcType=DECIMAL}, #{item.filePath,jdbcType=VARCHAR}, #{item.insertTime,jdbcType=TIMESTAMP},
+        #{item.insertUsername,jdbcType=VARCHAR}, #{item.remark,jdbcType=VARCHAR}, #{item.datagram1,jdbcType=VARCHAR},
+        #{item.datagram2,jdbcType=VARCHAR}, #{item.datagram3,jdbcType=VARCHAR} from dual
+    </foreach> )
+    </insert>
+    <update id="batchUpdate" parameterType="java.util.List">
+        update LOG_RESULT
+        set
+        LOG_ID=
+        <foreach collection="list" item="item" index="index" separator=" " open="case LOG_ID" close="end">
+            when #{item.logId,jdbcType=DECIMAL} then #{item.logId,jdbcType=DECIMAL}
+        </foreach>
+        ,LOG_CONTENT=
+        <foreach collection="list" item="item" index="index" separator=" " open="case LOG_ID" close="end">
+            when #{item.logId,jdbcType=DECIMAL} then #{item.logContent,jdbcType=VARCHAR}
+        </foreach>
+        ,FOREIGN_KEY_ID=
+        <foreach collection="list" item="item" index="index" separator=" " open="case LOG_ID" close="end">
+            when #{item.logId,jdbcType=DECIMAL} then #{item.foreignKeyId,jdbcType=DECIMAL}
+        </foreach>
+        ,FOREIGN_KEY_TYPE=
+        <foreach collection="list" item="item" index="index" separator=" " open="case LOG_ID" close="end">
+            when #{item.logId,jdbcType=DECIMAL} then #{item.foreignKeyType,jdbcType=VARCHAR}
+        </foreach>
+        ,METHOD_NAME=
+        <foreach collection="list" item="item" index="index" separator=" " open="case LOG_ID" close="end">
+            when #{item.logId,jdbcType=DECIMAL} then #{item.methodName,jdbcType=VARCHAR}
+        </foreach>
+        ,METHOD_DESCRIPTION=
+        <foreach collection="list" item="item" index="index" separator=" " open="case LOG_ID" close="end">
+            when #{item.logId,jdbcType=DECIMAL} then #{item.methodDescription,jdbcType=VARCHAR}
+        </foreach>
+        ,EXE_COST=
+        <foreach collection="list" item="item" index="index" separator=" " open="case LOG_ID" close="end">
+            when #{item.logId,jdbcType=DECIMAL} then #{item.exeCost,jdbcType=DECIMAL}
+        </foreach>
+        ,FILE_PATH=
+        <foreach collection="list" item="item" index="index" separator=" " open="case LOG_ID" close="end">
+            when #{item.logId,jdbcType=DECIMAL} then #{item.filePath,jdbcType=VARCHAR}
+        </foreach>
+        ,INSERT_TIME=
+        <foreach collection="list" item="item" index="index" separator=" " open="case LOG_ID" close="end">
+            when #{item.logId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
+        </foreach>
+        ,INSERT_USERNAME=
+        <foreach collection="list" item="item" index="index" separator=" " open="case LOG_ID" close="end">
+            when #{item.logId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
+        </foreach>
+        ,REMARK=
+        <foreach collection="list" item="item" index="index" separator=" " open="case LOG_ID" close="end">
+            when #{item.logId,jdbcType=DECIMAL} then #{item.remark,jdbcType=VARCHAR}
+        </foreach>
+        ,DATAGRAM1=
+        <foreach collection="list" item="item" index="index" separator=" " open="case LOG_ID" close="end">
+            when #{item.logId,jdbcType=DECIMAL} then #{item.datagram1,jdbcType=VARCHAR}
+        </foreach>
+        ,DATAGRAM2=
+        <foreach collection="list" item="item" index="index" separator=" " open="case LOG_ID" close="end">
+            when #{item.logId,jdbcType=DECIMAL} then #{item.datagram2,jdbcType=VARCHAR}
+        </foreach>
+        ,DATAGRAM3=
+        <foreach collection="list" item="item" index="index" separator=" " open="case LOG_ID" close="end">
+            when #{item.logId,jdbcType=DECIMAL} then #{item.datagram3,jdbcType=VARCHAR}
+        </foreach>
+        where LOG_ID in
+        <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
+            #{item.logId,jdbcType=DECIMAL}
+        </foreach>
+    </update>
+    <delete id="batchDelete" parameterType="java.util.List">
+        delete from LOG_RESULT
+        where LOG_ID in
+        <foreach collection="list" item="id" open="(" close=")" separator=",">
+            #{id}
+        </foreach>
+    </delete>
+    <!-- 友情提示！！！-->
+    <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
 
 </mapper>

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

@@ -3,20 +3,22 @@
 <mapper namespace="com.steerinfo.dil.mapper.RmsReceivingCompanyMapper">
     <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.RmsReceivingCompany">
         <id column="COMPANY_ID" javaType="DECIMAL" property="companyId"/>
-        <result column="COMPANY_CODE" jdbcType="VARCHAR" property="companyCode" />
-        <result column="COMPANY_NAME" jdbcType="VARCHAR" property="companyName" />
-        <result column="INSERT_USERNAME" jdbcType="VARCHAR" property="insertUsername" />
-        <result column="INSERT_TIME" jdbcType="TIMESTAMP" property="insertTime" />
-        <result column="UPDATE_USERNAME" jdbcType="VARCHAR" property="updateUsername" />
-        <result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime" />
-        <result column="INSERT_UPDATE_REMARK" jdbcType="VARCHAR" property="insertUpdateRemark" />
+        <result column="COMPANY_CODE" jdbcType="VARCHAR" property="companyCode"/>
+        <result column="COMPANY_NAME" jdbcType="VARCHAR" property="companyName"/>
+        <result column="INSERT_USERNAME" jdbcType="VARCHAR" property="insertUsername"/>
+        <result column="INSERT_TIME" jdbcType="TIMESTAMP" property="insertTime"/>
+        <result column="UPDATE_USERNAME" jdbcType="VARCHAR" property="updateUsername"/>
+        <result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime"/>
+        <result column="INSERT_UPDATE_REMARK" jdbcType="VARCHAR" property="insertUpdateRemark"/>
     </resultMap>
     <sql id="columns">
         t.COMPANY_ID, t.COMPANY_CODE, t.COMPANY_NAME, t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME,
-            t.UPDATE_TIME, t.INSERT_UPDATE_REMARK
+        t.UPDATE_TIME, t.INSERT_UPDATE_REMARK
     </sql>
     <sql id="select">
-        SELECT <include refid="columns" /> FROM rms_receiving_company t
+        SELECT
+        <include refid="columns"/>
+        FROM rms_receiving_company t
     </sql>
     <sql id="where">
         <where>
@@ -65,27 +67,27 @@
     </delete>
     <insert id="insert" parameterType="com.steerinfo.dil.model.RmsReceivingCompany">
         insert into rms_receiving_company
-            (
-                COMPANY_ID,
-                COMPANY_CODE,
-                COMPANY_NAME,
-                INSERT_USERNAME,
-                INSERT_TIME,
-                UPDATE_USERNAME,
-                UPDATE_TIME,
-                INSERT_UPDATE_REMARK
-             )
+        (
+        COMPANY_ID,
+        COMPANY_CODE,
+        COMPANY_NAME,
+        INSERT_USERNAME,
+        INSERT_TIME,
+        UPDATE_USERNAME,
+        UPDATE_TIME,
+        INSERT_UPDATE_REMARK
+        )
         values
-            (
-                #{companyId, jdbcType=DECIMAL},
-                #{companyCode, jdbcType=VARCHAR},
-                #{companyName, jdbcType=VARCHAR},
-                #{insertUsername, jdbcType=VARCHAR},
-                #{insertTime, jdbcType=TIMESTAMP},
-                #{updateUsername, jdbcType=VARCHAR},
-                #{updateTime, jdbcType=TIMESTAMP},
-                #{insertUpdateRemark, jdbcType=VARCHAR}
-             )
+        (
+        #{companyId, jdbcType=DECIMAL},
+        #{companyCode, jdbcType=VARCHAR},
+        #{companyName, jdbcType=VARCHAR},
+        #{insertUsername, jdbcType=VARCHAR},
+        #{insertTime, jdbcType=TIMESTAMP},
+        #{updateUsername, jdbcType=VARCHAR},
+        #{updateTime, jdbcType=TIMESTAMP},
+        #{insertUpdateRemark, jdbcType=VARCHAR}
+        )
     </insert>
     <insert id="insertSelective" parameterType="com.steerinfo.dil.model.RmsReceivingCompany">
         insert into rms_receiving_company
@@ -144,15 +146,15 @@
     </insert>
     <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.RmsReceivingCompany">
         update rms_receiving_company set
-            COMPANY_CODE = #{companyCode, jdbcType=VARCHAR},
-            COMPANY_NAME = #{companyName, jdbcType=VARCHAR},
-            INSERT_USERNAME = #{insertUsername, jdbcType=VARCHAR},
-            INSERT_TIME = #{insertTime, jdbcType=TIMESTAMP},
-            UPDATE_USERNAME = #{updateUsername, jdbcType=VARCHAR},
-            UPDATE_TIME = #{updateTime, jdbcType=TIMESTAMP},
-            INSERT_UPDATE_REMARK = #{insertUpdateRemark, jdbcType=VARCHAR}
+        COMPANY_CODE = #{companyCode, jdbcType=VARCHAR},
+        COMPANY_NAME = #{companyName, jdbcType=VARCHAR},
+        INSERT_USERNAME = #{insertUsername, jdbcType=VARCHAR},
+        INSERT_TIME = #{insertTime, jdbcType=TIMESTAMP},
+        UPDATE_USERNAME = #{updateUsername, jdbcType=VARCHAR},
+        UPDATE_TIME = #{updateTime, jdbcType=TIMESTAMP},
+        INSERT_UPDATE_REMARK = #{insertUpdateRemark, jdbcType=VARCHAR}
         where
-            COMPANY_ID = #{companyId, jdbcType=DECIMAL}
+        COMPANY_ID = #{companyId, jdbcType=DECIMAL}
     </update>
     <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.RmsReceivingCompany">
         update rms_receiving_company
@@ -182,39 +184,39 @@
         where COMPANY_ID = #{companyId, jdbcType=DECIMAL}
     </update>
     <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
-        <include refid="select" />
+        <include refid="select"/>
         where COMPANY_ID = #{companyId, jdbcType=DECIMAL}
     </select>
     <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
-        <include refid="select" />
-        <include refid="where" />
+        <include refid="select"/>
+        <include refid="where"/>
     </select>
     <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
-        <include refid="select" />
-        <include refid="where" />
+        <include refid="select"/>
+        <include refid="where"/>
     </select>
     <insert id="batchInsert" parameterType="java.util.List">
         insert into rms_receiving_company
         (
-            COMPANY_ID,
-            COMPANY_CODE,
-            COMPANY_NAME,
-            INSERT_USERNAME,
-            INSERT_TIME,
-            UPDATE_USERNAME,
-            UPDATE_TIME,
-            INSERT_UPDATE_REMARK
+        COMPANY_ID,
+        COMPANY_CODE,
+        COMPANY_NAME,
+        INSERT_USERNAME,
+        INSERT_TIME,
+        UPDATE_USERNAME,
+        UPDATE_TIME,
+        INSERT_UPDATE_REMARK
         )
         ( <foreach collection="list" item="item" separator="union all">
         select
-            #{companyId, jdbcType=DECIMAL},
-            #{companyCode, jdbcType=VARCHAR},
-            #{companyName, jdbcType=VARCHAR},
-            #{insertUsername, jdbcType=VARCHAR},
-            #{insertTime, jdbcType=TIMESTAMP},
-            #{updateUsername, jdbcType=VARCHAR},
-            #{updateTime, jdbcType=TIMESTAMP},
-            #{insertUpdateRemark, jdbcType=VARCHAR}
+        #{companyId, jdbcType=DECIMAL},
+        #{companyCode, jdbcType=VARCHAR},
+        #{companyName, jdbcType=VARCHAR},
+        #{insertUsername, jdbcType=VARCHAR},
+        #{insertTime, jdbcType=TIMESTAMP},
+        #{updateUsername, jdbcType=VARCHAR},
+        #{updateTime, jdbcType=TIMESTAMP},
+        #{insertUpdateRemark, jdbcType=VARCHAR}
         from dual
     </foreach> )
     </insert>
@@ -230,6 +232,6 @@
     </delete>
 
     <select id="selectAll" resultMap="BaseResultMap">
-        <include refid="select" />
+        <include refid="select"/>
     </select>
 </mapper>

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

@@ -1,179 +1,183 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.steerinfo.dil.mapper.SystemFileMapper">
-  <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.SystemFile">
-    <id column="ID" jdbcType="VARCHAR" property="id" />
-    <result column="FILENAME" jdbcType="VARCHAR" property="filename" />
-    <result column="FILEPATH" jdbcType="VARCHAR" property="filepath" />
-  </resultMap>
-  <sql id="columns">
-    ID, FILENAME, FILEPATH
-  </sql>
-  <sql id="columns_alias">
-    t.ID, t.FILENAME, t.FILEPATH
-  </sql>
-  <sql id="select">
-    SELECT <include refid="columns"/> FROM SYSTEM_FILE
-  </sql>
-  <sql id="select_alias">
-    SELECT <include refid="columns_alias"/> FROM SYSTEM_FILE t
-  </sql>
-  <sql id="where">
-    <where> 
-      <if test="id != null and id != ''">
-        and ID = #{id}
-      </if>
-      <if test="filename != null and filename != ''">
-        and FILENAME = #{filename}
-      </if>
-      <if test="filepath != null and filepath != ''">
-        and FILEPATH = #{filepath}
-      </if>
-    </where>
-  </sql>
-  <sql id="whereLike">
-    <where> 
-      <if test="id != null and id != ''">
-        and ID LIKE '%${id}%'
-      </if>
-      <if test="filename != null and filename != ''">
-        and FILENAME LIKE '%${filename}%'
-      </if>
-      <if test="filepath != null and filepath != ''">
-        and FILEPATH LIKE '%${filepath}%'
-      </if>
-    </where>
-  </sql>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
-    delete from SYSTEM_FILE
-    where ID = #{id,jdbcType=VARCHAR}
-  </delete>
-  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
-    delete from SYSTEM_FILE
-    where 1!=1 
-      <if test="filename != null and filename != ''">
-        or FILENAME = #{filename}
-      </if>
-      <if test="filepath != null and filepath != ''">
-        or FILEPATH = #{filepath}
-      </if>
-  </delete>
-  <insert id="insert" parameterType="com.steerinfo.dil.model.SystemFile">
-    insert into SYSTEM_FILE (ID, FILENAME, FILEPATH
-      )
-    values (#{id,jdbcType=VARCHAR}, #{filename,jdbcType=VARCHAR}, #{filepath,jdbcType=VARCHAR}
-      )
-  </insert>
-  <insert id="insertSelective" parameterType="com.steerinfo.dil.model.SystemFile">
-    insert into SYSTEM_FILE
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        ID,
-      </if>
-      <if test="filename != null">
-        FILENAME,
-      </if>
-      <if test="filepath != null">
-        FILEPATH,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        #{id,jdbcType=VARCHAR},
-      </if>
-      <if test="filename != null">
-        #{filename,jdbcType=VARCHAR},
-      </if>
-      <if test="filepath != null">
-        #{filepath,jdbcType=VARCHAR},
-      </if>
-    </trim>
-  </insert>
-  <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.SystemFile">
-    update SYSTEM_FILE
-    set FILENAME = #{filename,jdbcType=VARCHAR},
-      FILEPATH = #{filepath,jdbcType=VARCHAR}
-    where ID = #{id,jdbcType=VARCHAR}
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.SystemFile">
-    update SYSTEM_FILE
-    <set>
-      <if test="filename != null">
-        FILENAME = #{filename,jdbcType=VARCHAR},
-      </if>
-      <if test="filepath != null">
-        FILEPATH = #{filepath,jdbcType=VARCHAR},
-      </if>
-    </set>
-    where ID = #{id,jdbcType=VARCHAR}
-  </update>
-  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
-    <include refid="select"/>
-    where ID = #{id,jdbcType=VARCHAR}
-  </select>
-  <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
-    <include refid="select"/>
-    <include refid="where"/>
-  </select>
-  <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
-    <include refid="select"/>
-    <include refid="whereLike"/>
-  </select>
+    <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.SystemFile">
+        <id column="ID" jdbcType="VARCHAR" property="id"/>
+        <result column="FILENAME" jdbcType="VARCHAR" property="filename"/>
+        <result column="FILEPATH" jdbcType="VARCHAR" property="filepath"/>
+    </resultMap>
+    <sql id="columns">
+        ID, FILENAME, FILEPATH
+    </sql>
+    <sql id="columns_alias">
+        t.ID, t.FILENAME, t.FILEPATH
+    </sql>
+    <sql id="select">
+        SELECT
+        <include refid="columns"/>
+        FROM SYSTEM_FILE
+    </sql>
+    <sql id="select_alias">
+        SELECT
+        <include refid="columns_alias"/>
+        FROM SYSTEM_FILE t
+    </sql>
+    <sql id="where">
+        <where>
+            <if test="id != null and id != ''">
+                and ID = #{id}
+            </if>
+            <if test="filename != null and filename != ''">
+                and FILENAME = #{filename}
+            </if>
+            <if test="filepath != null and filepath != ''">
+                and FILEPATH = #{filepath}
+            </if>
+        </where>
+    </sql>
+    <sql id="whereLike">
+        <where>
+            <if test="id != null and id != ''">
+                and ID LIKE '%${id}%'
+            </if>
+            <if test="filename != null and filename != ''">
+                and FILENAME LIKE '%${filename}%'
+            </if>
+            <if test="filepath != null and filepath != ''">
+                and FILEPATH LIKE '%${filepath}%'
+            </if>
+        </where>
+    </sql>
+    <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+        delete from SYSTEM_FILE
+        where ID = #{id,jdbcType=VARCHAR}
+    </delete>
+    <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+        delete from SYSTEM_FILE
+        where 1!=1
+        <if test="filename != null and filename != ''">
+            or FILENAME = #{filename}
+        </if>
+        <if test="filepath != null and filepath != ''">
+            or FILEPATH = #{filepath}
+        </if>
+    </delete>
+    <insert id="insert" parameterType="com.steerinfo.dil.model.SystemFile">
+        insert into SYSTEM_FILE (ID, FILENAME, FILEPATH
+        )
+        values (#{id,jdbcType=VARCHAR}, #{filename,jdbcType=VARCHAR}, #{filepath,jdbcType=VARCHAR}
+        )
+    </insert>
+    <insert id="insertSelective" parameterType="com.steerinfo.dil.model.SystemFile">
+        insert into SYSTEM_FILE
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">
+                ID,
+            </if>
+            <if test="filename != null">
+                FILENAME,
+            </if>
+            <if test="filepath != null">
+                FILEPATH,
+            </if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">
+                #{id,jdbcType=VARCHAR},
+            </if>
+            <if test="filename != null">
+                #{filename,jdbcType=VARCHAR},
+            </if>
+            <if test="filepath != null">
+                #{filepath,jdbcType=VARCHAR},
+            </if>
+        </trim>
+    </insert>
+    <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.SystemFile">
+        update SYSTEM_FILE
+        set FILENAME = #{filename,jdbcType=VARCHAR},
+        FILEPATH = #{filepath,jdbcType=VARCHAR}
+        where ID = #{id,jdbcType=VARCHAR}
+    </update>
+    <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.SystemFile">
+        update SYSTEM_FILE
+        <set>
+            <if test="filename != null">
+                FILENAME = #{filename,jdbcType=VARCHAR},
+            </if>
+            <if test="filepath != null">
+                FILEPATH = #{filepath,jdbcType=VARCHAR},
+            </if>
+        </set>
+        where ID = #{id,jdbcType=VARCHAR}
+    </update>
+    <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+        <include refid="select"/>
+        where ID = #{id,jdbcType=VARCHAR}
+    </select>
+    <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+        <include refid="select"/>
+        <include refid="where"/>
+    </select>
+    <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+        <include refid="select"/>
+        <include refid="whereLike"/>
+    </select>
     <insert id="batchInsert" parameterType="java.util.List">
-    insert into SYSTEM_FILE 
-      (ID, 
-      FILENAME, FILEPATH)
-    ( <foreach collection="list" item="item" separator="union all"> 
-   select  
-      #{item.id,jdbcType=VARCHAR}, 
-      #{item.filename,jdbcType=VARCHAR}, #{item.filepath,jdbcType=VARCHAR} from dual  
-   </foreach> )
-  </insert>
+        insert into SYSTEM_FILE
+        (ID,
+        FILENAME, FILEPATH)
+        ( <foreach collection="list" item="item" separator="union all">
+        select
+        #{item.id,jdbcType=VARCHAR},
+        #{item.filename,jdbcType=VARCHAR}, #{item.filepath,jdbcType=VARCHAR} from dual
+    </foreach> )
+    </insert>
 
-  <update id="batchUpdate" parameterType="java.util.List">
-     update SYSTEM_FILE
-     set
-       ID=
-       <foreach collection="list" item="item" index="index" separator=" " open="case ID" close="end">
-          when #{item.id,jdbcType=VARCHAR} then #{item.id,jdbcType=VARCHAR}
-       </foreach>
-       ,FILENAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case ID" close="end">
-          when #{item.id,jdbcType=VARCHAR} then #{item.filename,jdbcType=VARCHAR}
-       </foreach>
-       ,FILEPATH=
-       <foreach collection="list" item="item" index="index" separator=" " open="case ID" close="end">
-          when #{item.id,jdbcType=VARCHAR} then #{item.filepath,jdbcType=VARCHAR}
-       </foreach>
-     where ID in 
-     <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
-    #{item.id,jdbcType=VARCHAR}
-     </foreach> 
-  </update>
-  <delete id="batchDelete" parameterType="java.util.List">
-    delete from SYSTEM_FILE
-    where ID in 
-    <foreach collection="list" item="id" open="(" close=")" separator=",">
-      #{id}
-    </foreach>
-  </delete>
-  <!-- 友情提示！！！-->
-  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
-  <insert id="insertAll" parameterType="com.steerinfo.dil.model.SystemFile">
-    insert into SYSTEM_FILE (ID, FILENAME, FILEPATH
-    )
-    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>
+    <update id="batchUpdate" parameterType="java.util.List">
+        update SYSTEM_FILE
+        set
+        ID=
+        <foreach collection="list" item="item" index="index" separator=" " open="case ID" close="end">
+            when #{item.id,jdbcType=VARCHAR} then #{item.id,jdbcType=VARCHAR}
+        </foreach>
+        ,FILENAME=
+        <foreach collection="list" item="item" index="index" separator=" " open="case ID" close="end">
+            when #{item.id,jdbcType=VARCHAR} then #{item.filename,jdbcType=VARCHAR}
+        </foreach>
+        ,FILEPATH=
+        <foreach collection="list" item="item" index="index" separator=" " open="case ID" close="end">
+            when #{item.id,jdbcType=VARCHAR} then #{item.filepath,jdbcType=VARCHAR}
+        </foreach>
+        where ID in
+        <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
+            #{item.id,jdbcType=VARCHAR}
+        </foreach>
+    </update>
+    <delete id="batchDelete" parameterType="java.util.List">
+        delete from SYSTEM_FILE
+        where ID in
+        <foreach collection="list" item="id" open="(" close=")" separator=",">
+            #{id}
+        </foreach>
+    </delete>
+    <!-- 友情提示！！！-->
+    <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+    <insert id="insertAll" parameterType="com.steerinfo.dil.model.SystemFile">
+        insert into SYSTEM_FILE (ID, FILENAME, FILEPATH
+        )
+        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>