修改一码通总览数据相关问题

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/service/IEquipmentCategoryService.java

@@ -38,7 +38,7 @@ public interface IEquipmentCategoryService {
 
     void checkEsData(String id);
 
-    List<EquipmentCategoryData> createEquipmentCategoryData(String unitCode);
+    List<EquipmentCategoryData> createEquipmentCategoryData();
 
     EquipmentCategoryData updateEquipmentCategoryData(String id);
 }

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/controller/EquipmentCategoryController.java

@@ -247,7 +247,7 @@ public class EquipmentCategoryController extends BaseController {
 	@ApiOperation(httpMethod = "get", value = "初始化一码通总览数据", notes = "初始化一码通总览数据")
 	public ResponseModel<Object> createEquipmentCategoryData(){
 
-		return ResponseHelper.buildResponse(equipmentCategoryService.createEquipmentCategoryData(null));
+		return ResponseHelper.buildResponse(equipmentCategoryService.createEquipmentCategoryData());
 	}
 
 	/**

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/EquipmentCategoryServiceImpl.java

@@ -781,9 +781,12 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
         }
     }
 
-    @Override
-    public List<EquipmentCategoryData> createEquipmentCategoryData(String unitCode) {
+    public List<EquipmentCategoryData> createEquipmentCategoryData() {
         equipmentCategoryDataService.remove(new QueryWrapper<>());
+        return getCategoryData(null);
+    }
+
+    private List<EquipmentCategoryData> getCategoryData(String unitCode) {
         List<EquipmentCategoryData> list = new ArrayList<>();
         List<Map<String, Object>> allUnitList = equipmentCategoryMapper.getAllUnit(unitCode);
         for (Map<String, Object> map : allUnitList) {
@@ -824,15 +827,9 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
                         break;
                 }
             }
-            EquipmentCategoryData categoryData = equipmentCategoryDataMapper.selectOne(new QueryWrapper<EquipmentCategoryData>().eq("unit_code", equipmentCategoryData.getUnitCode()));
-            int res = 0;
-            if (ObjectUtils.isEmpty(categoryData)) {
-                res = equipmentCategoryDataMapper.insert(equipmentCategoryData);
-            } else {
-                res = equipmentCategoryDataMapper.update(equipmentCategoryData,
-                        new QueryWrapper<EquipmentCategoryData>().eq("unit_code", equipmentCategoryData.getUnitCode()));
-            }
-            if (0 != res) {
+            boolean b = equipmentCategoryDataService.saveOrUpdate(equipmentCategoryData,
+                    new QueryWrapper<EquipmentCategoryData>().eq("unit_code", equipmentCategoryData.getUnitCode()));
+            if (b) {
                 list.add(equipmentCategoryData);
             }
         }
@@ -843,7 +840,7 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
     @Override
     public EquipmentCategoryData updateEquipmentCategoryData(String record) {
         String unitCode = equipmentCategoryMapper.getUnitCodeByRecord(record);
-        List<EquipmentCategoryData> equipmentCategoryData = createEquipmentCategoryData(unitCode);
+        List<EquipmentCategoryData> equipmentCategoryData = getCategoryData(unitCode);
         return equipmentCategoryData.get(0);
     }