查询所有到站信息

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

@@ -1,20 +1,24 @@
 package com.steerinfo.dil.controller;
 
 import com.steerinfo.dil.feign.ColumnDataFeign;
+import com.steerinfo.dil.feign.ESFeign;
 import com.steerinfo.dil.model.AmsSalePlan;
 import com.steerinfo.dil.service.IAmsSalePlanService;
 import com.steerinfo.dil.util.BaseRESTfulController;
 import com.steerinfo.dil.util.ColumnDataUtil;
+import com.steerinfo.dil.util.DataChange;
 import com.steerinfo.dil.util.PageListAdd;
 import com.steerinfo.framework.controller.RESTfulResult;
 import com.steerinfo.framework.service.pagehelper.PageHelper;
 import io.swagger.annotations.ApiImplicitParam;
 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.*;
 
 import java.math.BigDecimal;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -41,6 +45,9 @@ public class AmsSalePlanController extends BaseRESTfulController {
     @Autowired
     ColumnDataFeign columnDataFeign;
 
+    @Autowired
+    ESFeign esFeign;
+
     @Autowired
     ColumnDataUtil columnDataUtil;
 
@@ -147,4 +154,53 @@ public class AmsSalePlanController extends BaseRESTfulController {
     public RESTfulResult getAreaName(){
         return success(amsSalePlanService.getAreaName());
     }
+
+
+    @ApiModelProperty(value = "查询所有的钢材物资")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "232", required = false, dataType = "BigDecimal")
+    })
+    @PostMapping("/getAllSteelMaterialMes")
+    public RESTfulResult getAllSteelMaterialMes(@RequestBody(required = false) Map<String,Object> mapValue,
+                                           Integer pageNum,
+                                           Integer pageSize,
+                                           Integer apiId,
+                                           String con) {
+
+        //框计算
+        if(con != null){
+            if(!"undefined".equals(con)){
+                //设置要查询的索引名称
+                String index="get_steel_material_list";
+                //获取查询结果
+                return success(esFeign.getConResult(mapValue,index,apiId,pageNum,pageSize,con));
+            }
+        }
+
+        List<Map<String, Object>> list = null;
+        //如果有条件查询则跳过初始化，和创建索引
+        if(mapValue.size() == 1){
+            //将查询结果存入索引中
+            list = amsSalePlanService.getAllSteelMaterialMes(mapValue);
+            Map<String, Object> map = new HashMap<>();
+            //添加索引
+            map.put("index","get_steel_material_list");
+            //添加id
+            map.put("indexId","steelMaterialId");
+            list.add(map);
+            //新建索引
+            esFeign.insertIndex(list);
+            //删除
+            list.remove(list.size()-1);
+        }
+        if(list == null)
+            list = amsSalePlanService.getAllSteelMaterialMes(mapValue);
+        PageHelper.startPage(pageNum,pageSize);
+        //分页查询数据
+        List<Map<String, Object>> columnList = amsSalePlanService.getAllSteelMaterialMes(mapValue);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
+        return success(data);
+    }
 }

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

@@ -11,6 +11,7 @@ import com.steerinfo.framework.service.pagehelper.PageHelper;
 import io.swagger.annotations.ApiImplicitParam;
 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.*;
 
@@ -40,6 +41,17 @@ public class AmstruckRailDayplanController extends BaseRESTfulController {
     IAmstruckRailDayplanService amstruckRailDayplanService;
     @Autowired
     ColumnDataUtil columnDataUtil;
+
+    @ApiOperation(value="查询所有到站信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "planId", value = "主键ID", required = false, dataType = "BigDecimal")
+    })
+    @PostMapping(value = "/getArriveName")
+    public RESTfulResult getArriveName(){
+        List<Map<String, Object>> arriveName = amstruckRailDayplanService.getArriveName();
+        return success(arriveName);
+    }
+
     /**
      *新增日计划
      */

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

@@ -22,4 +22,6 @@ public interface AmsSalePlanMapper extends IBaseMapper<AmsSalePlan, BigDecimal>
     List<Map<String, Object>> selectByPlanId(BigDecimal planId);
     //通过主键获取销售片区名称
     String getAreaNameByAreaId(BigDecimal areaId);
+    //查询所有的钢材物资
+    List<Map<String, Object>> getAllSteelMaterialMes(Map<String, Object> map);
 }

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

