Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/DAL-DAZHOU-API

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

@@ -1382,4 +1382,127 @@ public class AMScontroller{
     public Map<String,Object> addDispatchSaleOrder(@RequestBody Map<String,Object> mapValue) {
         return amsFeign.addDispatchSaleOrder(mapValue);
     }
+
+   //发布通知================================================================================================================================
+    //公告展示
+
+
+    @ApiOperation(value = "销售公司获取公告信息", notes = "分页查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(414)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+    })
+    @PostMapping(value = "/getMarketingNoticeList")
+    public Map<String, Object> getMarketingNoticeList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                      Integer apiId,
+                                                      Integer pageNum,
+                                                      Integer pageSize,
+                                                      String con
+    ) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return amsFeign.getMarketingNoticeList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, con);
+    }
+
+
+
+    @ApiOperation(value = "承运商获取公告信息", notes = "分页查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(414)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+    })
+    @PostMapping(value = "/getCarrierNoticeList")
+    public Map<String, Object> getCarrierNoticeList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                    Integer apiId,
+                                                    Integer pageNum,
+                                                    Integer pageSize,
+                                                    String con
+    ) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return amsFeign.getCarrierNoticeList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, con);
+    }
+
+
+
+
+    @ApiOperation(value = "收货用户获取公告信息", notes = "分页查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(414)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+    })
+    @PostMapping(value = "/getClientNoticeList")
+    public Map<String, Object> getClientNoticeList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                   Integer apiId,
+                                                   Integer pageNum,
+                                                   Integer pageSize,
+                                                   String con
+    ) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return amsFeign.getClientNoticeList(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 amsFeign.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 amsFeign.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 amsFeign.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 amsFeign.getNoticeById(id);
+    }
+
+    @ApiOperation(value="获取最新公告详细信息", notes="根据url的permissions来获取详细信息")
+    @ApiImplicitParam(paramType = "name", name = "权限permission", value = "permission", required = true, dataType = "String")
+    @PostMapping(value = "/getNewNoticeByPermission/{permissions}")
+    public Map<String, Object> getNewNoticeByPermission(@PathVariable("permissions") String permissions){
+        return amsFeign.getNewNoticeByPermission(permissions);
+    }
+
+
+
+    //*******************************下拉框************************
+
+
+    @GetMapping("getNoticeTypeId")
+    @ApiOperation(value = "得到公告类型Id")
+    public Map<String,Object> getNoticeTypeId(){
+        return amsFeign.getNoticeTypeId();
+    }
 }

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

