Merge branch 'develop_dl' of http://36.40.66.175:5000//moa/amos-boot-biz into develop_dl

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/EquipmentManageController.java

@@ -67,7 +67,7 @@ public class EquipmentManageController extends AbstractBaseController{
                 companyId = result.get("sequenceNbr").toString();
             }
         }
-            return equipmentManageService.queryEquipmenInfoAndCount(equipmentName,equipmentCode,construction,maintenance,bizOrgCode,formGroupId,current,pageSize,controBoxBuildId,companyId, nameOrCode, null);
+            return equipmentManageService.queryEquipmenInfoAndCount(equipmentName,equipmentCode,construction,maintenance,bizOrgCode,formGroupId,current,pageSize,controBoxBuildId,companyId, nameOrCode, null, null);
     }
 
     @GetMapping(value = "/getUtils")
@@ -149,7 +149,7 @@ public class EquipmentManageController extends AbstractBaseController{
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "GET", value = "装备系统列表", notes = "装备系统列表")
     public List<EquipmentManageEntity>  getEquipmentManageAll() {
-       
+
         return equipmentManageService.list();
     }
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/FireFightingSystemController.java

@@ -724,7 +724,8 @@ public class FireFightingSystemController extends AbstractBaseController {
             @RequestParam(value = "current") int current,
             @RequestParam(value = "size") int pageSize,
             @RequestParam(value = "nameOrCode", required = false) String nameOrCode, @RequestParam(value = "companyId", required = false) String companyId,
-            @ApiParam(value = "缺陷管理新增页面用，其余地方可忽略 1-是缺陷管理 0-不是") @RequestParam(required = false) Integer isDefect
+            @ApiParam(value = "缺陷管理新增页面用，其余地方可忽略 1-是缺陷管理 0-不是") @RequestParam(required = false) Integer isDefect,
+            @ApiParam(value = "接口调用源，web端调用/卡片调用") @RequestParam(value = "useSource", required = false) String invokeSource
     ) {
         if (null != isDefect && 1 == isDefect) {
             ReginParams reginParams = getSelectedOrgInfo();
@@ -749,7 +750,7 @@ public class FireFightingSystemController extends AbstractBaseController {
             }
 
         }
-        return fireFightingSystemService.queryEquipmenInfoAndCount(equipmentName, equipmentCode, construction, maintenance, bizOrgCode, formGroupId, current, pageSize, controBoxBuildId, companyId, nameOrCode, systemStatus);
+        return fireFightingSystemService.queryEquipmenInfoAndCount(equipmentName, equipmentCode, construction, maintenance, bizOrgCode, formGroupId, current, pageSize, controBoxBuildId, companyId, nameOrCode, systemStatus, invokeSource);
     }
 
     /**

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

@@ -26,7 +26,7 @@ public interface EquipmentManageService extends IService<EquipmentManageEntity>
      * @param pageSize
      * @return
      */
-    Map<String, Object> queryEquipmenInfoAndCount(String equimentName, String equimentCode, String construction, String maintenance, String bizOrgCode, String formGroupId , int spage, int pageSize, String controBoxBuildId,String companyId, String nameOrCode,String systemStatus);
+    Map<String, Object> queryEquipmenInfoAndCount(String equimentName, String equimentCode, String construction, String maintenance, String bizOrgCode, String formGroupId , int spage, int pageSize, String controBoxBuildId,String companyId, String nameOrCode,String systemStatus, String invokeSource);
 
     /**
      * 获取下拉菜单数据

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

@@ -47,7 +47,7 @@ public interface IFireFightingSystemService extends IService<FireFightingSystemE
      * @param pageSize
      * @return
      */
-    Map<String, Object> queryEquipmenInfoAndCount(String equimentName, String equimentCode, String construction, String maintenance, String bizOrgCode, String formGroupId, int current, int pageSize,String controBoxBuildId,String companyId, String nameOrCode, String systemStatus);
+    Map<String, Object> queryEquipmenInfoAndCount(String equimentName, String equimentCode, String construction, String maintenance, String bizOrgCode, String formGroupId, int current, int pageSize,String controBoxBuildId,String companyId, String nameOrCode, String systemStatus, String invokeSource);
 
     FireFightingSystemEntity getOneById(Long id);
 

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

