新增 农事功能

src/main/java/com/yunfeiyun/agmp/fms/controller/FmsTaskController.java

@@ -431,7 +431,7 @@ public class FmsTaskController extends BaseController
         AddFmsTaskRecordReqVo addFmsTaskRecordReqVo = new AddFmsTaskRecordReqVo();
         FmsTask fmsTask = fmsTaskService.selectFmsTaskByTaskId(taskId,SecurityUtils.getTid());
         BeanUtil.copyProperties(fmsTask,addFmsTaskRecordReqVo,CopyOptions.create().ignoreNullValue());
-        FmsTaskrcdInfoResVo fmsTaskrcdInfoResVo = fmsTaskrcdService.selectFmsTaskrcdByTaskId(taskId,SecurityUtils.getTid());
+        FmsTaskrcdInfoResVo fmsTaskrcdInfoResVo = fmsTaskrcdService.getFmsTaskrcdByTaskId(taskId,SecurityUtils.getTid());
         BeanUtil.copyProperties(fmsTaskrcdInfoResVo,addFmsTaskRecordReqVo, CopyOptions.create().ignoreNullValue());
 
 

src/main/java/com/yunfeiyun/agmp/fms/controller/FmsTaskrcdController.java

@@ -14,14 +14,14 @@ import com.yunfeiyun.agmp.common.web.system.domain.SysRes;
 import com.yunfeiyun.agmp.fms.domain.FmsTaskrcd;
 import com.yunfeiyun.agmp.fms.domain.reqvo.FmsTaskrcdAuditReqVo;
 import com.yunfeiyun.agmp.fms.domain.reqvo.FmsTaskrcdListReqVo;
-import com.yunfeiyun.agmp.fms.domain.resvo.FmsTaskrcdInfoResVo;
-import com.yunfeiyun.agmp.fms.util.DataAuthUtil;
 import com.yunfeiyun.agmp.fms.domain.vo.FmsTaskrcdVo;
 import com.yunfeiyun.agmp.fms.service.IFmsTaskrcdService;
+import com.yunfeiyun.agmp.fms.util.DataAuthUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
+
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
@@ -93,7 +93,7 @@ public class FmsTaskrcdController extends BaseController
     @PreAuthorize("@ss.hasPermi('fms:taskrcd:task:info')")
     @GetMapping(value = "/task/info")
     public AjaxResult getInfoByTaskId(@RequestParam("taskId") String taskId) {
-        return success(fmsTaskrcdService.selectFmsTaskrcdByTaskId(taskId, SecurityUtils.getTid()));
+        return success(fmsTaskrcdService.getFmsTaskrcdByTaskId(taskId, SecurityUtils.getTid()));
     }
 
     /**

src/main/java/com/yunfeiyun/agmp/fms/scheduler/FmsWarnScheduler.java

@@ -6,7 +6,7 @@ import com.yunfeiyun.agmp.fms.domain.FmsWarn;
 import com.yunfeiyun.agmp.fms.domain.dto.FmsPlanByWarnSchedulerDto;
 import com.yunfeiyun.agmp.fms.domain.dto.FmsWarnBySchedulerDto;
 import com.yunfeiyun.agmp.fms.mapper.FmsPlanMapper;
-import com.yunfeiyun.agmp.fms.mapper.FmsWarnMapper;
+import com.yunfeiyun.agmp.fms.service.IFmsWarnService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;
@@ -19,8 +19,9 @@ import java.util.*;
 @Slf4j
 @Component
 public class FmsWarnScheduler {
+
     @Autowired
-    private FmsWarnMapper fmsWarnMapper;
+    private IFmsWarnService fmsWarnService;
 
     @Autowired
     private FmsPlanMapper fmsPlanMapper;
@@ -29,9 +30,9 @@ public class FmsWarnScheduler {
 
     @Transactional(rollbackFor = Exception.class)
     private void warnCreate(List<FmsWarn> fmsWarnList){
-        if (fmsWarnList.size() > 0){
+        if (!fmsWarnList.isEmpty()){
 
-            this.fmsWarnMapper.insertFmsWarnBatch(fmsWarnList);
+            this.fmsWarnService.insertFmsWarnBatch(fmsWarnList);
         }
 //        for(FmsWarn fmsWarn: fmsWarnList){
 //            MsgbatchContent msgbatchContent = new MsgbatchContent(fmsWarn.getWarnContent());
@@ -48,7 +49,7 @@ public class FmsWarnScheduler {
         log.info("创建农事预警定时任务开始");
 
         Set<String> warnKeySet = new HashSet<>();
-        List<FmsWarnBySchedulerDto> fmsWarnListBySchedulerDtos = this.fmsWarnMapper.selectFmsWarnListByScheduler();
+        List<FmsWarnBySchedulerDto> fmsWarnListBySchedulerDtos = this.fmsWarnService.selectFmsWarnListByScheduler();
         for (FmsWarnBySchedulerDto fmsWarnListBySchedulerDto: fmsWarnListBySchedulerDtos){
             System.out.println(fmsWarnListBySchedulerDto);
             if (ObjectUtils.isEmpty(fmsWarnListBySchedulerDto)){

src/main/java/com/yunfeiyun/agmp/fms/service/IFmsTaskrcdService.java

@@ -1,6 +1,7 @@
 package com.yunfeiyun.agmp.fms.service;
 
 import com.yunfeiyun.agmp.fms.domain.FmsTaskrcd;
+import com.yunfeiyun.agmp.fms.domain.dto.FmsTaskrcdListDto;
 import com.yunfeiyun.agmp.fms.domain.reqvo.FmsTaskrcdAuditReqVo;
 import com.yunfeiyun.agmp.fms.domain.reqvo.FmsTaskrcdListReqVo;
 import com.yunfeiyun.agmp.fms.domain.resvo.FmsTaskrcdByTaskrcdIdResVo;
@@ -40,7 +41,15 @@ public interface IFmsTaskrcdService
      * @param taskId 农事任务主键
      * @return 农事任务提交记录
      */
