Merge remote-tracking branch 'origin/develop_dl' into develop_dl

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/mapper/EquipmentSpecificMapper.java

@@ -290,6 +290,4 @@ public interface EquipmentSpecificMapper extends BaseMapper<EquipmentSpecific> {
 
     List<Map<String, Object>> getListByCode(@Param("code") String code, @Param("bizOrgCode") String bizOrgCode);
 
-    String getCheckId(@Param("id") String id);
-
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/RiskSourceServiceImpl.java

@@ -75,8 +75,7 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
         SendToMsgRiskAlarmInfoVo equipAlarm = new SendToMsgRiskAlarmInfoVo();
         Map<String, Object> m = new HashMap<>();
         if (source.equalsIgnoreCase(RiskSourceTypeEnum.PATROL.getName())) {
-            String checkId = equipmentSpecificMapper.getCheckId(id);
-            List<Map<String, Object>> checkInputItems = equipmentSpecificMapper.queryCheckInputItemsByCheckId(checkId);
+            List<Map<String, Object>> checkInputItems = equipmentSpecificMapper.queryCheckInputItemsByCheckId(id);
             Map<String, Object> map = checkInputItems.get(0);
             if (map.containsKey("equipId")) {
                 equipmentSpecId = String.valueOf(map.get("equipId"));
@@ -93,7 +92,7 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
                 equipInfoVo.setBizOrgCode(String.valueOf(map.get("biz_org_code")));
                 equipInfoVo.setBizOrgName(String.valueOf(map.get("biz_org_name")));
 
-                Map<String, Object> patrolMap = equipmentSpecificMapper.getPatrolData(Long.valueOf(String.valueOf(checkId)));
+                Map<String, Object> patrolMap = equipmentSpecificMapper.getPatrolData(Long.valueOf(id));
                 m.put("station", String.valueOf(map.get("biz_org_name")));
                 m.put("stationCode", String.valueOf(map.get("biz_org_code")));
                 m.put("planName", String.valueOf(patrolMap.get("planName")));

amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificMapper.xml

@@ -2434,20 +2434,11 @@
                 LEFT JOIN p_input_item ii ON ii.id = ci.input_id
                 LEFT JOIN p_point_classify ppc on ci.point_classify_id = ppc.id
         WHERE
-            ci.check_id = #{checkId}
+            ci.id = #{checkId}
         ORDER BY
             ci.order_no
     </select>
 
-    <select id="getCheckId" resultType="String">
-        SELECT
-            ci.check_id AS checkId,
-        FROM
-            p_check_input ci
-        WHERE
-            ci.id = #{checkId}
-    </select>
-
     <select id="getPointById" resultType="Map">
         SELECT
         p.id,
@@ -2506,7 +2497,7 @@
             LEFT JOIN p_plan ppl ON ppl.id = pc.plan_id
             LEFT JOIN `p_route` pr ON pr.id = pc.`route_id`
         WHERE
-            pci.check_id = #{checkId}
+            pci.id = #{checkId}
         order by pci.order_no
         limit 1
     </select>