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,9 +23,11 @@ import com.ruoyi.common.exception.CustomException;
 import com.ruoyi.common.exception.DemoModeException;
 import com.ruoyi.common.utils.StringUtils;
 
+import javax.servlet.http.HttpServletRequest;
+
 /**
  * 全局异常处理器
- * 
+ *
  * @author ruoyi
  */
 @RestControllerAdvice
@@ -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

@@ -21,7 +21,7 @@ import java.util.stream.Stream;
 
 /**
  * 物料总分类管理Controller
- * 
+ *
  * @author ruoyi
  * @date 2023-07-11
  */
@@ -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("添加成功");
     }
 
     /**
@@ -98,12 +103,17 @@ public class ActSuppliesRoleController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:suppliesrole:edit')")
     @Log(title = "导入规则", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody ActSuppliesRole actSuppliesRole)
+    public AjaxResult edit(@RequestBody  ActSuppliesRole actSuppliesRole)
     {
 
         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

@@ -17,20 +17,20 @@ import static jdk.nashorn.internal.runtime.regexp.joni.Config.log;
 
 /**
  * 物料总分类管理Service业务层处理
- * 
+ *
  * @author ruoyi
  * @date 2023-07-11
  */
 @Service
 
-public class ActSuppliesServiceImpl implements IActSuppliesService 
+public class ActSuppliesServiceImpl implements IActSuppliesService
 {
     @Autowired
     private ActSuppliesMapper actSuppliesMapper;
 
     /**
      * 查询物料总分类管理
-     * 
+     *
      * @param id 物料总分类管理ID
      * @return 物料总分类管理
      */
@@ -42,7 +42,7 @@ public class ActSuppliesServiceImpl implements IActSuppliesService
 
     /**
      * 查询物料总分类管理列表
-     * 
+     *
      * @param actSupplies 物料总分类管理
      * @return 物料总分类管理
      */
@@ -54,7 +54,7 @@ public class ActSuppliesServiceImpl implements IActSuppliesService
 
     /**
      * 新增物料总分类管理
-     * 
+     *
      * @param actSupplies 物料总分类管理
      * @return 结果
      */
@@ -66,18 +66,20 @@ 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)*/
     }
 
     /**
      * 修改物料总分类管理
-     * 
+     *
      * @param actSupplies 物料总分类管理
      * @return 结果
      */
@@ -89,17 +91,18 @@ 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);*/
     }
 
     /**
      * 批量删除物料总分类管理
-     * 
+     *
      * @param ids 需要删除的物料总分类管理ID
      * @return 结果
      */
@@ -111,7 +114,7 @@ public class ActSuppliesServiceImpl implements IActSuppliesService
 
     /**
      * 删除物料总分类管理信息
-     * 
+     *
      * @param id 物料总分类管理ID
      * @return 结果
      */
@@ -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

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.ActSuppliesMapper">
-    
+
     <resultMap type="ActSupplies" id="ActSuppliesResult">
         <result property="id"    column="id"    />
         <result property="pid"    column="pid"    />
@@ -27,7 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     <select id="selectActSuppliesList" parameterType="ActSupplies" resultMap="ActSuppliesResult">
         select a.id,a.pid,b.supplies_name fname,a.supplies_name,a.status from act_supplies a left join act_supplies b on a.pid =b.id
