合并冲突

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

@@ -580,6 +580,29 @@ public class RMScontroller {
         return   rmsFeign.getGatepostRulesList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize,con);
     }
 
+    @ApiOperation(value="删除", notes="根据rulesId删除")
+    @ApiImplicitParam(name = "门岗规则id", value = "rulesId", required = true, dataType = "int")
+    @PostMapping(value = "/deleteGatepostRules/{rulesId}")
+    public Map<String, Object> deleteGatepostRules(@PathVariable("rulesId") BigDecimal rulesId) {
+        return rmsFeign.deleteGatepostRules(rulesId);
+    }
+    @ApiOperation(value="新增门岗规则")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "门岗规则", required = false, dataType = "Map"),
+    })
+    @PostMapping("/insertGatepostRule")
+    public Map<String, Object> insertGatepostRule(@RequestBody(required = false) Map<String,Object> mapValue){
+        return rmsFeign.insertGatepostRule(mapValue);
+    }
+    @ApiOperation(value="获取门岗名")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "门岗id", value = "gatepostId", required = true, dataType = "int")
+    })
+    @PostMapping("/getGatepostName/{gatepostId}")
+    public Map<String, Object> getGatepostName(@PathVariable("gatepostId") BigDecimal gatepostId){
+        return rmsFeign.getGatepostName(gatepostId);
+    }
+
     @PostMapping("/getMaterialTypeList")
     @ApiOperation(value = "框计算物资种类")
     public Map<String, Object> getMaterialTypeList(@RequestBody(required = false) Map<String, Object> mapValue,
@@ -650,4 +673,67 @@ public class RMScontroller {
     public Map<String, Object> getVehicleTypeId() {
         return rmsFeign.getVehicleTypeId();
     }
+    //通知
+    @ApiOperation(value = "获取公告信息", notes = "分页查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId()", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
+    })
+
+
+    @PostMapping(value = "/getNoticeList")
+    public Map<String, Object> getNoticeList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                             Integer apiId,
+                                             Integer pageNum,
+                                             Integer pageSize,
+                                             String con
+    ) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return rmsFeign.getNoticeList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, con);
+    }
+
+    @ApiOperation(value="新增公告信息", notes="根据DilNotice对象创建")
+    @ApiImplicitParam(name = "dilNotice", value = "详细实体dilNotice", required = true, dataType = "DilNotice")
+    @PostMapping(value = "/insertNotice")
+    public Map<String, Object> insertNotice(@RequestBody(required = false) Map<String, Object> map) {
+        return rmsFeign.insertNotice(map);
+    }
+
+    @ApiOperation(value = "更新油价信息", notes = "根据dilNotice对象创建")
+    @ApiImplicitParam(name = "dilNotice", value = "详细实体dilNotice", required = true, dataType = "dilNotice")
+    @PostMapping(value = "/updateNotice", produces  = "application/json;charset=UTF-8")
+    public Map<String, Object> updateNotice(@RequestBody(required = false) Map<String, Object> map) {
+        return rmsFeign.updateNotice(map);
+    }
+
+    @ApiOperation(value="删除", notes="根据url的id来指定删除对象")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "BigDecimal")
+    @PostMapping(value = "/deleteNotice/{id}")//BigDecimal
+    public Map<String, Object> deleteNotice(@PathVariable("id") BigDecimal id) {
+        return rmsFeign.deleteNotice(id);
+    }
+
+
+
+    @ApiOperation(value="获取详细信息", notes="根据url的id来获取详细信息")
+    @ApiImplicitParam(paramType = "path", name = "公告id", value = "ID", required = true, dataType = "BigDecimal")
+    @PostMapping(value = "/getNoticeById/{id}")
+    public Map<String, Object> getNoticeById(@PathVariable("id") BigDecimal id){
+        return rmsFeign.getNoticeById(id);
+    }
+
+
+//*******************************下拉框************************
+
+    @GetMapping("getNoticeTypeId")
+    @ApiOperation(value = "得到公告类型Id")
+    public Map<String,Object> getNoticeTypeId(){
+        return rmsFeign.getNoticeTypeId();
+    }
+
 }

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

@@ -326,6 +326,7 @@ public class TMSController extends BaseRESTfulController {
                                                          Integer pageSize,
                                                          Integer apiId,
                                                          String con) {
+
         return tmsshipFeign.getWaterQualityResultList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con);
     }
 
