Merge remote-tracking branch 'origin/master'

ruoyi-admin/src/main/resources/application-dev.yml

@@ -8,7 +8,7 @@ spring:
             master:
                 url: jdbc:mysql://localhost:3306/hbghgz_sc?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: root
-                password: root
+                password: 123456
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭

ruoyi-admin/src/main/resources/application-druid.yml

@@ -8,7 +8,7 @@ spring:
             master:
                 url: jdbc:mysql://localhost:3306/hbghgz_sc?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
                 username: root
-                password: root
+                password: 123456
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭

ruoyi-framework/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java

 package com.ruoyi.framework.web.exception;
 
+import com.ruoyi.system.ex.ServiceException;
+import com.ruoyi.system.web.ServiceCode;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.dao.DataIntegrityViolationException;
+import org.springframework.jdbc.BadSqlGrammarException;
+import org.springframework.jdbc.UncategorizedSQLException;
 import org.springframework.security.access.AccessDeniedException;
 import org.springframework.security.authentication.AccountExpiredException;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.validation.BindException;
+import org.springframework.web.HttpRequestMethodNotSupportedException;
 import org.springframework.web.bind.MethodArgumentNotValidException;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
@@ -17,6 +23,8 @@ import com.ruoyi.common.exception.CustomException;
 import com.ruoyi.common.exception.DemoModeException;
 import com.ruoyi.common.utils.StringUtils;
 
+import javax.servlet.http.HttpServletRequest;
+
 /**
  * 全局异常处理器
  *
@@ -77,12 +85,12 @@ public class GlobalExceptionHandler
         return AjaxResult.error(e.getMessage());
     }
 
-    @ExceptionHandler(Exception.class)
+/*    @ExceptionHandler(Exception.class)
     public AjaxResult handleException(Exception e)
     {
         log.error(e.getMessage(), e);
         return AjaxResult.error(e.getMessage());
-    }
+    }*/
 
     /**
      * 自定义验证异常
@@ -114,4 +122,96 @@ public class GlobalExceptionHandler
     {
         return AjaxResult.error("演示模式，不允许操作");
     }
+
+    /*---------------------------------------------------*/
+
+    /**
+     * 请求方式不支持
+     * @param e
+     * @param request
+     * @return
+     */
+    @ExceptionHandler(HttpRequestMethodNotSupportedException.class)
+    public AjaxResult handleHttpRequestMethodNotSupported(HttpRequestMethodNotSupportedException e,
+                                                          HttpServletRequest request) {
+        String requestURI = request.getRequestURI();
+        log.error("请求地址{},不支持{}请求", requestURI, e.getMethod());
+        return AjaxResult.error(e.getMessage());
+    }
+
+
+
+    /**
+     * 拦截错误SQL异常
+     * @param e
+     * @param request
+     * @return
+     */
+    @ExceptionHandler(BadSqlGrammarException.class)
+    public AjaxResult handleBadSqlGrammarException(BadSqlGrammarException e,
+                                                   HttpServletRequest request) {
+        String requestURI = request.getRequestURI();
+        log.error("请求地址'{}',发生数据库异常.", requestURI, e);
+        return AjaxResult.error(HttpStatus.ERROR, "数据库异常！");
+    }
+
+    /**
+     * 可以拦截表示违反数据库的完整性约束导致的异常。
+     * @param e
+     * @param request
+     * @return
+     */
+    @ExceptionHandler(DataIntegrityViolationException.class)
+    public AjaxResult handleDataIntegrityViolationException(DataIntegrityViolationException e,
+                                                            HttpServletRequest request) {
+        String requestURI = request.getRequestURI();
+        log.error("请求地址'{}',发生数据库异常.", requestURI, e);
+        return AjaxResult.error(HttpStatus.ERROR, "数据库异常！");
+    }
+
+
+    /**
+     * 可以拦截违反数据库的非完整性约束导致的异常，可能也会拦截一些也包括 SQL 语句错误、连接问题、权限问题等各种数据库异常。
+     * @param e
+     * @param request
+     * @return
+     */
+    @ExceptionHandler(UncategorizedSQLException.class)
+    public AjaxResult handleUncategorizedSqlException(UncategorizedSQLException e,
+                                                      HttpServletRequest request) {
+        String requestURI = request.getRequestURI();
+        log.error("请求地址'{}',发生数据库异常.", requestURI, e);
+        return AjaxResult.error(HttpStatus.ERROR, "数据库异常！");
+    }
+
+    /**
+     * 拦截未知的运行时异常
+     * @param e
+     * @param request
+     * @return
+     */
+    @ExceptionHandler(RuntimeException.class)
+    public AjaxResult handleRuntimeException(RuntimeException e,
+                                             HttpServletRequest request) {
+        String requestURI = request.getRequestURI();
+        log.error("请求地址{},发生未知运行异常", requestURI, e);
+        return AjaxResult.error(e.getMessage());
+    }
+
+
+
+    /**
+     * 全局异常
+     * @param e
+     * @param request
+     * @return
+     */
+    @ExceptionHandler(Exception.class)
+    public AjaxResult handleException(Exception e,
+                                      HttpServletRequest request){
+        String requestURI = request.getRequestURI();
+        log.error("请求地址{},发生系统异常",requestURI,e);
+        return AjaxResult.error(e.getMessage());
+    }
+
 }

