提交代码

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

@@ -0,0 +1,31 @@
+package com.steerinfo.dil.feign;
+
+import com.steerinfo.framework.controller.RESTfulResult;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @ author    :TXF
+ * @ time      :2021/10/8 19:07
+ */
+
+
+@FeignClient(value = "DIL-AMS-API-DEV", url = "${openfeign.AmsFeign.url}")
+public interface AmsFeign {
+
+    @PostMapping(value = "/api/v1/ams/amssaleorders/getHaveCarTruckNoList")
+    RESTfulResult getHaveCarTruckNoList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                        @RequestParam Integer apiId,
+                                        @RequestParam Integer pageNum,
+                                        @RequestParam Integer pageSize,
+                                        @RequestParam String con,
+                                        @RequestParam String startTime,
+                                        @RequestParam String endTime);
+
+
+}

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

@@ -0,0 +1,25 @@
+package com.steerinfo.dil.feign;
+
+import com.steerinfo.framework.controller.RESTfulResult;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.Map;
+
+/**
+ * @ author    :TXF
+ * @ time      :2021/10/8 19:07
+ */
+
+
+@FeignClient(value = "DIL-DAZHOU-API-DEV", url = "${openfeign.DaZhouFeign.url}")
+public interface DaZhouFeign {
+
+    @GetMapping("/api/v1/uc/getSteelOrderNum")
+    RESTfulResult getSteelOrderNum();
+
+
+}

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

@@ -177,4 +177,12 @@ public interface QmsQueueResultMapper extends IBaseMapper<QmsQueueResult, BigDec
      * @Description:查询已出厂数量（钢材）
      */
     int queryLeaveFactoryNumber();
+
+    /**
+     * @author:zyf
+     * @version:1.0
+     * @Date:2022-10-27
+     * @Description:复刻出厂数
+    */
+    List<Map<String, Object>>   getCapacityByDefend(Map<String, Object> map);
 }

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

@@ -1,5 +1,6 @@
 package com.steerinfo.dil.service.impl;
 
+import com.steerinfo.dil.feign.AmsFeign;
 import com.steerinfo.dil.feign.LargeScreenFeign;
 import com.steerinfo.dil.mapper.*;
 import com.steerinfo.dil.model.QmsQueueResult;
