【CHG】修改安全工具计划变更提示

railway-admin/src/main/java/com/railway/web/controller/business/safetool/SecScheduledController.java

@@ -97,7 +97,7 @@ public class SecScheduledController extends BaseController {
     try {
       return toAjax(secScheduledService.addTools(secScheduled));
     } catch (Exception e) {
-      return toAjax(0);
+      return error(e.getMessage());
     }
 
   }

railway-business/src/main/java/com/railway/business/safetool/mapper/SecScheduledToolMapper.java

@@ -8,39 +8,42 @@ import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 /**
-* 安全计划和工具关系表
-* @author lijie
-* @date 2021/12/04
-*/
+ * 安全计划和工具关系表
+ *
+ * @author lijie
+ * @date 2021/12/04
+ */
 @Mapper
 @Repository
 public interface SecScheduledToolMapper {
 
-    /**
-    * 新增
-    */
-    int insert(SecScheduledTool secScheduledTool);
-    int check(SecScheduledTool secScheduledTool);
-    int checkdel(SecScheduledToolVo secScheduledTool);
-
-    /**
-    * 删除
-    */
-    int delete(SecScheduledToolVo secScheduledTool);
-
-    /**
-    * 更新
-    */
-    int update(SecScheduledTool secScheduledTool);
-
-    /**
-    * 获取单个
-    */
-    SecScheduledTool getInfo(@Param("id") String id);
-
-    /**
-    * 查询列表
-    */
-    Page<SecScheduledTool> getList(SecScheduledTool secScheduledTool);
+  /**
+   * 新增
+   */
+  int insert(SecScheduledTool secScheduledTool);
+
+  int check(SecScheduledTool secScheduledTool);
+
+  int checkdel(SecScheduledToolVo secScheduledTool);
+
+  /**
+   * 删除
+   */
+  int delete(SecScheduledToolVo secScheduledTool);
+
+  /**
+   * 更新
+   */
+  int update(SecScheduledTool secScheduledTool);
+
+  /**
+   * 获取单个
+   */
+  SecScheduledTool getInfo(@Param("id") String id);
+
+  /**
+   * 查询列表
+   */
+  Page<SecScheduledTool> getList(SecScheduledTool secScheduledTool);
 
 }

railway-business/src/main/java/com/railway/business/safetool/service/ISecScheduledService.java

@@ -43,5 +43,5 @@ public interface ISecScheduledService{
      int delTools(SecScheduledToolVo secScheduled) throws Exception ;
 
 
-     int addTools(SecScheduledToolVo toolsVo) ;
+     int addTools(SecScheduledToolVo toolsVo) throws Exception;
 }

railway-business/src/main/java/com/railway/business/safetool/service/impl/SecExperimentServiceImpl.java

@@ -23,7 +23,6 @@ import org.springframework.transaction.annotation.Transactional;
 * @date 2021/12/25
 */
 @Service
