Merge remote-tracking branch 'origin/master'

op-modules/op-device/src/main/java/com/op/device/controller/EquRepairOrderController.java

@@ -1,6 +1,8 @@
 package com.op.device.controller;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import javax.servlet.http.HttpServletResponse;
 
 import com.op.device.domain.EquEquipment;
@@ -48,6 +50,8 @@ public class EquRepairOrderController extends BaseController {
         return getDataTable(list);
     }
 
+
+
     /**
      * 导出故障报修列表
      */
@@ -152,4 +156,15 @@ public class EquRepairOrderController extends BaseController {
         return getDataTable(list);
     }
 
+    /**
+     * 黑蚊香车间生产监控看板设备故障信息
+     */
+
+
+    @GetMapping("/getCsRepairlist")
+    public List<EquRepairOrder> getCsRepairlist(EquRepairOrder equRepairOrder) {
+        //查询未维修完成的设备
+        List<EquRepairOrder> equRepairOrderList= equRepairOrderService.selectRepairEquList(equRepairOrder);
+        return equRepairOrderList;
+    }
 }

op-modules/op-device/src/main/java/com/op/device/mapper/EquRepairOrderMapper.java

@@ -113,4 +113,6 @@ public interface EquRepairOrderMapper {
     List<SysNoticeGroup> getNoticesGroup(SysNoticeGroup noticeQo);
 
     Map selectEquInfoByequCode(String equipmentCode);
+
+    List<EquRepairOrder> selectRepairEquList(EquRepairOrder equRepairOrder);
 }

op-modules/op-device/src/main/java/com/op/device/schedul/MyWebSocketHandler.java

@@ -27,19 +27,5 @@ public class MyWebSocketHandler extends TextWebSocketHandler {
     private EquRepairOrderMapper equRepairOrderMapper;
 
 
-    @Scheduled(fixedRate = 5000) // 每60秒执行一次
-    @DS("ds_1000")
-    public void sendPeriodicMessages() {
-        EquRepairOrder equRepairOrder=new EquRepairOrder();
-        equRepairOrder.setOrderStatus("2");
-        List<EquRepairOrder> equRepairOrderList=equRepairOrderMapper.selectEquRepairOrderList(equRepairOrder);
-        for (int i = 0; i < equRepairOrderList.size(); i++) {
-            Map map=new HashMap();
-            map=equRepairOrderMapper.selectEquInfoByequCode(equRepairOrderList.get(i).getEquipmentCode());
-            equRepairOrderList.get(i).setParams(map);
-        }
-        String jsonResult = JSON.toJSONString(equRepairOrderList);
-        WebSocketUsers.sendMessageToUsersByText(jsonResult);
 
-    }
 }

op-modules/op-device/src/main/java/com/op/device/service/IEquRepairOrderService.java

@@ -1,6 +1,7 @@
 package com.op.device.service;
 
 import java.util.List;
+import java.util.Map;
 
 import com.op.common.core.web.domain.AjaxResult;
 import com.op.device.domain.*;
@@ -80,4 +81,7 @@ public interface IEquRepairOrderService {
 
     //查询组线
     public List<EquEquipment> selectGroupLineList();
+    Map selectEquInfoByequCode(String equipmentCode);
+
+    List<EquRepairOrder> selectRepairEquList(EquRepairOrder equRepairOrder);
 }

op-modules/op-device/src/main/java/com/op/device/service/impl/EquRepairOrderServiceImpl.java

@@ -4,6 +4,7 @@ import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
@@ -604,4 +605,16 @@ public class EquRepairOrderServiceImpl implements IEquRepairOrderService {
         return equEquipmentMapper.selectEquipmentGroupLine();
     }
 
+    @Override
+    @DS("#header.poolName")
+    public Map selectEquInfoByequCode(String equipmentCode) {
+        return equRepairOrderMapper.selectEquInfoByequCode(equipmentCode);
+    }
+
+    @Override
+    @DS("#header.poolName")
+    public List<EquRepairOrder> selectRepairEquList(EquRepairOrder equRepairOrder) {
+        return equRepairOrderMapper.selectRepairEquList(equRepairOrder);
+    }
+
 }