-        <where>  
+        <where>
             <if test="id != null "> and a.id = #{id}</if>
             <if test="pid != null">and a.pid = #{pid}</if>
             <if test="fname != null "> and b.supplies_name like concat('%', #{fname}, '%')</if>
@@ -35,7 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="status != null "> and a.status = #{status}</if>
         </where>
     </select>
-    
+
     <select id="selectActSuppliesById" parameterType="Long" resultMap="ActSuppliesResult">
         <include refid="selectActSuppliesVo"/>
         where id = #{id}
@@ -45,7 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectActSuppliesVo"/>
         where pid = 0
     </select>
-        
+
     <insert id="insertActSupplies" parameterType="ActSupplies" useGeneratedKeys="true" keyProperty="id">
         insert into act_supplies
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -85,14 +85,34 @@ 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" resultType="Integer">
-        select pid from act_supplies
+    <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="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}-->
@@ -112,4 +132,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
     </update>
 
-</mapper>
+</mapper>
\ No newline at end of file

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/supplies/index_template.vue

@@ -188,14 +188,11 @@ import {
   addSuppliesTemplate,
   updateSuppliesTemplate,
   toggleEnable,toggleDisable,
-  listSuppliesTemplateId,findName, exportMyluckyexcel
+  listSuppliesTemplateId,findName
 } from "@/api/ruoyi-myLuckyexcel/myluckyexcel";
 import $ from 'jquery';
 import XLSX from 'xlsx';
 import LuckyExcel from 'luckyexcel';
-/*import luckysheet from 'luckysheet';*/
-import {exportSuppliesrole} from "@/api/system/suppliesrole";
-
 
 export default {
   name: "SuppliesTemplate",
@@ -248,16 +245,19 @@ export default {
     }
   },
   created() {
+
     this.getList();
     this.positionValue = "static";
+
   },
   mounted() {
+
     window.handleReturnButtonClick = this.handleReturnButtonClick;
+
   },
 
   methods: {
 
-
     /**启用 */
     toggleEnable(SuppliesTemplate) {
       console.log('你点击了【' + SuppliesTemplate.s + '】的开关控件，当前开关值:' + SuppliesTemplate.status);
@@ -276,14 +276,15 @@ export default {
         });
       } else {
         toggleDisable(SuppliesTemplate.id).then((response) => {
-          if (response.code === 200) {
+          if (response.msg === "200") {
             let message = '操作成功，已经将【' + SuppliesTemplate.templateName + '】的状态改为【' + enableText[SuppliesTemplate.status] + '】 !';
             this.$message({
               message: message,
               type: 'error'
             });
           } else {
-            this.$message.error(response.message);
+            this.getList();
+            this.$message.error(response.msg);
           }
 
         });
@@ -296,7 +297,7 @@ export default {
     },
 
     /**清空上传文件列表*/
-    handleChange(file, fileList) {
+    handleChange(file) {
       // 清空 fileList 中的旧文件
       this.fileListName = [];
       // 添加文件到 fileList 中
@@ -406,595 +407,112 @@ export default {
         this.open = true;
         this.title = "修改Excel模板";
       });
-      }
     },
     /** 提交按钮 */
     submitForm() {
-     if (!this.form.templateName){
-      this.msgError("上传的文件不能为空！")
-     }else {
-       this.fileListName = [];
-       if (!this.form.templateName) {
-         this.msgError("上传文件为空！！！")
-       } else {
-         this.$refs["form"].validate(valid => {
-           if (valid) {
-             if (this.form.id != null) {
-               updateSuppliesTemplate(this.form).then(response => {
-                 this.msgSuccess("修改成功");
-                 this.open = false;
-                 this.getList();
-               });
-             } else {
-               addSuppliesTemplate(this.form).then(response => {
-                 this.msgSuccess("新增成功");
-                 this.open = false;
-                 this.getList();
-               });
-             }
-           }
-         });
-       }
-     }
-  },
-
-  /** 详情按钮操作 */
-  handleSave(row) {
-
-    listSuppliesTemplateId(row.id).then(response => {
-
-      this.TemplateId = response.rows;
-
-      this.luckyLook();
-
-    })
-
-  },
-  /**展示详情luckysheet */
-  luckyLook() {
-
-    this.positionValue = 'absolute';
-    luckysheet.destroy();
-    luckysheet.create({
-      container: "luckysheet", // Luckysheet 的容器元素 ID
-      title: this.TemplateId[0].templateName, // Excel 文件名
-      data: JSON.parse(this.TemplateId[0].templateContent), // Excel 数据
-      showtoolbar: false, //是否第二列显示工具栏
-      showinfobar: true, //是否显示顶部名称栏
-      showsheetbar: false, //是否显示底部表格名称区域
-      pointEdit: false, //是否是编辑器插入表格模式
-      pointEditUpdate: null, //编辑器表格更新函数
-      allowEdit: false,//作用：是否允许前台编辑
-      functionButton: '<button id="exportButton" class="btn btn-primary" style=" padding:3px 6px; font-size: 16px;width: 100px;height: 27px; margin-right: 85px;" onclick="handleReturnButtonClick()">返回</button>',
-
-    });
-
-  },
-  /**详情返回按钮 */
-  handleReturnButtonClick() {
-
-    this.positionValue = 'static';
-    luckysheet.destroy();
-
-  },
-
-  /** 删除按钮操作*/
-  handleDelete(row) {
-    const ids = row.id || this.ids;
-    this.$confirm('是否确认删除Excel模板编号为"' + row.templateName + '"的数据项?', "警告", {
-      confirmButtonText: "确定",
-      cancelButtonText: "取消",
-      type: "warning"
-    }).then(function () {
-      return delSuppliesTemplate(ids);
-    }).then((result) => {
-      if (result.data === "操作失败") {
-        this.getList();
-        this.msgError("该模板下存在关联规则，请先删除关联规则！！！");
+      if (!this.form.templateName) {
+        this.msgError("上传的文件不能为空！")
       } else {
-        this.getList();
-        this.msgSuccess("删除成功");
+        this.fileListName = [];
+        if (!this.form.templateName) {
+          this.msgError("上传文件为空！！！")
+        } else {
+          this.$refs["form"].validate(valid => {
+            if (valid) {
+              if (this.form.id != null) {
+                updateSuppliesTemplate(this.form).then(response => {
+                  this.msgSuccess("修改成功");
+                  this.open = false;
+                  this.getList();
+                });
+              } else {
+                addSuppliesTemplate(this.form).then(response => {
+                  this.msgSuccess("新增成功");
+                  this.open = false;
+                  this.getList();
+                });
+              }
+            }
+          });
+        }
       }
-    }).catch(() => {
-    })
-
-  },
-
-  // /** 导出按钮操作 */
-  // handleExport() {
-  //   const queryParams = this.queryParams;
-  //   this.$confirm('是否确认导出所有导入规则数据项?', "警告", {
-  //     confirmButtonText: "确定",
-  //     cancelButtonText: "取消",
-  //     type: "warning"
-  //   }).then(function() {
-  //     return exportMyluckyexcel(queryParams);
-  //   }).then(response => {
-  //     this.download(response.msg);
-  //   })
-  // }
-};
-</script>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+    },
 
+    /** 详情按钮操作 */
+    handleSave(row) {
 
+      listSuppliesTemplateId(row.id).then(response => {
 
+        this.TemplateId = response.rows;
 
+        this.luckyLook();
 
+      })
 
+    },
+    /**展示详情luckysheet */
+    luckyLook() {
+
+      this.positionValue = 'absolute';
+      luckysheet.destroy();
+      luckysheet.create({
+        container: "luckysheet", // Luckysheet 的容器元素 ID
+        title: this.TemplateId[0].templateName, // Excel 文件名
+        data: JSON.parse(this.TemplateId[0].templateContent), // Excel 数据
+        showtoolbar: false, //是否第二列显示工具栏
+        showinfobar: true, //是否显示顶部名称栏
+        showsheetbar: false, //是否显示底部表格名称区域
+        pointEdit: false, //是否是编辑器插入表格模式
+        pointEditUpdate: null, //编辑器表格更新函数
+        allowEdit: false,//作用：是否允许前台编辑
+        functionButton: '<button id="exportButton" class="btn btn-primary" style=" padding:3px 6px; font-size: 16px;width: 100px;height: 27px; margin-right: 85px;" onclick="handleReturnButtonClick()">返回</button>',
 
+      });
 
+    },
+    /**详情返回按钮 */
+    handleReturnButtonClick() {
 
+      this.positionValue = 'static';
+      luckysheet.destroy();
 
+    },
 
-<!--<template>-->
-<!--  <div class="app-container">-->
-<!--    <el-form  ref="queryForm" size="small" :inline="true"  label-width="68px">-->
-<!--      <el-form-item label="模板" prop="name">-->
-<!--        <el-select v-model="selectedOption" size="mini" @change="handleOptionChange" placeholder="请选择你要查看的模板" >-->
-<!--          &lt;!&ndash;          <el-option label="自设的模板名" value="这里是Excel表内容"></el-option>&ndash;&gt;-->
-<!--          <el-option-->
-<!--            v-for="item in depss"-->
-<!--            :key="item.id"-->
-<!--            :label="item.name"-->
-<!--            :value="item.id"-->
-<!--          >-->
-<!--          </el-option>-->
-<!--        </el-select>-->
-<!--      </el-form-item>-->
-<!--      <el-form-item>-->
-<!--        &lt;!&ndash;<el-button type="primary" icon="el-icon-search" size="mini" >搜索</el-button> &ndash;&gt;-->
-<!--        &lt;!&ndash;<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>&ndash;&gt;-->
-<!--        &lt;!&ndash;<el-button type="primary" icon="el-icon-search" size="mini" >搜索</el-button>&ndash;&gt;-->
-<!--        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>-->
-<!--      </el-form-item>-->
-<!--    </el-form>-->
+    /** 删除按钮操作*/
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$confirm('是否确认删除Excel模板编号为"' + row.templateName + '"的数据项?', "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function () {
+        return delSuppliesTemplate(ids);
+      }).then((result) => {
+        if (result.data === "操作失败") {
+          this.getList();
+          this.msgError("该模板下存在关联规则，请先删除关联规则！！！");
+        } else {
+          this.getList();
+          this.msgSuccess("删除成功");
+        }
+      }).catch(() => {
+      })
 
