Browse Source

大屏样式改好,提交代码

zyf 2 years ago
parent
commit
eb0e019ef3

+ 8 - 0
src/main/java/com/steerinfo/dil/controller/QmsQueueListController.java

@@ -9,6 +9,7 @@ import com.steerinfo.framework.service.pagehelper.PageHelper;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
+import org.apache.xmlbeans.impl.xb.xsdschema.Public;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -162,6 +163,13 @@ public class QmsQueueListController extends BaseRESTfulController {
         return success(qmsQueueListService.ctrlZQueueAllow(map));
     }
 
+    @ApiOperation(value = "测试")
+    @GetMapping("/ceshi")
+    public RESTfulResult ceshi(){
+        qmsQueueListService.sendDataToLargeCreen();
+        return success();
+    }
+
 //    @ApiOperation(value="排队转移-->新增排队链表:实绩Id、门岗或月台、转移原因")
 //    @ApiImplicitParams({
 //            @ApiImplicitParam(name = "mapValue", value = "实绩Id、门岗或月台、转移原因", required = false, dataType = "Map"),

+ 24 - 0
src/main/java/com/steerinfo/dil/mapper/QmsQueueResultMapper.java

@@ -153,4 +153,28 @@ public interface QmsQueueResultMapper extends IBaseMapper<QmsQueueResult, BigDec
     List<Map<String,Object>> getMaterialId(BigDecimal orderId);
 
     List<Map<String,Object>> getStoreQueueList();
+
+    /**
+     * @author:zyf
+     * @version:1.0
+     * @Date:2022-09-27
+     * @Description:查询已派车数量(钢材)
+     */
+    int querySentCarNumber();
+
+    /**
+     * @author:zyf
+     * @version:1.0
+     * @Date:2022-09-27
+     * @Description:查询已进厂数量(钢材)
+     */
+    int queryIntoFactoryNumber();
+
+    /**
+     * @author:zyf
+     * @version:1.0
+     * @Date:2022-09-27
+     * @Description:查询已出厂数量(钢材)
+     */
+    int queryLeaveFactoryNumber();
 }

+ 3 - 0
src/main/java/com/steerinfo/dil/mapper/QmsQueueSpellingListMapper.java

@@ -23,4 +23,7 @@ public interface QmsQueueSpellingListMapper extends IBaseMapper<QmsQueueSpelling
     Integer existsCapacity(Object capacityId);
 
     int updateOOMLoadWarehouse(Map<String, Object> mesMap);
+
+
+
 }

+ 4 - 1
src/main/java/com/steerinfo/dil/service/impl/QmsQueueListServiceImpl.java

@@ -453,13 +453,16 @@ public class QmsQueueListServiceImpl implements IQmsQueueListService {
      * @Date:
      * @Description:做一个定时任务向两块大屏赋予值
      */
-    //@Scheduled(cron = "*/60 * * * * ?")
+    @Scheduled(cron = "*/60 * * * * ?")
     //@Scheduled(cron = "0 0/5 * * * ?")
     public void sendDataToLargeCreen(){
         Map<String,Object> mapValue=new HashMap<>();
         List<Map<String, Object>> datalist =new ArrayList<>();
         List<Map<String, Object>> queueListByQueueUp = qmsQueueResultService.getQueueListByQueueUp(mapValue);
         List<Map<String, Object>> queueListByQueueUpSpelling = qmsQueueResultService.getQueueListByQueueUpSpelling(mapValue);
+        //求出所有的数据
+        Map<String, Object> getnumber = qmsQueueResultService.getnumber();
+        datalist.add(getnumber);
         HashSet<Map<String,Object>> set=new HashSet<>(queueListByQueueUpSpelling);
         //queueListByQueueUp=queueListByQueueUp.stream().distinct().collect(Collectors.toList());
         datalist.addAll(queueListByQueueUp);

+ 20 - 1
src/main/java/com/steerinfo/dil/service/impl/QmsQueueResultServiceImpl.java

@@ -222,7 +222,26 @@ public class QmsQueueResultServiceImpl implements IQmsQueueResultService {
         return  qmsQueueResultMapper.getQueueListByQueueUpSpelling(map);
     }
 
-
+    /**
+     * @author:zyf
+     * @version:1.0
+     * @Date:2022-09-27
+     * @Description:查询出来所有的数据
+    */
+    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);
+        return map;
+    }
 
 
     /**

+ 45 - 0
src/main/resources/com/steerinfo/dil/mapper/QmsQueueResultMapper.xml

@@ -911,6 +911,51 @@
 
     </select>
 
+    <!--查询已派车车数-->
+    <select id="querySentCarNumber" resultType="java.lang.Integer">
+       select
+       count(*) ORDER_ID
+       from OMSTRUCK_ORDER OO
+       where OO.ORDER_TYPE=1
+       and to_char(OO.INSERT_TIME,'yyyy-mm-dd hh24:mi:ss')
+       between to_char(trunc(sysdate,'dd'),'yyyy-mm-dd hh24:mi:ss')
+       and to_char(trunc(sysdate,'dd')+23/24+59/24/60+59/24/60/60,'yyyy-mm-dd hh24:mi:ss')
+    </select>
+    <!--查询已扫码进厂车数-->
+    <select id="queryIntoFactoryNumber" resultType="java.lang.Integer">
+       select COUNT(*) RESULT_ID
+       from OMSTRUCK_ORDER OO
+       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 TMSTRUCK_LEAVE_FACTORY_RESULT TLFR
+       ON TLFR.RESULT_TOTAL_ID=TTR.RESULT_TOTAL_ID
+       where OO.ORDER_TYPE =1
+       and TER.INSERT_TIME IS NOT NULL
+       and to_char(OO.INSERT_TIME,'yyyy-mm-dd hh24:mi:ss')
+       between to_char(trunc(sysdate,'dd'),'yyyy-mm-dd hh24:mi:ss')
+       and to_char(trunc(sysdate,'dd')+23/24+59/24/60+59/24/60/60,'yyyy-mm-dd hh24:mi:ss')
+    </select>
+    <!--查询已扫码出厂车数-->
+    <select id="queryLeaveFactoryNumber" resultType="java.lang.Integer">
+       select COUNT(*) RESULT_ID
+       from OMSTRUCK_ORDER OO
+       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 TMSTRUCK_LEAVE_FACTORY_RESULT TLFR
+       ON TLFR.RESULT_TOTAL_ID=TTR.RESULT_TOTAL_ID
+       where OO.ORDER_TYPE =1
+       and TER.INSERT_TIME IS NOT NULL
+       and TLFR.INSERT_TIME IS NOT NULL
+       and to_char(OO.INSERT_TIME,'yyyy-mm-dd hh24:mi:ss')
+       between to_char(trunc(sysdate,'dd'),'yyyy-mm-dd hh24:mi:ss')
+       and to_char(trunc(sysdate,'dd')+23/24+59/24/60+59/24/60/60,'yyyy-mm-dd hh24:mi:ss')
+    </select>
+
+    <!--查询待进厂车数-->
     <update id="updateCancelResult" parameterType="com.steerinfo.dil.model.QmsQueueResult">
         update QMS_QUEUE_RESULT
         set RESULT_CANCEL_TIME   = SYSDATE,