@@ -1825,6 +1826,14 @@ public class TMSController extends BaseRESTfulController {
     public Map<String, Object> getDeliveryOrder(@RequestParam String orderNumber){
         return tmsTruckFeign.getDeliveryOrder(orderNumber);
     }
+    @ApiOperation(value="模糊查询江船名 ")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "state", value = "用户输入的江船名", required = false, dataType = "String"),
+    })
+    @PostMapping("getShipNameList")
+    public Map<String, Object> getShipNameList(@RequestParam(value = "state") String state){
+        return tmsshipFeign.getShipNameList(state);
+    }
 
     @ApiOperation(value = "国产矿物流新增装车")
     @PostMapping(value = "/addDomesticLoadResult")

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

@@ -12,8 +12,13 @@ import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiModelProperty;
 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;
 import org.springframework.web.bind.annotation.*;
 
+
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;

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

@@ -314,6 +314,16 @@ public interface RmsFeign {
                                              @RequestParam("pageSize") Integer pageSize,
                                              @RequestParam String con);
 
+    //    根据规则Id删除规则
+    @PostMapping(value ="api/v1/rms/rmsgatepost/deleteGatepostRules/{rulesId}")
+    Map<String, Object> deleteGatepostRules(@RequestParam("rulesId") BigDecimal rulesId);
+    //    新增门岗规则
+    @PostMapping(value ="api/v1/rms/rmsgatepost/insertGatepostRule")
+    Map<String, Object> insertGatepostRule(@RequestBody(required = false) Map<String, Object> mapValue);
+    //    根据门岗id获取门岗名
+    @PostMapping(value ="api/v1/rms/rmsgatepost/getGatepostName/{gatepostId}")
+    Map<String,Object> getGatepostName(@PathVariable("gatepostId")BigDecimal gatepostId);
+
     //获取物资种类
     @PostMapping(value = "api/v1/rms/rmsmaterialtype/getMaterialTypeList")
     Map<String, Object> getMaterialTypeList(@RequestBody(required = false) Map<String, Object> mapValue,
@@ -365,4 +375,38 @@ public interface RmsFeign {
     //    根据id下拉框获取车辆类型
     @GetMapping(value = "api/v1/rms/rmsgatepost/getVehicleTypeId")
     Map<String,Object> getVehicleTypeId();
+
+
+
+    @PostMapping(value = "/api/v1/rms/dilnotices/getNoticeList")
+    Map<String, Object> getNoticeList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                      @RequestParam("apiId") Integer apiId,
+                                      @RequestParam("pageNum") Integer pageNum,
+                                      @RequestParam("pageSize") Integer pageSize,
+                                      @RequestParam("con") String con);
+    //新增公告
+    @PostMapping(value = "api/v1/rms/dilnotices/insertNotice")
+    Map<String,Object> insertNotice(@RequestBody(required = false) Map<String,Object> map);
+
+    //删除公告
+    @PostMapping(value = "api/v1/rms/dilnotices/deleteNotice/{id}")
+    Map<String, Object> deleteNotice(@PathVariable("id") BigDecimal id);
+
+    //更新公告
+    @PostMapping(value = "api/v1/rms/dilnotices/updateNotice")
+    Map<String, Object> updateNotice(@RequestBody(required = false) Map<String, Object> map);
+
+    //根据id获取公告
+    @PostMapping(value = "api/v1/rms/dilnotices/getNoticeById/{id}")
+    Map<String, Object> getNoticeById(@PathVariable("id") BigDecimal id);
+
+
+//******************************************下拉框*******************************
+
+
+    //公告下拉框,须摸清实现原理
+    @GetMapping(value = "api/v1/rms/dilnotices/getNoticeTypeId")
+    Map<String,Object> getNoticeTypeId();
+
+
 }

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

@@ -252,4 +252,5 @@ public interface TmsTrainFeign {
     @ApiOperation(value = "批量新增计量委托")
     @PostMapping(value = "api/v1/trainTms/tmstrainmeasurecommissions/batchSendMeasureCommission")
     Map<String, Object> batchSendMeasureCommission(@RequestBody(required = false) Map<String, Object> map);
+
 }

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

