添加出入库归档查询接口

src/main/java/com/chinaitop/depot/agent/archive/controller/ArchiveController.java

@@ -11,6 +11,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -20,6 +21,7 @@ import com.chinaitop.utils.ParameterUtil;
 import com.github.pagehelper.PageHelper;
 
 import java.util.*;
+import java.util.concurrent.Future;
 
 @RestController
 @RequestMapping(value = "/archive")
@@ -230,4 +232,26 @@ public class ArchiveController {
         map = archiveService.getArchiveDataList(orgId);
         return map;
     }
+
+    @RequestMapping(value = "/getCRKArchiveList", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
+    @ApiOperation(value="出入库用归档接口(统一对外接口)", notes = "出入库用归档接口(统一对外接口)")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "orgId", value = "单位ID", paramType = "query")
+    })
+    public Map<String,Object> getCRKArchiveList(String orgId) throws Exception {
+        Map<String,Object> map = new HashMap<String, Object>();
+        try {
+            //执行任务
+            List<Map<String, Object>> archiveList = archiveService.getCRKArchiveList(orgId);
+            map.put("success",true);
+            map.put("msg","查询成功!");
+            map.put("rows",archiveList);
+            map.put("totalCount",archiveList.size());
+        } catch (Exception e) {
+            map.put("success",false);
+            map.put("msg","查询失败!");
+            return map;
+        }
+        return map;
+    }
 }

src/main/java/com/chinaitop/depot/agent/archive/mapper/StorageArchiveMapper.java

@@ -39,4 +39,5 @@ public interface StorageArchiveMapper {
     List<StorageArchive> getArchiveApprovalList(Map<String,Object> map);
 
     List<Map<String,Object>> getArchiveDataList(Map<String,Object> map);
+    List<Map<String,Object>> getCRKArchiveList(Map<String,Object> map);
 }

src/main/java/com/chinaitop/depot/agent/archive/mapper/StorageArchiveMapper.xml

@@ -424,4 +424,25 @@
     WHERE
         rn = 1
   </select>
+
+  <select id="getCRKArchiveList" resultType="java.util.Map" parameterType="java.util.Map">
+    SELECT
+        *
+    FROM
+        (
+            SELECT
+                ROW_NUMBER() OVER(PARTITION BY archive.storehouse_id ORDER BY archive.create_time DESC) rn,
+                to_char(archive.create_time, 'yyyy-mm-dd') AS archived_day,
+                house.storehouse_name AS store_name,
+                house.storehouse_code AS store_code
+            FROM
+                storage_archive archive
+            LEFT JOIN basic_storehouse house ON house.storehouse_id = archive.storehouse_id
+            WHERE
+                archive.archive_state = '5' AND
+                archive.org_id = #{orgId}
+        ) a
+    WHERE
+        rn = 1
+  </select>
 </mapper>

src/main/java/com/chinaitop/depot/agent/archive/service/ArchiveService.java

@@ -27,4 +27,5 @@ public interface ArchiveService {
     List<StorageArchive> getArchiveViewList(String storehouseId, String startTime, String endTime, String orgId);
 
     Map<Integer,Object> getArchiveDataList(String orgId);
+    List<Map<String,Object>> getCRKArchiveList(String orgId);
 }

src/main/java/com/chinaitop/depot/agent/archive/service/impl/ArchiveServiceImpl.java

@@ -202,4 +202,11 @@ public class ArchiveServiceImpl implements ArchiveService {
         }
         return objMap;
     }
+
+    @Override
+    public List<Map<String,Object>> getCRKArchiveList(String orgId) {
+        Map<String, Object> map = new HashMap<String, Object>();
+        map.put("orgId", orgId);
+        return ParameterUtil.slashCapitals(StorageArchiveMapper.getCRKArchiveList(map));
+    }
 }

src/main/resources/bootstrap.yml

@@ -11,7 +11,7 @@ server:
 eureka:
   client:
     service-url:
-      defaultZone: http://172.16.0.4:9711/eureka/
+      defaultZone: http://localhost:9002/eureka/
   instance:
     prefer-ip-address: true
     # 每隔10s发送一次心跳(默认30s)
@@ -33,65 +33,17 @@ spring:
     username: gbasedbt
     password: cDbK2S0go8
     driver-class-name: com.gbasedbt.jdbc.IfxDriver
-  # 缓存配置
-  session:
-    store-type: redis
-  redis:
-    database: 4
-    host: 172.16.0.46
-    port: 6679
-    password: 123456
-    timeout: 3000
-    jedis:
-      pool:
-        max-active: 8
-        max-wait: -1
-        max-idle: 8
-        min-idle: 0
-  # 静态资源配置
-  resources:
-    static-locations: classpath:/META-INF/resources/,classpath:/resources/,classpath:/static/,classpath:/public/,file:${web.upload-path}
-
-web:
-  upload-path: /upload
-
----
-server:
-  port: 9027
-  tomcat:
-    uri-encoding: utf-8
-
-# 注册中心配置
-eureka:
-  client:
-    service-url:
-      defaultZone: http://192.168.123.98:9002/eureka/
-  instance:
-    prefer-ip-address: true
-    # 每隔10s发送一次心跳(默认30s)
-    lease-renewal-interval-in-seconds: 10
-    # 告知服务端30秒还未收到心跳的话，就将该服务移除列表(默认90s)
-    lease-expiration-duration-in-seconds: 30
-
-spring:
-  profiles: dev
-  application:
-    name: depot-agent-lv
-  # 数据库配置
-  datasource:
-    type: com.alibaba.druid.pool.DruidDataSource
-    url: jdbc:gbasedbt-sqli://192.168.123.38:9099/depot:INFORMIXSERVER=depot;NEWCODESET=GBK,8859-1,819;GL_USEGLU=1;IFX_USE_STRENC=true;characterEncoding=utf8;DB_LOCALE=zh_cn.GB18030-2000
-    username: gbasedbt
-    password: depot123456
-    driver-class-name: com.gbasedbt.jdbc.IfxDriver
+  #    url: jdbc:gbasedbt-sqli://111.164.113.172:666/depot:INFORMIXSERVER=gbaseserver;NEWCODESET=GBK,8859-1,819;GL_USEGLU=1;IFX_USE_STRENC=true;characterEncoding=utf8;
+  #    username: gbasedbt
+  #    password: GBase123
   # 缓存配置
   session:
     store-type: redis
   redis:
     database: 2
-    host: 192.168.123.98
-    port: 6666
-    password: depotredis
+    host: localhost
+    port: 6379
+    password:
     timeout: 3000
     jedis:
       pool:
@@ -104,5 +56,4 @@ spring:
     static-locations: classpath:/META-INF/resources/,classpath:/resources/,classpath:/static/,classpath:/public/,file:${web.upload-path}
 
 web:
-  upload-path: /upload
-logging.level.com.chinaitop.depot.agent.crk.mapper: debug
+  upload-path: /upload