op-modules/op-device/src/main/resources/mapper/device/DeviceInterfaceMapper.xml

@@ -15,8 +15,9 @@
         from equ_repair_work_order wo
         left join base_equipment be on wo.equipment_code = be.equipment_code
         left join equ_team et on wo.work_team = et.team_code
-        where wo.work_status = '0'
+        where
-		and wo.del_flag = '0'
+--         wo.work_status = '0' AND
+		wo.del_flag = '0'
     </select>
 
     <select id="selectEquipmentList" parameterType="EquOperation" resultType="com.op.device.domain.vo.IEquipmentVO">

op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml

@@ -228,6 +228,10 @@
 		left join base_equipment be on eo.equipment_code = be.equipment_code
         <where>
             <if test="createTime == null and planType == 'spotInspection'">CONVERT(date,eo.create_time) =  CONVERT(date,GETDATE())</if>
+            <if test="createTime == null and planType != 'spotInspection'">
+                AND eo.create_time &gt;= DATEFROMPARTS(YEAR(GETDATE()), MONTH(GETDATE()), 1)
+                AND eo.create_time &lt; DATEADD(MONTH, 1, DATEFROMPARTS(YEAR(GETDATE()), MONTH(GETDATE()), 1))
+            </if>
             <if test="createTime != null and planType == 'spotInspection'">CONVERT(date,eo.create_time) = #{createTime}</if>
             and eo.plan_type = #{planType}
 		    and eo.del_flag = '0'
@@ -283,6 +287,10 @@
 	    left join base_equipment be on eo.equipment_code = be.equipment_code
         <where>
             <if test="createTime == null and planType == 'spotInspection'">CONVERT(date,eo.create_time) =  CONVERT(date,GETDATE())</if>
+            <if test="createTime == null and planType != 'spotInspection'">
+                AND eo.create_time &gt;= DATEFROMPARTS(YEAR(GETDATE()), MONTH(GETDATE()), 1)
+                AND eo.create_time &lt; DATEADD(MONTH, 1, DATEFROMPARTS(YEAR(GETDATE()), MONTH(GETDATE()), 1))
+            </if>
             <if test="createTime != null and planType == 'spotInspection'">and CONVERT(date,eo.create_time) = #{createTime}</if>
 		    and eo.del_flag = '0'
 		    and eo.order_status = '1'

op-modules/op-device/src/main/resources/mapper/device/EquRepairOrderMapper.xml

@@ -354,10 +354,36 @@
                 A.equipment_name as equipmentName
             FROM
                 equ_bind_auxiliary_equipment A
+                LEFT JOIN base_equipment B ON A.equipment_code = B.equipment_code
             WHERE
                 A.auxiliary_equipment_code = #{equipmentCode}
 
     </select>
+    <select id="selectRepairEquList" resultType="java.util.Map">
+            SELECT
+                ero.equipment_code AS equipmentCode,
+                ero.order_desc AS orderDesc,
+                be.equipment_name AS equipmentName,
+            CASE
+
+                    WHEN ebae.equipment_code IS NULL THEN
+                    ero.equipment_code ELSE ebae.equipment_code
+                END AS belongEquipmentCode,
+            CASE
+
+                    WHEN ebae.equipment_name IS NULL THEN
+                    be.equipment_name ELSE ebae.equipment_name
+                END AS belongEquipmentName
+            FROM
+                equ_repair_order ero
+                LEFT JOIN equ_repair_work_order erwo ON ero.order_id = erwo.order_id
+                LEFT JOIN base_equipment be ON be.equipment_code = ero.equipment_code
+                LEFT JOIN equ_bind_auxiliary_equipment ebae ON ebae.auxiliary_equipment_code = ero.equipment_code
+            WHERE
+                erwo.work_status != 1
+                AND erwo.del_flag = 0
+                AND ero.del_flag = 0;
+    </select>
 
 
 </mapper>