-    public FmsTaskrcdInfoResVo selectFmsTaskrcdByTaskId(String taskId, String tid);
+    public List<FmsTaskrcdListDto> selectFmsTaskrcdByTaskId(String taskId, String tid);
+
+    /**
+     * 根据任务ID查询农事任务提交记录
+     *
+     * @param taskId 农事任务主键
+     * @return 农事任务提交记录
+     */
+    public FmsTaskrcdInfoResVo getFmsTaskrcdByTaskId(String taskId, String tid);
 
     /**
      * 查询农事任务提交记录列表
@@ -90,4 +99,14 @@ public interface IFmsTaskrcdService
     public int audit(FmsTaskrcdAuditReqVo fmsTaskrcdAuditReqVo) throws Exception;
 
     List<FmsTaskrcdVo> selectFmsPlanTaskrcdList(FmsTaskrcdListReqVo fmsTaskrcdListReqVo);
+
+    public List<FmsTaskrcdListDto> selectTaskrcdList(FmsTaskrcdListReqVo fmsTaskrcdListReqVo);
+
+    /**
+     * 新增农事任务提交记录
+     *
+     * @param fmsTaskrcd 农事任务提交记录
+     * @return 结果
+     */
+    public int insertFmsTaskrcd(FmsTaskrcd fmsTaskrcd);
 }

src/main/java/com/yunfeiyun/agmp/fms/service/IFmsWarnService.java

@@ -2,6 +2,7 @@ package com.yunfeiyun.agmp.fms.service;
 
 import com.yunfeiyun.agmp.fms.domain.FmsTask;
 import com.yunfeiyun.agmp.fms.domain.FmsWarn;
+import com.yunfeiyun.agmp.fms.domain.dto.FmsWarnBySchedulerDto;
 import com.yunfeiyun.agmp.fms.domain.reqvo.FmsWarnReqVo;
 import com.yunfeiyun.agmp.fms.domain.reqvo.FmsWarnStatusReqVo;
 import com.yunfeiyun.agmp.fms.domain.resvo.FmsMessageResVo;
@@ -80,4 +81,29 @@ public interface IFmsWarnService
     public void appendWarnMessage(Map<String, FmsMessageResVo> fmsMessageResVoMap );
 
     List<FmsWarnExcelVo> selectFmsWarnExcelVoList(FmsWarnReqVo fmsWarnReqVo);
