Merge remote-tracking branch 'origin/develop' into develop

src/main/java/com/yunfeiyun/agmp/iotm/device/sf/controller/IotDeviceSfController.java

@@ -1,20 +1,26 @@
 package com.yunfeiyun.agmp.iotm.device.sf.controller;
 
+import cn.hutool.core.exceptions.ValidateException;
+import com.yunfeiyun.agmp.common.core.domain.AjaxResult;
 import com.yunfeiyun.agmp.common.core.page.TableDataInfo;
+import com.yunfeiyun.agmp.common.utils.StringUtils;
+import com.yunfeiyun.agmp.iot.common.constant.IotErrorCode;
 import com.yunfeiyun.agmp.iot.common.constant.devicetype.IotDeviceDictConst;
+import com.yunfeiyun.agmp.iot.common.exception.IotBizException;
 import com.yunfeiyun.agmp.iotm.common.controller.BaseController;
 import com.yunfeiyun.agmp.iotm.device.common.domin.IotDeviceBaseFunReqVo;
 import com.yunfeiyun.agmp.iotm.device.common.service.IotDeviceCommonService;
+import com.yunfeiyun.agmp.iotm.device.sf.domain.IotSfElementfactorAddReqVo;
 import com.yunfeiyun.agmp.iotm.device.sf.domain.IotSfElementfactorListReqVo;
 import com.yunfeiyun.agmp.iotm.util.ValidateUtil;
 import com.yunfeiyun.agmp.iotm.web.domain.reqvo.IotDeviceListReqVo;
 import com.yunfeiyun.agmp.iotm.web.domain.resvo.IotDeviceListResVo;
 import com.yunfeiyun.agmp.iotm.web.service.IIotDeviceService;