@@ -30,4 +30,7 @@ public interface AmstruckRailDayplanMapper extends IBaseMapper<AmstruckRailDaypl
     List<Map<String, Object>> getSzTruckRailDayPlan(Map<String, Object> mapValue);
 
     AmstruckRailDayplan selectByDayPlanId(Integer dayplanId);
+
+    //查询所有到站信息
+    List<Map<String, Object>> getArriveName();
 }

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

@@ -34,4 +34,7 @@ public interface IAmsSalePlanService{
     int updateAmsSalePlan(AmsSalePlan amsSalePlan);
     //删除销售计划
     int deleteAmsSalePlan(BigDecimal planId);
+
+    //查询所有的钢材物资
+    List<Map<String, Object>> getAllSteelMaterialMes(Map<String, Object> map);
 }

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

@@ -35,4 +35,7 @@ public interface IAmstruckRailDayplanService extends IBaseService<AmstruckRailDa
     List<Map<String, Object>> getSzTruckRailDayPlan(Map<String, Object> mapValue);
 
     AmstruckRailDayplan selectByDayPlanId(Integer dayplanId);
+
+    //查询所有到站信息
+    List<Map<String, Object>> getArriveName();
 }

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

@@ -38,6 +38,16 @@ public class AmsSalePlanServiceImpl implements IAmsSalePlanService {
         return amsSalePlanMapper.updateByPrimaryKey(amsSalePlan);
     }
 
+    /**
+     * 查询所有的钢材物资
+     * @param map
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> getAllSteelMaterialMes(Map<String, Object> map) {
+        return amsSalePlanMapper.getAllSteelMaterialMes(map);
+    }
+
     @Override
     public List<Map<String, Object>> getSalePlanInfo(Map<String, Object> map) {
         return amsSalePlanMapper.getSalePlanInfo(map);

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

@@ -71,4 +71,13 @@ public class AmstruckRailDayplanServiceImpl extends BaseServiceImpl<AmstruckRail
     public AmstruckRailDayplan selectByDayPlanId(Integer dayplanId) {
         return amstruckRailDayplanMapper.selectByDayPlanId(dayplanId);
     }
+
+    /**
+     * 查询所有到站信息
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> getArriveName() {
+        return amstruckRailDayplanMapper.getArriveName();
+    }
 }

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

@@ -405,7 +405,7 @@
     MATERIAL_ID "value",
     MATERIAL_NAME "label"
     from RMS_MATERIAL
-    where MATERIAL_CODE like '08%'
+    where MATERIAL_CODE like '0801%'
       and rownum < 20
 
   </select>
@@ -434,4 +434,15 @@
   <select id="getAreaNameByAreaId" parameterType="java.math.BigDecimal" resultType="String">
     select r_s_area.AREA_NAME "areaName" from RMS_SALE_AREA r_s_area where r_s_area.AREA_ID = #{areaId}
   </select>
+
+<!-- 查询所有钢材物资 -->
+  <select id="getAllSteelMaterialMes"  parameterType="java.util.Map" resultType="java.util.Map">
+    SELECT
+      RM.MATERIAL_ID "materialId",
+      RM.MATERIAL_CODE "materialCode",
+      RM.MATERIAL_NAME "materialName",
+      CONCAT(CONCAT(RM.MATERIAL_SPECIFICATION, '('),  CONCAT(RM.MATERIAL_MODEL, ')')) "Specification"
+    FROM RMS_MATERIAL RM
+    WHERE RM.MATERIAL_CODE LIKE '0801%'
+  </select>
 </mapper>

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

@@ -515,4 +515,12 @@ where t.dayplan_receive_status=0 and  t.material_id=496
   <select id="selectByDayPlanId" parameterType="java.lang.Integer" resultType="com.steerinfo.dil.model.AmstruckRailDayplan">
         select * from amstruck_rail_dayplan t where t.DAYPLAN_ID=#{id}
     </select>
+
+  <select id="getArriveName" resultType="java.util.LinkedHashMap">
+    select
+      ARRIVAL_ID "id",
+      ARRIVAL_ID "value",
+      ARRIVAL_NAME "label"
+    from RMSTRAIN_ARRIVAL_SEND
+  </select>
 </mapper>