修改站端bug

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

@@ -50,7 +50,7 @@ public class EquipmentSpecificAlarmLogController extends AbstractBaseController
      * @return
      */
     @RequestMapping(value = "/getEquipAlarmLog", method = RequestMethod.GET)
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
     @ApiOperation(httpMethod = "GET", value = "获取设备物联日志", notes = "获取设备物联日志")
     public ResponseModel getEquipAlarmLog(@RequestParam(required = false) String code,
                                           @RequestParam(required = false) String startTime,

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

@@ -3,16 +3,14 @@ package com.yeejoin.equipmanage.controller;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.equipmanage.common.dto.FaultCaseImportParam;
-import com.yeejoin.equipmanage.common.entity.EquipmentSpecific;
-import com.yeejoin.equipmanage.common.entity.FaultCase;
-import com.yeejoin.equipmanage.common.entity.FireFightingSystemEntity;
-import com.yeejoin.equipmanage.common.entity.SignalClassify;
+import com.yeejoin.equipmanage.common.entity.*;
 import com.yeejoin.equipmanage.common.entity.publics.CommonResponse;
 import com.yeejoin.equipmanage.common.entity.vo.EquiplistSpecificBySystemVO;
 import com.yeejoin.equipmanage.common.enums.EmergencyLevelEum;
 import com.yeejoin.equipmanage.common.utils.CommonResponseUtil;
 import com.yeejoin.equipmanage.common.utils.StringUtil;
 import com.yeejoin.equipmanage.common.vo.EquipmentManageVo;
+import com.yeejoin.equipmanage.common.vo.EquipmentVo;
 import com.yeejoin.equipmanage.service.*;
 import com.yeejoin.equipmanage.utils.FileHelper;
 import io.swagger.annotations.Api;
@@ -35,6 +33,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * 信号分类量测枚举表
@@ -67,7 +66,7 @@ public class FaultCaseController extends AbstractBaseController {
      *
      * @return
      */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
 	@PostMapping(value = "/save")
 	@ApiOperation(httpMethod = "POST", value = "新增信号分类量测枚举表", notes = "新增信号分类量测枚举表")
 	public ResponseModel<FaultCase> save(@RequestBody FaultCase model) {
@@ -81,7 +80,7 @@ public class FaultCaseController extends AbstractBaseController {
      * @param
      * @return
      */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
 	@PutMapping(value = "/update")
 	@ApiOperation(httpMethod = "PUT", value = "根据id更新故障案例", notes = "根据id更新故障案例")
 	public ResponseModel<FaultCase> updateByIdWlFaultCase(@RequestBody FaultCase model) {
@@ -153,7 +152,7 @@ public class FaultCaseController extends AbstractBaseController {
 	 *
 	 * @return
 	 */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
 	@ApiOperation(httpMethod = "GET",value = "模板导出",   notes = "模板导出")
 	@GetMapping(value = "/export")
 	public ResponseModel<List<FaultCase>> exportTemplate(HttpServletResponse response) {
@@ -170,6 +169,17 @@ public class FaultCaseController extends AbstractBaseController {
 			// 消防系统
 			downData.add(sysList.toArray(new String[sysList.size()]));
 		}
+
+		List<Equipment> categories = iEquipmentService.getAll();
+		List<String> equipList = new ArrayList<>();
+		for (Equipment entity : categories) {
+			String str = entity.getName() + "@" + entity.getCode();
+			equipList.add(str);
+		}
+		// 部件
+		downData.add(equipList.toArray(new String[equipList.size()]));
+
+
 		List<SignalClassify> singles = signalClassifyService.getList();
 		if(0 < singles.size()) {
 			List<String> classList = new ArrayList<>();
@@ -177,13 +187,13 @@ public class FaultCaseController extends AbstractBaseController {
 				String str = signalClassify.getTypeName();
 				classList.add(str);
 			}
-			// 故障类型
+			// 故障类型s
 			downData.add(classList.toArray(new String[classList.size()]));
 		}
 		// 故障等级
 		List<String> levels = EmergencyLevelEum.getDropDownList();
 		downData.add(levels.toArray(new String[levels.size()]));
-		String [] downRows = {"0","2","3"}; //下拉的列序号数组(序号从0开始)
+		String [] downRows = {"0","1","2","3"}; //下拉的列序号数组(序号从0开始)
 		try {
 			FileHelper.createExcelTemplate(fileName, handers, downData, downRows, response);
 		} catch (Exception e) {
@@ -197,7 +207,7 @@ public class FaultCaseController extends AbstractBaseController {
 	 *
 	 * @return
 	 */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
 	@PostMapping(value = "/import")
 	@ApiOperation(httpMethod = "POST", value = "模板填充数据导入", notes = "模板填充数据导入")
 	public ResponseModel importFaultCase(@ApiParam(value="导入数据文件", required=true) MultipartFile file) {
@@ -220,24 +230,33 @@ public class FaultCaseController extends AbstractBaseController {
 						return CommonResponseUtil.failure("请补充消防系统信息！");
 					}
 
-					if (StringUtil.isNotEmpty(dto.getFaultLevel())) {
-						String[] levels = dto.getFaultLevel().split("@");
-						faultCase.setFaultLevel(levels[1]);
-					} else {
-						return CommonResponseUtil.failure("请补充故障等级信息！");
-					}
-
 					if (StringUtil.isNotEmpty(dto.getEquipInfo())) {
 						String[] strings = dto.getEquipInfo().split("@");
 						if(2 > strings.length) {
 							return CommonResponseUtil.failure("部件支持的导入格式错误，正确格式例如：部件名称@部件编码 !");
 						} else {
-							faultCase.setEquipName(strings[0]);
-							faultCase.setEquipCode(strings[1]);
+							List<Equipment> eqes = iEquipmentService.getAllByCode(faultCase.getSystemId());
+							if (0 < eqes.size()) {
+								List<Equipment> tempList = eqes.stream().filter(x -> x.getCode().equalsIgnoreCase(strings[1])).collect(Collectors.toList());
+								if (0 < tempList.size()) {
+									faultCase.setEquipName(strings[0]);
+									faultCase.setEquipCode(strings[1]);
+								} else {
+									return CommonResponseUtil.failure("请注意当前系统下不存在此类部件 !");
+								}
+							}
 						}
 					} else {
 						return CommonResponseUtil.failure("请补充部件信息！");
 					}
+
+					if (StringUtil.isNotEmpty(dto.getFaultLevel())) {
+						String[] levels = dto.getFaultLevel().split("@");
+						faultCase.setFaultLevel(levels[1]);
+					} else {
+						return CommonResponseUtil.failure("请补充故障等级信息！");
+					}
+
 					cases.add(faultCase);
 				}
 				faultCaseService.saveOrUpdateBatch(cases);

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

@@ -96,11 +96,15 @@ public class FireSystemAction {
             boolean flag = Boolean.TRUE;
             for (EquipIndexDto o : list) {
                 // 此处由于测点装备可能不跟系统绑定，所以此处默认取第一个
-                EquipmentSpecificIndex index = specificIndexSerivce.getOne(new QueryWrapper<EquipmentSpecificIndex>().eq("equipment_index_key", o.getIndexKey()).last("limit 1"));
-                if(!(o.getIndexKey().equalsIgnoreCase(index.getEquipmentIndexKey()) && o.getIndexValue().equalsIgnoreCase(index.getValue()))) {
+                EquipmentSpecificIndex index = specificIndexSerivce.getOne(new QueryWrapper<EquipmentSpecificIndex>().eq("equipment_index_key", o.getIndexKey()).orderByDesc("update_date").last("limit 1"));
+
+                if (o.getIndexValue().equalsIgnoreCase(index.getValue())){
+                    break;
+                } else {
                     flag = Boolean.FALSE;
                     break;
                 }
+
             }
             if (flag) {
                 entity.setSystemRunState(runStateCode);

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

@@ -6137,7 +6137,7 @@
         <where>
             r.update_date BETWEEN date_sub( now(), INTERVAL 6 MONTH ) AND now()
             <if test="systemCode != null and systemCode != ''">
-                AND fs.system_type_code = #{systemCode}
+                AND fs.`code` = #{systemCode}
             </if>
         </where>
         GROUP BY