@@ -57,6 +58,9 @@ public class QmsQueueListServiceImpl implements IQmsQueueListService {
     @Autowired
     LargeScreenFeign largeScreenFeign;
 
+    @Autowired
+    AmsFeign amsFeign;
+
     @Autowired
     private QmsModelUnrooledMapper qmsModelUnrooledMapper;
 
@@ -455,7 +459,7 @@ public class QmsQueueListServiceImpl implements IQmsQueueListService {
         HashSet<Map<String,Object>> set=new HashSet<>(queueListByQueueUpSpelling);
         //queueListByQueueUp=queueListByQueueUp.stream().distinct().collect(Collectors.toList());
         datalist.addAll(queueListByQueueUp);
-        queueListByQueueUpSpelling=queueListByQueueUpSpelling.stream().distinct().collect(Collectors.toList());
+        //queueListByQueueUpSpelling=queueListByQueueUpSpelling.stream().distinct().collect(Collectors.toList());
         datalist.addAll(set);
         System.out.println(datalist.toString());
         //更新大屏(钢材科与东门)

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

@@ -1,6 +1,8 @@
 package com.steerinfo.dil.service.impl;
 
 import com.steerinfo.dil.controller.QmsQueueResultController;
+import com.steerinfo.dil.feign.AmsFeign;
+import com.steerinfo.dil.feign.DaZhouFeign;
 import com.steerinfo.dil.feign.IMFeign;
 import com.steerinfo.dil.feign.LargeScreenFeign;
 import com.steerinfo.dil.mapper.QmsQueueListMapper;
@@ -13,9 +15,12 @@ import com.steerinfo.dil.mapper.QmsQueueResultMapper;
 import com.steerinfo.dil.service.IQmsQueueResultService;
 import com.steerinfo.dil.util.ElectronicFenceUtils;
 import com.steerinfo.framework.controller.RESTfulResult;
+import oracle.sql.DATE;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
+
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.math.BigDecimal;
 
@@ -56,6 +61,12 @@ public class QmsQueueResultServiceImpl implements IQmsQueueResultService {
     @Autowired
     private IMFeign imFeign;
 
+    @Autowired
+    AmsFeign amsFeign;
+
+    @Autowired
+    DaZhouFeign daZhouFeign;
+
     @Autowired
     private QueueInterfaceMapper queueInterfaceMapper;
 
@@ -230,16 +241,44 @@ public class QmsQueueResultServiceImpl implements IQmsQueueResultService {
     */
     public Map<String,Object> getnumber(){
         Map<String,Object> map=new HashMap<>();
-        //查询出销售钢材的派车数
-        int SentCarNumber = qmsQueueResultMapper.querySentCarNumber();
-        //查询出销售钢材的进厂数
-        int IntoFactoryNumber=qmsQueueResultMapper.queryIntoFactoryNumber();
-        //查询出销售钢材的出厂数
-        int LeaveFactoryNumber=qmsQueueResultMapper.queryLeaveFactoryNumber();
-        map.put("sentCarNumber",SentCarNumber);
-        map.put("intoFactoryNumber",IntoFactoryNumber);
-        map.put("leaveFactoryNumber",LeaveFactoryNumber);
-        map.put("waitIntoFactoryNumber",SentCarNumber-IntoFactoryNumber);
+        try{
+            //查询出销售钢材的派车数
+            //1.先把时间状态改为时分秒清零的状态
+            Date now=new Date();
+            Calendar call=Calendar.getInstance();
+            call.setTime(now);
+            call.set(Calendar.HOUR_OF_DAY,0);
+            call.set(Calendar.MINUTE,0);
+            call.set(Calendar.SECOND,0);
+            call.set(Calendar.MILLISECOND,0);
+            Date date=call.getTime();
+            Map<String,Object> map1=new HashMap<>();
+            map1.put("oneDate",date);
+            map1.put("entity",date);
+            RESTfulResult haveCarTruckNoList = amsFeign.getHaveCarTruckNoList(map1, 466, null, null, null, null, null);
+            Map<String,Object> data = (Map<String, Object>) haveCarTruckNoList.getData();
+            int SentCarNumber = (int) data.get("total");
+            //int SentCarNumber = qmsQueueResultMapper.querySentCarNumber();
+            //查询出销售钢材的进厂数
+            RESTfulResult steelOrderNum = daZhouFeign.getSteelOrderNum();
+            int IntoFactoryNumber= (int) steelOrderNum.getData();
+            //int IntoFactoryNumber=qmsQueueResultMapper.queryIntoFactoryNumber();
+            //查询出销售钢材的出厂数
+            //先把时间格式化
+            SimpleDateFormat simpleDateFormat=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            String format = simpleDateFormat.format(date);
+            Map<String,Object> map2=new HashMap<>();
+            map2.put("oneDate",format);
+            List<Map<String, Object>> capacityByDefend = qmsQueueResultMapper.getCapacityByDefend(map2);
+            int LeaveFactoryNumber = capacityByDefend.size();
+            //int LeaveFactoryNumber=qmsQueueResultMapper.queryLeaveFactoryNumber();
+            map.put("sentCarNumber",SentCarNumber);
+            map.put("intoFactoryNumber",IntoFactoryNumber);
+            map.put("leaveFactoryNumber",LeaveFactoryNumber);
+            map.put("waitIntoFactoryNumber",SentCarNumber-IntoFactoryNumber);
+        }catch (Exception e){
+            e.printStackTrace();
+        }
         return map;
     }
 

src/main/resources/application-prod.yml

@@ -19,6 +19,10 @@ openfeign:
     url: ${IMFEIGN_URL:172.16.33.166:8055}
   LargeScreen:
     url: ${LARGESCREEN_URL:172.16.33.160:8064}
+  AmsFeign:
+    url: ${AMSFEIGN_URL:172.16.33.166:8079}
+  DaZhouFeign:
+    url: ${BMSTRUCKFEIGN_URL:172.16.33.166:8080}
 
 mvc:
   async:

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

@@ -956,6 +956,43 @@
        and to_char(trunc(sysdate,'dd')+23/24+59/24/60+59/24/60/60,'yyyy-mm-dd hh24:mi:ss')
     </select>
 
+    <select id="getCapacityByDefend" resultType="java.util.Map" parameterType="java.util.Map">
+        select distinct * from(
+        select rc.CAPACITY_NUMBER "capacityNumber",
+        rc.CAPACITY_TEL "capacityTel",
+        oo.ORDER_NUMBER "orderNumber",
+        ter.RESULT_ENTRY_GATE_TIME "resultEntryGateTime",
+        rg1.GATEPOST_NAME "gatepostName1",
+        tlfr.RESULT_OUT_GATE_TIME "resultOutGateTime",
+        rg2.GATEPOST_NAME "gatepostName2",
+        rm.material_name "materialName"
+        from OMSTRUCK_ORDER oo
+        left join OMSTRUCK_ORDER_MATERIAL oom
+        on oom.ORDER_ID = oo.ORDER_ID
+        left join RMS_MATERIAL rm
+        on rm.MATERIAL_ID = oom.MATERIAL_ID
+        left join RMS_CAPACITY rc
+        on rc.CAPACITY_ID = oo.CAPACITY_ID
+        left join TMSTRUCK_TOTAL_RESULT ttr
+        on ttr.ORDER_ID = oo.ORDER_ID
+        left join TMSTRUCK_ENFACTORY_RESULT ter
+        on ter.RESULT_TOTAL_ID = ttr.RESULT_TOTAL_ID
+        left join RMS_GATEPOST rg1
+        on rg1.GATEPOST_ID = ter.GATEPOST_ID
+        left join TMSTRUCK_LEAVE_FACTORY_RESULT tlfr
+        on tlfr.RESULT_TOTAL_ID = ttr.RESULT_TOTAL_ID
+        left join RMS_GATEPOST rg2
+        on rg2.GATEPOST_ID = tlfr.GATEPOST_ID
+        <where>
+            <if test="oneDate != null">
+                and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt; = tlfr.RESULT_OUT_GATE_TIME
+                and oo.order_type=1
+            </if>
+        </where>
+        order by ter.RESULT_ENTRY_GATE_TIME desc
+        )
+    </select>
+
     <!--查询待进厂车数-->
     <update id="updateCancelResult" parameterType="com.steerinfo.dil.model.QmsQueueResult">
         update QMS_QUEUE_RESULT