+
+    /**
+     * 新增预警
+     *
+     * @param fmsWarn 预警
+     * @return 结果
+     */
+    public int insertFmsWarn(FmsWarn fmsWarn);
+
+    /**
+     * 批量新增预警
+     *
+     * @param fmsWarn 预警
+     * @return 结果
+     */
+    public int insertFmsWarnBatch(List<FmsWarn> fmsWarn);
+
+    /**
+     * 查询预警列表
+     *
+     * @return 预警集合
+     */
+    public List<FmsWarnBySchedulerDto> selectFmsWarnListByScheduler();
+
+    public List<FmsWarnResVo> selectFmsWarnResVoByBlockManager(FmsWarnResVo fmsWarnResVo);
 }

src/main/java/com/yunfeiyun/agmp/fms/service/impl/FmsTaskServiceImpl.java

@@ -2,7 +2,6 @@ package com.yunfeiyun.agmp.fms.service.impl;
 
 import com.yunfeiyun.agmp.common.constant.ErrorCode;
 import com.yunfeiyun.agmp.common.constant.ResConstants;
-import com.yunfeiyun.agmp.common.core.domain.AjaxResult;
 import com.yunfeiyun.agmp.common.core.domain.entity.SysUser;
 import com.yunfeiyun.agmp.common.enums.CommonEnums;
 import com.yunfeiyun.agmp.common.enums.FmsMessageResVoType;
@@ -18,22 +17,23 @@ import com.yunfeiyun.agmp.common.web.system.mapper.SysUserMapper;
 import com.yunfeiyun.agmp.fms.domain.*;
 import com.yunfeiyun.agmp.fms.domain.dto.FmsTaskrcdListDto;
 import com.yunfeiyun.agmp.fms.domain.reqvo.AddFmsTaskRecordReqVo;
-import com.yunfeiyun.agmp.fms.domain.resvo.*;
-import com.yunfeiyun.agmp.fms.domain.vo.FmsTaskExcelVo;
-import com.yunfeiyun.agmp.fms.mapper.*;
-import com.yunfeiyun.agmp.fms.util.DataAuthUtil;
 import com.yunfeiyun.agmp.fms.domain.reqvo.FmsTaskListReqVo;
 import com.yunfeiyun.agmp.fms.domain.reqvo.FmsTaskStopReqVo;
 import com.yunfeiyun.agmp.fms.domain.reqvo.SelectOfTssStatReqVo;
+import com.yunfeiyun.agmp.fms.domain.resvo.*;
+import com.yunfeiyun.agmp.fms.domain.vo.FmsTaskExcelVo;
+import com.yunfeiyun.agmp.fms.mapper.*;
 import com.yunfeiyun.agmp.fms.service.IFmsTaskService;
+import com.yunfeiyun.agmp.fms.service.IFmsTaskrcdService;
+import com.yunfeiyun.agmp.fms.service.IFmsWarnService;
+import com.yunfeiyun.agmp.fms.util.DataAuthUtil;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
-import javax.annotation.Resource;
 
-import java.lang.reflect.Array;
+import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -71,6 +71,12 @@ public class FmsTaskServiceImpl implements IFmsTaskService
     @Resource
     private ResManager resManager;
 