ruoyi-supplies/src/main/java/com/ruoyi/system/controller/ActSuppliesController.java

@@ -90,7 +90,12 @@ public class ActSuppliesController extends BaseController
     {
         SysUser user = SecurityUtils.getLoginUser().getUser();
         actSupplies.setCreateBy(user.getUserName());
-        return toAjax(actSuppliesService.insertActSupplies(actSupplies));
+        /*return toAjax(actSuppliesService.insertActSupplies(actSupplies));*/
+        int i = actSuppliesService.insertActSupplies(actSupplies);
+        if(i==0){
+            return AjaxResult.error("添加名称失败，名称已被占用");
+        }
+        return  AjaxResult.success("添加成功");
     }
 
     /**
@@ -103,7 +108,12 @@ public class ActSuppliesController extends BaseController
     {
         SysUser user = SecurityUtils.getLoginUser().getUser();
         actSupplies.setUpdateBy(user.getUserName());
-        return toAjax(actSuppliesService.updateActSupplies(actSupplies));
+//        return toAjax(actSuppliesService.updateActSupplies(actSupplies));
+        int i = actSuppliesService.updateActSupplies(actSupplies);
+        if(i==0){
+            return AjaxResult.error("修改名称失败.名称已被占用");
+        }
+        return AjaxResult.success("修改成功");
     }
 
     /**
@@ -115,12 +125,10 @@ public class ActSuppliesController extends BaseController
     public AjaxResult remove(@PathVariable Long[] ids)
     {
 
-        List<Integer> find = Stream.concat(actSuppliesService.findall().stream(),actSuppliesService.findAllId().stream()).collect(Collectors.toList());
+        if (actSuppliesService.findall(ids).size()>0 || actSuppliesService.findAllId(ids).size()>0){
+
+            return AjaxResult.error("该物料下存在关联物料，请先删除关联物料！！！","操作失败");
 
-        for (long num : ids){
-            if (find.contains((int)num)){
-                return AjaxResult.success("删除失败","操作失败");
-            }
         }
 
         return toAjax(actSuppliesService.deleteActSuppliesByIds(ids));
@@ -145,13 +153,9 @@ public class ActSuppliesController extends BaseController
     public AjaxResult setDisable(@PathVariable("id") Long id)
     {
 
-        BigDecimal numBigDecimal = new BigDecimal(id);
-        Integer numberInt = numBigDecimal.intValue();
-
-        List<Integer> find = Stream.concat(actSuppliesService.findall().stream(),actSuppliesService.findAllId().stream()).collect(Collectors.toList());
-        if (find.contains(numberInt)){
+        if (actSuppliesService.find(id).size()>0 || actSuppliesService.findId(id).size()>0){
 
-            return AjaxResult.success("删除失败","操作失败");
+            return AjaxResult.success("该物料下存在关联物料，请先删除关联物料！！！","操作失败");
 
         }
 

ruoyi-supplies/src/main/java/com/ruoyi/system/controller/ActSuppliesDetailsController.java

@@ -116,15 +116,9 @@ public class ActSuppliesDetailsController extends BaseController
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
     {
-        List<Integer> find = actSuppliesDetailsService.findall();
-
-        for (long num : ids){
-            if (find.contains((int)num)){
-                return AjaxResult.success("删除失败","操作失败");
-            }
-        }
 
         return toAjax(actSuppliesDetailsService.deleteActSuppliesDetailsByIds(ids));
+
     }
 
     /**

ruoyi-supplies/src/main/java/com/ruoyi/system/controller/ActSuppliesRoleController.java

@@ -89,7 +89,12 @@ public class ActSuppliesRoleController extends BaseController
     {
         SysUser user = SecurityUtils.getLoginUser().getUser();
         actSuppliesRole.setCreateBy(user.getUserName());
-        return toAjax(actSuppliesRoleService.insertActSuppliesRole(actSuppliesRole));
+        /*return toAjax(actSuppliesService.insertActSupplies(actSupplies));*/
+        int i = actSuppliesRoleService.insertActSuppliesRole(actSuppliesRole);
+        if(i==0){
+            return AjaxResult.error("添加名称失败，名称已被占用");
+        }
+        return  AjaxResult.success("添加成功");
     }
 
     /**
@@ -103,7 +108,12 @@ public class ActSuppliesRoleController extends BaseController
 
         SysUser user = SecurityUtils.getLoginUser().getUser();
         actSuppliesRole.setUpdateBy(user.getUserName());
-        return toAjax(actSuppliesRoleService.updateActSuppliesRole(actSuppliesRole));
+        /*return toAjax(actSuppliesRoleService.updateActSuppliesRole(actSuppliesRole));*/
+        int i = actSuppliesRoleService.insertActSuppliesRole(actSuppliesRole);
+        if(i==0){
+            return AjaxResult.error("修改名称失败，名称已被占用");
+        }
+        return  AjaxResult.success("修改成功");
     }
 
     /**
@@ -114,14 +124,12 @@ public class ActSuppliesRoleController extends BaseController
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Integer[] ids)
     {
-        List<Integer> find = actSuppliesRoleService.findall();
 
-        for (long num : ids){
-            if (find.contains((int)num)){
-                return AjaxResult.success("删除失败","操作失败");
-            }
+        if (actSuppliesRoleService.findall(ids).size()>0){
+            return AjaxResult.error("该规则下存在关联规则，请先删除关联规则！！！","操作失败");
         }
 
+
         return toAjax(actSuppliesRoleService.deleteActSuppliesRoleByIds(ids));
     }
 
@@ -144,6 +152,10 @@ public class ActSuppliesRoleController extends BaseController
     @GetMapping("/disable/{id}")
     public AjaxResult setDisable(@PathVariable("id") Long id)
     {
+        if (actSuppliesRoleService.find(Math.toIntExact(id)).size()>0){
+            return AjaxResult.success("该规则下存在关联规则，请先删除关联规则！！！","操作失败");
+        }
+
         System.out.println("开始处理【禁用物料总分类管理】的请求，参数：{}"+ id);
         actSuppliesRoleService.setDisable(id);
         return AjaxResult.success();

ruoyi-supplies/src/main/java/com/ruoyi/system/controller/ActSuppliesTemplateController.java

@@ -105,12 +105,10 @@ public class ActSuppliesTemplateController extends BaseController {
     @DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids) {
 
-        List<Integer> find = actSuppliesTemplateService.findall();
 
-        for (long num : ids){
-            if (find.contains((int)num)){
-                return AjaxResult.success("删除失败","操作失败");
-            }
+
+        if (actSuppliesTemplateService.findall(ids).size()>0){
+            return AjaxResult.error("该模板下存在关联规则，请先删除关联规则！！！","操作失败");
         }
 
         return toAjax(actSuppliesTemplateService.deleteSuppliesTemplateByIds(ids));
@@ -121,12 +119,12 @@ public class ActSuppliesTemplateController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('SuppliesTemplate:SuppliesTemplate:ifName')")
     @GetMapping("/ifName/{name}")
-    public AjaxResult setEnable(@PathVariable("name") String name)
+    public AjaxResult ifName(@PathVariable("name") String name)
     {
         List<String> find = actSuppliesTemplateService.findName();
 
         if (find.contains(name)){
-            return AjaxResult.success("验证失败","存在重复");
+            return AjaxResult.success("上传文件名重复，请修改后上传！","存在重复");
         }
 
         return AjaxResult.success("验证通过","验证通过");
@@ -151,6 +149,9 @@ public class ActSuppliesTemplateController extends BaseController {
     @GetMapping("/disable/{id}")
     public AjaxResult setDisable(@PathVariable("id") Long id)
     {
+        if(actSuppliesTemplateService.find(id).size()>0){
+            return AjaxResult.success("该物料下存在关联物料，请先删除关联物料！！！","操作失败");
+        }
         System.out.println("开始处理【禁用物料总分类管理】的请求，参数：{}"+ id);
         actSuppliesTemplateService.setDisable(id);
         return AjaxResult.success();

ruoyi-supplies/src/main/java/com/ruoyi/system/mapper/ActSuppliesDetailsMapper.java

@@ -62,7 +62,5 @@ public interface ActSuppliesDetailsMapper
      */
     public int deleteActSuppliesDetailsByIds(Long[] ids);
 