@@ -403,14 +403,16 @@ public class EquipmentDetailServiceImpl extends ServiceImpl<EquipmentDetailMappe
             }
         }
         // 实时信号
-        int count = equipmentSpecificAlarmLogService.count(
+        List<EquipmentSpecificAlarmLog> alarmLogs = equipmentSpecificAlarmLogService.list(
                 Wrappers.<EquipmentSpecificAlarmLog>lambdaQuery()
+                        .select(EquipmentSpecificAlarmLog::getEquipmentSpecificIndexName)
                         .eq(EquipmentSpecificAlarmLog::getEquipmentSpecificId, id)
                         .isNull(EquipmentSpecificAlarmLog::getCleanTime)
+                        .orderByDesc(EquipmentSpecificAlarmLog::getCreateDate)
         );
         equipmentDetail.setSignal("-");
-        if (count > 0) {
-            String signal = equipmentSpecific.getRealtimeIotIndexName();
+        if (!alarmLogs.isEmpty()) {
+            String signal = alarmLogs.get(0).getEquipmentSpecificIndexName();
             equipmentDetail.setSignal(Objects.nonNull(signal) ? signal : "-");
         }
         // 二维码

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

@@ -53,7 +53,7 @@ public class EquipmentManageServiceImpl extends ServiceImpl<EquipmentManageMappe
 
     @Override
     public Map<String, Object> queryEquipmenInfoAndCount(String equimentName, String equimentCode, String construction, String maintenance,
-                                                         String bizOrgCode, String formGroupId, int current, int pageSize,String controBoxBuildId,String companyCode, String nameOrCode, String systemStatus) {
+                                                         String bizOrgCode, String formGroupId, int current, int pageSize,String controBoxBuildId,String companyCode, String nameOrCode, String systemStatus, String invokeSource) {
         HttpServletRequest request = null;
         Map map = new HashMap<String, Object>();
         map.put("equimentName", equimentName);
@@ -68,6 +68,7 @@ public class EquipmentManageServiceImpl extends ServiceImpl<EquipmentManageMappe
         map.put("controBoxBuildId",controBoxBuildId);
         map.put("nameOrCode", nameOrCode);
         map.put("systemStatus", systemStatus);
+        map.put("invokeSource", invokeSource);
         List<EquipmentManageVo> dataList = equipmentManageMapper.queryEquipmenInfo(map);
         Long count = equipmentManageMapper.queryEquipmenCount(map);
         map.clear();

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

@@ -199,9 +199,9 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
 
     @Override
     public Map<String, Object> queryEquipmenInfoAndCount(String equimentName, String equimentCode, String construction,
-                                                         String maintenance, String bizOrgCode, String formGroupId, int current, int pageSize, String controBoxBuildId, String companyId, String nameOrCode,String systemStatus) {
+                                                         String maintenance, String bizOrgCode, String formGroupId, int current, int pageSize, String controBoxBuildId, String companyId, String nameOrCode,String systemStatus, String invokeSource) {
         Map<String, Object> map = equipmentManageService.queryEquipmenInfoAndCount(equimentName, equimentCode,
-                construction, maintenance, bizOrgCode, formGroupId, current, pageSize, controBoxBuildId, companyId, nameOrCode, systemStatus);
+                construction, maintenance, bizOrgCode, formGroupId, current, pageSize, controBoxBuildId, companyId, nameOrCode, systemStatus, invokeSource);
         List<EquipmentManageVo> dataList = (List<EquipmentManageVo>) map.get("dataList");
         StringBuilder stb = new StringBuilder();
         dataList.forEach(y -> {

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

@@ -60,7 +60,14 @@
             <if test="formGroupId != null and formGroupId != '' and formGroupId != '-1'">
                 AND sys.form_group_id = #{formGroupId}
             </if>
-            order by CONVERT(sys.biz_org_name USING gbk) ASC, sys.system_status DESC
+            <choose>
+                <when test="invokeSource == 'dcfcCard'">
+                    ORDER BY CONVERT(sys.biz_org_name USING gbk) ASC, sys.system_status DESC
+                </when>
+                <otherwise>
+                    ORDER BY sys.id DESC
+                </otherwise>
+            </choose>
             LIMIT #{spage},#{pageSize}
     </select>
     <select id="queryEquipmenCount" resultType="long">