+    @Autowired
+    private IFmsWarnService fmsWarnService;
+
+    @Autowired
+    private IFmsTaskrcdService fmsTaskrcdService;
+
     /**
      * 查询农事任务
      * 
@@ -216,7 +222,7 @@ public class FmsTaskServiceImpl implements IFmsTaskService
         }
         if (fmsWarn != null) {
             fmsWarn.setTid(fmsTask.getLandId());
-            fmsWarnMapper.insertFmsWarn(fmsWarn);
+            fmsWarnService.insertFmsWarn(fmsWarn);
         }
 
         return i;
@@ -234,13 +240,13 @@ public class FmsTaskServiceImpl implements IFmsTaskService
         }
         if (fmsWarn != null) {
             fmsWarn.setTid(fmsTask.getLandId());
-            fmsWarnMapper.insertFmsWarn(fmsWarn);
+            fmsWarnService.insertFmsWarn(fmsWarn);
         }
         /* 增加农事提交记录，关联农资农具*/
         if (fmsTaskrcd != null) {
             fmsTaskrcd.setTid(fmsTask.getLandId());
-            fmsTaskrcdMapper.insertFmsTaskrcd(fmsTaskrcd);
-            if (fmsTaskassets != null && fmsTaskassets.size() > 0) {
+            fmsTaskrcdService.insertFmsTaskrcd(fmsTaskrcd);
+            if (fmsTaskassets != null && !fmsTaskassets.isEmpty()) {
                 fmsTaskassets.forEach(v -> {
                     v.setTaskrcdId(fmsTaskrcd.getTaskrcdId());
                     v.setTaskassetId(v.getId());
@@ -295,7 +301,7 @@ public class FmsTaskServiceImpl implements IFmsTaskService
         fmsTask.setTid(fmsTask.getLandId());
         fmsWarn.setTid(fmsTask.getLandId());
         int i = fmsTaskMapper.insertFmsTask(fmsTask);
-        fmsWarnMapper.insertFmsWarn(fmsWarn);
+        fmsWarnService.insertFmsWarn(fmsWarn);
         return i;
     }
 
@@ -333,7 +339,7 @@ public class FmsTaskServiceImpl implements IFmsTaskService
         if(null != fmsTaskpick){
             fmsTaskpickMapper.deleteFmsTaskpickByTaskpickId(fmsTaskpick.getTaskpickId(),tid);
         }
-        List<FmsTaskrcdListDto> fmsTaskrcdList = fmsTaskrcdMapper.selectFmsTaskrcdByTaskId(taskId,tid);
+        List<FmsTaskrcdListDto> fmsTaskrcdList = fmsTaskrcdService.selectFmsTaskrcdByTaskId(taskId,tid);
         if(!fmsTaskrcdList.isEmpty()){
             String[] fmsTaskRcdIds = fmsTaskrcdList.stream().map(FmsTaskrcdListDto::getTaskrcdId).toArray(String[]::new);
             List<FmsTaskAssetUsageResVo> fmsTaskassets = fmsTaskassetMapper.selectFmsTaskAssetByRcdId(fmsTaskRcdIds,tid);

src/main/java/com/yunfeiyun/agmp/fms/service/impl/FmsTaskrcdServiceImpl.java

@@ -204,13 +204,25 @@ public class FmsTaskrcdServiceImpl implements IFmsTaskrcdService
      * @return 农事任务提交记录
      */
     @Override
-    public FmsTaskrcdInfoResVo selectFmsTaskrcdByTaskId(String taskId, String tid) {
+    public List<FmsTaskrcdListDto> selectFmsTaskrcdByTaskId(String taskId, String tid) {
+        return fmsTaskrcdMapper.selectFmsTaskrcdByTaskId(taskId,tid);
+    }
+
+    /**
+     * 根据任务ID查询农事任务提交记录
+     *
+     * @param taskId 农事任务主键
+     * @param tid
+     * @return 农事任务提交记录
+     */
+    @Override
+    public FmsTaskrcdInfoResVo getFmsTaskrcdByTaskId(String taskId, String tid) {
         FmsTaskResVo fmsTaskResVo = this.fmsTaskMapper.getInfoByTaskId(taskId,tid);
         if (ObjectUtils.isEmpty(fmsTaskResVo)){
             //  农事任务不存在
             throw new BizException(ErrorCode.FMS_TASK_TASK_NO_EXIST);
         }
-        List<FmsTaskrcdListDto> taskrcdListDtos = this.fmsTaskrcdMapper.selectFmsTaskrcdByTaskId(taskId,tid);
+        List<FmsTaskrcdListDto> taskrcdListDtos = selectFmsTaskrcdByTaskId(taskId,tid);
         List<FmsTaskrcdVo> fmsTaskrcdVos = this.getFmsTaskrcdList(taskrcdListDtos);
         FmsTaskrcdInfoResVo fmsTaskrcdInfoResVo = new FmsTaskrcdInfoResVo();
         BeanUtils.copyProperties(fmsTaskResVo, fmsTaskrcdInfoResVo);
@@ -236,6 +248,7 @@ public class FmsTaskrcdServiceImpl implements IFmsTaskrcdService
      */
     @Override
     public List<FmsTaskrcdVo> selectFmsTaskrcdList(FmsTaskrcdListReqVo fmsTaskrcdListReqVo) {
+        fmsTaskrcdListReqVo.setTid(SecurityUtils.getTid());
         List<FmsTaskrcdListDto> taskrcdListDtos = fmsTaskrcdMapper.selectFmsTaskrcdListDto(fmsTaskrcdListReqVo);
         return this.getFmsTaskrcdList(taskrcdListDtos);
     }
@@ -269,7 +282,7 @@ public class FmsTaskrcdServiceImpl implements IFmsTaskrcdService
         fmsTaskrcd.setTid(fmsTask.getLandId());
         fmsTaskrcd.setTaskrcdAuditstatus(TaskrcdAuditStatus.UNAUDITED.getCode());
         fmsTaskrcd.setTaskrcdSubmitdate(DateUtils.dateTimeNow("yyyy-MM-dd HH:mm:ss").toString());
-        this.fmsTaskrcdMapper.insertFmsTaskrcd(fmsTaskrcd);
+        insertFmsTaskrcd(fmsTaskrcd);
 
         if (!TaskType.PATROL.equal(taskType)){
             ArrayList<FmsTaskmachineVo> machVos = fmsTaskrcdVo.getTaskMachines();
@@ -417,7 +430,7 @@ public class FmsTaskrcdServiceImpl implements IFmsTaskrcdService
     @Override
     @Transactional(rollbackFor = Exception.class)
     public int audit(FmsTaskrcdAuditReqVo fmsTaskrcdAuditReqVo) {
-        FmsTaskrcd fmsTaskrcd = fmsTaskrcdMapper.selectFmsTaskrcdByTaskrcdId(fmsTaskrcdAuditReqVo.getTaskrcdId(),SecurityUtils.getTid());
+        FmsTaskrcd fmsTaskrcd = selectFmsTaskrcdByTaskrcdId(fmsTaskrcdAuditReqVo.getTaskrcdId(),SecurityUtils.getTid());
         if(ObjectUtils.isEmpty(fmsTaskrcd)){
             // 农事任务提交记录不存在
             throw new BizException(ErrorCode.FMS_TASK_RCD_NO_EXIST);
@@ -568,6 +581,24 @@ public class FmsTaskrcdServiceImpl implements IFmsTaskrcdService
         return fmsTaskrcdsList;
     }
 
+    @Override
+    public List<FmsTaskrcdListDto> selectTaskrcdList(FmsTaskrcdListReqVo fmsTaskrcdListReqVo) {
+        fmsTaskrcdListReqVo.setTid(SecurityUtils.getTid());
+        return fmsTaskrcdMapper.selectTaskrcdList(fmsTaskrcdListReqVo);
+    }
+
+    /**
+     * 新增农事任务提交记录
+     *
+     * @param fmsTaskrcd 农事任务提交记录
+     * @return 结果
+     */
+    @Override
+    public int insertFmsTaskrcd(FmsTaskrcd fmsTaskrcd) {
+        fmsTaskrcd.setTid(SecurityUtils.getTid());
+        return fmsTaskrcdMapper.insertFmsTaskrcd(fmsTaskrcd);
+    }
+
     private void pickTaskAudit(FmsTaskrcd fmsTaskrcd) {
         FmsTaskpick fmsTaskpick = fmsTaskpickMapper.selectFmsTaskpickByTaskId(fmsTaskrcd.getTaskId(),SecurityUtils.getTid());
         if (ObjectUtils.isEmpty(fmsTaskpick)){

src/main/java/com/yunfeiyun/agmp/fms/service/impl/FmsWarnServiceImpl.java

@@ -1,8 +1,5 @@
 package com.yunfeiyun.agmp.fms.service.impl;
 
-import java.util.List;
-import java.util.Map;
-
 import com.yunfeiyun.agmp.common.constant.ErrorCode;
 import com.yunfeiyun.agmp.common.enums.FmsMessageResVoType;
 import com.yunfeiyun.agmp.common.enums.WarnStatus;
@@ -11,22 +8,25 @@ import com.yunfeiyun.agmp.common.utils.DateUtils;
 import com.yunfeiyun.agmp.common.utils.SecurityUtils;
 import com.yunfeiyun.agmp.fms.domain.FmsTask;
 import com.yunfeiyun.agmp.fms.domain.FmsWarn;
-import com.yunfeiyun.agmp.fms.domain.vo.FmsWarnExcelVo;
-import com.yunfeiyun.agmp.fms.mapper.FmsWarnMapper;
-import com.yunfeiyun.agmp.fms.util.DataAuthUtil;
+import com.yunfeiyun.agmp.fms.domain.dto.FmsWarnBySchedulerDto;
 import com.yunfeiyun.agmp.fms.domain.reqvo.FmsWarnReqVo;
 import com.yunfeiyun.agmp.fms.domain.reqvo.FmsWarnStatusReqVo;
 import com.yunfeiyun.agmp.fms.domain.resvo.FmsMessageResVo;
 import com.yunfeiyun.agmp.fms.domain.resvo.FmsMessageResVoItem;
 import com.yunfeiyun.agmp.fms.domain.resvo.FmsWarnResVo;
+import com.yunfeiyun.agmp.fms.domain.vo.FmsWarnExcelVo;
+import com.yunfeiyun.agmp.fms.mapper.FmsWarnMapper;
 import com.yunfeiyun.agmp.fms.service.IFmsTaskService;
 import com.yunfeiyun.agmp.fms.service.IFmsWarnService;
+import com.yunfeiyun.agmp.fms.util.DataAuthUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
 
 import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
 
 
 /**
@@ -84,6 +84,7 @@ public class FmsWarnServiceImpl implements IFmsWarnService
      */
     @Override
     public int updateFmsWarn(FmsWarn fmsWarn) {
+        fmsWarn.setTid(SecurityUtils.getTid());
         return fmsWarnMapper.updateFmsWarn(fmsWarn);
     }
 
@@ -112,7 +113,7 @@ public class FmsWarnServiceImpl implements IFmsWarnService
         fmsWarn.setWarnHandler(SecurityUtils.getLoginUser().getUserId());
         fmsWarn.setWarnHandletime(DateUtils.dateTimeNow("yyyy-MM-dd HH:mm:ss"));
 
-        return fmsWarnMapper.updateFmsWarn(fmsWarn);
+        return updateFmsWarn(fmsWarn);
     }
 
     /**
@@ -142,7 +143,7 @@ public class FmsWarnServiceImpl implements IFmsWarnService
         fmsWarn.setWarnHandler(SecurityUtils.getLoginUser().getUserId());
         fmsWarn.setWarnHandlestatus(WarnStatus.READ.getCode());
 
-        return fmsWarnMapper.updateFmsWarn(fmsWarn);
+        return updateFmsWarn(fmsWarn);
     }
 
     /**
@@ -177,7 +178,7 @@ public class FmsWarnServiceImpl implements IFmsWarnService
         if(fmsWarnResVoQuery.getDataFilter()&&fmsWarnResVoQuery.getBlockIds().isEmpty()){
             return;
         }
-        List<FmsWarnResVo> fmsWarnResVos = fmsWarnMapper.selectFmsWarnResVoByBlockManager(fmsWarnResVoQuery);
+        List<FmsWarnResVo> fmsWarnResVos = selectFmsWarnResVoByBlockManager(fmsWarnResVoQuery);
         for(FmsWarnResVo fmsWarnResVo : fmsWarnResVos){
             FmsMessageResVo fmsMessageResVo = fmsMessageResVoMap.get(FmsMessageResVoType.WARN.getType());
             FmsMessageResVoItem fmsMessageResVoItem = new FmsMessageResVoItem();
@@ -190,6 +191,49 @@ public class FmsWarnServiceImpl implements IFmsWarnService
 
     @Override
     public List<FmsWarnExcelVo> selectFmsWarnExcelVoList(FmsWarnReqVo fmsWarnReqVo) {
+        fmsWarnReqVo.setTid(SecurityUtils.getTid());
         return fmsWarnMapper.selectFmsWarnExcelVoList(fmsWarnReqVo);
     }
+
+    /**
+     * 新增预警
+     *
+     * @param fmsWarn 预警
+     * @return 结果
+     */
+    @Override
+    public int insertFmsWarn(FmsWarn fmsWarn) {
+        fmsWarn.setTid(SecurityUtils.getTid());
+        return fmsWarnMapper.insertFmsWarn(fmsWarn);
+    }
+
+    /**
+     * 批量新增预警
+     *
+     * @param fmsWarn 预警
+     * @return 结果
+     */
+    @Override
+    public int insertFmsWarnBatch(List<FmsWarn> fmsWarn) {
+        for (FmsWarn f : fmsWarn){
+            f.setTid(SecurityUtils.getTid());
+        }
+        return fmsWarnMapper.insertFmsWarnBatch(fmsWarn);
+    }
+
+    /**
+     * 查询预警列表
+     *
+     * @return 预警集合
+     */
+    @Override
+    public List<FmsWarnBySchedulerDto> selectFmsWarnListByScheduler() {
+        return fmsWarnMapper.selectFmsWarnListByScheduler();
+    }
+
+    @Override
+    public List<FmsWarnResVo> selectFmsWarnResVoByBlockManager(FmsWarnResVo fmsWarnResVo) {
+        fmsWarnResVo.setTid(SecurityUtils.getTid());
+        return fmsWarnMapper.selectFmsWarnResVoByBlockManager(fmsWarnResVo);
+    }
 }

src/main/java/com/yunfeiyun/agmp/fms/service/impl/SysCustomerServiceImpl.java

@@ -1,5 +1,6 @@
 package com.yunfeiyun.agmp.fms.service.impl;
 
+import com.yunfeiyun.agmp.common.utils.SecurityUtils;
 import com.yunfeiyun.agmp.fms.domain.SysCustomer;
 import com.yunfeiyun.agmp.fms.mapper.SysCustomerMapper;
 import com.yunfeiyun.agmp.fms.domain.resvo.SysCustomerResVo;
@@ -41,6 +42,7 @@ public class SysCustomerServiceImpl implements ISysCustomerService
      */
     @Override
     public List<SysCustomerResVo> selectSysCustomerList(SysCustomer sysCustomer) {
+        sysCustomer.setTid(SecurityUtils.getTid());
         return sysCustomerMapper.selectSysCustomerList(sysCustomer);
     }
 
@@ -52,6 +54,7 @@ public class SysCustomerServiceImpl implements ISysCustomerService
      */
     @Override
     public int insertSysCustomer(SysCustomer sysCustomer) {
+        sysCustomer.setTid(SecurityUtils.getTid());
         return sysCustomerMapper.insertSysCustomer(sysCustomer);
     }
 
@@ -63,6 +66,7 @@ public class SysCustomerServiceImpl implements ISysCustomerService
      */
     @Override
     public int updateSysCustomer(SysCustomer sysCustomer) {
+        sysCustomer.setTid(SecurityUtils.getTid());
         return sysCustomerMapper.updateSysCustomer(sysCustomer);
     }
 

src/main/resources/mapper/SysCustomerMapper.xml

@@ -9,9 +9,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectSysCustomerList" parameterType="SysCustomer" resultType="SysCustomerResVo">
-        select c.customerId, c.customerRealname, c.customerProvince, c.customerCity, c.customerArea, c.customerContactaddress, c.customerContanctway, c.customerContancts, c.customerRemark,
-        (select GROUP_CONCAT(resUrl) from SysRes r where r.resBusId = c.customerId) customerPreview,
-        (select GROUP_CONCAT(resId) from SysRes r where r.resBusId = c.customerId) resIds
+        select c.customerId, c.customerRealname, c.customerProvince, c.customerCity, c.customerArea,
+            c.customerContactaddress, c.customerContanctway, c.customerContancts, c.customerRemark,
+            (select GROUP_CONCAT(resUrl) from SysRes r where r.resBusId = c.customerId) customerPreview,
+            (select GROUP_CONCAT(resId) from SysRes r where r.resBusId = c.customerId) resIds
         from SysCustomer c
         <where>  
             <if test="customerRealname != null  and customerRealname != ''"> and customerRealname like concat('%', #{customerRealname}, '%')</if>