From 04303f6923bd45f87700983e8cafd120e8ccfc45 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期五, 27 六月 2025 17:58:49 +0800
Subject: [PATCH] art: 删除、注释无用代码
---
/dev/null | 67 ----------------------
src/main/java/org/jeecg/modules/flowable/service/impl/FlowThirdServiceImpl.java | 2
src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java | 46 +++++++--------
src/main/java/org/jeecg/modules/system/service/impl/SysDepartServiceImpl.java | 6 -
src/main/java/org/jeecg/modules/system/entity/SysDepartPermission.java | 5 -
src/main/java/org/jeecg/modules/system/entity/SysDepartRoleUser.java | 5 -
6 files changed, 24 insertions(+), 107 deletions(-)
diff --git a/src/main/java/org/jeecg/modules/dncFlow/FlowThirdServiceImpl.java b/src/main/java/org/jeecg/modules/flowable/service/impl/FlowThirdServiceImpl.java
similarity index 98%
rename from src/main/java/org/jeecg/modules/dncFlow/FlowThirdServiceImpl.java
rename to src/main/java/org/jeecg/modules/flowable/service/impl/FlowThirdServiceImpl.java
index f989792..946ae98 100644
--- a/src/main/java/org/jeecg/modules/dncFlow/FlowThirdServiceImpl.java
+++ b/src/main/java/org/jeecg/modules/flowable/service/impl/FlowThirdServiceImpl.java
@@ -1,4 +1,4 @@
-package org.jeecg.modules.dncFlow;
+package org.jeecg.modules.flowable.service.impl;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
diff --git a/src/main/java/org/jeecg/modules/ngalain/aop/LogRecordAspect.java b/src/main/java/org/jeecg/modules/ngalain/aop/LogRecordAspect.java
deleted file mode 100644
index 7f62785..0000000
--- a/src/main/java/org/jeecg/modules/ngalain/aop/LogRecordAspect.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package org.jeecg.modules.ngalain.aop;//package org.jeecg.modules.ngalain.aop;
-//
-//import javax.servlet.http.HttpServletRequest;
-//
-//import org.aspectj.lang.ProceedingJoinPoint;
-//import org.aspectj.lang.annotation.Around;
-//import org.aspectj.lang.annotation.Aspect;
-//import org.aspectj.lang.annotation.Pointcut;
-//import org.springframework.context.annotation.Configuration;
-//import org.springframework.web.context.request.RequestAttributes;
-//import org.springframework.web.context.request.RequestContextHolder;
-//import org.springframework.web.context.request.ServletRequestAttributes;
-//import org.slf4j.Logger;
-//import org.slf4j.LoggerFactory;;
-//
-//
-//// 鏆傛椂娉ㄩ噴鎺夛紝鎻愰珮绯荤粺鎬ц兘
-////@Aspect //瀹氫箟涓�涓垏闈�
-////@Configuration
-//public class LogRecordAspect {
-//private static final Logger logger = LoggerFactory.getLogger(LogRecordAspect.class);
-//
-// // 瀹氫箟鍒囩偣Pointcut
-// @Pointcut("execution(public * org.jeecg.modules.*.*.*Controller.*(..))")
-// public void excudeService() {
-// }
-//
-// @Around("excudeService()")
-// public Object doAround(ProceedingJoinPoint pjp) throws Throwable {
-// RequestAttributes ra = RequestContextHolder.getRequestAttributes();
-// ServletRequestAttributes sra = (ServletRequestAttributes) ra;
-// HttpServletRequest request = sra.getRequest();
-//
-// String url = request.getRequestURL().toString();
-// String method = request.getMethod();
-// String uri = request.getRequestURI();
-// String queryString = request.getQueryString();
-// logger.info("璇锋眰寮�濮�, 鍚勪釜鍙傛暟, url: {}, method: {}, uri: {}, params: {}", url, method, uri, queryString);
-//
-// // result鐨勫�煎氨鏄鎷︽埅鏂规硶鐨勮繑鍥炲��
-// Object result = pjp.proceed();
-//
-// logger.info("璇锋眰缁撴潫锛宑ontroller鐨勮繑鍥炲�兼槸 " + result);
-// return result;
-// }
-//}
\ No newline at end of file
diff --git a/src/main/java/org/jeecg/modules/ngalain/controller/NgAlainController.java b/src/main/java/org/jeecg/modules/ngalain/controller/NgAlainController.java
deleted file mode 100644
index 58a9c4c..0000000
--- a/src/main/java/org/jeecg/modules/ngalain/controller/NgAlainController.java
+++ /dev/null
@@ -1,86 +0,0 @@
-package org.jeecg.modules.ngalain.controller;//package org.jeecg.modules.ngalain.controller;
-//
-//import java.util.ArrayList;
-//import java.util.List;
-//import java.util.Map;
-//
-//import javax.servlet.http.HttpServletRequest;
-//
-//import org.apache.shiro.SecurityUtils;
-//import org.jeecg.common.api.vo.Result;
-//import org.jeecg.common.system.vo.DictModel;
-//import org.jeecg.common.system.vo.LoginUser;
-//import org.jeecg.modules.ngalain.service.NgAlainService;
-//import org.jeecg.modules.system.service.ISysDictService;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.web.bind.annotation.PathVariable;
-//import org.springframework.web.bind.annotation.RequestMapping;
-//import org.springframework.web.bind.annotation.RequestMethod;
-//import org.springframework.web.bind.annotation.ResponseBody;
-//import org.springframework.web.bind.annotation.RestController;
-//
-//import com.alibaba.fastjson.JSONObject;
-//
-//import lombok.extern.slf4j.Slf4j;
-//
-//@Slf4j
-//@RestController
-//@RequestMapping("/sys/ng-alain")
-//public class NgAlainController {
-// @Autowired
-// private NgAlainService ngAlainService;
-// @Autowired
-// private ISysDictService sysDictService;
-//
-// @RequestMapping(value = "/getAppData")
-// @ResponseBody
-// public JSONObject getAppData(HttpServletRequest request) throws Exception {
-// String token=request.getHeader("X-Access-Token");
-// JSONObject j = new JSONObject();
-// LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-// JSONObject userObjcet = new JSONObject();
-// userObjcet.put("name", user.getUsername());
-// userObjcet.put("avatar", user.getAvatar());
-// userObjcet.put("email", user.getEmail());
-// userObjcet.put("token", token);
-// j.put("user", userObjcet);
-// j.put("menu",ngAlainService.getMenu(user.getUsername()));
-// JSONObject app = new JSONObject();
-// app.put("name", "jeecg-boot-angular");
-// app.put("description", "jeecg+ng-alain鏁村悎鐗堟湰");
-// j.put("app", app);
-// return j;
-// }
-//
-// @RequestMapping(value = "/getDictItems/{dictCode}", method = RequestMethod.GET)
-// public Object getDictItems(@PathVariable String dictCode) {
-// log.info(" dictCode : "+ dictCode);
-// Result<List<DictModel>> result = new Result<List<DictModel>>();
-// List<DictModel> ls = null;
-// try {
-// ls = sysDictService.queryDictItemsByCode(dictCode);
-// result.setSuccess(true);
-// result.setResult(ls);
-// } catch (Exception e) {
-// log.error(e.getMessage(),e);
-// result.error500("鎿嶄綔澶辫触");
-// return result;
-// }
-// List<JSONObject> dictlist=new ArrayList<>();
-// for (DictModel l : ls) {
-// JSONObject dict=new JSONObject();
-// try {
-// dict.put("value",Integer.parseInt(l.getValue()));
-// } catch (NumberFormatException e) {
-// dict.put("value",l.getValue());
-// }
-// dict.put("label",l.getText());
-// dictlist.add(dict);
-// }
-// return dictlist;
-// }
-// @RequestMapping(value = "/getDictItemsByTable/{table}/{key}/{value}", method = RequestMethod.GET)
-// public Object getDictItemsByTable(@PathVariable String table,@PathVariable String key,@PathVariable String value) {
-// return this.ngAlainService.getDictByTable(table,key,value);
-// }
-//}
diff --git a/src/main/java/org/jeecg/modules/ngalain/service/NgAlainService.java b/src/main/java/org/jeecg/modules/ngalain/service/NgAlainService.java
deleted file mode 100644
index 85d605d..0000000
--- a/src/main/java/org/jeecg/modules/ngalain/service/NgAlainService.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package org.jeecg.modules.ngalain.service;
-
-import com.alibaba.fastjson.JSONArray;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * @Description: NgAlainService鎺ュ彛
- * @author: jeecg-boot
- */
-public interface NgAlainService {
- /**
- * 鑿滃崟
- * @param id
- * @return JSONArray
- * @throws Exception
- */
- public JSONArray getMenu(String id) throws Exception;
-
- /**
- * jeecg鑿滃崟
- * @param id
- * @return JSONArray
- * @throws Exception
- */
- public JSONArray getJeecgMenu(String id) throws Exception;
-
- /**
- * 鑾峰彇瀛楀吀鍊�
- * @param table
- * @param key
- * @param value
- * @return List<Map<String, String>>
- */
- public List<Map<String, String>> getDictByTable(String table, String key, String value);
-}
diff --git a/src/main/java/org/jeecg/modules/ngalain/service/impl/NgAlainServiceImpl.java b/src/main/java/org/jeecg/modules/ngalain/service/impl/NgAlainServiceImpl.java
deleted file mode 100644
index bcad44a..0000000
--- a/src/main/java/org/jeecg/modules/ngalain/service/impl/NgAlainServiceImpl.java
+++ /dev/null
@@ -1,187 +0,0 @@
-package org.jeecg.modules.ngalain.service.impl;
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import org.jeecg.common.constant.CommonConstant;
-import org.jeecg.common.constant.SymbolConstant;
-import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.ngalain.service.NgAlainService;
-import org.jeecg.modules.system.entity.SysPermission;
-import org.jeecg.modules.system.mapper.SysDictMapper;
-import org.jeecg.modules.system.service.ISysPermissionService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.Base64;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @Description: NgAlainServiceImpl 瀹炵幇绫�
- * @author: jeecg-boot
- */
-@Service("ngAlainService")
-public class NgAlainServiceImpl implements NgAlainService {
- @Autowired
- private ISysPermissionService sysPermissionService;
- @Autowired
- private SysDictMapper mapper;
- @Override
- public JSONArray getMenu(String id) throws Exception {
- return getJeecgMenu(id);
- }
- @Override
- public JSONArray getJeecgMenu(String id) throws Exception {
- List<SysPermission> metaList = sysPermissionService.queryByUser(id);
- JSONArray jsonArray = new JSONArray();
- getPermissionJsonArray(jsonArray, metaList, null);
- JSONArray menulist= parseNgAlain(jsonArray);
- JSONObject jeecgMenu = new JSONObject();
- jeecgMenu.put("text", "jeecg鑿滃崟");
- jeecgMenu.put("group",true);
- jeecgMenu.put("children", menulist);
- JSONArray jeecgMenuList=new JSONArray();
- jeecgMenuList.add(jeecgMenu);
- return jeecgMenuList;
- }
-
- @Override
- public List<Map<String, String>> getDictByTable(String table, String key, String value) {
- return this.mapper.getDictByTableNgAlain(table,key,value);
- }
-
- private JSONArray parseNgAlain(JSONArray jsonArray) {
- JSONArray menulist=new JSONArray();
- for (Object object : jsonArray) {
- JSONObject jsonObject= (JSONObject) object;
- String path= (String) jsonObject.get("path");
- JSONObject meta= (JSONObject) jsonObject.get("meta");
- JSONObject menu=new JSONObject();
- menu.put("text",meta.get("title"));
- menu.put("reuse",true);
- if (jsonObject.get("children")!=null){
- JSONArray child= parseNgAlain((JSONArray) jsonObject.get("children"));
- menu.put("children",child);
- JSONObject icon=new JSONObject();
- icon.put("type", "icon");
- icon.put("value", meta.get("icon"));
- menu.put("icon",icon);
- }else {
- menu.put("link",path);
- }
- menulist.add(menu);
- }
- return menulist;
- }
-
- /**
- * 鑾峰彇鑿滃崟JSON鏁扮粍
- * @param jsonArray
- * @param metaList
- * @param parentJson
- */
- private void getPermissionJsonArray(JSONArray jsonArray,List<SysPermission> metaList,JSONObject parentJson) {
- for (SysPermission permission : metaList) {
- if(permission.getMenuType()==null) {
- continue;
- }
- String tempPid = permission.getParentId();
- JSONObject json = getPermissionJsonObject(permission);
- if(parentJson==null && oConvertUtils.isEmpty(tempPid)) {
- jsonArray.add(json);
- if(!permission.isLeaf()) {
- getPermissionJsonArray(jsonArray, metaList, json);
- }
- }else if(parentJson!=null && oConvertUtils.isNotEmpty(tempPid) && tempPid.equals(parentJson.getString("id"))){
- if(permission.getMenuType()==0) {
- JSONObject metaJson = parentJson.getJSONObject("meta");
- if(metaJson.containsKey("permissionList")) {
- metaJson.getJSONArray("permissionList").add(json);
- }else {
- JSONArray permissionList = new JSONArray();
- permissionList.add(json);
- metaJson.put("permissionList", permissionList);
- }
-
- }else if(permission.getMenuType()==1) {
- if(parentJson.containsKey("children")) {
- parentJson.getJSONArray("children").add(json);
- }else {
- JSONArray children = new JSONArray();
- children.add(json);
- parentJson.put("children", children);
- }
-
- if(!permission.isLeaf()) {
- getPermissionJsonArray(jsonArray, metaList, json);
- }
- }
- }
-
-
- }
- }
- private JSONObject getPermissionJsonObject(SysPermission permission) {
- JSONObject json = new JSONObject();
- //绫诲瀷(0锛氫竴绾ц彍鍗� 1锛氬瓙鑿滃崟 2锛氭寜閽�)
- if(CommonConstant.MENU_TYPE_2.equals(permission.getMenuType())) {
- json.put("action", permission.getPerms());
- json.put("describe", permission.getName());
- }else if(CommonConstant.MENU_TYPE_0.equals(permission.getMenuType()) || CommonConstant.MENU_TYPE_1.equals(permission.getMenuType())) {
- json.put("id", permission.getId());
- boolean flag = permission.getUrl()!=null&&(permission.getUrl().startsWith(CommonConstant.HTTP_PROTOCOL)||permission.getUrl().startsWith(CommonConstant.HTTPS_PROTOCOL));
- if(flag) {
- String url= new String(Base64.getUrlEncoder().encode(permission.getUrl().getBytes()));
- json.put("path", "/sys/link/" +url.replaceAll("=",""));
- }else {
- json.put("path", permission.getUrl());
- }
-
- //閲嶈瑙勫垯锛氳矾鐢眓ame (閫氳繃URL鐢熸垚璺敱name,璺敱name渚涘墠绔紑鍙戯紝椤甸潰璺宠浆浣跨敤)
- json.put("name", urlToRouteName(permission.getUrl()));
-
- //鏄惁闅愯棌璺敱锛岄粯璁ら兘鏄樉绀虹殑
- if(permission.isHidden()) {
- json.put("hidden",true);
- }
- //鑱氬悎璺敱
- if(permission.isAlwaysShow()) {
- json.put("alwaysShow",true);
- }
- json.put("component", permission.getComponent());
- JSONObject meta = new JSONObject();
- meta.put("title", permission.getName());
- if(oConvertUtils.isEmpty(permission.getParentId())) {
- //涓�绾ц彍鍗曡烦杞湴鍧�
- json.put("redirect",permission.getRedirect());
- meta.put("icon", oConvertUtils.getString(permission.getIcon(), ""));
- }else {
- meta.put("icon", oConvertUtils.getString(permission.getIcon(), ""));
- }
- if(flag) {
- meta.put("url", permission.getUrl());
- }
- json.put("meta", meta);
- }
-
- return json;
- }
- /**
- * 閫氳繃URL鐢熸垚璺敱name锛堝幓鎺塙RL鍓嶇紑鏂滄潬锛屾浛鎹㈠唴瀹逛腑鐨勬枩鏉犫��/鈥欎负-锛�
- * 涓句緥锛� URL = /isystem/role
- * RouteName = isystem-role
- * @return
- */
- private String urlToRouteName(String url) {
- if(oConvertUtils.isNotEmpty(url)) {
- if(url.startsWith(SymbolConstant.SINGLE_SLASH)) {
- url = url.substring(1);
- }
- url = url.replace("/", "-");
- return url;
- }else {
- return null;
- }
- }
-}
diff --git a/src/main/java/org/jeecg/modules/system/controller/DataVersionController.java b/src/main/java/org/jeecg/modules/system/controller/DataVersionController.java
deleted file mode 100644
index 05645e8..0000000
--- a/src/main/java/org/jeecg/modules/system/controller/DataVersionController.java
+++ /dev/null
@@ -1,162 +0,0 @@
-package org.jeecg.modules.system.controller;
-
-import java.util.Arrays;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.system.base.entity.DataVersion;
-import org.jeecg.modules.system.service.IDataVersionService;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import lombok.extern.slf4j.Slf4j;
-
-import org.jeecg.common.system.base.controller.JeecgController;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.servlet.ModelAndView;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.jeecg.common.aspect.annotation.AutoLog;
-
- /**
- * @Description: mom_sys_data_version
- * @Author: jeecg-boot
- * @Date: 2022-12-07
- * @Version: V1.0
- */
-@Api(tags="鐗堟湰鎺у埗")
-@RestController
-@RequestMapping("/base/dataVersion")
-@Slf4j
-public class DataVersionController extends JeecgController<DataVersion, IDataVersionService> {
- @Autowired
- private IDataVersionService dataVersionService;
-
- /**
- * 鍒嗛〉鍒楄〃鏌ヨ
- *
- * @param dataVersion
- * @param pageNo
- * @param pageSize
- * @param req
- * @return
- */
- //@AutoLog(value = "mom_sys_data_version-鍒嗛〉鍒楄〃鏌ヨ")
- @ApiOperation(value="mom_sys_data_version-鍒嗛〉鍒楄〃鏌ヨ", notes="mom_sys_data_version-鍒嗛〉鍒楄〃鏌ヨ")
- @GetMapping(value = "/list")
- public Result<IPage<DataVersion>> queryPageList(DataVersion dataVersion,
- @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
- @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
- HttpServletRequest req) {
- QueryWrapper<DataVersion> queryWrapper = QueryGenerator.initQueryWrapper(dataVersion, req.getParameterMap());
- Page<DataVersion> page = new Page<DataVersion>(pageNo, pageSize);
- IPage<DataVersion> pageList = dataVersionService.page(page, queryWrapper);
- return Result.OK(pageList);
- }
-
- /**
- * 娣诲姞
- *
- * @param dataVersion
- * @return
- */
- @AutoLog(value = "mom_sys_data_version-娣诲姞")
- @ApiOperation(value="mom_sys_data_version-娣诲姞", notes="mom_sys_data_version-娣诲姞")
- //@RequiresPermissions("org.jeecg.modules.demo:mom_sys_data_version:add")
- @PostMapping(value = "/add")
- public Result<String> add(@RequestBody DataVersion dataVersion) {
- dataVersionService.save(dataVersion);
- return Result.OK("娣诲姞鎴愬姛锛�");
- }
-
- /**
- * 缂栬緫
- *
- * @param dataVersion
- * @return
- */
- @AutoLog(value = "mom_sys_data_version-缂栬緫")
- @ApiOperation(value="mom_sys_data_version-缂栬緫", notes="mom_sys_data_version-缂栬緫")
- //@RequiresPermissions("org.jeecg.modules.demo:mom_sys_data_version:edit")
- @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
- public Result<String> edit(@RequestBody DataVersion dataVersion) {
- dataVersionService.updateById(dataVersion);
- return Result.OK("缂栬緫鎴愬姛!");
- }
-
- /**
- * 閫氳繃id鍒犻櫎
- *
- * @param id
- * @return
- */
- @AutoLog(value = "mom_sys_data_version-閫氳繃id鍒犻櫎")
- @ApiOperation(value="mom_sys_data_version-閫氳繃id鍒犻櫎", notes="mom_sys_data_version-閫氳繃id鍒犻櫎")
- //@RequiresPermissions("org.jeecg.modules.demo:mom_sys_data_version:delete")
- @DeleteMapping(value = "/delete")
- public Result<String> delete(@RequestParam(name="id",required=true) String id) {
- dataVersionService.removeById(id);
- return Result.OK("鍒犻櫎鎴愬姛!");
- }
-
- /**
- * 鎵归噺鍒犻櫎
- *
- * @param ids
- * @return
- */
- @AutoLog(value = "mom_sys_data_version-鎵归噺鍒犻櫎")
- @ApiOperation(value="mom_sys_data_version-鎵归噺鍒犻櫎", notes="mom_sys_data_version-鎵归噺鍒犻櫎")
- //@RequiresPermissions("org.jeecg.modules.demo:mom_sys_data_version:deleteBatch")
- @DeleteMapping(value = "/deleteBatch")
- public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
- this.dataVersionService.removeByIds(Arrays.asList(ids.split(",")));
- return Result.OK("鎵归噺鍒犻櫎鎴愬姛!");
- }
-
- /**
- * 閫氳繃id鏌ヨ
- *
- * @param id
- * @return
- */
- //@AutoLog(value = "mom_sys_data_version-閫氳繃id鏌ヨ")
- @ApiOperation(value="mom_sys_data_version-閫氳繃id鏌ヨ", notes="mom_sys_data_version-閫氳繃id鏌ヨ")
- @GetMapping(value = "/queryById")
- public Result<DataVersion> queryById(@RequestParam(name="id",required=true) String id) {
- DataVersion dataVersion = dataVersionService.getById(id);
- if(dataVersion==null) {
- return Result.error("鏈壘鍒板搴旀暟鎹�");
- }
- return Result.OK(dataVersion);
- }
-
- /**
- * 瀵煎嚭excel
- *
- * @param request
- * @param dataVersion
- */
- //@RequiresPermissions("org.jeecg.modules.demo:mom_sys_data_version:exportXls")
- @RequestMapping(value = "/exportXls")
- public ModelAndView exportXls(HttpServletRequest request, DataVersion dataVersion) {
- return super.exportXls(request, dataVersion, DataVersion.class, "mom_sys_data_version");
- }
-
- /**
- * 閫氳繃excel瀵煎叆鏁版嵁
- *
- * @param request
- * @param response
- * @return
- */
- //@RequiresPermissions("mom_sys_data_version:importExcel")
- @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
- public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
- return super.importExcel(request, response, DataVersion.class);
- }
-
-}
diff --git a/src/main/java/org/jeecg/modules/system/controller/SysIdentityController.java b/src/main/java/org/jeecg/modules/system/controller/SysIdentityController.java
deleted file mode 100644
index 05f93aa..0000000
--- a/src/main/java/org/jeecg/modules/system/controller/SysIdentityController.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package org.jeecg.modules.system.controller;
-
-import io.swagger.annotations.Api;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.modules.system.service.SysIdentityService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController
-@RequestMapping("/base/sysIdentity")
-@Api(value = "鍗曞彿鐢熸垚鍣� 鍓嶇鎺у埗鍣�")
-public class SysIdentityController {
- @Autowired
- @Lazy
- private SysIdentityService sysIdentityService;
- // 鏂板
- @GetMapping("/getNumNew")
- public Result<?> getNum(@RequestParam(name="type",required = true)String type,
- @RequestParam(name="length",defaultValue = "4")Integer length) {
- String serialNum = sysIdentityService.getNumByTypeAndLength(type, length);
- return Result.ok(serialNum);
- }
-}
diff --git a/src/main/java/org/jeecg/modules/system/entity/DncDevicePermission.java b/src/main/java/org/jeecg/modules/system/entity/DncDevicePermission.java
deleted file mode 100644
index c2a0643..0000000
--- a/src/main/java/org/jeecg/modules/system/entity/DncDevicePermission.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package org.jeecg.modules.system.entity;
-
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.util.Date;
-
-@Data
-@NoArgsConstructor
-@TableName(value = "nc_device_permission")
-public class DncDevicePermission {
- public DncDevicePermission( String deviceId,String userId) {
- this.userId = userId;
- this.deviceId = deviceId;
- }
-
- @TableId(value = "device_perm_id")
- private String devicePermId;
- @TableField(value = "device_id")
- private String deviceId;
- @TableField(value = "user_id")
- private String userId;
- @JsonIgnore
- @TableField(value = "create_time", select = false, fill = FieldFill.INSERT)
- private Date createTime;
- @JsonIgnore
- @TableField(value = "create_by", select = false, fill = FieldFill.INSERT)
- private String createBy;
-
-}
diff --git a/src/main/java/org/jeecg/modules/system/entity/MdcEquipmentDepart.java b/src/main/java/org/jeecg/modules/system/entity/MdcEquipmentDepart.java
deleted file mode 100644
index 05958de..0000000
--- a/src/main/java/org/jeecg/modules/system/entity/MdcEquipmentDepart.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package org.jeecg.modules.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * 璁惧閮ㄩ棬
- * @author: LiuS
- * @create: 2023-03-27 17:22
- */
-@Data
-@TableName("mdc_equipment_depart")
-public class MdcEquipmentDepart implements Serializable {
-
- private static final long serialVersionUID = 6205064364855569581L;
-
- /**涓婚敭id*/
- @TableId(type = IdType.ASSIGN_ID)
- private String id;
- /**璁惧id*/
- private String equipmentId;
- /**閮ㄩ棬id*/
- private String depId;
- public MdcEquipmentDepart(String id, String equipmentId, String depId) {
- super();
- this.id = id;
- this.equipmentId = equipmentId;
- this.depId = depId;
- }
-
- public MdcEquipmentDepart(String id, String departId) {
- this.equipmentId = id;
- this.depId = departId;
- }
-}
diff --git a/src/main/java/org/jeecg/modules/system/entity/MdcProductionEquipment.java b/src/main/java/org/jeecg/modules/system/entity/MdcProductionEquipment.java
deleted file mode 100644
index cb2d4b5..0000000
--- a/src/main/java/org/jeecg/modules/system/entity/MdcProductionEquipment.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package org.jeecg.modules.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-
-/**
- * 浜х嚎璁惧
- *
- * @author: LiuS
- * @create: 2023-03-24 15:54
- */
-@Data
-@TableName("mdc_production_equipment")
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value = "mdc_production_equipment瀵硅薄", description = "浜х嚎璁惧琛�")
-public class MdcProductionEquipment implements Serializable {
-
- private static final long serialVersionUID = 1684188898785392096L;
-
- /**
- * 涓婚敭id
- */
- @TableId(type = IdType.ASSIGN_ID)
- private String id;
- /**
- * 浜х嚎id
- */
- private String productionId;
- /**
- * 璁惧id
- */
- private String equipmentId;
-
- public MdcProductionEquipment(String id, String productionId, String equipmentId) {
- super();
- this.id = id;
- this.productionId = productionId;
- this.equipmentId = equipmentId;
- }
-
- public MdcProductionEquipment(String id, String productionId) {
- this.equipmentId = id;
- this.productionId = productionId;
- }
-}
diff --git a/src/main/java/org/jeecg/modules/system/entity/SysDepartPermission.java b/src/main/java/org/jeecg/modules/system/entity/SysDepartPermission.java
index 4d47ce3..db03978 100644
--- a/src/main/java/org/jeecg/modules/system/entity/SysDepartPermission.java
+++ b/src/main/java/org/jeecg/modules/system/entity/SysDepartPermission.java
@@ -1,18 +1,13 @@
package org.jeecg.modules.system.entity;
-import java.io.Serializable;
-import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
/**
diff --git a/src/main/java/org/jeecg/modules/system/entity/SysDepartRoleUser.java b/src/main/java/org/jeecg/modules/system/entity/SysDepartRoleUser.java
index 5839019..c2a5d01 100644
--- a/src/main/java/org/jeecg/modules/system/entity/SysDepartRoleUser.java
+++ b/src/main/java/org/jeecg/modules/system/entity/SysDepartRoleUser.java
@@ -1,18 +1,13 @@
package org.jeecg.modules.system.entity;
-import java.io.Serializable;
-import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
/**
diff --git a/src/main/java/org/jeecg/modules/system/entity/SysIdentity.java b/src/main/java/org/jeecg/modules/system/entity/SysIdentity.java
deleted file mode 100644
index b4a80ef..0000000
--- a/src/main/java/org/jeecg/modules/system/entity/SysIdentity.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package org.jeecg.modules.system.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import org.jeecg.common.system.base.entity.JeecgEntity;
-
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("mom_sys_identity")
-@ApiModel(value = "鍗曟嵁娴佹按鍙风敓鎴愯〃")
-public class SysIdentity extends JeecgEntity {
-
- // private static final long serialVersionUID = 1L;
-
- @ApiModelProperty(value = "娴佹按鍙�")
- private int num;
-
- @ApiModelProperty(value = "鏈堜唤")
- private String monthValue;
-
- @ApiModelProperty(value = "骞翠唤")
- private String yearValue;
-
- @ApiModelProperty(value = "涓氬姟绫诲瀷")
- private String type;
-
- @ApiModelProperty(value = "涓氬姟绫诲瀷璇存槑")
- private String remark;
-
- @ApiModelProperty(value = "鍓嶇疆缂栫爜")
- private String prifix;
-
- @ApiModelProperty(value = "缂栫爜瑙勫垯")
- private String encodeRuleId;
-}
diff --git a/src/main/java/org/jeecg/modules/system/mapper/DncDevicePermissionMapper.java b/src/main/java/org/jeecg/modules/system/mapper/DncDevicePermissionMapper.java
deleted file mode 100644
index b380b68..0000000
--- a/src/main/java/org/jeecg/modules/system/mapper/DncDevicePermissionMapper.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.jeecg.modules.system.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.jeecg.modules.system.entity.DncDevicePermission;
-
-/**
- * @author: Lyh
- * @description: 杞﹂棿鏉冮檺Mapper鎺ュ彛
- * @create: 2023-04-07 11:17
- */
-public interface DncDevicePermissionMapper extends BaseMapper<DncDevicePermission> {
-
-}
diff --git a/src/main/java/org/jeecg/modules/system/mapper/MdcEquipmentDepartMapper.java b/src/main/java/org/jeecg/modules/system/mapper/MdcEquipmentDepartMapper.java
deleted file mode 100644
index 08ab138..0000000
--- a/src/main/java/org/jeecg/modules/system/mapper/MdcEquipmentDepartMapper.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package org.jeecg.modules.system.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.jeecg.modules.system.entity.MdcEquipmentDepart;
-
-/**
- * @author: LiuS
- * @create: 2023-03-27 17:27
- */
-public interface MdcEquipmentDepartMapper extends BaseMapper<MdcEquipmentDepart> {
-}
diff --git a/src/main/java/org/jeecg/modules/system/mapper/MdcProductionEquipmentMapper.java b/src/main/java/org/jeecg/modules/system/mapper/MdcProductionEquipmentMapper.java
deleted file mode 100644
index 1dce73d..0000000
--- a/src/main/java/org/jeecg/modules/system/mapper/MdcProductionEquipmentMapper.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.jeecg.modules.system.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.jeecg.modules.system.entity.MdcProductionEquipment;
-
-/**
- * 浜х嚎璁惧mapper鎺ュ彛
- *
- * @author: LiuS
- * @create: 2023-03-24 16:00
- */
-public interface MdcProductionEquipmentMapper extends BaseMapper<MdcProductionEquipment> {
-}
diff --git a/src/main/java/org/jeecg/modules/system/mapper/SysIdentityMapper.java b/src/main/java/org/jeecg/modules/system/mapper/SysIdentityMapper.java
deleted file mode 100644
index 962526c..0000000
--- a/src/main/java/org/jeecg/modules/system/mapper/SysIdentityMapper.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.jeecg.modules.system.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
-import org.jeecg.modules.system.entity.SysIdentity;
-
-public interface SysIdentityMapper extends BaseMapper<SysIdentity> {
-
-
- @Select("select id," +
- "num," +
- "month_value," +
- "year_value," +
- "type," +
- "remark " +
- " from mom_sys_identity t1 where t1.type = #{type} and t1.year_value = #{yearValue} and t1.month_value =#{monthValue}")
- public SysIdentity findIdentityByType(@Param("type") String type, @Param("yearValue") String yearValue, @Param("monthValue") String monthValue);
-}
diff --git a/src/main/java/org/jeecg/modules/system/service/IDncDevicePermissionService.java b/src/main/java/org/jeecg/modules/system/service/IDncDevicePermissionService.java
deleted file mode 100644
index 49905f9..0000000
--- a/src/main/java/org/jeecg/modules/system/service/IDncDevicePermissionService.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.jeecg.modules.system.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import org.jeecg.modules.system.entity.DncDevicePermission;
-
-public interface IDncDevicePermissionService extends IService<DncDevicePermission> {
-
- /**
- * 鏂板璁惧鏉冮檺
- * @param EquipmentId 璁惧ID
- * @param userId 鐢ㄦ埛ID
- */
- public void addDevicePermission(String EquipmentId, String userId);
-
-}
diff --git a/src/main/java/org/jeecg/modules/system/service/SysIdentityService.java b/src/main/java/org/jeecg/modules/system/service/SysIdentityService.java
deleted file mode 100644
index eba387c..0000000
--- a/src/main/java/org/jeecg/modules/system/service/SysIdentityService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.jeecg.modules.system.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import org.jeecg.modules.system.entity.SysIdentity;
-
-public interface SysIdentityService extends IService<SysIdentity> {
-
- public SysIdentity findIdentityByType(String type);
-
- /**
- * 鏍规嵁绫诲瀷鍜岄暱搴﹁幏鍙栨祦姘村彿
- * @param type
- * @return
- */
- public String getNumByTypeAndLength(String type, Integer length);
-}
diff --git a/src/main/java/org/jeecg/modules/system/service/impl/DncDevicePermissionServiceImpl.java b/src/main/java/org/jeecg/modules/system/service/impl/DncDevicePermissionServiceImpl.java
deleted file mode 100644
index 0921430..0000000
--- a/src/main/java/org/jeecg/modules/system/service/impl/DncDevicePermissionServiceImpl.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package org.jeecg.modules.system.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.jeecg.modules.system.entity.DncDevicePermission;
-import org.jeecg.modules.system.entity.SysUser;
-import org.jeecg.modules.system.mapper.DncDevicePermissionMapper;
-import org.jeecg.modules.system.service.IDncDevicePermissionService;
-import org.jeecg.modules.system.service.ISysUserService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Service
-public class DncDevicePermissionServiceImpl extends ServiceImpl<DncDevicePermissionMapper, DncDevicePermission> implements IDncDevicePermissionService {
- @Autowired
- private ISysUserService sysUserService;
-
- @Override
- public void addDevicePermission(String EquipmentId, String userId) {
- DncDevicePermission dncDevicePermission=new DncDevicePermission(EquipmentId,userId);
- List<DncDevicePermission> devicePermissionList=super.list(new LambdaQueryWrapper<DncDevicePermission>().eq(DncDevicePermission::getDeviceId,EquipmentId)
- .eq(DncDevicePermission::getUserId,userId));
- if (!devicePermissionList.isEmpty()){
- return;
- }
- SysUser sysUser=sysUserService.getUserByName("admin");
- if (userId.equals(sysUser.getId())) {
- // 绠＄悊鍛樻柊澧�
- super.save(dncDevicePermission);
- }else {
- // 闈炵鐞嗗憳鏂板锛岄粯璁ゆ坊鍔犵鐞嗗憳鏉冮檺
- List<DncDevicePermission> dncDevicePermissions=new ArrayList<>();
- dncDevicePermissions.add(dncDevicePermission);
- dncDevicePermissions.add(new DncDevicePermission(EquipmentId,sysUser.getId()));
- super.saveBatch(dncDevicePermissions);
- }
-
- }
-}
diff --git a/src/main/java/org/jeecg/modules/system/service/impl/SysDepartServiceImpl.java b/src/main/java/org/jeecg/modules/system/service/impl/SysDepartServiceImpl.java
index 7762723..c3ba253 100644
--- a/src/main/java/org/jeecg/modules/system/service/impl/SysDepartServiceImpl.java
+++ b/src/main/java/org/jeecg/modules/system/service/impl/SysDepartServiceImpl.java
@@ -54,8 +54,6 @@
private SysDepartRoleUserMapper departRoleUserMapper;
@Autowired
private SysUserMapper sysUserMapper;
- @Resource
- private MdcEquipmentDepartMapper mdcEquipmentDepartMapper;
@Override
public List<SysDepartTreeModel> queryMyDeptTreeList(String departIds) {
@@ -288,7 +286,7 @@
//鏍规嵁閮ㄩ棬id鍒犻櫎鐢ㄦ埛涓庨儴闂ㄥ叧绯�
userDepartMapper.delete(new LambdaQueryWrapper<SysUserDepart>().in(SysUserDepart::getDepId,idList));
//鏍规嵁閮ㄩ棬id鍒犻櫎璁惧涓庨儴闂ㄥ叧绯�
- mdcEquipmentDepartMapper.delete(new LambdaQueryWrapper<MdcEquipmentDepart>().in(MdcEquipmentDepart::getDepId, idList));
+// mdcEquipmentDepartMapper.delete(new LambdaQueryWrapper<MdcEquipmentDepart>().in(MdcEquipmentDepart::getDepId, idList));
//鏍规嵁閮ㄩ棬id鍒犻櫎閮ㄩ棬鎺堟潈
departPermissionMapper.delete(new LambdaQueryWrapper<SysDepartPermission>().in(SysDepartPermission::getDepartId,idList));
//鏍规嵁閮ㄩ棬id鍒犻櫎閮ㄩ棬瑙掕壊
@@ -383,7 +381,7 @@
//鏍规嵁閮ㄩ棬id鍒犻櫎鐢ㄦ埛涓庨儴闂ㄥ叧绯�
userDepartMapper.delete(new LambdaQueryWrapper<SysUserDepart>().in(SysUserDepart::getDepId, idList));
//鏍规嵁閮ㄩ棬id鍒犻櫎璁惧涓庨儴闂ㄥ叧绯�
- mdcEquipmentDepartMapper.delete(new LambdaQueryWrapper<MdcEquipmentDepart>().in(MdcEquipmentDepart::getDepId, idList));
+// mdcEquipmentDepartMapper.delete(new LambdaQueryWrapper<MdcEquipmentDepart>().in(MdcEquipmentDepart::getDepId, idList));
//鏍规嵁閮ㄩ棬id鍒犻櫎閮ㄩ棬鎺堟潈
departPermissionMapper.delete(new LambdaQueryWrapper<SysDepartPermission>().in(SysDepartPermission::getDepartId, idList));
//鏍规嵁閮ㄩ棬id鍒犻櫎閮ㄩ棬瑙掕壊
diff --git a/src/main/java/org/jeecg/modules/system/service/impl/SysIdentityServiceImpl.java b/src/main/java/org/jeecg/modules/system/service/impl/SysIdentityServiceImpl.java
deleted file mode 100644
index b968282..0000000
--- a/src/main/java/org/jeecg/modules/system/service/impl/SysIdentityServiceImpl.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package org.jeecg.modules.system.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.apache.commons.lang.StringUtils;
-import org.jeecg.common.util.DateUtils;
-import org.jeecg.modules.system.entity.SysIdentity;
-import org.jeecg.modules.system.mapper.SysIdentityMapper;
-import org.jeecg.modules.system.service.SysIdentityService;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.text.SimpleDateFormat;
-import java.util.List;
-
-@Service
-public class SysIdentityServiceImpl extends ServiceImpl<SysIdentityMapper, SysIdentity>
- implements SysIdentityService {
- /*@Autowired
- @Lazy
- private SerialNumberMapService serialNumberMapService;*/
-
- /**
- * 閫氳繃type鑾峰彇mom_sys_identity琛ㄥ疄渚嬶紝瀹炵幇鏂规硶
- *
- * @param type 涓氬姟绫诲瀷
- * @return SysIdentity mom_sys_identity琛ㄥ疄渚嬪璞�
- */
- @Override
- public SysIdentity findIdentityByType(String type) {
- String yearValue = DateUtils.date2Str(new SimpleDateFormat("yyyy"));
- String monthValue = DateUtils.date2Str(new SimpleDateFormat("MM"));
- SysIdentity identityByType = super.getBaseMapper().findIdentityByType(type, yearValue, monthValue);
- return identityByType;
- }
-
- @Override
- @Transactional(rollbackFor = {Exception.class})
- public String getNumByTypeAndLength(String type, Integer length) {
- String currentDate = DateUtils.getCurrentDateStr();
- String yearValue = currentDate.split("-")[0];
- String monthValue = currentDate.split("-")[1];
- List<SysIdentity> systemIdentityList =
- lambdaQuery()
- .eq(SysIdentity::getType, type)
- .eq(SysIdentity::getYearValue, yearValue)
- .eq(SysIdentity::getMonthValue, monthValue)
- .list();
- SysIdentity mesSysIdentity =
- systemIdentityList.size() > 0 ? systemIdentityList.get(0) : new SysIdentity();
- Integer num = 1;
- if (StringUtils.isBlank(mesSysIdentity.getId())) {
- mesSysIdentity.setType(type);
- mesSysIdentity.setMonthValue(monthValue);
- mesSysIdentity.setYearValue(yearValue);
- mesSysIdentity.setNum(num);
- super.saveOrUpdate(mesSysIdentity);
- } else {
- num = mesSysIdentity.getNum() + 1;
- mesSysIdentity.setNum(num);
- super.saveOrUpdate(mesSysIdentity);
- }
- String serialNum = StringUtils.leftPad(String.valueOf(num), length, "0");
- return serialNum;
- }
-
-
-}
diff --git a/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java b/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java
index 35ecc9a..89a4838 100644
--- a/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java
+++ b/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java
@@ -85,10 +85,6 @@
UserFactoryMapper userFactoryMapper;
@Resource
private ISysDictService sysDictService;
- @Resource
- private MdcProductionEquipmentMapper mdcProductionEquipmentMapper;
- @Resource
- private DncDevicePermissionMapper dncDevicePermissionMapper;
@Override
@CacheEvict(value = {CacheConstant.SYS_USERS_CACHE}, allEntries = true)
@@ -597,16 +593,16 @@
}
}
//step.5 淇濆瓨璁惧鏉冮檺
- List<String> EquipmentIds= mdcProductionEquipmentMapper.selectList(new QueryWrapper<MdcProductionEquipment>().in("production_id",arr))
- .stream().map(MdcProductionEquipment::getEquipmentId).collect(Collectors.toList());
- if (oConvertUtils.isNotEmpty(EquipmentIds)) {
- for (String equipmentId : EquipmentIds) {
- DncDevicePermission dncDevicePermission=new DncDevicePermission();
- dncDevicePermission.setDeviceId(equipmentId);
- dncDevicePermission.setUserId(user.getId());
- dncDevicePermissionMapper.insert(dncDevicePermission);
- }
- }
+// List<String> EquipmentIds= mdcProductionEquipmentMapper.selectList(new QueryWrapper<MdcProductionEquipment>().in("production_id",arr))
+// .stream().map(MdcProductionEquipment::getEquipmentId).collect(Collectors.toList());
+// if (oConvertUtils.isNotEmpty(EquipmentIds)) {
+// for (String equipmentId : EquipmentIds) {
+// DncDevicePermission dncDevicePermission=new DncDevicePermission();
+// dncDevicePermission.setDeviceId(equipmentId);
+// dncDevicePermission.setUserId(user.getId());
+// dncDevicePermissionMapper.insert(dncDevicePermission);
+// }
+// }
}
@Override
@@ -670,17 +666,17 @@
}
//step.5 淇敼璁惧鏉冮檺
//鍏堝垹鍚庡姞
- dncDevicePermissionMapper.delete(new QueryWrapper<DncDevicePermission>().lambda().eq(DncDevicePermission::getUserId, user.getId()));
- List<String> EquipmentIds= mdcProductionEquipmentMapper.selectList(new QueryWrapper<MdcProductionEquipment>().in("production_id",array))
- .stream().map(MdcProductionEquipment::getEquipmentId).collect(Collectors.toList());
- if (oConvertUtils.isNotEmpty(EquipmentIds)) {
- for (String equipmentId : EquipmentIds) {
- DncDevicePermission dncDevicePermission=new DncDevicePermission();
- dncDevicePermission.setDeviceId(equipmentId);
- dncDevicePermission.setUserId(user.getId());
- dncDevicePermissionMapper.insert(dncDevicePermission);
- }
- }
+// dncDevicePermissionMapper.delete(new QueryWrapper<DncDevicePermission>().lambda().eq(DncDevicePermission::getUserId, user.getId()));
+// List<String> EquipmentIds= mdcProductionEquipmentMapper.selectList(new QueryWrapper<MdcProductionEquipment>().in("production_id",array))
+// .stream().map(MdcProductionEquipment::getEquipmentId).collect(Collectors.toList());
+// if (oConvertUtils.isNotEmpty(EquipmentIds)) {
+// for (String equipmentId : EquipmentIds) {
+// DncDevicePermission dncDevicePermission=new DncDevicePermission();
+// dncDevicePermission.setDeviceId(equipmentId);
+// dncDevicePermission.setUserId(user.getId());
+// dncDevicePermissionMapper.insert(dncDevicePermission);
+// }
+// }
//step.6 淇敼鎵嬫満鍙峰拰閭
// 鏇存柊鎵嬫満鍙枫�侀偖绠辩┖瀛楃涓蹭负 null
userMapper.updateNullByEmptyString("email");
--
Gitblit v1.9.3