@@ -159,11 +159,23 @@ public interface TmsshipFeign {
      * 展示位置作业信息列表
      *
      * @param mapValue
+<<<<<<< HEAD
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
      * @return
      */
     @PostMapping(value = "/api/v1/shipTms/tmsshipshiplocations/getShipLocationList")
+    Map<String, Object> getShipLocationList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                      @RequestParam Integer pageNum,
+                                      @RequestParam Integer pageSize,
+                                      @RequestParam Integer apiId,
+                                            @RequestParam String con);
+
+    @PostMapping(value = "/api/v1/shipTms/tmsshipshiplocations/getShipLocationList")
     Map<String, Object> getShipLocationList(@RequestBody(required = false) Map<String, Object> mapValue);
 
+
     /**
      * 查询位置作业信息
      *
@@ -744,4 +756,8 @@ public interface TmsshipFeign {
     @PostMapping("api/v1/shipTms/shipdynamics/selectAll")
     Map<String, Object> selectAll();
 
+    //    模糊查询江船名
+    @PostMapping(value = "/api/v1/shipTms/dilbatchs/getShipNameList")
+    Map<String, Object> getShipNameList(@RequestParam(value = "state")String state);
+
 }

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

@@ -45,4 +45,5 @@ public interface UniversalMapper {
 
     //承运商边输边查
     List<Map<String, Object>> getCarrierMesByLike(String index);
+
 }

src/main/resources/bootstrap.yml

@@ -25,31 +25,31 @@ eureka:
 
 openfeign:
   ColumnDataFeign:
-    url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
+    url: ${COLUMNDATAFEIGN_URL:172.16.33.162:8001}
   AmsFeign:
-    url: ${AMSFEIGN_URL:172.16.33.166:8079}
+    url: ${AMSFEIGN_URL:172.16.33.162:8015}
   BmsshipFeign:
-    url: ${BMSSHIPFEIGN_URL:172.16.33.166:8078}
+    url: ${BMSSHIPFEIGN_URL:172.16.33.162:8007}
   BmstrainFeign:
-    url: ${BMSTRAINFEIGN_URL:172.16.33.166:8077}
+    url: ${BMSTRAINFEIGN_URL:172.16.33.162:8005}
   BmstruckFeign:
-    url: ${BMSTRUCKFEIGN_URL:172.16.33.166:8076}
+    url: ${BMSTRUCKFEIGN_URL:172.16.33.162:8009}
   QmsTruckFeign:
-    url: ${QMSTRUCKFEIGN_URL:172.16.33.166:8047}
+    url: ${QMSTRUCKFEIGN_URL:172.16.33.162:8017}
   TmsTrainFeign:
-    url: ${TMSTRAINFEIGN_URL:localhost:8086}
+    url: ${TMSTRAINFEIGN_URL:172.16.33.162:8004}
   TmsTruckFeign:
-    url: ${TMSTRUCKFEIGN_URL:localhost:8088}
+    url: ${TMSTRUCKFEIGN_URL:172.16.33.162:8008}
   TmsshipFeign:
-    url: ${TMSSHIPFEIGN_URL:172.16.33.166:8090}
+    url: ${TMSSHIPFEIGN_URL:172.16.33.162:8003}
   WMSHFeign:
-    url: ${WMSHFEIGN_URL:172.16.33.166:8070}
+    url: ${WMSHFEIGN_URL:172.16.33.162:8013}
   WMSFeign:
-    url: ${WMSFEIGN_URL:172.16.33.166:8093}
+    url: ${WMSFEIGN_URL:172.16.33.162:8012}
   OMSFeign:
-    url: ${OMSFEIGN_URL:172.16.33.166:8095}
+    url: ${OMSFEIGN_URL:172.16.33.162:8016}
   RmsFeign:
-    url: ${RMSFEIGN_HRL:172.16.33.166:8060}
+    url: ${RMSFEIGN_HRL:172.16.33.162:8014}
 
 genxml:
   pth: com/a
@@ -80,5 +80,5 @@ mybatis:
     mapUnderscoreToCamelCase: true
     call-setters-on-nulls: true
 server:
-  port: 8080
+  port: 8019
 

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

@@ -210,9 +210,9 @@
                                  RS.SUPPLIER_NAME    "supplierName",
                                  RS.SUPPLIER_ADDRESS "supplierAddress"
                  from DIL_BATCH DB
-                          join AMS_PURCHASE_ORDER APO
+                          left join AMS_PURCHASE_ORDER APO
                                     on apo.BATCH_ID = DB.BATCH_ID
-                          join RMS_SUPPLIER RS
+                          left join RMS_SUPPLIER RS
                                     on RS.SUPPLIER_ID = apo.SUPPLIER_UNIT_ID
                  <where>
                     <if test="materialId != null">