-<!--    <el-row :gutter="10" class="mb8">-->
-<!--      <el-col :span="1.5">-->
-<!--        <el-button-->
-<!--          type="success"-->
-<!--          plain-->
-<!--          icon="el-icon-download"-->
-<!--          size="mini"-->
-<!--          @click="dialogVisible = true"-->
-<!--        >保存</el-button>-->
-<!--      </el-col>-->
-<!--      <el-col :span="1.5">-->
-<!--        <el-button-->
-<!--          type="warning"-->
-<!--          plain-->
-<!--          icon="el-icon-s-promotion"-->
-<!--          size="mini"-->
-<!--          @click="handleExport"-->
-<!--          v-hasPermi="['ruoyi-myexcel:myexcel:export']"-->
-<!--        >导出</el-button>-->
-<!--      </el-col>-->
-<!--      <el-col :span="1.5">-->
-<!--        <el-upload-->
-<!--          type="file"-->
-<!--          name="file"-->
-<!--          ref="upload"-->
-<!--          :before-upload="handleFileChange"-->
-<!--          action=''-->
-<!--          :limit="1"-->
-<!--          :file-list="fileList"-->
-<!--        >-->
-<!--          <el-button  plain size="mini" icon="el-icon-upload2" type="primary">导入</el-button>-->
+    },
 