@@ -1337,4 +1337,73 @@ public interface AmsFeign {
     @ApiOperation(value="定向派单选择承运商并下发")
     @PostMapping("/api/v1/ams/amsdispatchsaleorders/addDispatchSaleOrder")
     Map<String, Object> addDispatchSaleOrder(@RequestBody Map<String, Object> mapValue);
+
+
+    //发布通知==============================================================================================
+    /*
+
+    //公告获取列表
+    @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/ams/dilnotices/getCarrierNoticeList")
+    Map<String, Object> getCarrierNoticeList(@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/ams/dilnotices/getMarketingNoticeList")
+    Map<String, Object> getMarketingNoticeList(@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/ams/dilnotices/getClientNoticeList")
+    Map<String, Object> getClientNoticeList(@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/ams/dilnotices/insertNotice")
+    Map<String,Object> insertNotice(@RequestBody(required = false) Map<String,Object> map);
+
+    //删除公告
+    @PostMapping(value = "api/v1/ams/dilnotices/deleteNotice/{id}")
+    Map<String, Object> deleteNotice(@PathVariable("id") BigDecimal id);
+
+    //更新公告
+    @PostMapping(value = "api/v1/ams/dilnotices/updateNotice")
+    Map<String, Object> updateNotice(@RequestBody(required = false) Map<String, Object> map);
+
+    //根据id获取公告
+    @PostMapping(value = "api/v1/ams/dilnotices/getNoticeById/{id}")
+    Map<String, Object> getNoticeById(@PathVariable("id") BigDecimal id);
+
+    //根据权限获取最新公告
+    @PostMapping(value = "api/v1/ams/dilnotices/getNewNoticeByPermission/{permissions}")
+    Map<String, Object> getNewNoticeByPermission(@PathVariable("permissions")String permissions);
+
+
+    //******************************************下拉框*******************************
+
+
+    //公告下拉框,须摸清实现原理
+    @GetMapping(value = "api/v1/ams/dilnotices/getNoticeTypeId")
+    Map<String,Object> getNoticeTypeId();
+
 }

src/main/resources/bootstrap.yml

@@ -53,34 +53,33 @@ openfeign:
     RmsFeign:
       url: ${RMSFEIGN_HRL:localhost:8060}
 
-
-#    ColumnDataFeign:
-#      url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
-#    AmsFeign:
-#      url: ${AMSFEIGN_URL:172.16.33.166:8079}
-#    BmsshipFeign:
-#      url: ${BMSSHIPFEIGN_URL:172.16.33.166:8078}
-#    BmstrainFeign:
-#      url: ${BMSTRAINFEIGN_URL:172.16.33.166:8077}
-#    BmstruckFeign:
-#      url: ${BMSTRUCKFEIGN_URL:172.16.33.166:8076}
-#    QmsTruckFeign:
-#      url: ${QMSTRUCKFEIGN_URL:172.16.33.166:8047}
-#    TmsTrainFeign:
-#      url: ${TMSTRAINFEIGN_URL:172.16.33.166:8086}
-#    TmsTruckFeign:
-#      url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8088}
-#    TmsshipFeign:
-#      url: ${TMSSHIPFEIGN_URL:172.16.33.166:8090}
-#    WMSHFeign:
-#      url: ${WMSHFEIGN_URL:172.16.33.166:8070}
-#    WMSFeign:
-#      url: ${WMSFEIGN_URL:172.16.33.166:8093}
-#    OMSFeign:
-#      url: ${OMSFEIGN_URL:172.16.33.166:8095}
-#    RmsFeign:
-#      url: ${RMSFEIGN_HRL:localhost:8060}
-
+  #测试环境
+#  ColumnDataFeign:
+#    url: ${COLUMNDATAFEIGN_URL:172.16.33.162:8001}
+#  AmsFeign:
+#    url: ${AMSFEIGN_URL:172.16.33.162:8015}
+#  BmsshipFeign:
+#    url: ${BMSSHIPFEIGN_URL:172.16.33.162:8007}
+#  BmstrainFeign:
+#    url: ${BMSTRAINFEIGN_URL:172.16.33.162:8005}
+#  BmstruckFeign:
+#    url: ${BMSTRUCKFEIGN_URL:172.16.33.162:8009}
+#  QmsTruckFeign:
+#    url: ${QMSTRUCKFEIGN_URL:172.16.33.162:8017}
+#  TmsTrainFeign:
+#    url: ${TMSTRAINFEIGN_URL:172.16.33.162:8004}
+#  TmsTruckFeign:
+#    url: ${TMSTRUCKFEIGN_URL:172.16.33.162:8008}
+#  TmsshipFeign:
+#    url: ${TMSSHIPFEIGN_URL:172.16.33.162:8003}
+#  WMSHFeign:
+#    url: ${WMSHFEIGN_URL:172.16.33.162:8013}
+#  WMSFeign:
+#    url: ${WMSFEIGN_URL:172.16.33.162:8012}
+#  OMSFeign:
+#    url: ${OMSFEIGN_URL:172.16.33.162:8016}
+#  RmsFeign:
+#    url: ${RMSFEIGN_HRL:172.16.33.162:8014}
 
 
 
@@ -113,6 +112,6 @@ mybatis:
     mapUnderscoreToCamelCase: true
     call-setters-on-nulls: true
 server:
-
   port: 8080
-
+#测试环境
+#  port: 8080