-    List<Integer> findall();
-
     List<ActSupplies> saveSid();
 }

ruoyi-supplies/src/main/java/com/ruoyi/system/mapper/ActSuppliesMapper.java

@@ -62,9 +62,13 @@ public interface ActSuppliesMapper
 
     List<ActSupplies> options();
 
-    List<Integer> findall();
+    List<Integer> findall(Long[] ids);
 
-    List<Integer> findAllId();
+    List<Integer> findAllId(Long[] ids);
+
+    List<Integer> find(Long id);
+
+    List<Integer> findId(Long id);
 
 
     /**

ruoyi-supplies/src/main/java/com/ruoyi/system/mapper/ActSuppliesRoleMapper.java

@@ -64,7 +64,8 @@ public interface ActSuppliesRoleMapper
 
     List<ActSuppliesTemplate> saveSid();
 
-    List<Integer> findall();
+    List<Integer> findall(Integer[] ids);
+    List<Integer> find(Integer id);
 
     public int countByRoleName(String roleName);
 

ruoyi-supplies/src/main/java/com/ruoyi/system/mapper/ActSuppliesTemplateMapper.java

@@ -27,7 +27,9 @@ public interface ActSuppliesTemplateMapper
 
     List<ActSuppliesTemplate> saveTemplate(Long id);
 
-    List<Integer> findall();
+    List<Integer> findall(Long[] ids);
+
+    List<Integer> find(Long id);
 
     List<String> findName();
 

ruoyi-supplies/src/main/java/com/ruoyi/system/service/ActSuppliesTemplateService.java

@@ -25,7 +25,9 @@ public interface ActSuppliesTemplateService
 
     List<ActSuppliesTemplate> saveTemplate(Long id);
 
-    List<Integer> findall();
+    List<Integer> findall(Long[] ids);
+
+    List<Integer> find(Long id);
     /**
      * 启用物料细分类管理
      *
@@ -43,4 +45,6 @@ public interface ActSuppliesTemplateService
 
     List<String> findName();
 
+
+
 }

ruoyi-supplies/src/main/java/com/ruoyi/system/service/IActSuppliesDetailsService.java

@@ -62,8 +62,6 @@ public interface IActSuppliesDetailsService
      */
     public int deleteActSuppliesDetailsById(Long id);
 