-@Transactional(readOnly = true)
 public class SecExperimentServiceImpl implements ISecExperimentService {
 
 	private final SecExperimentMapper secExperimentMapper;

railway-business/src/main/java/com/railway/business/safetool/service/impl/SecExperimentToolServiceImpl.java

@@ -14,7 +14,6 @@ import java.util.Date;
 * @date 2021/12/25
 */
 @Service
-@Transactional(readOnly = true)
 public class SecExperimentToolServiceImpl implements ISecExperimentToolService {
 
 	private final SecExperimentToolMapper secExperimentToolMapper;

railway-business/src/main/java/com/railway/business/safetool/service/impl/SecScheduledServiceImpl.java

@@ -1,14 +1,17 @@
 package com.railway.business.safetool.service.impl;
 
+import com.railway.business.safetool.domain.BaseSafetyTool;
 import com.railway.business.safetool.domain.SecScheduled;
 import com.railway.business.safetool.domain.SecScheduledTool;
 import com.railway.business.safetool.domain.vo.SecScheduledCountVo;
 import com.railway.business.safetool.domain.vo.SecScheduledListParmVo;
 import com.railway.business.safetool.domain.vo.SecScheduledToolListVo;
 import com.railway.business.safetool.domain.vo.SecScheduledToolVo;
+import com.railway.business.safetool.mapper.BaseSafetyToolMapper;
 import com.railway.business.safetool.mapper.SecScheduledMapper;
 import com.railway.business.safetool.mapper.SecScheduledToolMapper;
 import com.railway.business.safetool.service.ISecScheduledService;
+import com.railway.common.core.domain.entity.SysUser;
 import com.railway.common.utils.SecurityUtils;
 import com.railway.common.utils.bean.BeanUtils;
 import java.util.ArrayList;
@@ -31,11 +34,14 @@ public class SecScheduledServiceImpl implements ISecScheduledService {
 
   private final SecScheduledMapper secScheduledMapper;
   private final SecScheduledToolMapper secScheduledToolMapper;
+  private final BaseSafetyToolMapper safetyToolMapper;
 
   public SecScheduledServiceImpl(SecScheduledMapper secScheduledMapper,
-      SecScheduledToolMapper secScheduledToolMapper) {
+      SecScheduledToolMapper secScheduledToolMapper,
+      BaseSafetyToolMapper safetyToolMapper) {
     this.secScheduledMapper = secScheduledMapper;
     this.secScheduledToolMapper = secScheduledToolMapper;
+    this.safetyToolMapper = safetyToolMapper;
   }
 
   /**
@@ -133,7 +139,12 @@ public class SecScheduledServiceImpl implements ISecScheduledService {
 
   @Override
   @Transactional(rollbackFor = Exception.class)
-  public int addTools(SecScheduledToolVo toolsVo) {
+  public int addTools(SecScheduledToolVo toolsVo) throws Exception {
+    BaseSafetyTool safetyTool = safetyToolMapper.getInfo(toolsVo.getToolId());
+    SysUser sysUser = SecurityUtils.getLoginUser().getUser();
+    if (!safetyTool.getDeptId().equals(sysUser.getDeptId())) {
+      throw new Exception("该工具归属“" + safetyTool.getDeptName() + "”管理，请检查后重新操作");
+    }
 
     SecScheduledTool secScheduledTool = new SecScheduledTool();
     secScheduledTool.setScheduledId(toolsVo.getScheduledId());
@@ -142,7 +153,7 @@ public class SecScheduledServiceImpl implements ISecScheduledService {
     if (secScheduledToolMapper.check(secScheduledTool) == 0) {
       return secScheduledToolMapper.insert(secScheduledTool);
     } else {
-      return 0;
+      throw new Exception("该工具已经添加到其他计划中，请删除后重新操作");
     }
 
   }

railway-business/src/main/java/com/railway/business/safetool/service/impl/SecScheduledToolServiceImpl.java

@@ -14,13 +14,11 @@ import org.springframework.transaction.annotation.Transactional;
 * @date 2021/12/04
 */
 @Service
-@Transactional(readOnly = true)
 public class SecScheduledToolServiceImpl implements ISecScheduledToolService{
 
 	private final SecScheduledToolMapper secScheduledToolMapper;
 
-	public SecScheduledToolServiceImpl(
-			SecScheduledToolMapper secScheduledToolMapper) {
+	public SecScheduledToolServiceImpl(SecScheduledToolMapper secScheduledToolMapper) {
 		this.secScheduledToolMapper = secScheduledToolMapper;
 	}
 

railway-business/src/main/resources/mapper/safetool/SecScheduledToolMapper.xml

@@ -84,16 +84,19 @@
     delete from sec_scheduled_tool where scheduled_id = #{scheduledId} and tool_id = #{toolId}
   </delete>
 
-
   <select id="checkdel"
     parameterType="com.railway.business.safetool.domain.vo.SecScheduledToolVo"
     resultType="int">
     select count(1) c from sec_scheduled_tool where scheduled_id = #{scheduledId}
   </select>
+
   <select id="check" parameterType="com.railway.business.safetool.domain.SecScheduledTool"
     resultType="int">
-    select count(1) c from sec_scheduled_tool where tool_id = #{toolId}
+    select count(1) c from sec_scheduled_tool t
+    left join sec_scheduled t1 on t.scheduled_id = t1.id
+    where t1.del_flag = 0 and t.tool_id = #{toolId}
   </select>
+
   <update id="update" parameterType="com.railway.business.safetool.domain.SecScheduledTool">
     UPDATE sec_scheduled_tool
     <set>