更新查询装备定义列表

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

@@ -266,11 +266,10 @@ public class FaultCaseController extends AbstractBaseController {
 	 *
 	 * @return
 	 */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
 	@ApiOperation(httpMethod = "GET",value = "装备定义列表不分页",   notes = "装备定义列表不分页")
 	@GetMapping(value = "/equip/list")
-	public ResponseModel<List<EquiplistSpecificBySystemVO>> getEquipList(@RequestParam(value = "systemId") String systemId,
-																		 @RequestParam(value = "systemCode") String systemCode) {
-		return CommonResponseUtil.success(iEquipmentService.getAllByCode(systemId, systemCode));
+	public ResponseModel<List<EquiplistSpecificBySystemVO>> getEquipList(@RequestParam(value = "systemId", required = false) String systemId) {
+		return CommonResponseUtil.success(iEquipmentService.getAllByCode(systemId));
 	}
 }

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

@@ -127,5 +127,5 @@ public interface IEquipmentService extends IService<Equipment> {
      */
     EquipmentVo getEquipBySpecific(Long equipmentSpecificId);
 
-    List<Equipment> getAllByCode(String id, String code);
+    List<Equipment> getAllByCode(String id);
 }

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

 package com.yeejoin.equipmanage.service.impl;
 
 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.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -467,11 +468,16 @@ public class EquipmentServiceImpl extends ServiceImpl<EquipmentMapper, Equipment
     }
 
     @Override
-    public List<Equipment> getAllByCode(String id, String code) {
-        QueryWrapper<Equipment> queryWrapper = new QueryWrapper<Equipment>();
-        queryWrapper.likeLeft("code", code);
-        queryWrapper.ne("id", Long.valueOf(id));
-        return equipmentMapper.selectList(queryWrapper);
+    public List<Equipment> getAllByCode(String id) {
+        if (StringUtils.isNotEmpty(id)) {
+            EquipmentCategory category = equipmentCategoryMapper.selectOne(new LambdaQueryWrapper<EquipmentCategory>().eq(EquipmentCategory::getId, Long.valueOf(id)));
+            QueryWrapper<Equipment> queryWrapper = new QueryWrapper<Equipment>();
+            queryWrapper.likeRight("code", category.getCode().substring(0,4));
+            queryWrapper.ne("id", Long.valueOf(id));
+            return equipmentMapper.selectList(queryWrapper);
+        } else {
+            return this.list();
+        }
     }
 
 	@Override