-    List<Integer> findall();
-
     List<ActSupplies> saveSid();
     /**
      * 启用物料总分类管理

ruoyi-supplies/src/main/java/com/ruoyi/system/service/IActSuppliesRoleService.java

@@ -78,5 +78,6 @@ public interface IActSuppliesRoleService
      */
     void setDisable(Long id);
 
-    List<Integer> findall();
+    List<Integer> findall(Integer[] ids);
+    List<Integer> find(Integer id);
 }

ruoyi-supplies/src/main/java/com/ruoyi/system/service/IActSuppliesService.java

@@ -64,7 +64,6 @@ public interface IActSuppliesService
 
     List<ActSupplies> options();
 
-    List<Integer> findall();
 
     /**
      * 启用物料细分类管理
@@ -81,7 +80,14 @@ public interface IActSuppliesService
      */
     void setDisable(Long id);
 
-    List<Integer> findAllId();
+    List<Integer> findall(Long[] ids);
+
+    List<Integer> findAllId(Long[] ids);
+
+    List<Integer> find(Long id);
+
+    List<Integer> findId(Long id);
+
 
 
 }

ruoyi-supplies/src/main/java/com/ruoyi/system/service/impl/ActSuppliesDetailsServiceImpl.java

@@ -97,11 +97,6 @@ public class ActSuppliesDetailsServiceImpl implements IActSuppliesDetailsService
         return actSuppliesDetailsMapper.deleteActSuppliesDetailsById(id);
     }
 
-    @Override
-    public List<Integer> findall() {
-        return actSuppliesDetailsMapper.findall();
-    }
-
     @Override
     public List<ActSupplies> saveSid() {
         return actSuppliesDetailsMapper.saveSid();

ruoyi-supplies/src/main/java/com/ruoyi/system/service/impl/ActSuppliesRoleServiceImpl.java

@@ -64,13 +64,14 @@ public class ActSuppliesRoleServiceImpl implements IActSuppliesRoleService
         if(countByRoleName > 0){
             String message = "添加规则失败，规则名称已被占用";
             System.out.println(message);
-            throw new ServiceException(ServiceCode.ERR_CONFLICT,message);
+            /*throw new ServiceException(ServiceCode.ERR_CONFLICT,message);*/
         }
         ActSuppliesRole actSuppliesRole1 = new ActSuppliesRole();
         BeanUtils.copyProperties(actSuppliesRole,actSuppliesRole1);
 
         actSuppliesRole.setCreateTime(DateUtils.getNowDate());
-        return actSuppliesRoleMapper.insertActSuppliesRole(actSuppliesRole);
+        return 0;
+               /* actSuppliesRoleMapper.insertActSuppliesRole(actSuppliesRole)*/
     }
 
     /**
@@ -87,12 +88,13 @@ public class ActSuppliesRoleServiceImpl implements IActSuppliesRoleService
         if(countByRoleName > 0){
             String message = "修改规则失败，新的规则名称已被占用";
             System.out.println(message);
-            throw new ServiceException(ServiceCode.ERR_CONFLICT,message);
+           /* throw new ServiceException(ServiceCode.ERR_CONFLICT,message);*/
         }
         ActSuppliesRole actSuppliesRole2 = new ActSuppliesRole();
         BeanUtils.copyProperties(actSuppliesRole,actSuppliesRole2);
         actSuppliesRole.setUpdateTime(DateUtils.getNowDate());