-<!--        </el-upload>-->
-<!--      </el-col>-->
-<!--      &lt;!&ndash;      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>&ndash;&gt;-->
-<!--    </el-row>-->
-<!--    &lt;!&ndash; luckysheet容器 &ndash;&gt;-->
-<!--    &lt;!&ndash;    <div id="luckysheetContainer"></div>&ndash;&gt;-->
-<!--    <div-->
-<!--      id="luckysheet"-->
-<!--      style="margin: 0px; padding: 0px; position: absolute; width: 100%;height: 800px; left: 0px; top: 110px; bottom: 0px; z-index: 0"-->
-<!--    >-->
-<!--    </div>-->
-<!--    &lt;!&ndash; 用户添加或修改我的Excel表格的弹框 &ndash;&gt;-->
-<!--    <el-dialog-->
-<!--      title="是否确认保存?"-->
-<!--      :visible.sync="dialogVisible"-->
-<!--      width="30%"-->
-<!--      style="z-index: 1; "-->
-<!--      :before-close="handleClose">-->
-<!--      <el-form  label-width="80px" @submit.native.prevent>-->
-<!--        <el-form-item label="名称" >-->
-<!--          &lt;!&ndash;  onkeypress="if (event.keyCode == 13) return false" //关闭enter的触发事件  &ndash;&gt;-->
-<!--          <el-input v-model="from_name"-->
-<!--                    @keyup.enter.native="handleEnter"-->
-<!--                    placeholder="请输入名称" />-->
-<!--        </el-form-item>-->
-<!--      </el-form>-->
-<!--      <span slot="footer" class="dialog-footer">-->
-<!--    <el-button @click="dialogVisible = false">取 消</el-button>-->
-<!--    <el-button type="primary" @click="submit_from">确 定</el-button>-->
-<!--  </span>-->
-<!--    </el-dialog>-->
-<!--  </div>-->
-<!--</template>-->
-
-<!--<script>-->
-<!--  import $ from 'jquery'-->
-<!--  /*安装插件 npm install xlsx，安装完成后引入 import XLSX from ‘xlsx’*/-->
-<!--  import XLSX from 'xlsx'-->
-<!--  import {addMyluckyexcel, getMyluckyexcel, listMyluckyexcel} from "@/api/ruoyi-myLuckyexcel/myluckyexcel";-->
-
-<!--  import luckysheet from 'luckysheet'-->
-<!--  import LuckyExcel from 'luckyexcel'-->
-<!--  //导入库export.js 这个文件是es6的，不能在普通的HTML文件直接引入js文件（虽然都是js文件，但是有区别，具体请百度es6与es5）！需要把es6转es5才可以直接引入使用！-->
-<!--  import { exportExcel } from '../../../../public/luckysheet/exportExcel'-->
-<!--  export default {-->
-<!--    name: "Mymodule",-->
-<!--    data() {-->
-<!--      return {-->
-<!--        //弹出页面的表名-->
-<!--        from_name : "",-->
-<!--        // 是否显示弹出层-->
-<!--        dialogVisible : false,-->
-<!--        selectedOption:'',-->
-<!--        luckysheetData: '',-->
-<!--        fileList:[],-->
-<!--        depss:[],-->
-<!--        // 表单参数-->
-<!--        form: {},-->
-<!--        // 查询参数-->
-<!--        queryParams: {-->
-<!--          pageNum: 1,-->
-<!--          pageSize: 10,-->
-<!--          name: null,-->
-<!--          content: null-->
-<!--        },-->
-<!--      };-->
-<!--    },-->
-<!--    created() {-->
-<!--//刷新页面时进行的操作-->
-
-<!--      this.getList();-->
-<!--    },-->
-<!--    mounted() {-->
-
-<!--      this.init();-->
-<!--    },-->
-<!--    methods:{-->
-<!--      /** 页面刷新时展示的数据*/-->
-<!--      getList() {-->
-<!--        listMyluckyexcel(this.queryParams).then(response => {-->
-<!--          this.depss = response.rows;-->
-<!--        });-->
-<!--      },-->
-<!--      /** 下拉选和页面luckysheet绑定 */-->
-<!--      handleOptionChange() {-->
-<!--        //根据选中的下拉选项值获取相应的信息-->
-<!--        getMyluckyexcel(this.selectedOption).then(response => {-->
-
-<!--          const sysSupplies = response.data;-->
-
-<!--          this.luckysheetData = sysSupplies.jsons;-->
-<!--          //将接收到的json存到json_data中-->
-<!--          //const json_data = response.data;-->
-<!--          let json_data = JSON.parse(sysSupplies.jsons);-->
-<!--          let filename= sysSupplies.name;-->
-
-<!--          luckysheet.create({-->
-<!--            container: "luckysheet", // Luckysheet 的容器元素 ID-->
-<!--            title: filename, // Excel 文件名-->
-<!--            data: json_data, // Excel 数据-->
-<!--            showinfobar: false, //是否显示顶部名称栏-->
-<!--            lang:'zh',-->
-<!--          });-->
-
-<!--        }).catch(() => {-->
-<!--          // 处理错误逻辑，这里是一个空的错误处理函数-->
-<!--          this.$message.error('暂停失败,发生未知错误!');-->
-<!--        });-->
-<!--      },-->
-<!--      /** 导出设置 */-->
-<!--      handleExport(){-->
-<!--        var date =new Date().getTime();-->
-<!--        exportExcel(luckysheet.getAllSheets(), '导出'+date)-->
-<!--      },-->
-<!--      /** 弹出的确认框关闭 */-->
-<!--      handleClose(done) {-->
-<!--        this.$confirm('确认关闭？')-->
-<!--          .then(_ => {-->
-<!--            done();-->
-<!--          })-->
-<!--          .catch(_ => {});-->
-<!--      },-->
-<!--      /** 回车事件和保存提交绑定 */-->
-<!--      handleEnter(event) {-->
-<!--        if (event.keyCode === 13) {-->
-<!--          event.preventDefault(); // 阻止默认的回车事件-->
-<!--          // 触发确定操作-->
-<!--          this.submit_from();-->
-<!--        }-->
-<!--      },-->
-<!--      /** 保存到数据库*/-->
-<!--      submit_from() {-->
-<!--        const name = this.from_name-->
-<!--        if(name!=""){-->
-<!--          let objsheet = luckysheet.getAllSheets() // 得到表的数据-->
-<!--          //LuckyExcel = objsheet // 将表的数据保存本地-->
-<!--          let strsheet = JSON.stringify(objsheet)// 对象转化为字符串-->
-<!--          const  data={name :name,jsons:strsheet};-->
-<!--          addMyluckyexcel(data).then(response => {-->
-<!--            if(response.code==200){-->
-<!--              this.$message({-->
-<!--                message: '保存成功', type: 'success'-->
-<!--              });-->
-<!--              this.dialogVisible=false;-->
-<!--              //this.$router.replace({ path: '/' }); //刷新整个页面会出错-->
-<!--              //window.location.reload();//也是全局刷新,不合适-->
-<!--              this.$router.go(-1);-->
-<!--            }else{-->
-<!--              this.$message.error('保存失败');-->
-<!--            }-->
-<!--          });-->
-<!--        }else{-->
-<!--          this.$message.error('请输入表格名称后再进行保存!');-->
-<!--        }-->
-
-<!--      },-->
-<!--      /* 重置按钮操作 */-->
-<!--      resetQuery() {-->
-<!--        luckysheet.destroy()-->
-<!--        let options = {-->
-<!--          container: 'luckysheet', //luckysheet为容器id-->
-<!--          title:'',-->
-<!--          lang:'zh',-->
-<!--          showinfobar:false,-->
-<!--          data:[-->
-<!--            {-->
-<!--              "name": "sheet1", //工作表名称-->
-<!--              "color": "", //工作表颜色-->
-<!--              "index": 0, //工作表索引-->
-<!--              "status": 1, //激活状态-->
-<!--              "order": 0, //工作表的下标-->
-<!--              "hide": 0,//是否隐藏-->
-<!--              "row": 20, //行数-->
-<!--              "column": 15, //列数-->
-<!--              "defaultRowHeight": 19, //自定义行高-->
-<!--              "defaultColWidth": 73, //自定义列宽-->
-<!--              "celldata": [-->
-
-
-<!--              ], //初始化使用的单元格数据-->
-<!--              "config": {-->
-<!--                "merge": {-->
-<!--                }, //合并单元格-->
-<!--                "rowlen":{}, //表格行高-->
-<!--                "columnlen":{}, //表格列宽-->
-<!--                "rowhidden":{}, //隐藏行-->
-<!--                "colhidden":{}, //隐藏列-->
-<!--                "borderInfo":{-->
-
-<!--                }, //边框-->
-<!--                "authority":{}, //工作表保护-->
-
-<!--              },-->
-<!--            },-->
-<!--            /*{-->
-<!--              "name": "Sheet2",-->
-<!--              "color": "",-->
-<!--              "index": 1,-->
-<!--              "status": 0,-->
-<!--              "order": 1,-->
-<!--              "celldata": [],-->
-<!--              "config": {}-->
-<!--            },-->
-<!--            {-->
-<!--              "name": "Sheet3",-->
-<!--              "color": "",-->
-<!--              "index": 2,-->
-<!--              "status": 0,-->
-<!--              "order": 2,-->
-<!--              "celldata": [],-->
-<!--              "config": {},-->
-<!--            }*/-->
-<!--          ]-->
-
-<!--        }-->
-<!--        luckysheet.create(options)-->
-<!--      },-->
-<!--      /*// 表单重置-->
-<!--      reset() {-->
-<!--        this.form = {-->
-<!--          id: null,-->
-<!--          name: null,-->
-<!--          description: null-->
-<!--        };-->
-<!--        this.resetForm("form");-->
-<!--      },-->
-<!--      /!** 搜索按钮操作 *!/-->
-<!--      handleQuery() {-->
-<!--        this.queryParams.pageNum = 1;-->
-<!--        this.getList();-->
-<!--      },-->
-
-<!--      // 多选框选中数据-->
-<!--      handleSelectionChange(selection) {-->
-<!--        this.ids = selection.map(item => item.id)-->
-<!--        this.single = selection.length!==1-->
-<!--        this.multiple = !selection.length-->
-<!--      },-->
-<!--      /!** 导出按钮操作 *!/-->
-<!--      handleExport() {-->
-<!--        this.download('ruoyi-mymodule/mymodule/export', {-->
-<!--          ...this.queryParams-->
-<!--        }, `mymodule_${new Date().getTime()}.xlsx`)-->
-<!--      },*/-->
-<!--      /** Luckyexcel文档 */-->
-<!--      init() {-->
-<!--        let options = {-->
-<!--          container: 'luckysheet', //luckysheet为容器id-->
-<!--          title:'',-->
-<!--          lang:'zh',-->
-<!--          showinfobar:false,-->
-<!--          data:[-->
-<!--            {-->
-<!--              "name": "sheet1", //工作表名称-->
-<!--              "color": "", //工作表颜色-->
-<!--              "index": 0, //工作表索引-->
-<!--              "status": 1, //激活状态-->
-<!--              "order": 0, //工作表的下标-->
-<!--              "hide": 0,//是否隐藏-->
-<!--              "row": 20, //行数-->
-<!--              "column": 15, //列数-->
-<!--              "defaultRowHeight": 19, //自定义行高-->
-<!--              "defaultColWidth": 73, //自定义列宽-->
-<!--              "celldata": [-->
-
-
-<!--              ], //初始化使用的单元格数据-->
-<!--              "config": {-->
-<!--                "merge": {-->
-<!--                }, //合并单元格-->
-<!--                "rowlen":{}, //表格行高-->
-<!--                "columnlen":{}, //表格列宽-->
-<!--                "rowhidden":{}, //隐藏行-->
-<!--                "colhidden":{}, //隐藏列-->
-<!--                "borderInfo":{-->
-
-<!--                }, //边框-->
-<!--                "authority":{}, //工作表保护-->
-
-<!--              },-->
-<!--            },-->
-<!--            /*{-->
-<!--              "name": "Sheet2",-->
-<!--              "color": "",-->
-<!--              "index": 1,-->
-<!--              "status": 0,-->
-<!--              "order": 1,-->
-<!--              "celldata": [],-->
-<!--              "config": {}-->
-<!--            },-->
-<!--            {-->
-<!--              "name": "Sheet3",-->
-<!--              "color": "",-->
-<!--              "index": 2,-->
-<!--              "status": 0,-->
-<!--              "order": 2,-->
-<!--              "celldata": [],-->
-<!--              "config": {},-->
-<!--            }*/-->
-<!--          ]-->
-
-<!--        }-->
-<!--        luckysheet.create(options)-->
-
-<!--      },-->
-<!--      Excel(e) {-->
-<!--        let that = this-->
-<!--        // 错误情况判断-->
-<!--        const files = e.target.files-->
-<!--        if (files.length <= 0) {-->
-<!--          return false;-->
-<!--        } else if (!/\.(xls|xlsx)$/.test(files[0].name.toLowerCase())) {-->
-<!--          this.$message({-->
-<!--            message: "上传格式不正确，请上传xls或者xlsx格式",-->
-<!--            type: "warning"-->
-<!--          });-->
-<!--          return false-->
-<!--        } else {-->
-<!--          that.upload_file = files[0].name-->
-<!--        }-->
-<!--        // 读取表格-->
-<!--        const fileReader = new FileReader()-->
-<!--        fileReader.onload = ev => {-->
-<!--          try {-->
-<!--            const data = ev.target.result;-->
-<!--            const workbook = XLSX.read(data, {-->
-<!--              type: "binary"-->
-<!--            })-->
-<!--            // 读取第一张表-->
-<!--            const wsname = workbook.SheetNames[0]-->
-<!--            const ws = XLSX.utils.sheet_to_json(workbook.Sheets[wsname])-->
-<!--            // 打印 ws 就可以看到读取出的表格数据-->
-<!--            console.log(ws)-->
-<!--            // 定义一个新数组，存放处理后的表格数据-->
-<!--            that.lists = []-->
-<!--            ws.forEach(item => {-->
-<!--              that.lists.push({-->
-<!--                // 对ws进行处理后放进lists内-->
-<!--              })-->
-<!--            })-->
-<!--            // 调用方法将lists数组发送给后端-->
-<!--            this.submit_form(that.lists)-->
-<!--          } catch (e) {-->
-<!--            return false-->
-<!--          }-->
-<!--        }-->
-<!--        fileReader.readAsBinaryString(files[0])-->
-<!--      },-->
-<!--      /** 导入事件*/-->
-<!--      handleFileChange(evt) {-->
-<!--        let name = evt.name-->
-<!--        let suffixArr = name.split('.'),-->
-<!--          suffix = suffixArr[suffixArr.length - 1]-->
-<!--        if (suffix != 'xlsx') {-->
-<!--          alert('当前仅支持导入xlsx文件')-->
-<!--          return-->
-<!--        }-->
-<!--        LuckyExcel.transformExcelToLucky(-->
-<!--          evt,-->
-<!--          function(exportJson, luckysheetfile) {-->
-
-
-<!--            if (exportJson.sheets == null || exportJson.sheets.length == 0) {-->
-<!--              alert(-->
-<!--                '无法读取excel文件的内容，目前不支持xls文件!'-->
-<!--              )-->
-<!--              return-->
-<!--            }-->
-
-<!--            luckysheet.destroy()-->
-
-<!--            luckysheet.create({-->
-<!--              container: 'luckysheet', //luckysheet is the container id-->
-<!--              title: exportJson.info.name,-->
-<!--              lang: 'zh', // 设定表格语言-->
-<!--              showinfobar: false,-->
-<!--              data: exportJson.sheets,-->
-<!--              userInfo: exportJson.info.name.creator-->
-<!--            })-->
-<!--          }-->
-<!--        )-->
-<!--      },-->
-<!--    }-->
-<!--// 配置项-->
-
-<!--  };-->
-<!--</script>-->
+    // /** 导出按钮操作 */
+    // handleExport() {
+    //   const queryParams = this.queryParams;
+    //   this.$confirm('是否确认导出所有导入规则数据项?', "警告", {
+    //     confirmButtonText: "确定",
+    //     cancelButtonText: "取消",
+    //     type: "warning"
+    //   }).then(function() {
+    //     return exportMyluckyexcel(queryParams);
+    //   }).then(response => {
+    //     this.download(response.msg);
+    //   })
+    // }
+  }
+}
+</script>

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);