修改船舶

.idea/libraries/Maven__com_netflix_hystrix_hystrix_metrics_event_stream_1_5_12.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: com.netflix.hystrix:hystrix-metrics-event-stream:1.5.12">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/../../../../maven/apache-maven-3.6.3/apache-maven-3.6.3/cangku/com/netflix/hystrix/hystrix-metrics-event-stream/1.5.12/hystrix-metrics-event-stream-1.5.12.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../../maven/apache-maven-3.6.3/apache-maven-3.6.3/cangku/com/netflix/hystrix/hystrix-metrics-event-stream/1.5.12/hystrix-metrics-event-stream-1.5.12-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../../maven/apache-maven-3.6.3/apache-maven-3.6.3/cangku/com/netflix/hystrix/hystrix-metrics-event-stream/1.5.12/hystrix-metrics-event-stream-1.5.12-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__org_apache_commons_commons_lang3_3_7.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.apache.commons:commons-lang3:3.7">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/../../../../maven/apache-maven-3.6.3/apache-maven-3.6.3/cangku/org/apache/commons/commons-lang3/3.7/commons-lang3-3.7.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../../maven/apache-maven-3.6.3/apache-maven-3.6.3/cangku/org/apache/commons/commons-lang3/3.7/commons-lang3-3.7-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../../maven/apache-maven-3.6.3/apache-maven-3.6.3/cangku/org/apache/commons/commons-lang3/3.7/commons-lang3-3.7-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

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

@@ -14,6 +14,7 @@ import com.steerinfo.dil.service.IDilBatchService;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.AnnotationUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -86,6 +87,35 @@ public class DilBatchController extends BaseRESTfulController {
         return success(data);
     }
 