-        return actSuppliesRoleMapper.updateActSuppliesRole(actSuppliesRole);
+        return 0;
+        /* actSuppliesRoleMapper.insertActSuppliesRole(actSuppliesRole)*/
     }
 
     /**
@@ -135,8 +137,13 @@ public class ActSuppliesRoleServiceImpl implements IActSuppliesRoleService
     }
 
     @Override
-    public List<Integer> findall() {
-        return actSuppliesRoleMapper.findall();
+    public List<Integer> findall(Integer[] ids) {
+        return actSuppliesRoleMapper.findall(ids);
+    }
+
+    @Override
+    public List<Integer> find(Integer id) {
+        return actSuppliesRoleMapper.find(id);
     }
 
 

ruoyi-supplies/src/main/java/com/ruoyi/system/service/impl/ActSuppliesServiceImpl.java

@@ -66,13 +66,15 @@ public class ActSuppliesServiceImpl implements IActSuppliesService
         if(countBySuppliesName > 0){
             String message = "添加物料总分类管理失败，名称已被占用！";
             System.out.println(message);
-            throw new ServiceException(ServiceCode.ERR_CONFLICT,message);
+            /*throw new ServiceException(ServiceCode.ERR_CONFLICT,message);*/
         }
+
         ActSupplies actSupplies1 = new ActSupplies();
         BeanUtils.copyProperties(actSupplies,actSupplies1);
 
         actSupplies.setCreateTime(DateUtils.getNowDate());
-        return actSuppliesMapper.insertActSupplies(actSupplies);
+        return 0;
+                /*actSuppliesMapper.insertActSupplies(actSupplies)*/
     }
 
     /**
@@ -89,12 +91,13 @@ public class ActSuppliesServiceImpl implements IActSuppliesService
         if(countBySuppliesName > 0) {
             String message = "修改物料总分类管理失败，新的名称已被占用！";
             System.out.println(message);
-            throw new ServiceException(ServiceCode.ERR_CONFLICT, message);
+          /*  throw new ServiceException(ServiceCode.ERR_CONFLICT, message);*/
         }
         ActSupplies actSupplies1 = new ActSupplies();
         BeanUtils.copyProperties(actSupplies,actSupplies1);
         actSupplies.setUpdateTime(DateUtils.getNowDate());