+import com.yunfeiyun.agmp.iotm.web.service.IIotSfElementfactorService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.Arrays;
@@ -34,6 +40,9 @@ public class IotDeviceSfController extends BaseController {
     @Autowired
     private IotDeviceCommonService iotDeviceCommonService;
 
+    @Autowired
+    private IIotSfElementfactorService iotSfElementfactorService;
+
     /**
      * 水肥设备列表
      * /list  所有设备
@@ -60,38 +69,77 @@ public class IotDeviceSfController extends BaseController {
     }
 
     /**
-     * 获取已存在的元素列表
+     * 获取泵类设备已存在的元素列表
      * 该接口用于根据请求参数获取已存在的元素列表，并返回相关数据。
      *
      * @param reqVo 请求参数，包含设备标识devBid等信息
      * @return 返回TableDataInfo对象，包含元素列表数据
      * @throws IllegalArgumentException 如果reqVo中的devBid为空，则抛出异常
      */
-    @GetMapping("/ele/already/List")
-    public TableDataInfo getAlreadyElementList(IotSfElementfactorListReqVo reqVo){
+    @GetMapping("/pump/already/list")
+    public TableDataInfo getPumpAlreadyElementList(IotSfElementfactorListReqVo reqVo){
         ValidateUtil.validateDevBid(reqVo.getDevBid());
         IotDeviceBaseFunReqVo iotDeviceBaseFunReqVo = new IotDeviceBaseFunReqVo();
         iotDeviceBaseFunReqVo.setDevBid(reqVo.getDevBid());
-        iotDeviceBaseFunReqVo.setMethodName("getAlreadyElementList");
+        iotDeviceBaseFunReqVo.setMethodName("getPumpAlreadyElementList");
         iotDeviceBaseFunReqVo.setParam(reqVo);
         return iotDeviceCommonService.func(iotDeviceBaseFunReqVo);
     }
 
     /**
-     * 获取未处理的元素列表
+     * 获取泵类未处理的元素列表
      * 该接口用于根据请求参数获取未处理的元素列表，并返回相关数据。
      *
      * @param reqVo 请求参数，包含设备标识（devBid）等信息
      * @return TableDataInfo 包含未处理的元素列表的数据封装对象
      * @throws IllegalArgumentException 如果devBid为空，则抛出非法参数异常
      */
-    @GetMapping("/ele/unalready/List")
-    public TableDataInfo getUnAlreadyElementList(IotSfElementfactorListReqVo reqVo){
+    @GetMapping("/pump/unalready/list")
+    public TableDataInfo getPumpUnAlreadyElementList(IotSfElementfactorListReqVo reqVo){
         ValidateUtil.validateDevBid(reqVo.getDevBid());
         IotDeviceBaseFunReqVo iotDeviceBaseFunReqVo = new IotDeviceBaseFunReqVo();
         iotDeviceBaseFunReqVo.setDevBid(reqVo.getDevBid());
-        iotDeviceBaseFunReqVo.setMethodName("getUnAlreadyElementList");
+        iotDeviceBaseFunReqVo.setMethodName("getPumpUnAlreadyElementList");
         iotDeviceBaseFunReqVo.setParam(reqVo);
         return iotDeviceCommonService.func(iotDeviceBaseFunReqVo);
     }
+
+    /**
+     * 新增泵类要素
+     * 该接口用于添加新的泵类要素，接收相关参数并调用通用设备功能服务进行处理。
+     *
+     * @param reqVo 包含设备添加请求的参数，包括设备标识（devBid）等
+     * @return 返回操作结果的表格数据信息
+     * @throws ValidateException 如果设备标识（devBid）无效，则抛出ValidateException异常
+     */
+    @Transactional(rollbackFor = Exception.class)
+    @PostMapping("/pump/add")
+    public AjaxResult pumpAdd(@RequestBody IotSfElementfactorAddReqVo reqVo){
+        ValidateUtil.validateDevBid(reqVo.getDevBid());
+        IotDeviceBaseFunReqVo iotDeviceBaseFunReqVo = new IotDeviceBaseFunReqVo();
+        iotDeviceBaseFunReqVo.setDevBid(reqVo.getDevBid());
+        iotDeviceBaseFunReqVo.setMethodName("pumpAdd");
+        iotDeviceBaseFunReqVo.setParam(reqVo);
+        int status = iotDeviceCommonService.func(iotDeviceBaseFunReqVo);
+        return toAjax(status);
+    }
+
+
+    /**
+     * 删除要素接口
+     * 根据传入的要素标识删除对应的要素信息
+     *
+     * @param sfBid 要素标识，用于唯一确定要删除的要素
+     * @return AjaxResult 操作结果，包含状态码和消息
+     * @throws IotBizException 如果要素标识为空，则抛出IotBizException异常
+     */
+    @Transactional(rollbackFor = Exception.class)
+    @DeleteMapping("/ele/delete/{sfBid}")
+    public AjaxResult elementDelete(@PathVariable String sfBid){
+        if(StringUtils.isEmpty(sfBid)){
+            throw new IotBizException(IotErrorCode.PARAM_INVALID.getCode(), "要素标识不能为空");
+        }
+        int status = iotSfElementfactorService.deleteIotSfElementfactorBySfBid(sfBid);
+        return toAjax(status);
+    }
 }

src/main/java/com/yunfeiyun/agmp/iotm/device/sf/domain/IotSfElementfactorAddReqVo.java

@@ -0,0 +1,58 @@
+package com.yunfeiyun.agmp.iotm.device.sf.domain;
+
+import com.yunfeiyun.agmp.iot.common.domain.IotBaseEntity;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 水肥机要素
+ */
+@Data
+public class IotSfElementfactorAddReqVo extends IotBaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /** 自增主键 */
+    private Long id;
+
+    /** 业务标识 */
+    private String sfBid;
+
+    /** 设备编号 */
+    private String devBid;
+
+    /** 水肥要素类型 */
+    private String sfType;
+
+    /** 原始名称 */
+    private String sfName;
+
+    /** 显示名称 */
+    private String sfDisplayname;
+
+    /** 要素编码 */
+    private String sfCode;
+
+    /** 父类id */
+    private String sfParentBid;
+
+    /** 排序字段 默认0 */
+    private int sfSequence;
+
+    /** 租户ID */
+    private String tid;
+
+    /** 创建时间 */
+    private String sfCreatedDate;
+
+    /** 创建人 */
+    private String sfCreator;
+
+    /** 修改时间 */
+    private String sfModifieddate;
+    /** 修改人 */
+    private String sfModifier;
+
+    private List<IotSfElementfactorAddReqVo> childrenList;
+
+}

src/main/java/com/yunfeiyun/agmp/iotm/device/sf/domain/IotSfElementfactorListReqVo.java

@@ -2,6 +2,8 @@ package com.yunfeiyun.agmp.iotm.device.sf.domain;
 
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * 水肥机要素
  */
@@ -50,4 +52,6 @@ public class IotSfElementfactorListReqVo {
     /** 修改人 */
     private String sfModifier;
 
+    private List<String> sfTypeList;
+
 }

src/main/java/com/yunfeiyun/agmp/iotm/device/sf/service/IIotSfCommService.java

@@ -2,22 +2,27 @@ package com.yunfeiyun.agmp.iotm.device.sf.service;
 
 import com.yunfeiyun.agmp.common.constant.ErrorCode;
 import com.yunfeiyun.agmp.common.core.page.TableDataInfo;
+import com.yunfeiyun.agmp.common.utils.DateUtils;
+import com.yunfeiyun.agmp.common.utils.SecurityUtils;
 import com.yunfeiyun.agmp.common.utils.StringUtils;
 import com.yunfeiyun.agmp.iot.common.constant.IotErrorCode;
 import com.yunfeiyun.agmp.iot.common.constant.devicetype.IotDeviceDictConst;
 import com.yunfeiyun.agmp.iot.common.domain.IotDevice;
 import com.yunfeiyun.agmp.iot.common.domain.IotRunHaoSfdata;
+import com.yunfeiyun.agmp.iot.common.domain.IotSfElementfactor;
+import com.yunfeiyun.agmp.iot.common.enums.EnumSfElementType;
 import com.yunfeiyun.agmp.iot.common.exception.IotBizException;
 import com.yunfeiyun.agmp.iotm.device.common.service.IotDeviceBaseService;
 import com.yunfeiyun.agmp.iotm.device.common.service.impl.IotDeviceBaseServiceImpl;
+import com.yunfeiyun.agmp.iotm.device.sf.domain.IotSfElementfactorAddReqVo;
 import com.yunfeiyun.agmp.iotm.device.sf.domain.IotSfElementfactorAlreadyListResVo;
 import com.yunfeiyun.agmp.iotm.device.sf.domain.IotSfElementfactorListReqVo;
 import com.yunfeiyun.agmp.iotm.web.service.IIotDeviceService;
 import com.yunfeiyun.agmp.iotm.web.service.IIotSfElementfactorService;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.util.*;
 
 /**
  * 水肥机通用服务
@@ -40,13 +45,13 @@ public class IIotSfCommService extends IotDeviceBaseServiceImpl implements IotDe
     }
 
     /**
-     * 获取已存在的元素列表
+     * 获取泵类设备已存在的元素列表
      *
      * @param reqVo 请求对象，包含设备标识等信息
      * @return TableDataInfo 包含响应码、消息、数据和总数
      * @throws IotBizException 抛出业务异常，包含错误码和错误信息
      */
-    public TableDataInfo getAlreadyElementList(IotSfElementfactorListReqVo reqVo) {
+    public TableDataInfo getPumpAlreadyElementList(IotSfElementfactorListReqVo reqVo) {
         TableDataInfo rspData = new TableDataInfo();
         rspData.setCode(ErrorCode.SUCCESS.getCode());
         rspData.setMsg(ErrorCode.SUCCESS.getMessage());
@@ -63,8 +68,8 @@ public class IIotSfCommService extends IotDeviceBaseServiceImpl implements IotDe
             throw new IotBizException(IotErrorCode.INVALID_DEVICE_ID.getCode(), "设备不存在");
         }
 
-        List<IotSfElementfactorAlreadyListResVo> resVoList = iotSfElementfactorService.getAlreadyElementList(reqVo);
-        if (resVoList != null && resVoList.size() > 0){
+        List<IotSfElementfactorAlreadyListResVo> resVoList = iotSfElementfactorService.getPumpAlreadyElementList(reqVo);
+        if (resVoList != null && !resVoList.isEmpty()){
             rspData.setData(resVoList);
             rspData.setTotal(resVoList.size());
         }
@@ -72,15 +77,100 @@ public class IIotSfCommService extends IotDeviceBaseServiceImpl implements IotDe
     }
 
     /**
-     * 获取未处理的元素列表
+     * 获取泵类未处理的元素列表
      * 该接口用于根据请求参数获取未处理的元素列表，并返回相关数据。
      *
      * @param reqVo 请求参数，包含设备标识（devBid）等信息
      * @return TableDataInfo 包含未处理的元素列表的数据封装对象
      * @throws IllegalArgumentException 如果devBid为空，则抛出非法参数异常
      */
-    public TableDataInfo getUnAlreadyElementList(IotSfElementfactorListReqVo reqVo) {
+    public TableDataInfo getPumpUnAlreadyElementList(IotSfElementfactorListReqVo reqVo) {
         // 由具体子类实现
         return null;
     }
+
+    private IotSfElementfactor makeIotSfElementfactor(IotSfElementfactorAddReqVo reqVo, String date){
+        String tid = SecurityUtils.getTid();
+        String userId = SecurityUtils.getUserId();
+
+        IotSfElementfactor elementfactor = new IotSfElementfactor();
+        String sfBid = elementfactor.getUUId();
+        BeanUtils.copyProperties(reqVo, elementfactor);
+        elementfactor.setSfBid(sfBid);
+        elementfactor.setTid(tid);
+        elementfactor.setSfCreatedDate(date);
+        elementfactor.setSfCreator(userId);
+        elementfactor.setSfModifieddate(date);
+        elementfactor.setSfModifier(userId);
+        return elementfactor;
+    }
+
+    /**
+     * 新增泵类要素
+     * 该接口用于添加新的泵类要素，接收相关参数并调用通用设备功能服务进行处理。
+     *
+     * @param reqVo 包含设备添加请求的参数，包括设备标识（devBid）等
+     */
+    public int pumpAdd(IotSfElementfactorAddReqVo reqVo) {
+        String devBid = reqVo.getDevBid();
+        if (StringUtils.isEmpty(devBid)) {
+            throw new IotBizException(IotErrorCode.INVALID_DEVICE_ID.getCode(), "设备标识不能为空");
+        }
+
+        IotDevice findDevice = iotDeviceService.selectIotDeviceByDevBid(reqVo.getDevBid());
+        if (findDevice == null) {
+            throw new IotBizException(IotErrorCode.INVALID_DEVICE_ID.getCode(), "设备不存在");
+        }
+        String sfType = reqVo.getSfType();
+        String sfCode = reqVo.getSfCode();
+        // 肥料桶是虚拟的，不需要检测code重复问题
+        if(!Objects.equals(sfType, EnumSfElementType.FERTILIZER_BUCKET.getCode())){
+            if (StringUtils.isEmpty(sfCode)) {
+                throw new IotBizException(IotErrorCode.INVALID_DEVICE_ID.getCode(), "要素编码不能为空");
+            }
+        }
+        String sfDisplayname = reqVo.getSfDisplayname();
+        if (StringUtils.isEmpty(sfType)) {
+            throw new IotBizException(IotErrorCode.INVALID_DEVICE_ID.getCode(), "要素类型不能为空");
+        }
+
+        if (StringUtils.isEmpty(sfDisplayname)) {
+            throw new IotBizException(IotErrorCode.INVALID_DEVICE_ID.getCode(), "要素名称不能为空");
+        }
+
+        IotSfElementfactorListReqVo reqVo1 = new IotSfElementfactorListReqVo();
+        reqVo1.setDevBid(devBid);
+        List<IotSfElementfactor> elementList = iotSfElementfactorService.selectIotSfElementfactorListByPump(reqVo1);
+        Set<String> sfCodeSet = new HashSet<>();
+        for (IotSfElementfactor element : elementList) {
+            if(StringUtils.isNotEmpty(element.getSfCode())){
+                sfCodeSet.add(element.getSfCode());
+            }
+        }
+
+        String createDate = DateUtils.dateTimeNow();
+        List<IotSfElementfactor> sfElementfactorList = new ArrayList<>();
+
+        IotSfElementfactor elementfactor = makeIotSfElementfactor(reqVo, createDate);
+        sfElementfactorList.add(elementfactor);
+
+        List<IotSfElementfactorAddReqVo> childrenList = reqVo.getChildrenList();
+        if (childrenList!= null &&!childrenList.isEmpty()){
+            for (IotSfElementfactorAddReqVo child : childrenList) {
+                child.setDevBid(devBid);
+                IotSfElementfactor childElementfactor = makeIotSfElementfactor(child, createDate);
+                childElementfactor.setSfParentBid(elementfactor.getSfBid());
+                sfElementfactorList.add(childElementfactor);
+            }
+        }
+
+        for(IotSfElementfactor element : sfElementfactorList){
+            if(sfCodeSet.contains(element.getSfCode())){
+                throw new IotBizException(IotErrorCode.INVALID_DEVICE_ID.getCode(), "要素编码重复");
+            }
+        }
+
+        return iotSfElementfactorService.batchInsertIotSfElementfactor(sfElementfactorList);
+    }
+
 }

src/main/java/com/yunfeiyun/agmp/iotm/device/sf/service/impl/IotRunHaoSfServiceImpl.java

@@ -9,6 +9,7 @@ import com.yunfeiyun.agmp.iot.common.constant.devicetype.ServiceNameConst;
 import com.yunfeiyun.agmp.iot.common.domain.IotDevice;
 import com.yunfeiyun.agmp.iot.common.domain.IotRunHaoSfdata;
 import com.yunfeiyun.agmp.iot.common.domain.IotSfElementfactor;
+import com.yunfeiyun.agmp.iot.common.enums.EnumSfElementType;
 import com.yunfeiyun.agmp.iot.common.exception.IotBizException;
 import com.yunfeiyun.agmp.iot.common.service.MongoService;
 import com.yunfeiyun.agmp.iot.common.util.dev.RunHaoSfElementUtil;
@@ -42,14 +43,14 @@ public class IotRunHaoSfServiceImpl extends IIotSfCommService {
     private MongoService mongoService;
 
     /**
-     * 获取未处理的元素列表
+     * 获取泵类未处理的元素列表
      * 该接口用于根据请求参数获取未处理的元素列表，并返回相关数据。
      *
      * @param reqVo 请求参数，包含设备标识（devBid）等信息
      * @return TableDataInfo 包含未处理的元素列表的数据封装对象
      * @throws IllegalArgumentException 如果devBid为空，则抛出非法参数异常
      */
-    public TableDataInfo getUnAlreadyElementList(IotSfElementfactorListReqVo reqVo) {
+    public TableDataInfo getPumpUnAlreadyElementList(IotSfElementfactorListReqVo reqVo) {
         TableDataInfo rspData = new TableDataInfo();
         rspData.setCode(ErrorCode.SUCCESS.getCode());
         rspData.setMsg(ErrorCode.SUCCESS.getMessage());
@@ -66,6 +67,13 @@ public class IotRunHaoSfServiceImpl extends IIotSfCommService {
             throw new IotBizException(IotErrorCode.INVALID_DEVICE_ID.getCode(), "设备不存在");
         }
 
+        List<String> sfTypeList = new ArrayList<>();
+        sfTypeList.add(EnumSfElementType.WATER_SOURCE.getCode());
+        sfTypeList.add(EnumSfElementType.FERTILIZER.getCode());
+        sfTypeList.add(EnumSfElementType.SUCTION.getCode());
+        sfTypeList.add(EnumSfElementType.MIXING.getCode());
+        reqVo.setSfTypeList(sfTypeList);
+
         List<IotSfElementfactor> elementfactorList = iotSfElementfactorService.selectIotSfElementfactorList(reqVo);
         Set<String> sfCodeSet = new java.util.HashSet<>();
         for (IotSfElementfactor elementfactor : elementfactorList) {
@@ -83,7 +91,7 @@ public class IotRunHaoSfServiceImpl extends IIotSfCommService {
                 if(sfCodeSet.contains(key)){
                     continue;
                 }
-                IotSfElementfactor elementFactor = RunHaoSfElementUtil.getSfElementfactor(key);
+                IotSfElementfactor elementFactor = RunHaoSfElementUtil.getPumpElementFactor(key);
                 if(elementFactor == null){
                     continue;
                 }

src/main/java/com/yunfeiyun/agmp/iotm/web/mapper/IotSfElementfactorMapper.java

@@ -19,4 +19,21 @@ public interface IotSfElementfactorMapper {
      */
     public List<IotSfElementfactor> selectIotSfElementfactorList(IotSfElementfactorListReqVo reqVo);
 
+    /**
+     * 批量插入水肥机要素
+     *
+     * @param factorList 水肥机要素列表
+     * @return 结果
+     */
+    public int batchInsertIotSfElementfactor(List<IotSfElementfactor> factorList);
+
+
+    /**
+     * 删除水肥机要素
+     *
+     * @param sfBid 水肥机要素ID
+     * @return 结果
+     */
+    public int deleteIotSfElementfactorBySfBid(String sfBid);
+
 }

src/main/java/com/yunfeiyun/agmp/iotm/web/service/IIotSfElementfactorService.java

@@ -19,11 +19,51 @@ public interface IIotSfElementfactorService {
     public List<IotSfElementfactor> selectIotSfElementfactorList(IotSfElementfactorListReqVo reqVo);
 
     /**
+     * 查询泵类已配置原始要素列表
+     * @param reqVo
+     * @return
+     */
+
+    public List<IotSfElementfactor> selectIotSfElementfactorListByPump(IotSfElementfactorListReqVo reqVo);
+
+    /**
+     * 批量插入水肥机要素
+     *
+     * @param factorList 水肥机要素列表
+     * @return 结果
+     */
+    public int batchInsertIotSfElementfactor(List<IotSfElementfactor> factorList);
+
+    /**
+     * 删除水肥机要素
+     *
+     * @param sfBid 水肥机要素ID
+     * @return 结果
+     */
+    public int deleteIotSfElementfactorBySfBid(String sfBid);
+
+//    /**
+//     * 查询已配置要素列表
+//     * @param reqVo
+//     * @return
+//     */
+//
+//    public List<IotSfElementfactorAlreadyListResVo> getAlreadyElementList(IotSfElementfactorListReqVo reqVo);
+
+    /**
      * 查询已配置要素列表
      * @param reqVo
      * @return
      */
 
-    public List<IotSfElementfactorAlreadyListResVo> getAlreadyElementList(IotSfElementfactorListReqVo reqVo);
+    public List<IotSfElementfactorAlreadyListResVo> getAlreadyElementList(List<IotSfElementfactor> factorList);
+
+    /**
+     * 查询泵类已配置要素列表
+     * @param reqVo
+     * @return
+     */
+
+    public List<IotSfElementfactorAlreadyListResVo> getPumpAlreadyElementList(IotSfElementfactorListReqVo reqVo);
 }
 

src/main/java/com/yunfeiyun/agmp/iotm/web/service/impl/IotSfElementfactorServiceImpl.java

@@ -2,12 +2,14 @@ package com.yunfeiyun.agmp.iotm.web.service.impl;
 
 import com.yunfeiyun.agmp.common.utils.SecurityUtils;
 import com.yunfeiyun.agmp.iot.common.domain.IotSfElementfactor;
+import com.yunfeiyun.agmp.iot.common.enums.EnumSfElementType;
 import com.yunfeiyun.agmp.iotm.device.sf.domain.IotSfElementfactorAlreadyListResVo;
 import com.yunfeiyun.agmp.iotm.device.sf.domain.IotSfElementfactorListReqVo;
 import com.yunfeiyun.agmp.iotm.web.mapper.IotSfElementfactorMapper;
 import com.yunfeiyun.agmp.iotm.web.service.IIotSfElementfactorService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
@@ -15,9 +17,11 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
-@Service
+
 @Slf4j
+@Service
 public class IotSfElementfactorServiceImpl implements IIotSfElementfactorService {
+    @Autowired
     private IotSfElementfactorMapper iotSfElementfactorMapper;
     /**
      * 查询水肥机要素列表
@@ -31,17 +35,66 @@ public class IotSfElementfactorServiceImpl implements IIotSfElementfactorService
         return iotSfElementfactorMapper.selectIotSfElementfactorList(reqVo);
     }
 
+
+    /**
+     * 批量插入水肥机要素
+     *
+     * @param factorList 水肥机要素列表
+     * @return 结果
+     */
+    @Override
+    public int batchInsertIotSfElementfactor(List<IotSfElementfactor> factorList) {
+        return iotSfElementfactorMapper.batchInsertIotSfElementfactor(factorList);
+    }
+
+    /**
+     * 删除水肥机要素
+     *
+     * @param sfBid 水肥机要素ID
+     * @return 结果
+     */
+    @Override
+    public int deleteIotSfElementfactorBySfBid(String sfBid) {
+        return iotSfElementfactorMapper.deleteIotSfElementfactorBySfBid(sfBid);
+    }
+
+//    /**
+//     * 查询已配置要素列表
+//     *
+//     * @param reqVo
+//     * @return
+//     */
+//    @Override
+//    public List<IotSfElementfactorAlreadyListResVo> getAlreadyElementList(IotSfElementfactorListReqVo reqVo) {
+//        List<IotSfElementfactor> elementfactorList = selectIotSfElementfactorList(reqVo);
+//        Map<String, IotSfElementfactorAlreadyListResVo> eleMap = new LinkedHashMap<>();
+//        for (IotSfElementfactor elementfactor : elementfactorList) {
+//            String sfBid = elementfactor.getSfBid();
+//            String sfParentBid = elementfactor.getSfParentBid();
+//
+//            IotSfElementfactorAlreadyListResVo eleResVo = new IotSfElementfactorAlreadyListResVo();
+//            BeanUtils.copyProperties(elementfactor, eleResVo);
+//
+//            IotSfElementfactorAlreadyListResVo parentInfo = eleMap.get(sfParentBid);
+//            if(parentInfo == null){
+//                eleResVo.setChildrenList(new ArrayList<>());
+//                eleMap.put(sfBid, eleResVo);
+//            }else{
+//                parentInfo.getChildrenList().add(eleResVo);
+//            }
+//        }
+//        return new ArrayList<>(eleMap.values());
+//    }
+
     /**
      * 查询已配置要素列表
      *
-     * @param reqVo
-     * @return
+     * @param factorList@return
      */
     @Override
-    public List<IotSfElementfactorAlreadyListResVo> getAlreadyElementList(IotSfElementfactorListReqVo reqVo) {
-        List<IotSfElementfactor> elementfactorList = iotSfElementfactorMapper.selectIotSfElementfactorList(reqVo);
+    public List<IotSfElementfactorAlreadyListResVo> getAlreadyElementList(List<IotSfElementfactor> factorList) {
         Map<String, IotSfElementfactorAlreadyListResVo> eleMap = new LinkedHashMap<>();
-        for (IotSfElementfactor elementfactor : elementfactorList) {
+        for (IotSfElementfactor elementfactor : factorList) {
             String sfBid = elementfactor.getSfBid();
             String sfParentBid = elementfactor.getSfParentBid();
 
@@ -58,4 +111,34 @@ public class IotSfElementfactorServiceImpl implements IIotSfElementfactorService
         }
         return new ArrayList<>(eleMap.values());
     }
+
+    /**
+     * 查询泵类已配置原始要素列表
+     *
+     * @param reqVo
+     * @return
+     */
+    @Override
+    public List<IotSfElementfactor> selectIotSfElementfactorListByPump(IotSfElementfactorListReqVo reqVo) {
+        List<String> sfTypeList = new ArrayList<>();
+        sfTypeList.add(EnumSfElementType.WATER_SOURCE.getCode());
+        sfTypeList.add(EnumSfElementType.FERTILIZER.getCode());
+        sfTypeList.add(EnumSfElementType.SUCTION.getCode());
+        sfTypeList.add(EnumSfElementType.MIXING.getCode());
+        sfTypeList.add(EnumSfElementType.FERTILIZER_BUCKET.getCode());
+        reqVo.setSfTypeList(sfTypeList);
+        return selectIotSfElementfactorList(reqVo);
+    }
+
+    /**
+     * 查询泵类已配置要素列表
+     *
+     * @param reqVo
+     * @return
+     */
+    @Override
+    public List<IotSfElementfactorAlreadyListResVo> getPumpAlreadyElementList(IotSfElementfactorListReqVo reqVo) {
+        List<IotSfElementfactor> elementfactorList = selectIotSfElementfactorListByPump(reqVo);
+        return getAlreadyElementList(elementfactorList);
+    }
 }

src/main/resources/mapper/IotSfElementfactorMapper.xml

@@ -32,4 +32,18 @@
         </where>
     </select>
 
+    <insert id="batchInsertIotSfElementfactor" parameterType="IotSfElementfactor">
+        INSERT INTO IotSfElementfactor (id, sfBid, devBid, sfType, sfCode, sfName, sfDisplayname, sfParentBid, sfSequence,
+            tid, sfCreatedDate, sfCreator, sfModifieddate, sfModifier)
+        VALUES
+        <foreach collection="list" item="item" index="index" separator=",">
+            (#{item.id}, #{item.sfBid}, #{item.devBid}, #{item.sfType}, #{item.sfCode}, #{item.sfName}, #{item.sfDisplayname}, #{item.sfParentBid}, #{item.sfSequence},
+            #{item.tid}, #{item.sfCreatedDate}, #{item.sfCreator}, #{item.sfModifieddate}, #{item.sfModifier})
+        </foreach>
+    </insert>
+
+    <delete id="deleteIotSfElementfactorBySfBid" parameterType="string">
+        DELETE FROM IotSfElementfactor WHERE sfBid = #{sfBid} OR sfParentBid = #{sfBid}
+    </delete>
+
 </mapper>