修改bug

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

@@ -61,6 +61,13 @@ public class FormInstanceController extends AbstractBaseController {
         String orgCode = getOrgCode();
         return formInstanceEquipService.updateForm(instanceId, orgCode, map, groupCode);
     }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(value = "删除")
+    @DeleteMapping(value = "/{instanceId}")
+    public Boolean delete(@PathVariable Long instanceId) {
+        return formInstanceEquipService.deleteInstanceById(instanceId);
+    }
 }
 
 

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

@@ -6,6 +6,7 @@ import java.util.List;
 import java.util.Map;
 
 import com.yeejoin.equipmanage.common.datasync.vo.FireEquipmentVO;
+import com.yeejoin.equipmanage.common.entity.*;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -15,10 +16,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.equipmanage.common.datasync.entity.FireEquipment;
 import com.yeejoin.equipmanage.common.dto.EquipmentSpecificDto;
 import com.yeejoin.equipmanage.common.dto.UserDto;
-import com.yeejoin.equipmanage.common.entity.EquipmentCategory;
-import com.yeejoin.equipmanage.common.entity.EquipmentSpecific;
-import com.yeejoin.equipmanage.common.entity.EquipmentSpecificIndex;
-import com.yeejoin.equipmanage.common.entity.MaintenanceResourceData;
 import com.yeejoin.equipmanage.common.entity.dto.EquipmentSpecificDTO;
 import com.yeejoin.equipmanage.common.entity.vo.ComplementCodeVO;
 import com.yeejoin.equipmanage.common.entity.vo.EquiplistSpecificBySystemVO;
@@ -220,7 +217,7 @@ public interface EquipmentSpecificMapper extends BaseMapper<EquipmentSpecific> {
      */
     List<Map<String, Object>> queryCompanyStaData();
 
-    String getEquipmentBySpecificId(@Param("specificId") Long specificId);
+    Equipment getEquipmentBySpecificId(@Param("specificId") Long specificId);
 
     List<EquiplistSpecificBySystemVO> getListByWarehouseStructureId(Long floorId);
 

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

@@ -3,6 +3,7 @@ package com.yeejoin.equipmanage.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yeejoin.amos.boot.module.jcs.api.dto.IotSystemAlarmRo;
@@ -110,6 +111,9 @@ public class ConfirmAlarmServiceImpl extends ServiceImpl<ConfirmAlarmMapper, Equ
     private EquipmentSpecificMapper equipmentSpecificMapper;
 
     @Autowired
+    private EquipmentMapper equipmentMapper;
+
+    @Autowired
     private EquipmentSpecificAlarmMapper equipmentSpecificAlarmMapper;
     
     @Autowired
@@ -177,8 +181,14 @@ public class ConfirmAlarmServiceImpl extends ServiceImpl<ConfirmAlarmMapper, Equ
                 ent.setEquipmentSpecificAlarmId(equipmentSpecificAlarmId);
                 ent.setEquipmentSpecificId(alarmLog.getEquipmentSpecificId());
                 ent.setEquipmentSpecificIndexKey(alarmLog.getEquipmentSpecificIndexKey());
-                String cleanType = equipmentSpecificMapper.getEquipmentBySpecificId(alarmLog.getEquipmentSpecificId());
-                if (StringUtil.isNotEmpty(cleanType) && AlarmCleanTypeEnum.QRXC.getCode().equals(cleanType)) {
+                Equipment equipment = equipmentSpecificMapper.getEquipmentBySpecificId(alarmLog.getEquipmentSpecificId());
+                if (!StringUtil.isNotEmpty(equipment.getCleanType())) {
+                    // 若此装备未定义消除策略，默认设置为复位信号自动消除
+                    equipment.setCleanType(AlarmCleanTypeEnum.ZDXC.getCode());
+                    equipmentMapper.updateById(equipment);
+                }
+
+                if (StringUtil.isNotEmpty(equipment.getCleanType()) && AlarmCleanTypeEnum.QRXC.getCode().equals(equipment.getCleanType())) {
                     EquipmentSpecificAlarm alarm = equipmentSpecificAlarmMapper.selectById(alarmLog.getEquipmentSpecificAlarmId());
                     alarm.setStatus(AlarmStatusEnum.HF.getCode());
                     equipmentSpecificAlarmMapper.updateById(alarm);
@@ -214,8 +224,8 @@ public class ConfirmAlarmServiceImpl extends ServiceImpl<ConfirmAlarmMapper, Equ
             Date date = new Date();
             SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             String dateString = formatter.format(date);
-            ent.setDefectBatchId(UUID.randomUUID().toString().replace("-", "").toLowerCase());
             if (ent.isAddDefect()) {
+                ent.setDefectBatchId(UUID.randomUUID().toString().replace("-", "").toLowerCase());
                 ent.setResolveResult(dateString + " " + userModel.getRealName() + " 添加为缺陷进行消缺。");
             } else {
                 ent.setResolveResult(dateString + " " + userModel.getRealName() + " 进行警情确认处理。");

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

@@ -1544,9 +1544,9 @@
             c.`code`
     </select>
 
-    <select id="getEquipmentBySpecificId" resultType="String">
+    <select id="getEquipmentBySpecificId" resultType="com.yeejoin.equipmanage.common.entity.Equipment">
         select
-         we.clean_type
+            we.*
         from
          wl_equipment we
          LEFT JOIN `wl_equipment_detail` wed ON wed.equipment_id = we.id