+
+
+
+    @ApiOperation(value="查询批次列表", notes="分页查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "489", required = false, dataType = "Integer")
+    })
+    @PostMapping("/getBatchIdByForeign")
+    public RESTfulResult getBatchIdByForeign(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                 Integer pageNum,
+                                                 Integer pageSize,
+                                                 Integer apiId,
+                                                 String con) {
+        if (mapValue==null){
+            mapValue=new HashMap<>();
+        }
+        if (con!=null&&!"null".equals(con)){
+            mapValue.put("con",con);
+        }
+        List<Map<String, Object>> listTotal =  dilBatchService.getBatchIdByForeign(mapValue);
+        PageHelper.startPage(pageNum, pageSize);
+        //分页查询数据
+        List<Map<String, Object>> columnList = dilBatchService.getBatchIdByForeign(mapValue);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, listTotal, columnList);
+        return success(data);
+    }
+
 //    根据索引模糊查询外轮船名
     @ApiOperation(value="根据用户输入输出船名", notes="模糊查询")
     @ApiImplicitParams({

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

@@ -6,6 +6,7 @@ import com.steerinfo.framework.controller.RESTfulResult;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -20,10 +21,14 @@ public class ShipDynamicsController extends BaseRESTfulController {
 
     @ApiOperation(value="查询所有的船舶动态信息")
     @PostMapping("/selectAllShipDynamaics")
-    public RESTfulResult selectAllShipDynamaics() {
+    public RESTfulResult selectAllShipDynamaics(@RequestBody(required = false)Map<String,Object> mapVal,
+                                                String con) {
         //返回值mapList
         //获取视图里的所有外轮船名，物资名称
-         List<Map<String, Object>> list = iShipDynamicsService.selectAll();
+        if (con!=null&&!"null".equals(con)){
+            mapVal.put("con",con);
+        }
+         List<Map<String, Object>> list = iShipDynamicsService.selectAll(mapVal);
         if (list.size()==0){
 //            System.out.println("暂时没有位置作业");
             return failed("暂时没有船舶动态");

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

@@ -28,6 +28,7 @@ public interface DilBatchMapper extends IBaseMapper<DilBatch, Short> {
     BigDecimal selectBatchIdByName(Map<String,Object> map);
 
     //根据外轮船名和物资名称查找批次主表id是否存在
-    BigDecimal selectBatchIdByForeign(Map<String,Object> map);
+    List<Map<String,Object>> selectBatchIdByForeign(Map<String,Object> map);
 
+    List<Map<String, Object>> getBatchIdByForeign(Map<String, Object> mapValue);
 }

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

@@ -9,6 +9,6 @@ import java.util.Map;
 @Mapper
 public interface ShipDynamicsMapper {
     //查询船舶动态表
-    List<Map<String, Object>> selectAll();
+    List<Map<String, Object>> selectAll(Map<String,Object> map);
     List<Map<String, Object>> selectByshipName(String shipName, String materialName);
 }

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

@@ -33,4 +33,6 @@ public interface IDilBatchService {
 
     //新增批次
     Map<String,Object> insertBatchId(Map<String,Object> map);
+
+    List<Map<String, Object>> getBatchIdByForeign(Map<String, Object> mapValue);
 }

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

@@ -6,7 +6,7 @@ import java.util.Map;
 public interface IShipDynamicsService {
 
     //
-    List<Map<String, Object>> selectAll();
+    List<Map<String, Object>> selectAll(Map<String,Object> map);
     //通过外轮船名，物资名称查询视图中的江船状态数据
     List<Map<String, Object>> selectByshipName(String shipName, String materialName);
 }

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

@@ -63,11 +63,12 @@ public class DilBatchServiceImpl  implements IDilBatchService {
         String foreignShipName = (String) map.get("foreignShipName");
         BigDecimal materialId = DataChange.dataToBigDecimal(map.get("materialId"));
         String userId = (String) map.get("userId");
+        BigDecimal batchIds =DataChange.dataToBigDecimal(map.get("batchIds"));
         DilBatchInfacotry dilBatchInfacotry=new DilBatchInfacotry();
         //首先根据外轮船名和批次查找批次主表id是否存在
-        BigDecimal BatchId = dilBatchMapper.selectBatchIdByForeign(map);
-        if (BatchId!=null){
-            dilBatchInfacotry.setBatchId(BatchId);
+        List<Map<String,Object>> BatchId = dilBatchMapper.selectBatchIdByForeign(map);
+        if (BatchId.size()!=0){
+            dilBatchInfacotry.setBatchId(batchIds);
         }else {
             DilBatch dilBatch = new DilBatch();
             BigDecimal batchId1 = dilBatchMapper.selectBatchId();
@@ -95,4 +96,9 @@ public class DilBatchServiceImpl  implements IDilBatchService {
         }
         return map;
     }
+
+    @Override
+    public List<Map<String, Object>> getBatchIdByForeign(Map<String, Object> mapValue) {
+        return dilBatchMapper.getBatchIdByForeign(mapValue);
+    }
 }

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

@@ -14,10 +14,12 @@ public class ShipDynamicsServiceImpl implements IShipDynamicsService {
     ShipDynamicsMapper shipDynamicsMapper;
 
     //获取视图里的所有外轮船名，物资名称
-    public List<Map<String, Object>> selectAll() {
-        return shipDynamicsMapper.selectAll();
+    public List<Map<String, Object>> selectAll(Map<String,Object> map) {
+        return shipDynamicsMapper.selectAll(map);
     }
 
+
+
     @Override
     public List<Map<String, Object>> selectByshipName(String shipName, String materialName) {
         return shipDynamicsMapper.selectByshipName(shipName,materialName);

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

@@ -142,9 +142,7 @@ public class ImageFileUtils implements FileUtils {
     public Object downloadFile(String filePath) throws Exception {
         File file = new File(filePath);
         if(file.isDirectory()){
-
             throw new RuntimeException("当前路径是目录");
-
         }
         byte[] b = bytes(file);
         String type =getFileHeader(b);

src/main/resources/application-dev.yml

@@ -7,9 +7,11 @@ spring:
   application:
     name: dil-shiptms-api-dev
 
+
+
 openfeign:
   WmshboundFeign:
-    url: ${WMSHBOUNDFEIGN_URL:172.16.33.162:8013}
+    url: ${WMSHBOUNDFEIGN_URL:172.16.33.166:8013}
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
 

src/main/resources/application-prod.yml

@@ -6,6 +6,21 @@ spring:
     driver-class-name: oracle.jdbc.OracleDriver
   application:
     name: dil-shiptms-api-prod
+  druid:
+    stat-view-servlet:
+     #是否启用StatViewServlet(监控页面),默认true-启动，false-不启动
+      enabled: false
+      url-pattern: '/druid/*'
+      # IP白名单(没有配置或者为空，则允许所有访问)
+      allow:
+      # IP黑名单(存在共同时,deny优先于allow)
+      deny:
+      # 禁用HTML页面上的"Reset All"功能
+      reset-enable: false
+      # 登录名
+      login-username: admin
+      # 登录密码
+      login-password: dagang0426
 
 openfeign:
   WmshboundFeign:

src/main/resources/bootstrap.yml

@@ -1,7 +1,7 @@
 api.version: api/v1/shipTms
 spring:
   profiles:
-    include: ${SPRING_PROFILES:prod}
+    include: ${SPRING_PROFILES:dev}
   jackson:
         date-format: yyyy-MM-dd HH:mm:ss
         time-zone: GMT+8

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

@@ -336,10 +336,28 @@
     and DB.MATERIAL_ID=#{materialId}
     AND DBI.INFACTORY_SHIP_NAME= #{inFactoryShipName}
   </select>
-  <select id="selectBatchIdByForeign" resultType="java.math.BigDecimal">
+  <select id="selectBatchIdByForeign" resultType="java.util.Map">
     select DB.BATCH_ID "batchId"
     from DIL_BATCH DB
     WHERE DB.RESULT_FOREIGN_SHIP_NAME=#{foreignShipName}
     AND DB.MATERIAL_ID=#{materialId}
   </select>
+  <select id="getBatchIdByForeign" resultType="java.util.Map">
+    select DB.RESULT_FOREIGN_SHIP_NAME "foreignShipName",
+           RM.MATERIAL_NAME "materialName",
+           APO.PURCHASE_ORDER_NO "purchaseOrderNo",
+           DB.BATCH_ID "batchId",
+           RM.MATERIAL_ID "materialId"
+    from AMS_PURCHASE_ORDER APO
+    LEFT JOIN DIL_BATCH DB
+    ON DB.BATCH_ID=APO.BATCH_ID
+    LEFT JOIN RMS_MATERIAL RM
+    ON RM.MATERIAL_ID=DB.MATERIAL_ID
+    where DB.RESULT_FOREIGN_SHIP_NAME IS NOT NULL AND RM.MATERIAL_NAME IS NOT NULL
+    <if test="con!=null">
+      and (instr(DB.RESULT_FOREIGN_SHIP_NAME , #{con}) > 0  or instr(RM.MATERIAL_NAME , #{con}) > 0 )
+    </if>
+    order by DB.INSERT_TIME DESC
+
+  </select>
 </mapper>

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

@@ -66,6 +66,9 @@
                                                                              rn = 1)) tsl on tsl.total_result_id=ttr.result_id
         where ttr.ship_status = 0 and tsl.LOCATION_STATUS is not null and tlsr.DELETED=0
         and  adn.DELETED=0 and oic.DELETED=0
+        <if test="con!=null">
+         and (instr(RMT.MATERIAL_TYPE_NAME,#{con}) > 0 or instr(rc.capacity_number,#{con}) > 0 or instr(rm.material_name,#{con}) > 0 or instr(db.result_foreign_ship_name,#{con}) >0 )
+        </if>
     </select>
     <select id="selectByshipName" resultType="java.util.Map" parameterType="java.util.Map">
         select sd.GM_TONNAGE as "tonnage",