-        return actSuppliesMapper.updateActSupplies(actSupplies);
+        return 0;
+        /*actSuppliesMapper.updateActSupplies(actSupplies);*/
     }
 
     /**
@@ -127,8 +130,8 @@ public class ActSuppliesServiceImpl implements IActSuppliesService
     }
 
     @Override
-    public List<Integer> findall() {
-        return actSuppliesMapper.findall();
+    public List<Integer> findall(Long[] ids) {
+        return actSuppliesMapper.findall(ids);
     }
 
     @Override
@@ -142,8 +145,18 @@ public class ActSuppliesServiceImpl implements IActSuppliesService
     }
 
     @Override
-    public List<Integer> findAllId() {
-        return actSuppliesMapper.findAllId();
+    public List<Integer> findAllId(Long[] ids) {
+        return actSuppliesMapper.findAllId(ids);
+    }
+
+    @Override
+    public List<Integer> find(Long id) {
+        return actSuppliesMapper.find(id);
+    }
+
+    @Override
+    public List<Integer> findId(Long id) {
+        return actSuppliesMapper.findId(id);
     }
 
 
@@ -164,6 +177,8 @@ public class ActSuppliesServiceImpl implements IActSuppliesService
             System.out.println(message);
             throw new RuntimeException(message);
         }
+
+
         ActSupplies actSupplies = new ActSupplies();
         actSupplies.setId(id);
         actSupplies.setStatus(status);

ruoyi-supplies/src/main/java/com/ruoyi/system/service/impl/ActSuppliesTemplateServiceImpl.java

@@ -67,9 +67,15 @@ public class ActSuppliesTemplateServiceImpl implements ActSuppliesTemplateServic
     }
 
     @Override
-    public List<Integer> findall() {
-        return actSuppliesTemplateMapper.findall();
+    public List<Integer> findall(Long[] ids) {
+        return actSuppliesTemplateMapper.findall(ids);
     }
+
+    @Override
+    public List<Integer> find(Long id) {
+        return actSuppliesTemplateMapper.find(id);
+    }
+
     @Override
     public void setEnable(Long id) {
         updateStatusById(id,0);

ruoyi-supplies/src/main/resources/mapper/system/ActSuppliesDetailsMapper.xml

@@ -49,10 +49,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select id,pid,supplies_name from act_supplies where status = 0;
     </select>
 
-    <select id="findall" resultType="Integer">
-        select det_id from act_supplies_template GROUP BY det_id
-    </select>
-
     <select id="selectActSuppliesDetailsList" parameterType="ActSuppliesDetails" resultMap="OneActSuppliesDetailsResult">
         select a.id, a.sid,b.supplies_name,a.details_name,a.sysclassify,a.status from act_supplies_details a left join act_supplies b on a.sid = b.id
         <where>

ruoyi-supplies/src/main/resources/mapper/system/ActSuppliesMapper.xml

@@ -85,15 +85,35 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </update>
 
-    <select id="findall" resultType="Integer">
-        select sid from act_supplies_details GROUP BY sid
+    <select id="findall" parameterType="String" resultType="Integer">
+--         select sid from act_supplies_details GROUP BY sid
+        select sid from act_supplies_details where sid in
+        <foreach collection="array" item="id" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </select>
+
+    <select id="findAllId" parameterType="String" resultType="Integer">
+--         select pid from act_supplies
+        select pid from act_supplies where pid in
+        <foreach collection="array" item="id" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </select>
+
+    <select id="find"  resultType="Integer">
+        --         select sid from act_supplies_details GROUP BY sid
+        select sid from act_supplies_details where sid = #{id}
+
     </select>
 
-    <select id="findAllId" resultType="Integer">
-        select pid from act_supplies
+    <select id="findId"  resultType="Integer">
+        --         select pid from act_supplies
+        select pid from act_supplies where pid = #{id}
     </select>
 
 
+
 <!--    <delete id="deleteActSuppliesById" parameterType="Long">-->
 <!--        delete from act_supplies where id = #{id}-->
 <!--    </delete>-->

ruoyi-supplies/src/main/resources/mapper/system/ActSuppliesRoleMapper.xml

@@ -30,9 +30,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     </resultMap>
 
-    <select id="findall" resultType="Integer">
-        select role_id from act_supplies_role_detail GROUP BY role_id
+    <select id="findall" parameterType="String" resultType="Integer">
+        select role_id from act_supplies_role_detail where role_id in
+        <foreach collection="array" item="id" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </select>
+
+    <select id="find"  resultType="Integer">
+        select role_id from act_supplies_role_detail where role_id=#{id}
+
     </select>
+
     <select id="countByRoleName" resultType="int">
         select count(*) from act_supplies_role where role_name=#{roleName}
     </select>

ruoyi-supplies/src/main/resources/mapper/system/ActSuppliesTemplateMapper.xml

@@ -21,10 +21,18 @@
         select id, det_id, template_name, template_content, status, create_by, create_time, update_by, update_time from act_supplies_template
     </sql>
 
-    <select id="findall" resultType="Integer">
-        select temp_id from act_supplies_role GROUP BY temp_id
+    <select id="find"  resultType="Integer">
+        select temp_id from act_supplies_role where temp_id=#{id}
     </select>
 
+    <select id="findall" parameterType="String" resultType="Integer">
+        select temp_id from act_supplies_role where temp_id in
+        <foreach collection="array" item="id" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </select>
+
+
     <select id="findName" resultType="String">
         select template_name from act_supplies_template
     </select>

ruoyi-ui/.eslintrc.js

@@ -3,12 +3,14 @@ module.exports = {
   root: true,
   parserOptions: {
     parser: 'babel-eslint',
-    sourceType: 'module'
+    sourceType: 'module',
+
   },
   env: {
     browser: true,
     node: true,
     es6: true,
+    jquery: true
   },
   extends: ['plugin:vue/recommended', 'eslint:recommended'],
 

ruoyi-ui/package.json

@@ -5,9 +5,9 @@
   "author": "若依",
   "license": "MIT",
   "scripts": {
-    "dev": "set NODE_OPTIONS=--openssl-legacy-provider & vue-cli-service serve",
-    "build:prod": "set NODE_OPTIONS=--openssl-legacy-provider & vue-cli-service build",
-    "build:stage": "set NODE_OPTIONS=--openssl-legacy-provider & vue-cli-service build --mode staging",
+    "dev": "vue-cli-service serve",
+    "build:prod": "vue-cli-service build",
+    "build:stage": "vue-cli-service build --mode staging",
     "preview": "node build/index.js --preview",
     "lint": "eslint --ext .js,.vue src"
   },

ruoyi-ui/public/index.html

@@ -10,14 +10,14 @@
     <link rel='stylesheet' href='<%= BASE_URL %>./plugins/plugins.css' />
     <link rel='stylesheet' href='<%= BASE_URL %>./css/luckysheet.css' />
     <link rel='stylesheet' href='<%= BASE_URL %>./assets/iconfont/iconfont.css' />
-    <!--<link rel='stylesheet' href='./luckysheet/expendPlugins/chart/chartmix.css' />-->
+    <link rel='stylesheet' href='<%= BASE_URL %>./expendPlugins/chart/chartmix.css' />
     <script src="<%= BASE_URL %>./jquery.min.js"></script>
     <script src="<%= BASE_URL %>./plugins/js/plugin.js"></script>
     <script src="<%= BASE_URL %>./luckysheet.umd.js"></script>
-    <!--<script src="./luckysheet/expendPlugins/chart/chartmix.umd.min.js"></script>-->
+    <script src="/expendPlugins/chart/chartmix.umd.min.js"></script>
 
 
-<!--    <link rel='stylesheet' href='https://cdn.jsdelivr.net/npm/luckysheet@latest/dist/plugins/css/pluginsCss.css' />
+<!--<link rel='stylesheet' href='https://cdn.jsdelivr.net/npm/luckysheet@latest/dist/plugins/css/pluginsCss.css' />
     <link rel='stylesheet' href='https://cdn.jsdelivr.net/npm/luckysheet@latest/dist/plugins/plugins.css' />
     <link rel='stylesheet' href='https://cdn.jsdelivr.net/npm/luckysheet@latest/dist/css/luckysheet.css' />
     <link rel='stylesheet' href='https://cdn.jsdelivr.net/npm/luckysheet@latest/dist/assets/iconfont/iconfont.css' />

ruoyi-ui/src/main.js

@@ -23,10 +23,7 @@ import RightToolbar from "@/components/RightToolbar"
 import axios from "axios";
 import qs from  'qs';
 import * as echarts from "echarts";
-// import $ from "jquery";
-//
-// window.jQuery = $;
-// window.$ = $;
+
 
 // 全局方法挂载
 Vue.prototype.echarts=echarts;

ruoyi-ui/src/views/system/ActSuppliesDetails/ActSuppliesDetails/index.vue

@@ -262,12 +262,10 @@ export default {
     toggleEnable(actSuppliesDetails){
       console.log('你点击了【' + actSuppliesDetails.detailsName+'】的开关控件，当前开关值:' + actSuppliesDetails.status);
       let enableText=['启用','禁用'];
-
-
-      if(actSuppliesDetails.status == 0) {
+      if(actSuppliesDetails.status === 0) {
         toggleEnable(actSuppliesDetails.id).then((response) =>{
 
-          if(response.code == 200){
+          if(response.code === 200){
 
             let message = '操作成功，已经将【' + actSuppliesDetails.detailsName +'】的状态改为【'+ enableText[actSuppliesDetails.status] +'】 !';
             this.$message({
@@ -280,7 +278,7 @@ export default {
         });
       }else {
         toggleDisable(actSuppliesDetails.id).then((response) =>{
-          if(response.code == 200){
+          if(response.code === 200){
             let message = '操作成功，已经将【' + actSuppliesDetails.detailsName +'】的状态改为【'+ enableText[actSuppliesDetails.status] +'】 !';
             this.$message({
               message: message,
@@ -323,7 +321,7 @@ export default {
         sid: null,
         detailsName: null,
         sysclassify: null,
-        status: 0,
+        status: null,
         createBy: null,
         createTime: null,
         updateBy: null,

ruoyi-ui/src/views/system/Actsupplies/Actsupplies/index.vue

@@ -253,33 +253,41 @@ export default {
       // const pageNumber = this.queryParams.pageNum || 1;
       return  index + 1;
     },
-
     /**启用 */
     toggleEnable(actSupplies){
       console.log('你点击了【' + actSupplies.suppliesName+'】的开关控件，当前开关值:' + actSupplies.status);
       let enableText=['启用','禁用'];
-      if(actSupplies.status == 0) {
+      if(actSupplies.status === 0) {
         toggleEnable(actSupplies.id).then((response) =>{
-          response.code == 200;
+          if(response.code === 200){
             let message = '操作成功，已经将【' + actSupplies.suppliesName +'】的状态改为【'+ enableText[actSupplies.status] +'】 !';
             this.$message({
               message: message,
               type:'success'
             });
+          }else {
+            this.$message.error(response.message);
+          }
+
         });
       }else {
         toggleDisable(actSupplies.id).then((response) =>{
-          response.code == 200;
+          if(response.msg === "200"){
             let message = '操作成功，已经将【' + actSupplies.suppliesName +'】的状态改为【'+ enableText[actSupplies.status] +'】 !';
             this.$message({
               message: message,
               type:'error'
             });
+          }else {
+            this.getList();
+            this.$message.error(response.msg);
+          }
 
         });
       }
     },
 
+
     /** 查询上级关联关系*/
     fetchOptions() {
       getPid().then(response => {

ruoyi-ui/src/views/system/suppliesrole/index.vue

@@ -223,13 +223,13 @@ export default {
   methods: {
 
     /**启用 */
-    toggleEnable(suppliesrole){
-      console.log('你点击了【' + suppliesrole.s+'】的开关控件，当前开关值:' + suppliesrole.status);
+    toggleEnable(suppliesRole){
+      console.log('你点击了【' + suppliesRole.s+'】的开关控件，当前开关值:' + suppliesRole.status);
       let enableText=['启用','禁用'];
-      if(suppliesrole.status == 0) {
-        toggleEnable(suppliesrole.id).then((response) =>{
-          if(response.code == 200){
-            let message = '操作成功，已经将【' + suppliesrole.roleName +'】的状态改为【'+ enableText[suppliesrole.status] +'】 !';
+      if(suppliesRole.status === 0) {
+        toggleEnable(suppliesRole.id).then((response) =>{
+          if(response.code === 200){
+            let message = '操作成功，已经将【' + suppliesRole.roleName +'】的状态改为【'+ enableText[suppliesRole.status] +'】 !';
             this.$message({
               message: message,
               type:'success'
@@ -239,15 +239,16 @@ export default {
           }
         });
       }else {
-        toggleDisable(suppliesrole.id).then((response) =>{
-          if(response.code == 200){
-            let message = '操作成功，已经将【' + suppliesrole.roleName +'】的状态改为【'+ enableText[suppliesrole.status] +'】 !';
+        toggleDisable(suppliesRole.id).then((response) =>{
+          if(response.msg === "200"){
+            let message = '操作成功，已经将【' + suppliesRole.roleName +'】的状态改为【'+ enableText[suppliesRole.status] +'】 !';
             this.$message({
               message: message,
               type:'error'
             });
           }else {
-            this.$message.error(response.message);
+            this.getList();
+            this.$message.error(response.msg);
           }
 
         });

ruoyi-ui/src/views/system/suppliesroledetail/index.vue

@@ -420,23 +420,23 @@ export default {
     },
 
 
-    toggleEnable(suppliesroledetail){
-      console.log('你点击了【' + suppliesroledetail.s+'】的开关控件，当前开关值:' + suppliesroledetail.status);
+    toggleEnable(suppliesRoleDetail){
+      console.log('你点击了【' + suppliesRoleDetail.s+'】的开关控件，当前开关值:' + suppliesRoleDetail.status);
       let enableText=['启用','禁用'];
 
-      if(suppliesroledetail.status === 0) {
-        toggleEnable(suppliesroledetail.id).then((response) =>{
+      if(suppliesRoleDetail.status === 0) {
+        toggleEnable(suppliesRoleDetail.id).then((response) =>{
           if(response.code === 200){
-            let message = '操作成功，已经将【' + suppliesroledetail.roleName +'】的状态改为【'+ enableText[suppliesroledetail.status] +'】 !';
+            let message = '操作成功，已经将【' + suppliesRoleDetail.roleName +'】的状态改为【'+ enableText[suppliesRoleDetail.status] +'】 !';
             this.$message({message: message,type:'success'});
           }else {
             this.$message.error(response.message);
           }
         });
       }else {
-        toggleDisable(suppliesroledetail.id).then((response) =>{
+        toggleDisable(suppliesRoleDetail.id).then((response) =>{
           if(response.code === 200){
-            let message = '操作成功，已经将【' + suppliesroledetail.roleName +'】的状态改为【'+ enableText[suppliesroledetail.status] +'】 !';
+            let message = '操作成功，已经将【' + suppliesRoleDetail.roleName +'】的状态改为【'+ enableText[suppliesRoleDetail.status] +'】 !';
             this.$message({message: message, type:'success'});
           }else {
             this.$message.error(response.message);