From 2166b1661ca1e94fae6e4631799a9997418bff43 Mon Sep 17 00:00:00 2001
From: cuijian <cuijian@xalxzn.com>
Date: 星期四, 26 六月 2025 11:40:37 +0800
Subject: [PATCH] 基础数据，产线，班次，班组
---
src/main/java/org/jeecg/modules/base/service/IUserFactoryService.java | 21
src/main/java/org/jeecg/modules/base/service/IFactoryService.java | 41
src/main/java/org/jeecg/modules/base/service/IShiftGroupService.java | 14
src/main/java/org/jeecg/modules/base/mapper/xml/FactoryMapper.xml | 4
src/main/java/org/jeecg/modules/base/mapper/xml/UserGroupMapper.xml | 4
src/main/java/org/jeecg/modules/base/mapper/UserFactoryMapper.java | 17
src/main/java/org/jeecg/modules/base/controller/ShiftGroupController.java | 185 +++
src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java | 34
src/main/java/org/jeecg/modules/system/mapper/SysUserMapper.java | 9
src/main/java/org/jeecg/modules/base/controller/FactoryController.java | 238 ++++
src/main/java/org/jeecg/modules/base/entity/ShiftGroup.java | 89 +
src/main/java/org/jeecg/modules/base/mapper/xml/ShiftGroupMapper.xml | 4
src/main/java/org/jeecg/modules/base/mapper/LineSideWarehouseMapper.java | 17
src/main/java/org/jeecg/modules/base/entity/UserGroup.java | 63 +
src/main/java/org/jeecg/modules/base/mapper/ShiftMapper.java | 17
src/main/java/org/jeecg/modules/base/entity/Shift.java | 93 +
src/main/java/org/jeecg/modules/system/util/FindsProductionsChildrenUtil.java | 55
src/main/java/org/jeecg/modules/base/controller/LineSideWarehouseController.java | 177 +++
src/main/java/org/jeecg/modules/base/service/impl/UserFactoryServiceImpl.java | 59 +
src/main/java/org/jeecg/modules/base/mapper/xml/LineSideWarehouseMapper.xml | 2
src/main/java/org/jeecg/modules/base/service/impl/SupplierServiceImpl.java | 14
src/main/java/org/jeecg/modules/base/mapper/SupplierMapper.java | 23
src/main/java/org/jeecg/modules/base/service/impl/EncodeRuleServiceDetailImpl.java | 1
src/main/java/org/jeecg/modules/system/service/ISysUserService.java | 10
src/main/java/org/jeecg/modules/base/entity/UserFactory.java | 60 +
src/main/java/org/jeecg/modules/base/model/FactoryIdModel.java | 22
src/main/java/org/jeecg/modules/system/mapper/xml/SysUserMapper.xml | 8
src/main/java/org/jeecg/modules/base/controller/UserFactoryController.java | 177 +++
src/main/java/org/jeecg/modules/base/service/impl/ShiftServiceImpl.java | 19
src/main/java/org/jeecg/modules/base/service/IShiftService.java | 14
src/main/java/org/jeecg/modules/base/entity/Factory.java | 97 +
src/main/java/org/jeecg/modules/base/controller/SupplierController.java | 302 ++--
src/main/java/org/jeecg/common/system/api/ISysBaseAPI.java | 2
src/main/java/org/jeecg/modules/base/entity/Supplier.java | 229 +--
src/main/java/org/jeecg/modules/base/service/ILineSideWarehouseService.java | 14
src/main/java/org/jeecg/modules/base/service/impl/LineSideWarehouseServiceImpl.java | 19
src/main/java/org/jeecg/modules/base/service/impl/UserGroupServiceImpl.java | 19
src/main/java/org/jeecg/modules/base/controller/UserGroupController.java | 177 +++
src/main/java/org/jeecg/modules/base/mapper/xml/ShiftMapper.xml | 2
src/main/java/org/jeecg/modules/base/controller/ShiftController.java | 197 +++
src/main/java/org/jeecg/modules/base/mapper/UserGroupMapper.java | 17
src/main/java/org/jeecg/modules/base/service/impl/ShiftGroupServiceImpl.java | 19
src/main/java/org/jeecg/modules/system/vo/SysUserGroupVO.java | 31
src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java | 28
src/main/java/org/jeecg/modules/base/entity/LineSideWarehouse.java | 72 +
src/main/java/org/jeecg/modules/base/mapper/FactoryMapper.java | 17
src/main/java/org/jeecg/modules/base/mapper/xml/SupplierMapper.xml | 5
/dev/null | 38
src/main/java/org/jeecg/modules/base/service/ISupplierService.java | 9
src/main/java/org/jeecg/modules/base/mapper/ShiftGroupMapper.java | 17
src/main/java/org/jeecg/modules/base/mapper/xml/UserFactoryMapper.xml | 4
src/main/java/org/jeecg/modules/base/service/impl/FactoryServiceImpl.java | 201 +++
src/main/java/org/jeecg/modules/system/controller/SysUserController.java | 112 +
src/main/java/org/jeecg/modules/base/service/IUserGroupService.java | 14
src/main/java/org/jeecg/modules/base/model/FactoryTreeModel.java | 104 +
55 files changed, 2,792 insertions(+), 445 deletions(-)
diff --git a/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.java b/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.java
index c9594c9..85433b4 100644
--- a/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.java
+++ b/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.java
@@ -411,7 +411,6 @@
void delSysUploadRelaByBusIdAndBusType(String busId, String busType);
- String getUnitNameById(String unitId);
String queryDictTextByKey(String dictCode, String key);
@@ -423,7 +422,6 @@
void removeDataVersionById(String id);
- String getEnterpriseNameById(String enterpriseId);
List<DataVersion> getLastDataVersion(String businessType, String enterpriseId, String isLastusable);
diff --git a/src/main/java/org/jeecg/modules/base/controller/ClientCategoryController.java b/src/main/java/org/jeecg/modules/base/controller/ClientCategoryController.java
deleted file mode 100644
index fbd8981..0000000
--- a/src/main/java/org/jeecg/modules/base/controller/ClientCategoryController.java
+++ /dev/null
@@ -1,176 +0,0 @@
-package org.jeecg.modules.base.controller;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.jeecg.common.api.vo.CommonGenericTree;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
-import org.jeecg.common.system.base.controller.JeecgController;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.modules.base.entity.Client;
-import org.jeecg.modules.base.entity.ClientCategory;
-import org.jeecg.modules.base.service.IClientCategoryService;
-import org.jeecg.modules.base.service.IClientService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.servlet.ModelAndView;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * @Description: 瀹㈡埛鍒嗙被
- * @Author: jeecg-boot
- * @Date: 2023-03-10
- * @Version: V1.0
- */
-@Api(tags = "瀹㈡埛鍒嗙被")
-@RestController
-@RequestMapping("/base/clientCategory")
-@Slf4j
-public class ClientCategoryController extends JeecgController<ClientCategory, IClientCategoryService> {
- @Autowired
-
- private IClientService clientService;
- @Autowired
-
- private IClientCategoryService clientCategoryService;
-
-
- /**
- * 鍒嗛〉鍒楄〃鏌ヨ
- *
- * @param clientCategory
- * @param pageNo
- * @param pageSize
- * @param req
- * @return
- */
- @ApiOperation(value = "瀹㈡埛鍒嗙被-鍒嗛〉鍒楄〃鏌ヨ", notes = "瀹㈡埛鍒嗙被-鍒嗛〉鍒楄〃鏌ヨ")
- @GetMapping(value = "/list")
- public Result<IPage<ClientCategory>> queryPageList(ClientCategory clientCategory, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
- QueryWrapper<ClientCategory> queryWrapper = QueryGenerator.initQueryWrapper(clientCategory, req.getParameterMap());
- Page<ClientCategory> page = new Page<ClientCategory>(pageNo, pageSize);
- IPage<ClientCategory> pageList = clientCategoryService.page(page, queryWrapper);
- return Result.OK(pageList);
- }
-
- /**
- * 娣诲姞
- *
- * @param clientCategory
- * @return
- */
- @AutoLog(value = "瀹㈡埛鍒嗙被-娣诲姞")
- @ApiOperation(value = "瀹㈡埛鍒嗙被-娣诲姞", notes = "瀹㈡埛鍒嗙被-娣诲姞")
- @PostMapping(value = "/add")
- public Result<String> add(@RequestBody ClientCategory clientCategory) {
- clientCategoryService.save(clientCategory);
- return Result.OK("娣诲姞鎴愬姛锛�");
- }
-
- /**
- * 缂栬緫
- *
- * @param clientCategory
- * @return
- */
- @AutoLog(value = "瀹㈡埛鍒嗙被-缂栬緫")
- @ApiOperation(value = "瀹㈡埛鍒嗙被-缂栬緫", notes = "瀹㈡埛鍒嗙被-缂栬緫")
- @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
- public Result<String> edit(@RequestBody ClientCategory clientCategory) {
- clientCategoryService.updateById(clientCategory);
- return Result.OK("缂栬緫鎴愬姛!");
- }
-
- /**
- * 閫氳繃id鍒犻櫎
- *
- * @param id
- * @return
- */
- @AutoLog(value = "瀹㈡埛鍒嗙被-閫氳繃id鍒犻櫎")
- @ApiOperation(value = "瀹㈡埛鍒嗙被-閫氳繃id鍒犻櫎", notes = "瀹㈡埛鍒嗙被-閫氳繃id鍒犻櫎")
- @DeleteMapping(value = "/delete")
- public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
- List<Client> projectList = clientService.lambdaQuery().eq(Client::getClientCategoryId, id).eq(Client::getDelFlag, "0").list();
- if (projectList.size() > 0) {
- return Result.error(projectList.size() + "");
- }
- ClientCategory clientCategory = clientCategoryService.getById(id);
- clientCategory.setDelFlag(1);
- clientCategoryService.updateById(clientCategory);
- return Result.OK("鍒犻櫎鎴愬姛!");
- }
-
- /**
- * 鎵归噺鍒犻櫎
- *
- * @param ids
- * @return
- */
- @AutoLog(value = "瀹㈡埛鍒嗙被-鎵归噺鍒犻櫎")
- @ApiOperation(value = "瀹㈡埛鍒嗙被-鎵归噺鍒犻櫎", notes = "瀹㈡埛鍒嗙被-鎵归噺鍒犻櫎")
- @DeleteMapping(value = "/deleteBatch")
- public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
- this.clientCategoryService.removeByIds(Arrays.asList(ids.split(",")));
- return Result.OK("鎵归噺鍒犻櫎鎴愬姛!");
- }
-
- /**
- * 閫氳繃id鏌ヨ
- *
- * @param id
- * @return
- */
- @ApiOperation(value = "瀹㈡埛鍒嗙被-閫氳繃id鏌ヨ", notes = "瀹㈡埛鍒嗙被-閫氳繃id鏌ヨ")
- @GetMapping(value = "/queryById")
- public Result<ClientCategory> queryById(@RequestParam(name = "id", required = true) String id) {
- ClientCategory clientCategory = clientCategoryService.getById(id);
- if (clientCategory == null) {
- return Result.error("鏈壘鍒板搴旀暟鎹�");
- }
- return Result.OK(clientCategory);
- }
-
- /**
- * 瀵煎嚭excel
- *
- * @param request
- * @param clientCategory
- */
- @RequestMapping(value = "/exportXls")
- public ModelAndView exportXls(HttpServletRequest request, ClientCategory clientCategory) {
- return super.exportXls(request, clientCategory, ClientCategory.class, "mom_base_client_category");
- }
-
- /**
- * 閫氳繃excel瀵煎叆鏁版嵁
- *
- * @param request
- * @param response
- * @return
- */
- @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
- public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
- return super.importExcel(request, response, ClientCategory.class);
- }
-
- /**
- * @MethodName: loadTree
- * @Description: 瀹㈡埛鍒嗙被 鏍�
- */
- @GetMapping("/loadTree")
- public Result<?> loadTree(HttpServletRequest httpServletRequest) {
- List<CommonGenericTree> list = clientCategoryService.loadTree();
- return Result.ok(list);
- }
-
-}
diff --git a/src/main/java/org/jeecg/modules/base/controller/ClientContactController.java b/src/main/java/org/jeecg/modules/base/controller/ClientContactController.java
deleted file mode 100644
index 78f3e0f..0000000
--- a/src/main/java/org/jeecg/modules/base/controller/ClientContactController.java
+++ /dev/null
@@ -1,156 +0,0 @@
-package org.jeecg.modules.base.controller;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
-import org.jeecg.common.system.base.controller.JeecgController;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.modules.base.entity.ClientContact;
-import org.jeecg.modules.base.service.IClientContactService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.servlet.ModelAndView;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.Arrays;
-
-/**
- * @Description: 瀹㈡埛鑱旂郴浜�
- * @Author: jeecg-boot
- * @Date: 2023-03-10
- * @Version: V1.0
- */
-@Api(tags = "瀹㈡埛鑱旂郴浜�")
-@RestController
-@RequestMapping("/base/clientContact")
-@Slf4j
-public class ClientContactController extends JeecgController<ClientContact, IClientContactService> {
- @Autowired
- private IClientContactService clientContactService;
-
-
- /**
- * 鍒嗛〉鍒楄〃鏌ヨ
- *
- * @param clientContact
- * @param pageNo
- * @param pageSize
- * @param req
- * @return
- */
- //@AutoLog(value = "渚涘簲鍟嗚仈绯讳汉-鍒嗛〉鍒楄〃鏌ヨ")
- @ApiOperation(value = "瀹㈡埛鑱旂郴浜�-鍒嗛〉鍒楄〃鏌ヨ", notes = "瀹㈡埛鑱旂郴浜�-鍒嗛〉鍒楄〃鏌ヨ")
- @GetMapping(value = "/list")
- public Result<IPage<ClientContact>> queryPageList(ClientContact clientContact,
- @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
- @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
- HttpServletRequest req) {
- QueryWrapper<ClientContact> queryWrapper = QueryGenerator.initQueryWrapper(clientContact, req.getParameterMap());
- Page<ClientContact> page = new Page<ClientContact>(pageNo, pageSize);
- IPage<ClientContact> pageList = clientContactService.page(page, queryWrapper);
- return Result.OK(pageList);
- }
-
- /**
- * 娣诲姞
- *
- * @param clientContact
- * @return
- */
- @AutoLog(value = "瀹㈡埛鑱旂郴浜�-娣诲姞")
- @ApiOperation(value = "瀹㈡埛鑱旂郴浜�-娣诲姞", notes = "瀹㈡埛鑱旂郴浜�-娣诲姞")
- @PostMapping(value = "/add")
- public Result<String> add(@RequestBody ClientContact clientContact) {
- clientContactService.save(clientContact);
- return Result.OK("娣诲姞鎴愬姛锛�");
- }
-
- /**
- * 缂栬緫
- *
- * @param clientContact
- * @return
- */
- @AutoLog(value = "瀹㈡埛鑱旂郴浜�-缂栬緫")
- @ApiOperation(value = "瀹㈡埛鑱旂郴浜�-缂栬緫", notes = "瀹㈡埛鑱旂郴浜�-缂栬緫")
- @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
- public Result<String> edit(@RequestBody ClientContact clientContact) {
- clientContactService.updateById(clientContact);
- return Result.OK("缂栬緫鎴愬姛!");
- }
-
- /**
- * 閫氳繃id鍒犻櫎
- *
- * @param id
- * @return
- */
- @AutoLog(value = "瀹㈡埛鑱旂郴浜�-閫氳繃id鍒犻櫎")
- @ApiOperation(value = "渚涘簲鍟嗚仈绯讳汉-閫氳繃id鍒犻櫎", notes = "瀹㈡埛鑱旂郴浜�-閫氳繃id鍒犻櫎")
- @DeleteMapping(value = "/delete")
- public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
- clientContactService.removeById(id);
- return Result.OK("鍒犻櫎鎴愬姛!");
- }
-
- /**
- * 鎵归噺鍒犻櫎
- *
- * @param ids
- * @return
- */
- @AutoLog(value = "瀹㈡埛鑱旂郴浜�-鎵归噺鍒犻櫎")
- @ApiOperation(value = "渚涘簲鍟嗚仈绯讳汉-鎵归噺鍒犻櫎", notes = "瀹㈡埛鑱旂郴浜�-鎵归噺鍒犻櫎")
- @DeleteMapping(value = "/deleteBatch")
- public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
- this.clientContactService.removeByIds(Arrays.asList(ids.split(",")));
- return Result.OK("鎵归噺鍒犻櫎鎴愬姛!");
- }
-
- /**
- * 閫氳繃id鏌ヨ
- *
- * @param id
- * @return
- */
- //@AutoLog(value = "渚涘簲鍟嗚仈绯讳汉-閫氳繃id鏌ヨ")
- @ApiOperation(value = "瀹㈡埛鑱旂郴浜�-閫氳繃id鏌ヨ", notes = "瀹㈡埛鑱旂郴浜�-閫氳繃id鏌ヨ")
- @GetMapping(value = "/queryById")
- public Result<ClientContact> queryById(@RequestParam(name = "id", required = true) String id) {
- ClientContact clientContact = clientContactService.getById(id);
- if (clientContact == null) {
- return Result.error("鏈壘鍒板搴旀暟鎹�");
- }
- return Result.OK(clientContact);
- }
-
- /**
- * 瀵煎嚭excel
- *
- * @param request
- * @param clientContact
- */
- @RequestMapping(value = "/exportXls")
- public ModelAndView exportXls(HttpServletRequest request, ClientContact clientContact) {
- return super.exportXls(request, clientContact, ClientContact.class, "瀹㈡埛鑱旂郴浜�");
- }
-
- /**
- * 閫氳繃excel瀵煎叆鏁版嵁
- *
- * @param request
- * @param response
- * @return
- */
- @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
- public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
- return super.importExcel(request, response, ClientContact.class);
- }
-
-}
diff --git a/src/main/java/org/jeecg/modules/base/controller/ClientController.java b/src/main/java/org/jeecg/modules/base/controller/ClientController.java
deleted file mode 100644
index f8ee67e..0000000
--- a/src/main/java/org/jeecg/modules/base/controller/ClientController.java
+++ /dev/null
@@ -1,180 +0,0 @@
-package org.jeecg.modules.base.controller;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
-import org.jeecg.common.system.base.controller.JeecgController;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.modules.base.entity.Client;
-import org.jeecg.modules.base.entity.ClientCategory;
-import org.jeecg.modules.base.service.IClientCategoryService;
-import org.jeecg.modules.base.service.IClientService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.servlet.ModelAndView;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * @Description: 瀹㈡埛
- * @Author: jeecg-boot
- * @Date: 2023-03-10
- * @Version: V1.0
- */
-@Api(tags = "瀹㈡埛")
-@RestController
-@RequestMapping("/base/client")
-@Slf4j
-public class ClientController extends JeecgController<Client, IClientService> {
- @Autowired
- private IClientService clientService;
- @Autowired
- @Lazy
- private IClientCategoryService clientCategoryService;
-
-
- /**
- * 鍒嗛〉鍒楄〃鏌ヨ
- *
- * @param client
- * @param pageNo
- * @param pageSize
- * @param req
- * @return
- */
- //@AutoLog(value = "mom_eam_inspection_project-鍒嗛〉鍒楄〃鏌ヨ")
- @ApiOperation(value = "瀹㈡埛-鍒嗛〉鍒楄〃鏌ヨ", notes = "瀹㈡埛-鍒嗛〉鍒楄〃鏌ヨ")
- @GetMapping(value = "/list")
- public Result<IPage<Client>> queryPageList(Client client,
- @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
- @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
- HttpServletRequest req) {
- QueryWrapper<Client> queryWrapper = QueryGenerator.initQueryWrapper(client, req.getParameterMap());
- Page<Client> page = new Page<Client>(pageNo, pageSize);
- IPage<Client> pageList = clientService.page(page, queryWrapper);
- List<Client> records = pageList.getRecords();
- for (Client record : records) {
- String clientCategoryId = record.getClientCategoryId();
- ClientCategory clientCategory = clientCategoryService.getById(clientCategoryId);
- if (clientCategory != null) {
- record.setClientCategoryNumName(clientCategory.getNum() + "/" + clientCategory.getName());
- } else {
- record.setClientCategoryNumName("/");
- }
-
- }
- return Result.OK(pageList);
- }
-
- /**
- * 娣诲姞
- *
- * @param client
- * @return
- */
- @AutoLog(value = "瀹㈡埛-娣诲姞")
- @ApiOperation(value = "瀹㈡埛-娣诲姞", notes = "瀹㈡埛-娣诲姞")
- @PostMapping(value = "/add")
- public Result<String> add(@RequestBody Client client) {
- clientService.save(client);
- return Result.OK("娣诲姞鎴愬姛锛�");
- }
-
- /**
- * 缂栬緫
- *
- * @param client
- * @return
- */
- @AutoLog(value = "瀹㈡埛-缂栬緫")
- @ApiOperation(value = "瀹㈡埛-缂栬緫", notes = "瀹㈡埛-缂栬緫")
- @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
- public Result<String> edit(@RequestBody Client client) {
- clientService.updateById(client);
- return Result.OK("缂栬緫鎴愬姛!");
- }
-
- /**
- * 閫氳繃id鍒犻櫎
- *
- * @param id
- * @return
- */
- @AutoLog(value = "瀹㈡埛-閫氳繃id鍒犻櫎")
- @ApiOperation(value = "瀹㈡埛-閫氳繃id鍒犻櫎", notes = "瀹㈡埛-閫氳繃id鍒犻櫎")
- @DeleteMapping(value = "/delete")
- public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
- Client client = clientService.getById(id);
- client.setDelFlag(1);
- clientService.updateById(client);
- return Result.OK("鍒犻櫎鎴愬姛!");
- }
-
- /**
- * 鎵归噺鍒犻櫎
- *
- * @param ids
- * @return
- */
- @AutoLog(value = "瀹㈡埛-鎵归噺鍒犻櫎")
- @ApiOperation(value = "瀹㈡埛-鎵归噺鍒犻櫎", notes = "瀹㈡埛-鎵归噺鍒犻櫎")
- @DeleteMapping(value = "/deleteBatch")
- public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
- List<String> idList = Arrays.asList(ids.split(","));
- for (String id : idList) {
- Client client = clientService.getById(id);
- client.setDelFlag(1);
- clientService.updateById(client);
- }
- return Result.OK("鎵归噺鍒犻櫎鎴愬姛!");
- }
-
- /**
- * 閫氳繃id鏌ヨ
- *
- * @param id
- * @return
- */
- @ApiOperation(value = "瀹㈡埛-閫氳繃id鏌ヨ", notes = "瀹㈡埛-閫氳繃id鏌ヨ")
- @GetMapping(value = "/queryById")
- public Result<Client> queryById(@RequestParam(name = "id", required = true) String id) {
- Client client = clientService.getById(id);
- if (client == null) {
- return Result.error("鏈壘鍒板搴旀暟鎹�");
- }
- return Result.OK(client);
- }
-
- /**
- * 瀵煎嚭excel
- *
- * @param request
- * @param client
- */
- @RequestMapping(value = "/exportXls")
- public ModelAndView exportXls(HttpServletRequest request, Client client) {
- return super.exportXls(request, client, Client.class, "mom_base_client");
- }
-
- /**
- * 閫氳繃excel瀵煎叆鏁版嵁
- *
- * @param request
- * @param response
- * @return
- */
- @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
- public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
- return super.importExcel(request, response, Client.class);
- }
-
-}
diff --git a/src/main/java/org/jeecg/modules/base/controller/ConstructorController.java b/src/main/java/org/jeecg/modules/base/controller/ConstructorController.java
deleted file mode 100644
index 1af2524..0000000
--- a/src/main/java/org/jeecg/modules/base/controller/ConstructorController.java
+++ /dev/null
@@ -1,164 +0,0 @@
-package org.jeecg.modules.base.controller;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
-import org.jeecg.common.system.base.controller.JeecgController;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.modules.base.entity.Constructor;
-import org.jeecg.modules.base.service.IConstructorService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.servlet.ModelAndView;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * @Description: 鍒堕�犲晢
- * @Author: houjie
- * @Date: 2023-03-06
- * @Version: V1.0
- */
-@Api(tags = "鍒堕�犲晢")
-@RestController
-@RequestMapping("/base/constructor")
-@Slf4j
-public class ConstructorController extends JeecgController<Constructor, IConstructorService> {
- @Autowired
- private IConstructorService constructorService;
-
-
- /**
- * 鍒嗛〉鍒楄〃鏌ヨ
- *
- * @param
- * @param pageNo
- * @param pageSize
- * @param req
- * @return
- */
-
- @ApiOperation(value = "鍒堕�犲晢-鍒嗛〉鍒楄〃鏌ヨ", notes = "鍒堕�犲晢-鍒嗛〉鍒楄〃鏌ヨ")
- @GetMapping(value = "/list")
- public Result<IPage<Constructor>> queryPageList(Constructor constructor,
- @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
- @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
- HttpServletRequest req) {
- QueryWrapper<Constructor> queryWrapper = QueryGenerator.initQueryWrapper(constructor, req.getParameterMap());
- Page<Constructor> page = new Page<Constructor>(pageNo, pageSize);
- IPage<Constructor> pageList = constructorService.page(page, queryWrapper);
- return Result.OK(pageList);
- }
-
- /**
- * 娣诲姞
- *
- * @param constructor
- * @return
- */
- @AutoLog(value = "鍒堕�犲晢-娣诲姞")
- @ApiOperation(value = "鍒堕�犲晢-娣诲姞", notes = "鍒堕�犲晢-娣诲姞")
- @PostMapping(value = "/add")
- public Result<String> add(@RequestBody Constructor constructor) {
- constructorService.save(constructor);
- return Result.OK("娣诲姞鎴愬姛锛�");
- }
-
- /**
- * 缂栬緫
- *
- * @param constructor
- * @return
- */
- @AutoLog(value = "鍒堕�犲晢-缂栬緫")
- @ApiOperation(value = "鍒堕�犲晢-缂栬緫", notes = "鍒堕�犲晢-缂栬緫")
- @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
- public Result<String> edit(@RequestBody Constructor constructor) {
- constructorService.updateById(constructor);
- return Result.OK("缂栬緫鎴愬姛!");
- }
-
- /**
- * 閫氳繃id鍒犻櫎
- *
- * @param id
- * @return
- */
- @AutoLog(value = "鍒堕�犲晢-閫氳繃id鍒犻櫎")
- @ApiOperation(value = "鍒堕�犲晢-閫氳繃id鍒犻櫎", notes = "鍒堕�犲晢-閫氳繃id鍒犻櫎")
- @DeleteMapping(value = "/delete")
- public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
- Constructor constructor = constructorService.getById(id);
- constructor.setDelFlag(1);
- constructorService.updateById(constructor);
- return Result.OK("鍒犻櫎鎴愬姛!");
- }
-
- /**
- * 鎵归噺鍒犻櫎
- *
- * @param ids
- * @return
- */
- @AutoLog(value = "鍒堕�犲晢-鎵归噺鍒犻櫎")
- @ApiOperation(value = "鍒堕�犲晢-鎵归噺鍒犻櫎", notes = "鍒堕�犲晢-鎵归噺鍒犻櫎")
- @DeleteMapping(value = "/deleteBatch")
- public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
- List<String> stringList = Arrays.asList(ids.split(","));
- for (String id : stringList) {
- Constructor constructor = constructorService.getById(id);
- constructor.setDelFlag(1);
- constructorService.updateById(constructor);
- }
- return Result.OK("鎵归噺鍒犻櫎鎴愬姛!");
- }
-
- /**
- * 閫氳繃id鏌ヨ
- *
- * @param id
- * @return
- */
- @ApiOperation(value = "鍒堕�犲晢-閫氳繃id鏌ヨ", notes = "鍒堕�犲晢-閫氳繃id鏌ヨ")
- @GetMapping(value = "/queryById")
- public Result<Constructor> queryById(@RequestParam(name = "id", required = true) String id) {
- Constructor constructor = constructorService.getById(id);
- if (constructor == null) {
- return Result.error("鏈壘鍒板搴旀暟鎹�");
- }
- return Result.OK(constructor);
- }
-
- /**
- * 瀵煎嚭excel
- *
- * @param request
- * @param constructor
- */
-
- @RequestMapping(value = "/exportXls")
- public ModelAndView exportXls(HttpServletRequest request, Constructor constructor) {
- return super.exportXls(request, constructor, Constructor.class, "鍒堕�犲晢");
- }
-
- /**
- * 閫氳繃excel瀵煎叆鏁版嵁
- *
- * @param request
- * @param response
- * @return
- */
-
- @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
- public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
- return super.importExcel(request, response, Constructor.class);
- }
-}
diff --git a/src/main/java/org/jeecg/modules/base/controller/EnterpriseAdministratorController.java b/src/main/java/org/jeecg/modules/base/controller/EnterpriseAdministratorController.java
deleted file mode 100644
index b65c0c5..0000000
--- a/src/main/java/org/jeecg/modules/base/controller/EnterpriseAdministratorController.java
+++ /dev/null
@@ -1,162 +0,0 @@
-package org.jeecg.modules.base.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 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.jeecg.modules.base.entity.EnterpriseAdministrator;
-import org.jeecg.modules.base.service.IEnterpriseAdministratorService;
-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: 浼佷笟绠＄悊鍛�
- * @Author: jeecg-boot
- * @Date: 2022-11-22
- * @Version: V1.0
- */
-@Api(tags="浼佷笟绠＄悊鍛�")
-@RestController
-@RequestMapping("/base/enterpriseAdministrator")
-@Slf4j
-public class EnterpriseAdministratorController extends JeecgController<EnterpriseAdministrator, IEnterpriseAdministratorService> {
- @Autowired
- private IEnterpriseAdministratorService enterpriseAdministratorService;
-
- /**
- * 鍒嗛〉鍒楄〃鏌ヨ
- *
- * @param enterpriseAdministrator
- * @param pageNo
- * @param pageSize
- * @param req
- * @return
- */
- //@AutoLog(value = "浼佷笟绠＄悊鍛�-鍒嗛〉鍒楄〃鏌ヨ")
- @ApiOperation(value="浼佷笟绠＄悊鍛�-鍒嗛〉鍒楄〃鏌ヨ", notes="浼佷笟绠＄悊鍛�-鍒嗛〉鍒楄〃鏌ヨ")
- @GetMapping(value = "/list")
- public Result<IPage<EnterpriseAdministrator>> queryPageList(EnterpriseAdministrator enterpriseAdministrator,
- @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
- @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
- HttpServletRequest req) {
- QueryWrapper<EnterpriseAdministrator> queryWrapper = QueryGenerator.initQueryWrapper(enterpriseAdministrator, req.getParameterMap());
- Page<EnterpriseAdministrator> page = new Page<EnterpriseAdministrator>(pageNo, pageSize);
- IPage<EnterpriseAdministrator> pageList = enterpriseAdministratorService.page(page, queryWrapper);
- return Result.OK(pageList);
- }
-
- /**
- * 娣诲姞
- *
- * @param enterpriseAdministrator
- * @return
- */
- @AutoLog(value = "浼佷笟绠＄悊鍛�-娣诲姞")
- @ApiOperation(value="浼佷笟绠＄悊鍛�-娣诲姞", notes="浼佷笟绠＄悊鍛�-娣诲姞")
- //@RequiresPermissions("org.jeecg.modules.demo:mom_base_enterprise_administrator:add")
- @PostMapping(value = "/add")
- public Result<String> add(@RequestBody EnterpriseAdministrator enterpriseAdministrator) {
- enterpriseAdministratorService.save(enterpriseAdministrator);
- return Result.OK("娣诲姞鎴愬姛锛�");
- }
-
- /**
- * 缂栬緫
- *
- * @param enterpriseAdministrator
- * @return
- */
- @AutoLog(value = "浼佷笟绠＄悊鍛�-缂栬緫")
- @ApiOperation(value="浼佷笟绠＄悊鍛�-缂栬緫", notes="浼佷笟绠＄悊鍛�-缂栬緫")
- //@RequiresPermissions("org.jeecg.modules.demo:mom_base_enterprise_administrator:edit")
- @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
- public Result<String> edit(@RequestBody EnterpriseAdministrator enterpriseAdministrator) {
- enterpriseAdministratorService.updateById(enterpriseAdministrator);
- return Result.OK("缂栬緫鎴愬姛!");
- }
-
- /**
- * 閫氳繃id鍒犻櫎
- *
- * @param id
- * @return
- */
- @AutoLog(value = "浼佷笟绠＄悊鍛�-閫氳繃id鍒犻櫎")
- @ApiOperation(value="浼佷笟绠＄悊鍛�-閫氳繃id鍒犻櫎", notes="浼佷笟绠＄悊鍛�-閫氳繃id鍒犻櫎")
- //@RequiresPermissions("org.jeecg.modules.demo:mom_base_enterprise_administrator:delete")
- @DeleteMapping(value = "/delete")
- public Result<String> delete(@RequestParam(name="id",required=true) String id) {
- enterpriseAdministratorService.removeById(id);
- return Result.OK("鍒犻櫎鎴愬姛!");
- }
-
- /**
- * 鎵归噺鍒犻櫎
- *
- * @param ids
- * @return
- */
- @AutoLog(value = "浼佷笟绠＄悊鍛�-鎵归噺鍒犻櫎")
- @ApiOperation(value="浼佷笟绠＄悊鍛�-鎵归噺鍒犻櫎", notes="浼佷笟绠＄悊鍛�-鎵归噺鍒犻櫎")
- //@RequiresPermissions("org.jeecg.modules.demo:mom_base_enterprise_administrator:deleteBatch")
- @DeleteMapping(value = "/deleteBatch")
- public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
- this.enterpriseAdministratorService.removeByIds(Arrays.asList(ids.split(",")));
- return Result.OK("鎵归噺鍒犻櫎鎴愬姛!");
- }
-
- /**
- * 閫氳繃id鏌ヨ
- *
- * @param id
- * @return
- */
- //@AutoLog(value = "浼佷笟绠＄悊鍛�-閫氳繃id鏌ヨ")
- @ApiOperation(value="浼佷笟绠＄悊鍛�-閫氳繃id鏌ヨ", notes="浼佷笟绠＄悊鍛�-閫氳繃id鏌ヨ")
- @GetMapping(value = "/queryById")
- public Result<EnterpriseAdministrator> queryById(@RequestParam(name="id",required=true) String id) {
- EnterpriseAdministrator enterpriseAdministrator = enterpriseAdministratorService.getById(id);
- if(enterpriseAdministrator==null) {
- return Result.error("鏈壘鍒板搴旀暟鎹�");
- }
- return Result.OK(enterpriseAdministrator);
- }
-
- /**
- * 瀵煎嚭excel
- *
- * @param request
- * @param enterpriseAdministrator
- */
- //@RequiresPermissions("org.jeecg.modules.demo:mom_base_enterprise_administrator:exportXls")
- @RequestMapping(value = "/exportXls")
- public ModelAndView exportXls(HttpServletRequest request, EnterpriseAdministrator enterpriseAdministrator) {
- return super.exportXls(request, enterpriseAdministrator, EnterpriseAdministrator.class, "浼佷笟绠＄悊鍛�");
- }
-
- /**
- * 閫氳繃excel瀵煎叆鏁版嵁
- *
- * @param request
- * @param response
- * @return
- */
- //@RequiresPermissions("mom_base_enterprise_administrator:importExcel")
- @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
- public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
- return super.importExcel(request, response, EnterpriseAdministrator.class);
- }
-
-}
diff --git a/src/main/java/org/jeecg/modules/base/controller/EnterpriseController.java b/src/main/java/org/jeecg/modules/base/controller/EnterpriseController.java
deleted file mode 100644
index d1b5f98..0000000
--- a/src/main/java/org/jeecg/modules/base/controller/EnterpriseController.java
+++ /dev/null
@@ -1,722 +0,0 @@
-package org.jeecg.modules.base.controller;
-
-import java.text.ParseException;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-import java.util.*;
-import java.util.concurrent.CopyOnWriteArrayList;
-import java.util.stream.Collectors;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
-import com.baomidou.mybatisplus.core.toolkit.StringUtils;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.system.vo.SelectTreeModel;
-import org.jeecg.modules.base.entity.Enterprise;
-import org.jeecg.modules.base.service.IEnterpriseService;
-
-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.jeecg.modules.quartz.entity.QuartzJob;
-import org.jeecg.modules.quartz.service.IQuartzJobService;
-import org.jeecg.modules.system.entity.Administrator;
-import org.jeecg.common.system.base.entity.DataVersion;
-import org.jeecg.modules.system.service.IAdministratorService;
-import org.jeecg.modules.system.service.IDataVersionService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
-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: 浼佷笟鏋舵瀯
- * @Author: jeecg-boot
- * @Date: 2022-11-21
- * @Version: V1.0
- */
-@Api(tags="浼佷笟鏋舵瀯")
-@RestController
-@RequestMapping("/base/enterprise")
-@Slf4j
-public class EnterpriseController extends JeecgController<Enterprise, IEnterpriseService> {
- @Autowired
- private IEnterpriseService enterpriseService;
- @Autowired
- private IDataVersionService dataVersionService;
- @Autowired
- private IQuartzJobService quartzJobService;
- @Autowired
- private IAdministratorService administratorService;
- /**
- *
- * 鑾峰彇闆嗗洟鏋舵瀯鏍�
- *
- */
- @GetMapping("/enterpriseTree")
- public Result<?> getEnterpriseTree(@RequestParam(value = "version", required = false) Integer version){
- SelectTreeModel selectTreeModel = new SelectTreeModel();
- selectTreeModel.setKey("0");
- selectTreeModel.setTitle("闆嗗洟鏋舵瀯");
- List<SelectTreeModel> finallyList = new ArrayList<>();
- selectTreeModel.setChildren(enterpriseService.getEnterpriseVersionTree("0",version));
- finallyList.add(selectTreeModel);
- return Result.OK(finallyList);
- }
- /**
- * 鍒嗛〉鍒楄〃鏌ヨ
- *
- * @param map
- * @param pageNo
- * @param pageSize
- * @param parentId
- * @return
- */
- //@AutoLog(value = "浼佷笟鏋舵瀯-鍒嗛〉鍒楄〃鏌ヨ")
- @ApiOperation(value="浼佷笟鏋舵瀯-鍒嗛〉鍒楄〃鏌ヨ", notes="浼佷笟鏋舵瀯-鍒嗛〉鍒楄〃鏌ヨ")
- @GetMapping(value = "/list")
- public Result<IPage<Map<String,Object>>> queryPageList(Map map,
- @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
- @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
- @RequestParam(name = "parentId",required = false) String parentId,
- @RequestParam(name="version",required = false) Integer version
- ) {
- Page<Map<String,Object>> page = new Page(pageNo, pageSize);
- IPage<Map<String,Object>> pageList = enterpriseService.getEnterpriseListByPid(page,version,parentId);
- return Result.OK(pageList);
- }
- /**
- *
- * 鏌ヨ褰撳墠鐢熸晥鐗堟湰鍒楄〃
- *
- */
- @GetMapping("getUsableList")
- public Result<?> getUsableList(){
- return Result.OK(enterpriseService.getUsableList());
- }
-
- /**
- *
- * 鏌ユ墍鏈変紒涓氬垪琛�
- *
- */
- @GetMapping("/mapList")
- public Result<?> getEnterpriseList(){
- return Result.OK(enterpriseService.getEnterprise());
- }
-
- /**
- * 娣诲姞闇�瑕佷竴娆℃�у畬鎴�
- *
- * @param map
- * @return
- */
- @AutoLog(value = "浼佷笟鏋舵瀯-娣诲姞")
- @ApiOperation(value="浼佷笟鏋舵瀯-娣诲姞", notes="浼佷笟鏋舵瀯-娣诲姞")
- @PostMapping(value = "/add")
- @Transactional
- public Result<String> add(@RequestBody Map<String,Object> map) {
- Enterprise enterprise = new Enterprise();
- //(璁剧疆淇濆瓨鐨勫伐浣滀腑蹇冩暟鎹級
- enterprise.setCode(String.valueOf(map.get("code")))
- .setName(String.valueOf(map.get("name")))
- .setRemark(String.valueOf(map.get("remark")))
- .setVersion(Integer.parseInt(String.valueOf(map.get("version"))))
- .setStatus(String.valueOf(map.get("status")))
- .setParentId(String.valueOf(map.get("parentId")))
- .setDelFlag(0);
- enterpriseService.save(enterprise);
- QueryWrapper<Enterprise> queryWrapper = new QueryWrapper<Enterprise>()
- .eq("code",enterprise.getCode()).eq("version",enterprise.getVersion()).eq("del_flag",0);
- Enterprise selectEnterprise = enterpriseService.getOne(queryWrapper,true);
- DataVersion dataVersion = new DataVersion();
- dataVersion.setBusinessId(selectEnterprise.getId())
- .setBusinessType("闆嗗洟鏋舵瀯")
- .setVersion(selectEnterprise.getVersion())
- .setVersionStatus(String.valueOf(map.get("versionStatus")))
- .setDelFlag(0)
- .setEffectiveType("0")
- .setIsLastUsable("0");
- dataVersionService.save(dataVersion);
- QueryWrapper<DataVersion> queryWrapper1 = new QueryWrapper<DataVersion>()
- .eq("business_id",selectEnterprise.getId()).eq("del_flag",0);
- DataVersion selectDataVersion = dataVersionService.getOne(queryWrapper1,true);
- selectEnterprise.setDataVersionId(selectDataVersion.getId());
- enterpriseService.saveOrUpdate(selectEnterprise);
- return Result.OK("娣诲姞鎴愬姛锛�");
- }
- /**
- * 鍗囩増
- * 闇�瑕佷竴娆″畬鎴�
- * @param map
- * @param
- * @return
- */
- @PostMapping("/updateVersion")
- @Transactional
- public Result<?> updateVersion(@RequestBody Map<String,Object> map){
- Integer version = Integer.parseInt((String)map.get("version"));
- Integer newVersion = enterpriseService.getAllVersion().stream().findFirst().get()+1;
- //璇ユ柟娉曞湪api鍖�
- recurrenceUpdata("0","0",version,newVersion);
- return Result.OK("鍗囩増鎴愬姛",newVersion);
- }
- /**
- * 绔嬪嵆鐢熸晥
- * 闇�瑕佷竴娆″畬鎴�
- * @param map
- * @param
- * @return
- */
- @PostMapping("/updateVersionStatusToUsable")
- @Transactional
- public Result<?> updateVersionStatusToUsable(@RequestBody Map<String,Object> map){
- //濡傛灉鏈夊畾鏃剁敓鐢熸晥,鍒欏皢瀹氭椂鐢熸晥浠诲姟鍏抽棴
- QuartzJob quartzJob = quartzJobService.getOne(new QueryWrapper<QuartzJob>()
- .eq("job_class_name","org.jeecg.modules.quartz.job.EnterpriseSetUsableJob"),true);
- if(ObjectUtils.isNotNull(quartzJob)){
- quartzJobService.deleteAndStopJob(quartzJob);
- }
- //鑾峰彇鐗堟湰鍙�
- Integer version = Integer.parseInt((String)map.get("version"));
- //鑾峰彇涓婃鐢熸晥鐗堟湰骞跺皢鍏舵槸鍚︿笂娆＄敓鏁堜綅缃疆涓哄惁
- List<Enterprise> lastUsableList = enterpriseService.getLastUsableList();
- if(CollectionUtils.isNotEmpty(lastUsableList)){
- List<DataVersion> lastUsableVersionList = dataVersionService.list( new QueryWrapper<DataVersion>()
- .in("business_id",lastUsableList.stream()
- .map(Enterprise::getId)
- .collect(Collectors.toList())).eq("del_flag",0));
- lastUsableVersionList.stream().forEach(dataVersion -> {
- dataVersion.setIsLastUsable("0");
- });
- dataVersionService.updateBatchById(lastUsableVersionList);
- }
- //鑾峰彇鐢熸晥鐗堟湰鍙婄増鏈俊鎭苟灏嗗叾缃负澶辨晥
- List<Enterprise> usableList = enterpriseService.getUsableList();
- if(CollectionUtils.isNotEmpty(usableList)){
- List<DataVersion> usableDataVersionList = dataVersionService.list(new QueryWrapper<DataVersion>()
- .in("business_id",usableList.stream()
- .map(Enterprise::getId)
- .collect(Collectors.toList())));
- usableDataVersionList.stream().forEach(dataVersion -> {
- dataVersion
- .setVersionStatus("3")
- .setIsLastUsable("1")
- .setExpiredTime(new Date(System.currentTimeMillis()));
- });
- dataVersionService.updateBatchById(usableDataVersionList);
- }
- //鑾峰彇寰呯敓鏁堢増鏈強鐗堟湰淇℃伅骞跺皢鍏剁疆涓虹敓鏁�
- List<DataVersion> dataVersionList = dataVersionService.list(new QueryWrapper<DataVersion>()
- .in("business_id",enterpriseService
- .list(
- new QueryWrapper<Enterprise>()
- .eq("version",version)
- .eq("del_flag",0)
- )
- .stream().map(Enterprise::getId)
- .collect(Collectors.toList())));
- dataVersionList.stream().forEach(dataVersion -> {
- dataVersion.setVersionStatus("2")
- .setEffectiveType("2")
- .setEffectiveTime(new Date(System.currentTimeMillis()))
- .setIsLastUsable("0");
- });
- //瀛樺叆鏁版嵁搴�
- dataVersionService.updateBatchById(dataVersionList);
- return Result.OK("鐢熸晥鎴愬姛");
- }
- /**
- * 瀹氭椂鐢熸晥
- * 闇�瑕佷竴娆℃�у畬鎴�
- * @param quartzJob
- * @param
- * @return
- */
- @PostMapping("/updateVersionStatusToUsableBySetTime")
- @Transactional
- public Result<?> updateVersionStatusToUsableBySetTime(@RequestBody QuartzJob quartzJob) throws ParseException {
- DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
- DateTimeFormatter dateTimeFormatter1 = DateTimeFormatter.ofPattern("ss mm HH dd MM ? yyyy");
- String jobClassName = quartzJob.getJobClassName();
- String time = quartzJob.getCronExpression();
- System.out.println(time);
- LocalDateTime localDateTime = LocalDateTime.parse(time,dateTimeFormatter);
- String cronStr=dateTimeFormatter1.format(localDateTime);
- quartzJob.setCronExpression(cronStr);
- QueryWrapper<QuartzJob> queryWrapper = new QueryWrapper();
- queryWrapper.eq("JOB_CLASS_NAME",jobClassName);
- List<QuartzJob> quartzJobs = quartzJobService.list(queryWrapper);
- if(CollectionUtils.isEmpty(quartzJobs)){
- quartzJobService.saveAndScheduleJob(quartzJob);
- quartzJobs = quartzJobService.list(queryWrapper);
- quartzJob.setId(quartzJobs.get(0).getId());
- quartzJobService.resumeJob(quartzJob);
- return Result.OK(quartzJob);
- }else{
- quartzJob.setId(quartzJobs.get(0).getId());
- quartzJobService.resumeJob(quartzJob);
- return Result.OK(quartzJob);
- }
- }
- /**
- * 缂栬緫
- *
- * @param enterprise
- * @return
- */
- @AutoLog(value = "浼佷笟鏋舵瀯-缂栬緫")
- @ApiOperation(value="浼佷笟鏋舵瀯-缂栬緫", notes="浼佷笟鏋舵瀯-缂栬緫")
- @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
- public Result<String> edit(@RequestBody Enterprise enterprise) {
- enterpriseService.updateById(enterprise);
- return Result.OK("缂栬緫鎴愬姛!");
- }
-
- /**
- * 閫氳繃id鍒犻櫎
- *
- * @param id
- * @return
- */
- @AutoLog(value = "浼佷笟鏋舵瀯-閫氳繃id鍒犻櫎")
- @ApiOperation(value="浼佷笟鏋舵瀯-閫氳繃id鍒犻櫎", notes="浼佷笟鏋舵瀯-閫氳繃id鍒犻櫎")
- @DeleteMapping(value = "/delete")
- @Transactional
- public Result<String> delete(@RequestParam(name="id",required=true) String id) {
- dataVersionService.update(new UpdateWrapper<DataVersion>()
- .set("del_flag",1)
- .eq("business_id",id));
- enterpriseService.update(new UpdateWrapper<Enterprise>().
- set("del_flag",1)
- .eq("id",id));
- return Result.OK("鍒犻櫎鎴愬姛!");
- }
-
-
- /**
- * 鎵归噺鍒犻櫎
- *
- * @param ids
- * @return
- */
- @AutoLog(value = "浼佷笟鏋舵瀯-鎵归噺鍒犻櫎")
- @ApiOperation(value="浼佷笟鏋舵瀯-鎵归噺鍒犻櫎", notes="浼佷笟鏋舵瀯-鎵归噺鍒犻櫎")
- @DeleteMapping(value = "/deleteBatch")
- @Transactional
- public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
- dataVersionService.update(new UpdateWrapper<DataVersion>()
- .set("del_flag",1)
- .in("business_id",Arrays.asList(ids.split(","))));
- enterpriseService.
- update(new UpdateWrapper<Enterprise>()
- .set("del_flag",1)
- .in("id",Arrays.asList(ids.split(","))));
- return Result.OK("鍒犻櫎鎴愬姛");
- }
-
- /**
- * 閫氳繃id鏌ヨ
- *
- * @param id
- * @return
- */
- @ApiOperation(value="浼佷笟鏋舵瀯-閫氳繃id鏌ヨ", notes="浼佷笟鏋舵瀯-閫氳繃id鏌ヨ")
- @GetMapping(value = "/queryById")
- public Result<Enterprise> queryById(@RequestParam(name="id",required=true) String id) {
- Enterprise enterprise = enterpriseService.getById(id);
- if(enterprise==null) {
- return Result.error("鏈壘鍒板搴旀暟鎹�");
- }
- return Result.OK(enterprise);
- }
-
- /**
- * 瀵煎嚭excel
- *
- * @param request
- * @param enterprise
- */
- @RequestMapping(value = "/exportXls")
- public ModelAndView exportXls(HttpServletRequest request, Enterprise enterprise) {
- return super.exportXls(request, enterprise, Enterprise.class, "浼佷笟鏋舵瀯");
- }
-
- /**
- * 閫氳繃excel瀵煎叆鏁版嵁
- *
- * @param request
- * @param response
- * @return
- */
- @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
- public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
- return super.importExcel(request, response, Enterprise.class);
- }
- /**
- * 琛ㄥ崟楠岃瘉
- *
- *
- */
- @GetMapping("/check")
- public Result<?> check(@RequestParam(name="name",required = false) String name,
- @RequestParam(name="version",required = false) Integer version,
- @RequestParam(name="parentId",required = true) String parentId
- ){
- QueryWrapper<Enterprise> queryWrapper = new QueryWrapper<>();
- if(!StringUtils.isBlank(name)){
- queryWrapper.eq("name",name);
- }
- if(version!=null){
- queryWrapper.eq("version",version);
- }
- if(!StringUtils.isBlank(parentId)){
- queryWrapper.eq("parent_id",parentId);
- }
- queryWrapper.eq("del_flag","0");
- return Result.OK(enterpriseService.list(queryWrapper));
- }
- /**
- * 鑾峰彇鍒濆鐗堟湰鍙�
- *
- *
- */
- @GetMapping("/getInitVersion")
- public Result<?> getUsableVersion(){
- return Result.OK(enterpriseService.getInitVersion());
- }
- /**
- * 鑾峰彇鎵�鏈夌増鏈彿
- *
- *
- */
- @GetMapping("/getVersionList")
- public Result<?> getAllVersion(){
- return Result.OK(enterpriseService.getAllVersion());
- }
- /**
- * 鑾峰彇褰撳墠鐢熸晥鐗堟湰鍜屼笂涓�娆＄敓鏁堢増鏈殑鐗堟湰鍙�
- *
- * @return
- */
- @GetMapping("/getNowAndLastUsableVersion")
- public Result<?> getNowAndLastUsableVersion(){
- return Result.OK(enterpriseService.getNowAndLastUsableVersion());
- }
- /**
- * 鍒犻櫎娑堟伅鎻愰啋
- *
- * @param delIndexList
- * @return
- */
- @PostMapping("/checkDel")
- @Transactional
- public Result<?> checkDel(@RequestBody List<String> delIndexList){
- List<Administrator> administrators = administratorService
- .list(new QueryWrapper<Administrator>()
- .in("enterprise_id",delIndexList)
- .eq("del_flag",0)
- );
- List<String> list1 = administrators.stream().map(Administrator::getEnterpriseId).collect(Collectors.toList());
- Set<String> set = new TreeSet<>();
- set.addAll(list1);
- if(CollectionUtils.isNotEmpty(set)){
- List<Enterprise> enterpriseList = enterpriseService.listByIds(set);
- final String[] listMessage = {""};
- if(CollectionUtils.isNotEmpty(enterpriseList)){
- enterpriseList.stream().forEach(enterprise -> {
- listMessage[0] = listMessage[0] +enterprise.getCode()+",";
- });
- String trueMessage = "缂栧彿涓�"+listMessage[0]
- .substring(0, listMessage[0].length()-1)+"鐨勬暟鎹寮曠敤锛岀‘璁ゅ垹闄ゅ悧锛�";
- return Result.OK(trueMessage);
- }
- }
- return Result.OK("閫変腑鏁版嵁娌℃湁琚紩鐢紝鍙互瀹夊叏鍒犻櫎锛岀‘璁ゅ垹闄ゅ悧锛�");
- }
- /**
- * 鎷栨嫿鑺傜偣
- *
- * @param map
- * @return
- */
- @PostMapping("/dropAndChangeNode")
- @Transactional
- public Result<?> dropAndChangeNode(@RequestBody Map<String,String> map){
- String dropedKey=map.get("dropedKey");
- String changeKey=map.get("changeKey");
- String dropedParentId = map.get("dropedParentId");
- String changeParentId = map.get("changeParentId");
- Enterprise dropedEnterprise = enterpriseService.getById(dropedKey);
- Enterprise changeEnterprise = enterpriseService.getById(changeKey);
- String dropedCode = dropedEnterprise.getCode();
- String changeCode = changeEnterprise.getCode();
- String status = map.get("status");
- if("1".equals(status)||"3".equals(status)){
- dropedEnterprise.setId(changeKey).setParentId(changeParentId).setCode(changeCode);
- changeEnterprise.setId(dropedKey).setParentId(dropedParentId).setCode(dropedCode);
- List<Enterprise> list = new ArrayList<>();
- list.add(dropedEnterprise);
- list.add(changeEnterprise);
- enterpriseService.updateBatchById(list);
- }else if("4".equals(status)){
- //浜掓崲浣嶇疆
- String finalCode="";
- List<Enterprise> changeChildList = enterpriseService
- .list(new QueryWrapper<Enterprise>()
- .eq("parent_id",changeKey)
- .eq("del_flag",0));
- if(CollectionUtils.isNotEmpty(changeChildList)){
- TreeSet<Integer> childIntCodeSet = new TreeSet<>(Comparator.reverseOrder());
- changeChildList.stream().forEach(sysDepart -> {
- String orgCode = sysDepart.getCode();
- Integer subCode = Integer.parseInt(orgCode.substring(orgCode.lastIndexOf(".")+1));
- childIntCodeSet.add(subCode);
- });
- Integer finalIntSubfix=childIntCodeSet.first()+1;
- finalCode = changeCode+".0"+finalIntSubfix;
- }
- else {
- finalCode = changeCode+".01";
- }
- dropedEnterprise.setParentId(changeKey).setCode(finalCode);
- enterpriseService.updateById(dropedEnterprise);
- //閲嶆柊璁＄畻璋冩暣浣嶇疆鍚庡悇瀛╁瓙鐨刢ode
- changeEveryChildCode(dropedKey,finalCode);
- }else if("2".equals(status)){
- String prefix = changeCode.substring(0,changeCode.lastIndexOf("."));
- Integer changeSubfix = Integer.parseInt(changeCode.substring(changeCode.lastIndexOf(".")+1));
- List<Enterprise> changeChildList = enterpriseService.list(new QueryWrapper<Enterprise>()
- .eq("parent_id",changeParentId)
- .eq("del_flag",0));
- changeChildList.stream().forEach(enterprise -> {
- String code = enterprise.getCode();
- String id = enterprise.getId();
- Integer numSubfix = Integer.parseInt(code.substring(code.lastIndexOf(".")+1));
- if(numSubfix>changeSubfix){
- numSubfix = numSubfix+1;
- String finalCode = prefix+".0"+numSubfix;
- enterprise.setCode(finalCode);
- changeEveryChildCode(id,finalCode);
- }
- });
- enterpriseService.saveOrUpdateBatch(changeChildList);
- Integer numDropedSubfix = changeSubfix+1;
- String finalDropedCode = prefix+".0"+numDropedSubfix;
- dropedEnterprise.setCode(finalDropedCode).setParentId(changeParentId);
- changeEveryChildCode(dropedKey,finalDropedCode);
- enterpriseService.saveOrUpdate(dropedEnterprise);
- }else if("5".equals(status)){
- String prefix = changeCode.substring(0,changeCode.lastIndexOf("."));
- Integer changeSubfix = Integer.parseInt(changeCode.substring(changeCode.lastIndexOf(".")+1));
- List<Enterprise> changeChildList = enterpriseService.list(new QueryWrapper<Enterprise>()
- .eq("parent_id",changeParentId)
- .eq("del_flag",0));
- changeChildList.stream().forEach(enterprise -> {
- String code = enterprise.getCode();
- String id = enterprise.getId();
- Integer numSubfix = Integer.parseInt(code.substring(code.lastIndexOf(".")+1));
- if(numSubfix>=changeSubfix){
- numSubfix = numSubfix+1;
- String finalCode = prefix+".0"+numSubfix;
- enterprise.setCode(finalCode);
- changeEveryChildCode(id,finalCode);
- }
- });
- enterpriseService.saveOrUpdateBatch(changeChildList);
- Integer numDropedSubfix = changeSubfix;
- String finalDropedCode = prefix+".0"+numDropedSubfix;
- dropedEnterprise.setCode(finalDropedCode).setParentId(changeParentId);
- changeEveryChildCode(dropedKey,finalDropedCode);
- enterpriseService.saveOrUpdate(dropedEnterprise);
- }
-
- return Result.OK("鏍戠粨鏋勮皟鏁存垚鍔�");
-
- }
- /**
- * 鍒ゆ柇鏄惁鏈変翰瀛愬叧绯�
- *
- * @param map
- * @return
- */
- @PostMapping("/checkPositionInfo")
- public Result<?> checkPositionInfo(@RequestBody Map<String,String> map){
- String dropedKey=map.get("dropedKey");
- String changeKey=map.get("changeKey");
- return Result.OK(isChildren(changeKey,dropedKey)||isChildren(dropedKey,changeKey));
- }
-
- /*-----------------------------------------------浠ヤ笅涓烘彁渚涙柟渚跨殑api-------------------------------*/
- /**
- * 鍗囩増鍗曚釜鏍戣妭鐐瑰苟杩斿洖鍗囩増鍚庢柊鑺傜偣Id
- * @param sourceEnterprise
- * @param newParentId
- * @param newVersion
- * @return newEnterPriseId
- *
- */
- public String updataOneNode
- (
- Enterprise sourceEnterprise,
- String newParentId,
- Integer newVersion
- ){
- //1.鍙栧嚭鏃х増鏈俊鎭�;2.鍒涘缓灏嗘柊鐗堟湰闆嗗洟鏋舵瀯鍙婂叾鐗堟湰鍙峰苟瀛樺叆鏁版嵁搴�
- // 1.
- DataVersion oldDataVersion = dataVersionService
- .getOne(new QueryWrapper<DataVersion>()
- .eq("business_id",sourceEnterprise.getId())
- .eq("del_flag",0),true);
- sourceEnterprise.setId(null)
- .setParentId(newParentId)
- .setVersion(newVersion);
- //2.
- enterpriseService.save(sourceEnterprise);
- Enterprise newEnterprise = enterpriseService
- .getOne(new QueryWrapper<Enterprise>()
- .eq("code",sourceEnterprise.getCode())
- .eq("version",newVersion)
- .eq("del_flag",0),true);
- DataVersion newDataVersion = new DataVersion();
- newDataVersion
- .setVersion(newVersion)
- .setBusinessType("闆嗗洟鏋舵瀯")
- .setBusinessId(newEnterprise.getId())
- .setIsLastUsable("0")
- .setVersionStatus("1")
- .setDelFlag(0)
- .setSourceVersionId(oldDataVersion.getId());
- dataVersionService.save(newDataVersion);
- //灏嗙増鏈彿瀛樺叆鍏宠仈鐨勯泦鍥㈡灦鏋�
- String newDataVersionId = dataVersionService
- .getOne(new QueryWrapper<DataVersion>()
- .eq("business_id",newDataVersion.getBusinessId())
- .eq("del_flag",0)).getId();
- enterpriseService.update(new UpdateWrapper<Enterprise>()
- .set("data_version_id",newDataVersionId)
- .eq("id",newEnterprise.getId()));
- return newEnterprise.getId();
- }
- /**
- * 閫掑綊鍗囩増澶氫釜鑺傜偣
- * @param parentId
- * @param newParentId
- * @param version
- * @param newVersion
- * @return
- */
- public void recurrenceUpdata(String parentId,String newParentId,Integer version,Integer newVersion){
- CopyOnWriteArrayList<Enterprise> childList = new CopyOnWriteArrayList<>();
- childList.addAll(enterpriseService.list(new QueryWrapper<Enterprise>()
- .eq("parent_id",parentId)
- .eq("version",version)
- .eq("del_flag",0)));
- if(CollectionUtils.isNotEmpty(childList)){
- childList.stream().forEach(childEnterprise ->{
- //鎶奵hild鐨処d瀛樹笅鏉�,鍥犱负鍦ㄦ祦閲岃竟鎿嶄綔瀵硅薄瀹规槗鎵潃铔�
- String childNewId= childEnterprise.getId();
- //灏嗘暟鎹瓨鍏ユ暟鎹簱
- String childNewParentId=updataOneNode(childEnterprise,newParentId,newVersion);
- //閫掑綊
- recurrenceUpdata(childNewId,childNewParentId,version,newVersion);
- } );
- }
-
- }
- /**
- * 鎷栨嫿浜ゆ崲涓や釜鏍戠殑浣嶇疆
- * @param dropedEnterprise
- * @param changeEnterprise
- * @return
- */
- public void changePosition(Enterprise dropedEnterprise,Enterprise changeEnterprise){
- String dropedId = dropedEnterprise.getId();
- String changeId = changeEnterprise.getId();
- String dropedParentId = dropedEnterprise.getParentId();
- String changeParentId = changeEnterprise.getParentId();
- String dropedCode = dropedEnterprise.getCode();
- String changeCode = changeEnterprise.getCode();
- //瀛樺湪鐖舵崲瀛�
- if(dropedId.equals(changeParentId)){
- dropedEnterprise.setParentId(changeId);
- changeEnterprise.setParentId(dropedParentId).setCode(dropedCode);
- enterpriseService.saveOrUpdate(changeEnterprise);
- enterpriseService.saveOrUpdate(dropedEnterprise);
- changeEveryChildCode(changeId,dropedCode);
- }
- //瀛樺湪瀛愭崲鐖�
- else if(changeId.equals(dropedParentId)){
- dropedEnterprise.setParentId(changeParentId).setCode(changeCode);
- changeEnterprise.setParentId(dropedId);
- enterpriseService.saveOrUpdate(dropedEnterprise);
- enterpriseService.saveOrUpdate(changeEnterprise);
- changeEveryChildCode(dropedId,changeCode);
- }
- else {
- dropedEnterprise.setParentId(changeParentId).setCode(changeCode);
- changeEnterprise.setParentId(dropedParentId).setCode(dropedCode);
- enterpriseService.saveOrUpdate(dropedEnterprise);
- enterpriseService.saveOrUpdate(changeEnterprise);
- changeEveryChildCode(changeId,dropedCode);
- changeEveryChildCode(dropedId,changeCode);
- }
- }
- /**
- * 閫掑綊璋冩暣鏍戣妭鐐圭殑code
- * @param parentId
- * @param prefix
- * @return
- */
- public void changeEveryChildCode(String parentId,String prefix){
- List<Enterprise> children = enterpriseService.list(new QueryWrapper<Enterprise>()
- .eq("parent_id",parentId)
- .eq("del_flag",0));
- if(CollectionUtils.isNotEmpty(children)){
- for(Enterprise enterprise:children){
- String id = enterprise.getId();
- String oldCode = enterprise.getCode();
- String subfix = oldCode.substring(oldCode.lastIndexOf(".")+1);
- String realCode = prefix+"."+subfix;
- enterpriseService.update(new UpdateWrapper<Enterprise>().set("code",realCode).eq("id",id));
- changeEveryChildCode(id,realCode);
- }
- }
- }
- /**
- * 閫掑綊鍒ゆ柇鏄惁涓哄悗杈堝叕鍙�
- * @param parentId
- * @param id
- * @return
- */
- public boolean isChildren(String parentId,String id){
- boolean tag = false;
- List<String> idList = enterpriseService.list(new QueryWrapper<Enterprise>()
- .eq("parent_id",parentId)
- .eq("del_flag",0))
- .stream()
- .map(Enterprise::getId)
- .collect(Collectors.toList());
- if(CollectionUtils.isNotEmpty(idList)){
- for(String strId:idList){
- if(strId.equals(id)){
- return true;
- }
- else if(!tag){
- tag = isChildren(strId,id);
- }
- }
- }
- return tag;
- }
-
-}
diff --git a/src/main/java/org/jeecg/modules/base/controller/FactoryController.java b/src/main/java/org/jeecg/modules/base/controller/FactoryController.java
new file mode 100644
index 0000000..75efb57
--- /dev/null
+++ b/src/main/java/org/jeecg/modules/base/controller/FactoryController.java
@@ -0,0 +1,238 @@
+package org.jeecg.modules.base.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.constant.CommonConstant;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.base.entity.Factory;
+import org.jeecg.modules.base.model.FactoryIdModel;
+import org.jeecg.modules.base.service.IFactoryService;
+
+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.modules.base.model.FactoryTreeModel;
+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: 宸ュ巶/杞﹂棿/浜х嚎
+ * @Author: jeecg-boot
+ * @Date: 2025-06-24
+ * @Version: V1.0
+ */
+@Api(tags="宸ュ巶/杞﹂棿/浜х嚎")
+@RestController
+@RequestMapping("/base/factory")
+@Slf4j
+public class FactoryController extends JeecgController<Factory, IFactoryService> {
+ @Autowired
+ private IFactoryService factoryService;
+
+ /**
+ * 鍒嗛〉鍒楄〃鏌ヨ
+ *
+ * @param factory
+ * @param pageNo
+ * @param pageSize
+ * @param req
+ * @return
+ */
+ //@AutoLog(value = "宸ュ巶/杞﹂棿/浜х嚎-鍒嗛〉鍒楄〃鏌ヨ")
+ @ApiOperation(value="宸ュ巶/杞﹂棿/浜х嚎-鍒嗛〉鍒楄〃鏌ヨ", notes="宸ュ巶/杞﹂棿/浜х嚎-鍒嗛〉鍒楄〃鏌ヨ")
+ @GetMapping(value = "/list")
+ public Result<IPage<Factory>> queryPageList(Factory factory,
+ @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+ @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+ HttpServletRequest req) {
+ QueryWrapper<Factory> queryWrapper = QueryGenerator.initQueryWrapper(factory, req.getParameterMap());
+ Page<Factory> page = new Page<Factory>(pageNo, pageSize);
+ IPage<Factory> pageList = factoryService.page(page, queryWrapper);
+ return Result.OK(pageList);
+ }
+
+ /**
+ * 娣诲姞
+ *
+ * @param factory
+ * @return
+ */
+ @AutoLog(value = "宸ュ巶/杞﹂棿/浜х嚎-娣诲姞")
+ @ApiOperation(value="宸ュ巶/杞﹂棿/浜х嚎-娣诲姞", notes="宸ュ巶/杞﹂棿/浜х嚎-娣诲姞")
+ //@RequiresPermissions("org.jeecg.modules:base_factory:add")
+ @PostMapping(value = "/add")
+ public Result<Factory> add(@RequestBody Factory factory) {
+ Result<Factory> result = new Result<>();
+ try {
+ factoryService.saveFactoryData(factory);
+ result.success("娣诲姞鎴愬姛锛�");
+ } catch (Exception e) {
+ log.error(e.getMessage(), e);
+ result.error500("鎿嶄綔澶辫触");
+ }
+ return result;
+ }
+
+ /**
+ * 缂栬緫
+ *
+ * @param factory
+ * @return
+ */
+ @AutoLog(value = "宸ュ巶/杞﹂棿/浜х嚎-缂栬緫")
+ @ApiOperation(value="宸ュ巶/杞﹂棿/浜х嚎-缂栬緫", notes="宸ュ巶/杞﹂棿/浜х嚎-缂栬緫")
+ //@RequiresPermissions("org.jeecg.modules:base_factory:edit")
+ @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+ public Result<String> edit(@RequestBody Factory factory) {
+ factoryService.updateById(factory);
+ return Result.OK("缂栬緫鎴愬姛!");
+ }
+
+ /**
+ * 閫氳繃id鍒犻櫎
+ *
+ * @param id
+ * @return
+ */
+ @AutoLog(value = "宸ュ巶/杞﹂棿/浜х嚎-閫氳繃id鍒犻櫎")
+ @ApiOperation(value="宸ュ巶/杞﹂棿/浜х嚎-閫氳繃id鍒犻櫎", notes="宸ュ巶/杞﹂棿/浜х嚎-閫氳繃id鍒犻櫎")
+ //@RequiresPermissions("org.jeecg.modules:base_factory:delete")
+ @DeleteMapping(value = "/delete")
+ public Result<Factory> delete(@RequestParam(name="id",required=true) String id) {
+ Result<Factory> result = new Result<>();
+ Factory factory = factoryService.getById(id);
+ if (factory == null) {
+ result.error500("鏈壘鍒板搴斿疄浣�");
+ } else {
+ boolean ok = factoryService.delete(id);
+ if (ok) {
+ result.success("鍒犻櫎鎴愬姛!");
+ }
+ }
+ return result;
+ }
+
+ /**
+ * 鎵归噺鍒犻櫎
+ *
+ * @param ids
+ * @return
+ */
+ @AutoLog(value = "宸ュ巶/杞﹂棿/浜х嚎-鎵归噺鍒犻櫎")
+ @ApiOperation(value="宸ュ巶/杞﹂棿/浜х嚎-鎵归噺鍒犻櫎", notes="宸ュ巶/杞﹂棿/浜х嚎-鎵归噺鍒犻櫎")
+ //@RequiresPermissions("org.jeecg.modules:base_factory:deleteBatch")
+ @DeleteMapping(value = "/deleteBatch")
+ public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+ this.factoryService.removeByIds(Arrays.asList(ids.split(",")));
+ return Result.OK("鎵归噺鍒犻櫎鎴愬姛!");
+ }
+
+ /**
+ * 閫氳繃id鏌ヨ
+ *
+ * @param id
+ * @return
+ */
+ //@AutoLog(value = "宸ュ巶/杞﹂棿/浜х嚎-閫氳繃id鏌ヨ")
+ @ApiOperation(value="宸ュ巶/杞﹂棿/浜х嚎-閫氳繃id鏌ヨ", notes="宸ュ巶/杞﹂棿/浜х嚎-閫氳繃id鏌ヨ")
+ @GetMapping(value = "/queryById")
+ public Result<Factory> queryById(@RequestParam(name="id",required=true) String id) {
+ Factory factory = factoryService.getById(id);
+ if(factory==null) {
+ return Result.error("鏈壘鍒板搴旀暟鎹�");
+ }
+ return Result.OK(factory);
+ }
+
+ /**
+ * 瀵煎嚭excel
+ *
+ * @param request
+ * @param factory
+ */
+ //@RequiresPermissions("org.jeecg.modules:base_factory:exportXls")
+ @RequestMapping(value = "/exportXls")
+ public ModelAndView exportXls(HttpServletRequest request, Factory factory) {
+ return super.exportXls(request, factory, Factory.class, "宸ュ巶/杞﹂棿/浜х嚎");
+ }
+
+ /**
+ * 閫氳繃excel瀵煎叆鏁版嵁
+ *
+ * @param request
+ * @param response
+ * @return
+ */
+ //@RequiresPermissions("base_factory:importExcel")
+ @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+ public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+ return super.importExcel(request, response, Factory.class);
+ }
+
+
+ //@AutoLog(value = "浜х嚎琛�-鏍戝舰鍒楄〃")
+ @ApiOperation(value = "浜х嚎琛�-鏍戝舰鍒楄〃", notes = "浜х嚎琛�-鏍戝舰鍒楄〃")
+ @GetMapping(value = "/queryTreeList")
+ public Result<List<FactoryTreeModel>> queryTreeList(@RequestParam(name = "ids", required = false) String ids) {
+ Result<List<FactoryTreeModel>> result = new Result<>();
+ try {
+ if (oConvertUtils.isNotEmpty(ids)) {
+ List<FactoryTreeModel> factoryList = factoryService.queryTreeList(ids);
+ result.setResult(factoryList);
+ } else {
+ List<FactoryTreeModel> list = factoryService.queryTreeList();
+ result.setResult(list);
+ }
+ result.setSuccess(true);
+ } catch (Exception e) {
+ log.error(e.getMessage(), e);
+ }
+ return result;
+ }
+
+ //@AutoLog(value = "浜х嚎琛�-id闆嗗悎")
+ @ApiOperation(value = "浜х嚎琛�-id闆嗗悎", notes = "浜х嚎琛�-id闆嗗悎")
+ @GetMapping(value = "/queryTreeIdList")
+ public Result<List<String>> queryTreeIdList() {
+ Result<List<String>> result = new Result<>();
+ try {
+ List<Factory> factoryList = factoryService.list(new LambdaQueryWrapper<Factory>().eq(Factory::getDelFlag, CommonConstant.DEL_FLAG_0).orderByAsc(Factory::getSorter));
+ List<String> ids = factoryList.stream().map(Factory::getId).collect(Collectors.toList());
+ result.setSuccess(true);
+ result.setResult(ids);
+ } catch (Exception e) {
+ log.error(e.getMessage(), e);
+ }
+ return result;
+ }
+
+ //@AutoLog(value = "浜х嚎琛�-鏌ヨ鏍戝舰缁撴瀯鎵�鏈変骇绾垮悕绉�")
+ @ApiOperation(value = "浜х嚎琛�-鏌ヨ鏍戝舰缁撴瀯鎵�鏈変骇绾垮悕绉�", notes = "浜х嚎琛�-鏌ヨ鏍戝舰缁撴瀯鎵�鏈変骇绾垮悕绉�")
+ @GetMapping(value = "/queryIdTree")
+ public Result<List<FactoryIdModel>> queryIdTree() {
+ Result<List<FactoryIdModel>> result = new Result<>();
+ try {
+ List<FactoryIdModel> list = factoryService.queryFactoryIdTreeList();
+ result.setResult(list);
+ result.setSuccess(true);
+ } catch (Exception e) {
+ log.error(e.getMessage(), e);
+ }
+ return result;
+ }
+
+}
diff --git a/src/main/java/org/jeecg/modules/base/controller/FactoryElementCategoryController.java b/src/main/java/org/jeecg/modules/base/controller/FactoryElementCategoryController.java
deleted file mode 100644
index d37d7e5..0000000
--- a/src/main/java/org/jeecg/modules/base/controller/FactoryElementCategoryController.java
+++ /dev/null
@@ -1,198 +0,0 @@
-package org.jeecg.modules.base.controller;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import com.baomidou.mybatisplus.core.toolkit.StringUtils;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.modules.base.entity.FactoryElementCategory;
-import org.jeecg.modules.base.service.IFactoryElementCategoryService;
-
-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: 宸ュ巶瑕佺礌绫诲瀷
- * @Author: jeecg-boot
- * @Date: 2022-11-07
- * @Version: V1.0
- */
-@Api(tags="宸ュ巶瑕佺礌绫诲瀷")
-@RestController
-@RequestMapping("/base/factoryElementCategory")
-@Slf4j
-public class FactoryElementCategoryController extends JeecgController<FactoryElementCategory, IFactoryElementCategoryService> {
- @Autowired
- private IFactoryElementCategoryService factoryElementCategoryService;
-
- /**
- * 琛ㄥ崟楠岃瘉
- *
- *
- */
- @GetMapping("/check")
- public Result<?> check(@RequestParam(name="name",required = false) String name,
- @RequestParam(name="code",required = false) String code
- ){
- QueryWrapper<FactoryElementCategory> queryWrapper = new QueryWrapper<>();
- if(!StringUtils.isBlank(name)){
- queryWrapper.eq("name",name);
- }
- if(!StringUtils.isBlank(code)){
- queryWrapper.eq("code",code);
- }
- queryWrapper.eq("del_flag","0");
- return Result.OK(factoryElementCategoryService.list(queryWrapper));
- }
- /**
- * 鍒嗛〉鍒楄〃鏌ヨ
- *
- * @param factoryElementCategory
- * @param pageNo
- * @param pageSize
- * @param req
- * @return
- */
- //@AutoLog(value = "宸ュ巶瑕佺礌绫诲瀷-鍒嗛〉鍒楄〃鏌ヨ")
- @ApiOperation(value="宸ュ巶瑕佺礌绫诲瀷-鍒嗛〉鍒楄〃鏌ヨ", notes="宸ュ巶瑕佺礌绫诲瀷-鍒嗛〉鍒楄〃鏌ヨ")
- @GetMapping(value = "/list")
- public Result<IPage<FactoryElementCategory>> queryPageList(FactoryElementCategory factoryElementCategory,
- @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
- @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
- HttpServletRequest req) {
- QueryWrapper<FactoryElementCategory> queryWrapper = QueryGenerator.initQueryWrapper(factoryElementCategory, req.getParameterMap());
- queryWrapper.eq("del_flag","0");
- Page<FactoryElementCategory> page = new Page<FactoryElementCategory>(pageNo, pageSize);
- IPage<FactoryElementCategory> pageList = factoryElementCategoryService.page(page, queryWrapper);
- return Result.OK(pageList);
- }
-
- /**
- * 娣诲姞
- *
- * @param factoryElementCategory
- * @return
- */
- @AutoLog(value = "宸ュ巶瑕佺礌绫诲瀷-娣诲姞")
- @ApiOperation(value="宸ュ巶瑕佺礌绫诲瀷-娣诲姞", notes="宸ュ巶瑕佺礌绫诲瀷-娣诲姞")
- //@RequiresPermissions("org.jeecg.modules.demo:mom_base_factory_element_category:add")
- @PostMapping(value = "/add")
- public Result<String> add(@RequestBody FactoryElementCategory factoryElementCategory) {
- factoryElementCategory.setDelFlag("0");
- factoryElementCategoryService.save(factoryElementCategory);
- return Result.OK("娣诲姞鎴愬姛锛�");
- }
-
- /**
- * 缂栬緫
- *
- * @param factoryElementCategory
- * @return
- */
- @AutoLog(value = "宸ュ巶瑕佺礌绫诲瀷-缂栬緫")
- @ApiOperation(value="宸ュ巶瑕佺礌绫诲瀷-缂栬緫", notes="宸ュ巶瑕佺礌绫诲瀷-缂栬緫")
- //@RequiresPermissions("org.jeecg.modules.demo:mom_base_factory_element_category:edit")
- @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
- public Result<String> edit(@RequestBody FactoryElementCategory factoryElementCategory) {
- factoryElementCategoryService.updateById(factoryElementCategory);
- return Result.OK("缂栬緫鎴愬姛!");
- }
-
- /**
- * 閫氳繃id鍒犻櫎
- *
- * @param id
- * @return
- */
- @AutoLog(value = "宸ュ巶瑕佺礌绫诲瀷-閫氳繃id鍒犻櫎")
- @ApiOperation(value="宸ュ巶瑕佺礌绫诲瀷-閫氳繃id鍒犻櫎", notes="宸ュ巶瑕佺礌绫诲瀷-閫氳繃id鍒犻櫎")//閫昏緫鍒犻櫎
- //@RequiresPermissions("org.jeecg.modules.demo:mom_base_factory_element_category:delete")
- @DeleteMapping(value = "/delete")
- public Result<String> delete(@RequestParam(name="id",required=true) String id) {
- FactoryElementCategory factoryElementCategory = new FactoryElementCategory();
- factoryElementCategory.setId(id);
- factoryElementCategory.setDelFlag("1");
- factoryElementCategoryService.updateById(factoryElementCategory);
- return Result.OK("鍒犻櫎鎴愬姛!");
- }
-
- /**
- * 鎵归噺鍒犻櫎
- *
- * @param ids
- * @return
- */
- @AutoLog(value = "宸ュ巶瑕佺礌绫诲瀷-鎵归噺鍒犻櫎")
- @ApiOperation(value="宸ュ巶瑕佺礌绫诲瀷-鎵归噺鍒犻櫎", notes="宸ュ巶瑕佺礌绫诲瀷-鎵归噺鍒犻櫎")//閫昏緫鍒犻櫎
- //@RequiresPermissions("org.jeecg.modules.demo:mom_base_factory_element_category:deleteBatch")
- @DeleteMapping(value = "/deleteBatch")
- public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
- List<FactoryElementCategory> list = new ArrayList<>();
- String realIds[] = ids.split(",");
- for(String id:realIds){
- FactoryElementCategory factoryElementCategory = new FactoryElementCategory();
- factoryElementCategory.setId(id);
- factoryElementCategory.setDelFlag("1");
- list.add(factoryElementCategory);
- }
- this.factoryElementCategoryService.updateBatchById(list);
- return Result.OK("鎵归噺鍒犻櫎鎴愬姛!");
- }
-
- /**
- * 閫氳繃id鏌ヨ
- *
- * @param id
- * @return
- */
- //@AutoLog(value = "宸ュ巶瑕佺礌绫诲瀷-閫氳繃id鏌ヨ")
- @ApiOperation(value="宸ュ巶瑕佺礌绫诲瀷-閫氳繃id鏌ヨ", notes="宸ュ巶瑕佺礌绫诲瀷-閫氳繃id鏌ヨ")
- @GetMapping(value = "/queryById")
- public Result<FactoryElementCategory> queryById(@RequestParam(name="id",required=true) String id) {
- FactoryElementCategory factoryElementCategory = factoryElementCategoryService.getById(id);
- if(factoryElementCategory==null) {
- return Result.error("鏈壘鍒板搴旀暟鎹�");
- }
- return Result.OK(factoryElementCategory);
- }
-
- /**
- * 瀵煎嚭excel
- *
- * @param request
- * @param factoryElementCategory
- */
- //@RequiresPermissions("org.jeecg.modules.demo:mom_base_factory_element_category:exportXls")
- @RequestMapping(value = "/exportXls")
- public ModelAndView exportXls(HttpServletRequest request, FactoryElementCategory factoryElementCategory) {
- return super.exportXls(request, factoryElementCategory, FactoryElementCategory.class, "宸ュ巶瑕佺礌绫诲瀷");
- }
-
- /**
- * 閫氳繃excel瀵煎叆鏁版嵁
- *
- * @param request
- * @param response
- * @return
- */
- //@RequiresPermissions("mom_base_factory_element_category:importExcel")
- @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
- public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
- return super.importExcel(request, response, FactoryElementCategory.class);
- }
-
-}
diff --git a/src/main/java/org/jeecg/modules/base/controller/FactoryModelController.java b/src/main/java/org/jeecg/modules/base/controller/FactoryModelController.java
deleted file mode 100644
index 81ba9cc..0000000
--- a/src/main/java/org/jeecg/modules/base/controller/FactoryModelController.java
+++ /dev/null
@@ -1,711 +0,0 @@
-package org.jeecg.modules.base.controller;
-
-import java.text.ParseException;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-import java.util.*;
-import java.util.stream.Collectors;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
-import com.baomidou.mybatisplus.core.toolkit.StringUtils;
-import org.apache.shiro.SecurityUtils;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.system.vo.LoginUser;
-import org.jeecg.common.system.vo.SelectTreeModel;
-import org.jeecg.modules.base.entity.FactoryModel;
-import org.jeecg.modules.base.service.IEnterpriseService;
-import org.jeecg.modules.base.service.IFactoryModelService;
-
-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.jeecg.modules.quartz.entity.QuartzJob;
-import org.jeecg.modules.quartz.service.IQuartzJobService;
-import org.jeecg.common.system.base.entity.DataVersion;
-import org.jeecg.modules.system.service.IDataVersionService;
-import org.jeecg.modules.system.service.ISysUserService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
-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: 宸ュ巶寤烘ā
- * @Author: jeecg-boot
- * @Date: 2022-11-08
- * @Version: V1.0
- */
-@Api(tags="宸ュ巶寤烘ā")
-@RestController
-@RequestMapping("/base/factoryModel")
-@Slf4j
-public class FactoryModelController extends JeecgController<FactoryModel, IFactoryModelService>{
- @Autowired
- private IFactoryModelService factoryModelService;
- @Autowired
- private IEnterpriseService enterpriseService;
- @Autowired
- private ISysUserService sysUserService;
- @Autowired
- private IDataVersionService dataVersionService;
- @Autowired
- private IQuartzJobService quartzJobService;
- /**
- * 鑾峰彇鍒濆淇℃伅
- *
- *
- */
- @GetMapping("/getFactoryInfo")
- public Result<?> getFactoryInfo(){
- Map<String,Object> infoMap = new HashMap<>(2);
- LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-// infoMap.put("enterpriseId",loginUser.getEnterpriseId());
- infoMap.put("version",factoryModelService.getUsableVersion().get(0));
- return Result.OK(infoMap);
- }
- /**
- * 鐢熸晥杞﹂棿鍒楄〃
- * @return
- */
- @GetMapping("getUsableWorkShopList")
- public Result<?> getUsableList(){
- return Result.OK(factoryModelService.getUsableWorkShopList());
- }
- /**
- * 鏍规嵁鐗堟湰鑾峰彇鐗堟湰鍙�
- *
- *
- */
- @GetMapping("/getVersionStatusByVersion")
- public Result<?> getVersionStatusByVersion(@RequestParam(value = "version",required = false) Integer version){
- return Result.OK(factoryModelService.getVersionStatusByVersion(version));
- }
- /**
- * 鑾峰彇鍒濆鐗堟湰鍙�
- *
- *
- */
- @GetMapping("/getInitVersion")
- public Result<?> getUsableVersion(){
- return Result.OK(factoryModelService.getInitVersion());
- }
- /**
- * 鑾峰彇鎵�鏈夌増鏈彿
- *
- *
- */
- @GetMapping("/getVersionList")
- public Result<?> getAllVersion(){
- return Result.OK(factoryModelService.getVersionList());
- }
- /**
- * //鏍规嵁浼佷笟id鍙婄増鏈彿鏌ヨ宸ュ巶鏍�
- *
- * @param enterpriseId
- * @param version
- * @return
- */
- @GetMapping("/loadTree")//鏍规嵁浣跨敤鑰呯殑id鏌ュ叾鎵�鍦ㄥ伐鍘傜殑鏍�
- public Result<?> loadTree(@RequestParam(value = "enterpriseId", required = false)String enterpriseId,
- @RequestParam(value = "version", required = false) Integer version){
- List<SelectTreeModel> list = new ArrayList<>();
- SelectTreeModel selectTreeModel = new SelectTreeModel();
- selectTreeModel.setKey(enterpriseId);
- selectTreeModel.setChildren(factoryModelService.loadTree(enterpriseId,version));
- selectTreeModel.setTitle("宸ュ巶寤烘ā");
- list.add(selectTreeModel);
- return Result.OK(list);
- }
-
- /**
- * //鏍规嵁宸ュ巶id鏌ユ墍鏈夊瓙宸ュ巶鍙婅溅闂�
- *
- * @param pageNo
- * @param pageSize
- * @param parentId
- * @param version
- * @return
- */
- @GetMapping("/list")//鏍规嵁宸ュ巶id鏌ユ墍鏈夊瓙宸ュ巶鍙婅溅闂�
- public Result<?> list(Map map,
- @RequestParam(name ="pageNo", defaultValue="1") Integer pageNo,
- @RequestParam(name ="pageSize", defaultValue="10") Integer pageSize,
- @RequestParam(name = "parentId",required = false) String parentId,
- @RequestParam(name="version",required = false) Integer version,
- @RequestParam(name="selected",required = false) String selected
- ){
- List<String> ids = new ArrayList<>();
- if(selected!=null){
- ids = Arrays.asList(selected.split(","));
- }
- Page<Map<String,Object>> page = new Page(pageNo, pageSize);
- IPage<Map<String,Object>> pageList = factoryModelService.getFactoryList(page,version,parentId,ids);
- return Result.OK(pageList);
- }
- /**
- * 鏌ユ墍鏈夐儴闂�
- *
- * @param
- * @return
- */
- @GetMapping("/departList")
- public Result<?> departList(){
- return Result.OK(factoryModelService.getDepartList());
- }
- /**
- * 鏍规嵁瀹㈡埛id鏌ュ鎴锋墍鍦ㄥ叕鍙竔d
- *
- * @param uid
- * @return
- */
- @GetMapping("/enterprise/{uid}")
- public Result<?> getEidByUid(@PathVariable("uid") String uid){
- return Result.OK(factoryModelService.getEidByUid(uid));
- }
- /**
- * 琛ㄥ崟鏍￠獙
- *
- * @param name
- * @param parentId
- * @param version
- * @return
- */
- @GetMapping("/check")
- public Result<?> checkName(@RequestParam(name="name",required = true) String name,
- @RequestParam(name="version",required = false) Integer version,
- @RequestParam(name="parentId",required = true) String parentId){
- QueryWrapper<FactoryModel> queryWrapper = new QueryWrapper<>();
- if(!StringUtils.isBlank(name)){
- queryWrapper.eq("name",name);
- }
- if(version!=null){
- queryWrapper.eq("version",version);
- }
- if(!StringUtils.isBlank(parentId)){
- queryWrapper.eq("parent_id",parentId);
- }
- queryWrapper.eq("del_flag","0");
- return Result.OK(factoryModelService.list(queryWrapper));
- }
- /**
- *
- * 鏌ュ綋鍓嶇敓鏁堜紒涓氫笅鏈夋棤閮ㄩ棬鍘嗗彶鐗堟湰
- *
- */
- @Transactional
- @GetMapping(value = "/getNewVersionPermission")
- public Result<?> getNewVersionPermission(){
- List<String> usableEnterpriseIds = enterpriseService.getUsableIdList();
- return Result.OK(factoryModelService.list(new QueryWrapper<FactoryModel>().in("enterprise_id",usableEnterpriseIds).eq("del_flag",0)));
- }
- /**
- *
- * 鏌ュ綋鍓嶇敓鏁堜紒涓氫笅鏈夋棤閮ㄩ棬鍘嗗彶鐗堟湰
- *
- */
- @Transactional
- @GetMapping(value = "/getUpdateVersionPermission")
- public Result<?> getUpdatePermission(@RequestParam("version") Integer version){
- List<String> usableEnterpriseIds = enterpriseService.getUsableIdList();
- return Result.OK(factoryModelService.list(new QueryWrapper<FactoryModel>()
- .in("enterprise_id",usableEnterpriseIds)
- .eq("version",version)
- .eq("del_flag",0)));
- }
- /**
- * 娣诲姞
- *
- * @param map
- * @return
- */
- @AutoLog(value = "宸ュ巶寤烘ā-娣诲姞")
- @ApiOperation(value="宸ュ巶寤烘ā-娣诲姞", notes="宸ュ巶寤烘ā-娣诲姞")
- @PostMapping(value = "/add")
- @Transactional
- public Result<String> add(@RequestBody Map<String,Object> map) {
- FactoryModel factoryModel = new FactoryModel();
- factoryModel.setCode(String.valueOf(map.get("code")))
- .setName(String.valueOf(map.get("name")))
- .setVersion(Integer.parseInt(String.valueOf(map.get("version"))))
- .setParentId(String.valueOf(map.get("parentId")))
- .setEnterpriseId(String.valueOf(map.get("enterpriseId")))
- .setFactoryElementCategoryId(String.valueOf(map.get("factoryElementCategoryId")))
- .setRemark(String.valueOf(map.get("remark")))
- .setDepartId(String.valueOf(map.get("departId")))
- .setVirtualFlag(Integer.parseInt(String.valueOf(map.get("virtualFlag"))))
- .setDelFlag(0);
- factoryModelService.save(factoryModel);
- QueryWrapper<FactoryModel> queryWrapper = new QueryWrapper<FactoryModel>()
- .eq("code",factoryModel.getCode())
- .eq("version",factoryModel.getVersion())
- .eq("del_flag",0);
- FactoryModel selectFactoryModel = factoryModelService.getOne(queryWrapper,true);
- DataVersion dataVersion = new DataVersion();
- dataVersion.setBusinessId(selectFactoryModel.getId())
- .setBusinessType("宸ュ巶寤烘ā")
- .setVersion(selectFactoryModel.getVersion())
- .setVersionStatus(String.valueOf(map.get("versionStatus")))
- .setDelFlag(0)
- .setEffectiveType("0")
- .setIsLastUsable("0");
- dataVersionService.save(dataVersion);
- QueryWrapper<DataVersion> queryWrapper1 = new QueryWrapper<DataVersion>()
- .eq("business_id",selectFactoryModel.getId()).eq("del_flag",0);
- DataVersion selectDataVersion = dataVersionService.getOne(queryWrapper1,true);
- selectFactoryModel.setDataVersionId(selectDataVersion.getId());
- factoryModelService.saveOrUpdate(selectFactoryModel);
- return Result.OK("娣诲姞鎴愬姛锛�");
- }
- /**
- * 缂栬緫
- *
- * @param factoryModel
- * @return
- */
- @AutoLog(value = "宸ュ巶寤烘ā-缂栬緫")
- @ApiOperation(value="宸ュ巶寤烘ā-缂栬緫", notes="宸ュ巶寤烘ā-缂栬緫")
- @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
- public Result<String> edit(@RequestBody FactoryModel factoryModel) {
- factoryModelService.updateById(factoryModel);
- return Result.OK("缂栬緫鎴愬姛!");
- }
- /**
- * 鍗囩増
- *
- * @param map
- * @return
- */
- @PostMapping("/updateVersion")
- @Transactional
- public Result<?> updateVersion(@RequestBody Map<String,Object> map){
- Integer version = Integer.parseInt((String)map.get("version"));
- List<String> list = enterpriseService.getUsableIdList();
- Integer newVersion =factoryModelService.getVersionList().stream().findFirst().get()+1;
- list.forEach(id->{
- recurrenceUpdata(id,id,version,newVersion);
- });
- return Result.OK("鍗囩増鎴愬姛",newVersion);
- }
- /**
- * 绔嬪嵆鐢熸晥
- * 闇�瑕佷竴娆″畬鎴�
- * @param map
- * @param
- * @return
- */
- @PostMapping("/updateVersionStatusToUsable")
- @Transactional
- public Result<?> updateVersionStatusToUsable(@RequestBody Map<String,Object> map){
- QuartzJob quartzJob = quartzJobService.getOne(new QueryWrapper<QuartzJob>()
- .eq("job_class_name","org.jeecg.modules.quartz.job.FactoryModelSetUsableJob"),true);
- if(ObjectUtils.isNotNull(quartzJob)){
- quartzJobService.deleteAndStopJob(quartzJob);
- }
- //鑾峰彇鐗堟湰鍙�
- Integer version = Integer.parseInt((String)map.get("version"));
- //鑾峰彇涓婃鐢熸晥鐗堟湰骞跺皢鍏舵槸鍚︿笂娆＄敓鏁堜綅缃疆涓哄惁
- List<FactoryModel> lastUsableList = factoryModelService.getLastUsableList(null);
- if(CollectionUtils.isNotEmpty(lastUsableList)){
- List<DataVersion> lastUsableVersionList = dataVersionService.list( new QueryWrapper<DataVersion>()
- .in("business_id",lastUsableList.stream()
- .map(FactoryModel::getId)
- .collect(Collectors.toList())).eq("del_flag",0));
- lastUsableVersionList.stream().forEach(dataVersion -> {
- dataVersion.setIsLastUsable("0");
- });
- dataVersionService.updateBatchById(lastUsableVersionList);
- }
- //鑾峰彇鐢熸晥鐗堟湰鍙婄増鏈俊鎭苟灏嗗叾缃负澶辨晥
- List<FactoryModel> usableList = factoryModelService.getUsableList(null);
- if(CollectionUtils.isNotEmpty(usableList)){
- List<DataVersion> usableDataVersionList = dataVersionService.list(new QueryWrapper<DataVersion>()
- .in("business_id",usableList.stream()
- .map(FactoryModel::getId)
- .collect(Collectors.toList())));
- usableDataVersionList.stream().forEach(dataVersion -> {
- dataVersion
- .setVersionStatus("3")
- .setIsLastUsable("1")
- .setExpiredTime(new Date(System.currentTimeMillis()));
- });
- dataVersionService.updateBatchById(usableDataVersionList);
- }
- //鑾峰彇寰呯敓鏁堢増鏈強鐗堟湰淇℃伅骞跺皢鍏剁疆涓虹敓鏁�
- List<DataVersion> dataVersionList = dataVersionService.list(new QueryWrapper<DataVersion>()
- .in("business_id",factoryModelService
- .getAllDepartByPid(version)
- .stream().map(FactoryModel::getId)
- .collect(Collectors.toList())));
- dataVersionList.stream().forEach(dataVersion -> {
- dataVersion.setVersionStatus("2")
- .setEffectiveType("2")
- .setEffectiveTime(new Date(System.currentTimeMillis()))
- .setIsLastUsable("0");
- });
- //瀛樺叆鏁版嵁搴�
- dataVersionService.updateBatchById(dataVersionList);
- return Result.OK("鐢熸晥鎴愬姛");
- }
- /**
- * 瀹氭椂鐢熸晥
- * 闇�瑕佷竴娆℃�у畬鎴�
- * @param quartzJob
- * @param
- * @return
- */
- @PostMapping("/updateVersionStatusToUsableBySetTime")
- @Transactional
- public Result<?> updateVersionStatusToUsableBySetTime(@RequestBody QuartzJob quartzJob) throws ParseException {
- DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
- DateTimeFormatter dateTimeFormatter1 = DateTimeFormatter.ofPattern("ss mm HH dd MM ? yyyy");
- String jobClassName = quartzJob.getJobClassName();
- String time = quartzJob.getCronExpression();
- System.out.println(time);
- LocalDateTime localDateTime = LocalDateTime.parse(time,dateTimeFormatter);
- String cronStr=dateTimeFormatter1.format(localDateTime);
- quartzJob.setCronExpression(cronStr);
- QueryWrapper<QuartzJob> queryWrapper = new QueryWrapper();
- queryWrapper.eq("JOB_CLASS_NAME",jobClassName);
- List<QuartzJob> quartzJobs = quartzJobService.list(queryWrapper);
- if(CollectionUtils.isEmpty(quartzJobs)){
- quartzJobService.saveAndScheduleJob(quartzJob);
- quartzJobs = quartzJobService.list(queryWrapper);
- quartzJob.setId(quartzJobs.get(0).getId());
- quartzJobService.resumeJob(quartzJob);
- return Result.OK(quartzJob);
- }else{
- quartzJob.setId(quartzJobs.get(0).getId());
- quartzJobService.resumeJob(quartzJob);
- return Result.OK(quartzJob);
- }
- }
- /**
- * 鑾峰彇褰撳墠鐢熸晥鐗堟湰鍜屼笂涓�娆＄敓鏁堢増鏈殑鐗堟湰鍙�
- *
- * @return
- */
- @GetMapping("/getNowAndLastUsableVersion")
- public Result<?> getNowAndLastUsableVersion(){
- return Result.OK(factoryModelService.getNowAndLastUsableVersion());
- }
- /**
- * 鍒ゆ柇鏄惁鏈変翰瀛愬叧绯�
- *
- * @param map
- * @return
- */
- @PostMapping("/checkPositionInfo")
- public Result<?> checkPositionInfo(@RequestBody Map<String,String> map){
- String dropedKey=map.get("dropedKey");
- String changeKey=map.get("changeKey");
- return Result.OK(isChildren(changeKey,dropedKey)||isChildren(dropedKey,changeKey));
- }
- /**
- * 鎷栨嫿鑺傜偣
- *
- * @param map
- * @return
- */
- @PostMapping("/dropAndChangeNode")
- @Transactional
- public Result<?> dropAndChangeNode(@RequestBody Map<String,String> map){
- String dropedKey=map.get("dropedKey");
- String changeKey=map.get("changeKey");
- String dropedParentId = map.get("dropedParentId");
- String changeParentId = map.get("changeParentId");
- FactoryModel dropedFactory = factoryModelService.getById(dropedKey);
- FactoryModel changeFactory = factoryModelService.getById(changeKey);
- String dropedCode = dropedFactory.getCode();
- String changeCode = changeFactory.getCode();
- String status = map.get("status");
- if("1".equals(status)||"3".equals(status)){
- dropedFactory.setId(changeKey).setParentId(changeParentId).setCode(changeCode);
- changeFactory.setId(dropedKey).setParentId(dropedParentId).setCode(dropedCode);
- List<FactoryModel> list = new ArrayList<>();
- list.add(dropedFactory);
- list.add(changeFactory);
- factoryModelService.updateBatchById(list);
- }else if("4".equals(status)){
- //浜掓崲浣嶇疆
- String finalCode="";
- List<FactoryModel> changeChildList = factoryModelService
- .list(new QueryWrapper<FactoryModel>()
- .eq("parent_id",changeKey)
- .eq("del_flag",0));
- if(CollectionUtils.isNotEmpty(changeChildList)){
- TreeSet<Integer> childIntCodeSet = new TreeSet<>(Comparator.reverseOrder());
- changeChildList.stream().forEach(factoryModel -> {
- String code = factoryModel.getCode();
- Integer subCode = Integer.parseInt(code.substring(code.lastIndexOf(".")+1));
- childIntCodeSet.add(subCode);
- });
- Integer finalIntSubfix=childIntCodeSet.first()+1;
- finalCode = changeCode+".0"+finalIntSubfix;
- }
- else {
- finalCode = changeCode+".01";
- }
- dropedFactory.setParentId(changeKey).setCode(finalCode);
- factoryModelService.updateById(dropedFactory);
- //閲嶆柊璁＄畻璋冩暣浣嶇疆鍚庡悇瀛╁瓙鐨刢ode
- changeEveryChildCode(dropedKey,finalCode);
- }else if("2".equals(status)){
- String prefix = changeCode.substring(0,changeCode.lastIndexOf("."));
- Integer changeSubfix = Integer.parseInt(changeCode.substring(changeCode.lastIndexOf(".")+1));
- List<FactoryModel> changeChildList = factoryModelService.list(new QueryWrapper<FactoryModel>()
- .eq("parent_id",changeParentId)
- .eq("del_flag",0));
- changeChildList.stream().forEach(factoryModel -> {
- String code = factoryModel.getCode();
- String id = factoryModel.getId();
- Integer numSubfix = Integer.parseInt(code.substring(code.lastIndexOf(".")+1));
- if(numSubfix>changeSubfix){
- numSubfix = numSubfix+1;
- String finalCode = prefix+".0"+numSubfix;
- factoryModel.setCode(finalCode);
- changeEveryChildCode(id,finalCode);
- }
- });
- factoryModelService.saveOrUpdateBatch(changeChildList);
- Integer numDropedSubfix = changeSubfix+1;
- String finalDropedCode = prefix+".0"+numDropedSubfix;
- dropedFactory.setCode(finalDropedCode).setParentId(changeParentId);
- changeEveryChildCode(dropedKey,finalDropedCode);
- factoryModelService.saveOrUpdate(dropedFactory);
- }else if("5".equals(status)){
- String prefix = changeCode.substring(0,changeCode.lastIndexOf("."));
- Integer changeSubfix = Integer.parseInt(changeCode.substring(changeCode.lastIndexOf(".")+1));
- List<FactoryModel> changeChildList = factoryModelService.list(new QueryWrapper<FactoryModel>()
- .eq("parent_id",changeParentId)
- .eq("del_flag",0));
- changeChildList.stream().forEach(factoryModel -> {
- String code = factoryModel.getCode();
- String id = factoryModel.getId();
- Integer numSubfix = Integer.parseInt(code.substring(code.lastIndexOf(".")+1));
- if(numSubfix>=changeSubfix){
- numSubfix = numSubfix+1;
- String finalCode = prefix+".0"+numSubfix;
- factoryModel.setCode(finalCode);
- changeEveryChildCode(id,finalCode);
- }
- });
- factoryModelService.saveOrUpdateBatch(changeChildList);
- Integer numDropedSubfix = changeSubfix;
- String finalDropedCode = prefix+".0"+numDropedSubfix;
- dropedFactory.setCode(finalDropedCode).setParentId(changeParentId);
- changeEveryChildCode(dropedKey,finalDropedCode);
- factoryModelService.saveOrUpdate(dropedFactory);
- }
-
- return Result.OK("鏍戠粨鏋勮皟鏁存垚鍔�");
-
- }
- /**
- * 閫氳繃id鍒犻櫎
- *
- * @param id
- * @return
- */
- @AutoLog(value = "宸ュ巶寤烘ā-閫氳繃id鍒犻櫎")
- @ApiOperation(value="宸ュ巶寤烘ā-閫氳繃id鍒犻櫎", notes="宸ュ巶寤烘ā-閫氳繃id鍒犻櫎")
- @DeleteMapping(value = "/delete")
- public Result<String> delete(@RequestParam(name="id",required=true) String id) {
- dataVersionService.update(new UpdateWrapper<DataVersion>()
- .set("del_flag",1)
- .eq("business_id",id));
- factoryModelService.update(new UpdateWrapper<FactoryModel>().eq("id",id).set("del_flag",1));
- return Result.OK("鍒犻櫎鎴愬姛!");
- }
-
- /**
- * 鎵归噺鍒犻櫎
- *
- * @param ids
- * @return
- */
- @AutoLog(value = "宸ュ巶寤烘ā-鎵归噺鍒犻櫎")
- @ApiOperation(value="宸ュ巶寤烘ā-鎵归噺鍒犻櫎", notes="宸ュ巶寤烘ā-鎵归噺鍒犻櫎")
- //@RequiresPermissions("org.jeecg.modules.demo:mom_base_factory_model:deleteBatch")
- @DeleteMapping(value = "/deleteBatch")
- public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
- dataVersionService.update(new UpdateWrapper<DataVersion>()
- .set("del_flag",1)
- .in("business_id",Arrays.asList(ids.split(","))));
- this.factoryModelService.update(new UpdateWrapper<FactoryModel>()
- .in("id",Arrays.asList(ids.split(",")))
- .set("del_flag",1));
- return Result.OK("鎵归噺鍒犻櫎鎴愬姛!");
- }
-
- /**
- * 閫氳繃id鏌ヨ
- *
- * @param id
- * @return
- */
- //@AutoLog(value = "宸ュ巶寤烘ā-閫氳繃id鏌ヨ")
- @ApiOperation(value="宸ュ巶寤烘ā-閫氳繃id鏌ヨ", notes="宸ュ巶寤烘ā-閫氳繃id鏌ヨ")
- @GetMapping(value = "/queryById")
- public Result<FactoryModel> queryById(@RequestParam(name="id",required=true) String id) {
- FactoryModel factoryModel = factoryModelService.getById(id);
- if(factoryModel==null) {
- return Result.error("鏈壘鍒板搴旀暟鎹�");
- }
- return Result.OK(factoryModel);
- }
- /**
- * 瀵煎嚭excel
- *
- * @param request
- * @param factoryModel
- */
- //@RequiresPermissions("org.jeecg.modules.demo:mom_base_factory_model:exportXls")
- @RequestMapping(value = "/exportXls")
- public ModelAndView exportXls(HttpServletRequest request, FactoryModel factoryModel) {
- return super.exportXls(request, factoryModel, FactoryModel.class, "宸ュ巶寤烘ā");
- }
-
- /**
- * 閫氳繃excel瀵煎叆鏁版嵁
- *
- * @param request
- * @param response
- * @return
- */
- //@RequiresPermissions("org.jeecg.modules.demo:mom_base_factory_model:importExcel")
- @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
- public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
- return super.importExcel(request, response, FactoryModel.class);
- }
- /*-----------------------------------------------浠ヤ笅涓烘彁渚涙柟渚跨殑api-------------------------------*/
- /**
- * 鍗囩増鍗曚釜鏍戣妭鐐瑰苟杩斿洖鍗囩増鍚庢柊鑺傜偣Id
- * @param sourceFactoryModel
- * @param newParentId
- * @param newVersion
- * @return newEnterPriseId
- *
- */
- public String updataOneNode
- (
- FactoryModel sourceFactoryModel,
- String newParentId,
- Integer newVersion
- ){
- //1.鍙栧嚭鏃х増鏈俊鎭�;2.鍒涘缓灏嗘柊鐗堟湰宸ュ巶寤烘ā鍙婂叾鐗堟湰鍙峰苟瀛樺叆鏁版嵁搴�
- // 1.
- DataVersion oldDataVersion = dataVersionService
- .getOne(new QueryWrapper<DataVersion>()
- .eq("business_id",sourceFactoryModel.getId())
- .eq("del_flag",0),true);
- sourceFactoryModel.setId(null)
- .setParentId(newParentId)
- .setVersion(newVersion);
- //2.
- factoryModelService.save(sourceFactoryModel);
- FactoryModel newFactoryModel = factoryModelService
- .getOne(new QueryWrapper<FactoryModel>()
- .eq("code",sourceFactoryModel.getCode())
- .eq("version",newVersion)
- .eq("del_flag",0),true);
- DataVersion newDataVersion = new DataVersion();
- newDataVersion
- .setVersion(newVersion)
- .setBusinessType("宸ュ巶寤烘ā")
- .setBusinessId(newFactoryModel.getId())
- .setIsLastUsable("0")
- .setVersionStatus("1")
- .setDelFlag(0)
- .setSourceVersionId(oldDataVersion.getId());
- dataVersionService.save(newDataVersion);
- //灏嗙増鏈彿瀛樺叆鍏宠仈鐨勫伐鍘傚缓妯�
- String newDataVersionId = dataVersionService
- .getOne(new QueryWrapper<DataVersion>()
- .eq("business_id",newDataVersion.getBusinessId())
- .eq("del_flag",0)).getId();
- factoryModelService.update(new UpdateWrapper<FactoryModel>()
- .set("data_version_id",newDataVersionId)
- .eq("id",newFactoryModel.getId()));
- return newFactoryModel.getId();
- }
- /**
- * 閫掑綊鍗囩増澶氫釜鑺傜偣
- * @param parentId
- * @param newParentId
- * @param version
- * @param newVersion
- * @return
- */
- public void recurrenceUpdata(String parentId,String newParentId,Integer version,Integer newVersion){
- List<FactoryModel> childList = factoryModelService
- .list(new QueryWrapper<FactoryModel>()
- .eq("parent_id",parentId)
- .eq("version",version)
- .eq("del_flag",0));
- if(CollectionUtils.isNotEmpty(childList)){
- for(int i=0;i<childList.size();i++){
- String childNewId= childList.get(i).getId();
- String childNewParentId=updataOneNode(childList.get(i),newParentId,newVersion);
- recurrenceUpdata(childNewId,childNewParentId,version,newVersion);
- }
- }
-
- }
- /**
- * 閫掑綊鍒ゆ柇鏄惁瀛樺湪鐩寸郴浜插睘鍏崇郴
- * @param parentId
- * @param id
- * @return
- */
- public boolean isChildren(String parentId,String id){
- boolean tag = false;
- List<String> idList = factoryModelService.list(new QueryWrapper<FactoryModel>()
- .eq("parent_id",parentId)
- .eq("del_flag",0))
- .stream()
- .map(FactoryModel::getId)
- .collect(Collectors.toList());
- if(CollectionUtils.isNotEmpty(idList)){
- for(String strId:idList){
- if(strId.equals(id)){
- return true;
- }
- else if(!tag){
- tag = isChildren(strId,id);
- }
- }
- }
- return tag;
- }
- /**
- * 閫掑綊璋冩暣鏍戣妭鐐圭殑code
- * @param parentId
- * @param prefix
- * @return
- */
- public void changeEveryChildCode(String parentId,String prefix){
- List<FactoryModel> children = factoryModelService.list(new QueryWrapper<FactoryModel>()
- .eq("parent_id",parentId)
- .eq("del_flag",0));
- if(CollectionUtils.isNotEmpty(children)){
- for(FactoryModel factoryModel:children){
- String id = factoryModel.getId();
- String oldCode = factoryModel.getCode();
- String subfix = oldCode.substring(oldCode.lastIndexOf(".")+1);
- String realCode = prefix+"."+subfix;
- factoryModelService.update(new UpdateWrapper<FactoryModel>().set("code",realCode).eq("id",id));
- changeEveryChildCode(id,realCode);
- }
- }
- }
-}
diff --git a/src/main/java/org/jeecg/modules/base/controller/LineSideWarehouseController.java b/src/main/java/org/jeecg/modules/base/controller/LineSideWarehouseController.java
new file mode 100644
index 0000000..91d186c
--- /dev/null
+++ b/src/main/java/org/jeecg/modules/base/controller/LineSideWarehouseController.java
@@ -0,0 +1,177 @@
+package org.jeecg.modules.base.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+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.util.oConvertUtils;
+import org.jeecg.modules.base.entity.LineSideWarehouse;
+import org.jeecg.modules.base.service.ILineSideWarehouseService;
+
+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.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+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.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+
+ /**
+ * @Description: 绾胯竟浠撳簱淇℃伅
+ * @Author: jeecg-boot
+ * @Date: 2025-06-24
+ * @Version: V1.0
+ */
+@Api(tags="绾胯竟浠撳簱淇℃伅")
+@RestController
+@RequestMapping("/base/lineSideWarehouse")
+@Slf4j
+public class LineSideWarehouseController extends JeecgController<LineSideWarehouse, ILineSideWarehouseService> {
+ @Autowired
+ private ILineSideWarehouseService lineSideWarehouseService;
+
+ /**
+ * 鍒嗛〉鍒楄〃鏌ヨ
+ *
+ * @param lineSideWarehouse
+ * @param pageNo
+ * @param pageSize
+ * @param req
+ * @return
+ */
+ //@AutoLog(value = "绾胯竟浠撳簱淇℃伅-鍒嗛〉鍒楄〃鏌ヨ")
+ @ApiOperation(value="绾胯竟浠撳簱淇℃伅-鍒嗛〉鍒楄〃鏌ヨ", notes="绾胯竟浠撳簱淇℃伅-鍒嗛〉鍒楄〃鏌ヨ")
+ @GetMapping(value = "/list")
+ public Result<IPage<LineSideWarehouse>> queryPageList(LineSideWarehouse lineSideWarehouse,
+ @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+ @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+ HttpServletRequest req) {
+ QueryWrapper<LineSideWarehouse> queryWrapper = QueryGenerator.initQueryWrapper(lineSideWarehouse, req.getParameterMap());
+ Page<LineSideWarehouse> page = new Page<LineSideWarehouse>(pageNo, pageSize);
+ IPage<LineSideWarehouse> pageList = lineSideWarehouseService.page(page, queryWrapper);
+ return Result.OK(pageList);
+ }
+
+ /**
+ * 娣诲姞
+ *
+ * @param lineSideWarehouse
+ * @return
+ */
+ @AutoLog(value = "绾胯竟浠撳簱淇℃伅-娣诲姞")
+ @ApiOperation(value="绾胯竟浠撳簱淇℃伅-娣诲姞", notes="绾胯竟浠撳簱淇℃伅-娣诲姞")
+ //@RequiresPermissions("org.jeecg.modules:base_line_side_warehouse:add")
+ @PostMapping(value = "/add")
+ public Result<String> add(@RequestBody LineSideWarehouse lineSideWarehouse) {
+ lineSideWarehouseService.save(lineSideWarehouse);
+ return Result.OK("娣诲姞鎴愬姛锛�");
+ }
+
+ /**
+ * 缂栬緫
+ *
+ * @param lineSideWarehouse
+ * @return
+ */
+ @AutoLog(value = "绾胯竟浠撳簱淇℃伅-缂栬緫")
+ @ApiOperation(value="绾胯竟浠撳簱淇℃伅-缂栬緫", notes="绾胯竟浠撳簱淇℃伅-缂栬緫")
+ //@RequiresPermissions("org.jeecg.modules:base_line_side_warehouse:edit")
+ @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+ public Result<String> edit(@RequestBody LineSideWarehouse lineSideWarehouse) {
+ lineSideWarehouseService.updateById(lineSideWarehouse);
+ return Result.OK("缂栬緫鎴愬姛!");
+ }
+
+ /**
+ * 閫氳繃id鍒犻櫎
+ *
+ * @param id
+ * @return
+ */
+ @AutoLog(value = "绾胯竟浠撳簱淇℃伅-閫氳繃id鍒犻櫎")
+ @ApiOperation(value="绾胯竟浠撳簱淇℃伅-閫氳繃id鍒犻櫎", notes="绾胯竟浠撳簱淇℃伅-閫氳繃id鍒犻櫎")
+ //@RequiresPermissions("org.jeecg.modules:base_line_side_warehouse:delete")
+ @DeleteMapping(value = "/delete")
+ public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+ lineSideWarehouseService.removeById(id);
+ return Result.OK("鍒犻櫎鎴愬姛!");
+ }
+
+ /**
+ * 鎵归噺鍒犻櫎
+ *
+ * @param ids
+ * @return
+ */
+ @AutoLog(value = "绾胯竟浠撳簱淇℃伅-鎵归噺鍒犻櫎")
+ @ApiOperation(value="绾胯竟浠撳簱淇℃伅-鎵归噺鍒犻櫎", notes="绾胯竟浠撳簱淇℃伅-鎵归噺鍒犻櫎")
+ //@RequiresPermissions("org.jeecg.modules:base_line_side_warehouse:deleteBatch")
+ @DeleteMapping(value = "/deleteBatch")
+ public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+ this.lineSideWarehouseService.removeByIds(Arrays.asList(ids.split(",")));
+ return Result.OK("鎵归噺鍒犻櫎鎴愬姛!");
+ }
+
+ /**
+ * 閫氳繃id鏌ヨ
+ *
+ * @param id
+ * @return
+ */
+ //@AutoLog(value = "绾胯竟浠撳簱淇℃伅-閫氳繃id鏌ヨ")
+ @ApiOperation(value="绾胯竟浠撳簱淇℃伅-閫氳繃id鏌ヨ", notes="绾胯竟浠撳簱淇℃伅-閫氳繃id鏌ヨ")
+ @GetMapping(value = "/queryById")
+ public Result<LineSideWarehouse> queryById(@RequestParam(name="id",required=true) String id) {
+ LineSideWarehouse lineSideWarehouse = lineSideWarehouseService.getById(id);
+ if(lineSideWarehouse==null) {
+ return Result.error("鏈壘鍒板搴旀暟鎹�");
+ }
+ return Result.OK(lineSideWarehouse);
+ }
+
+ /**
+ * 瀵煎嚭excel
+ *
+ * @param request
+ * @param lineSideWarehouse
+ */
+ //@RequiresPermissions("org.jeecg.modules:base_line_side_warehouse:exportXls")
+ @RequestMapping(value = "/exportXls")
+ public ModelAndView exportXls(HttpServletRequest request, LineSideWarehouse lineSideWarehouse) {
+ return super.exportXls(request, lineSideWarehouse, LineSideWarehouse.class, "绾胯竟浠撳簱淇℃伅");
+ }
+
+ /**
+ * 閫氳繃excel瀵煎叆鏁版嵁
+ *
+ * @param request
+ * @param response
+ * @return
+ */
+ //@RequiresPermissions("base_line_side_warehouse:importExcel")
+ @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+ public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+ return super.importExcel(request, response, LineSideWarehouse.class);
+ }
+
+}
diff --git a/src/main/java/org/jeecg/modules/base/controller/MaterialCategoryController.java b/src/main/java/org/jeecg/modules/base/controller/MaterialCategoryController.java
deleted file mode 100644
index df042ef..0000000
--- a/src/main/java/org/jeecg/modules/base/controller/MaterialCategoryController.java
+++ /dev/null
@@ -1,402 +0,0 @@
-package org.jeecg.modules.base.controller;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
-import com.baomidou.mybatisplus.core.toolkit.StringUtils;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
-import org.jeecg.common.constant.CommonConstant;
-import org.jeecg.common.system.base.controller.JeecgController;
-import org.jeecg.common.system.vo.SelectTreeModel;
-import org.jeecg.modules.base.entity.MaterialCategory;
-import org.jeecg.modules.base.service.IMaterialCategoryService;
-import org.jeecg.modules.quartz.entity.QuartzJob;
-import org.jeecg.modules.quartz.service.IQuartzJobService;
-import org.jeecg.common.system.base.entity.DataVersion;
-import org.jeecg.modules.system.service.IDataVersionService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.*;
-
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-import java.util.*;
-import java.util.concurrent.CopyOnWriteArrayList;
-import java.util.stream.Collectors;
-
-/**
- * @Description: 鐗╂枡鍒嗙被
- * @Author: jeecg-boot
- * @Date: 2023-04-20
- * @Version: V1.0
- */
-@Api(tags = "鐗╂枡鍒嗙被")
-@RestController
-@RequestMapping("/base/materialCategory")
-@Slf4j
-public class MaterialCategoryController extends JeecgController<MaterialCategory, IMaterialCategoryService> {
-
- @Autowired
- private IMaterialCategoryService materialCategoryService;
- @Autowired
- private IDataVersionService dataVersionService;
- @Autowired
- private IQuartzJobService quartzJobService;
-
- /**
- * 鑾峰彇鐗╂枡鍒嗙被鏋舵瀯鏍�
- */
- @GetMapping("/enterpriseTree")
- @ApiOperation(value = "鑾峰彇鐗╂枡鍒嗙被鏋舵瀯鏍�", notes = "鑾峰彇鐗╂枡鍒嗙被鏋舵瀯鏍�")
- public Result<?> getEnterpriseTree(@RequestParam(value = "version", required = false) Integer version) {
- SelectTreeModel selectTreeModel = new SelectTreeModel();
- selectTreeModel.setKey("0");
- selectTreeModel.setTitle("鐗╂枡鍒嗙被");
- List<SelectTreeModel> finallyList = new ArrayList<>();
- selectTreeModel.setChildren(materialCategoryService.getMaterialCategoryVersionTree("0", version));
- finallyList.add(selectTreeModel);
- return Result.OK(finallyList);
- }
-
- /**
- * 鍒嗛〉鍒楄〃鏌ヨ
- *
- * @param map
- * @param pageNo
- * @param pageSize
- * @param parentId
- * @return
- */
- @ApiOperation(value = "鐗╂枡鍒嗙被-鍒嗛〉鍒楄〃鏌ヨ", notes = "鐗╂枡鍒嗙被-鍒嗛〉鍒楄〃鏌ヨ")
- @GetMapping(value = "/list")
- public Result<IPage<Map<String, Object>>> queryPageList(Map map,
- @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
- @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
- @RequestParam(name = "parentId", required = false) String parentId,
- @RequestParam(name = "version", required = false) Integer version) {
- Page<Map<String, Object>> page = new Page(pageNo, pageSize);
- IPage<Map<String, Object>> pageList = materialCategoryService.getMaterialCategoryListByPid(page, version, parentId);
- return Result.OK(pageList);
- }
-
- /**
- * 鑾峰彇鍒濆鐗堟湰鍙�
- */
- @GetMapping("/getInitVersion")
- public Result<?> getUsableVersion() {
- return Result.OK(materialCategoryService.getInitVersion());
- }
-
- /**
- * 鑾峰彇鎵�鏈夌増鏈彿
- */
- @GetMapping("/getVersionList")
- @ApiOperation(value = "鑾峰彇鎵�鏈夌増鏈彿", notes = "鑾峰彇鎵�鏈夌増鏈彿")
- public Result<?> getAllVersion() {
- return Result.OK(materialCategoryService.getAllVersion());
- }
-
- /**
- * 娣诲姞闇�瑕佷竴娆℃�у畬鎴�
- *
- * @param materialCategory
- * @return
- */
- @AutoLog(value = "鐗╂枡鍒嗙被-娣诲姞")
- @ApiOperation(value = "鐗╂枡鍒嗙被-娣诲姞", notes = "鐗╂枡鍒嗙被-娣诲姞")
- @PostMapping(value = "/add")
- @Transactional
- public Result<String> add(@RequestBody MaterialCategory materialCategory) {
- materialCategoryService.save(materialCategory);
- LambdaQueryWrapper<MaterialCategory> queryWrapper = new LambdaQueryWrapper<MaterialCategory>()
- .eq(MaterialCategory::getCode, materialCategory.getCode())
- .eq(MaterialCategory::getVersion, materialCategory.getVersion())
- .eq(MaterialCategory::getDelFlag, CommonConstant.DEL_FLAG_0);
- MaterialCategory selectMaterialCategory = materialCategoryService.getOne(queryWrapper, true);
- DataVersion dataVersion = new DataVersion();
- dataVersion.setBusinessId(selectMaterialCategory.getId())
- .setBusinessType("鐗╂枡鍒嗙被")
- .setVersion(selectMaterialCategory.getVersion())
- .setVersionStatus(materialCategory.getVersionStatus())
- .setDelFlag(CommonConstant.DEL_FLAG_0)
- .setEffectiveType("0")
- .setIsLastUsable("0");
- dataVersionService.save(dataVersion);
- LambdaQueryWrapper<DataVersion> queryWrapper1 = new LambdaQueryWrapper<DataVersion>()
- .eq(DataVersion::getBusinessId, selectMaterialCategory.getId())
- .eq(DataVersion::getDelFlag, CommonConstant.DEL_FLAG_0);
-
- DataVersion selectDataVersion = dataVersionService.getOne(queryWrapper1, true);
- selectMaterialCategory.setDataVersionId(selectDataVersion.getId());
- materialCategoryService.saveOrUpdate(selectMaterialCategory);
- return Result.OK("娣诲姞鎴愬姛锛�");
- }
-
- /**
- * 鍗囩増
- * 闇�瑕佷竴娆″畬鎴�
- *
- * @param map
- * @param
- * @return
- */
- @ApiOperation(value = "鐗╂枡鍒嗙被-鐗堟湰鍗囩骇", notes = "鐗╂枡鍒嗙被-鐗堟湰鍗囩骇")
- @PostMapping("/updateVersion")
- @Transactional
- public Result<?> updateVersion(@RequestBody Map<String, Integer> map) {
- Integer version = map.get("version");
- Set<Integer> allVersion = materialCategoryService.getAllVersion();
- int newVersion = 1;
- if (CollectionUtils.isNotEmpty(allVersion)) {
- newVersion = allVersion.stream().findFirst().get() + 1;
- }
- recurrenceUpdata("0", "0", version, newVersion);
- return Result.OK("鍗囩増鎴愬姛", newVersion);
- }
-
- /**
- * 閫掑綊鍗囩増澶氫釜鑺傜偣
- *
- * @param parentId
- * @param newParentId
- * @param version
- * @param newVersion
- * @return
- */
- public void recurrenceUpdata(String parentId, String newParentId, Integer version, Integer newVersion) {
- CopyOnWriteArrayList<MaterialCategory> childList = new CopyOnWriteArrayList<>(materialCategoryService.list(new QueryWrapper<MaterialCategory>()
- .eq("parent_id", parentId)
- .eq("version", version)
- .eq("del_flag", 0)));
- if (CollectionUtils.isNotEmpty(childList)) {
- childList.forEach(childEnterprise -> {
- //鎶奵hild鐨処d瀛樹笅鏉�,鍥犱负鍦ㄦ祦閲岃竟鎿嶄綔瀵硅薄瀹规槗鎵潃铔�
- String childNewId = childEnterprise.getId();
- //灏嗘暟鎹瓨鍏ユ暟鎹簱
- String childNewParentId = updataOneNode(childEnterprise, newParentId, newVersion);
- //閫掑綊
- recurrenceUpdata(childNewId, childNewParentId, version, newVersion);
- });
- }
- }
-
- /**
- * 绔嬪嵆鐢熸晥
- * 闇�瑕佷竴娆″畬鎴�
- *
- * @param map
- * @param
- * @return
- */
- @PostMapping("/updateVersionStatusToUsable")
- @Transactional
- public Result<?> updateVersionStatusToUsable(@RequestBody Map<String, Object> map) {
- //濡傛灉鏈夊畾鏃剁敓鐢熸晥,鍒欏皢瀹氭椂鐢熸晥浠诲姟鍏抽棴
- QuartzJob quartzJob = quartzJobService.getOne(new QueryWrapper<QuartzJob>()
- .eq("job_class_name", "org.jeecg.modules.quartz.job.EnterpriseSetUsableJob"), true);
- if (ObjectUtils.isNotNull(quartzJob)) {
- quartzJobService.deleteAndStopJob(quartzJob);
- }
- //鑾峰彇鐗堟湰鍙�
- Integer version = Integer.parseInt((String) map.get("version"));
- //鑾峰彇涓婃鐢熸晥鐗堟湰骞跺皢鍏舵槸鍚︿笂娆＄敓鏁堜綅缃疆涓哄惁
- List<MaterialCategory> lastUsableList = materialCategoryService.getLastUsableList();
- if (CollectionUtils.isNotEmpty(lastUsableList)) {
- List<DataVersion> lastUsableVersionList = dataVersionService.list(new QueryWrapper<DataVersion>()
- .in("business_id", lastUsableList.stream()
- .map(MaterialCategory::getId)
- .collect(Collectors.toList())).eq("del_flag", 0));
- lastUsableVersionList.stream().forEach(dataVersion -> {
- dataVersion.setIsLastUsable("0");
- });
- dataVersionService.updateBatchById(lastUsableVersionList);
- }
- //鑾峰彇鐢熸晥鐗堟湰鍙婄増鏈俊鎭苟灏嗗叾缃负澶辨晥
- List<MaterialCategory> usableList = materialCategoryService.getUsableList();
- if (CollectionUtils.isNotEmpty(usableList)) {
- List<DataVersion> usableDataVersionList = dataVersionService.list(new QueryWrapper<DataVersion>()
- .in("business_id", usableList.stream()
- .map(MaterialCategory::getId)
- .collect(Collectors.toList())));
- usableDataVersionList.stream().forEach(dataVersion -> {
- dataVersion
- .setVersionStatus("3")
- .setIsLastUsable("1")
- .setExpiredTime(new Date(System.currentTimeMillis()));
- });
- dataVersionService.updateBatchById(usableDataVersionList);
- }
- //鑾峰彇寰呯敓鏁堢増鏈強鐗堟湰淇℃伅骞跺皢鍏剁疆涓虹敓鏁�
- List<DataVersion> dataVersionList = dataVersionService.list(new QueryWrapper<DataVersion>()
- .in("business_id", materialCategoryService
- .list(
- new QueryWrapper<MaterialCategory>()
- .eq("version", version)
- .eq("del_flag", 0)
- )
- .stream().map(MaterialCategory::getId)
- .collect(Collectors.toList())));
- dataVersionList.stream().forEach(dataVersion -> {
- dataVersion.setVersionStatus("2")
- .setEffectiveType("2")
- .setEffectiveTime(new Date(System.currentTimeMillis()))
- .setIsLastUsable("0");
- });
- //瀛樺叆鏁版嵁搴�
- dataVersionService.updateBatchById(dataVersionList);
- return Result.OK("鐢熸晥鎴愬姛");
- }
-
- /**
- * 瀹氭椂鐢熸晥
- * 闇�瑕佷竴娆℃�у畬鎴�
- *
- * @param quartzJob
- * @param
- * @return
- */
- @PostMapping("/updateVersionStatusToUsableBySetTime")
- @Transactional
- public Result<?> updateVersionStatusToUsableBySetTime(@RequestBody QuartzJob quartzJob) {
- DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
- DateTimeFormatter dateTimeFormatter1 = DateTimeFormatter.ofPattern("ss mm HH dd MM ? yyyy");
- String jobClassName = quartzJob.getJobClassName();
- String time = quartzJob.getCronExpression();
- LocalDateTime localDateTime = LocalDateTime.parse(time, dateTimeFormatter);
- String cronStr = dateTimeFormatter1.format(localDateTime);
- quartzJob.setCronExpression(cronStr);
- QueryWrapper<QuartzJob> queryWrapper = new QueryWrapper();
- queryWrapper.eq("JOB_CLASS_NAME", jobClassName);
- List<QuartzJob> quartzJobs = quartzJobService.list(queryWrapper);
- if (CollectionUtils.isEmpty(quartzJobs)) {
- quartzJobService.saveAndScheduleJob(quartzJob);
- quartzJobs = quartzJobService.list(queryWrapper);
- quartzJob.setId(quartzJobs.get(0).getId());
- quartzJobService.resumeJob(quartzJob);
- return Result.OK(quartzJob);
- } else {
- quartzJob.setId(quartzJobs.get(0).getId());
- quartzJobService.resumeJob(quartzJob);
- return Result.OK(quartzJob);
- }
- }
-
- /**
- * 缂栬緫
- *
- * @param materialCategory
- * @return
- */
- @AutoLog(value = "鐗╂枡鍒嗙被-缂栬緫")
- @ApiOperation(value = "鐗╂枡鍒嗙被-缂栬緫", notes = "鐗╂枡鍒嗙被-缂栬緫")
- @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
- public Result<String> edit(@RequestBody MaterialCategory materialCategory) {
- materialCategoryService.updateById(materialCategory);
- return Result.OK("缂栬緫鎴愬姛!");
- }
-
- /**
- * 閫氳繃id鍒犻櫎
- *
- * @param id
- * @return
- */
- @AutoLog(value = "鐗╂枡鍒嗙被-閫氳繃id鍒犻櫎")
- @ApiOperation(value = "鐗╂枡鍒嗙被-閫氳繃id鍒犻櫎", notes = "鐗╂枡鍒嗙被-閫氳繃id鍒犻櫎")
- @DeleteMapping(value = "/delete")
- @Transactional
- public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
- dataVersionService.update(new UpdateWrapper<DataVersion>()
- .set("del_flag", 1)
- .eq("business_id", id));
- materialCategoryService.update(new UpdateWrapper<MaterialCategory>().
- set("del_flag", 1)
- .eq("id", id));
- return Result.OK("鍒犻櫎鎴愬姛!");
- }
-
-
- /**
- * 鍗囩増鍗曚釜鏍戣妭鐐瑰苟杩斿洖鍗囩増鍚庢柊鑺傜偣Id
- *
- * @param materialCategory
- * @param newParentId
- * @param newVersion
- * @return newEnterPriseId
- */
- public String updataOneNode(MaterialCategory materialCategory, String newParentId, Integer newVersion) {
- //1.鍙栧嚭鏃х増鏈俊鎭�;2.鍒涘缓灏嗘柊鐗堟湰鐗╂枡鍒嗙被鍙婂叾鐗堟湰鍙峰苟瀛樺叆鏁版嵁搴�
- DataVersion oldDataVersion = dataVersionService.getOne(new LambdaQueryWrapper<DataVersion>()
- .eq(DataVersion::getBusinessId, materialCategory.getId())
- .eq(DataVersion::getDelFlag, CommonConstant.DEL_FLAG_0.toString()), true);
- materialCategory.setId(null);
- materialCategory.setParentId(newParentId);
- materialCategory.setVersion(newVersion);
- // 娣诲姞鐗╂枡鍒嗙被
- materialCategoryService.save(materialCategory);
- MaterialCategory newEnterprise = materialCategoryService.getOne(new QueryWrapper<MaterialCategory>()
- .eq("code", materialCategory.getCode())
- .eq("version", newVersion)
- .eq("del_flag", 0), true);
- DataVersion newDataVersion = new DataVersion();
- newDataVersion
- .setVersion(newVersion)
- .setBusinessType("鐗╂枡鍒嗙被")
- .setBusinessId(newEnterprise.getId())
- .setIsLastUsable("0")
- .setVersionStatus("1")
- .setDelFlag(0)
- .setSourceVersionId(oldDataVersion.getId());
- // 娣诲姞鏁版嵁鐗堟湰
- dataVersionService.save(newDataVersion);
- //灏嗙増鏈彿瀛樺叆鍏宠仈鐨勯泦鍥㈡灦鏋�
- String newDataVersionId = dataVersionService
- .getOne(new QueryWrapper<DataVersion>()
- .eq("business_id", newDataVersion.getBusinessId())
- .eq("del_flag", 0)).getId();
- materialCategoryService.update(new UpdateWrapper<MaterialCategory>()
- .set("data_version_id", newDataVersionId)
- .eq("id", newEnterprise.getId()));
- return newEnterprise.getId();
- }
-
- /**
- * 鑾峰彇褰撳墠鐢熸晥鐗堟湰鍜屼笂涓�娆＄敓鏁堢増鏈殑鐗堟湰鍙�
- *
- * @return
- */
- @GetMapping("/getNowAndLastUsableVersion")
- public Result<?> getNowAndLastUsableVersion() {
- return Result.OK(materialCategoryService.getNowAndLastUsableVersion());
- }
-
- /**
- * 琛ㄥ崟楠岃瘉
- */
- @GetMapping("/check")
- public Result<?> check(@RequestParam(name = "name", required = false) String name,
- @RequestParam(name = "version", required = false) Integer version,
- @RequestParam(name = "parentId", required = true) String parentId
- ) {
- LambdaQueryWrapper<MaterialCategory> wrapper = new LambdaQueryWrapper<>();
- if (!StringUtils.isBlank(name)) {
- wrapper.eq(MaterialCategory::getName, name);
- }
- if (version != null) {
- wrapper.eq(MaterialCategory::getVersion, version);
- }
- if (!StringUtils.isBlank(parentId)) {
- wrapper.eq(MaterialCategory::getParentId, parentId);
- }
- wrapper.eq(MaterialCategory::getDelFlag, CommonConstant.DEL_FLAG_0.toString());
- return Result.OK(materialCategoryService.list(wrapper));
- }
-}
diff --git a/src/main/java/org/jeecg/modules/base/controller/MaterialController.java b/src/main/java/org/jeecg/modules/base/controller/MaterialController.java
deleted file mode 100644
index 40bd652..0000000
--- a/src/main/java/org/jeecg/modules/base/controller/MaterialController.java
+++ /dev/null
@@ -1,165 +0,0 @@
-package org.jeecg.modules.base.controller;
-
-import java.util.Arrays;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import lombok.experimental.Accessors;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.modules.base.entity.Material;
-import org.jeecg.modules.base.service.IMaterialService;
-
-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: 鐗╂枡琛�
- * @Author: jeecg-boot
- * @Date: 2023-04-28
- * @Version: V1.0
- */
-@Api(tags="鐗╂枡琛�")
-@RestController
-@RequestMapping("/base/material")
-@Slf4j
-@Accessors(chain = true)
-public class MaterialController extends JeecgController<Material, IMaterialService> {
- @Autowired
- private IMaterialService materialService;
-
- /**
- * 鍒嗛〉鍒楄〃鏌ヨ
- *
- * @param material
- * @param pageNo
- * @param pageSize
- * @param req
- * @return
- */
- //@AutoLog(value = "鐗╂枡琛�-鍒嗛〉鍒楄〃鏌ヨ")
- @ApiOperation(value="鐗╂枡琛�-鍒嗛〉鍒楄〃鏌ヨ", notes="鐗╂枡琛�-鍒嗛〉鍒楄〃鏌ヨ")
- @GetMapping(value = "/list")
- public Result<IPage<Material>> queryPageList(Material material,
- @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
- @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
- HttpServletRequest req) {
- QueryWrapper<Material> queryWrapper = QueryGenerator.initQueryWrapper(material, req.getParameterMap());
- Page<Material> page = new Page<Material>(pageNo, pageSize);
- IPage<Material> pageList = materialService.page(page, queryWrapper);
- return Result.OK(pageList);
- }
-
- /**
- * 娣诲姞
- *
- * @param material
- * @return
- */
- @AutoLog(value = "鐗╂枡琛�-娣诲姞")
- @ApiOperation(value="鐗╂枡琛�-娣诲姞", notes="鐗╂枡琛�-娣诲姞")
- //@RequiresPermissions("org.jeecg.modules.demo:mom_base_material:add")
- @PostMapping(value = "/add")
- public Result<String> add(@RequestBody Material material) {
- materialService.save(material);
- return Result.OK("娣诲姞鎴愬姛锛�");
- }
-
- /**
- * 缂栬緫
- *
- * @param material
- * @return
- */
- @AutoLog(value = "鐗╂枡琛�-缂栬緫")
- @ApiOperation(value="鐗╂枡琛�-缂栬緫", notes="鐗╂枡琛�-缂栬緫")
- //@RequiresPermissions("org.jeecg.modules.demo:mom_base_material:edit")
- @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
- public Result<String> edit(@RequestBody Material material) {
- materialService.updateById(material);
- return Result.OK("缂栬緫鎴愬姛!");
- }
-
- /**
- * 閫氳繃id鍒犻櫎
- *
- * @param id
- * @return
- */
- @AutoLog(value = "鐗╂枡琛�-閫氳繃id鍒犻櫎")
- @ApiOperation(value="鐗╂枡琛�-閫氳繃id鍒犻櫎", notes="鐗╂枡琛�-閫氳繃id鍒犻櫎")
- //@RequiresPermissions("org.jeecg.modules.demo:mom_base_material:delete")
- @DeleteMapping(value = "/delete")
- public Result<String> delete(@RequestParam(name="id",required=true) String id) {
- materialService.removeById(id);
- return Result.OK("鍒犻櫎鎴愬姛!");
- }
-
- /**
- * 鎵归噺鍒犻櫎
- *
- * @param ids
- * @return
- */
- @AutoLog(value = "鐗╂枡琛�-鎵归噺鍒犻櫎")
- @ApiOperation(value="鐗╂枡琛�-鎵归噺鍒犻櫎", notes="鐗╂枡琛�-鎵归噺鍒犻櫎")
- //@RequiresPermissions("org.jeecg.modules.demo:mom_base_material:deleteBatch")
- @DeleteMapping(value = "/deleteBatch")
- public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
- this.materialService.removeByIds(Arrays.asList(ids.split(",")));
- return Result.OK("鎵归噺鍒犻櫎鎴愬姛!");
- }
-
- /**
- * 閫氳繃id鏌ヨ
- *
- * @param id
- * @return
- */
- //@AutoLog(value = "鐗╂枡琛�-閫氳繃id鏌ヨ")
- @ApiOperation(value="鐗╂枡琛�-閫氳繃id鏌ヨ", notes="鐗╂枡琛�-閫氳繃id鏌ヨ")
- @GetMapping(value = "/queryById")
- public Result<Material> queryById(@RequestParam(name="id",required=true) String id) {
- Material material = materialService.getById(id);
- if(material==null) {
- return Result.error("鏈壘鍒板搴旀暟鎹�");
- }
- return Result.OK(material);
- }
-
- /**
- * 瀵煎嚭excel
- *
- * @param request
- * @param material
- */
- //@RequiresPermissions("org.jeecg.modules.demo:mom_base_material:exportXls")
- @RequestMapping(value = "/exportXls")
- public ModelAndView exportXls(HttpServletRequest request, Material material) {
- return super.exportXls(request, material, Material.class, "鐗╂枡琛�");
- }
-
- /**
- * 閫氳繃excel瀵煎叆鏁版嵁
- *
- * @param request
- * @param response
- * @return
- */
- //@RequiresPermissions("mom_base_material:importExcel")
- @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
- public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
- return super.importExcel(request, response, Material.class);
- }
-
-}
diff --git a/src/main/java/org/jeecg/modules/base/controller/ProductionLineWarehouseController.java b/src/main/java/org/jeecg/modules/base/controller/ProductionLineWarehouseController.java
deleted file mode 100644
index c761443..0000000
--- a/src/main/java/org/jeecg/modules/base/controller/ProductionLineWarehouseController.java
+++ /dev/null
@@ -1,702 +0,0 @@
-package org.jeecg.modules.base.controller;
-
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
-import com.baomidou.mybatisplus.core.toolkit.StringUtils;
-import org.jeecg.common.system.query.QueryGenerator;
-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.jeecg.common.api.vo.Result;
-import org.jeecg.modules.base.entity.*;
-import org.jeecg.modules.base.service.IEnterpriseService;
-import org.jeecg.modules.base.service.IFactoryModelService;
-import org.jeecg.modules.quartz.entity.QuartzJob;
-import org.jeecg.modules.quartz.service.IQuartzJobService;
-import org.jeecg.common.system.base.entity.DataVersion;
-import org.jeecg.modules.system.service.IDataVersionService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.springframework.web.servlet.ModelAndView;
-
-import java.text.ParseException;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-import java.util.*;
-
-import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.base.service.IProductionLineWarehouseService;
-import org.jeecg.modules.base.service.IProductionLineWarehouseClientService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.jeecg.common.aspect.annotation.AutoLog;
-import org.apache.shiro.SecurityUtils;
-import org.jeecg.common.system.vo.LoginUser;
-import org.jeecgframework.poi.excel.ExcelImportUtil;
-import org.jeecgframework.poi.excel.def.NormalExcelConstants;
-import org.jeecgframework.poi.excel.entity.ExportParams;
-import org.jeecgframework.poi.excel.entity.ImportParams;
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
-import java.io.IOException;
-import java.util.stream.Collectors;
-
- /**
- * @Description: 绾胯竟搴撶鐞�
- * @Author: jeecg-boot
- * @Date: 2023-01-28
- * @Version: V1.0
- */
-@Api(tags="绾胯竟搴撶鐞�")
-@RestController
-@RequestMapping("/base/productionLineWarehouse")
-@Slf4j
-public class ProductionLineWarehouseController extends JeecgController<ProductionLineWarehouse, IProductionLineWarehouseService> {
-
- @Autowired
- private IProductionLineWarehouseService productionLineWarehouseService;
-
- @Autowired
- private IProductionLineWarehouseClientService productionLineWarehouseClientService;
-
- @Autowired
- private IDataVersionService dataVersionService;
-
- @Autowired
- private IQuartzJobService quartzJobService;
-
- @Autowired
- private IFactoryModelService factoryModelService;
-
- @Autowired
- private IEnterpriseService enterpriseService;
- /*---------------------------------涓昏〃澶勭悊-begin-------------------------------------*/
- /**
- * 鑾峰彇缁存姢鍗囩増鍏佽鏉冮檺
- *
- *
- */
- @GetMapping("/getNewVersionPermission")
- public Result<?> getNewVersionPermission(){
- List<FactoryModel> usableFactoryList = factoryModelService
- .list(new QueryWrapper<FactoryModel>()
- .eq("del_flag",0)
- .in("enterprise_id",enterpriseService.getUsableIdList()));
- if(CollectionUtils.isEmpty(usableFactoryList)){
- return Result.OK(false);
- }else {
- List<ProductionLineWarehouse> list = productionLineWarehouseService
- .list(new QueryWrapper<ProductionLineWarehouse>()
- .in("workshop_id",usableFactoryList.stream().map(FactoryModel::getId).collect(Collectors.toList()))
- .eq("del_flag",0));
- if(CollectionUtils.isNotEmpty(list)){
- return Result.OK(false);
- }
- else {
- return Result.OK(true);
- }
- }
- }
- /**
- *
- * 鏌ヨ鐗堟湰鏄惁涓哄巻鍙茬増鏈�
- *
- */
- @GetMapping(value = "/getUpdateVersionPermission")
- public Result<?> getUpdatePermission(@RequestParam("version") Integer version){
- List<FactoryModel> usableFactoryList = factoryModelService
- .list(new QueryWrapper<FactoryModel>()
- .eq("del_flag",0)
- .in("enterprise_id",enterpriseService.getUsableIdList()));
- if(CollectionUtils.isNotEmpty(usableFactoryList)){
- return Result.OK(productionLineWarehouseService
- .list(new QueryWrapper<ProductionLineWarehouse>()
- .in("workshop_id",usableFactoryList.stream().map(FactoryModel::getId).collect(Collectors.toList()))
- .eq("version",version)
- .eq("del_flag",0)));
- }
- return Result.OK();
- }
- /**
- * 鑾峰彇鍒濆淇℃伅
- *
- *
- */
- @GetMapping("/getWarehouseInfo")
- public Result<?> getFactoryInfo(){
- Map<String,Object> infoMap = new HashMap<>(2);
- LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
- infoMap.put("enterpriseId",loginUser.getEnterpriseId());
- infoMap.put("version",productionLineWarehouseService.getInitVersion());
- return Result.OK(infoMap);
- }
- /**
- * 鍒嗛〉鍒楄〃鏌ヨ
- * @param map
- * @param pageNo
- * @param pageSize
- * @param workshopId
- * @param version
- * @return
- */
- @ApiOperation(value="绾胯竟搴撶鐞�-鍒嗛〉鍒楄〃鏌ヨ", notes="绾胯竟搴撶鐞�-鍒嗛〉鍒楄〃鏌ヨ")
- @GetMapping(value = "/list")
- @Transactional
- public Result<?> list(Map map,
- @RequestParam(name ="pageNo", defaultValue="1") Integer pageNo,
- @RequestParam(name ="pageSize", defaultValue="10") Integer pageSize,
- @RequestParam(name = "workshopId",required = false) String workshopId,
- @RequestParam(name="version",required = false) Integer version){
- Page<Map<String,Object>> page = new Page(pageNo, pageSize);
- IPage<Map<String,Object>> pageList = productionLineWarehouseService.getWarehouseList(page,version,workshopId);
- return Result.OK(pageList);
- }
- /**
- * 鑾峰彇褰撳墠鐢熸晥鐗堟湰鍜屼笂涓�娆＄敓鏁堢増鏈殑鐗堟湰鍙�
- *
- * @return
- */
- @GetMapping("/getNowAndLastUsableVersion")
- public Result<?> getNowAndLastUsableVersion(){
- return Result.OK(productionLineWarehouseService.getNowAndLastUsableVersion());
- }
- /**
- * 鑾峰彇鎵�鏈夌増鏈彿
- *
- *
- */
- @GetMapping("/getVersionList")
- public Result<?> getAllVersion(){
- return Result.OK(productionLineWarehouseService.getVersionList());
- }
- /**
- * 鏍规嵁鐗堟湰鑾峰彇鐗堟湰鍙�
- * @param version
- * @return
- *
- */
- @GetMapping("/getVersionStatusByVersion")
- public Result<?> getVersionStatusByVersion(@RequestParam(value = "version",required = false) Integer version){
- return Result.OK(productionLineWarehouseService.getVersionStatusByVersion(version));
- }
- /**
- * 娣诲姞
- * @param map
- * @return
- */
- @AutoLog(value = "绾胯竟搴撶鐞�-娣诲姞")
- @ApiOperation(value="绾胯竟搴撶鐞�-娣诲姞", notes="绾胯竟搴撶鐞�-娣诲姞")
- //@RequiresPermissions("org.jeecg.modules.demo:mom_base_production_line_warehouse:add")
- @PostMapping(value = "/add")
- public Result<String> add(@RequestBody Map<String,Object> map) {
- ProductionLineWarehouse productionLineWarehouse = new ProductionLineWarehouse();
- productionLineWarehouse.setCode(String.valueOf(map.get("code")))
- .setName(String.valueOf(map.get("name")))
- .setVersion(Integer.parseInt(String.valueOf(map.get("version"))))
- .setWorkshopId(String.valueOf(map.get("workshopId")))
- .setRemark(String.valueOf(map.get("remark")))
- .setStatus(String.valueOf(map.get("status")))
- .setDelFlag(0);
- productionLineWarehouseService.save(productionLineWarehouse);
- QueryWrapper<ProductionLineWarehouse> queryWrapper = new QueryWrapper<ProductionLineWarehouse>()
- .eq("code",productionLineWarehouse.getCode())
- .eq("version",productionLineWarehouse.getVersion())
- .eq("del_flag",0);
- ProductionLineWarehouse selectWarehouse = productionLineWarehouseService.getOne(queryWrapper,true);
- DataVersion dataVersion = new DataVersion();
- dataVersion.setBusinessId(selectWarehouse.getId())
- .setBusinessType("绾胯竟搴撶鐞�")
- .setVersion(selectWarehouse.getVersion())
- .setVersionStatus(String.valueOf(map.get("versionStatus")))
- .setDelFlag(0)
- .setEffectiveType("0")
- .setIsLastUsable("0");
- dataVersionService.save(dataVersion);
- QueryWrapper<DataVersion> queryWrapper1 = new QueryWrapper<DataVersion>()
- .eq("business_id",selectWarehouse.getId()).eq("del_flag",0);
- DataVersion selectDataVersion = dataVersionService.getOne(queryWrapper1,true);
- selectWarehouse.setDataVersionId(selectDataVersion.getId());
- productionLineWarehouseService.saveOrUpdate(selectWarehouse);
- return Result.OK("娣诲姞鎴愬姛锛�");
- }
- /**
- * 琛ㄥ崟鏍￠獙
- */
- @GetMapping("/check")
- public Result<?> check(@RequestParam(name="name",required = false) String name,
- @RequestParam(name="workshopId",required = false) String workshopId,
- @RequestParam(name="version",required = false) Integer version
- ){
- QueryWrapper<ProductionLineWarehouse> queryWrapper = new QueryWrapper<>();
- if(!StringUtils.isBlank(name)){
- queryWrapper.eq("name",name);
- }
- if(!StringUtils.isBlank(workshopId)){
- queryWrapper.eq("workshop_id",workshopId);
- }
- if(version!=null){
- queryWrapper.eq("version",version);
- }
- queryWrapper.eq("del_flag","0");
- return Result.OK(productionLineWarehouseService.list(queryWrapper));
- }
- /**
- * 鍗囩増
- * 闇�瑕佷竴娆″畬鎴�
- * @param map
- * @param
- * @return
- */
- @PostMapping("/updateVersion")
- @Transactional
- public Result<?> updateVersion(@RequestBody Map<String,Object> map){
- Integer version = Integer.parseInt((String)map.get("version"));
- //鑾峰彇鍗囩増鏁版嵁
- List<ProductionLineWarehouse> list = productionLineWarehouseService.list(new QueryWrapper<ProductionLineWarehouse>()
- .eq("version",version)
- .eq("del_flag",0));
- //鑾峰彇鍗囩増鏁版嵁鐨勭増鏈俊鎭�
- QueryWrapper<DataVersion> queryWrapper = new QueryWrapper<DataVersion>()
- .in("business_id", list.stream().map(ProductionLineWarehouse::getId).collect(Collectors.toList()))
- .eq("del_flag",0);
- List<DataVersion> dataVersionList = dataVersionService.list(queryWrapper);
- Set<Integer> set = productionLineWarehouseService.getVersionList();
- Optional<Integer> maxVersion = set.stream().findFirst();
- list.stream().forEach(warehouse -> {
- warehouse.setId("");
- warehouse.setVersion(maxVersion.get()+1);
- });
- productionLineWarehouseService.saveBatch(list);
- List<ProductionLineWarehouse> newList = productionLineWarehouseService
- .list(new QueryWrapper<ProductionLineWarehouse>()
- .eq("version",maxVersion.get()+1));
- List<DataVersion> newDataVersionList = new ArrayList<>();
- for(int i=0;i<newList.size();i++){
- DataVersion dataVersion = new DataVersion();
- for(int j=0;j<list.size();j++){
- for(int k=0;k<dataVersionList.size();k++){
- if(list.get(j).getCode().equals(newList.get(i).getCode())
- &&list.get(j).getDataVersionId().equals(dataVersionList.get(k).getId())) {
- dataVersion
- .setVersion(maxVersion.get() + 1)
- .setVersionStatus("1")
- .setBusinessId(newList.get(i).getId())
- .setDelFlag(0)
- .setSourceVersionId(dataVersionList.get(k).getId())
- .setBusinessType("绾胯竟搴撶鐞�")
- .setIsLastUsable("0");
- }
- }
- }
- newDataVersionList.add(dataVersion);
- }
- dataVersionService.saveBatch(newDataVersionList);
- List<String> dataVersionBusinessIdList = newDataVersionList.stream().map(DataVersion::getBusinessId).collect(Collectors.toList());
- QueryWrapper<DataVersion> queryWrapper1 = new QueryWrapper<DataVersion>().in("business_id",dataVersionBusinessIdList).eq("del_flag",0);
- List<DataVersion> selectDataVersionList = dataVersionService.list(queryWrapper1);
- for(int i=0;i<newList.size();i++){
- for(int j=0;j<selectDataVersionList.size();j++){
- if(newList.get(i).getId().equals(selectDataVersionList.get(j).getBusinessId())){
- newList.get(i).setDataVersionId(selectDataVersionList.get(j).getId());
- }
- }
- }
- productionLineWarehouseService.updateBatchById(newList);
- return Result.OK(maxVersion.get()+1);
- }
- /**
- * 缁存姢鍗囩増
- * 闇�瑕佷竴娆″畬鎴�
- * @param
- * @return
- */
- @PostMapping("/updateVersionForChange")
- @Transactional
- public Result<?> updateVersionForChange(){
- Set<Integer> set = productionLineWarehouseService.getVersionList();
- return Result.OK(set.stream().findFirst().get()+1);
- }
- /**
- * 鐢熸晥
- * 闇�瑕佷竴娆℃�у畬鎴�
- * @param
- * @param map
- * @return
- */
- @PostMapping("/updateVersionStatusToUsable")
- @Transactional
- public Result<?> updateVersionStatusToUsable(@RequestBody Map<String,Object> map){
- Date date = new Date(System.currentTimeMillis());
- QuartzJob quartzJob = quartzJobService.getOne(new QueryWrapper<QuartzJob>()
- .eq("job_class_name","org.jeecg.modules.quartz.job.ProductionLineWarehouseSetUsableJob"),true);
- if(ObjectUtils.isNotNull(quartzJob)){
- quartzJobService.deleteAndStopJob(quartzJob);
- }
- Integer version = Integer.parseInt((String)map.get("version"));
- //鑾峰彇涓婃鐢熸晥鐗堟湰骞跺皢鍏舵槸鍚︿笂娆＄敓鏁堜綅缃疆涓哄惁
- List<ProductionLineWarehouse> lastUsableList = productionLineWarehouseService.getLastUsableList();
- if(CollectionUtils.isNotEmpty(lastUsableList)){
- QueryWrapper<DataVersion> queryWrapper2 = new QueryWrapper<DataVersion>()
- .in("business_id",lastUsableList.stream()
- .map(ProductionLineWarehouse::getId)
- .collect(Collectors.toList()));
- List<DataVersion> lastUsableVersionList = dataVersionService.list(queryWrapper2);
- lastUsableVersionList.stream().forEach(dataVersion -> {
- dataVersion
- .setIsLastUsable("0");
- });
- dataVersionService.updateBatchById(lastUsableVersionList);
- }
- //鑾峰彇鐢熸晥鐗堟湰鍙婄増鏈俊鎭苟灏嗗叾缃负澶辨晥
- List<ProductionLineWarehouse> usableList = productionLineWarehouseService.getUsableList();
- if(CollectionUtils.isNotEmpty(usableList)){
- QueryWrapper<DataVersion> queryWrapper = new QueryWrapper<DataVersion>()
- .in("business_id",usableList.stream()
- .map(ProductionLineWarehouse::getId)
- .collect(Collectors.toList()));
- List<DataVersion> usableDataVersionList = dataVersionService.list(queryWrapper);
- usableDataVersionList.stream().forEach(dataVersion -> {
- dataVersion
- .setVersionStatus("3")
- .setIsLastUsable("1")
- .setExpiredTime(date);
- });
- dataVersionService.updateBatchById(usableDataVersionList);
- }
- //鑾峰彇寰呯敓鏁堢増鏈強鐗堟湰淇℃伅骞跺皢鍏剁疆涓虹敓鏁�
- QueryWrapper<DataVersion> queryWrapper1 = new QueryWrapper<DataVersion>()
- .in("business_id",productionLineWarehouseService.list(new QueryWrapper<ProductionLineWarehouse>()
- .eq("version",version)
- .eq("del_flag",0))
- .stream().map(ProductionLineWarehouse::getId)
- .collect(Collectors.toList()));
- List<DataVersion> dataVersionList = dataVersionService.list(queryWrapper1);
- dataVersionList.stream().forEach(dataVersion -> {
- dataVersion.setVersionStatus("2")
- .setEffectiveType("2")
- .setEffectiveTime(date)
- .setIsLastUsable("0");
- });
- //瀛樺叆鏁版嵁搴�
- dataVersionService.updateBatchById(dataVersionList);
- return Result.OK("鐢熸晥鎴愬姛");
- }
- /**
- * 瀹氭椂鐢熸晥
- * 闇�瑕佷竴娆℃�у畬鎴�
- * @param quartzJob
- * @param
- * @return
- */
- @PostMapping("/updateVersionStatusToUsableBySetTime")
- @Transactional
- public Result<?> updateVersionStatusToUsableBySetTime(@RequestBody QuartzJob quartzJob) throws ParseException {
- DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
- DateTimeFormatter dateTimeFormatter1 = DateTimeFormatter.ofPattern("ss mm HH dd MM ? yyyy");
- String jobClassName = quartzJob.getJobClassName();
- String time = quartzJob.getCronExpression();
- System.out.println(time);
- LocalDateTime localDateTime = LocalDateTime.parse(time,dateTimeFormatter);
- String cronStr=dateTimeFormatter1.format(localDateTime);
- quartzJob.setCronExpression(cronStr);
- QueryWrapper<QuartzJob> queryWrapper = new QueryWrapper();
- queryWrapper.eq("JOB_CLASS_NAME",jobClassName);
- List<QuartzJob> quartzJobs = quartzJobService.list(queryWrapper);
- if(CollectionUtils.isEmpty(quartzJobs)){
- quartzJobService.saveAndScheduleJob(quartzJob);
- quartzJobs = quartzJobService.list(queryWrapper);
- quartzJob.setId(quartzJobs.get(0).getId());
- quartzJobService.resumeJob(quartzJob);
- return Result.OK(quartzJob);
- }else{
- quartzJob.setId(quartzJobs.get(0).getId());
- quartzJobService.resumeJob(quartzJob);
- return Result.OK(quartzJob);
- }
-
- }
-
- /**
- * 缂栬緫
- * @param productionLineWarehouse
- * @return
- */
- @AutoLog(value = "绾胯竟搴撶鐞�-缂栬緫")
- @ApiOperation(value="绾胯竟搴撶鐞�-缂栬緫", notes="绾胯竟搴撶鐞�-缂栬緫")
- //@RequiresPermissions("org.jeecg.modules.demo:mom_base_production_line_warehouse:edit")
- @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
- public Result<String> edit(@RequestBody ProductionLineWarehouse productionLineWarehouse) {
- productionLineWarehouseService.updateById(productionLineWarehouse);
- return Result.OK("缂栬緫鎴愬姛!");
- }
-
- /**
- * 閫氳繃id鍒犻櫎
- * @param id
- * @return
- */
- @Transactional
- @AutoLog(value = "绾胯竟搴撶鐞�-閫氳繃id鍒犻櫎")
- @ApiOperation(value="绾胯竟搴撶鐞�-閫氳繃id鍒犻櫎", notes="绾胯竟搴撶鐞�-閫氳繃id鍒犻櫎")
- //@RequiresPermissions("org.jeecg.modules.demo:mom_base_production_line_warehouse:delete")
- @DeleteMapping(value = "/delete")
- public Result<String> delete(@RequestParam(name="id",required=true) String id) {
- dataVersionService.update(new UpdateWrapper<DataVersion>()
- .set("del_flag",1)
- .eq("business_id",id));
- productionLineWarehouseService.update(new UpdateWrapper<ProductionLineWarehouse>().set("del_flag",1).eq("id",id));
- return Result.OK("鍒犻櫎鎴愬姛!");
- }
-
- /**
- * 鎵归噺鍒犻櫎
- * @param ids
- * @return
- */
- @Transactional
- @AutoLog(value = "绾胯竟搴撶鐞�-鎵归噺鍒犻櫎")
- @ApiOperation(value="绾胯竟搴撶鐞�-鎵归噺鍒犻櫎", notes="绾胯竟搴撶鐞�-鎵归噺鍒犻櫎")
- //@RequiresPermissions("org.jeecg.modules.demo:mom_base_production_line_warehouse:deleteBatch")
- @DeleteMapping(value = "/deleteBatch")
- public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
- dataVersionService.update(new UpdateWrapper<DataVersion>()
- .set("del_flag",1)
- .in("business_id",Arrays.asList(ids.split(","))));
- productionLineWarehouseService
- .update(new UpdateWrapper<ProductionLineWarehouse>()
- .in("id",Arrays.asList(ids.split(","))).set("del_flag",1));
- return Result.OK("鎵归噺鍒犻櫎鎴愬姛!");
- }
-
- /**
- * 瀵煎嚭
- * @return
- */
- //@RequiresPermissions("org.jeecg.modules.demo:mom_base_production_line_warehouse:exportXls")
- @RequestMapping(value = "/exportXls")
- public ModelAndView exportXls(HttpServletRequest request, ProductionLineWarehouse productionLineWarehouse) {
- return super.exportXls(request, productionLineWarehouse, ProductionLineWarehouse.class, "绾胯竟搴撶鐞�");
- }
-
- /**
- * 瀵煎叆
- * @return
- */
- //@RequiresPermissions("org.jeecg.modules.demo:mom_base_production_line_warehouse:importExcel")
- @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
- public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
- return super.importExcel(request, response, ProductionLineWarehouse.class);
- }
- /*---------------------------------涓昏〃澶勭悊-end-------------------------------------*/
-
-
- /*--------------------------------瀛愯〃澶勭悊-绾胯竟搴撴湇鍔″璞�-begin----------------------------------------------*/
- /**
- * 閫氳繃涓昏〃ID鏌ヨ
- * @return
- */
- //@AutoLog(value = "绾胯竟搴撴湇鍔″璞�-閫氳繃涓昏〃ID鏌ヨ")
- @ApiOperation(value="绾胯竟搴撴湇鍔″璞�-閫氳繃涓昏〃ID鏌ヨ", notes="绾胯竟搴撴湇鍔″璞�-閫氳繃涓昏〃ID鏌ヨ")
- @GetMapping(value = "/listProductionLineWarehouseClientByMainId")
- public Result<IPage<ProductionLineWarehouseClient>> listProductionLineWarehouseClientByMainId(ProductionLineWarehouseClient productionLineWarehouseClient,
- @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
- @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
- HttpServletRequest req) {
- QueryWrapper<ProductionLineWarehouseClient> queryWrapper = QueryGenerator.initQueryWrapper(productionLineWarehouseClient, req.getParameterMap());
- Page<ProductionLineWarehouseClient> page = new Page<ProductionLineWarehouseClient>(pageNo, pageSize);
- IPage<ProductionLineWarehouseClient> pageList = productionLineWarehouseClientService.page(page, queryWrapper);
- return Result.OK(pageList);
- }
-
- /**
- * 娣诲姞
- * @param map
- * @return
- */
- @AutoLog(value = "绾胯竟搴撴湇鍔″璞�-娣诲姞")
- @ApiOperation(value="绾胯竟搴撴湇鍔″璞�-娣诲姞", notes="绾胯竟搴撴湇鍔″璞�-娣诲姞")
- @PostMapping(value = "/addProductionLineWarehouseClient")
- public Result<String> addProductionLineWarehouseClient(@RequestBody Map map) {
- List<Map<String,Object>> addFactoryIds = (List<Map<String, Object>>) map.get("addFactoryIds");
- String warehouseId = (String) map.get("warehouseId");
- if(CollectionUtils.isNotEmpty(addFactoryIds)){
- List<ProductionLineWarehouseClient> warehouseClients=new ArrayList<>();
- addFactoryIds.forEach(factoryMap->{
- ProductionLineWarehouseClient warehouseClient = new ProductionLineWarehouseClient();
- warehouseClient.setClientId((String) factoryMap.get("id"))
- .setWarehouseId(warehouseId)
- .setCode((String) factoryMap.get("code"))
- .setName((String) factoryMap.get("name"))
- .setDelFlag(0);
- warehouseClients.add(warehouseClient);
- });
- productionLineWarehouseClientService.saveBatch(warehouseClients);
- }
- return Result.OK("娣诲姞鎴愬姛锛�");
- }
-
- /**
- * 缂栬緫
- * @param map
- * @return
- */
- @AutoLog(value = "绾胯竟搴撴湇鍔″璞�-缂栬緫")
- @ApiOperation(value="绾胯竟搴撴湇鍔″璞�-缂栬緫", notes="绾胯竟搴撴湇鍔″璞�-缂栬緫")
- @RequestMapping(value = "/editProductionLineWarehouseClient", method = {RequestMethod.PUT,RequestMethod.POST})
- public Result<String> editProductionLineWarehouseClient(@RequestBody Map map) {
- List<Map<String,Object>> addFactoryIds = (List<Map<String, Object>>) map.get("addFactoryIds");
- String id = (String) map.get("id");
- if(CollectionUtils.isNotEmpty(addFactoryIds)){
- UpdateWrapper<ProductionLineWarehouseClient> updateWrapper = new UpdateWrapper<ProductionLineWarehouseClient>()
- .eq("id",id)
- .set("code",(String)addFactoryIds.get(0).get("code"))
- .set("name",(String)addFactoryIds.get(0).get("name"));
- productionLineWarehouseClientService.update(updateWrapper);
- }
- return Result.OK("缂栬緫鎴愬姛!");
- }
-
- /**
- * 閫氳繃id鍒犻櫎
- * @param id
- * @return
- */
- @AutoLog(value = "绾胯竟搴撴湇鍔″璞�-閫氳繃id鍒犻櫎")
- @ApiOperation(value="绾胯竟搴撴湇鍔″璞�-閫氳繃id鍒犻櫎", notes="绾胯竟搴撴湇鍔″璞�-閫氳繃id鍒犻櫎")
- @DeleteMapping(value = "/deleteProductionLineWarehouseClient")
- public Result<String> deleteProductionLineWarehouseClient(@RequestParam(name="id",required=true) String id) {
- dataVersionService.update(new UpdateWrapper<DataVersion>()
- .set("del_flag",1)
- .eq("business_id",id));
- productionLineWarehouseClientService.update( new UpdateWrapper<ProductionLineWarehouseClient>()
- .set("del_flag",1)
- .eq("id",id));
- return Result.OK("鍒犻櫎鎴愬姛!");
- }
-
- /**
- * 鎵归噺鍒犻櫎
- * @param ids
- * @return
- */
- @AutoLog(value = "绾胯竟搴撴湇鍔″璞�-鎵归噺鍒犻櫎")
- @ApiOperation(value="绾胯竟搴撴湇鍔″璞�-鎵归噺鍒犻櫎", notes="绾胯竟搴撴湇鍔″璞�-鎵归噺鍒犻櫎")
- @DeleteMapping(value = "/deleteBatchProductionLineWarehouseClient")
- public Result<String> deleteBatchProductionLineWarehouseClient(@RequestParam(name="ids",required=true) String ids) {
- dataVersionService.update(new UpdateWrapper<DataVersion>()
- .set("del_flag",1)
- .in("business_id",Arrays.asList(ids.split(","))));
- productionLineWarehouseClientService.update(new UpdateWrapper<ProductionLineWarehouseClient>()
- .in("id",Arrays.asList(ids.split(",")))
- .set("del_flag",1));
- return Result.OK("鍒犻櫎鎴愬姛");
- }
-
- /**
- * 瀵煎嚭
- * @return
- */
- @RequestMapping(value = "/exportProductionLineWarehouseClient")
- public ModelAndView exportProductionLineWarehouseClient(HttpServletRequest request, ProductionLineWarehouseClient productionLineWarehouseClient) {
- // Step.1 缁勮鏌ヨ鏉′欢
- QueryWrapper<ProductionLineWarehouseClient> queryWrapper = QueryGenerator.initQueryWrapper(productionLineWarehouseClient, request.getParameterMap());
- LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-
- // Step.2 鑾峰彇瀵煎嚭鏁版嵁
- List<ProductionLineWarehouseClient> pageList = productionLineWarehouseClientService.list(queryWrapper);
- List<ProductionLineWarehouseClient> exportList = null;
-
- // 杩囨护閫変腑鏁版嵁
- String selections = request.getParameter("selections");
- if (oConvertUtils.isNotEmpty(selections)) {
- List<String> selectionList = Arrays.asList(selections.split(","));
- exportList = pageList.stream().filter(item -> selectionList.contains(item.getId())).collect(Collectors.toList());
- } else {
- exportList = pageList;
- }
-
- // Step.3 AutoPoi 瀵煎嚭Excel
- ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
- //姝ゅ璁剧疆鐨刦ilename鏃犳晥,鍓嶇浼氶噸鏇存柊璁剧疆涓�涓�
- mv.addObject(NormalExcelConstants.FILE_NAME, "绾胯竟搴撴湇鍔″璞�");
- mv.addObject(NormalExcelConstants.CLASS, ProductionLineWarehouseClient.class);
- mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("绾胯竟搴撴湇鍔″璞℃姤琛�", "瀵煎嚭浜�:" + sysUser.getRealname(), "绾胯竟搴撴湇鍔″璞�"));
- mv.addObject(NormalExcelConstants.DATA_LIST, exportList);
- return mv;
- }
-
- /**
- * 瀵煎叆
- * @return
- */
- @RequestMapping(value = "/importProductionLineWarehouseClient/{mainId}")
- public Result<?> importProductionLineWarehouseClient(HttpServletRequest request, HttpServletResponse response, @PathVariable("mainId") String mainId) {
- MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
- Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
- for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
- // 鑾峰彇涓婁紶鏂囦欢瀵硅薄
- MultipartFile file = entity.getValue();
- ImportParams params = new ImportParams();
- params.setTitleRows(2);
- params.setHeadRows(1);
- params.setNeedSave(true);
- try {
- List<ProductionLineWarehouseClient> list = ExcelImportUtil.importExcel(file.getInputStream(), ProductionLineWarehouseClient.class, params);
- for (ProductionLineWarehouseClient temp : list) {
- temp.setWarehouseId(mainId);
- }
- long start = System.currentTimeMillis();
- productionLineWarehouseClientService.saveBatch(list);
- log.info("娑堣�楁椂闂�" + (System.currentTimeMillis() - start) + "姣");
- return Result.OK("鏂囦欢瀵煎叆鎴愬姛锛佹暟鎹鏁帮細" + list.size());
- } catch (Exception e) {
- log.error(e.getMessage(), e);
- return Result.error("鏂囦欢瀵煎叆澶辫触:" + e.getMessage());
- } finally {
- try {
- file.getInputStream().close();
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
- }
- return Result.error("鏂囦欢瀵煎叆澶辫触锛�");
- }
-
- /*--------------------------------瀛愯〃澶勭悊-绾胯竟搴撴湇鍔″璞�-end----------------------------------------------*/
- /**
- * //鏍规嵁宸ュ巶id鏌ユ墍鏈夊瓙宸ュ巶鍙婅溅闂�
- *
- * @param pageNo
- * @param pageSize
- * @param parentId
- * @param version
- * @return
- */
- @GetMapping("/factorylist")//鏍规嵁宸ュ巶id鏌ユ墍鏈夊瓙宸ュ巶鍙婅溅闂�
- public Result<?> list(Map map,
- @RequestParam(name ="pageNo", defaultValue="1") Integer pageNo,
- @RequestParam(name ="pageSize", defaultValue="10") Integer pageSize,
- @RequestParam(name = "parentId",required = false) String parentId,
- @RequestParam(name="version",required = false) Integer version,
- @RequestParam(name="selected",required = false) String selected
- ){
- List<String> ids = new ArrayList<>();
- if(selected!=null){
- ids = Arrays.asList(selected.split(","));
- }
- Page<Map<String,Object>> page = new Page(pageNo, pageSize);
- IPage<Map<String,Object>> pageList = productionLineWarehouseClientService.getFactoryList(page,version,parentId,ids);
- return Result.OK(pageList);
- }
-
-
-
-}
diff --git a/src/main/java/org/jeecg/modules/base/controller/ShiftController.java b/src/main/java/org/jeecg/modules/base/controller/ShiftController.java
new file mode 100644
index 0000000..3ad8028
--- /dev/null
+++ b/src/main/java/org/jeecg/modules/base/controller/ShiftController.java
@@ -0,0 +1,197 @@
+package org.jeecg.modules.base.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import com.alibaba.fastjson.JSONObject;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.base.entity.Shift;
+import org.jeecg.modules.base.service.IShiftService;
+
+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.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+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.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+
+ /**
+ * @Description: 鐝
+ * @Author: jeecg-boot
+ * @Date: 2025-06-24
+ * @Version: V1.0
+ */
+@Api(tags="鐝")
+@RestController
+@RequestMapping("/base/shift")
+@Slf4j
+public class ShiftController extends JeecgController<Shift, IShiftService> {
+ @Autowired
+ private IShiftService shiftService;
+
+ /**
+ * 鍒嗛〉鍒楄〃鏌ヨ
+ *
+ * @param shift
+ * @param pageNo
+ * @param pageSize
+ * @param req
+ * @return
+ */
+ //@AutoLog(value = "鐝-鍒嗛〉鍒楄〃鏌ヨ")
+ @ApiOperation(value="鐝-鍒嗛〉鍒楄〃鏌ヨ", notes="鐝-鍒嗛〉鍒楄〃鏌ヨ")
+ @GetMapping(value = "/list")
+ public Result<IPage<Shift>> queryPageList(Shift shift,
+ @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+ @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+ HttpServletRequest req) {
+ QueryWrapper<Shift> queryWrapper = QueryGenerator.initQueryWrapper(shift, req.getParameterMap());
+ Page<Shift> page = new Page<Shift>(pageNo, pageSize);
+ IPage<Shift> pageList = shiftService.page(page, queryWrapper);
+ return Result.OK(pageList);
+ }
+
+ /**
+ * 娣诲姞
+ *
+ * @param shift
+ * @return
+ */
+ @AutoLog(value = "鐝-娣诲姞")
+ @ApiOperation(value="鐝-娣诲姞", notes="鐝-娣诲姞")
+ //@RequiresPermissions("org.jeecg.modules:base_shift:add")
+ @PostMapping(value = "/add")
+ public Result<String> add(@RequestBody Shift shift) {
+ shiftService.save(shift);
+ return Result.OK("娣诲姞鎴愬姛锛�");
+ }
+
+ /**
+ * 缂栬緫
+ *
+ * @param shift
+ * @return
+ */
+ @AutoLog(value = "鐝-缂栬緫")
+ @ApiOperation(value="鐝-缂栬緫", notes="鐝-缂栬緫")
+ //@RequiresPermissions("org.jeecg.modules:base_shift:edit")
+ @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+ public Result<String> edit(@RequestBody Shift shift) {
+ shiftService.updateById(shift);
+ return Result.OK("缂栬緫鎴愬姛!");
+ }
+
+ /**
+ * 閫氳繃id鍒犻櫎
+ *
+ * @param id
+ * @return
+ */
+ @AutoLog(value = "鐝-閫氳繃id鍒犻櫎")
+ @ApiOperation(value="鐝-閫氳繃id鍒犻櫎", notes="鐝-閫氳繃id鍒犻櫎")
+ //@RequiresPermissions("org.jeecg.modules:base_shift:delete")
+ @DeleteMapping(value = "/delete")
+ public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+ shiftService.removeById(id);
+ return Result.OK("鍒犻櫎鎴愬姛!");
+ }
+
+ /**
+ * 鎵归噺鍒犻櫎
+ *
+ * @param ids
+ * @return
+ */
+ @AutoLog(value = "鐝-鎵归噺鍒犻櫎")
+ @ApiOperation(value="鐝-鎵归噺鍒犻櫎", notes="鐝-鎵归噺鍒犻櫎")
+ //@RequiresPermissions("org.jeecg.modules:base_shift:deleteBatch")
+ @DeleteMapping(value = "/deleteBatch")
+ public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+ this.shiftService.removeByIds(Arrays.asList(ids.split(",")));
+ return Result.OK("鎵归噺鍒犻櫎鎴愬姛!");
+ }
+
+ /**
+ * 閫氳繃id鏌ヨ
+ *
+ * @param id
+ * @return
+ */
+ //@AutoLog(value = "鐝-閫氳繃id鏌ヨ")
+ @ApiOperation(value="鐝-閫氳繃id鏌ヨ", notes="鐝-閫氳繃id鏌ヨ")
+ @GetMapping(value = "/queryById")
+ public Result<Shift> queryById(@RequestParam(name="id",required=true) String id) {
+ Shift shift = shiftService.getById(id);
+ if(shift==null) {
+ return Result.error("鏈壘鍒板搴旀暟鎹�");
+ }
+ return Result.OK(shift);
+ }
+
+ /**
+ * 瀵煎嚭excel
+ *
+ * @param request
+ * @param shift
+ */
+ //@RequiresPermissions("org.jeecg.modules:base_shift:exportXls")
+ @RequestMapping(value = "/exportXls")
+ public ModelAndView exportXls(HttpServletRequest request, Shift shift) {
+ return super.exportXls(request, shift, Shift.class, "鐝");
+ }
+
+ /**
+ * 閫氳繃excel瀵煎叆鏁版嵁
+ *
+ * @param request
+ * @param response
+ * @return
+ */
+ //@RequiresPermissions("base_shift:importExcel")
+ @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+ public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+ return super.importExcel(request, response, Shift.class);
+ }
+
+ /**
+ * 鐝琛�-鏍规嵁id淇敼鐘舵��
+ *
+ * @param jsonObject
+ * @return
+ */
+ @AutoLog(value = "鏍规嵁id淇敼鐘舵��")
+ @ApiOperation(value = "鏍规嵁id淇敼鐘舵��", notes = "鏍规嵁id淇敼鐘舵��")
+ @PutMapping("/updateStatusById")
+ public Result<?> updateSubStatusById(@RequestBody JSONObject jsonObject) {
+ String id = jsonObject.getString("id");
+ String status = jsonObject.getString("status");
+ Shift shift = shiftService.getById(id);
+ shift.setShiftStatus(status);
+ Boolean flag = shiftService.updateById(shift);
+ return flag ? Result.OK("淇敼鎴愬姛") : Result.error("淇敼澶辫触");
+ }
+
+}
diff --git a/src/main/java/org/jeecg/modules/base/controller/ShiftGroupController.java b/src/main/java/org/jeecg/modules/base/controller/ShiftGroupController.java
new file mode 100644
index 0000000..ba9a438
--- /dev/null
+++ b/src/main/java/org/jeecg/modules/base/controller/ShiftGroupController.java
@@ -0,0 +1,185 @@
+package org.jeecg.modules.base.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+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.util.oConvertUtils;
+import org.jeecg.modules.base.entity.ShiftGroup;
+import org.jeecg.modules.base.entity.UserGroup;
+import org.jeecg.modules.base.service.IShiftGroupService;
+
+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.modules.base.service.IUserGroupService;
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+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.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+
+ /**
+ * @Description: 鐝粍浜哄憳淇℃伅
+ * @Author: jeecg-boot
+ * @Date: 2025-06-24
+ * @Version: V1.0
+ */
+@Api(tags="鐝粍浜哄憳淇℃伅")
+@RestController
+@RequestMapping("/base/shiftGroup")
+@Slf4j
+public class ShiftGroupController extends JeecgController<ShiftGroup, IShiftGroupService> {
+ @Autowired
+ private IShiftGroupService shiftGroupService;
+
+ @Autowired
+ private IUserGroupService userGroupService;
+
+ /**
+ * 鍒嗛〉鍒楄〃鏌ヨ
+ *
+ * @param shiftGroup
+ * @param pageNo
+ * @param pageSize
+ * @param req
+ * @return
+ */
+ //@AutoLog(value = "鐝粍浜哄憳淇℃伅-鍒嗛〉鍒楄〃鏌ヨ")
+ @ApiOperation(value="鐝粍浜哄憳淇℃伅-鍒嗛〉鍒楄〃鏌ヨ", notes="鐝粍浜哄憳淇℃伅-鍒嗛〉鍒楄〃鏌ヨ")
+ @GetMapping(value = "/list")
+ public Result<IPage<ShiftGroup>> queryPageList(ShiftGroup shiftGroup,
+ @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+ @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+ HttpServletRequest req) {
+ QueryWrapper<ShiftGroup> queryWrapper = QueryGenerator.initQueryWrapper(shiftGroup, req.getParameterMap());
+ Page<ShiftGroup> page = new Page<ShiftGroup>(pageNo, pageSize);
+ IPage<ShiftGroup> pageList = shiftGroupService.page(page, queryWrapper);
+ return Result.OK(pageList);
+ }
+
+ /**
+ * 娣诲姞
+ *
+ * @param shiftGroup
+ * @return
+ */
+ @AutoLog(value = "鐝粍浜哄憳淇℃伅-娣诲姞")
+ @ApiOperation(value="鐝粍浜哄憳淇℃伅-娣诲姞", notes="鐝粍浜哄憳淇℃伅-娣诲姞")
+ //@RequiresPermissions("org.jeecg.modules:base_shift_group:add")
+ @PostMapping(value = "/add")
+ public Result<String> add(@RequestBody ShiftGroup shiftGroup) {
+ shiftGroupService.save(shiftGroup);
+ return Result.OK("娣诲姞鎴愬姛锛�");
+ }
+
+ /**
+ * 缂栬緫
+ *
+ * @param shiftGroup
+ * @return
+ */
+ @AutoLog(value = "鐝粍浜哄憳淇℃伅-缂栬緫")
+ @ApiOperation(value="鐝粍浜哄憳淇℃伅-缂栬緫", notes="鐝粍浜哄憳淇℃伅-缂栬緫")
+ //@RequiresPermissions("org.jeecg.modules:base_shift_group:edit")
+ @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+ public Result<String> edit(@RequestBody ShiftGroup shiftGroup) {
+ shiftGroupService.updateById(shiftGroup);
+ return Result.OK("缂栬緫鎴愬姛!");
+ }
+
+ /**
+ * 閫氳繃id鍒犻櫎
+ *
+ * @param id
+ * @return
+ */
+ @AutoLog(value = "鐝粍浜哄憳淇℃伅-閫氳繃id鍒犻櫎")
+ @ApiOperation(value="鐝粍浜哄憳淇℃伅-閫氳繃id鍒犻櫎", notes="鐝粍浜哄憳淇℃伅-閫氳繃id鍒犻櫎")
+ //@RequiresPermissions("org.jeecg.modules:base_shift_group:delete")
+ @DeleteMapping(value = "/delete")
+ public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+ //鏌ヨ鍏宠仈鍏崇郴锛屽苟鍒犻櫎
+ List<UserGroup> userGroupList = userGroupService.lambdaQuery().eq(UserGroup::getGroupId,id).list();
+ userGroupService.removeBatchByIds(userGroupList);
+ shiftGroupService.removeById(id);
+ return Result.OK("鍒犻櫎鎴愬姛!");
+ }
+
+ /**
+ * 鎵归噺鍒犻櫎
+ *
+ * @param ids
+ * @return
+ */
+ @AutoLog(value = "鐝粍浜哄憳淇℃伅-鎵归噺鍒犻櫎")
+ @ApiOperation(value="鐝粍浜哄憳淇℃伅-鎵归噺鍒犻櫎", notes="鐝粍浜哄憳淇℃伅-鎵归噺鍒犻櫎")
+ //@RequiresPermissions("org.jeecg.modules:base_shift_group:deleteBatch")
+ @DeleteMapping(value = "/deleteBatch")
+ public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+ this.shiftGroupService.removeByIds(Arrays.asList(ids.split(",")));
+ return Result.OK("鎵归噺鍒犻櫎鎴愬姛!");
+ }
+
+ /**
+ * 閫氳繃id鏌ヨ
+ *
+ * @param id
+ * @return
+ */
+ //@AutoLog(value = "鐝粍浜哄憳淇℃伅-閫氳繃id鏌ヨ")
+ @ApiOperation(value="鐝粍浜哄憳淇℃伅-閫氳繃id鏌ヨ", notes="鐝粍浜哄憳淇℃伅-閫氳繃id鏌ヨ")
+ @GetMapping(value = "/queryById")
+ public Result<ShiftGroup> queryById(@RequestParam(name="id",required=true) String id) {
+ ShiftGroup shiftGroup = shiftGroupService.getById(id);
+ if(shiftGroup==null) {
+ return Result.error("鏈壘鍒板搴旀暟鎹�");
+ }
+ return Result.OK(shiftGroup);
+ }
+
+ /**
+ * 瀵煎嚭excel
+ *
+ * @param request
+ * @param shiftGroup
+ */
+ //@RequiresPermissions("org.jeecg.modules:base_shift_group:exportXls")
+ @RequestMapping(value = "/exportXls")
+ public ModelAndView exportXls(HttpServletRequest request, ShiftGroup shiftGroup) {
+ return super.exportXls(request, shiftGroup, ShiftGroup.class, "鐝粍浜哄憳淇℃伅");
+ }
+
+ /**
+ * 閫氳繃excel瀵煎叆鏁版嵁
+ *
+ * @param request
+ * @param response
+ * @return
+ */
+ //@RequiresPermissions("base_shift_group:importExcel")
+ @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+ public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+ return super.importExcel(request, response, ShiftGroup.class);
+ }
+
+}
diff --git a/src/main/java/org/jeecg/modules/base/controller/SupplierCategoryController.java b/src/main/java/org/jeecg/modules/base/controller/SupplierCategoryController.java
deleted file mode 100644
index 6cc96f0..0000000
--- a/src/main/java/org/jeecg/modules/base/controller/SupplierCategoryController.java
+++ /dev/null
@@ -1,177 +0,0 @@
-package org.jeecg.modules.base.controller;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.jeecg.common.api.vo.CommonGenericTree;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
-import org.jeecg.common.system.base.controller.JeecgController;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.modules.base.entity.Supplier;
-import org.jeecg.modules.base.entity.SupplierCategory;
-import org.jeecg.modules.base.service.ISupplierCategoryService;
-import org.jeecg.modules.base.service.ISupplierService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.servlet.ModelAndView;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.Arrays;
-import java.util.List;
-
-/**
-* @Description: 渚涘簲鍟嗗垎绫�
-* @Author: jeecg-boot
-* @Date: 2023-03-10
-* @Version: V1.0
-*/
-@Api(tags="渚涘簲鍟嗗垎绫�")
-@RestController
-@RequestMapping("/eam/supplierCategory")
-@Slf4j
-public class SupplierCategoryController extends JeecgController<SupplierCategory, ISupplierCategoryService> {
- @Autowired
- private ISupplierCategoryService supplierCategoryService;
- @Autowired
- private ISupplierService supplierService;
-
- /**
- * 鍒嗛〉鍒楄〃鏌ヨ
- *
- * @param supplierCategory
- * @param pageNo
- * @param pageSize
- * @param req
- * @return
- */
- @ApiOperation(value="渚涘簲鍟嗗垎绫�-鍒嗛〉鍒楄〃鏌ヨ", notes="渚涘簲鍟嗗垎绫�-鍒嗛〉鍒楄〃鏌ヨ")
- @GetMapping(value = "/list")
- public Result<IPage<SupplierCategory>> queryPageList(SupplierCategory supplierCategory,
- @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
- @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
- HttpServletRequest req) {
- QueryWrapper<SupplierCategory> queryWrapper = QueryGenerator.initQueryWrapper(supplierCategory, req.getParameterMap());
- Page<SupplierCategory> page = new Page<SupplierCategory>(pageNo, pageSize);
- IPage<SupplierCategory> pageList = supplierCategoryService.page(page, queryWrapper);
- return Result.OK(pageList);
- }
-
- /**
- * 娣诲姞
- *
- * @param inspectionProjectCategory
- * @return
- */
- @AutoLog(value = "渚涘簲鍟嗗垎绫�-娣诲姞")
- @ApiOperation(value="渚涘簲鍟嗗垎绫�-娣诲姞", notes="渚涘簲鍟嗗垎绫�-娣诲姞")
- @PostMapping(value = "/add")
- public Result<String> add(@RequestBody SupplierCategory inspectionProjectCategory) {
- supplierCategoryService.save(inspectionProjectCategory);
- return Result.OK("娣诲姞鎴愬姛锛�");
- }
-
- /**
- * 缂栬緫
- *
- * @param inspectionProjectCategory
- * @return
- */
- @AutoLog(value = "渚涘簲鍟嗗垎绫�-缂栬緫")
- @ApiOperation(value="渚涘簲鍟嗗垎绫�-缂栬緫", notes="渚涘簲鍟嗗垎绫�-缂栬緫")
- @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
- public Result<String> edit(@RequestBody SupplierCategory inspectionProjectCategory) {
- supplierCategoryService.updateById(inspectionProjectCategory);
- return Result.OK("缂栬緫鎴愬姛!");
- }
-
- /**
- * 閫氳繃id鍒犻櫎
- *
- * @param id
- * @return
- */
- @AutoLog(value = "渚涘簲鍟嗗垎绫�-閫氳繃id鍒犻櫎")
- @ApiOperation(value="渚涘簲鍟嗗垎绫�-閫氳繃id鍒犻櫎", notes="渚涘簲鍟嗗垎绫�-閫氳繃id鍒犻櫎")
- @DeleteMapping(value = "/delete")
- public Result<String> delete(@RequestParam(name="id",required=true) String id) {
- List<Supplier> projectList = supplierService.lambdaQuery()
- .eq(Supplier::getSupplierCategoryId, id)
- .eq(Supplier::getDelFlag, "0").list();
- if(projectList.size()>0){
- return Result.error(projectList.size()+"");
- }
- SupplierCategory inspectionProjectCategory = supplierCategoryService.getById(id);
- inspectionProjectCategory.setDelFlag(1);
- supplierCategoryService.updateById(inspectionProjectCategory);
- return Result.OK("鍒犻櫎鎴愬姛!");
- }
-
- /**
- * 鎵归噺鍒犻櫎
- *
- * @param ids
- * @return
- */
- @AutoLog(value = "渚涘簲鍟嗗垎绫�-鎵归噺鍒犻櫎")
- @ApiOperation(value="渚涘簲鍟嗗垎绫�-鎵归噺鍒犻櫎", notes="渚涘簲鍟嗗垎绫�-鎵归噺鍒犻櫎")
- @DeleteMapping(value = "/deleteBatch")
- public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
- this.supplierCategoryService.removeByIds(Arrays.asList(ids.split(",")));
- return Result.OK("鎵归噺鍒犻櫎鎴愬姛!");
- }
-
- /**
- * 閫氳繃id鏌ヨ
- *
- * @param id
- * @return
- */
- @ApiOperation(value="渚涘簲鍟嗗垎绫�-閫氳繃id鏌ヨ", notes="渚涘簲鍟嗗垎绫�-閫氳繃id鏌ヨ")
- @GetMapping(value = "/queryById")
- public Result<SupplierCategory> queryById(@RequestParam(name="id",required=true) String id) {
- SupplierCategory inspectionProjectCategory = supplierCategoryService.getById(id);
- if(inspectionProjectCategory ==null) {
- return Result.error("鏈壘鍒板搴旀暟鎹�");
- }
- return Result.OK(inspectionProjectCategory);
- }
-
- /**
- * 瀵煎嚭excel
- *
- * @param request
- * @param inspectionProjectCategory
- */
- @RequestMapping(value = "/exportXls")
- public ModelAndView exportXls(HttpServletRequest request, SupplierCategory inspectionProjectCategory) {
- return super.exportXls(request, inspectionProjectCategory, SupplierCategory.class, "mom_base_supplier_category");
- }
-
- /**
- * 閫氳繃excel瀵煎叆鏁版嵁
- *
- * @param request
- * @param response
- * @return
- */
- @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
- public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
- return super.importExcel(request, response, SupplierCategory.class);
- }
-
- /**
- * @MethodName: loadTree
- * @Description: 渚涘簲鍟嗗垎绫� 鏍�
- */
- @GetMapping("/loadTree")
- public Result<?> loadTree(HttpServletRequest httpServletRequest) {
- List<CommonGenericTree> list = supplierCategoryService.loadTree();
- return Result.ok(list);
- }
-
-}
diff --git a/src/main/java/org/jeecg/modules/base/controller/SupplierContactController.java b/src/main/java/org/jeecg/modules/base/controller/SupplierContactController.java
deleted file mode 100644
index ae467f8..0000000
--- a/src/main/java/org/jeecg/modules/base/controller/SupplierContactController.java
+++ /dev/null
@@ -1,155 +0,0 @@
-package org.jeecg.modules.base.controller;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
-import org.jeecg.common.system.base.controller.JeecgController;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.modules.base.entity.SupplierContact;
-import org.jeecg.modules.base.service.ISupplierContactService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.servlet.ModelAndView;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.Arrays;
-
-/**
- * @Description: mom_eam_inspection_project
- * @Author: jeecg-boot
- * @Date: 2023-03-10
- * @Version: V1.0
- */
-@Api(tags = "渚涘簲鍟嗚仈绯讳汉")
-@RestController
-@RequestMapping("/eam/supplierContact")
-@Slf4j
-public class SupplierContactController extends JeecgController<SupplierContact, ISupplierContactService> {
- @Autowired
- private ISupplierContactService supplierContactService;
-
-
- /**
- * 鍒嗛〉鍒楄〃鏌ヨ
- *
- * @param supplierContact
- * @param pageNo
- * @param pageSize
- * @param req
- * @return
- */
- //@AutoLog(value = "渚涘簲鍟嗚仈绯讳汉-鍒嗛〉鍒楄〃鏌ヨ")
- @ApiOperation(value = "渚涘簲鍟嗚仈绯讳汉-鍒嗛〉鍒楄〃鏌ヨ", notes = "渚涘簲鍟嗚仈绯讳汉-鍒嗛〉鍒楄〃鏌ヨ")
- @GetMapping(value = "/list")
- public Result<IPage<SupplierContact>> queryPageList(SupplierContact supplierContact,
- @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
- @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
- HttpServletRequest req) {
- QueryWrapper<SupplierContact> queryWrapper = QueryGenerator.initQueryWrapper(supplierContact, req.getParameterMap());
- Page<SupplierContact> page = new Page<SupplierContact>(pageNo, pageSize);
- IPage<SupplierContact> pageList = supplierContactService.page(page, queryWrapper);
- return Result.OK(pageList);
- }
-
- /**
- * 娣诲姞
- *
- * @param supplierContact
- * @return
- */
- @AutoLog(value = "渚涘簲鍟嗚仈绯讳汉-娣诲姞")
- @ApiOperation(value = "渚涘簲鍟嗚仈绯讳汉-娣诲姞", notes = "渚涘簲鍟嗚仈绯讳汉-娣诲姞")
- @PostMapping(value = "/add")
- public Result<String> add(@RequestBody SupplierContact supplierContact) {
- supplierContactService.save(supplierContact);
- return Result.OK("娣诲姞鎴愬姛锛�");
- }
-
- /**
- * 缂栬緫
- *
- * @param supplierContact
- * @return
- */
- @AutoLog(value = "渚涘簲鍟嗚仈绯讳汉-缂栬緫")
- @ApiOperation(value = "渚涘簲鍟嗚仈绯讳汉-缂栬緫", notes = "渚涘簲鍟嗚仈绯讳汉-缂栬緫")
- @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
- public Result<String> edit(@RequestBody SupplierContact supplierContact) {
- supplierContactService.updateById(supplierContact);
- return Result.OK("缂栬緫鎴愬姛!");
- }
-
- /**
- * 閫氳繃id鍒犻櫎
- *
- * @param id
- * @return
- */
- @AutoLog(value = "渚涘簲鍟嗚仈绯讳汉-閫氳繃id鍒犻櫎")
- @ApiOperation(value = "渚涘簲鍟嗚仈绯讳汉-閫氳繃id鍒犻櫎", notes = "渚涘簲鍟嗚仈绯讳汉-閫氳繃id鍒犻櫎")
- @DeleteMapping(value = "/delete")
- public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
- supplierContactService.removeById(id);
- return Result.OK("鍒犻櫎鎴愬姛!");
- }
-
- /**
- * 鎵归噺鍒犻櫎
- *
- * @param ids
- * @return
- */
- @AutoLog(value = "渚涘簲鍟嗚仈绯讳汉-鎵归噺鍒犻櫎")
- @ApiOperation(value = "渚涘簲鍟嗚仈绯讳汉-鎵归噺鍒犻櫎", notes = "渚涘簲鍟嗚仈绯讳汉-鎵归噺鍒犻櫎")
- @DeleteMapping(value = "/deleteBatch")
- public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
- this.supplierContactService.removeByIds(Arrays.asList(ids.split(",")));
- return Result.OK("鎵归噺鍒犻櫎鎴愬姛!");
- }
-
- /**
- * 閫氳繃id鏌ヨ
- *
- * @param id
- * @return
- */
- @ApiOperation(value = "渚涘簲鍟嗚仈绯讳汉-閫氳繃id鏌ヨ", notes = "渚涘簲鍟嗚仈绯讳汉-閫氳繃id鏌ヨ")
- @GetMapping(value = "/queryById")
- public Result<SupplierContact> queryById(@RequestParam(name = "id", required = true) String id) {
- SupplierContact momBaseSupplierContact = supplierContactService.getById(id);
- if (momBaseSupplierContact == null) {
- return Result.error("鏈壘鍒板搴旀暟鎹�");
- }
- return Result.OK(momBaseSupplierContact);
- }
-
- /**
- * 瀵煎嚭excel
- *
- * @param request
- * @param supplierContact
- */
- @RequestMapping(value = "/exportXls")
- public ModelAndView exportXls(HttpServletRequest request, SupplierContact supplierContact) {
- return super.exportXls(request, supplierContact, SupplierContact.class, "渚涘簲鍟嗚仈绯讳汉");
- }
-
- /**
- * 閫氳繃excel瀵煎叆鏁版嵁
- *
- * @param request
- * @param response
- * @return
- */
- @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
- public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
- return super.importExcel(request, response, SupplierContact.class);
- }
-
-}
diff --git a/src/main/java/org/jeecg/modules/base/controller/SupplierController.java b/src/main/java/org/jeecg/modules/base/controller/SupplierController.java
index 6ed75b9..32a2574 100644
--- a/src/main/java/org/jeecg/modules/base/controller/SupplierController.java
+++ b/src/main/java/org/jeecg/modules/base/controller/SupplierController.java
@@ -1,174 +1,174 @@
package org.jeecg.modules.base.controller;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+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.util.oConvertUtils;
+import org.jeecg.modules.base.entity.Supplier;
+import org.jeecg.modules.base.service.ISupplierService;
+
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
+
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.jeecg.common.system.base.controller.JeecgController;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.modules.base.entity.Supplier;
-import org.jeecg.modules.base.entity.SupplierCategory;
-import org.jeecg.modules.base.service.ISupplierCategoryService;
-import org.jeecg.modules.base.service.ISupplierService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.Arrays;
-import java.util.List;
-
-/**
-* @Description: 渚涘簲鍟�
-* @Author: jeecg-boot
-* @Date: 2023-03-10
-* @Version: V1.0
-*/
-@Api(tags="渚涘簲鍟�")
+ /**
+ * @Description: 渚涘簲鍟嗙鐞�
+ * @Author: jeecg-boot
+ * @Date: 2025-06-24
+ * @Version: V1.0
+ */
+@Api(tags="渚涘簲鍟嗙鐞�")
@RestController
-@RequestMapping("/eam/supplier")
+@RequestMapping("/base/supplier")
@Slf4j
public class SupplierController extends JeecgController<Supplier, ISupplierService> {
- @Autowired
- private ISupplierService inspectionProjectService;
- @Autowired
- private ISupplierCategoryService inspectionProjectCategoryService;
-
+ @Autowired
+ private ISupplierService supplierService;
+
+ /**
+ * 鍒嗛〉鍒楄〃鏌ヨ
+ *
+ * @param supplier
+ * @param pageNo
+ * @param pageSize
+ * @param req
+ * @return
+ */
+ //@AutoLog(value = "渚涘簲鍟嗙鐞�-鍒嗛〉鍒楄〃鏌ヨ")
+ @ApiOperation(value="渚涘簲鍟嗙鐞�-鍒嗛〉鍒楄〃鏌ヨ", notes="渚涘簲鍟嗙鐞�-鍒嗛〉鍒楄〃鏌ヨ")
+ @GetMapping(value = "/list")
+ public Result<IPage<Supplier>> queryPageList(Supplier supplier,
+ @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+ @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+ HttpServletRequest req) {
+ QueryWrapper<Supplier> queryWrapper = QueryGenerator.initQueryWrapper(supplier, req.getParameterMap());
+ Page<Supplier> page = new Page<Supplier>(pageNo, pageSize);
+ IPage<Supplier> pageList = supplierService.page(page, queryWrapper);
+ return Result.OK(pageList);
+ }
+
+ /**
+ * 娣诲姞
+ *
+ * @param supplier
+ * @return
+ */
+ @AutoLog(value = "渚涘簲鍟嗙鐞�-娣诲姞")
+ @ApiOperation(value="渚涘簲鍟嗙鐞�-娣诲姞", notes="渚涘簲鍟嗙鐞�-娣诲姞")
+ //@RequiresPermissions("org.jeecg.modules:base_supplier:add")
+ @PostMapping(value = "/add")
+ public Result<String> add(@RequestBody Supplier supplier) {
+ supplierService.save(supplier);
+ return Result.OK("娣诲姞鎴愬姛锛�");
+ }
+
+ /**
+ * 缂栬緫
+ *
+ * @param supplier
+ * @return
+ */
+ @AutoLog(value = "渚涘簲鍟嗙鐞�-缂栬緫")
+ @ApiOperation(value="渚涘簲鍟嗙鐞�-缂栬緫", notes="渚涘簲鍟嗙鐞�-缂栬緫")
+ //@RequiresPermissions("org.jeecg.modules:base_supplier:edit")
+ @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+ public Result<String> edit(@RequestBody Supplier supplier) {
+ supplierService.updateById(supplier);
+ return Result.OK("缂栬緫鎴愬姛!");
+ }
+
+ /**
+ * 閫氳繃id鍒犻櫎
+ *
+ * @param id
+ * @return
+ */
+ @AutoLog(value = "渚涘簲鍟嗙鐞�-閫氳繃id鍒犻櫎")
+ @ApiOperation(value="渚涘簲鍟嗙鐞�-閫氳繃id鍒犻櫎", notes="渚涘簲鍟嗙鐞�-閫氳繃id鍒犻櫎")
+ //@RequiresPermissions("org.jeecg.modules:base_supplier:delete")
+ @DeleteMapping(value = "/delete")
+ public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+ supplierService.removeById(id);
+ return Result.OK("鍒犻櫎鎴愬姛!");
+ }
+
+ /**
+ * 鎵归噺鍒犻櫎
+ *
+ * @param ids
+ * @return
+ */
+ @AutoLog(value = "渚涘簲鍟嗙鐞�-鎵归噺鍒犻櫎")
+ @ApiOperation(value="渚涘簲鍟嗙鐞�-鎵归噺鍒犻櫎", notes="渚涘簲鍟嗙鐞�-鎵归噺鍒犻櫎")
+ //@RequiresPermissions("org.jeecg.modules:base_supplier:deleteBatch")
+ @DeleteMapping(value = "/deleteBatch")
+ public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+ this.supplierService.removeByIds(Arrays.asList(ids.split(",")));
+ return Result.OK("鎵归噺鍒犻櫎鎴愬姛!");
+ }
+
+ /**
+ * 閫氳繃id鏌ヨ
+ *
+ * @param id
+ * @return
+ */
+ //@AutoLog(value = "渚涘簲鍟嗙鐞�-閫氳繃id鏌ヨ")
+ @ApiOperation(value="渚涘簲鍟嗙鐞�-閫氳繃id鏌ヨ", notes="渚涘簲鍟嗙鐞�-閫氳繃id鏌ヨ")
+ @GetMapping(value = "/queryById")
+ public Result<Supplier> queryById(@RequestParam(name="id",required=true) String id) {
+ Supplier supplier = supplierService.getById(id);
+ if(supplier==null) {
+ return Result.error("鏈壘鍒板搴旀暟鎹�");
+ }
+ return Result.OK(supplier);
+ }
/**
- * 鍒嗛〉鍒楄〃鏌ヨ
- *
- * @param inspectionProject
- * @param pageNo
- * @param pageSize
- * @param req
- * @return
- */
- @ApiOperation(value="渚涘簲鍟�-鍒嗛〉鍒楄〃鏌ヨ", notes="渚涘簲鍟�-鍒嗛〉鍒楄〃鏌ヨ")
- @GetMapping(value = "/list")
- public Result<IPage<Supplier>> queryPageList(Supplier inspectionProject,
- @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
- @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
- HttpServletRequest req) {
- QueryWrapper<Supplier> queryWrapper = QueryGenerator.initQueryWrapper(inspectionProject, req.getParameterMap());
- Page<Supplier> page = new Page<Supplier>(pageNo, pageSize);
- IPage<Supplier> pageList = inspectionProjectService.page(page, queryWrapper);
- List<Supplier> records = pageList.getRecords();
- for (Supplier record : records) {
- String inspectionProjectTypeId = record.getSupplierCategoryId();
- SupplierCategory inspectionProjectCategory = inspectionProjectCategoryService.getById(inspectionProjectTypeId);
- if(inspectionProjectCategory != null ){
- record.setSupplierCategoryNumName(inspectionProjectCategory.getNum()+"/"+ inspectionProjectCategory.getName());
- }else{
- record.setSupplierCategoryNumName("/");
- }
-
- }
- return Result.OK(pageList);
- }
-
- /**
- * 娣诲姞
- *
- * @param inspectionProject
- * @return
- */
- @AutoLog(value = "渚涘簲鍟�-娣诲姞")
- @ApiOperation(value="渚涘簲鍟�-娣诲姞", notes="渚涘簲鍟�-娣诲姞")
- @PostMapping(value = "/add")
- public Result<String> add(@RequestBody Supplier inspectionProject) {
- inspectionProjectService.save(inspectionProject);
- return Result.OK("娣诲姞鎴愬姛锛�");
- }
-
- /**
- * 缂栬緫
- *
- * @param inspectionProject
- * @return
- */
- @AutoLog(value = "渚涘簲鍟�-缂栬緫")
- @ApiOperation(value="渚涘簲鍟�-缂栬緫", notes="渚涘簲鍟�-缂栬緫")
- @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
- public Result<String> edit(@RequestBody Supplier inspectionProject) {
- inspectionProjectService.updateById(inspectionProject);
- return Result.OK("缂栬緫鎴愬姛!");
- }
-
- /**
- * 閫氳繃id鍒犻櫎
- *
- * @param id
- * @return
- */
- @AutoLog(value = "渚涘簲鍟�-閫氳繃id鍒犻櫎")
- @ApiOperation(value="渚涘簲鍟�-閫氳繃id鍒犻櫎", notes="渚涘簲鍟�-閫氳繃id鍒犻櫎")
- @DeleteMapping(value = "/delete")
- public Result<String> delete(@RequestParam(name="id",required=true) String id) {
- Supplier inspectionProject = inspectionProjectService.getById(id);
- inspectionProject.setDelFlag(1);
- inspectionProjectService.updateById(inspectionProject);
- return Result.OK("鍒犻櫎鎴愬姛!");
- }
-
- /**
- * 鎵归噺鍒犻櫎
- *
- * @param ids
- * @return
- */
- @AutoLog(value = "渚涘簲鍟�-鎵归噺鍒犻櫎")
- @ApiOperation(value="渚涘簲鍟�-鎵归噺鍒犻櫎", notes="渚涘簲鍟�-鎵归噺鍒犻櫎")
- @DeleteMapping(value = "/deleteBatch")
- public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
- List<String> idList = Arrays.asList(ids.split(","));
- for (String id : idList) {
- Supplier inspectionProject = inspectionProjectService.getById(id);
- inspectionProject.setDelFlag(1);
- inspectionProjectService.updateById(inspectionProject);
- }
- return Result.OK("鎵归噺鍒犻櫎鎴愬姛!");
- }
-
- /**
- * 閫氳繃id鏌ヨ
- *
- * @param id
- * @return
- */
- @ApiOperation(value="渚涘簲鍟�-閫氳繃id鏌ヨ", notes="渚涘簲鍟�-閫氳繃id鏌ヨ")
- @GetMapping(value = "/queryById")
- public Result<Supplier> queryById(@RequestParam(name="id",required=true) String id) {
- Supplier inspectionProject = inspectionProjectService.getById(id);
- if(inspectionProject==null) {
- return Result.error("鏈壘鍒板搴旀暟鎹�");
- }
- return Result.OK(inspectionProject);
- }
-
- /**
- * 瀵煎嚭excel
- *
- * @param request
- * @param inspectionProject
- */
+ * 瀵煎嚭excel
+ *
+ * @param request
+ * @param supplier
+ */
+ //@RequiresPermissions("org.jeecg.modules:base_supplier:exportXls")
@RequestMapping(value = "/exportXls")
- public ModelAndView exportXls(HttpServletRequest request, Supplier inspectionProject) {
- return super.exportXls(request, inspectionProject, Supplier.class, "mom_base_supplier");
+ public ModelAndView exportXls(HttpServletRequest request, Supplier supplier) {
+ return super.exportXls(request, supplier, Supplier.class, "渚涘簲鍟嗙鐞�");
}
/**
- * 閫氳繃excel瀵煎叆鏁版嵁
- *
- * @param request
- * @param response
- * @return
- */
+ * 閫氳繃excel瀵煎叆鏁版嵁
+ *
+ * @param request
+ * @param response
+ * @return
+ */
+ //@RequiresPermissions("base_supplier:importExcel")
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, Supplier.class);
diff --git a/src/main/java/org/jeecg/modules/base/controller/UnitCategoryController.java b/src/main/java/org/jeecg/modules/base/controller/UnitCategoryController.java
deleted file mode 100644
index 6f68ecf..0000000
--- a/src/main/java/org/jeecg/modules/base/controller/UnitCategoryController.java
+++ /dev/null
@@ -1,156 +0,0 @@
-package org.jeecg.modules.base.controller;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import lombok.extern.slf4j.Slf4j;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.base.entity.UnitCategory;
-import org.jeecg.modules.base.service.IUnitCategoryService;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @Title: Controller
- * @Description: 璁￠噺鍗曚綅鍒嗙被琛� 鍓嶇鎺у埗鍣�
- * @Author: cuijian
- * @Date: 2022-10-19
- * @Version: V1.0
- */
-@RestController
-@RequestMapping("/base")
-@Slf4j
-public class UnitCategoryController {
-
- @Resource
- private IUnitCategoryService unitCategoryService;
- /**
- * 鏌ヨ鏁版嵁 鏌ュ嚭璁￠噺鍗曚綅鍒嗙被,骞朵互鏍戠粨鏋勬暟鎹牸寮忓搷搴旂粰鍓嶇
- * @author cj
- * @return
- */
- @GetMapping(value="/getTree")
- public Result<List<UnitCategory>> getTreeList(){
- Result<List<UnitCategory>> resule = new Result<>();
- List<UnitCategory> list = unitCategoryService.lambdaQuery().eq(UnitCategory::getPid, "-1").list();
- if(list.size() == 0){
- UnitCategory unitCategory = new UnitCategory();
- unitCategory.setPid("-1");
- unitCategory.setCode("0");
- unitCategory.setId("0");
- unitCategory.setName("璁￠噺鍗曚綅鍒嗙被");
- unitCategoryService.save(unitCategory);
- }
- List<UnitCategory> treeList = unitCategoryService.getTreeList();
- resule.setResult(treeList);
- return resule;
- }
-
- /**
- * 鏌ヨ鏁版嵁 鏌ュ嚭璁￠噺鍗曚綅鍒嗙被鍜屽垎绫讳笅鐨勮閲忓崟浣�,骞朵互鏍戠粨鏋勬暟鎹牸寮忓搷搴旂粰鍓嶇
- * @author cj
- * @return
- */
- @GetMapping(value="/getUnitTree")
- public Result<List<UnitCategory>> getUnitTreeList(){
- Result<List<UnitCategory>> resule = new Result<>();
- List<UnitCategory> treeList = unitCategoryService.getUnitTreeList();
- resule.setResult(treeList);
- return resule;
- }
-
- /**
- * 鏌ヨ鏁版嵁 鏍规嵁璁￠噺鍗曚綅鍒嗙被,鏌ヨ鍑鸿璁￠噺鍗曚綅涓嬬殑璁￠噺鍗曚綅
- * @author cj
- * @param id
- * @return
- */
- @GetMapping(value="/getList")
- public Result<List<UnitCategory>> getList(@RequestParam String id){
- Result<List<UnitCategory>> resule = new Result<>();
- //id鍓嶇浼犵┖瀛楃涓叉椂锛屾煡璇id涓�-1鐨勬暟鎹繑鍥�
- if (id == "") {
- List<UnitCategory> list = unitCategoryService.lambdaQuery().eq(UnitCategory::getPid, "-1").list();
- if(list.size() == 0){
- UnitCategory unitCategory = new UnitCategory();
- unitCategory.setPid("-1");
- unitCategory.setCode("0");
- unitCategory.setId("0");
- unitCategory.setName("璁￠噺鍗曚綅鍒嗙被");
- unitCategoryService.save(unitCategory);
- }
- LambdaQueryWrapper<UnitCategory> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(UnitCategory::getPid,"-1");
- List<UnitCategory> treeList = unitCategoryService.getList(unitCategoryService.getOne(queryWrapper).getId());
- resule.setResult(treeList);
- }else{
- List<UnitCategory> treeList = unitCategoryService.getList(id);
- resule.setResult(treeList);
- }
- return resule;
- }
-
- /**
- * 澧炲姞鏁版嵁 娣诲姞璁￠噺鍗曚綅鍒嗙被淇℃伅
- * @author cj
- * @param unitCategory
- * @return
- */
- @PostMapping(value = "/add")
- public Result<UnitCategory> add(@RequestBody UnitCategory unitCategory){
- Result<UnitCategory> result = new Result<>();
- try{
- unitCategoryService.saveOrUpdate(unitCategory);
- result.success("鎿嶄綔鎴愬姛");
- }catch (Exception e){
- result.error500("鎿嶄綔澶辫触");
- }
- return result;
- }
-
- /**
- * 鍒犻櫎鏁版嵁 鍒犻櫎閫変腑鐨勮閲忓崟浣�
- * @author cj
- * @param ids
- * @return
- */
- @DeleteMapping(value = "/delete")
- public Result<UnitCategory> deleteCategory(@RequestParam String ids){
- Result<UnitCategory> result = new Result<>();
- if(oConvertUtils.isEmpty(ids)) {
- result.error500("鏈�変腑璁￠噺鍗曚綅鍒嗙被锛�");
- }else {
- String[] ls = ids.split(",");
- List<UnitCategory> list = new ArrayList<>();
- List<Long> idList = new ArrayList<>();
- List<String> nameList = new ArrayList<>();
- for (String id : ls) {
- //鏍规嵁id鏌ヨ鏄惁鏈夊瓙鍒嗙被
- LambdaQueryWrapper<UnitCategory> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(UnitCategory::getPid,id);
- list = unitCategoryService.list(queryWrapper);
- if(list.size()==0){
- idList.add(Long.parseLong(id) );
- }else{
- LambdaQueryWrapper<UnitCategory> queryWrapper1 = new LambdaQueryWrapper<>();
- queryWrapper1.eq(UnitCategory::getId,id);
- nameList.add(unitCategoryService.getOne(queryWrapper1).getCode()+unitCategoryService.getOne(queryWrapper1).getName());
- }
- }
- if (idList.size() > 0) {
- unitCategoryService.removeByIds(idList);
- if (ls.length == idList.size()) {
- result.success("鍒犻櫎鎴愬姛锛�");
- } else {
- result.error500("閮ㄥ垎鍒犻櫎鎴愬姛锛�("+nameList+"涓惈鏈夊瓙鍒嗙被鏃犳硶鍒犻櫎!)");
- }
- }else {
- result.error500("閫夋嫨鐨勮閲忓崟浣嶅垎绫婚兘鍚湁瀛愬垎绫伙紝鏃犳硶鍒犻櫎锛�");
- }
- }
- return result;
- }
-
-}
diff --git a/src/main/java/org/jeecg/modules/base/controller/UnitController.java b/src/main/java/org/jeecg/modules/base/controller/UnitController.java
deleted file mode 100644
index 3c13036..0000000
--- a/src/main/java/org/jeecg/modules/base/controller/UnitController.java
+++ /dev/null
@@ -1,167 +0,0 @@
-package org.jeecg.modules.base.controller;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
-import org.jeecg.common.system.base.controller.JeecgController;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.base.entity.Unit;
-import org.jeecg.modules.base.entity.UnitConversion;
-import org.jeecg.modules.base.service.IUnitConversionService;
-import org.jeecg.modules.base.service.IUnitService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.servlet.ModelAndView;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * @Title: Controller
- * @Description: 璁￠噺鍗曚綅琛� 鍓嶇鎺у埗鍣�
- * @Author: cuijian
- * @Date: 2022-10-26
- * @Version: V1.0
- */
-@RestController
-@RequestMapping("/base/unit")
-@Slf4j
-public class UnitController extends JeecgController<Unit, IUnitService> {
-
- @Autowired
- private IUnitService unitService;
-
-
- /**
- * 鍒嗛〉鍒楄〃鏌ヨ
- *
- * @param
- * @param pageNo
- * @param pageSize
- * @param req
- * @return
- */
-
- @ApiOperation(value = "璁￠噺鍗曚綅-鍒嗛〉鍒楄〃鏌ヨ", notes = "璁￠噺鍗曚綅-鍒嗛〉鍒楄〃鏌ヨ")
- @GetMapping(value = "/list")
- public Result<IPage<Unit>> queryPageList(Unit unit,
- @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
- @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
- HttpServletRequest req) {
- QueryWrapper<Unit> queryWrapper = QueryGenerator.initQueryWrapper(unit, req.getParameterMap());
- Page<Unit> page = new Page<Unit>(pageNo, pageSize);
- IPage<Unit> pageList = unitService.page(page, queryWrapper);
- return Result.OK(pageList);
- }
-
- /**
- * 娣诲姞
- *
- * @param unit
- * @return
- */
- @AutoLog(value = "璁￠噺鍗曚綅-娣诲姞")
- @ApiOperation(value = "璁￠噺鍗曚綅-娣诲姞", notes = "璁￠噺鍗曚綅-娣诲姞")
-
- @PostMapping(value = "/add")
- public Result<String> add(@RequestBody Unit unit) {
- unitService.save(unit);
- return Result.OK("娣诲姞鎴愬姛锛�");
- }
-
- /**
- * 缂栬緫
- *
- * @param unit
- * @return
- */
- @AutoLog(value = "璁￠噺鍗曚綅-缂栬緫")
- @ApiOperation(value = "璁￠噺鍗曚綅-缂栬緫", notes = "璁￠噺鍗曚綅-缂栬緫")
- @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
- public Result<String> edit(@RequestBody Unit unit) {
- unitService.updateById(unit);
- return Result.OK("缂栬緫鎴愬姛!");
- }
-
- /**
- * 閫氳繃id鍒犻櫎
- *
- * @param id
- * @return
- */
- @AutoLog(value = "璁￠噺鍗曚綅-閫氳繃id鍒犻櫎")
- @ApiOperation(value = "璁￠噺鍗曚綅-閫氳繃id鍒犻櫎", notes = "璁￠噺鍗曚綅-閫氳繃id鍒犻櫎")
- @DeleteMapping(value = "/delete")
- public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
- unitService.removeById(id);
- return Result.OK("鍒犻櫎鎴愬姛!");
- }
-
- /**
- * 鎵归噺鍒犻櫎
- *
- * @param ids
- * @return
- */
- @AutoLog(value = "璁￠噺鍗曚綅-鎵归噺鍒犻櫎")
- @ApiOperation(value = "璁￠噺鍗曚綅-鎵归噺鍒犻櫎", notes = "璁￠噺鍗曚綅-鎵归噺鍒犻櫎")
- @DeleteMapping(value = "/deleteBatch")
- public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
- List<String> stringList = Arrays.asList(ids.split(","));
- unitService.removeBatchByIds(stringList);
- return Result.OK("鎵归噺鍒犻櫎鎴愬姛!");
- }
-
- /**
- * 閫氳繃id鏌ヨ
- *
- * @param id
- * @return
- */
- //@AutoLog(value = "绮惧害鍙傛暟-閫氳繃id鏌ヨ")
- @ApiOperation(value = "璁￠噺鍗曚綅-閫氳繃id鏌ヨ", notes = "璁￠噺鍗曚綅-閫氳繃id鏌ヨ")
- @GetMapping(value = "/queryById")
- public Result<Unit> queryById(@RequestParam(name = "id", required = true) String id) {
- Unit unit = unitService.getById(id);
- if (unit == null) {
- return Result.error("鏈壘鍒板搴旀暟鎹�");
- }
- return Result.OK(unit);
- }
-
- /**
- * 瀵煎嚭excel
- *
- * @param request
- * @param unit
- */
-
- @RequestMapping(value = "/exportXls")
- public ModelAndView exportXls(HttpServletRequest request, Unit unit) {
- return super.exportXls(request, unit, Unit.class, "璁￠噺鍗曚綅");
- }
-
- /**
- * 閫氳繃excel瀵煎叆鏁版嵁
- *
- * @param request
- * @param response
- * @return
- */
- @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
- public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
- return super.importExcel(request, response, Unit.class);
- }
-
-
-}
diff --git a/src/main/java/org/jeecg/modules/base/controller/UnitConversionController.java b/src/main/java/org/jeecg/modules/base/controller/UnitConversionController.java
deleted file mode 100644
index ac2c6ea..0000000
--- a/src/main/java/org/jeecg/modules/base/controller/UnitConversionController.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package org.jeecg.modules.base.controller;
-
-import lombok.extern.slf4j.Slf4j;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.base.entity.UnitConversion;
-import org.jeecg.modules.base.service.IUnitConversionService;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * @Title: Controller
- * @Description: 璁￠噺鍗曚綅鎹㈢畻琛� 鍓嶇鎺у埗鍣�
- * @Author: cuijian
- * @Date: 2022-10-26
- * @Version: V1.0
- */
-@RestController
-@RequestMapping("/base/unit/onversion")
-@Slf4j
-public class UnitConversionController {
-
- @Resource
- private IUnitConversionService momUnitConversionService;
- /**
- * 鏌ヨ鏁版嵁 鏍规嵁璁￠噺鍗曚綅id鏌ヨ璁￠噺鍗曚綅鎹㈢畻淇℃伅
- * @author cj
- * @param ids
- * @return
- */
- @GetMapping(value="/getListByUnitId")
- public Result<List<UnitConversion>> getListByUnitId(String ids){
- Result<List<UnitConversion>> resule = new Result<>();
- List<UnitConversion> treeList = momUnitConversionService.getListByUnitId(ids);
- resule.setResult(treeList);
- return resule;
- }
-
- /**
- * 澧炲姞鏁版嵁 娣诲姞璁￠噺鍗曚綅鎹㈢畻淇℃伅
- * @author cj
- * @param unitConversion
- * @return
- */
- @PostMapping(value = "/addMomUnitOnversion")
- public Result<UnitConversion> addMomUnitOnversion(@RequestBody UnitConversion unitConversion){
- Result<UnitConversion> result = new Result<>();
- try{
- momUnitConversionService.saveOrUpdate(unitConversion);
- result.success("鎿嶄綔鎴愬姛");
- }catch (Exception e){
- result.error500("鎿嶄綔澶辫触");
- }
- return result;
- }
-
- /**
- * 鍒犻櫎鏁版嵁 鍒犻櫎閫変腑鐨勮閲忓崟浣嶆崲绠椾俊鎭�
- * @author cj
- * @param ids
- * @return
- */
- @DeleteMapping(value = "/deleteMomUnitOnversion")
- public Result<UnitConversion> deleteMomUnitOnversion(@RequestParam String ids){
- Result<UnitConversion> result = new Result<>();
- if(oConvertUtils.isEmpty(ids)) {
- result.error500("鏈�変腑璁￠噺鍗曚綅鎹㈢畻淇℃伅锛�");
- }else {
- String[] ls = ids.split(",");
- for (String id : ls) {
- if (momUnitConversionService.removeById(id)) {
- result.success("鍒犻櫎鎴愬姛锛�");
- } else {
- result.success("鍒犻櫎澶辫触锛�");
- }
- }
- }
- return result;
- }
-
-}
diff --git a/src/main/java/org/jeecg/modules/base/controller/UserFactoryController.java b/src/main/java/org/jeecg/modules/base/controller/UserFactoryController.java
new file mode 100644
index 0000000..4a7a46b
--- /dev/null
+++ b/src/main/java/org/jeecg/modules/base/controller/UserFactoryController.java
@@ -0,0 +1,177 @@
+package org.jeecg.modules.base.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+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.util.oConvertUtils;
+import org.jeecg.modules.base.entity.UserFactory;
+import org.jeecg.modules.base.service.IUserFactoryService;
+
+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.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+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.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+
+ /**
+ * @Description: 鐢ㄦ埛宸ュ巶/杞﹂棿/浜х嚎鍏崇郴
+ * @Author: jeecg-boot
+ * @Date: 2025-06-24
+ * @Version: V1.0
+ */
+@Api(tags="鐢ㄦ埛宸ュ巶/杞﹂棿/浜х嚎鍏崇郴")
+@RestController
+@RequestMapping("/base/userFactory")
+@Slf4j
+public class UserFactoryController extends JeecgController<UserFactory, IUserFactoryService> {
+ @Autowired
+ private IUserFactoryService userFactoryService;
+
+ /**
+ * 鍒嗛〉鍒楄〃鏌ヨ
+ *
+ * @param userFactory
+ * @param pageNo
+ * @param pageSize
+ * @param req
+ * @return
+ */
+ //@AutoLog(value = "鐢ㄦ埛宸ュ巶/杞﹂棿/浜х嚎鍏崇郴-鍒嗛〉鍒楄〃鏌ヨ")
+ @ApiOperation(value="鐢ㄦ埛宸ュ巶/杞﹂棿/浜х嚎鍏崇郴-鍒嗛〉鍒楄〃鏌ヨ", notes="鐢ㄦ埛宸ュ巶/杞﹂棿/浜х嚎鍏崇郴-鍒嗛〉鍒楄〃鏌ヨ")
+ @GetMapping(value = "/list")
+ public Result<IPage<UserFactory>> queryPageList(UserFactory userFactory,
+ @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+ @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+ HttpServletRequest req) {
+ QueryWrapper<UserFactory> queryWrapper = QueryGenerator.initQueryWrapper(userFactory, req.getParameterMap());
+ Page<UserFactory> page = new Page<UserFactory>(pageNo, pageSize);
+ IPage<UserFactory> pageList = userFactoryService.page(page, queryWrapper);
+ return Result.OK(pageList);
+ }
+
+ /**
+ * 娣诲姞
+ *
+ * @param userFactory
+ * @return
+ */
+ @AutoLog(value = "鐢ㄦ埛宸ュ巶/杞﹂棿/浜х嚎鍏崇郴-娣诲姞")
+ @ApiOperation(value="鐢ㄦ埛宸ュ巶/杞﹂棿/浜х嚎鍏崇郴-娣诲姞", notes="鐢ㄦ埛宸ュ巶/杞﹂棿/浜х嚎鍏崇郴-娣诲姞")
+ //@RequiresPermissions("org.jeecg.modules:base_user_factory:add")
+ @PostMapping(value = "/add")
+ public Result<String> add(@RequestBody UserFactory userFactory) {
+ userFactoryService.save(userFactory);
+ return Result.OK("娣诲姞鎴愬姛锛�");
+ }
+
+ /**
+ * 缂栬緫
+ *
+ * @param userFactory
+ * @return
+ */
+ @AutoLog(value = "鐢ㄦ埛宸ュ巶/杞﹂棿/浜х嚎鍏崇郴-缂栬緫")
+ @ApiOperation(value="鐢ㄦ埛宸ュ巶/杞﹂棿/浜х嚎鍏崇郴-缂栬緫", notes="鐢ㄦ埛宸ュ巶/杞﹂棿/浜х嚎鍏崇郴-缂栬緫")
+ //@RequiresPermissions("org.jeecg.modules:base_user_factory:edit")
+ @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+ public Result<String> edit(@RequestBody UserFactory userFactory) {
+ userFactoryService.updateById(userFactory);
+ return Result.OK("缂栬緫鎴愬姛!");
+ }
+
+ /**
+ * 閫氳繃id鍒犻櫎
+ *
+ * @param id
+ * @return
+ */
+ @AutoLog(value = "鐢ㄦ埛宸ュ巶/杞﹂棿/浜х嚎鍏崇郴-閫氳繃id鍒犻櫎")
+ @ApiOperation(value="鐢ㄦ埛宸ュ巶/杞﹂棿/浜х嚎鍏崇郴-閫氳繃id鍒犻櫎", notes="鐢ㄦ埛宸ュ巶/杞﹂棿/浜х嚎鍏崇郴-閫氳繃id鍒犻櫎")
+ //@RequiresPermissions("org.jeecg.modules:base_user_factory:delete")
+ @DeleteMapping(value = "/delete")
+ public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+ userFactoryService.removeById(id);
+ return Result.OK("鍒犻櫎鎴愬姛!");
+ }
+
+ /**
+ * 鎵归噺鍒犻櫎
+ *
+ * @param ids
+ * @return
+ */
+ @AutoLog(value = "鐢ㄦ埛宸ュ巶/杞﹂棿/浜х嚎鍏崇郴-鎵归噺鍒犻櫎")
+ @ApiOperation(value="鐢ㄦ埛宸ュ巶/杞﹂棿/浜х嚎鍏崇郴-鎵归噺鍒犻櫎", notes="鐢ㄦ埛宸ュ巶/杞﹂棿/浜х嚎鍏崇郴-鎵归噺鍒犻櫎")
+ //@RequiresPermissions("org.jeecg.modules:base_user_factory:deleteBatch")
+ @DeleteMapping(value = "/deleteBatch")
+ public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+ this.userFactoryService.removeByIds(Arrays.asList(ids.split(",")));
+ return Result.OK("鎵归噺鍒犻櫎鎴愬姛!");
+ }
+
+ /**
+ * 閫氳繃id鏌ヨ
+ *
+ * @param id
+ * @return
+ */
+ //@AutoLog(value = "鐢ㄦ埛宸ュ巶/杞﹂棿/浜х嚎鍏崇郴-閫氳繃id鏌ヨ")
+ @ApiOperation(value="鐢ㄦ埛宸ュ巶/杞﹂棿/浜х嚎鍏崇郴-閫氳繃id鏌ヨ", notes="鐢ㄦ埛宸ュ巶/杞﹂棿/浜х嚎鍏崇郴-閫氳繃id鏌ヨ")
+ @GetMapping(value = "/queryById")
+ public Result<UserFactory> queryById(@RequestParam(name="id",required=true) String id) {
+ UserFactory userFactory = userFactoryService.getById(id);
+ if(userFactory==null) {
+ return Result.error("鏈壘鍒板搴旀暟鎹�");
+ }
+ return Result.OK(userFactory);
+ }
+
+ /**
+ * 瀵煎嚭excel
+ *
+ * @param request
+ * @param userFactory
+ */
+ //@RequiresPermissions("org.jeecg.modules:base_user_factory:exportXls")
+ @RequestMapping(value = "/exportXls")
+ public ModelAndView exportXls(HttpServletRequest request, UserFactory userFactory) {
+ return super.exportXls(request, userFactory, UserFactory.class, "鐢ㄦ埛宸ュ巶/杞﹂棿/浜х嚎鍏崇郴");
+ }
+
+ /**
+ * 閫氳繃excel瀵煎叆鏁版嵁
+ *
+ * @param request
+ * @param response
+ * @return
+ */
+ //@RequiresPermissions("base_user_factory:importExcel")
+ @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+ public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+ return super.importExcel(request, response, UserFactory.class);
+ }
+
+}
diff --git a/src/main/java/org/jeecg/modules/base/controller/UserGroupController.java b/src/main/java/org/jeecg/modules/base/controller/UserGroupController.java
new file mode 100644
index 0000000..4006b26
--- /dev/null
+++ b/src/main/java/org/jeecg/modules/base/controller/UserGroupController.java
@@ -0,0 +1,177 @@
+package org.jeecg.modules.base.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+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.util.oConvertUtils;
+import org.jeecg.modules.base.entity.UserGroup;
+import org.jeecg.modules.base.service.IUserGroupService;
+
+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.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+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.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+
+ /**
+ * @Description: 鐝粍
+ * @Author: jeecg-boot
+ * @Date: 2025-06-24
+ * @Version: V1.0
+ */
+@Api(tags="鐝粍")
+@RestController
+@RequestMapping("/base/userGroup")
+@Slf4j
+public class UserGroupController extends JeecgController<UserGroup, IUserGroupService> {
+ @Autowired
+ private IUserGroupService userGroupService;
+
+ /**
+ * 鍒嗛〉鍒楄〃鏌ヨ
+ *
+ * @param userGroup
+ * @param pageNo
+ * @param pageSize
+ * @param req
+ * @return
+ */
+ //@AutoLog(value = "鐝粍-鍒嗛〉鍒楄〃鏌ヨ")
+ @ApiOperation(value="鐝粍-鍒嗛〉鍒楄〃鏌ヨ", notes="鐝粍-鍒嗛〉鍒楄〃鏌ヨ")
+ @GetMapping(value = "/list")
+ public Result<IPage<UserGroup>> queryPageList(UserGroup userGroup,
+ @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+ @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+ HttpServletRequest req) {
+ QueryWrapper<UserGroup> queryWrapper = QueryGenerator.initQueryWrapper(userGroup, req.getParameterMap());
+ Page<UserGroup> page = new Page<UserGroup>(pageNo, pageSize);
+ IPage<UserGroup> pageList = userGroupService.page(page, queryWrapper);
+ return Result.OK(pageList);
+ }
+
+ /**
+ * 娣诲姞
+ *
+ * @param userGroup
+ * @return
+ */
+ @AutoLog(value = "鐝粍-娣诲姞")
+ @ApiOperation(value="鐝粍-娣诲姞", notes="鐝粍-娣诲姞")
+ //@RequiresPermissions("org.jeecg.modules:base_user_group:add")
+ @PostMapping(value = "/add")
+ public Result<String> add(@RequestBody UserGroup userGroup) {
+ userGroupService.save(userGroup);
+ return Result.OK("娣诲姞鎴愬姛锛�");
+ }
+
+ /**
+ * 缂栬緫
+ *
+ * @param userGroup
+ * @return
+ */
+ @AutoLog(value = "鐝粍-缂栬緫")
+ @ApiOperation(value="鐝粍-缂栬緫", notes="鐝粍-缂栬緫")
+ //@RequiresPermissions("org.jeecg.modules:base_user_group:edit")
+ @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+ public Result<String> edit(@RequestBody UserGroup userGroup) {
+ userGroupService.updateById(userGroup);
+ return Result.OK("缂栬緫鎴愬姛!");
+ }
+
+ /**
+ * 閫氳繃id鍒犻櫎
+ *
+ * @param id
+ * @return
+ */
+ @AutoLog(value = "鐝粍-閫氳繃id鍒犻櫎")
+ @ApiOperation(value="鐝粍-閫氳繃id鍒犻櫎", notes="鐝粍-閫氳繃id鍒犻櫎")
+ //@RequiresPermissions("org.jeecg.modules:base_user_group:delete")
+ @DeleteMapping(value = "/delete")
+ public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+ userGroupService.removeById(id);
+ return Result.OK("鍒犻櫎鎴愬姛!");
+ }
+
+ /**
+ * 鎵归噺鍒犻櫎
+ *
+ * @param ids
+ * @return
+ */
+ @AutoLog(value = "鐝粍-鎵归噺鍒犻櫎")
+ @ApiOperation(value="鐝粍-鎵归噺鍒犻櫎", notes="鐝粍-鎵归噺鍒犻櫎")
+ //@RequiresPermissions("org.jeecg.modules:base_user_group:deleteBatch")
+ @DeleteMapping(value = "/deleteBatch")
+ public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+ this.userGroupService.removeByIds(Arrays.asList(ids.split(",")));
+ return Result.OK("鎵归噺鍒犻櫎鎴愬姛!");
+ }
+
+ /**
+ * 閫氳繃id鏌ヨ
+ *
+ * @param id
+ * @return
+ */
+ //@AutoLog(value = "鐝粍-閫氳繃id鏌ヨ")
+ @ApiOperation(value="鐝粍-閫氳繃id鏌ヨ", notes="鐝粍-閫氳繃id鏌ヨ")
+ @GetMapping(value = "/queryById")
+ public Result<UserGroup> queryById(@RequestParam(name="id",required=true) String id) {
+ UserGroup userGroup = userGroupService.getById(id);
+ if(userGroup==null) {
+ return Result.error("鏈壘鍒板搴旀暟鎹�");
+ }
+ return Result.OK(userGroup);
+ }
+
+ /**
+ * 瀵煎嚭excel
+ *
+ * @param request
+ * @param userGroup
+ */
+ //@RequiresPermissions("org.jeecg.modules:base_user_group:exportXls")
+ @RequestMapping(value = "/exportXls")
+ public ModelAndView exportXls(HttpServletRequest request, UserGroup userGroup) {
+ return super.exportXls(request, userGroup, UserGroup.class, "鐝粍");
+ }
+
+ /**
+ * 閫氳繃excel瀵煎叆鏁版嵁
+ *
+ * @param request
+ * @param response
+ * @return
+ */
+ //@RequiresPermissions("base_user_group:importExcel")
+ @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+ public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+ return super.importExcel(request, response, UserGroup.class);
+ }
+
+}
diff --git a/src/main/java/org/jeecg/modules/base/controller/WarehouseAreaController.java b/src/main/java/org/jeecg/modules/base/controller/WarehouseAreaController.java
deleted file mode 100644
index b197fcd..0000000
--- a/src/main/java/org/jeecg/modules/base/controller/WarehouseAreaController.java
+++ /dev/null
@@ -1,188 +0,0 @@
-package org.jeecg.modules.base.controller;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-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.util.oConvertUtils;
-import org.jeecg.modules.base.entity.WarehouseArea;
-import org.jeecg.modules.base.entity.WarehouseLocation;
-import org.jeecg.modules.base.service.IWarehouseAreaService;
-
-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.modules.base.service.IWarehouseLocationService;
-import org.jeecgframework.poi.excel.ExcelImportUtil;
-import org.jeecgframework.poi.excel.def.NormalExcelConstants;
-import org.jeecgframework.poi.excel.entity.ExportParams;
-import org.jeecgframework.poi.excel.entity.ImportParams;
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
-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.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
-import org.springframework.web.servlet.ModelAndView;
-import com.alibaba.fastjson.JSON;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.jeecg.common.aspect.annotation.AutoLog;
-
- /**
- * @Description: mom_base_warehouse_area
- * @Author: jeecg-boot
- * @Date: 2023-07-06
- * @Version: V1.0
- */
-@Api(tags="mom_base_warehouse_area")
-@RestController
-@RequestMapping("/base/warehouseArea")
-@Slf4j
-public class WarehouseAreaController extends JeecgController<WarehouseArea, IWarehouseAreaService> {
- @Autowired
- private IWarehouseAreaService warehouseAreaService;
-
- @Autowired
- private IWarehouseLocationService warehouseLocationService;
-
- /**
- * 鍒嗛〉鍒楄〃鏌ヨ
- *
- * @param warehouseArea
- * @param pageNo
- * @param pageSize
- * @param req
- * @return
- */
- //@AutoLog(value = "mom_base_warehouse_area-鍒嗛〉鍒楄〃鏌ヨ")
- @ApiOperation(value="mom_base_warehouse_area-鍒嗛〉鍒楄〃鏌ヨ", notes="mom_base_warehouse_area-鍒嗛〉鍒楄〃鏌ヨ")
- @GetMapping(value = "/list")
- public Result<IPage<WarehouseArea>> queryPageList(WarehouseArea warehouseArea,
- @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
- @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
- HttpServletRequest req) {
- QueryWrapper<WarehouseArea> queryWrapper = QueryGenerator.initQueryWrapper(warehouseArea, req.getParameterMap());
- Page<WarehouseArea> page = new Page<WarehouseArea>(pageNo, pageSize);
- IPage<WarehouseArea> pageList = warehouseAreaService.page(page, queryWrapper);
- return Result.OK(pageList);
- }
-
- /**
- * 娣诲姞
- *
- * @param warehouseArea
- * @return
- */
- @AutoLog(value = "mom_base_warehouse_area-娣诲姞")
- @ApiOperation(value="mom_base_warehouse_area-娣诲姞", notes="mom_base_warehouse_area-娣诲姞")
- //@RequiresPermissions("org.jeecg.modules:mom_base_warehouse_area:add")
- @PostMapping(value = "/add")
- public Result<String> add(@RequestBody WarehouseArea warehouseArea) {
- warehouseAreaService.save(warehouseArea);
- return Result.OK("娣诲姞鎴愬姛锛�");
- }
-
- /**
- * 缂栬緫
- *
- * @param warehouseArea
- * @return
- */
- @AutoLog(value = "mom_base_warehouse_area-缂栬緫")
- @ApiOperation(value="mom_base_warehouse_area-缂栬緫", notes="mom_base_warehouse_area-缂栬緫")
- //@RequiresPermissions("org.jeecg.modules:mom_base_warehouse_area:edit")
- @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
- public Result<String> edit(@RequestBody WarehouseArea warehouseArea) {
- warehouseAreaService.updateById(warehouseArea);
- return Result.OK("缂栬緫鎴愬姛!");
- }
-
- /**
- * 閫氳繃id鍒犻櫎
- *
- * @param id
- * @return
- */
- @AutoLog(value = "mom_base_warehouse_area-閫氳繃id鍒犻櫎")
- @ApiOperation(value="mom_base_warehouse_area-閫氳繃id鍒犻櫎", notes="mom_base_warehouse_area-閫氳繃id鍒犻櫎")
- //@RequiresPermissions("org.jeecg.modules:mom_base_warehouse_area:delete")
- @DeleteMapping(value = "/delete")
- public Result<String> delete(@RequestParam(name="id",required=true) String id) {
- List<WarehouseLocation> warehouseLocations = warehouseLocationService.lambdaQuery()
- .eq(WarehouseLocation::getWarehouseAreaId, id).eq(WarehouseLocation::getDelFlag, 0)
- .list();
- for (WarehouseLocation warehouseLocation : warehouseLocations) {
- warehouseLocationService.removeById(warehouseLocation);
- }
- warehouseAreaService.removeById(id);
- return Result.OK("鍒犻櫎鎴愬姛!");
- }
-
- /**
- * 鎵归噺鍒犻櫎
- *
- * @param ids
- * @return
- */
- @AutoLog(value = "mom_base_warehouse_area-鎵归噺鍒犻櫎")
- @ApiOperation(value="mom_base_warehouse_area-鎵归噺鍒犻櫎", notes="mom_base_warehouse_area-鎵归噺鍒犻櫎")
- //@RequiresPermissions("org.jeecg.modules:mom_base_warehouse_area:deleteBatch")
- @DeleteMapping(value = "/deleteBatch")
- public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
- this.warehouseAreaService.removeByIds(Arrays.asList(ids.split(",")));
- return Result.OK("鎵归噺鍒犻櫎鎴愬姛!");
- }
-
- /**
- * 閫氳繃id鏌ヨ
- *
- * @param id
- * @return
- */
- //@AutoLog(value = "mom_base_warehouse_area-閫氳繃id鏌ヨ")
- @ApiOperation(value="mom_base_warehouse_area-閫氳繃id鏌ヨ", notes="mom_base_warehouse_area-閫氳繃id鏌ヨ")
- @GetMapping(value = "/queryById")
- public Result<WarehouseArea> queryById(@RequestParam(name="id",required=true) String id) {
- WarehouseArea warehouseArea = warehouseAreaService.getById(id);
- if(warehouseArea==null) {
- return Result.error("鏈壘鍒板搴旀暟鎹�");
- }
- return Result.OK(warehouseArea);
- }
-
- /**
- * 瀵煎嚭excel
- *
- * @param request
- * @param warehouseArea
- */
- //@RequiresPermissions("org.jeecg.modules:mom_base_warehouse_area:exportXls")
- @RequestMapping(value = "/exportXls")
- public ModelAndView exportXls(HttpServletRequest request, WarehouseArea warehouseArea) {
- return super.exportXls(request, warehouseArea, WarehouseArea.class, "mom_base_warehouse_area");
- }
-
- /**
- * 閫氳繃excel瀵煎叆鏁版嵁
- *
- * @param request
- * @param response
- * @return
- */
- //@RequiresPermissions("mom_base_warehouse_area:importExcel")
- @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
- public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
- return super.importExcel(request, response, WarehouseArea.class);
- }
-
-}
diff --git a/src/main/java/org/jeecg/modules/base/controller/WarehouseController.java b/src/main/java/org/jeecg/modules/base/controller/WarehouseController.java
deleted file mode 100644
index bcd84b9..0000000
--- a/src/main/java/org/jeecg/modules/base/controller/WarehouseController.java
+++ /dev/null
@@ -1,772 +0,0 @@
-package org.jeecg.modules.base.controller;//package org.jeecg.modules.base.controller;
-//
-//import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-//import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-//import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
-//import com.baomidou.mybatisplus.core.toolkit.StringUtils;
-//import org.jeecg.common.system.query.QueryGenerator;
-//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.jeecg.common.api.vo.Result;
-//import org.jeecg.modules.base.entity.*;
-//import org.jeecg.modules.base.service.*;
-//import org.jeecg.modules.quartz.entity.QuartzJob;
-//import org.jeecg.modules.quartz.service.IQuartzJobService;
-//import org.jeecg.common.system.base.entity.DataVersion;
-//import org.jeecg.modules.system.service.IDataVersionService;
-//import org.jeecg.modules.system.service.ISysUserService;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.transaction.annotation.Transactional;
-//import org.springframework.web.bind.annotation.*;
-//import javax.servlet.http.HttpServletRequest;
-//import javax.servlet.http.HttpServletResponse;
-//import org.springframework.web.servlet.ModelAndView;
-//
-//import java.text.ParseException;
-//import java.time.LocalDateTime;
-//import java.time.format.DateTimeFormatter;
-//import java.util.*;
-//
-//import org.jeecg.common.util.oConvertUtils;
-//import io.swagger.annotations.Api;
-//import io.swagger.annotations.ApiOperation;
-//import org.jeecg.common.aspect.annotation.AutoLog;
-//import org.apache.shiro.SecurityUtils;
-//import org.jeecg.common.system.vo.LoginUser;
-//import org.jeecgframework.poi.excel.ExcelImportUtil;
-//import org.jeecgframework.poi.excel.def.NormalExcelConstants;
-//import org.jeecgframework.poi.excel.entity.ExportParams;
-//import org.jeecgframework.poi.excel.entity.ImportParams;
-//import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
-//import org.springframework.web.multipart.MultipartFile;
-//import org.springframework.web.multipart.MultipartHttpServletRequest;
-//import java.io.IOException;
-//import java.util.stream.Collectors;
-//
-// /**
-// * @Description: 浠撳簱
-// * @Author: jeecg-boot
-// * @Date: 2022-11-07
-// * @Version: V1.0
-// */
-//@Api(tags="浠撳簱绠＄悊")
-//@RestController
-// @RequestMapping("/base/warehouse")
-//@Slf4j
-//public class WarehouseController extends JeecgController<Warehouse, IWarehouseService> {
-//
-// @Autowired
-// private IWarehouseService warehouseService;
-//
-// @Autowired
-// private IWarehouseClientService warehouseClientService;
-//
-// @Autowired
-// private IEnterpriseService enterpriseService;
-//
-// @Autowired
-// private ISysUserService sysUserService;
-//
-// @Autowired
-// private IDataVersionService dataVersionService;
-//
-// @Autowired
-// private IQuartzJobService quartzJobService;
-//
-// @Autowired
-// private IWarehouseAreaService warehouseAreaService;
-//
-// @Autowired
-// private IWarehouseLocationService warehouseLocationService;
-//
-//
-// /*---------------------------------涓昏〃澶勭悊-begin-------------------------------------*/
-// /**
-// * 鑾峰彇鍒濆淇℃伅
-// *
-// *
-// */
-// @GetMapping("/getWarehouseInfo")
-// public Result<?> getFactoryInfo(){
-// Map<String,Object> infoMap = new HashMap<>(2);
-// LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-//// infoMap.put("enterpriseId",loginUser.getEnterpriseId());
-//// infoMap.put("version",warehouseService.getInitVersion());
-// return Result.OK(infoMap);
-// }
-// /**
-// * 琛ㄥ崟鏍￠獙
-// */
-// @GetMapping("/check")
-// public Result<?> check(@RequestParam(name="name",required = false) String name,
-// @RequestParam(name="enterpriseId",required = false) String enterpriseId,
-// @RequestParam(name="version",required = false) Integer version
-// ){
-// QueryWrapper<Warehouse> queryWrapper = new QueryWrapper<>();
-// if(!StringUtils.isBlank(name)){
-// queryWrapper.eq("name",name);
-// }
-// if(!StringUtils.isBlank(enterpriseId)){
-// queryWrapper.eq("enterprise_id",enterpriseId);
-// }
-// if(version!=null){
-// queryWrapper.eq("version",version);
-// }
-// queryWrapper.eq("del_flag","0");
-// return Result.OK(warehouseService.list(queryWrapper));
-// }
-// /**
-// * 鍒嗛〉鍒楄〃鏌ヨ
-// * @param map
-// * @param pageNo
-// * @param pageSize
-// * @param version
-// * @param enterpriseId
-// * @return
-// */
-// //@AutoLog(value = "浠撳簱-鍒嗛〉鍒楄〃鏌ヨ")
-// @ApiOperation(value="浠撳簱-鍒嗛〉鍒楄〃鏌ヨ", notes="浠撳簱-鍒嗛〉鍒楄〃鏌ヨ")
-// @GetMapping("/list")
-// public Result<?> list(Map map,
-// @RequestParam(name ="pageNo", defaultValue="1") Integer pageNo,
-// @RequestParam(name ="pageSize", defaultValue="10") Integer pageSize,
-// @RequestParam(name = "enterpriseId",required = false) String enterpriseId,
-// @RequestParam(name="version",required = false) Integer version){
-// Page<Map<String,Object>> page = new Page(pageNo, pageSize);
-// IPage<Map<String,Object>> pageList = warehouseService.getWarehouseList(page,version,enterpriseId);
-// return Result.OK(pageList);
-// }
-// /**
-// * 鑾峰彇褰撳墠鐢熸晥鐗堟湰鍜屼笂涓�娆＄敓鏁堢増鏈殑鐗堟湰鍙�
-// *
-// * @return
-// */
-// @GetMapping("/getNowAndLastUsableVersion")
-// public Result<?> getNowAndLastUsableVersion(){
-// return Result.OK(warehouseService.getNowAndLastUsableVersion());
-// }
-// /**
-// * 鑾峰彇鎵�鏈夌増鏈彿
-// *
-// *
-// */
-// @GetMapping("/getVersionList")
-// public Result<?> getAllVersion(){
-// return Result.OK(warehouseService.getVersionList());
-// }
-// /**
-// * 鏍规嵁鐗堟湰鑾峰彇鐗堟湰鍙�
-// * @param version
-// * @return
-// *
-// */
-// @GetMapping("/getVersionStatusByVersion")
-// public Result<?> getVersionStatusByVersion(@RequestParam(value = "version",required = false) Integer version){
-// return Result.OK(warehouseService.getVersionStatusByVersion(version));
-// }
-// /**
-// *
-// * 鏌ヨ鐗堟湰鏄惁涓哄巻鍙茬増鏈�
-// *
-// */
-// @GetMapping(value = "/getUpdateVersionPermission")
-// public Result<?> getUpdatePermission(@RequestParam("version") Integer version){
-// List<String> usableEnterpriseIds = enterpriseService.getUsableIdList();
-// return Result.OK(warehouseService.list(new QueryWrapper<Warehouse>()
-// .in("enterprise_id",usableEnterpriseIds)
-// .eq("version",version)
-// .eq("del_flag",0)));
-// }
-// /**
-// *
-// * 鏌ュ綋鍓嶇敓鏁堜紒涓氫笅鏈夋棤浠撳簱鍘嗗彶鐗堟湰
-// *
-// */
-// @GetMapping(value = "/getNewVersionPermission")
-// public Result<?> getNewVersionPermission(){
-// List<String> usableEnterpriseIds = enterpriseService.getUsableIdList();
-// return Result.OK(warehouseService.list(new QueryWrapper<Warehouse>().in("enterprise_id",usableEnterpriseIds).eq("del_flag",0)));
-// }
-// /**
-// * 缁存姢鍗囩増
-// * 闇�瑕佷竴娆″畬鎴�
-// * @param
-// * @return
-// */
-// @PostMapping("/updateVersionForChange")
-// @Transactional
-// public Result<?> updateVersionForChange(){
-// Set<Integer> set = warehouseService.getVersionList();
-// return Result.OK(set.stream().findFirst().get()+1);
-// }
-// /**
-// * 娣诲姞
-// * @param map
-// * @return
-// */
-// @AutoLog(value = "浠撳簱-娣诲姞")
-// @ApiOperation(value="浠撳簱-娣诲姞", notes="浠撳簱-娣诲姞")
-// //@RequiresPermissions("org.jeecg.modules.demo:mom_base_warehouse:add")
-// @PostMapping(value = "/add")
-// public Result<String> add(@RequestBody Map<String,Object> map) {
-// Warehouse warehouse = new Warehouse();
-// warehouse.setCode(String.valueOf(map.get("code")))
-// .setName(String.valueOf(map.get("name")))
-// .setVersion(Integer.parseInt(String.valueOf(map.get("version"))))
-// .setEnterpriseId(String.valueOf(map.get("enterpriseId")))
-// .setRemark(String.valueOf(map.get("remark")))
-// .setStatus(String.valueOf(map.get("status")))
-// .setDelFlag(0);
-// warehouseService.save(warehouse);
-// QueryWrapper<Warehouse> queryWrapper = new QueryWrapper<Warehouse>()
-// .eq("code",warehouse.getCode())
-// .eq("version",warehouse.getVersion())
-// .eq("del_flag",0);
-// Warehouse selectWarehouse = warehouseService.getOne(queryWrapper,true);
-// DataVersion dataVersion = new DataVersion();
-// dataVersion.setBusinessId(selectWarehouse.getId())
-// .setBusinessType("浠撳簱绠＄悊")
-// .setVersion(selectWarehouse.getVersion())
-// .setVersionStatus(String.valueOf(map.get("versionStatus")))
-// .setDelFlag(0)
-// .setEffectiveType("0")
-// .setIsLastUsable("0");
-// dataVersionService.save(dataVersion);
-// QueryWrapper<DataVersion> queryWrapper1 = new QueryWrapper<DataVersion>()
-// .eq("business_id",selectWarehouse.getId()).eq("del_flag",0);
-// DataVersion selectDataVersion = dataVersionService.getOne(queryWrapper1,true);
-// selectWarehouse.setDataVersionId(selectDataVersion.getId());
-// warehouseService.saveOrUpdate(selectWarehouse);
-// return Result.OK("娣诲姞鎴愬姛锛�");
-// }
-// /**
-// * 鍗囩増
-// * 闇�瑕佷竴娆″畬鎴�
-// * @param map
-// * @param
-// * @return
-// */
-// @PostMapping("/updateVersion")
-// @Transactional
-// public Result<?> updateVersion(@RequestBody Map<String,Object> map){
-// Integer version = Integer.parseInt((String)map.get("version"));
-// //鑾峰彇鍗囩増鏁版嵁
-// List<Warehouse> list = warehouseService.list(new QueryWrapper<Warehouse>()
-// .eq("version",version)
-// .eq("del_flag",0));
-// //鑾峰彇鍗囩増鏁版嵁鐨勭増鏈俊鎭�
-// QueryWrapper<DataVersion> queryWrapper = new QueryWrapper<DataVersion>()
-// .in("business_id", list.stream().map(Warehouse::getId).collect(Collectors.toList()))
-// .eq("del_flag",0);
-// List<DataVersion> dataVersionList = dataVersionService.list(queryWrapper);
-// Set<Integer> set = warehouseService.getVersionList();
-// Optional<Integer> maxVersion = set.stream().findFirst();
-// list.stream().forEach(warehouse -> {
-// warehouse.setId("");
-// warehouse.setVersion(maxVersion.get()+1);
-// });
-// warehouseService.saveBatch(list);
-// List<Warehouse> newList = warehouseService
-// .list(new QueryWrapper<Warehouse>()
-// .eq("version",maxVersion.get()+1));
-// List<DataVersion> newDataVersionList = new ArrayList<>();
-// for(int i=0;i<newList.size();i++){
-// DataVersion dataVersion = new DataVersion();
-// for(int j=0;j<list.size();j++){
-// for(int k=0;k<dataVersionList.size();k++){
-// if(list.get(j).getCode().equals(newList.get(i).getCode())
-// &&list.get(j).getDataVersionId().equals(dataVersionList.get(k).getId())) {
-// dataVersion
-// .setVersion(maxVersion.get() + 1)
-// .setVersionStatus("1")
-// .setBusinessId(newList.get(i).getId())
-// .setDelFlag(0)
-// .setSourceVersionId(dataVersionList.get(k).getId())
-// .setBusinessType("浠撳簱绠＄悊")
-// .setIsLastUsable("0");
-// }
-// }
-// }
-// newDataVersionList.add(dataVersion);
-// }
-// dataVersionService.saveBatch(newDataVersionList);
-// List<String> dataVersionBusinessIdList = newDataVersionList.stream().map(DataVersion::getBusinessId).collect(Collectors.toList());
-// QueryWrapper<DataVersion> queryWrapper1 = new QueryWrapper<DataVersion>().in("business_id",dataVersionBusinessIdList).eq("del_flag",0);
-// List<DataVersion> selectDataVersionList = dataVersionService.list(queryWrapper1);
-// for(int i=0;i<newList.size();i++){
-// for(int j=0;j<selectDataVersionList.size();j++){
-// if(newList.get(i).getId().equals(selectDataVersionList.get(j).getBusinessId())){
-// newList.get(i).setDataVersionId(selectDataVersionList.get(j).getId());
-// }
-// }
-// }
-// warehouseService.updateBatchById(newList);
-// return Result.OK(maxVersion.get()+1);
-// }
-// /**
-// * 鐢熸晥
-// * 闇�瑕佷竴娆℃�у畬鎴�
-// * @param
-// * @param map
-// * @return
-// */
-// @PostMapping("/updateVersionStatusToUsable")
-// @Transactional
-// public Result<?> updateVersionStatusToUsable(@RequestBody Map<String,Object> map){
-// Date date = new Date(System.currentTimeMillis());
-// QuartzJob quartzJob = quartzJobService.getOne(new QueryWrapper<QuartzJob>()
-// .eq("job_class_name","org.jeecg.modules.quartz.job.WarehouseSetUsableJob"),true);
-// if(ObjectUtils.isNotNull(quartzJob)){
-// quartzJobService.deleteAndStopJob(quartzJob);
-// }
-// Integer version = Integer.parseInt((String)map.get("version"));
-// //鑾峰彇涓婃鐢熸晥鐗堟湰骞跺皢鍏舵槸鍚︿笂娆＄敓鏁堜綅缃疆涓哄惁
-// List<Warehouse> lastUsableList = warehouseService.getLastUsableList();
-// if(CollectionUtils.isNotEmpty(lastUsableList)){
-// QueryWrapper<DataVersion> queryWrapper2 = new QueryWrapper<DataVersion>()
-// .in("business_id",lastUsableList.stream()
-// .map(Warehouse::getId)
-// .collect(Collectors.toList()));
-// List<DataVersion> lastUsableVersionList = dataVersionService.list(queryWrapper2);
-// lastUsableVersionList.stream().forEach(dataVersion -> {
-// dataVersion
-// .setIsLastUsable("0");
-// });
-// dataVersionService.updateBatchById(lastUsableVersionList);
-// }
-// //鑾峰彇鐢熸晥鐗堟湰鍙婄増鏈俊鎭苟灏嗗叾缃负澶辨晥
-// List<Warehouse> usableList = warehouseService.getUsableList();
-// if(CollectionUtils.isNotEmpty(usableList)){
-// QueryWrapper<DataVersion> queryWrapper = new QueryWrapper<DataVersion>()
-// .in("business_id",usableList.stream()
-// .map(Warehouse::getId)
-// .collect(Collectors.toList()));
-// List<DataVersion> usableDataVersionList = dataVersionService.list(queryWrapper);
-// usableDataVersionList.stream().forEach(dataVersion -> {
-// dataVersion
-// .setVersionStatus("3")
-// .setIsLastUsable("1")
-// .setExpiredTime(date);
-// });
-// dataVersionService.updateBatchById(usableDataVersionList);
-// }
-// //鑾峰彇寰呯敓鏁堢増鏈強鐗堟湰淇℃伅骞跺皢鍏剁疆涓虹敓鏁�
-// QueryWrapper<DataVersion> queryWrapper1 = new QueryWrapper<DataVersion>()
-// .in("business_id",warehouseService.list(new QueryWrapper<Warehouse>()
-// .eq("version",version)
-// .eq("del_flag",0))
-// .stream().map(Warehouse::getId)
-// .collect(Collectors.toList()));
-// List<DataVersion> dataVersionList = dataVersionService.list(queryWrapper1);
-// dataVersionList.stream().forEach(dataVersion -> {
-// dataVersion.setVersionStatus("2")
-// .setEffectiveType("2")
-// .setEffectiveTime(date)
-// .setIsLastUsable("0");
-// });
-// //瀛樺叆鏁版嵁搴�
-// dataVersionService.updateBatchById(dataVersionList);
-// return Result.OK("鐢熸晥鎴愬姛");
-// }
-// /**
-// * 瀹氭椂鐢熸晥
-// * 闇�瑕佷竴娆℃�у畬鎴�
-// * @param quartzJob
-// * @param
-// * @return
-// */
-// @PostMapping("/updateVersionStatusToUsableBySetTime")
-// @Transactional
-// public Result<?> updateVersionStatusToUsableBySetTime(@RequestBody QuartzJob quartzJob) throws ParseException {
-// DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-// DateTimeFormatter dateTimeFormatter1 = DateTimeFormatter.ofPattern("ss mm HH dd MM ? yyyy");
-// String jobClassName = quartzJob.getJobClassName();
-// String time = quartzJob.getCronExpression();
-// System.out.println(time);
-// LocalDateTime localDateTime = LocalDateTime.parse(time,dateTimeFormatter);
-// String cronStr=dateTimeFormatter1.format(localDateTime);
-// quartzJob.setCronExpression(cronStr);
-// QueryWrapper<QuartzJob> queryWrapper = new QueryWrapper();
-// queryWrapper.eq("JOB_CLASS_NAME",jobClassName);
-// List<QuartzJob> quartzJobs = quartzJobService.list(queryWrapper);
-// if(CollectionUtils.isEmpty(quartzJobs)){
-// quartzJobService.saveAndScheduleJob(quartzJob);
-// quartzJobs = quartzJobService.list(queryWrapper);
-// quartzJob.setId(quartzJobs.get(0).getId());
-// quartzJobService.resumeJob(quartzJob);
-// return Result.OK(quartzJob);
-// }else{
-// quartzJob.setId(quartzJobs.get(0).getId());
-// quartzJobService.resumeJob(quartzJob);
-// return Result.OK(quartzJob);
-// }
-//
-// }
-//
-// /**
-// * 缂栬緫
-// * @param warehouse
-// * @return
-// */
-// @AutoLog(value = "浠撳簱-缂栬緫")
-// @ApiOperation(value="浠撳簱-缂栬緫", notes="浠撳簱-缂栬緫")
-// //@RequiresPermissions("org.jeecg.modules.demo:mom_base_warehouse:edit")
-// @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
-// public Result<String> edit(@RequestBody Warehouse warehouse) {
-// warehouseService.updateById(warehouse);
-// return Result.OK("缂栬緫鎴愬姛!");
-// }
-//
-// /**
-// * 閫氳繃id鍒犻櫎
-// * @param id
-// * @return
-// */
-// @AutoLog(value = "浠撳簱-閫氳繃id鍒犻櫎")
-// @ApiOperation(value="浠撳簱-閫氳繃id鍒犻櫎", notes="浠撳簱-閫氳繃id鍒犻櫎")
-// //@RequiresPermissions("org.jeecg.modules.demo:mom_base_warehouse:delete")
-// @DeleteMapping(value = "/delete")
-// public Result<String> delete(@RequestParam(name="id",required=true) String id) {
-// dataVersionService.update(new UpdateWrapper<DataVersion>()
-// .set("del_flag",1)
-// .eq("business_id",id));
-// UpdateWrapper updateWrapper = new UpdateWrapper();
-// updateWrapper.set("del_flag","1");
-// updateWrapper.eq("id",id);
-// warehouseService.update(updateWrapper);
-// return Result.OK("鍒犻櫎鎴愬姛!");
-// }
-//
-// /**
-// * 鎵归噺鍒犻櫎
-// * @param ids
-// * @return
-// */
-// @AutoLog(value = "浠撳簱-鎵归噺鍒犻櫎")
-// @ApiOperation(value="浠撳簱-鎵归噺鍒犻櫎", notes="浠撳簱-鎵归噺鍒犻櫎")
-// //@RequiresPermissions("org.jeecg.modules.demo:mom_base_warehouse:deleteBatch")
-// @DeleteMapping(value = "/deleteBatch")
-// public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
-// dataVersionService.update(new UpdateWrapper<DataVersion>()
-// .set("del_flag",1)
-// .in("business_id",Arrays.asList(ids.split(","))));
-// warehouseService
-// .update(new UpdateWrapper<Warehouse>()
-// .in("id",Arrays.asList(ids.split(","))).set("del_flag",1));
-// return Result.OK("鎵归噺鍒犻櫎鎴愬姛!");
-// }
-//
-// /**
-// * 瀵煎嚭
-// * @return
-// */
-// //@RequiresPermissions("org.jeecg.modules.demo:mom_base_warehouse:exportXls")
-// @RequestMapping(value = "/exportXls")
-// public ModelAndView exportXls(HttpServletRequest request, Warehouse warehouse) {
-// return super.exportXls(request, warehouse, Warehouse.class, "浠撳簱");
-// }
-//
-// /**
-// * 瀵煎叆
-// * @return
-// */
-// //@RequiresPermissions("org.jeecg.modules.demo:mom_base_warehouse:importExcel")
-// @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
-// public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
-// return super.importExcel(request, response, Warehouse.class);
-// }
-// /*---------------------------------涓昏〃澶勭悊-end-------------------------------------*/
-//
-//
-// /*--------------------------------瀛愯〃澶勭悊-浠撳簱鏈嶅姟瀵硅薄-begin----------------------------------------------*/
-// /**
-// * 閫氳繃涓昏〃ID鏌ヨ
-// * @return
-// */
-// @GetMapping("/checkWarehouseClient")
-// public Result<?> checkClient(
-// @RequestParam(name="clientId",required = false) String clientId,
-// @RequestParam(name="warehouseId") String warehouseId){
-// QueryWrapper<WarehouseClient> queryWrapper = new QueryWrapper<>();
-// if(!StringUtils.isBlank(clientId)){
-// queryWrapper.eq("client_id",clientId);
-// }
-// if(!StringUtils.isBlank(warehouseId)){
-// queryWrapper.eq("warehouse_id",warehouseId);
-// }
-// queryWrapper.eq("del_flag","0");
-// return Result.OK(warehouseClientService.list(queryWrapper));
-// }
-// /**
-// * 閫氳繃涓昏〃ID鏌ヨ
-// * @return
-// */
-// //@AutoLog(value = "浠撳簱鏈嶅姟瀵硅薄-閫氳繃涓昏〃ID鏌ヨ")
-// @ApiOperation(value="浠撳簱鏈嶅姟瀵硅薄-閫氳繃涓昏〃ID鏌ヨ", notes="浠撳簱鏈嶅姟瀵硅薄-閫氳繃涓昏〃ID鏌ヨ")
-// @GetMapping(value = "/listWarehouseClientByMainId")
-// public Result<IPage<WarehouseClient>> listWarehouseClientByMainId(WarehouseClient warehouseClient,
-// @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-// @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-// HttpServletRequest req) {
-// QueryWrapper<WarehouseClient> queryWrapper = QueryGenerator.initQueryWrapper(warehouseClient, req.getParameterMap());
-// queryWrapper.eq("del_flag",0);
-// Page<WarehouseClient> page = new Page<WarehouseClient>(pageNo, pageSize);
-// IPage<WarehouseClient> pageList = warehouseClientService.page(page, queryWrapper);
-// return Result.OK(pageList);
-// }
-//
-// /**
-// * 娣诲姞
-// * @param map
-// * @return
-// */
-// @AutoLog(value = "浠撳簱鏈嶅姟瀵硅薄-娣诲姞")
-// @ApiOperation(value="浠撳簱鏈嶅姟瀵硅薄-娣诲姞", notes="浠撳簱鏈嶅姟瀵硅薄-娣诲姞")
-// @PostMapping(value = "/addWarehouseClient")
-// public Result<String> addWarehouseClient(@RequestBody Map<String,Object> map) {
-// List<Map<String,Object>> addDepartIds = (List<Map<String, Object>>) map.get("addDepartIds");
-// List<Map<String,Object>> addFactoryIds = (List<Map<String, Object>>) map.get("addFactoryIds");
-// String warehouseId = (String) map.get("warehouseId");
-// if(CollectionUtils.isNotEmpty(addDepartIds)){
-// List<WarehouseClient> warehouseClients=new ArrayList<>();
-// addDepartIds.forEach(departMap->{
-// WarehouseClient warehouseClient = new WarehouseClient();
-// warehouseClient.setClientId((String) departMap.get("id"))
-// .setWarehouseId(warehouseId)
-// .setCode((String) departMap.get("orgCode"))
-// .setName((String) departMap.get("departName"))
-// .setElementType("缁勭粐閮ㄩ棬")
-// .setDelFlag(0);
-// warehouseClients.add(warehouseClient);
-// });
-// warehouseClientService.saveBatch(warehouseClients);
-// }
-//
-// if(CollectionUtils.isNotEmpty(addFactoryIds)){
-// List<WarehouseClient> warehouseClients=new ArrayList<>();
-// addFactoryIds.forEach(factoryMap->{
-// WarehouseClient warehouseClient = new WarehouseClient();
-// warehouseClient.setClientId((String) factoryMap.get("id"))
-// .setWarehouseId(warehouseId)
-// .setCode((String) factoryMap.get("code"))
-// .setName((String) factoryMap.get("name"))
-// .setElementType("宸ュ巶")
-// .setDelFlag(0);
-// warehouseClients.add(warehouseClient);
-// });
-// warehouseClientService.saveBatch(warehouseClients);
-// }
-// return Result.OK("娣诲姞鎴愬姛锛�");
-// }
-//
-// /**
-// * 缂栬緫
-// * @param map
-// * @return
-// */
-// @AutoLog(value = "浠撳簱鏈嶅姟瀵硅薄-缂栬緫")
-// @ApiOperation(value="浠撳簱鏈嶅姟瀵硅薄-缂栬緫", notes="浠撳簱鏈嶅姟瀵硅薄-缂栬緫")
-// @RequestMapping(value = "/editWarehouseClient", method = {RequestMethod.PUT,RequestMethod.POST})
-// public Result<String> editWarehouseClient(@RequestBody Map<String,Object> map) {
-// List<Map<String,Object>> addDepartIds = (List<Map<String, Object>>) map.get("addDepartIds");
-// List<Map<String,Object>> addFactoryIds = (List<Map<String, Object>>) map.get("addFactoryIds");
-// String id = (String) map.get("id");
-// if(CollectionUtils.isNotEmpty(addDepartIds)){
-// UpdateWrapper<WarehouseClient> updateWrapper = new UpdateWrapper<WarehouseClient>()
-// .eq("id",id)
-// .set("code",(String)addDepartIds.get(0).get("orgCode"))
-// .set("name",(String) addDepartIds.get(0).get("departName"));
-// warehouseClientService.update(updateWrapper);
-// }
-//
-// if(CollectionUtils.isNotEmpty(addFactoryIds)){
-// UpdateWrapper<WarehouseClient> updateWrapper = new UpdateWrapper<WarehouseClient>()
-// .eq("id",id)
-// .set("code",(String)addFactoryIds.get(0).get("code"))
-// .set("name",(String)addFactoryIds.get(0).get("name"));
-// warehouseClientService.update(updateWrapper);
-// }
-// return Result.OK("缂栬緫鎴愬姛!");
-// }
-//
-// /**
-// * 閫氳繃id鍒犻櫎
-// * @param id
-// * @return
-// */
-// @AutoLog(value = "浠撳簱鏈嶅姟瀵硅薄-閫氳繃id鍒犻櫎")
-// @ApiOperation(value="浠撳簱鏈嶅姟瀵硅薄-閫氳繃id鍒犻櫎", notes="浠撳簱鏈嶅姟瀵硅薄-閫氳繃id鍒犻櫎")
-// @DeleteMapping(value = "/deleteWarehouseClient")
-// public Result<String> deleteWarehouseClient(@RequestParam(name="id",required=true) String id) {
-// warehouseClientService.update( new UpdateWrapper<WarehouseClient>()
-// .set("del_flag",1)
-// .eq("id",id));
-// return Result.OK("鍒犻櫎鎴愬姛!");
-// }
-//
-// /**
-// * 鎵归噺鍒犻櫎
-// * @param ids
-// * @return
-// */
-// @AutoLog(value = "浠撳簱鏈嶅姟瀵硅薄-鎵归噺鍒犻櫎")
-// @ApiOperation(value="浠撳簱鏈嶅姟瀵硅薄-鎵归噺鍒犻櫎", notes="浠撳簱鏈嶅姟瀵硅薄-鎵归噺鍒犻櫎")
-// @DeleteMapping(value = "/deleteBatchWarehouseClient")
-// public Result<String> deleteBatchWarehouseClient(@RequestParam(name="ids",required=true) String ids) {
-// warehouseClientService.update(new UpdateWrapper<WarehouseClient>()
-// .in("id",Arrays.asList(ids.split(",")))
-// .set("del_flag",1));
-// return Result.OK("鍒犻櫎鎴愬姛");
-// }
-//
-// /**
-// * 瀵煎嚭
-// * @return
-// */
-// @RequestMapping(value = "/exportWarehouseClient")
-// public ModelAndView exportWarehouseClient(HttpServletRequest request, WarehouseClient warehouseClient) {
-// // Step.1 缁勮鏌ヨ鏉′欢
-// QueryWrapper<WarehouseClient> queryWrapper = QueryGenerator.initQueryWrapper(warehouseClient, request.getParameterMap());
-// LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-//
-// // Step.2 鑾峰彇瀵煎嚭鏁版嵁
-// List<WarehouseClient> pageList = warehouseClientService.list(queryWrapper);
-// List<WarehouseClient> exportList = null;
-//
-// // 杩囨护閫変腑鏁版嵁
-// String selections = request.getParameter("selections");
-// if (oConvertUtils.isNotEmpty(selections)) {
-// List<String> selectionList = Arrays.asList(selections.split(","));
-// exportList = pageList.stream().filter(item -> selectionList.contains(item.getId())).collect(Collectors.toList());
-// } else {
-// exportList = pageList;
-// }
-//
-// // Step.3 AutoPoi 瀵煎嚭Excel
-// ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-// //姝ゅ璁剧疆鐨刦ilename鏃犳晥,鍓嶇浼氶噸鏇存柊璁剧疆涓�涓�
-// mv.addObject(NormalExcelConstants.FILE_NAME, "浠撳簱鏈嶅姟瀵硅薄");
-// mv.addObject(NormalExcelConstants.CLASS, WarehouseClient.class);
-// mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("浠撳簱鏈嶅姟瀵硅薄鎶ヨ〃", "瀵煎嚭浜�:" + sysUser.getRealname(), "浠撳簱鏈嶅姟瀵硅薄"));
-// mv.addObject(NormalExcelConstants.DATA_LIST, exportList);
-// return mv;
-// }
-//
-// /**
-// * 瀵煎叆
-// * @return
-// */
-// @RequestMapping(value = "/importWarehouseClient/{mainId}")
-// public Result<?> importWarehouseClient(HttpServletRequest request, HttpServletResponse response, @PathVariable("mainId") String mainId) {
-// MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
-// Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
-// for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
-// // 鑾峰彇涓婁紶鏂囦欢瀵硅薄
-// MultipartFile file = entity.getValue();
-// ImportParams params = new ImportParams();
-// params.setTitleRows(2);
-// params.setHeadRows(1);
-// params.setNeedSave(true);
-// try {
-// List<WarehouseClient> list = ExcelImportUtil.importExcel(file.getInputStream(), WarehouseClient.class, params);
-// for (WarehouseClient temp : list) {
-// temp.setWarehouseId(mainId);
-// }
-// long start = System.currentTimeMillis();
-// warehouseClientService.saveBatch(list);
-// log.info("娑堣�楁椂闂�" + (System.currentTimeMillis() - start) + "姣");
-// return Result.OK("鏂囦欢瀵煎叆鎴愬姛锛佹暟鎹鏁帮細" + list.size());
-// } catch (Exception e) {
-// log.error(e.getMessage(), e);
-// return Result.error("鏂囦欢瀵煎叆澶辫触:" + e.getMessage());
-// } finally {
-// try {
-// file.getInputStream().close();
-// } catch (IOException e) {
-// e.printStackTrace();
-// }
-// }
-// }
-// return Result.error("鏂囦欢瀵煎叆澶辫触锛�");
-// }
-// @GetMapping("/enterpriseList")
-// public Result<?> getEnterpriseList(){
-// return Result.OK(enterpriseService.getEnterpriseListByPid(new Page<>(),1,"0"));
-// }
-//
-// /*--------------------------------瀛愯〃澶勭悊-浠撳簱鏈嶅姟瀵硅薄-end----------------------------------------------*/
-//
-//
-//
-// /**
-// * 浠撳簱绠＄悊 鏂板
-// * qsw
-// */
-// @PostMapping(value = "/addWarehouse")
-// public Result<String> addWarehouse(@RequestBody Warehouse warehouse) {
-// warehouseService.save(warehouse);
-// return Result.OK("娣诲姞鎴愬姛锛�");
-// }
-//
-//
-// /**
-// * 鍒嗛〉鍒楄〃鏌ヨ
-// * qsw
-// */
-// @GetMapping(value = "/find")
-// public Result<IPage<Warehouse>> queryPageList(Warehouse warehouse,
-// @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-// @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-// HttpServletRequest req) {
-// QueryWrapper<Warehouse> queryWrapper = QueryGenerator.initQueryWrapper(warehouse, req.getParameterMap());
-// Page<Warehouse> page = new Page<Warehouse>(pageNo, pageSize);
-// IPage<Warehouse> pageList = warehouseService.page(page, queryWrapper);
-// return Result.OK(pageList);
-// }
-//
-// /**
-// * 閫氳繃id鍒犻櫎
-// * @param id
-// * @return
-// * qsw
-// */
-// @AutoLog(value = "浠撳簱-閫氳繃id鍒犻櫎")
-// @ApiOperation(value="浠撳簱-閫氳繃id鍒犻櫎", notes="浠撳簱-閫氳繃id鍒犻櫎")
-// //@RequiresPermissions("org.jeecg.modules.demo:mom_base_warehouse:delete")
-// @DeleteMapping(value = "/deleteWarehouseAreaLocation")
-// public Result<String> deleteWarehouseAreaLocation(@RequestParam(name="id",required=true) String id) {
-//
-// List<WarehouseLocation> warehouseLocations = warehouseLocationService.lambdaQuery()
-// .eq(WarehouseLocation::getWarehouseId, id).eq(WarehouseLocation::getDelFlag, 0)
-// .list();
-// for (WarehouseLocation warehouseLocation : warehouseLocations) {
-// warehouseLocationService.removeById(warehouseLocation);
-// }
-//
-// List<WarehouseArea> warehouseAreas = warehouseAreaService.lambdaQuery()
-// .eq(WarehouseArea::getWarehouseId, id)
-// .eq(WarehouseArea::getDelFlag, 0).list();
-// for (WarehouseArea warehouseArea : warehouseAreas) {
-// warehouseAreaService.removeById(warehouseArea);
-// }
-// warehouseService.removeById(id);
-// return Result.OK("鍒犻櫎鎴愬姛!");
-// }
-//
-// /**
-// * 閫氳繃id鏌ヨ
-// *qsw
-// */
-// @GetMapping(value = "/queryById")
-// public Result<Warehouse> queryById(@RequestParam(name="id",required=true) String id) {
-// Warehouse warehouse = warehouseService.getById(id);
-// if(warehouse ==null) {
-// return Result.error("鏈壘鍒板搴旀暟鎹�");
-// }
-// return Result.OK(warehouse);
-// }
-//
-//}
diff --git a/src/main/java/org/jeecg/modules/base/controller/WarehouseLocationController.java b/src/main/java/org/jeecg/modules/base/controller/WarehouseLocationController.java
deleted file mode 100644
index 234bf04..0000000
--- a/src/main/java/org/jeecg/modules/base/controller/WarehouseLocationController.java
+++ /dev/null
@@ -1,177 +0,0 @@
-package org.jeecg.modules.base.controller;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-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.util.oConvertUtils;
-import org.jeecg.modules.base.entity.WarehouseLocation;
-import org.jeecg.modules.base.service.IWarehouseLocationService;
-
-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.jeecgframework.poi.excel.ExcelImportUtil;
-import org.jeecgframework.poi.excel.def.NormalExcelConstants;
-import org.jeecgframework.poi.excel.entity.ExportParams;
-import org.jeecgframework.poi.excel.entity.ImportParams;
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
-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.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
-import org.springframework.web.servlet.ModelAndView;
-import com.alibaba.fastjson.JSON;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.jeecg.common.aspect.annotation.AutoLog;
-
- /**
- * @Description: mom_base_warehouse_location
- * @Author: jeecg-boot
- * @Date: 2023-07-06
- * @Version: V1.0
- */
-@Api(tags="mom_base_warehouse_location")
-@RestController
-@RequestMapping("/base/warehouseLocation")
-@Slf4j
-public class WarehouseLocationController extends JeecgController<WarehouseLocation, IWarehouseLocationService> {
- @Autowired
- private IWarehouseLocationService warehouseLocationService;
-
- /**
- * 鍒嗛〉鍒楄〃鏌ヨ
- *
- * @param warehouseLocation
- * @param pageNo
- * @param pageSize
- * @param req
- * @return
- */
- //@AutoLog(value = "mom_base_warehouse_location-鍒嗛〉鍒楄〃鏌ヨ")
- @ApiOperation(value="mom_base_warehouse_location-鍒嗛〉鍒楄〃鏌ヨ", notes="mom_base_warehouse_location-鍒嗛〉鍒楄〃鏌ヨ")
- @GetMapping(value = "/list")
- public Result<IPage<WarehouseLocation>> queryPageList(WarehouseLocation warehouseLocation,
- @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
- @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
- HttpServletRequest req) {
- QueryWrapper<WarehouseLocation> queryWrapper = QueryGenerator.initQueryWrapper(warehouseLocation, req.getParameterMap());
- Page<WarehouseLocation> page = new Page<WarehouseLocation>(pageNo, pageSize);
- IPage<WarehouseLocation> pageList = warehouseLocationService.page(page, queryWrapper);
- return Result.OK(pageList);
- }
-
- /**
- * 娣诲姞
- *
- * @param warehouseLocation
- * @return
- */
- @AutoLog(value = "mom_base_warehouse_location-娣诲姞")
- @ApiOperation(value="mom_base_warehouse_location-娣诲姞", notes="mom_base_warehouse_location-娣诲姞")
- //@RequiresPermissions("org.jeecg.modules:mom_base_warehouse_location:add")
- @PostMapping(value = "/add")
- public Result<String> add(@RequestBody WarehouseLocation warehouseLocation) {
- warehouseLocationService.save(warehouseLocation);
- return Result.OK("娣诲姞鎴愬姛锛�");
- }
-
- /**
- * 缂栬緫
- *
- * @param warehouseLocation
- * @return
- */
- @AutoLog(value = "mom_base_warehouse_location-缂栬緫")
- @ApiOperation(value="mom_base_warehouse_location-缂栬緫", notes="mom_base_warehouse_location-缂栬緫")
- //@RequiresPermissions("org.jeecg.modules:mom_base_warehouse_location:edit")
- @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
- public Result<String> edit(@RequestBody WarehouseLocation warehouseLocation) {
- warehouseLocationService.updateById(warehouseLocation);
- return Result.OK("缂栬緫鎴愬姛!");
- }
-
- /**
- * 閫氳繃id鍒犻櫎
- *
- * @param id
- * @return
- */
- @AutoLog(value = "mom_base_warehouse_location-閫氳繃id鍒犻櫎")
- @ApiOperation(value="mom_base_warehouse_location-閫氳繃id鍒犻櫎", notes="mom_base_warehouse_location-閫氳繃id鍒犻櫎")
- //@RequiresPermissions("org.jeecg.modules:mom_base_warehouse_location:delete")
- @DeleteMapping(value = "/delete")
- public Result<String> delete(@RequestParam(name="id",required=true) String id) {
- warehouseLocationService.removeById(id);
- return Result.OK("鍒犻櫎鎴愬姛!");
- }
-
- /**
- * 鎵归噺鍒犻櫎
- *
- * @param ids
- * @return
- */
- @AutoLog(value = "mom_base_warehouse_location-鎵归噺鍒犻櫎")
- @ApiOperation(value="mom_base_warehouse_location-鎵归噺鍒犻櫎", notes="mom_base_warehouse_location-鎵归噺鍒犻櫎")
- //@RequiresPermissions("org.jeecg.modules:mom_base_warehouse_location:deleteBatch")
- @DeleteMapping(value = "/deleteBatch")
- public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
- this.warehouseLocationService.removeByIds(Arrays.asList(ids.split(",")));
- return Result.OK("鎵归噺鍒犻櫎鎴愬姛!");
- }
-
- /**
- * 閫氳繃id鏌ヨ
- *
- * @param id
- * @return
- */
- //@AutoLog(value = "mom_base_warehouse_location-閫氳繃id鏌ヨ")
- @ApiOperation(value="mom_base_warehouse_location-閫氳繃id鏌ヨ", notes="mom_base_warehouse_location-閫氳繃id鏌ヨ")
- @GetMapping(value = "/queryById")
- public Result<WarehouseLocation> queryById(@RequestParam(name="id",required=true) String id) {
- WarehouseLocation warehouseLocation = warehouseLocationService.getById(id);
- if(warehouseLocation==null) {
- return Result.error("鏈壘鍒板搴旀暟鎹�");
- }
- return Result.OK(warehouseLocation);
- }
-
- /**
- * 瀵煎嚭excel
- *
- * @param request
- * @param warehouseLocation
- */
- //@RequiresPermissions("org.jeecg.modules:mom_base_warehouse_location:exportXls")
- @RequestMapping(value = "/exportXls")
- public ModelAndView exportXls(HttpServletRequest request, WarehouseLocation warehouseLocation) {
- return super.exportXls(request, warehouseLocation, WarehouseLocation.class, "mom_base_warehouse_location");
- }
-
- /**
- * 閫氳繃excel瀵煎叆鏁版嵁
- *
- * @param request
- * @param response
- * @return
- */
- //@RequiresPermissions("mom_base_warehouse_location:importExcel")
- @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
- public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
- return super.importExcel(request, response, WarehouseLocation.class);
- }
-
-}
diff --git a/src/main/java/org/jeecg/modules/base/controller/WorkCenterController.java b/src/main/java/org/jeecg/modules/base/controller/WorkCenterController.java
deleted file mode 100644
index 3b577b0..0000000
--- a/src/main/java/org/jeecg/modules/base/controller/WorkCenterController.java
+++ /dev/null
@@ -1,565 +0,0 @@
-package org.jeecg.modules.base.controller;
-
-import java.text.ParseException;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-import java.util.*;
-import java.util.stream.Collectors;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.modules.base.entity.*;
-import org.jeecg.modules.base.service.*;
-
-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.jeecg.modules.quartz.entity.QuartzJob;
-import org.jeecg.modules.quartz.service.IQuartzJobService;
-import org.jeecg.common.system.base.entity.DataVersion;
-import org.jeecg.modules.system.service.IDataVersionService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
-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_base_work_center
- * @Author: jeecg-boot
- * @Date: 2022-11-17
- * @Version: V1.0
- */
-@Api(tags="宸ヤ綔涓績")
-@RestController
-@RequestMapping("/base/workCenter")
-@Slf4j
-public class WorkCenterController extends JeecgController<WorkCenter, IWorkCenterService> {
- @Autowired
- private IWorkCenterService workCenterService;
- @Autowired
- private IFactoryModelService factoryModelService;
- @Autowired
- private IQuartzJobService quartzJobService;
- @Autowired
- private IDataVersionService dataVersionService;
- @Autowired
- private IWorkCenterUserService workCenterUserService;
- @Autowired
- private IWorkCenterEquipmentService workCenterEquipmentService;
- @Autowired
- private IEnterpriseService enterpriseService;
- /**
- * 鏍规嵁鐗堟湰鑾峰彇鐗堟湰鍙�
- *
- *
- */
- @GetMapping("/getVersionStatusByVersion")
- public Result<?> getVersionStatusByVersion(@RequestParam(value = "version",required = false) Integer version){
- return Result.OK(workCenterService.getVersionStatusByVersion(version));
- }
- /**
- * 鑾峰彇鍒濆鐗堟湰鍙�
- *
- * @return
- */
- @GetMapping("getInitVersion")
- public Result<?> getInitVersion(){
- return Result.OK(workCenterService.getInitVersion());
- }
- /**
- * 鑾峰彇鏍硅妭鐐�
- *
- * @param eid
- * @param fid
- * @return
- */
- @GetMapping("/getTop/{eid}/{fid}")
- public Result<?> getTop(@PathVariable("eid") String eid,@PathVariable("fid") String fid){
- return Result.OK(workCenterService.getTop(eid,fid));
- }
- /**
- *
- * 鏌ュ綋鍓嶇敓鏁堜紒涓氫笅鏈夋棤閮ㄩ棬鍘嗗彶鐗堟湰
- *
- */
- @Transactional
- @GetMapping(value = "/getUpdateVersionPermission")
- public Result<?> getUpdatePermission(@RequestParam("version") Integer version){
- List<String> usableIds = factoryModelService
- .getUsableList(enterpriseService.getUsableIdList())
- .stream()
- .map(FactoryModel::getId)
- .collect(Collectors.toList());
- if(CollectionUtils.isNotEmpty(usableIds)){
- return Result.OK(workCenterService.list(new QueryWrapper<WorkCenter>()
- .in("parent_factory_model_id",usableIds)
- .eq("version",version)
- .eq("del_flag",0)));
- }
- return Result.ok();
- }
- /**
- *
- * 鏌ュ綋鍓嶇敓鏁堜紒涓氫笅鐨勭敓鏁堝伐鍘備笅鏈夋棤宸ヤ綔涓績鍘嗗彶鐗堟湰
- *
- */
- @Transactional
- @GetMapping(value = "/getNewVersionPermission")
- public Result<?> getNewVersionPermission(){
- List<FactoryModel> usableFactoryList = factoryModelService
- .list(new QueryWrapper<FactoryModel>()
- .eq("del_flag",0)
- .in("enterprise_id",enterpriseService.getUsableIdList()));
- if(CollectionUtils.isEmpty(usableFactoryList)){
- return Result.OK(false);
- }else {
- List<WorkCenter> list = workCenterService
- .list(new QueryWrapper<WorkCenter>()
- .in("parent_factory_model_id",usableFactoryList.stream().map(FactoryModel::getId).collect(Collectors.toList()))
- .eq("del_flag",0));
- if(CollectionUtils.isNotEmpty(list)){
- return Result.OK(false);
- }
- else {
- return Result.OK(true);
- }
- }
- }
- /**
- * 鍗囩増
- * 闇�瑕佷竴娆″畬鎴�
- * @param map
- * @param
- * @return
- */
- @PostMapping("/updateVersion")
- @Transactional
- public Result<?> updateVersion(@RequestBody Map<String,Object> map){
- Integer version = Integer.parseInt((String)map.get("version"));
- //鑾峰彇鍗囩増鏁版嵁
- List<WorkCenter> list = workCenterService.getUpdateVersionlist(version);
- //鑾峰彇鍗囩増鏁版嵁鐨勭増鏈俊鎭�
- QueryWrapper<DataVersion> queryWrapper = new QueryWrapper<DataVersion>()
- .in("business_id", list.stream().map(WorkCenter::getId).collect(Collectors.toList()))
- .eq("del_flag",0);
- List<DataVersion> dataVersionList = dataVersionService.list(queryWrapper);
- Set<Integer> set = workCenterService.getVersionList();
- Optional<Integer> maxVersion = set.stream().findFirst();
- list.stream().forEach(workCenter -> {
- workCenter.setId("");
- workCenter.setVersion(maxVersion.get()+1);
- });
- workCenterService.saveBatch(list);
- List<WorkCenter> newList = workCenterService
- .list(new QueryWrapper<WorkCenter>()
- .eq("version",maxVersion.get()+1));
- List<DataVersion> newDataVersionList = new ArrayList<>();
- for(int i=0;i<newList.size();i++){
- DataVersion dataVersion = new DataVersion();
- for(int j=0;j<list.size();j++){
- for(int k=0;k<dataVersionList.size();k++){
- if(list.get(j).getCode().equals(newList.get(i).getCode())
- &&list.get(j).getDataVersionId().equals(dataVersionList.get(k).getId())) {
- dataVersion
- .setVersion(maxVersion.get() + 1)
- .setVersionStatus("1")
- .setBusinessId(newList.get(i).getId())
- .setDelFlag(0)
- .setSourceVersionId(dataVersionList.get(k).getId())
- .setBusinessType("宸ヤ綔涓績")
- .setIsLastUsable("0");
- }
- }
- }
- newDataVersionList.add(dataVersion);
- }
- dataVersionService.saveBatch(newDataVersionList);
- List<String> dataVersionBusinessIdList = newDataVersionList.stream().map(DataVersion::getBusinessId).collect(Collectors.toList());
- QueryWrapper<DataVersion> queryWrapper1 = new QueryWrapper<DataVersion>().in("business_id",dataVersionBusinessIdList).eq("del_flag",0);
- List<DataVersion> selectDataVersionList = dataVersionService.list(queryWrapper1);
- for(int i=0;i<newList.size();i++){
- for(int j=0;j<selectDataVersionList.size();j++){
- if(newList.get(i).getId().equals(selectDataVersionList.get(j).getBusinessId())){
- newList.get(i).setDataVersionId(selectDataVersionList.get(j).getId());
- }
- }
- }
- workCenterService.updateBatchById(newList);
- return Result.OK(maxVersion.get()+1);
- }
- /**
- * 缁存姢鍗囩増
- * 闇�瑕佷竴娆″畬鎴�
- * @param
- * @return
- */
- @PostMapping("/updateVersionForChange")
- @Transactional
- public Result<?> updateVersionForChange(){
- Set<Integer> set = workCenterService.getVersionList();
- return Result.OK(set.stream().findFirst().get()+1);
- }
- /**
- * 鐢熸晥
- * 闇�瑕佷竴娆℃�у畬鎴�
- * @param
- * @param map
- * @return
- */
- @PostMapping("/updateVersionStatusToUsable")
- @Transactional
- public Result<?> updateVersionStatusToUsable(@RequestBody Map<String,Object> map){
- Date date = new Date(System.currentTimeMillis());
- QuartzJob quartzJob = quartzJobService.getOne(new QueryWrapper<QuartzJob>()
- .eq("job_class_name","org.jeecg.modules.quartz.job.WorkCenterSetUsableJob"),true);
- if(ObjectUtils.isNotNull(quartzJob)){
- quartzJobService.deleteAndStopJob(quartzJob);
- }
- String factoryModelId = String.valueOf(map.get("factoryModelId"));
- Integer version = Integer.parseInt((String)map.get("version"));
- //鑾峰彇涓婃鐢熸晥鐗堟湰骞跺皢鍏舵槸鍚︿笂娆＄敓鏁堜綅缃疆涓哄惁
- List<WorkCenter> lastUsableList = workCenterService.getLastUsableVersion();
- if(CollectionUtils.isNotEmpty(lastUsableList)){
- QueryWrapper<DataVersion> queryWrapper2 = new QueryWrapper<DataVersion>()
- .in("business_id",lastUsableList.stream()
- .map(WorkCenter::getId)
- .collect(Collectors.toList()));
- List<DataVersion> lastUsableVersionList = dataVersionService.list(queryWrapper2);
- lastUsableVersionList.stream().forEach(dataVersion -> {
- dataVersion
- .setIsLastUsable("0");
- });
- dataVersionService.updateBatchById(lastUsableVersionList);
- }
- //鑾峰彇鐢熸晥鐗堟湰鍙婄増鏈俊鎭苟灏嗗叾缃负澶辨晥
- List<WorkCenter> usableList = workCenterService.getUsableList();
- if(CollectionUtils.isNotEmpty(usableList)){
- QueryWrapper<DataVersion> queryWrapper = new QueryWrapper<DataVersion>()
- .in("business_id",usableList.stream()
- .map(WorkCenter::getId)
- .collect(Collectors.toList()));
- List<DataVersion> usableDataVersionList = dataVersionService.list(queryWrapper);
- usableDataVersionList.stream().forEach(dataVersion -> {
- dataVersion
- .setVersionStatus("3")
- .setIsLastUsable("1")
- .setExpiredTime(date);
- });
- dataVersionService.updateBatchById(usableDataVersionList);
- }
- //鑾峰彇寰呯敓鏁堢増鏈強鐗堟湰淇℃伅骞跺皢鍏剁疆涓虹敓鏁�
- QueryWrapper<DataVersion> queryWrapper1 = new QueryWrapper<DataVersion>()
- .in("business_id",workCenterService
- .getUpdateVersionlist(version)
- .stream().map(WorkCenter::getId)
- .collect(Collectors.toList()));
- List<DataVersion> dataVersionList = dataVersionService.list(queryWrapper1);
- dataVersionList.stream().forEach(dataVersion -> {
- dataVersion.setVersionStatus("2")
- .setEffectiveType("2")
- .setEffectiveTime(date)
- .setIsLastUsable("0");
- });
- //瀛樺叆鏁版嵁搴�
- dataVersionService.updateBatchById(dataVersionList);
- return Result.OK("鐢熸晥鎴愬姛");
- }
- /**
- * 瀹氭椂鐢熸晥
- * 闇�瑕佷竴娆℃�у畬鎴�
- * @param quartzJob
- * @param
- * @return
- */
- @PostMapping("/updateVersionStatusToUsableBySetTime")
- @Transactional
- public Result<?> updateVersionStatusToUsableBySetTime(@RequestBody QuartzJob quartzJob) throws ParseException {
- DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
- DateTimeFormatter dateTimeFormatter1 = DateTimeFormatter.ofPattern("ss mm HH dd MM ? yyyy");
- String jobClassName = quartzJob.getJobClassName();
- String time = quartzJob.getCronExpression();
- System.out.println(time);
- LocalDateTime localDateTime = LocalDateTime.parse(time,dateTimeFormatter);
- String cronStr=dateTimeFormatter1.format(localDateTime);
- quartzJob.setCronExpression(cronStr);
- QueryWrapper<QuartzJob> queryWrapper = new QueryWrapper();
- queryWrapper.eq("JOB_CLASS_NAME",jobClassName);
- List<QuartzJob> quartzJobs = quartzJobService.list(queryWrapper);
- if(CollectionUtils.isEmpty(quartzJobs)){
- quartzJobService.saveAndScheduleJob(quartzJob);
- quartzJobs = quartzJobService.list(queryWrapper);
- quartzJob.setId(quartzJobs.get(0).getId());
- quartzJobService.resumeJob(quartzJob);
- return Result.OK(quartzJob);
- }else{
- quartzJob.setId(quartzJobs.get(0).getId());
- quartzJobService.resumeJob(quartzJob);
- return Result.OK(quartzJob);
- }
-
- }
- /**
- * 鍒嗛〉鍒楄〃鏌ヨ
- *
- * @param workCenterDetail
- * @param pageNo
- * @param pageSize
- * @return
- */
- @ApiOperation(value="mom_base_work_center-鍒嗛〉鍒楄〃鏌ヨ", notes="mom_base_work_center-鍒嗛〉鍒楄〃鏌ヨ")
- @GetMapping(value = "/list")
- public Result<IPage<WorkCenterDetail>> queryPageList(WorkCenterDetail workCenterDetail,
- @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
- @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
- @RequestParam(name="parentFactoryModelId",required = true,defaultValue = "") String parentFactoryModelId,
- @RequestParam(name="factoryModelVersion",required = true,defaultValue = "") Integer factoryModelVersion,
- @RequestParam(name="version",required = true,defaultValue = "") Integer version
- ) {
- Page<WorkCenterDetail> page = new Page(pageNo, pageSize);
- IPage<WorkCenterDetail> pageList = workCenterService.getAllWorkCenterByPMFId(page,parentFactoryModelId,factoryModelVersion,version);
- return Result.OK(pageList);
- }
- /**
- * 鑾峰彇鐗堟湰鍙�
- *
- *
- * @return
- */
- @GetMapping("/versionList")
- public Result<?> getVersionList(){
- return Result.OK( workCenterService.getVersionList());
- }
- /**
- * 鑾峰彇宸ュ巶寤烘ā鐢熸晥澶辨晥鍒楄〃
- * @return
- */
- @GetMapping("/getFactoryVersionList")
- public Result<?> getFactoryVersionList(){
- return Result.OK(workCenterService.getFactoryVersionList());
- }
- /**
- * 娣诲姞
- *
- * @param map
- * @return
- */
- @AutoLog(value = "mom_base_work_center-娣诲姞")
- @ApiOperation(value="mom_base_work_center-娣诲姞", notes="mom_base_work_center-娣诲姞")
- @PostMapping(value = "/add")
- @Transactional
- public Result<String> add(@RequestBody Map<String,Object> map) {
- WorkCenter workCenter = new WorkCenter();
- //(璁剧疆淇濆瓨鐨勫伐浣滀腑蹇冩暟鎹級
- workCenter.setCode(String.valueOf(map.get("code")))
- .setName(String.valueOf(map.get("name")))
- .setServiceCategory(String.valueOf(map.get("serviceCategory")))
- .setWorkCenterCategory(String.valueOf(map.get("workCenterCategory")))
- .setEquipmentTeamId(String.valueOf(map.get("equipmentTeamId")))
- .setFeedingArea(String.valueOf(map.get("feedingArea")))
- .setBaitingArea(String.valueOf(map.get("baitingArea")))
- .setRemark(String.valueOf(map.get("remark")))
- .setVersion(Integer.parseInt(String.valueOf(map.get("version"))))
- .setFactoryModelId(String.valueOf(map.get("factoryModelId")))
- .setParentFactoryModelId(String.valueOf(map.get("parentFactoryModelId")))
- .setDelFlag(0);
- workCenterService.save(workCenter);
- QueryWrapper<WorkCenter> queryWrapper = new QueryWrapper<WorkCenter>()
- .eq("code",workCenter.getCode()).eq("version",workCenter.getVersion()).eq("del_flag",0);
- WorkCenter selectWorkCenter = workCenterService.getOne(queryWrapper,true);
- DataVersion dataVersion = new DataVersion();
- dataVersion.setBusinessId(selectWorkCenter.getId())
- .setBusinessType("宸ヤ綔涓績")
- .setVersion(selectWorkCenter.getVersion())
- .setVersionStatus(String.valueOf(map.get("versionStatus")))
- .setDelFlag(0)
- .setEffectiveType("0")
- .setIsLastUsable("0");
- dataVersionService.save(dataVersion);
- QueryWrapper<DataVersion> queryWrapper1 = new QueryWrapper<DataVersion>()
- .eq("business_id",selectWorkCenter.getId()).eq("del_flag",0);
- DataVersion selectDataVersion = dataVersionService.getOne(queryWrapper1,true);
- selectWorkCenter.setDataVersionId(selectDataVersion.getId());
- workCenterService.saveOrUpdate(selectWorkCenter);
- return Result.OK("娣诲姞鎴愬姛锛�");
- }
-
- /**
- * 缂栬緫
- *
- * @param workCenter
- * @return
- */
- @AutoLog(value = "mom_base_work_center-缂栬緫")
- @ApiOperation(value="mom_base_work_center-缂栬緫", notes="mom_base_work_center-缂栬緫")
- @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
- public Result<String> edit(@RequestBody WorkCenter workCenter) {
- workCenterService.updateById(workCenter);
- return Result.OK("缂栬緫鎴愬姛!");
- }
-
- /**
- * 閫氳繃id鍒犻櫎
- *
- * @param id
- * @return
- */
- @AutoLog(value = "mom_base_work_center-閫氳繃id鍒犻櫎")
- @ApiOperation(value="mom_base_work_center-閫氳繃id鍒犻櫎", notes="mom_base_work_center-閫氳繃id鍒犻櫎")
- @DeleteMapping(value = "/delete")
- public Result<String> delete(@RequestParam(name="id",required=true) String id) {
- dataVersionService.update(new UpdateWrapper<DataVersion>()
- .set("del_flag",1)
- .eq("business_id",id));
- workCenterService.update(new UpdateWrapper<WorkCenter>().
- set("del_flag",1)
- .eq("id",id));
- return Result.OK("鍒犻櫎鎴愬姛!");
- }
-
- /**
- * 鎵归噺鍒犻櫎
- *
- * @param ids
- * @return
- */
- @AutoLog(value = "mom_base_work_center-鎵归噺鍒犻櫎")
- @ApiOperation(value="mom_base_work_center-鎵归噺鍒犻櫎", notes="mom_base_work_center-鎵归噺鍒犻櫎")
- @DeleteMapping(value = "/deleteBatch")
- public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
- dataVersionService.update(new UpdateWrapper<DataVersion>()
- .set("del_flag",1)
- .in("business_id",Arrays.asList(ids.split(","))));
- workCenterService.
- update(new UpdateWrapper<WorkCenter>()
- .set("del_flag",1)
- .in("id",Arrays.asList(ids.split(","))));
- return Result.OK("鍒犻櫎鎴愬姛");
- }
-
- /**
- * 閫氳繃id鏌ヨ
- *
- * @param id
- * @return
- */
- //@AutoLog(value = "mom_base_work_center-閫氳繃id鏌ヨ")
- @ApiOperation(value="mom_base_work_center-閫氳繃id鏌ヨ", notes="mom_base_work_center-閫氳繃id鏌ヨ")
- @GetMapping(value = "/queryById")
- public Result<WorkCenter> queryById(@RequestParam(name="id",required=true) String id) {
- WorkCenter workCenter = workCenterService.getById(id);
- if(workCenter==null) {
- return Result.error("鏈壘鍒板搴旀暟鎹�");
- }
- return Result.OK(workCenter);
- }
-
- /**
- * 瀵煎嚭excel
- *
- * @param request
- * @param workCenter
- */
- //@RequiresPermissions("org.jeecg.modules.demo:mom_base_work_center:exportXls")
- @RequestMapping(value = "/exportXls")
- public ModelAndView exportXls(HttpServletRequest request, WorkCenter workCenter) {
- return super.exportXls(request, workCenter, WorkCenter.class, "mom_base_work_center");
- }
-
- /**
- * 閫氳繃excel瀵煎叆鏁版嵁
- *
- * @param request
- * @param response
- * @return
- */
- //@RequiresPermissions("mom_base_work_center:importExcel")
- @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
- public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
- return super.importExcel(request, response, WorkCenter.class);
- }
- /**
- * 鑾峰彇璇ュ伐浣滀腑蹇冩墍鍦ㄤ紒涓氱殑璁惧缁勫垪琛�
- *
- * @param enterpriseId
- * @return
- */
- @GetMapping("/equipmentCategorylist")
- public Result<?> getEquipmentCategoryListByEnterpriseId(@RequestParam(name = "enterpriseId",required = false) String enterpriseId){
- return Result.OK(workCenterService.getEquipmentCategoryListByEnterpriseId(enterpriseId));
- }
- /**
- * 鑾峰彇褰撳墠鐢熸晥鐗堟湰鍜屼笂涓�娆＄敓鏁堢増鏈殑鐗堟湰鍙�
- *
- * @param
- * @return
- */
- @GetMapping("/getNowAndLastUsableVersion")
- public Result<?> getNowAndLastUsableVersion(){
- return Result.OK(workCenterService.getNowAndLastUsableVersion());
- }
- /**
- * 鏍￠獙鍚嶇О鏄惁閲嶅
- *
- * @param
- * @return
- */
- @GetMapping("/check")
- public Result<?> check( @RequestParam(name="parentFactoryModelId",required = false,defaultValue = "") String parentFactoryModelId,
- @RequestParam(name="version",required = false) Integer version,
- @RequestParam(name="name") String name
- ){
- QueryWrapper<WorkCenter> queryWrapper = new QueryWrapper<WorkCenter>()
- .eq("parent_factory_model_id",parentFactoryModelId)
- .eq("name",name)
- .eq("version",version)
- .eq("del_flag",0);
- return Result.OK(workCenterService.list(queryWrapper));
- }
- /**
- * 鍒犻櫎娑堟伅鎻愰啋
- *
- * @param delIndexList
- * @return
- */
- @PostMapping("/checkDel")
- @Transactional
- public Result<?> checkDel(@RequestBody List<String> delIndexList){
- List<WorkCenterEquipment> workCenterEquipments = workCenterEquipmentService
- .list(new QueryWrapper<WorkCenterEquipment>()
- .in("work_center_id",delIndexList)
- .eq("del_flag",0)
- );
- List<WorkCenterUser> workCenterUsers = workCenterUserService.list(new QueryWrapper<WorkCenterUser>()
- .in("work_center_id",delIndexList)
- .eq("del_flag",0)
- );
- List<String> list1 = workCenterEquipments.stream().map(WorkCenterEquipment::getWorkCenterId).collect(Collectors.toList());
- List<String> list2 = workCenterUsers.stream().map(WorkCenterUser::getWorkCenterId).collect(Collectors.toList());
- Set<String> set = new TreeSet<>();
- set.addAll(list1);
- set.addAll(list2);
- if(CollectionUtils.isNotEmpty(set)){
- List<WorkCenter> workCenterList = workCenterService.listByIds(set);
- final String[] listMessage = {""};
- if(CollectionUtils.isNotEmpty(workCenterList)){
- workCenterList.stream().forEach(workCenter -> {
- listMessage[0] = listMessage[0] +workCenter.getCode()+",";
- });
- String trueMessage = "缂栧彿涓�"+listMessage[0]
- .substring(0, listMessage[0].length()-1)+"鐨勬暟鎹寮曠敤锛岀‘璁ゅ垹闄ゅ悧锛�";
- return Result.OK(trueMessage);
- }
- }
- return Result.OK("閫変腑鏁版嵁娌℃湁琚紩鐢紝鍙互瀹夊叏鍒犻櫎锛岀‘璁ゅ垹闄ゅ悧锛�");
- }
-}
diff --git a/src/main/java/org/jeecg/modules/base/controller/WorkCenterEquipmentController.java b/src/main/java/org/jeecg/modules/base/controller/WorkCenterEquipmentController.java
deleted file mode 100644
index a8646f7..0000000
--- a/src/main/java/org/jeecg/modules/base/controller/WorkCenterEquipmentController.java
+++ /dev/null
@@ -1,211 +0,0 @@
-package org.jeecg.modules.base.controller;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.core.toolkit.StringUtils;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.modules.base.entity.WorkCenterEquipment;
-import org.jeecg.modules.base.entity.WorkCenterUser;
-import org.jeecg.modules.base.service.IWorkCenterEquipmentService;
-
-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_base_work_center_equipment
- * @Author: jeecg-boot
- * @Date: 2022-12-06
- * @Version: V1.0
- */
-@Api(tags="宸ヤ綔涓績鍒嗛厤璁惧")
-@RestController
-@RequestMapping("/base/workCenterEquipment")
-@Slf4j
-public class WorkCenterEquipmentController extends JeecgController<WorkCenterEquipment, IWorkCenterEquipmentService> {
- @Autowired
- private IWorkCenterEquipmentService workCenterEquipmentService;
-
- /**
- * 鍒嗛〉鍒楄〃鏌ヨ
- *
- * @param map
- * @param pageNo
- * @param pageSize
- * @param workCenterId
- * @return
- */
- //@AutoLog(value = "mom_base_work_center_equipment-鍒嗛〉鍒楄〃鏌ヨ")
- @ApiOperation(value="mom_base_work_center_equipment-鍒嗛〉鍒楄〃鏌ヨ", notes="mom_base_work_center_equipment-鍒嗛〉鍒楄〃鏌ヨ")
- @GetMapping(value = "/list")
- public Result<IPage<Map<String,Object>>> queryPageList(Map map,
- @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
- @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
- @RequestParam(name="workCenterId",required = false) String workCenterId) {
- Page<Map<String,Object>> page = new Page<>(pageNo, pageSize);
- IPage<Map<String,Object>> pageList = workCenterEquipmentService.listByWorkCenterId(page,workCenterId);
- return Result.OK(pageList);
- }
-
- /**
- * 娣诲姞
- *
- * @param map
- * @return
- */
- @AutoLog(value = "mom_base_work_center_equipment-娣诲姞")
- @ApiOperation(value="mom_base_work_center_equipment-娣诲姞", notes="mom_base_work_center_equipment-娣诲姞")
- //@RequiresPermissions("org.jeecg.modules.demo:mom_base_work_center_equipment:add")
- @PostMapping(value = "/add")
- public Result<String> add(@RequestBody Map<String,Object> map) {
- String workCenterId = String.valueOf(map.get("workCenterId"));
- String addEquipmentIds = String.valueOf(map.get("addEquipmentList"));
- String enterpriseId = String.valueOf(map.get("enterpriseId"));
- List<String> addEquipmentList = Arrays.asList(addEquipmentIds.split(","));
- List<WorkCenterEquipment> list = new ArrayList<>();
- for(String equipmentId:addEquipmentList){
- WorkCenterEquipment workCenterEquipment = new WorkCenterEquipment();
- workCenterEquipment.setWorkCenterId(workCenterId)
- .setEquipmentId(equipmentId)
- .setEnterpriseId(enterpriseId)
- .setDelFlag(0);
- list.add(workCenterEquipment);
- }
- workCenterEquipmentService.saveBatch(list);
- return Result.OK("娣诲姞鎴愬姛锛�");
- }
-
- /**
- * 缂栬緫
- *
- * @param workCenterEquipment
- * @return
- */
- @AutoLog(value = "mom_base_work_center_equipment-缂栬緫")
- @ApiOperation(value="mom_base_work_center_equipment-缂栬緫", notes="mom_base_work_center_equipment-缂栬緫")
- //@RequiresPermissions("org.jeecg.modules.demo:mom_base_work_center_equipment:edit")
- @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
- public Result<String> edit(@RequestBody WorkCenterEquipment workCenterEquipment) {
- workCenterEquipmentService.updateById(workCenterEquipment);
- return Result.OK("缂栬緫鎴愬姛!");
- }
-
- /**
- * 閫氳繃id鍒犻櫎
- *
- * @param id
- * @return
- */
- @AutoLog(value = "mom_base_work_center_equipment-閫氳繃id鍒犻櫎")
- @ApiOperation(value="mom_base_work_center_equipment-閫氳繃id鍒犻櫎", notes="mom_base_work_center_equipment-閫氳繃id鍒犻櫎")
- @DeleteMapping(value = "/delete")
- public Result<String> delete(@RequestParam(name="id",required=true) String id) {
- UpdateWrapper<WorkCenterEquipment> updateWrapper
- = new UpdateWrapper<WorkCenterEquipment>()
- .set("del_flag",1)
- .eq("id",id);
- workCenterEquipmentService.update(updateWrapper);
- return Result.OK("鍒犻櫎鎴愬姛!");
- }
-
- /**
- * 鎵归噺鍒犻櫎
- *
- * @param ids
- * @return
- */
- @AutoLog(value = "mom_base_work_center_equipment-鎵归噺鍒犻櫎")
- @ApiOperation(value="mom_base_work_center_equipment-鎵归噺鍒犻櫎", notes="mom_base_work_center_equipment-鎵归噺鍒犻櫎")
- @DeleteMapping(value = "/deleteBatch")
- public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
- UpdateWrapper<WorkCenterEquipment> updateWrapper =
- new UpdateWrapper<WorkCenterEquipment>()
- .set("del_flag",1)
- .in("id",Arrays.asList(ids.split(",")));
- this.workCenterEquipmentService.update(updateWrapper);
- return Result.OK("鎵归噺鍒犻櫎鎴愬姛!");
- }
-
- /**
- * 閫氳繃id鏌ヨ
- *
- * @param id
- * @return
- */
- //@AutoLog(value = "mom_base_work_center_equipment-閫氳繃id鏌ヨ")
- @ApiOperation(value="mom_base_work_center_equipment-閫氳繃id鏌ヨ", notes="mom_base_work_center_equipment-閫氳繃id鏌ヨ")
- @GetMapping(value = "/queryById")
- public Result<WorkCenterEquipment> queryById(@RequestParam(name="id",required=true) String id) {
- WorkCenterEquipment workCenterEquipment = workCenterEquipmentService.getById(id);
- if(workCenterEquipment==null) {
- return Result.error("鏈壘鍒板搴旀暟鎹�");
- }
- return Result.OK(workCenterEquipment);
- }
-
- /**
- * 瀵煎嚭excel
- *
- * @param request
- * @param workCenterEquipment
- */
- //@RequiresPermissions("org.jeecg.modules.demo:mom_base_work_center_equipment:exportXls")
- @RequestMapping(value = "/exportXls")
- public ModelAndView exportXls(HttpServletRequest request, WorkCenterEquipment workCenterEquipment) {
- return super.exportXls(request, workCenterEquipment, WorkCenterEquipment.class, "mom_base_work_center_equipment");
- }
-
- /**
- * 閫氳繃excel瀵煎叆鏁版嵁
- *
- * @param request
- * @param response
- * @return
- */
- //@RequiresPermissions("mom_base_work_center_equipment:importExcel")
- @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
- public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
- return super.importExcel(request, response, WorkCenterEquipment.class);
- }
- /**
- * 鑾峰彇娣诲姞璁惧鍒楄〃
- *
- * @param pageNo
- * @param pageSize
- * @param equipmentCategoryId
- * @param workCenterEquipIds
- * @return
- */
- @GetMapping("/getAddEquipList")
- public Result<?> getAddEquipList( @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
- @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
- @RequestParam(name = "equipmentCategoryId",required = false) String equipmentCategoryId,
- @RequestParam(name = "workCenterEquipIds",required = false) String workCenterEquipIds
- ){
- List<String> equipmentIdList = new ArrayList<>();
- if(!StringUtils.isBlank(workCenterEquipIds)){
- equipmentIdList=Arrays.asList(workCenterEquipIds.split(","));
- }
- Page<Map<String,Object>> page = new Page<>(pageNo, pageSize);
- IPage<Map<String,Object>> pageList=workCenterEquipmentService
- .getAddEquipmentListByEquipmentCategoryId(page,equipmentCategoryId,equipmentIdList);
- return Result.OK(pageList);
- }
-
-}
diff --git a/src/main/java/org/jeecg/modules/base/controller/WorkCenterUserController.java b/src/main/java/org/jeecg/modules/base/controller/WorkCenterUserController.java
deleted file mode 100644
index 749a57e..0000000
--- a/src/main/java/org/jeecg/modules/base/controller/WorkCenterUserController.java
+++ /dev/null
@@ -1,273 +0,0 @@
-package org.jeecg.modules.base.controller;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.core.toolkit.StringUtils;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.modules.base.entity.WorkCenterEquipment;
-import org.jeecg.modules.base.entity.WorkCenterUser;
-import org.jeecg.modules.base.service.IFactoryModelService;
-import org.jeecg.modules.base.service.IWorkCenterUserService;
-
-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.jeecg.modules.system.service.ISysUserService;
-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_base_work_center_user
- * @Author: jeecg-boot
- * @Date: 2022-12-06
- * @Version: V1.0
- */
-@Api(tags="宸ヤ綔涓績鍒嗛厤浜哄憳")
-@RestController
-@RequestMapping("/base/workCenterUser")
-@Slf4j
-public class WorkCenterUserController extends JeecgController<WorkCenterUser, IWorkCenterUserService> {
- @Autowired
- private IWorkCenterUserService workCenterUserService;
- @Autowired
- private IFactoryModelService factoryModelService;
- /**
- * 鍒嗛〉鍒楄〃鏌ヨ
- *
- * @param map
- * @param pageNo
- * @param pageSize
- * @param workCenterId
- * @return
- */
- //@AutoLog(value = "mom_base_work_center_user-鍒嗛〉鍒楄〃鏌ヨ")
- @ApiOperation(value="mom_base_work_center_user-鍒嗛〉鍒楄〃鏌ヨ", notes="mom_base_work_center_user-鍒嗛〉鍒楄〃鏌ヨ")
- @GetMapping(value = "/list")
- public Result<IPage<Map<String,Object>>> queryPageList(Map map,
- @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
- @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
- @RequestParam(name="workCenterId",required = false) String workCenterId
- ) {
- Page<Map<String,Object>> page = new Page<>(pageNo, pageSize);
- IPage<Map<String,Object>> pageList = workCenterUserService.listByWorkCenterId(page,workCenterId);
- return Result.OK(pageList);
- }
-
- /**
- * 娣诲姞
- *
- * @param map
- * @return
- */
- @AutoLog(value = "mom_base_work_center_user-娣诲姞")
- @ApiOperation(value="mom_base_work_center_user-娣诲姞", notes="mom_base_work_center_user-娣诲姞")
- @PostMapping(value = "/add")
- public Result<String> add(@RequestBody Map<String,Object> map) {
- String workCenterId = String.valueOf(map.get("workCenterId"));
- String addUesrIds = String.valueOf(map.get("addUserIdList"));
- String enterpriseId = String.valueOf(map.get("enterpriseId"));
- List<String> addUserIdList = Arrays.asList(addUesrIds.split(","));
- List<WorkCenterUser> list = new ArrayList<>();
- for(String userId:addUserIdList){
- WorkCenterUser workCenterUser = new WorkCenterUser();
- workCenterUser.setWorkCenterId(workCenterId);
- workCenterUser.setUserId(userId);
- workCenterUser.setEnterpriseId(enterpriseId);
- workCenterUser.setDelFlag(0);
- list.add(workCenterUser);
- }
- workCenterUserService.saveBatch(list);
- return Result.OK("娣诲姞鎴愬姛锛�");
- }
-
- /**
- * 缂栬緫
- *
- * @param workCenterUser
- * @return
- */
- @AutoLog(value = "mom_base_work_center_user-缂栬緫")
- @ApiOperation(value="mom_base_work_center_user-缂栬緫", notes="mom_base_work_center_user-缂栬緫")
- //@RequiresPermissions("org.jeecg.modules.demo:mom_base_work_center_user:edit")
- @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
- public Result<String> edit(@RequestBody WorkCenterUser workCenterUser) {
- workCenterUserService.updateById(workCenterUser);
- return Result.OK("缂栬緫鎴愬姛!");
- }
-
- /**
- * 閫氳繃id鍒犻櫎
- *
- * @param id
- * @return
- */
- @AutoLog(value = "mom_base_work_center_user-閫氳繃id鍒犻櫎")
- @ApiOperation(value="mom_base_work_center_user-閫氳繃id鍒犻櫎", notes="mom_base_work_center_user-閫氳繃id鍒犻櫎")
- //@RequiresPermissions("org.jeecg.modules.demo:mom_base_work_center_user:delete")
- @DeleteMapping(value = "/delete")
- public Result<String> delete(@RequestParam(name="id",required=true) String id) {
- UpdateWrapper<WorkCenterUser> updateWrapper = new UpdateWrapper<WorkCenterUser>()
- .set("del_flag",1).eq("id",id);
- workCenterUserService.update(updateWrapper);
- return Result.OK("鍒犻櫎鎴愬姛!");
- }
-
- /**
- * 鎵归噺鍒犻櫎
- *
- * @param ids
- * @return
- */
- @AutoLog(value = "mom_base_work_center_user-鎵归噺鍒犻櫎")
- @ApiOperation(value="mom_base_work_center_user-鎵归噺鍒犻櫎", notes="mom_base_work_center_user-鎵归噺鍒犻櫎")
- //@RequiresPermissions("org.jeecg.modules.demo:mom_base_work_center_user:deleteBatch")
- @DeleteMapping(value = "/deleteBatch")
- public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
- UpdateWrapper<WorkCenterUser> updateWrapper = new UpdateWrapper<WorkCenterUser>()
- .in("id",Arrays.asList(ids.split(",")))
- .set("del_flag",1);
- this.workCenterUserService.update(updateWrapper);
- return Result.OK("鎵归噺鍒犻櫎鎴愬姛!");
- }
-
- /**
- * 閫氳繃id鏌ヨ
- *
- * @param id
- * @return
- */
- //@AutoLog(value = "mom_base_work_center_user-閫氳繃id鏌ヨ")
- @ApiOperation(value="mom_base_work_center_user-閫氳繃id鏌ヨ", notes="mom_base_work_center_user-閫氳繃id鏌ヨ")
- @GetMapping(value = "/queryById")
- public Result<WorkCenterUser> queryById(@RequestParam(name="id",required=true) String id) {
- WorkCenterUser workCenterUser = workCenterUserService.getById(id);
- if(workCenterUser==null) {
- return Result.error("鏈壘鍒板搴旀暟鎹�");
- }
- return Result.OK(workCenterUser);
- }
-
- /**
- * 瀵煎嚭excel
- *
- * @param request
- * @param workCenterUser
- */
- //@RequiresPermissions("org.jeecg.modules.demo:mom_base_work_center_user:exportXls")
- @RequestMapping(value = "/exportXls")
- public ModelAndView exportXls(HttpServletRequest request, WorkCenterUser workCenterUser) {
- return super.exportXls(request, workCenterUser, WorkCenterUser.class, "mom_base_work_center_user");
- }
-
- /**
- * 閫氳繃excel瀵煎叆鏁版嵁
- *
- * @param request
- * @param response
- * @return
- */
- //@RequiresPermissions("mom_base_work_center_user:importExcel")
- @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
- public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
- return super.importExcel(request, response, WorkCenterUser.class);
- }
- /**
- * 閫氳繃鑾峰彇宸ュ巶寤烘ā鑾峰彇閮ㄩ棬Id
- *
- * @param id
- * @return
- */
- @GetMapping("/getDepartId")
- public Result<?> getFactoryModelById(@RequestParam("parentFactoryModelId") String id) {
- return Result.OK(factoryModelService.getById(id));
- }
- /**
- * 寰呭垎閰嶄汉鍛樺垪琛ㄦ煡璇�
- *
- * @param map
- * @param pageNo
- * @param pageSize
- * @param departId
- * @param userIdList
- * @param enterpriseId
- * @return
- */
- //@AutoLog(value = "mom_base_work_center_user-鍒嗛〉鍒楄〃鏌ヨ")
- @ApiOperation(value="mom_base_work_center_user-鍒嗛〉鍒楄〃鏌ヨ", notes="mom_base_work_center_user-鍒嗛〉鍒楄〃鏌ヨ")
- @GetMapping(value = "/userList")
- public Result<IPage<Map<String,Object>>> queryPageUserList(Map map,
- @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
- @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
- @RequestParam(name="departId",required = false) String departId,
- @RequestParam(name="userIdList",required = false)String userIdList,
- @RequestParam(name="enterpriseId",required = false)String enterpriseId
- ) {
-
- List<String> uids = new ArrayList<>();
- if(!StringUtils.isBlank(userIdList)){
- uids=Arrays.asList(userIdList.split(","));
- }
- if(StringUtils.isBlank(enterpriseId)){
- Page<Map<String,Object>> page = new Page<>(pageNo, pageSize);
- IPage<Map<String,Object>> pageList = workCenterUserService.getAddUserList(page,departId,uids);
- return Result.OK(pageList);
- }else {
- Page<Map<String,Object>> page = new Page<>(pageNo, pageSize);
- IPage<Map<String,Object>> pageList=workCenterUserService.listByEnterpriseId(page,enterpriseId,uids,departId);
- return Result.OK(pageList);
- }
- }
- /**
- * 鏈儴闂ㄥ緟鍒嗛厤浜哄憳鍒楄〃鏌ヨ
- *
- * @param map
- * @param pageNo
- * @param pageSize
- * @param departId
- * @param userIdList
- * @return
- */
- @GetMapping(value = "/ownUserList")
- public Result<?> getOwnUsers(Map map,
- @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
- @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
- @RequestParam(name="departId",required = false) String departId,
- @RequestParam(name="userIdList",required = false)String userIdList){
- List<String> uids = new ArrayList<>();
- if(!StringUtils.isBlank(userIdList)){
- uids=Arrays.asList(userIdList.split(","));
- }
- Page<Map<String,Object>> page = new Page<>(pageNo, pageSize);
- IPage<Map<String,Object>> pageList=workCenterUserService.getUserList(page,uids,departId);
- return Result.OK(pageList);
-
- }
- /**
- * 鑾峰彇浜哄憳鍊熺敤閮ㄩ棬鏍�
- *
- * @param enterpriseId
- * @param departId
- * @return
- */
- @GetMapping("/departTree")
- public Result<?> loadBorrowTree(@RequestParam("enterpriseId") String enterpriseId,
- @RequestParam("departId")String departId,
- @RequestParam("version")Integer version
- ){
- return Result.ok(workCenterUserService.getDepartTreeByEnterpriseId(enterpriseId,departId,version));
- }
-}
diff --git a/src/main/java/org/jeecg/modules/base/entity/Client.java b/src/main/java/org/jeecg/modules/base/entity/Client.java
deleted file mode 100644
index 3a969e4..0000000
--- a/src/main/java/org/jeecg/modules/base/entity/Client.java
+++ /dev/null
@@ -1,147 +0,0 @@
-package org.jeecg.modules.base.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-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.aspect.annotation.Dict;
-import org.jeecg.common.constant.CommonConstant;
-import org.jeecg.common.system.base.entity.JeecgEntity;
-import org.jeecgframework.poi.excel.annotation.Excel;
-
-import java.io.Serializable;
-
-/**
- * @author
- */
-@Data
-@TableName("mom_base_client")
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "mom_base_client瀵硅薄", description = "mom_base_client")
-public class Client extends JeecgEntity implements Serializable {
- private static final long serialVersionUID = 1L;
-
- /**
- * 瀹㈡埛缂栫爜
- */
- @Excel(name = "瀹㈡埛缂栫爜", width = 15)
- @ApiModelProperty(value = "瀹㈡埛缂栫爜")
- private String num;
- /**
- * 瀹㈡埛鍚嶇О
- */
- @Excel(name = "瀹㈡埛鍚嶇О", width = 15)
- @ApiModelProperty(value = "瀹㈡埛鍚嶇О")
- private String name;
-
- /**
- * 绠�绉�
- */
- @Excel(name = "绠�绉�", width = 15)
- @ApiModelProperty(value = "绠�绉�")
- private String abbreviation;
-
- /**
- * 瀹㈡埛绫诲瀷
- */
- @Excel(name = "瀹㈡埛绫诲瀷", width = 15,dicCode = "client_type")
- @ApiModelProperty(value = "瀹㈡埛绫诲瀷")
- @Dict(dicCode = "client_type")
- private String clientType;
-
- /**
- * 鎵�灞炶涓�
- */
- @Excel(name = "鎵�灞炶涓�", width = 15)
- @ApiModelProperty(value = "鎵�灞炶涓�")
- private String affiliationIndustry;
-
-
- /**
- * 鍦板潃
- */
-
- @Excel(name = "鍦板潃",width = 30)
- @ApiModelProperty(value = "鍦板潃")
- private String address;
-
-
-
-
- /**
- * 绉熸埛id
- */
- @Excel(name = "绉熸埛id", width = 15)
- @ApiModelProperty(value = "绉熸埛id")
- private String tenantId;
-
-
- /**
- * 鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)
- */
- @Excel(name = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)", width = 15)
- @ApiModelProperty(value = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)")
- private Integer delFlag = CommonConstant.DEL_FLAG_0;
- /**
- * 澶囨敞
- */
- @Excel(name = "澶囨敞", width = 15)
- @ApiModelProperty(value = "澶囨敞")
- private String remark;
- /**
- * 澶囩敤瀛楁1
- */
- @Excel(name = "澶囩敤瀛楁1", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁1")
- private String clientUda1;
- /**
- * 澶囩敤瀛楁2
- */
- @Excel(name = "澶囩敤瀛楁2", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁2")
- private String clientUda2;
- /**
- * 澶囩敤瀛楁3
- */
- @Excel(name = "澶囩敤瀛楁3", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁3")
- private String clientUda3;
- /**
- * 澶囩敤瀛楁4
- */
- @Excel(name = "澶囩敤瀛楁4", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁4")
- private String clientUda4;
- /**
- * 澶囩敤瀛楁5
- */
- @Excel(name = "澶囩敤瀛楁5", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁5")
- private String clientUda5;
- /**
- * 鐘舵�� 0 绂佺敤 1 鍚敤
- */
- @Excel(name = "鐘舵�� 0 绂佺敤 1 鍚敤", width = 15)
- @ApiModelProperty(value = "鐘舵�� 0 绂佺敤 1 鍚敤")
- private String status = CommonConstant.STATUS_1;
-
- /**
- * 瀹㈡埛鍒嗙被Id
- */
- @Excel(name = "supplier_category_id", width = 15)
- @ApiModelProperty(value = "supplier_category_id")
- private String clientCategoryId;
-
-
-
-
-
-
- @ApiModelProperty(value = "瀹㈡埛鍒嗙被缂栫爜/鍚嶇О")
- @TableField(exist = false)
- private String clientCategoryNumName;
-}
diff --git a/src/main/java/org/jeecg/modules/base/entity/ClientCategory.java b/src/main/java/org/jeecg/modules/base/entity/ClientCategory.java
deleted file mode 100644
index b332989..0000000
--- a/src/main/java/org/jeecg/modules/base/entity/ClientCategory.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package org.jeecg.modules.base.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.constant.CommonConstant;
-import org.jeecg.common.system.base.entity.JeecgEntity;
-import org.jeecgframework.poi.excel.annotation.Excel;
-
-import java.io.Serializable;
-
-@Data
-@TableName("mom_base_client_category")
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "mom_base_client_category瀵硅薄", description = "mom_base_client_category")
-public class ClientCategory extends JeecgEntity implements Serializable {
- private static final long serialVersionUID = 1L;
-
- /**鐖秈d*/
- @Excel(name = "鐖秈d", width = 15)
- @ApiModelProperty(value = "鐖秈d")
- private String parentId;
- /**缂栫爜*/
- @Excel(name = "缂栫爜", width = 15)
- @ApiModelProperty(value = "缂栫爜")
- private String num;
- /**鍚嶇О*/
- @Excel(name = "鍚嶇О", width = 15)
- @ApiModelProperty(value = "鍚嶇О")
- private String name;
- /**绉熸埛id*/
- @Excel(name = "绉熸埛id", width = 15)
- @ApiModelProperty(value = "绉熸埛id")
- private String tenantId;
- /**鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)*/
- @Excel(name = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)", width = 15)
- @ApiModelProperty(value = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)")
- private Integer delFlag = CommonConstant.DEL_FLAG_0;
- /**澶囨敞*/
- @Excel(name = "澶囨敞", width = 15)
- @ApiModelProperty(value = "澶囨敞")
- private String remark;
- /**澶囩敤瀛楁1*/
- @Excel(name = "澶囩敤瀛楁1", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁1")
- private String clientCategoryUda1;
- /**澶囩敤瀛楁2*/
- @Excel(name = "澶囩敤瀛楁2", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁2")
- private String clientCategoryUda2;
- /**澶囩敤瀛楁3*/
- @Excel(name = "澶囩敤瀛楁3", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁3")
- private String clientCategoryUda3;
- /**澶囩敤瀛楁4*/
- @Excel(name = "澶囩敤瀛楁4", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁4")
- private String clientCategoryUda4;
- /**澶囩敤瀛楁5*/
- @Excel(name = "澶囩敤瀛楁5", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁5")
- private String clientCategoryUda5;
- /**鐘舵�� 0 绂佺敤 1 鍚敤*/
- @Excel(name = "鐘舵�� 0 绂佺敤 1 鍚敤", width = 15)
- @ApiModelProperty(value = "鐘舵�� 0 绂佺敤 1 鍚敤")
- private String status = CommonConstant.STATUS_1;
-}
diff --git a/src/main/java/org/jeecg/modules/base/entity/ClientContact.java b/src/main/java/org/jeecg/modules/base/entity/ClientContact.java
deleted file mode 100644
index 08281dd..0000000
--- a/src/main/java/org/jeecg/modules/base/entity/ClientContact.java
+++ /dev/null
@@ -1,139 +0,0 @@
-package org.jeecg.modules.base.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.aspect.annotation.Dict;
-import org.jeecg.common.constant.CommonConstant;
-import org.jeecg.common.system.base.entity.JeecgEntity;
-import org.jeecgframework.poi.excel.annotation.Excel;
-
-import java.io.Serializable;
-
-@Data
-@TableName("mom_base_client_contact")
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "mom_base_client_contact瀵硅薄", description = "mom_base_client_contact")
-public class ClientContact extends JeecgEntity implements Serializable {
- private static final long serialVersionUID = 1L;
-
-
- /**
- * 鑱旂郴浜哄悕绉�
- */
- @Excel(name = "鑱旂郴浜哄悕绉�", width = 15)
- @ApiModelProperty(value = "鑱旂郴浜哄悕绉�")
- private String name;
-
- /**
- * 鎬у埆锛�0锛氱敺 1锛氬コ锛�
- */
- @Excel(name = "鎬у埆", width = 15,dicCode = "sex")
- @Dict(dicCode = "sex")
- @ApiModelProperty(value = "鎬у埆")
- private String sex;
-
-
- /**
- * 鑱屼綅
- */
-
- @Excel(name = "鑱屼綅", width = 15)
- @ApiModelProperty(value = "鑱屼綅")
- private String position;
-
- /**
- * 鐢靛瓙閭欢
- */
- @Excel(name = "鐢靛瓙閭欢", width = 15)
- @ApiModelProperty(value = "鐢靛瓙閭欢")
- private String email;
-
- /**
- * 鐢佃瘽
- */
- @Excel(name = "鐢佃瘽", width = 15)
- @ApiModelProperty(value = "鐢佃瘽")
- private String phone;
-
- /**
- * 鐢佃瘽
- */
- @Excel(name = "鏄惁榛樿", width = 15)
- @ApiModelProperty(value = "鏄惁榛樿")
- @Dict(dicCode = "default_value")
- private String defaultValue;
-
-
-
-
-
- /**
- * 渚涘簲鍟咺D
- */
- @Excel(name = "client_id", width = 15)
- @ApiModelProperty(value = "瀹㈡埛id")
- private String clientId;
-
-
- /**
- * 绉熸埛id
- */
- @Excel(name = "绉熸埛id", width = 15)
- @ApiModelProperty(value = "绉熸埛id")
- private String tenantId;
-
-
- /**
- * 鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)
- */
- @Excel(name = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)", width = 15)
- @ApiModelProperty(value = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)")
- private Integer delFlag = CommonConstant.DEL_FLAG_0;
- /**
- * 澶囨敞
- */
- @Excel(name = "澶囨敞", width = 15)
- @ApiModelProperty(value = "澶囨敞")
- private String remark;
- /**
- * 澶囩敤瀛楁1
- */
- @Excel(name = "澶囩敤瀛楁1", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁1")
- private String clientContactUda1;
- /**
- * 澶囩敤瀛楁2
- */
- @Excel(name = "澶囩敤瀛楁2", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁2")
- private String clientContactUda2;
- /**
- * 澶囩敤瀛楁3
- */
- @Excel(name = "澶囩敤瀛楁3", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁3")
- private String clientContactUda3;
- /**
- * 澶囩敤瀛楁4
- */
- @Excel(name = "澶囩敤瀛楁4", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁4")
- private String clientContactUda4;
- /**
- * 澶囩敤瀛楁5
- */
- @Excel(name = "澶囩敤瀛楁5", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁5")
- private String clientContactUda5;
- /**
- * 鐘舵�� 0 绂佺敤 1 鍚敤
- */
- @Excel(name = "鐘舵�� 0 绂佺敤 1 鍚敤", width = 15)
- @ApiModelProperty(value = "鐘舵�� 0 绂佺敤 1 鍚敤")
- private String status = CommonConstant.STATUS_1;
-}
diff --git a/src/main/java/org/jeecg/modules/base/entity/Constructor.java b/src/main/java/org/jeecg/modules/base/entity/Constructor.java
deleted file mode 100644
index 6143765..0000000
--- a/src/main/java/org/jeecg/modules/base/entity/Constructor.java
+++ /dev/null
@@ -1,105 +0,0 @@
-package org.jeecg.modules.base.entity;
-
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import org.jeecg.common.constant.CommonConstant;
-import org.jeecg.common.system.base.entity.JeecgEntity;
-import org.jeecgframework.poi.excel.annotation.Excel;
-
-import java.io.Serializable;
-
-@TableName("mom_base_constructor")
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "mom_base_constructor", description = "鍒堕�犲晢")
-public class Constructor extends JeecgEntity implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
-
- /**
- * 鍒堕�犲晢缂栫爜
- */
- @Excel(name = "鍒堕�犲晢缂栫爜", width = 15)
- @ApiModelProperty(value = "鍒堕�犲晢缂栫爜")
- private String num;
-
- /**
- * 鍒堕�犲晢鍚嶇О
- */
- @Excel(name = "鍒堕�犲晢鍚嶇О", width = 15)
- @ApiModelProperty(value = "鍒堕�犲晢鍚嶇О")
- private String name;
-
-
-
- /**
- * 绉熸埛id
- */
- @Excel(name = "绉熸埛id", width = 15)
- @ApiModelProperty(value = "绉熸埛id")
- private String tenantId;
- /**
- * 鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)
- */
- @JsonIgnore
- @Excel(name = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)", width = 15)
- @ApiModelProperty(value = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)", hidden = true)
- @TableLogic
- private Integer delFlag = CommonConstant.DEL_FLAG_0;
- /**
- * 澶囨敞
- */
- @Excel(name = "澶囨敞", width = 15)
- @ApiModelProperty(value = "澶囨敞")
- private String remark;
-
-
-
-
- /**
- * 澶囩敤瀛楁1
- */
- @Excel(name = "澶囩敤瀛楁1", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁1")
- private String constructorUda1;
- /**
- * 澶囩敤瀛楁2
- */
- @Excel(name = "澶囩敤瀛楁2", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁2")
- private String constructorUda2;
- /**
- * 澶囩敤瀛楁3
- */
- @Excel(name = "澶囩敤瀛楁3", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁3")
- private String constructorUda3;
- /**
- * 澶囩敤瀛楁4
- */
- @Excel(name = "澶囩敤瀛楁4", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁4")
- private String constructorUda4;
- /**
- * 澶囩敤瀛楁5
- */
- @Excel(name = "澶囩敤瀛楁5", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁5")
- private String constructorUda5;
-
- /**
- * 鐘舵�� 0 绂佺敤 1 鍚敤
- */
- @Excel(name = "鐘舵�� 0 绂佺敤 1 鍚敤", width = 15)
- @ApiModelProperty(value = "鐘舵�� 0 绂佺敤 1 鍚敤")
- private String status = CommonConstant.STATUS_1;
-
-}
diff --git a/src/main/java/org/jeecg/modules/base/entity/Enterprise.java b/src/main/java/org/jeecg/modules/base/entity/Enterprise.java
deleted file mode 100644
index c2d11a2..0000000
--- a/src/main/java/org/jeecg/modules/base/entity/Enterprise.java
+++ /dev/null
@@ -1,148 +0,0 @@
-package org.jeecg.modules.base.entity;
-
-import java.io.Serializable;
-import java.io.UnsupportedEncodingException;
-import java.util.Date;
-import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.jeecgframework.poi.excel.annotation.Excel;
-import org.jeecg.common.aspect.annotation.Dict;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * @Description: 浼佷笟鏋舵瀯
- * @Author: jeecg-boot
- * @Date: 2022-11-21
- * @Version: V1.0
- */
-@Data
-@TableName("mom_base_enterprise")
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value="mom_base_enterprise瀵硅薄", description="浼佷笟鏋舵瀯")
-public class Enterprise implements Serializable {
- private static final long serialVersionUID = 1L;
-
- /**涓婚敭ID*/
- @TableId(type = IdType.ASSIGN_ID)
- @ApiModelProperty(value = "涓婚敭ID")
- private String id;
- /**鍏徃缂栫爜*/
- @Excel(name = "鍏徃缂栫爜", width = 15)
- @ApiModelProperty(value = "鍏徃缂栫爜")
- private String code;
- /**鍏徃鍚嶇О锛堢畝绉帮級*/
- @Excel(name = "鍏徃鍚嶇О锛堢畝绉帮級", width = 15)
- @ApiModelProperty(value = "鍏徃鍚嶇О锛堢畝绉帮級")
- private String name;
- /**涓婄骇ID*/
- @Excel(name = "涓婄骇ID", width = 15)
- @ApiModelProperty(value = "涓婄骇ID")
- private String parentId;
- /**缁熶竴绀句細淇＄敤浠ｇ爜*/
- @Excel(name = "缁熶竴绀句細淇＄敤浠ｇ爜", width = 15)
- @ApiModelProperty(value = "缁熶竴绀句細淇＄敤浠ｇ爜")
- private String creditCode;
- /**鍏ㄧО*/
- @Excel(name = "鍏ㄧО", width = 15)
- @ApiModelProperty(value = "鍏ㄧО")
- private String fullName;
- /**鑻辨枃鍚�*/
- @Excel(name = "鑻辨枃鍚�", width = 15)
- @ApiModelProperty(value = "鑻辨枃鍚�")
- private String englishName;
- /**鍦板潃*/
- @Excel(name = "鍦板潃", width = 15)
- @ApiModelProperty(value = "鍦板潃")
- private String address;
- /**寮�鎴疯*/
- @Excel(name = "寮�鎴疯", width = 15)
- @ApiModelProperty(value = "寮�鎴疯")
- private String openingBank;
- /**閾惰璐︽埛*/
- @Excel(name = "閾惰璐︽埛", width = 15)
- @ApiModelProperty(value = "閾惰璐︽埛")
- private String account;
- /**鑱旂郴浜�*/
- @Excel(name = "鑱旂郴浜�", width = 15)
- @ApiModelProperty(value = "鑱旂郴浜�")
- private String contact;
- /**鎵嬫満*/
- @Excel(name = "鎵嬫満", width = 15)
- @ApiModelProperty(value = "鎵嬫満")
- private String phoneNumber;
- /**鐢佃瘽*/
- @Excel(name = "鐢佃瘽", width = 15)
- @ApiModelProperty(value = "鐢佃瘽")
- private String companyTelephone;
- /**閭*/
- @Excel(name = "閭", width = 15)
- @ApiModelProperty(value = "閭")
- private String email;
- /**澶囨敞*/
- @Excel(name = "澶囨敞", width = 15)
- @ApiModelProperty(value = "澶囨敞")
- private String remark;
- /**鐗堟湰*/
- @Excel(name = "鐗堟湰", width = 15)
- @ApiModelProperty(value = "鐗堟湰")
- private Integer version;
- /**鐘舵��(1- 姝ｅ父 ,0- 鍐荤粨)*/
- @Excel(name = "鐘舵��(1- 姝ｅ父 ,0- 鍐荤粨)", width = 15)
- @ApiModelProperty(value = "鐘舵��(1- 姝ｅ父 ,0- 鍐荤粨)")
- private String status;
- /**浼佷笟澶囩敤瀛楁1*/
- @Excel(name = "浼佷笟澶囩敤瀛楁1", width = 15)
- @ApiModelProperty(value = "浼佷笟澶囩敤瀛楁1")
- private String enterpriseUda1;
- /**浼佷笟澶囩敤瀛楁2*/
- @Excel(name = "浼佷笟澶囩敤瀛楁2", width = 15)
- @ApiModelProperty(value = "浼佷笟澶囩敤瀛楁2")
- private String enterpriseUda2;
- /**浼佷笟澶囩敤瀛楁3*/
- @Excel(name = "浼佷笟澶囩敤瀛楁3", width = 15)
- @ApiModelProperty(value = "浼佷笟澶囩敤瀛楁3")
- private String enterpriseUda3;
- /**浼佷笟澶囩敤瀛楁4*/
- @Excel(name = "浼佷笟澶囩敤瀛楁4", width = 15)
- @ApiModelProperty(value = "浼佷笟澶囩敤瀛楁4")
- private String enterpriseUda4;
- /**浼佷笟澶囩敤瀛楁5*/
- @Excel(name = "浼佷笟澶囩敤瀛楁5", width = 15)
- @ApiModelProperty(value = "浼佷笟澶囩敤瀛楁5")
- private String enterpriseUda5;
- /**鍒涘缓浜�*/
- @ApiModelProperty(value = "鍒涘缓浜�")
- private String createBy;
- /**鍒涘缓鏃堕棿*/
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
- @DateTimeFormat(pattern="yyyy-MM-dd")
- @ApiModelProperty(value = "鍒涘缓鏃堕棿")
- private Date createTime;
- /**鏇存柊浜�*/
- @ApiModelProperty(value = "鏇存柊浜�")
- private String updateBy;
- /**鏇存柊鏃堕棿*/
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
- @DateTimeFormat(pattern="yyyy-MM-dd")
- @ApiModelProperty(value = "鏇存柊鏃堕棿")
- private Date updateTime;
- /**绉熸埛ID*/
- @Excel(name = "绉熸埛ID", width = 15)
- @ApiModelProperty(value = "绉熸埛ID")
- private String tenantId;
- /**鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)*/
- @Excel(name = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)", width = 15)
- @ApiModelProperty(value = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)")
- private Integer delFlag;
- @ApiModelProperty(value = "鐗堟湰鏁版嵁Id")
- private String dataVersionId;
-}
diff --git a/src/main/java/org/jeecg/modules/base/entity/EnterpriseAdministrator.java b/src/main/java/org/jeecg/modules/base/entity/EnterpriseAdministrator.java
deleted file mode 100644
index 1ce5526..0000000
--- a/src/main/java/org/jeecg/modules/base/entity/EnterpriseAdministrator.java
+++ /dev/null
@@ -1,84 +0,0 @@
-package org.jeecg.modules.base.entity;
-
-import java.io.Serializable;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.experimental.Accessors;
-import org.jeecg.common.aspect.annotation.Dict;
-import lombok.Data;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.jeecgframework.poi.excel.annotation.Excel;
-import java.util.Date;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.io.UnsupportedEncodingException;
-
-/**
- * @Description: mom_base_enterprise_administrator
- * @Author: jeecg-boot
- * @Date: 2023-01-12
- * @Version: V1.0
- */
-@Data
-@TableName("mom_base_enterprise_administrator")
-@ApiModel(value="mom_base_enterprise_administrator瀵硅薄", description="mom_base_enterprise_administrator")
-@Accessors(chain = true)
-public class EnterpriseAdministrator implements Serializable {
- private static final long serialVersionUID = 1L;
- /**涓婚敭ID*/
- @TableId(type = IdType.ASSIGN_ID)
- @ApiModelProperty(value = "涓婚敭ID")
- private String id;
- /**浼佷笟ID*/
- @Excel(name = "浼佷笟ID", width = 15)
- @ApiModelProperty(value = "浼佷笟ID")
- private String enterpriseId;
- /**绯荤粺绠＄悊鍛業D*/
- @ApiModelProperty(value = "绯荤粺绠＄悊鍛業D")
- private String administratorId;
- /**鎺堟潈浜�*/
- @ApiModelProperty(value = "鎺堟潈鏃堕棿")
- private String authName;
- /**澶囩敤瀛楁1*/
- @Excel(name = "澶囩敤瀛楁1", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁1")
- private String sysAdministratorUda1;
- /**澶囩敤瀛楁2*/
- @Excel(name = "澶囩敤瀛楁2", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁2")
- private String sysAdministratorUda2;
- /**澶囩敤瀛楁3*/
- @Excel(name = "澶囩敤瀛楁3", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁3")
- private String sysAdministratorUda3;
- /**澶囩敤瀛楁4*/
- @Excel(name = "澶囩敤瀛楁4", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁4")
- private String sysAdministratorUda4;
- /**澶囩敤瀛楁5*/
- @Excel(name = "澶囩敤瀛楁5", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁5")
- private String sysAdministratorUda5;
- /**鍒涘缓浜�*/
- @ApiModelProperty(value = "鍒涘缓浜�")
- private String createBy;
- /**鍒涘缓鏃堕棿*/
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
- @DateTimeFormat(pattern="yyyy-MM-dd")
- @ApiModelProperty(value = "鍒涘缓鏃堕棿")
- private Date createTime;
- /**鏇存柊浜�*/
- @ApiModelProperty(value = "鏇存柊浜�")
- private String updateBy;
- /**鏇存柊鏃堕棿*/
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
- @DateTimeFormat(pattern="yyyy-MM-dd")
- @ApiModelProperty(value = "鏇存柊鏃堕棿")
- private Date updateTime;
- /**鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)*/
- @Excel(name = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)", width = 15)
- @ApiModelProperty(value = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)")
- private Integer delFlag;
-}
diff --git a/src/main/java/org/jeecg/modules/base/entity/Factory.java b/src/main/java/org/jeecg/modules/base/entity/Factory.java
new file mode 100644
index 0000000..b3c8007
--- /dev/null
+++ b/src/main/java/org/jeecg/modules/base/entity/Factory.java
@@ -0,0 +1,97 @@
+package org.jeecg.modules.base.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.jeecg.common.constant.CommonConstant;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: 宸ュ巶/杞﹂棿/浜х嚎
+ * @Author: jeecg-boot
+ * @Date: 2025-06-24
+ * @Version: V1.0
+ */
+@Data
+@TableName("base_factory")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="base_factory瀵硅薄", description="宸ュ巶/杞﹂棿/浜х嚎")
+public class Factory implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ /**涓婚敭*/
+ @TableId(type = IdType.ASSIGN_ID)
+ @ApiModelProperty(value = "涓婚敭")
+ private String id;
+ /**鍒涘缓浜�*/
+ @ApiModelProperty(value = "鍒涘缓浜�")
+ private String createBy;
+ /**鍒涘缓鏃堕棿*/
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern="yyyy-MM-dd")
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ private Date createTime;
+ /**鏇存柊浜�*/
+ @ApiModelProperty(value = "鏇存柊浜�")
+ private String updateBy;
+ /**鏇存柊鏃堕棿*/
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern="yyyy-MM-dd")
+ @ApiModelProperty(value = "鏇存柊鏃堕棿")
+ private Date updateTime;
+ /**鍒犻櫎鏍囪*/
+ @Excel(name = "鍒犻櫎鏍囪", width = 15)
+ @ApiModelProperty(value = "鍒犻櫎鏍囪")
+ @TableLogic
+ private Integer delFlag = CommonConstant.DEL_FLAG_0;
+ /**鍚嶇О*/
+ @Excel(name = "鍚嶇О", width = 15)
+ @ApiModelProperty(value = "鍚嶇О")
+ private String factoryName;
+ /**缂栫爜*/
+ @Excel(name = "缂栫爜", width = 15)
+ @ApiModelProperty(value = "缂栫爜")
+ private String factoryCode;
+ /**鐖惰妭鐐�*/
+ @Excel(name = "鐖惰妭鐐�", width = 15)
+ @ApiModelProperty(value = "鐖惰妭鐐�")
+ private String parentId;
+ /**鐘舵��*/
+ @Excel(name = "鐘舵��", width = 15)
+ @ApiModelProperty(value = "鐘舵��")
+ private String factoryStatus;
+ /**鍒嗙被锛屽伐鍘�/杞﹂棿/浜х嚎*/
+ @Excel(name = "鍒嗙被锛屽伐鍘�/杞﹂棿/浜х嚎", width = 15)
+ @ApiModelProperty(value = "鍒嗙被锛屽伐鍘�/杞﹂棿/浜х嚎")
+ private String factoryCategory;
+ /**鎺掑簭*/
+ @Excel(name = "鎺掑簭", width = 15)
+ @ApiModelProperty(value = "鎺掑簭")
+ private Integer sorter;
+ /**鍦板潃*/
+ @Excel(name = "鍦板潃", width = 15)
+ @ApiModelProperty(value = "鍦板潃")
+ private String address;
+ /**MDC灞曠ず鏍囪瘑*/
+ @Excel(name = "MDC灞曠ず鏍囪瘑", width = 15)
+ @ApiModelProperty(value = "MDC灞曠ず鏍囪瘑")
+ private String mdcFlag;
+ /**澶囨敞*/
+ @Excel(name = "澶囨敞", width = 15)
+ @ApiModelProperty(value = "澶囨敞")
+ private String remark;
+}
diff --git a/src/main/java/org/jeecg/modules/base/entity/FactoryElementCategory.java b/src/main/java/org/jeecg/modules/base/entity/FactoryElementCategory.java
deleted file mode 100644
index 69cc998..0000000
--- a/src/main/java/org/jeecg/modules/base/entity/FactoryElementCategory.java
+++ /dev/null
@@ -1,88 +0,0 @@
-package org.jeecg.modules.base.entity;
-
-import java.io.Serializable;
-import java.io.UnsupportedEncodingException;
-import java.util.Date;
-import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.jeecgframework.poi.excel.annotation.Excel;
-import org.jeecg.common.aspect.annotation.Dict;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * @Description: 宸ュ巶瑕佺礌绫诲瀷
- * @Author: jeecg-boot
- * @Date: 2022-11-07
- * @Version: V1.0
- */
-@Data
-@TableName("mom_base_factory_element_category")
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value="mom_base_factory_element_category瀵硅薄", description="宸ュ巶瑕佺礌绫诲瀷")
-public class FactoryElementCategory implements Serializable {
- private static final long serialVersionUID = 1L;
-
- /**涓婚敭*/
- @TableId(type = IdType.ASSIGN_ID)
- @ApiModelProperty(value = "涓婚敭")
- private String id;
- /**绫诲瀷缂栫爜*/
- @Excel(name = "绫诲瀷缂栫爜", width = 15)
- @ApiModelProperty(value = "绫诲瀷缂栫爜")
- private String code;
- /**绫诲瀷鍚嶇О*/
- @Excel(name = "绫诲瀷鍚嶇О", width = 15)
- @ApiModelProperty(value = "绫诲瀷鍚嶇О")
- private String name;
- /**澶囩敤瀛楁1*/
- @ApiModelProperty(value = "澶囩敤瀛楁1")
- private String factoryElementCategoryUda1;
- /**澶囩敤瀛楁2*/
- @ApiModelProperty(value = "澶囩敤瀛楁2")
- private String factoryElementCategoryUda2;
- /**澶囩敤瀛楁3*/
- @ApiModelProperty(value = "澶囩敤瀛楁3")
- private String factoryElementCategoryUda3;
- /**澶囩敤瀛楁4*/
- @ApiModelProperty(value = "澶囩敤瀛楁4")
- private String factoryElementCategoryUda4;
- /**澶囩敤瀛楁5*/
- @ApiModelProperty(value = "澶囩敤瀛楁5")
- private String factoryElementCategoryUda5;
- /**鍒涘缓浜�*/
- @ApiModelProperty(value = "鍒涘缓浜�")
- @Excel(name = "鍒涘缓浜�", width = 15)
- private String createBy;
- /**鍒涘缓鏃ユ湡*/
- @Excel(name = "鍒涘缓鏃ユ湡", width = 15,format = "yyyy-MM-dd")
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- @ApiModelProperty(value = "鍒涘缓鏃ユ湡")
- private Date createTime;
- /**鏇存柊浜�*/
- @Excel(name = "鏇存柊浜�", width = 15)
- @ApiModelProperty(value = "鏇存柊浜�")
- private String updateBy;
- /**鏇存柊鏃ユ湡*/
- @Excel(name = "鏇存柊鏃ユ湡", width = 15,format = "yyyy-MM-dd")
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- @ApiModelProperty(value = "鏇存柊鏃ユ湡")
- private Date updateTime;
- /**澶囨敞*/
- @Excel(name = "澶囨敞", width = 15)
- @ApiModelProperty(value = "澶囨敞")
- private String remark;
- /**鐘舵�侊紝0锛氭甯革紝1锛氬垹闄�*/
- @ApiModelProperty(value = "鐘舵�侊紝0锛氭甯革紝1锛氬垹闄�")
- private String delFlag;
-}
diff --git a/src/main/java/org/jeecg/modules/base/entity/FactoryModel.java b/src/main/java/org/jeecg/modules/base/entity/FactoryModel.java
deleted file mode 100644
index 889f92c..0000000
--- a/src/main/java/org/jeecg/modules/base/entity/FactoryModel.java
+++ /dev/null
@@ -1,122 +0,0 @@
-package org.jeecg.modules.base.entity;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.experimental.Accessors;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.jeecgframework.poi.excel.annotation.Excel;
-import org.jeecg.common.aspect.annotation.Dict;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.io.UnsupportedEncodingException;
-
-/**
- * @Description: 宸ュ巶寤烘ā
- * @Author: jeecg-boot
- * @Date: 2022-11-08
- * @Version: V1.0
- */
-@Data
-@TableName("mom_base_factory_model")
-@ApiModel(value="mom_base_factory_model瀵硅薄", description="宸ュ巶寤烘ā")
-@Accessors(chain = true)
-public class FactoryModel implements Serializable {
- private static final long serialVersionUID = 1L;
- /**涓婚敭ID*/
- @TableId(type = IdType.ASSIGN_ID)
- @ApiModelProperty(value = "涓婚敭ID")
- private String id;
- /**浼佷笟ID*/
- @Excel(name = "浼佷笟ID", width = 15)
- @ApiModelProperty(value = "浼佷笟ID")
- private String enterpriseId;
- /**宸ュ巶瑕佺礌缂栫爜*/
- @Excel(name = "宸ュ巶瑕佺礌缂栫爜", width = 15)
- @ApiModelProperty(value = "宸ュ巶瑕佺礌缂栫爜")
- private String code;
- /**宸ュ巶瑕佺礌鍚嶇О*/
- @Excel(name = "宸ュ巶瑕佺礌鍚嶇О", width = 15)
- @ApiModelProperty(value = "宸ュ巶瑕佺礌鍚嶇О")
- private String name;
- /**璐ｄ换缁勭粐ID*/
- @Excel(name = "璐ｄ换缁勭粐ID", width = 15)
- @ApiModelProperty(value = "璐ｄ换缁勭粐ID")
- private String departId;
- /**涓婄骇瑕佺礌ID*/
- @Excel(name = "涓婄骇瑕佺礌ID", width = 15)
- @ApiModelProperty(value = "涓婄骇瑕佺礌ID")
- private String parentId;
- /**宸ュ巶瑕佺礌绫诲瀷ID*/
- @Excel(name = "宸ュ巶瑕佺礌绫诲瀷ID", width = 15)
- @ApiModelProperty(value = "宸ュ巶瑕佺礌绫诲瀷ID")
- private String factoryElementCategoryId;
- /**鏄惁铏氭嫙锛�1鏄� 0鍚︼級*/
- @Excel(name = "鏄惁铏氭嫙锛�1鏄� 0鍚︼級", width = 15)
- @ApiModelProperty(value = "鏄惁铏氭嫙锛�1鏄� 0鍚︼級")
- private Integer virtualFlag;
- /**鐗堟湰*/
- @Excel(name = "鐗堟湰", width = 15)
- @ApiModelProperty(value = "鐗堟湰")
- private Integer version;
- /**鐗堟湰鏁版嵁ID*/
- @ApiModelProperty(value = "鐗堟湰鏁版嵁ID")
- private String dataVersionId;
- /**澶囨敞*/
- @Excel(name = "澶囨敞", width = 15)
- @ApiModelProperty(value = "澶囨敞")
- private String remark;
- /**鐘舵�� 0 绂佺敤 1 鍚敤*/
- @Excel(name = "鐘舵�� 0 绂佺敤 1 鍚敤", width = 15)
- @ApiModelProperty(value = "鐘舵�� 0 绂佺敤 1 鍚敤")
- private String status;
- /**澶囩敤瀛楁1*/
- @Excel(name = "澶囩敤瀛楁1", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁1")
- private String factoryModelUda1;
- /**澶囩敤瀛楁2*/
- @Excel(name = "澶囩敤瀛楁2", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁2")
- private String factoryModelUda2;
- /**澶囩敤瀛楁3*/
- @Excel(name = "澶囩敤瀛楁3", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁3")
- private String factoryModelUda3;
- /**澶囩敤瀛楁4*/
- @Excel(name = "澶囩敤瀛楁4", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁4")
- private String factoryModelUda4;
- /**澶囩敤瀛楁5*/
- @Excel(name = "澶囩敤瀛楁5", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁5")
- private String factoryModelUda5;
- /**鍒涘缓浜�*/
- @ApiModelProperty(value = "鍒涘缓浜�")
- private String createBy;
- /**鍒涘缓鏃堕棿*/
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
- @DateTimeFormat(pattern="yyyy-MM-dd")
- @ApiModelProperty(value = "鍒涘缓鏃堕棿")
- private Date createTime;
- /**鏇存柊浜�*/
- @ApiModelProperty(value = "鏇存柊浜�")
- private String updateBy;
- /**鏇存柊鏃堕棿*/
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
- @DateTimeFormat(pattern="yyyy-MM-dd")
- @ApiModelProperty(value = "鏇存柊鏃堕棿")
- private Date updateTime;
- /**绉熸埛ID*/
- @Excel(name = "绉熸埛ID", width = 15)
- @ApiModelProperty(value = "绉熸埛ID")
- private String tenantId;
- /**鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)*/
- @Excel(name = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)", width = 15)
- @ApiModelProperty(value = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)")
- private Integer delFlag;
-}
diff --git a/src/main/java/org/jeecg/modules/base/entity/FactoryModelDetail.java b/src/main/java/org/jeecg/modules/base/entity/FactoryModelDetail.java
deleted file mode 100644
index ad02468..0000000
--- a/src/main/java/org/jeecg/modules/base/entity/FactoryModelDetail.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package org.jeecg.modules.base.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.jeecg.common.aspect.annotation.Dict;
-import org.jeecgframework.poi.excel.annotation.Excel;
-import org.springframework.format.annotation.DateTimeFormat;
-@Data
-public class FactoryModelDetail {
- private String id;
- private String enterpriseId;
- private String code;
- private String name;
- private String departId;
- private String parentId;
- private String factoryElementCategoryName;
- private String factoryElementCategoryId;
- private Integer virtualFlag;
- private String version;
- private String remark;
- private String status;
- private String auditStatus;
- private String createBy;
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
- @DateTimeFormat(pattern="yyyy-MM-dd")
- private java.util.Date createTime;
- private String updateBy;
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
- @DateTimeFormat(pattern="yyyy-MM-dd")
- private java.util.Date updateTime;
- private String tenantId;
- private Integer delFlag;
- private String hasChild;
- private String departName;
- private String parentName;
-}
diff --git a/src/main/java/org/jeecg/modules/base/entity/LineSideWarehouse.java b/src/main/java/org/jeecg/modules/base/entity/LineSideWarehouse.java
new file mode 100644
index 0000000..da8196d
--- /dev/null
+++ b/src/main/java/org/jeecg/modules/base/entity/LineSideWarehouse.java
@@ -0,0 +1,72 @@
+package org.jeecg.modules.base.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: 绾胯竟浠撳簱淇℃伅
+ * @Author: jeecg-boot
+ * @Date: 2025-06-24
+ * @Version: V1.0
+ */
+@Data
+@TableName("base_line_side_warehouse")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="base_line_side_warehouse瀵硅薄", description="绾胯竟浠撳簱淇℃伅")
+public class LineSideWarehouse implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ /**涓婚敭*/
+ @TableId(type = IdType.ASSIGN_ID)
+ @ApiModelProperty(value = "涓婚敭")
+ private String id;
+ /**鍒涘缓浜�*/
+ @ApiModelProperty(value = "鍒涘缓浜�")
+ private String createBy;
+ /**鍒涘缓鏃堕棿*/
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern="yyyy-MM-dd")
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ private Date createTime;
+ /**鏇存柊浜�*/
+ @ApiModelProperty(value = "鏇存柊浜�")
+ private String updateBy;
+ /**鏇存柊鏃堕棿*/
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern="yyyy-MM-dd")
+ @ApiModelProperty(value = "鏇存柊鏃堕棿")
+ private Date updateTime;
+ /**鍒犻櫎鏍囪*/
+ @Excel(name = "鍒犻櫎鏍囪", width = 15)
+ @ApiModelProperty(value = "鍒犻櫎鏍囪")
+ @TableLogic
+ private Integer delFlag;
+ /**浠撳簱缂栫爜*/
+ @Excel(name = "浠撳簱缂栫爜", width = 15)
+ @ApiModelProperty(value = "浠撳簱缂栫爜")
+ private String warehouseCode;
+ /**浠撳簱鍚嶇О*/
+ @Excel(name = "浠撳簱鍚嶇О", width = 15)
+ @ApiModelProperty(value = "浠撳簱鍚嶇О")
+ private String warehouseName;
+ /**宸ュ巶/浜х嚎ID*/
+ @Excel(name = "宸ュ巶/浜х嚎ID", width = 15)
+ @ApiModelProperty(value = "宸ュ巶/浜х嚎ID")
+ private String factoryId;
+}
diff --git a/src/main/java/org/jeecg/modules/base/entity/Material.java b/src/main/java/org/jeecg/modules/base/entity/Material.java
deleted file mode 100644
index 84b82d1..0000000
--- a/src/main/java/org/jeecg/modules/base/entity/Material.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package org.jeecg.modules.base.entity;
-
-import java.io.Serializable;
-import java.io.UnsupportedEncodingException;
-import java.util.Date;
-import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.jeecg.common.constant.CommonConstant;
-import org.jeecg.common.system.base.entity.JeecgEntity;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.jeecgframework.poi.excel.annotation.Excel;
-import org.jeecg.common.aspect.annotation.Dict;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * @Description: 鐗╂枡琛�
- * @Author: jeecg-boot
- * @Date: 2023-05-04
- * @Version: V1.0
- */
-@Data
-@TableName("mom_base_material")
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value="mom_base_material瀵硅薄", description="鐗╂枡琛�")
-public class Material extends JeecgEntity implements Serializable {
- private static final long serialVersionUID = 1L;
- /**鐗╂枡缂栧彿*/
- @Excel(name = "鐗╂枡缂栧彿", width = 15)
- @ApiModelProperty(value = "鐗╂枡缂栧彿")
- private String num;
- /**鐗╂枡鍚嶇О*/
- @Excel(name = "鐗╂枡鍚嶇О", width = 15)
- @ApiModelProperty(value = "鐗╂枡鍚嶇О")
- private String name;
- /**鐗╂枡瑙勬牸*/
- @Excel(name = "鐗╂枡瑙勬牸", width = 15)
- @ApiModelProperty(value = "鐗╂枡瑙勬牸")
- private String specification;
- /**鐗╂枡鍨嬪彿*/
- @Excel(name = "鐗╂枡鍨嬪彿", width = 15)
- @ApiModelProperty(value = "鐗╂枡鍨嬪彿")
- private String model;
- /**璁￠噺鍗曚綅ID*/
- @Excel(name = "璁￠噺鍗曚綅ID", width = 15)
- @ApiModelProperty(value = "璁￠噺鍗曚綅ID")
- @Dict(dictTable = "mom_base_unit",dicText = "name",dicCode = "id")
- private String unitId;
- /**鐗╂枡绫诲埆ID*/
- @Excel(name = "鐗╂枡绫诲埆ID", width = 15)
- @ApiModelProperty(value = "鐗╂枡绫诲埆ID")
- private String materialCategoryId;
- /**鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)*/
- @Excel(name = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)", width = 15)
- @ApiModelProperty(value = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)")
- private Integer delFlag = CommonConstant.DEL_FLAG_0;;
-}
diff --git a/src/main/java/org/jeecg/modules/base/entity/MaterialCategory.java b/src/main/java/org/jeecg/modules/base/entity/MaterialCategory.java
deleted file mode 100644
index 918d647..0000000
--- a/src/main/java/org/jeecg/modules/base/entity/MaterialCategory.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package org.jeecg.modules.base.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-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.constant.CommonConstant;
-import org.jeecg.common.system.base.entity.JeecgEntity;
-import org.jeecgframework.poi.excel.annotation.Excel;
-
-import java.io.Serializable;
-
-@Data
-@TableName("mom_base_material_category")
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "鐗╂枡鍒嗙被瀵硅薄", description = "mom_base_material_category")
-public class MaterialCategory extends JeecgEntity implements Serializable {
- private static final long serialVersionUID = 1L;
-
- /**
- * 鐗╂枡鍒嗙被缂栫爜
- */
- @Excel(name = "鐗╂枡鍒嗙被缂栫爜", width = 15)
- @ApiModelProperty(value = "鐗╂枡鍒嗙被缂栫爜")
- private String code;
- /**
- * 鐗╂枡鍒嗙被鍚嶇О
- */
- @Excel(name = "鐗╂枡鍒嗙被鍚嶇О", width = 15)
- @ApiModelProperty(value = "鐗╂枡鍒嗙被鍚嶇О")
- private String name;
- /**
- * 涓婄骇鍒嗙被id
- */
- @Excel(name = "涓婄骇鍒嗙被id", width = 15)
- @ApiModelProperty(value = "涓婄骇鍒嗙被id")
- private String parentId;
-
- /**
- * 澶囨敞
- */
- @Excel(name = "澶囨敞", width = 15)
- @ApiModelProperty(value = "澶囨敞")
- private String remark;
- /**
- * 鐗堟湰鍙�
- */
- @Excel(name = "鐗堟湰鍙�", width = 15)
- @ApiModelProperty(value = "鐗堟湰鍙�")
- private Integer version;
-
- /**
- * 鐗堟湰鏁版嵁Id
- */
- @Excel(name = "鐗堟湰鏁版嵁Id", width = 15)
- @ApiModelProperty(value = "鐗堟湰鏁版嵁Id")
- private String dataVersionId;
-
- /**
- * 澶囩敤瀛楁1
- */
- @Excel(name = "澶囩敤瀛楁1", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁1")
- private String materialCategoryUda1;
- /**
- * 澶囩敤瀛楁2
- */
- @Excel(name = "澶囩敤瀛楁2", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁2")
- private String materialCategoryUda2;
- /**
- * 澶囩敤瀛楁3
- */
- @Excel(name = "澶囩敤瀛楁3", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁3")
- private String materialCategoryUda3;
- /**
- * 澶囩敤瀛楁4
- */
- @Excel(name = "澶囩敤瀛楁4", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁4")
- private String materialCategoryUda4;
- /**
- * 澶囩敤瀛楁5
- */
- @Excel(name = "澶囩敤瀛楁5", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁5")
- private String materialCategoryUda5;
-
- /**
- * 鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)
- */
- @Excel(name = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)", width = 15)
- @ApiModelProperty(value = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)")
- private String delFlag = CommonConstant.DEL_FLAG_0.toString();
-
- /**
- * 鐗堟湰鐘舵�侊紝0锛氭柊寤猴紝1锛氱紪杈戯紝2锛氱敓鏁堬紝3锛氬け鏁堬紝4锛氬緟鐢熸晥
- */
- @TableField(exist = false)
- private String versionStatus;
-}
diff --git a/src/main/java/org/jeecg/modules/base/entity/ProductionLineWarehouse.java b/src/main/java/org/jeecg/modules/base/entity/ProductionLineWarehouse.java
deleted file mode 100644
index 6941b10..0000000
--- a/src/main/java/org/jeecg/modules/base/entity/ProductionLineWarehouse.java
+++ /dev/null
@@ -1,103 +0,0 @@
-package org.jeecg.modules.base.entity;
-
-import java.io.Serializable;
-import java.io.UnsupportedEncodingException;
-import java.util.Date;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.experimental.Accessors;
-import org.jeecgframework.poi.excel.annotation.Excel;
-import lombok.Data;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.jeecg.common.aspect.annotation.Dict;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-/**
- * @Description: 绾胯竟搴撶鐞�
- * @Author: jeecg-boot
- * @Date: 2023-01-28
- * @Version: V1.0
- */
-@Data
-@TableName("mom_base_production_line_warehouse")
-@ApiModel(value="mom_base_production_line_warehouse瀵硅薄", description="绾胯竟搴撶鐞�")
-@Accessors(chain = true)
-public class ProductionLineWarehouse implements Serializable {
- private static final long serialVersionUID = 1L;
-
- /**涓婚敭ID*/
- @TableId(type = IdType.ASSIGN_ID)
- @ApiModelProperty(value = "涓婚敭ID")
- private String id;
- /**绾胯竟搴撶紪鐮�*/
- @Excel(name = "绾胯竟搴撶紪鐮�", width = 15)
- @ApiModelProperty(value = "绾胯竟搴撶紪鐮�")
- private String code;
- /**绾胯竟搴撳悕绉�*/
- @Excel(name = "绾胯竟搴撳悕绉�", width = 15)
- @ApiModelProperty(value = "绾胯竟搴撳悕绉�")
- private String name;
- /**鏄惁铏氭嫙锛�0锛氭槸锛�1锛氬惁*/
- @Excel(name = "鏄惁铏氭嫙锛�0锛氭槸锛�1锛氬惁", width = 15)
- @ApiModelProperty(value = "鏄惁铏氭嫙锛�0锛氭槸锛�1锛氬惁")
- private String status;
- /**鐗堟湰鍙�*/
- @Excel(name = "鐗堟湰鍙�", width = 15)
- @ApiModelProperty(value = "鐗堟湰鍙�")
- private Integer version;
- /**鐗堟湰鏁版嵁ID*/
- @Excel(name = "鐗堟湰鏁版嵁ID", width = 15)
- @ApiModelProperty(value = "鐗堟湰鏁版嵁ID")
- private String dataVersionId;
- /**澶囩敤瀛楁1*/
- @Excel(name = "澶囩敤瀛楁1", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁1")
- private String warehouseUda1;
- /**澶囩敤瀛楁2*/
- @Excel(name = "澶囩敤瀛楁2", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁2")
- private String warehouseUda2;
- /**澶囩敤瀛楁3*/
- @Excel(name = "澶囩敤瀛楁3", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁3")
- private String warehouseUda3;
- /**澶囩敤瀛楁4*/
- @Excel(name = "澶囩敤瀛楁4", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁4")
- private String warehouseUda4;
- /**澶囩敤瀛楁5*/
- @Excel(name = "澶囩敤瀛楁5", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁5")
- private String warehouseUda5;
- /**鍒涘缓浜�*/
- @ApiModelProperty(value = "鍒涘缓浜�")
- private String createBy;
- /**鍒涘缓鏃ユ湡*/
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
- @DateTimeFormat(pattern="yyyy-MM-dd")
- @ApiModelProperty(value = "鍒涘缓鏃ユ湡")
- private Date createTime;
- /**鏇存柊浜�*/
- @ApiModelProperty(value = "鏇存柊浜�")
- private String updateBy;
- /**鏇存柊鏃ユ湡*/
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
- @DateTimeFormat(pattern="yyyy-MM-dd")
- @ApiModelProperty(value = "鏇存柊鏃ユ湡")
- private Date updateTime;
- /**鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)*/
- @Excel(name = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)", width = 15)
- @ApiModelProperty(value = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)")
- private Integer delFlag;
- /**澶囨敞*/
- @Excel(name = "澶囨敞", width = 15)
- @ApiModelProperty(value = "澶囨敞")
- private String remark;
- /**杞﹂棿ID*/
- @Excel(name = "杞﹂棿ID", width = 15)
- @ApiModelProperty(value = "杞﹂棿ID")
- private String workshopId;
-}
diff --git a/src/main/java/org/jeecg/modules/base/entity/ProductionLineWarehouseClient.java b/src/main/java/org/jeecg/modules/base/entity/ProductionLineWarehouseClient.java
deleted file mode 100644
index 366c15b..0000000
--- a/src/main/java/org/jeecg/modules/base/entity/ProductionLineWarehouseClient.java
+++ /dev/null
@@ -1,94 +0,0 @@
-package org.jeecg.modules.base.entity;
-
-import java.io.Serializable;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.experimental.Accessors;
-import org.jeecg.common.aspect.annotation.Dict;
-import lombok.Data;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.jeecgframework.poi.excel.annotation.Excel;
-import java.util.Date;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.io.UnsupportedEncodingException;
-
-/**
- * @Description: 绾胯竟搴撴湇鍔″璞�
- * @Author: jeecg-boot
- * @Date: 2023-01-28
- * @Version: V1.0
- */
-@Data
-@TableName("mom_base_production_line_warehouse_client")
-@ApiModel(value="mom_base_production_line_warehouse_client瀵硅薄", description="绾胯竟搴撴湇鍔″璞�")
-@Accessors(chain = true)
-public class ProductionLineWarehouseClient implements Serializable {
- private static final long serialVersionUID = 1L;
-
- /**涓婚敭ID*/
- @TableId(type = IdType.ASSIGN_ID)
- @ApiModelProperty(value = "涓婚敭ID")
- private String id;
- /**鏈嶅姟瀵硅薄ID*/
- @Excel(name = "鏈嶅姟瀵硅薄ID", width = 15)
- @ApiModelProperty(value = "鏈嶅姟瀵硅薄ID")
- private String clientId;
- /**瀵硅薄缂栫爜*/
- @Excel(name = "瀵硅薄缂栫爜", width = 15)
- @ApiModelProperty(value = "瀵硅薄缂栫爜")
- private String code;
- /**瀵硅薄鍚嶇О*/
- @Excel(name = "瀵硅薄鍚嶇О", width = 15)
- @ApiModelProperty(value = "瀵硅薄鍚嶇О")
- private String name;
- /**浠撳簱id*/
- @ApiModelProperty(value = "浠撳簱id")
- private String warehouseId;
- /**澶囩敤瀛楁1*/
- @Excel(name = "澶囩敤瀛楁1", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁1")
- private String warehouseClientUda1;
- /**澶囩敤瀛楁2*/
- @Excel(name = "澶囩敤瀛楁2", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁2")
- private String warehouseClientUda2;
- /**澶囩敤瀛楁3*/
- @Excel(name = "澶囩敤瀛楁3", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁3")
- private String warehouseClientUda3;
- /**澶囩敤瀛楁4*/
- @Excel(name = "澶囩敤瀛楁4", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁4")
- private String warehouseClientUda4;
- /**澶囩敤瀛楁5*/
- @Excel(name = "澶囩敤瀛楁5", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁5")
- private String warehouseClientUda5;
- /**鍒涘缓浜�*/
- @ApiModelProperty(value = "鍒涘缓浜�")
- private String createBy;
- /**鍒涘缓鏃ユ湡*/
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
- @DateTimeFormat(pattern="yyyy-MM-dd")
- @ApiModelProperty(value = "鍒涘缓鏃ユ湡")
- private Date createTime;
- /**鏇存柊浜�*/
- @ApiModelProperty(value = "鏇存柊浜�")
- private String updateBy;
- /**鏇存柊鏃ユ湡*/
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
- @DateTimeFormat(pattern="yyyy-MM-dd")
- @ApiModelProperty(value = "鏇存柊鏃ユ湡")
- private Date updateTime;
- /**鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)*/
- @Excel(name = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)", width = 15)
- @ApiModelProperty(value = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)")
- private Integer delFlag;
- /**澶囨敞*/
- @Excel(name = "澶囨敞", width = 15)
- @ApiModelProperty(value = "澶囨敞")
- private String remark;
-}
diff --git a/src/main/java/org/jeecg/modules/base/entity/Shift.java b/src/main/java/org/jeecg/modules/base/entity/Shift.java
new file mode 100644
index 0000000..57929b7
--- /dev/null
+++ b/src/main/java/org/jeecg/modules/base/entity/Shift.java
@@ -0,0 +1,93 @@
+package org.jeecg.modules.base.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.jeecg.common.constant.CommonConstant;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: 鐝
+ * @Author: jeecg-boot
+ * @Date: 2025-06-24
+ * @Version: V1.0
+ */
+@Data
+@TableName("base_shift")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="base_shift瀵硅薄", description="鐝")
+public class Shift implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ /**涓婚敭*/
+ @TableId(type = IdType.ASSIGN_ID)
+ @ApiModelProperty(value = "涓婚敭")
+ private String id;
+ /**鍒涘缓浜�*/
+ @ApiModelProperty(value = "鍒涘缓浜�")
+ private String createBy;
+ /**鍒涘缓鏃堕棿*/
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern="yyyy-MM-dd")
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ private Date createTime;
+ /**鏇存柊浜�*/
+ @ApiModelProperty(value = "鏇存柊浜�")
+ private String updateBy;
+ /**鏇存柊鏃堕棿*/
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern="yyyy-MM-dd")
+ @ApiModelProperty(value = "鏇存柊鏃堕棿")
+ private Date updateTime;
+ /**鍒犻櫎鏍囪*/
+ @Excel(name = "鍒犻櫎鏍囪", width = 15)
+ @ApiModelProperty(value = "鍒犻櫎鏍囪")
+ @TableLogic
+ private Integer delFlag = CommonConstant.DEL_FLAG_0;
+ /**鐝鍚嶇О*/
+ @Excel(name = "鐝鍚嶇О", width = 15)
+ @ApiModelProperty(value = "鐝鍚嶇О")
+ private String shiftName;
+ /**鐝缂栫爜*/
+ @Excel(name = "鐝缂栫爜", width = 15)
+ @ApiModelProperty(value = "鐝缂栫爜")
+ private String shiftCode;
+ /**寮�濮嬫椂闂�*/
+ @Excel(name = "寮�濮嬫椂闂�", width = 15)
+ @ApiModelProperty(value = "寮�濮嬫椂闂�")
+ private String startTime;
+ /**缁撴潫鏃堕棿*/
+ @Excel(name = "缁撴潫鏃堕棿", width = 15)
+ @ApiModelProperty(value = "缁撴潫鏃堕棿")
+ private String endTime;
+ /**宸ヤ綔鏃堕暱(灏忔椂)*/
+ @Excel(name = "宸ヤ綔鏃堕暱(灏忔椂)", width = 15)
+ @ApiModelProperty(value = "宸ヤ綔鏃堕暱(灏忔椂)")
+ private BigDecimal workHours;
+ /**鐝鐘舵��*/
+ @Excel(name = "鐝鐘舵��", width = 15)
+ @ApiModelProperty(value = "鐝鐘舵��")
+ private String shiftStatus;
+ /**鏄惁璺ㄥぉ 1 鏄� 0 鍚� 榛樿 0*/
+ @Excel(name = "鏄惁璺ㄥぉ 1 鏄� 0 鍚� 榛樿 0", width = 15)
+ @ApiModelProperty(value = "鏄惁璺ㄥぉ 1 鏄� 0 鍚� 榛樿 0")
+ private String crossDayFlag;
+ /**澶囨敞*/
+ @Excel(name = "澶囨敞", width = 15)
+ @ApiModelProperty(value = "澶囨敞")
+ private String remark;
+}
diff --git a/src/main/java/org/jeecg/modules/base/entity/ShiftGroup.java b/src/main/java/org/jeecg/modules/base/entity/ShiftGroup.java
new file mode 100644
index 0000000..53c0e80
--- /dev/null
+++ b/src/main/java/org/jeecg/modules/base/entity/ShiftGroup.java
@@ -0,0 +1,89 @@
+package org.jeecg.modules.base.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.jeecg.common.constant.CommonConstant;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: 鐝粍浜哄憳淇℃伅
+ * @Author: jeecg-boot
+ * @Date: 2025-06-24
+ * @Version: V1.0
+ */
+@Data
+@TableName("base_shift_group")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="base_shift_group瀵硅薄", description="鐝粍浜哄憳淇℃伅")
+public class ShiftGroup implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ /**涓婚敭*/
+ @TableId(type = IdType.ASSIGN_ID)
+ @ApiModelProperty(value = "涓婚敭")
+ private String id;
+ /**鍒涘缓浜�*/
+ @ApiModelProperty(value = "鍒涘缓浜�")
+ private String createBy;
+ /**鍒涘缓鏃堕棿*/
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern="yyyy-MM-dd")
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ private Date createTime;
+ /**鏇存柊浜�*/
+ @ApiModelProperty(value = "鏇存柊浜�")
+ private String updateBy;
+ /**鏇存柊鏃堕棿*/
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern="yyyy-MM-dd")
+ @ApiModelProperty(value = "鏇存柊鏃堕棿")
+ private Date updateTime;
+ /**鍒犻櫎鏍囪*/
+ @Excel(name = "鍒犻櫎鏍囪", width = 15)
+ @ApiModelProperty(value = "鍒犻櫎鏍囪")
+ @TableLogic
+ private Integer delFlag = CommonConstant.DEL_FLAG_0;
+ /**鐝粍鍚嶇О*/
+ @Excel(name = "鐝粍鍚嶇О", width = 15)
+ @ApiModelProperty(value = "鐝粍鍚嶇О")
+ private String groupName;
+ /**鐝粍缂栫爜*/
+ @Excel(name = "鐝粍缂栫爜", width = 15)
+ @ApiModelProperty(value = "鐝粍缂栫爜")
+ private String groupCode;
+ /**鐝粍闀�*/
+ @Excel(name = "鐝粍闀�", width = 15)
+ @ApiModelProperty(value = "鐝粍闀�")
+ private String groupManager;
+ /**鐘舵��*/
+ @Excel(name = "鐘舵��", width = 15)
+ @ApiModelProperty(value = "鐘舵��")
+ private String groupStatus;
+ /**鐝ID*/
+ @Excel(name = "鐝ID", width = 15)
+ @ApiModelProperty(value = "鐝ID")
+ private String shiftId;
+ /**宸ュ巶/杞﹂棿/浜х嚎ID*/
+ @Excel(name = "宸ュ巶/杞﹂棿/浜х嚎ID", width = 15)
+ @ApiModelProperty(value = "宸ュ巶/杞﹂棿/浜х嚎ID")
+ private String factoryId;
+ /**澶囨敞*/
+ @Excel(name = "澶囨敞", width = 15)
+ @ApiModelProperty(value = "澶囨敞")
+ private String remark;
+}
diff --git a/src/main/java/org/jeecg/modules/base/entity/Supplier.java b/src/main/java/org/jeecg/modules/base/entity/Supplier.java
index 0bb7323..fa928e8 100644
--- a/src/main/java/org/jeecg/modules/base/entity/Supplier.java
+++ b/src/main/java/org/jeecg/modules/base/entity/Supplier.java
@@ -1,150 +1,121 @@
package org.jeecg.modules.base.entity;
-import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.jeecg.common.constant.CommonConstant;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
-import org.jeecg.common.aspect.annotation.Dict;
-import org.jeecg.common.constant.CommonConstant;
-import org.jeecg.common.system.base.entity.JeecgEntity;
-import org.jeecgframework.poi.excel.annotation.Excel;
-
-import java.io.Serializable;
/**
- * @Description: mom_eam_inspection_project
+ * @Description: 渚涘簲鍟嗙鐞�
* @Author: jeecg-boot
- * @Date: 2023-03-10
+ * @Date: 2025-06-24
* @Version: V1.0
*/
@Data
-@TableName("mom_base_supplier")
+@TableName("base_supplier")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "mom_base_supplier瀵硅薄", description = "mom_base_supplier")
-public class Supplier extends JeecgEntity implements Serializable {
+@ApiModel(value="base_supplier瀵硅薄", description="渚涘簲鍟嗙鐞�")
+public class Supplier implements Serializable {
private static final long serialVersionUID = 1L;
- /**
- * 缂栫爜
- */
- @Excel(name = "缂栫爜", width = 15)
- @ApiModelProperty(value = "缂栫爜")
- private String num;
- /**
- * 鍚嶇О
- */
- @Excel(name = "鍚嶇О", width = 15)
- @ApiModelProperty(value = "鍚嶇О")
- private String name;
-
- /**
- * 绠�绉�
- */
- @Excel(name = "绠�绉�", width = 15)
- @ApiModelProperty(value = "绠�绉�")
- private String abbreviation;
-
- /**
- * 渚涘簲鍟嗙被鍨�
- */
- @Excel(name = "渚涘簲鍟嗙被鍨�", width = 15,dicCode = "supplier_type")
- @ApiModelProperty(value = "渚涘簲鍟嗙被鍨�")
- @Dict(dicCode = "supplier_type")
- private String supplierType;
-
- /**
- * 鎵�灞炶涓�
- */
- @Excel(name = "鎵�灞炶涓�", width = 15)
- @ApiModelProperty(value = "鎵�灞炶涓�")
- private String affiliationIndustry;
-
-
- /**
- * 鍦板潃
- */
-
- @Excel(name = "鍦板潃",width = 30)
- @ApiModelProperty(value = "鍦板潃")
- private String address;
-
-
-
-
- /**
- * 绉熸埛id
- */
- @Excel(name = "绉熸埛id", width = 15)
- @ApiModelProperty(value = "绉熸埛id")
- private String tenantId;
-
-
- /**
- * 鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)
- */
- @Excel(name = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)", width = 15)
- @ApiModelProperty(value = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)")
+ /**涓婚敭*/
+ @TableId(type = IdType.ASSIGN_ID)
+ @ApiModelProperty(value = "涓婚敭")
+ private String id;
+ /**鍒涘缓浜�*/
+ @ApiModelProperty(value = "鍒涘缓浜�")
+ private String createBy;
+ /**鍒涘缓鏃堕棿*/
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern="yyyy-MM-dd")
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ private Date createTime;
+ /**鏇存柊浜�*/
+ @ApiModelProperty(value = "鏇存柊浜�")
+ private String updateBy;
+ /**鏇存柊鏃堕棿*/
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern="yyyy-MM-dd")
+ @ApiModelProperty(value = "鏇存柊鏃堕棿")
+ private Date updateTime;
+ /**鍒犻櫎鏍囪*/
+ @Excel(name = "鍒犻櫎鏍囪", width = 15)
+ @ApiModelProperty(value = "鍒犻櫎鏍囪")
+ @TableLogic
private Integer delFlag = CommonConstant.DEL_FLAG_0;
- /**
- * 澶囨敞
- */
- @Excel(name = "澶囨敞", width = 15)
+ /**渚涘簲鍟嗙紪鐮�*/
+ @Excel(name = "渚涘簲鍟嗙紪鐮�", width = 15)
+ @ApiModelProperty(value = "渚涘簲鍟嗙紪鐮�")
+ private String supplierCode;
+ /**渚涘簲鍟嗗悕绉�*/
+ @Excel(name = "渚涘簲鍟嗗悕绉�", width = 15)
+ @ApiModelProperty(value = "渚涘簲鍟嗗悕绉�")
+ private String supplierName;
+ /**渚涘簲鍟嗗悕绉�*/
+ @Excel(name = "渚涘簲鍟嗗悕绉�", width = 15)
+ @ApiModelProperty(value = "渚涘簲鍟嗗悕绉�")
+ private String supplierStatus;
+ /**鍥藉*/
+ @Excel(name = "鍥藉", width = 15)
+ @ApiModelProperty(value = "鍥藉")
+ private String country;
+ /**鐪佷唤*/
+ @Excel(name = "鐪佷唤", width = 15)
+ @ApiModelProperty(value = "鐪佷唤")
+ private String province;
+ /**鍩庡競*/
+ @Excel(name = "鍩庡競", width = 15)
+ @ApiModelProperty(value = "鍩庡競")
+ private String city;
+ /**璇︾粏鍦板潃*/
+ @Excel(name = "璇︾粏鍦板潃", width = 15)
+ @ApiModelProperty(value = "璇︾粏鍦板潃")
+ private String address;
+ /**閭紪*/
+ @Excel(name = "閭紪", width = 15)
+ @ApiModelProperty(value = "閭紪")
+ private String postcode;
+ /**鑱旂郴浜�*/
+ @Excel(name = "鑱旂郴浜�", width = 15)
+ @ApiModelProperty(value = "鑱旂郴浜�")
+ private String contact;
+ /**浼犵湡*/
+ @Excel(name = "浼犵湡", width = 15)
+ @ApiModelProperty(value = "浼犵湡")
+ private String fax;
+ /**閭*/
+ @Excel(name = "閭", width = 15)
+ @ApiModelProperty(value = "閭")
+ private String email;
+ /**鐢佃瘽*/
+ @Excel(name = "鐢佃瘽", width = 15)
+ @ApiModelProperty(value = "鐢佃瘽")
+ private String phone;
+ /**鍏徃鐢佃瘽*/
+ @Excel(name = "鍏徃鐢佃瘽", width = 15)
+ @ApiModelProperty(value = "鍏徃鐢佃瘽")
+ private String companyTelephone;
+ /**瀹樻柟缃戠珯*/
+ @Excel(name = "瀹樻柟缃戠珯", width = 15)
+ @ApiModelProperty(value = "瀹樻柟缃戠珯")
+ private String officialWebsite;
+ /**澶囨敞*/
+ @Excel(name = "澶囨敞", width = 15)
@ApiModelProperty(value = "澶囨敞")
private String remark;
- /**
- * 澶囩敤瀛楁1
- */
- @Excel(name = "澶囩敤瀛楁1", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁1")
- private String supplierUda1;
- /**
- * 澶囩敤瀛楁2
- */
- @Excel(name = "澶囩敤瀛楁2", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁2")
- private String supplierUda2;
- /**
- * 澶囩敤瀛楁3
- */
- @Excel(name = "澶囩敤瀛楁3", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁3")
- private String supplierUda3;
- /**
- * 澶囩敤瀛楁4
- */
- @Excel(name = "澶囩敤瀛楁4", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁4")
- private String supplierUda4;
- /**
- * 澶囩敤瀛楁5
- */
- @Excel(name = "澶囩敤瀛楁5", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁5")
- private String supplierUda5;
- /**
- * 鐘舵�� 0 绂佺敤 1 鍚敤
- */
- @Excel(name = "鐘舵�� 0 绂佺敤 1 鍚敤", width = 15)
- @ApiModelProperty(value = "鐘舵�� 0 绂佺敤 1 鍚敤")
- private String status = CommonConstant.STATUS_1;
-
- /**
- * 渚涘簲鍟嗙被鍨婭d
- */
- @Excel(name = "supplier_category_id", width = 15)
- @ApiModelProperty(value = "supplier_category_id")
- private String supplierCategoryId;
-
-
-
-
-
-
- @ApiModelProperty(value = "渚涘簲鍟嗛」鐩垎绫荤紪鐮�/鍚嶇О")
- @TableField(exist = false)
- private String supplierCategoryNumName;
}
diff --git a/src/main/java/org/jeecg/modules/base/entity/SupplierCategory.java b/src/main/java/org/jeecg/modules/base/entity/SupplierCategory.java
deleted file mode 100644
index 1897405..0000000
--- a/src/main/java/org/jeecg/modules/base/entity/SupplierCategory.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package org.jeecg.modules.base.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.constant.CommonConstant;
-import org.jeecg.common.system.base.entity.JeecgEntity;
-import org.jeecgframework.poi.excel.annotation.Excel;
-
-
-@Data
-@TableName("mom_base_supplier_category")
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "mom_base_supplier_category瀵硅薄", description = "mom_base_supplier_category")
-public class SupplierCategory extends JeecgEntity {
-
- private static final long serialVersionUID = 1L;
-
- /**鐖秈d*/
- @Excel(name = "鐖秈d", width = 15)
- @ApiModelProperty(value = "鐖秈d")
- private String parentId;
- /**缂栫爜*/
- @Excel(name = "缂栫爜", width = 15)
- @ApiModelProperty(value = "缂栫爜")
- private String num;
- /**鍚嶇О*/
- @Excel(name = "鍚嶇О", width = 15)
- @ApiModelProperty(value = "鍚嶇О")
- private String name;
- /**绉熸埛id*/
- @Excel(name = "绉熸埛id", width = 15)
- @ApiModelProperty(value = "绉熸埛id")
- private String tenantId;
- /**鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)*/
- @Excel(name = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)", width = 15)
- @ApiModelProperty(value = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)")
- private Integer delFlag = CommonConstant.DEL_FLAG_0;
- /**澶囨敞*/
- @Excel(name = "澶囨敞", width = 15)
- @ApiModelProperty(value = "澶囨敞")
- private String remark;
- /**澶囩敤瀛楁1*/
- @Excel(name = "澶囩敤瀛楁1", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁1")
- private String supplierCategoryUda1;
- /**澶囩敤瀛楁2*/
- @Excel(name = "澶囩敤瀛楁2", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁2")
- private String supplierCategoryUda2;
- /**澶囩敤瀛楁3*/
- @Excel(name = "澶囩敤瀛楁3", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁3")
- private String supplierCategoryUda3;
- /**澶囩敤瀛楁4*/
- @Excel(name = "澶囩敤瀛楁4", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁4")
- private String supplierCategoryUda4;
- /**澶囩敤瀛楁5*/
- @Excel(name = "澶囩敤瀛楁5", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁5")
- private String supplierCategoryUda5;
- /**鐘舵�� 0 绂佺敤 1 鍚敤*/
- @Excel(name = "鐘舵�� 0 绂佺敤 1 鍚敤", width = 15)
- @ApiModelProperty(value = "鐘舵�� 0 绂佺敤 1 鍚敤")
- private String status = CommonConstant.STATUS_1;
-}
diff --git a/src/main/java/org/jeecg/modules/base/entity/SupplierContact.java b/src/main/java/org/jeecg/modules/base/entity/SupplierContact.java
deleted file mode 100644
index 68e1b7e..0000000
--- a/src/main/java/org/jeecg/modules/base/entity/SupplierContact.java
+++ /dev/null
@@ -1,148 +0,0 @@
-package org.jeecg.modules.base.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-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.aspect.annotation.Dict;
-import org.jeecg.common.constant.CommonConstant;
-import org.jeecg.common.system.base.entity.JeecgEntity;
-import org.jeecgframework.poi.excel.annotation.Excel;
-
-import java.io.Serializable;
-
-/**
- * @Description: mom_eam_inspection_project
- * @Author: jeecg-boot
- * @Date: 2023-03-10
- * @Version: V1.0
- */
-@Data
-@TableName("mom_base_supplier_contact")
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "mom_base_supplier_contact瀵硅薄", description = "mom_base_supplier_contact")
-public class SupplierContact extends JeecgEntity implements Serializable {
- private static final long serialVersionUID = 1L;
-
-
- /**
- * 鑱旂郴浜哄悕绉�
- */
- @Excel(name = "鑱旂郴浜哄悕绉�", width = 15)
- @ApiModelProperty(value = "鑱旂郴浜哄悕绉�")
- private String name;
-
- /**
- * 鎬у埆锛�0锛氱敺 1锛氬コ锛�
- */
- @Excel(name = "鎬у埆", width = 15,dicCode = "sex")
- @Dict(dicCode = "sex")
- @ApiModelProperty(value = "鎬у埆")
- private String sex;
-
-
- /**
- * 鑱屼綅
- */
-
- @Excel(name = "鑱屼綅", width = 15)
- @ApiModelProperty(value = "鑱屼綅")
- private String position;
-
- /**
- * 鐢靛瓙閭欢
- */
- @Excel(name = "鐢靛瓙閭欢", width = 15)
- @ApiModelProperty(value = "鐢靛瓙閭欢")
- private String email;
-
- /**
- * 鐢佃瘽
- */
- @Excel(name = "鐢佃瘽", width = 15)
- @ApiModelProperty(value = "鐢佃瘽")
- private String phone;
-
- /**
- * 鐢佃瘽
- */
- @Excel(name = "鏄惁榛樿", width = 15)
- @ApiModelProperty(value = "鏄惁榛樿")
- @Dict(dicCode = "default_value")
- private String defaultValue;
-
-
-
-
-
- /**
- * 渚涘簲鍟咺D
- */
- @Excel(name = "supplier_id", width = 15)
- @ApiModelProperty(value = "渚涘簲鍟唅d")
- private String supplierId;
-
-
- /**
- * 绉熸埛id
- */
- @Excel(name = "绉熸埛id", width = 15)
- @ApiModelProperty(value = "绉熸埛id")
- private String tenantId;
-
-
- /**
- * 鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)
- */
- @Excel(name = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)", width = 15)
- @ApiModelProperty(value = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)")
- private Integer delFlag = CommonConstant.DEL_FLAG_0;
- /**
- * 澶囨敞
- */
- @Excel(name = "澶囨敞", width = 15)
- @ApiModelProperty(value = "澶囨敞")
- private String remark;
- /**
- * 澶囩敤瀛楁1
- */
- @Excel(name = "澶囩敤瀛楁1", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁1")
- private String supplierContactUda1;
- /**
- * 澶囩敤瀛楁2
- */
- @Excel(name = "澶囩敤瀛楁2", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁2")
- private String supplierContactUda2;
- /**
- * 澶囩敤瀛楁3
- */
- @Excel(name = "澶囩敤瀛楁3", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁3")
- private String supplierContactUda3;
- /**
- * 澶囩敤瀛楁4
- */
- @Excel(name = "澶囩敤瀛楁4", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁4")
- private String supplierContactUda4;
- /**
- * 澶囩敤瀛楁5
- */
- @Excel(name = "澶囩敤瀛楁5", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁5")
- private String supplierContactUda5;
- /**
- * 鐘舵�� 0 绂佺敤 1 鍚敤
- */
- @Excel(name = "鐘舵�� 0 绂佺敤 1 鍚敤", width = 15)
- @ApiModelProperty(value = "鐘舵�� 0 绂佺敤 1 鍚敤")
- private String status = CommonConstant.STATUS_1;
-
-
-}
diff --git a/src/main/java/org/jeecg/modules/base/entity/Unit.java b/src/main/java/org/jeecg/modules/base/entity/Unit.java
deleted file mode 100644
index e8edb15..0000000
--- a/src/main/java/org/jeecg/modules/base/entity/Unit.java
+++ /dev/null
@@ -1,105 +0,0 @@
-package org.jeecg.modules.base.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import org.jeecg.common.constant.CommonConstant;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.util.List;
-
-/**
- * <p>
- * 璁￠噺鍗曚綅琛�
- * </p>
- *
- * @Author cuijian
- * @since 2022-10-26
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@TableName("mom_base_unit")
-@Accessors(chain = true)
-public class Unit implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * id
- */
- @TableId(type = IdType.ASSIGN_ID)
- private String id;
-
- /**
- * 鍗曚綅浠ｇ爜
- */
- private String num;
-
- /**
- * 鍗曚綅鍚嶇О
- */
- private String name;
-
- /**
- * 鍗曚綅鍒嗙被ID
- */
- private String unitCategoryId;
-
- /**
- * 鐘舵�� 0锛氱鐢� 1锛氬惎鐢�
- */
- private String status = "1";
-
- /**
- * 绉熸埛id
- */
- private String tenantId;
-
-
- /**
- * 鍒涘缓浜�
- */
- private String createBy;
-
- /**
- * 鍒涘缓鏃堕棿
- */
- @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date createTime;
-
- /**
- * 鏇存柊浜�
- */
- private String updateBy;
-
- /**
- * 鏇存柊鏃堕棿
- */
- private Date updateTime;
-
- /**
- * 鐘舵�侊紝0锛氭甯革紝1锛氬垹闄�
- */
- private String delFlag = "0";
-
- //澶囨敞
- private String remark;
-
- //璁￠噺鍗曚綅鍒嗙被鍚嶇О
- @TableField(exist = false)
- private String categoryName;
-
- //璁￠噺鍗曚綅鍚嶇О
- @TableField(exist = false)
- private String unitName;
-
-
-}
diff --git a/src/main/java/org/jeecg/modules/base/entity/UnitCategory.java b/src/main/java/org/jeecg/modules/base/entity/UnitCategory.java
deleted file mode 100644
index ec74abb..0000000
--- a/src/main/java/org/jeecg/modules/base/entity/UnitCategory.java
+++ /dev/null
@@ -1,122 +0,0 @@
-package org.jeecg.modules.base.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.util.List;
-
-/**
- * <p>
- * 璁￠噺鍗曚綅鍒嗙被琛�
- * </p>
- *
- * @Author cuijian
- * @since 2022-10-19
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@TableName("mom_base_unit_category")
-@Accessors(chain = true)
-public class UnitCategory implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * id
- */
- @TableId(type = IdType.ASSIGN_ID)
- private String id;
-
- /**
- * 鍗曚綅浠ｇ爜
- */
- private String code;
-
- /**
- * 鍗曚綅鍚嶇О
- */
- private String name;
-
- /**
- * 涓婄骇鍗曚綅
- */
- private String pid;
-
- /**
- * 澶囩敤瀛楁1
- */
- private String unitCategoryUda1;
-
- /**
- * 澶囩敤瀛楁2
- */
- private String unitCategoryUda2;
-
- /**
- * 澶囩敤瀛楁3
- */
- private String unitCategoryUda3;
-
- /**
- * 澶囩敤瀛楁4
- */
- private String unitCategoryUda4;
-
- /**
- * 澶囩敤瀛楁5
- */
- private String unitCategoryUda5;
-
- /**
- * 鍒涘缓浜�
- */
- private String createBy;
-
- /**
- * 鍒涘缓鏃堕棿
- */
- @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date createTime;
-
- /**
- * 鏇存柊浜�
- */
- private String updateBy;
-
- /**
- * 鏇存柊鏃堕棿
- */
- private Date updateTime;
-
- /**
- * 鐘舵�侊紝0锛氭甯革紝1锛氬垹闄�
- */
- private String delFlag;
-
- //澶囨敞
- private String remark;
-
- //code+name鍊�,鐢ㄤ簬鏄剧ず鏍�
- @TableField(exist = false)
- private String codeName;
-
- //涓婄骇鍒嗙被鍚嶇О
- @TableField(exist = false)
- private String pName;
-
-
- //瀛愯妭鐐�
- @TableField(exist = false)
- private List<UnitCategory> children;
-
-}
diff --git a/src/main/java/org/jeecg/modules/base/entity/UnitConversion.java b/src/main/java/org/jeecg/modules/base/entity/UnitConversion.java
deleted file mode 100644
index c04ef6a..0000000
--- a/src/main/java/org/jeecg/modules/base/entity/UnitConversion.java
+++ /dev/null
@@ -1,111 +0,0 @@
-package org.jeecg.modules.base.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.util.List;
-
-/**
- * <p>
- * 璁￠噺鍗曚綅琛�
- * </p>
- *
- * @Author cuijian
- * @since 2022-10-26
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@TableName("mom_base_unit_conversion")
-@Accessors(chain = true)
-public class UnitConversion implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * id
- */
- @TableId(type = IdType.ASSIGN_ID)
- private String id;
-
- /**
- * 璁￠噺鍗曚綅id
- */
- private String unitId;
-
- /**
- * 鐩爣璁￠噺鍗曚綅id
- */
- private String targetUnitId;
-
- /**
- * 鎹㈢畻姣斾緥
- */
- private String conversionRatio;
-
- /**
- * 鐘舵�� 0锛氱鐢� 1锛氬惎鐢�
- */
- private String status = "1";
-
- /**
- * 绉熸埛id
- */
- private String tenantId;
-
-
- /**
- * 鍒涘缓浜�
- */
- private String createBy;
-
- /**
- * 鍒涘缓鏃堕棿
- */
- @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date createTime;
-
- /**
- * 鏇存柊浜�
- */
- private String updateBy;
-
- /**
- * 鏇存柊鏃堕棿
- */
- private Date updateTime;
-
- /**
- * 鐘舵�侊紝0锛氭甯革紝1锛氬垹闄�
- */
- private String delFlag = "0";
-
- //澶囨敞
- private String remark;
-
- //璁￠噺鍗曚綅浠ｇ爜
- @TableField(exist = false)
- private String unitNum;
-
- //鐩爣璁￠噺鍗曚綅浠ｇ爜
- @TableField(exist = false)
- private String targetUnitNum;
-
- //鐩爣璁￠噺鍗曚綅鍚嶇О
- @TableField(exist = false)
- private String targetUnitName;
-
- //璁￠噺鍗曚綅鍚嶇О
- @TableField(exist = false)
- private String unitName;
-
-}
diff --git a/src/main/java/org/jeecg/modules/base/entity/UserFactory.java b/src/main/java/org/jeecg/modules/base/entity/UserFactory.java
new file mode 100644
index 0000000..c1802f5
--- /dev/null
+++ b/src/main/java/org/jeecg/modules/base/entity/UserFactory.java
@@ -0,0 +1,60 @@
+package org.jeecg.modules.base.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: 鐢ㄦ埛宸ュ巶/杞﹂棿/浜х嚎鍏崇郴
+ * @Author: jeecg-boot
+ * @Date: 2025-06-24
+ * @Version: V1.0
+ */
+@Data
+@TableName("base_user_factory")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="base_user_factory瀵硅薄", description="鐢ㄦ埛宸ュ巶/杞﹂棿/浜х嚎鍏崇郴")
+public class UserFactory implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ /**涓婚敭*/
+ @TableId(type = IdType.ASSIGN_ID)
+ @ApiModelProperty(value = "涓婚敭")
+ private String id;
+ /**鍒涘缓浜�*/
+ @ApiModelProperty(value = "鍒涘缓浜�")
+ private String createBy;
+ /**鍒涘缓鏃堕棿*/
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern="yyyy-MM-dd")
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ private Date createTime;
+ /**鐢ㄦ埛*/
+ @Excel(name = "鐢ㄦ埛", width = 15)
+ @ApiModelProperty(value = "鐢ㄦ埛")
+ private String userId;
+ /**宸ュ巶/杞﹂棿/浜х嚎ID*/
+ @Excel(name = "宸ュ巶/杞﹂棿/浜х嚎ID", width = 15)
+ @ApiModelProperty(value = "宸ュ巶/杞﹂棿/浜х嚎ID")
+ private String factoryId;
+
+ public UserFactory(String id, String factoryId) {
+ this.userId = id;
+ this.factoryId = factoryId;
+ }
+}
diff --git a/src/main/java/org/jeecg/modules/base/entity/UserGroup.java b/src/main/java/org/jeecg/modules/base/entity/UserGroup.java
new file mode 100644
index 0000000..9bef1bd
--- /dev/null
+++ b/src/main/java/org/jeecg/modules/base/entity/UserGroup.java
@@ -0,0 +1,63 @@
+package org.jeecg.modules.base.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import java.util.List;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: 鐝粍
+ * @Author: jeecg-boot
+ * @Date: 2025-06-24
+ * @Version: V1.0
+ */
+@Data
+@TableName("base_user_group")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="base_user_group瀵硅薄", description="鐝粍")
+public class UserGroup implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ /**涓婚敭*/
+ @TableId(type = IdType.ASSIGN_ID)
+ @ApiModelProperty(value = "涓婚敭")
+ private String id;
+ /**鍒涘缓浜�*/
+ @ApiModelProperty(value = "鍒涘缓浜�")
+ private String createBy;
+ /**鍒涘缓鏃堕棿*/
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern="yyyy-MM-dd")
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ private Date createTime;
+ /**鐝粍ID*/
+ @Excel(name = "鐝粍ID", width = 15)
+ @ApiModelProperty(value = "鐝粍ID")
+ private String groupId;
+ /**鐢ㄦ埛ID*/
+ @Excel(name = "鐢ㄦ埛ID", width = 15)
+ @ApiModelProperty(value = "鐢ㄦ埛ID")
+ private String userId;
+
+ public UserGroup(String groupId, String userId) {
+ super();
+ this.groupId = groupId;
+ this.userId = userId;
+ }
+}
diff --git a/src/main/java/org/jeecg/modules/base/entity/Warehouse.java b/src/main/java/org/jeecg/modules/base/entity/Warehouse.java
deleted file mode 100644
index 9f0a573..0000000
--- a/src/main/java/org/jeecg/modules/base/entity/Warehouse.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package org.jeecg.modules.base.entity;
-
-import java.io.Serializable;
-import java.io.UnsupportedEncodingException;
-import java.util.Date;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.experimental.Accessors;
-import org.jeecg.common.constant.CommonConstant;
-import org.jeecg.common.system.base.controller.JeecgController;
-import org.jeecg.common.system.base.entity.JeecgEntity;
-import org.jeecgframework.poi.excel.annotation.Excel;
-import lombok.Data;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.jeecg.common.aspect.annotation.Dict;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-/**
- * @Description: 浠撳簱
- * @Author: jeecg-boot
- * @Date: 2022-11-07
- * @Version: V1.0
- */
-@Data
-@TableName("mom_base_warehouse")
-@ApiModel(value="mom_base_warehouse瀵硅薄", description="浠撳簱")
-@Accessors(chain = true)
-public class Warehouse extends JeecgEntity implements Serializable {
- private static final long serialVersionUID = 1L;
-
- /**浠撳簱缂栫爜*/
- @Excel(name = "浠撳簱缂栫爜", width = 15)
- @ApiModelProperty(value = "浠撳簱缂栫爜")
- private String code;
- /**浠撳簱鍚嶇О*/
- @Excel(name = "浠撳簱鍚嶇О", width = 15)
- @ApiModelProperty(value = "浠撳簱鍚嶇О")
- private String name;
- /**鏄惁铏氭嫙锛�0锛氭槸锛�1锛氬惁*/
- @Excel(name = "鏄惁铏氭嫙", width = 15)
- @ApiModelProperty(value = "鏄惁铏氭嫙锛�0锛氭槸锛�1锛氬惁")
- private String status;
- /**鐗堟湰鍙�*/
- @Excel(name = "鐗堟湰鍙�", width = 15)
- @ApiModelProperty(value = "鐗堟湰鍙�")
- private Integer version;
- /**鐗堟湰鏁版嵁ID*/
- @Excel(name = "鐗堟湰鏁版嵁ID", width = 15)
- @ApiModelProperty(value = "鐗堟湰鏁版嵁ID")
- private String dataVersionId;
- /**澶囩敤瀛楁1*/
- @ApiModelProperty(value = "澶囩敤瀛楁1")
- private String warehouseUda1;
- /**澶囩敤瀛楁2*/
- @ApiModelProperty(value = "澶囩敤瀛楁2")
- private String warehouseUda2;
- /**澶囩敤瀛楁3*/
- @ApiModelProperty(value = "澶囩敤瀛楁3")
- private String warehouseUda3;
- /**澶囩敤瀛楁4*/
- @ApiModelProperty(value = "澶囩敤瀛楁4")
- private String warehouseUda4;
- /**澶囩敤瀛楁5*/
- @ApiModelProperty(value = "澶囩敤瀛楁5")
- private String warehouseUda5;
-
- /**鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)*/
- @ApiModelProperty(value = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)")
- private Integer delFlag = CommonConstant.DEL_FLAG_0;
- /**澶囨敞*/
- @Excel(name = "澶囨敞", width = 15)
- @ApiModelProperty(value = "澶囨敞")
- private String remark;
- @ApiModelProperty(value = "浼佷笟ID")
- private String enterpriseId;
-
- @ApiModelProperty(value = "浠撳簱绫诲瀷锛堝瓧鍏革細warehouse_type锛�")
- @Dict(dicCode = "warehouse_type")
- private String type;
-
- @ApiModelProperty(value = "鏄惁搴熷搧搴擄紙瀛楀吀锛歸hether_waste_warehouse锛�")
- @Dict(dicCode = "whether_waste_warehouse")
- private String whetherWasteWarehouse;
-
- @ApiModelProperty(value = "搴撳尯搴撲綅绠＄悊锛堝瓧鍏革細location_manage锛�")
- @Dict(dicCode = "location_manage")
- private String locationManage;
-
- @ApiModelProperty(value = "鏄惁鑷姩鍖栦粨搴擄紙瀛楀吀锛歸hether_automation_warehouse锛�")
- @Dict(dicCode = "whether_automation_warehouse")
- private String whetherAutomationWarehouse;
-
- @ApiModelProperty(value = "鏈嶅姟瀵硅薄锛堝瓧鍏革細service_object锛�")
- @Dict(dicCode = "service_object")
- private String serviceObject;
-}
diff --git a/src/main/java/org/jeecg/modules/base/entity/WarehouseArea.java b/src/main/java/org/jeecg/modules/base/entity/WarehouseArea.java
deleted file mode 100644
index 7ca840e..0000000
--- a/src/main/java/org/jeecg/modules/base/entity/WarehouseArea.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package org.jeecg.modules.base.entity;
-
-import java.io.Serializable;
-import java.io.UnsupportedEncodingException;
-import java.util.Date;
-import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.jeecg.common.constant.CommonConstant;
-import org.jeecg.common.system.base.entity.JeecgEntity;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.jeecgframework.poi.excel.annotation.Excel;
-import org.jeecg.common.aspect.annotation.Dict;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * @Description: mom_base_warehouse_area
- * @Author: jeecg-boot
- * @Date: 2023-07-06
- * @Version: V1.0
- */
-@Data
-@TableName("mom_base_warehouse_area")
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value="mom_base_warehouse_area瀵硅薄", description="mom_base_warehouse_area")
-public class WarehouseArea extends JeecgEntity implements Serializable {
- private static final long serialVersionUID = 1L;
-
- /**浠撳簱id*/
- @Excel(name = "浠撳簱id", width = 15)
- @ApiModelProperty(value = "浠撳簱id")
- private String warehouseId;
- /**搴撳尯缂栧彿*/
- @Excel(name = "搴撳尯缂栧彿", width = 15)
- @ApiModelProperty(value = "搴撳尯缂栧彿")
- private String num;
- /**搴撳尯鍚嶇О*/
- @Excel(name = "搴撳尯鍚嶇О", width = 15)
- @ApiModelProperty(value = "搴撳尯鍚嶇О")
- private String name;
- /**搴撲綅鏁伴噺*/
- @Excel(name = "搴撲綅鏁伴噺", width = 15)
- @ApiModelProperty(value = "搴撲綅鏁伴噺")
- private BigDecimal quantity;
-
- /**鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)*/
- @Excel(name = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)", width = 15)
- @ApiModelProperty(value = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)")
- private Integer delFlag = CommonConstant.DEL_FLAG_0;
-}
diff --git a/src/main/java/org/jeecg/modules/base/entity/WarehouseClient.java b/src/main/java/org/jeecg/modules/base/entity/WarehouseClient.java
deleted file mode 100644
index 5fbb1ac..0000000
--- a/src/main/java/org/jeecg/modules/base/entity/WarehouseClient.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package org.jeecg.modules.base.entity;
-
-import java.io.Serializable;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.experimental.Accessors;
-import org.jeecg.common.aspect.annotation.Dict;
-import lombok.Data;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.jeecgframework.poi.excel.annotation.Excel;
-import java.util.Date;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.io.UnsupportedEncodingException;
-
-/**
- * @Description: 浠撳簱鏈嶅姟瀵硅薄
- * @Author: jeecg-boot
- * @Date: 2022-11-07
- * @Version: V1.0
- */
-@Data
-@TableName("mom_base_warehouse_client")
-@Accessors(chain = true)
-@ApiModel(value="mom_base_warehouse_client瀵硅薄", description="浠撳簱鏈嶅姟瀵硅薄")
-public class WarehouseClient implements Serializable {
- private static final long serialVersionUID = 1L;
-
- /**涓婚敭*/
- @TableId(type = IdType.ASSIGN_ID)
- @ApiModelProperty(value = "涓婚敭")
- private String id;
- @ApiModelProperty(value = "鏈嶅姟瀵硅薄ID")
- private String clientId;
- /**瀵硅薄缂栫爜*/
- @Excel(name = "瀵硅薄缂栫爜", width = 15)
- @ApiModelProperty(value = "瀵硅薄缂栫爜")
- private String code;
- /**瀵硅薄鍚嶇О*/
- @Excel(name = "瀵硅薄鍚嶇О", width = 15)
- @ApiModelProperty(value = "瀵硅薄鍚嶇О")
- private String name;
- /**瑕佺礌绫诲瀷*/
- @Excel(name = "瑕佺礌绫诲瀷", width = 15)
- @ApiModelProperty(value = "瑕佺礌绫诲瀷")
- private String elementType;
- /**浠撳簱id*/
- @ApiModelProperty(value = "浠撳簱id")
- private String warehouseId;
- /**澶囩敤瀛楁1*/
- @ApiModelProperty(value = "澶囩敤瀛楁1")
- private String warehouseClientUda1;
- /**澶囩敤瀛楁2*/
- @ApiModelProperty(value = "澶囩敤瀛楁2")
- private String warehouseClientUda2;
- /**澶囩敤瀛楁3*/
- @ApiModelProperty(value = "澶囩敤瀛楁3")
- private String warehouseClientUda3;
- /**澶囩敤瀛楁4*/
- @ApiModelProperty(value = "澶囩敤瀛楁4")
- private String warehouseClientUda4;
- /**澶囩敤瀛楁5*/
- @ApiModelProperty(value = "澶囩敤瀛楁5")
- private String warehouseClientUda5;
- /**鍒涘缓浜�*/
- @ApiModelProperty(value = "鍒涘缓浜�")
- private String createBy;
- /**鍒涘缓鏃ユ湡*/
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
- @DateTimeFormat(pattern="yyyy-MM-dd")
- @ApiModelProperty(value = "鍒涘缓鏃ユ湡")
- private Date createTime;
- /**鏇存柊浜�*/
- @ApiModelProperty(value = "鏇存柊浜�")
- private String updateBy;
- /**鏇存柊鏃ユ湡*/
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
- @DateTimeFormat(pattern="yyyy-MM-dd")
- @ApiModelProperty(value = "鏇存柊鏃ユ湡")
- private Date updateTime;
- /**鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)*/
- @ApiModelProperty(value = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)")
- private Integer delFlag;
- /**澶囨敞*/
- @Excel(name = "澶囨敞", width = 15)
- @ApiModelProperty(value = "澶囨敞")
- private String remark;
-}
diff --git a/src/main/java/org/jeecg/modules/base/entity/WarehouseLocation.java b/src/main/java/org/jeecg/modules/base/entity/WarehouseLocation.java
deleted file mode 100644
index 5ce2ee6..0000000
--- a/src/main/java/org/jeecg/modules/base/entity/WarehouseLocation.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package org.jeecg.modules.base.entity;
-
-import java.io.Serializable;
-import java.io.UnsupportedEncodingException;
-import java.util.Date;
-import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.jeecg.common.constant.CommonConstant;
-import org.jeecg.common.system.base.entity.JeecgEntity;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.jeecgframework.poi.excel.annotation.Excel;
-import org.jeecg.common.aspect.annotation.Dict;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * @Description: mom_base_warehouse_location
- * @Author: jeecg-boot
- * @Date: 2023-07-06
- * @Version: V1.0
- */
-@Data
-@TableName("mom_base_warehouse_location")
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value="mom_base_warehouse_location瀵硅薄", description="mom_base_warehouse_location")
-public class WarehouseLocation extends JeecgEntity implements Serializable {
- private static final long serialVersionUID = 1L;
-
- /**浠撳簱id*/
- @Excel(name = "浠撳簱id", width = 15)
- @ApiModelProperty(value = "浠撳簱id")
- private String warehouseId;
- /**浠撳簱搴撳尯id*/
- @Excel(name = "浠撳簱搴撳尯id", width = 15)
- @ApiModelProperty(value = "浠撳簱搴撳尯id")
- private String warehouseAreaId;
- /**搴撲綅缂栫爜*/
- @Excel(name = "搴撲綅缂栫爜", width = 15)
- @ApiModelProperty(value = "搴撲綅缂栫爜")
- private String num;
- /**琛屽彿*/
- @Excel(name = "琛屽彿", width = 15)
- @ApiModelProperty(value = "琛屽彿")
- private BigDecimal xnum;
- /**鍒楀彿*/
- @Excel(name = "鍒楀彿", width = 15)
- @ApiModelProperty(value = "鍒楀彿")
- private BigDecimal ynum;
- /**灞傚彿*/
- @Excel(name = "灞傚彿", width = 15)
- @ApiModelProperty(value = "灞傚彿")
- private BigDecimal znum;
-
- /**鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)*/
- @Excel(name = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)", width = 15)
- @ApiModelProperty(value = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)")
- private Integer delFlag = CommonConstant.DEL_FLAG_0;
-}
diff --git a/src/main/java/org/jeecg/modules/base/entity/WorkCenter.java b/src/main/java/org/jeecg/modules/base/entity/WorkCenter.java
deleted file mode 100644
index 29b6e95..0000000
--- a/src/main/java/org/jeecg/modules/base/entity/WorkCenter.java
+++ /dev/null
@@ -1,120 +0,0 @@
-package org.jeecg.modules.base.entity;
-
-import java.io.Serializable;
-import java.io.UnsupportedEncodingException;
-import java.util.Date;
-import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.jeecgframework.poi.excel.annotation.Excel;
-import org.jeecg.common.aspect.annotation.Dict;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * @Description: mom_base_work_center
- * @Author: jeecg-boot
- * @Date: 2022-11-17
- * @Version: V1.0
- */
-@Data
-@TableName("mom_base_work_center")
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value="mom_base_work_center瀵硅薄", description="mom_base_work_center")
-public class WorkCenter implements Serializable {
- private static final long serialVersionUID = 1L;
-
- /**涓婚敭ID*/
- @TableId(type = IdType.ASSIGN_ID)
- @ApiModelProperty(value = "涓婚敭ID")
- private String id;
- /**宸ヤ綔涓績缂栫爜*/
- @Excel(name = "宸ヤ綔涓績缂栫爜", width = 15)
- @ApiModelProperty(value = "宸ヤ綔涓績缂栫爜")
- private String code;
- /**宸ヤ綔涓績鍚嶇О*/
- @Excel(name = "宸ヤ綔涓績鍚嶇О", width = 15)
- @ApiModelProperty(value = "宸ヤ綔涓績鍚嶇О")
- private String name;
- /**涓氬姟绫诲瀷ID*/
- @Excel(name = "涓氬姟绫诲瀷", width = 15)
- @ApiModelProperty(value = "涓氬姟绫诲瀷")
- private String serviceCategory;
- /**宸ヤ綔涓績绫诲瀷ID*/
- @Excel(name = "宸ヤ綔涓績绫诲瀷ID", width = 15)
- @ApiModelProperty(value = "宸ヤ綔涓績绫诲瀷ID")
- private String workCenterCategory;
- /**璁惧缁処D*/
- @Excel(name = "璁惧缁処D", width = 15)
- @ApiModelProperty(value = "璁惧缁処D")
- private String equipmentTeamId;
- /**涓婃枡鍖�*/
- @Excel(name = "涓婃枡鍖�", width = 15)
- @ApiModelProperty(value = "涓婃枡鍖�")
- private String feedingArea;
- /**涓嬫枡鍖�*/
- @Excel(name = "涓嬫枡鍖�", width = 15)
- @ApiModelProperty(value = "涓嬫枡鍖�")
- private String baitingArea;
- /**鐗堟湰*/
- @Excel(name = "鐗堟湰", width = 15)
- @ApiModelProperty(value = "鐗堟湰")
- private Integer version;
- /**宸ュ巶寤烘āID*/
- @Excel(name = "宸ュ巶寤烘āID", width = 15)
- @ApiModelProperty(value = "椤跺眰宸ュ巶寤烘āID")
- private String factoryModelId;
- /**澶囩敤瀛楁1*/
- @Excel(name = "澶囩敤瀛楁1", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁1")
- private String workCenterUda1;
- /**澶囩敤瀛楁2*/
- @Excel(name = "澶囩敤瀛楁2", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁2")
- private String workCenterUda2;
- /**澶囩敤瀛楁3*/
- @Excel(name = "澶囩敤瀛楁3", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁3")
- private String workCenterUda3;
- /**澶囩敤瀛楁4*/
- @Excel(name = "澶囩敤瀛楁4", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁4")
- private String workCenterUda4;
- /**澶囩敤瀛楁5*/
- @Excel(name = "澶囩敤瀛楁5", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁5")
- private String workCenterUda5;
- /**鍒涘缓浜�*/
- @ApiModelProperty(value = "鍒涘缓浜�")
- private String createBy;
- /**鍒涘缓鏃堕棿*/
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
- @DateTimeFormat(pattern="yyyy-MM-dd")
- @ApiModelProperty(value = "鍒涘缓鏃堕棿")
- private Date createTime;
- /**淇敼浜�*/
- @ApiModelProperty(value = "淇敼浜�")
- private String updateBy;
- /**淇敼鏃堕棿*/
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
- @DateTimeFormat(pattern="yyyy-MM-dd")
- @ApiModelProperty(value = "淇敼鏃堕棿")
- private Date updateTime;
- /**澶囨敞*/
- @Excel(name = "澶囨敞", width = 15)
- @ApiModelProperty(value = "澶囨敞")
- private String remark;
- @ApiModelProperty(value = "鐖跺眰宸ュ巶寤烘āid")
- private String parentFactoryModelId;
- @ApiModelProperty(value = "0锛氭湭鍒犻櫎锛�1锛氬凡鍒犻櫎")
- private Integer delFlag;
- @ApiModelProperty(value = "鐗堟湰ID")
- private String dataVersionId;
-}
diff --git a/src/main/java/org/jeecg/modules/base/entity/WorkCenterDetail.java b/src/main/java/org/jeecg/modules/base/entity/WorkCenterDetail.java
deleted file mode 100644
index fe560fe..0000000
--- a/src/main/java/org/jeecg/modules/base/entity/WorkCenterDetail.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package org.jeecg.modules.base.entity;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.jeecgframework.poi.excel.annotation.Excel;
-
-@Data
-public class WorkCenterDetail {
- private String id;
- private String code;
- private String name;
- private String serviceCategory;
- private String workCenterCategory;
- private String equipmentTeamId;
- private String equipmentTeamName;
- private String feedingArea;
- private String baitingArea;
- private String isLastUsable;
- private Integer version;
- private String versionStatus;
- private String auditStatus;
- private String factoryModelId;
- private String createBy;
- private java.util.Date createTime;
- private String updateBy;
- private java.util.Date updateTime;
- private String remark;
- private String parentFactoryModelId;
- private Integer delFlag;
- private String dataVersionId;
-}
diff --git a/src/main/java/org/jeecg/modules/base/entity/WorkCenterEquipment.java b/src/main/java/org/jeecg/modules/base/entity/WorkCenterEquipment.java
deleted file mode 100644
index 08a1c8d..0000000
--- a/src/main/java/org/jeecg/modules/base/entity/WorkCenterEquipment.java
+++ /dev/null
@@ -1,94 +0,0 @@
-package org.jeecg.modules.base.entity;
-
-import java.io.Serializable;
-import java.io.UnsupportedEncodingException;
-import java.util.Date;
-import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.jeecgframework.poi.excel.annotation.Excel;
-import org.jeecg.common.aspect.annotation.Dict;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * @Description: mom_base_work_center_equipment
- * @Author: jeecg-boot
- * @Date: 2022-12-06
- * @Version: V1.0
- */
-@Data
-@TableName("mom_base_work_center_equipment")
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value="mom_base_work_center_equipment瀵硅薄", description="mom_base_work_center_equipment")
-public class WorkCenterEquipment implements Serializable {
- private static final long serialVersionUID = 1L;
-
- /**涓婚敭ID*/
- @TableId(type = IdType.ASSIGN_ID)
- @ApiModelProperty(value = "涓婚敭ID")
- private String id;
- /**宸ヤ綔涓績id*/
- @Excel(name = "宸ヤ綔涓績id", width = 15)
- @ApiModelProperty(value = "宸ヤ綔涓績id")
- private String workCenterId;
- /**璁惧id*/
- @Excel(name = "璁惧id", width = 15)
- @ApiModelProperty(value = "璁惧id")
- private String equipmentId;
- /**澶囩敤瀛楁1*/
- @Excel(name = "澶囩敤瀛楁1", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁1")
- private String workCenterEquipmentUda1;
- /**澶囩敤瀛楁2*/
- @Excel(name = "澶囩敤瀛楁2", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁2")
- private String workCenterEquipmentUda2;
- /**澶囩敤瀛楁3*/
- @Excel(name = "澶囩敤瀛楁3", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁3")
- private String workCenterEquipmentUda3;
- /**澶囩敤瀛楁4*/
- @Excel(name = "澶囩敤瀛楁4", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁4")
- private String workCenterEquipmentUda4;
- /**澶囩敤瀛楁5*/
- @Excel(name = "澶囩敤瀛楁5", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁5")
- private String workCenterEquipmentUda5;
- /**鐘舵��*/
- @Excel(name = "鐘舵��", width = 15)
- @ApiModelProperty(value = "鐘舵��")
- private String status;
- /**鍒涘缓浜�*/
- @ApiModelProperty(value = "鍒涘缓浜�")
- private String createBy;
- /**鍒涘缓鏃堕棿*/
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
- @DateTimeFormat(pattern="yyyy-MM-dd")
- @ApiModelProperty(value = "鍒涘缓鏃堕棿")
- private Date createTime;
- /**鏇存柊浜�*/
- @ApiModelProperty(value = "鏇存柊浜�")
- private String updateBy;
- /**鏇存柊鏃堕棿*/
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
- @DateTimeFormat(pattern="yyyy-MM-dd")
- @ApiModelProperty(value = "鏇存柊鏃堕棿")
- private Date updateTime;
- /**鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)*/
- @Excel(name = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)", width = 15)
- @ApiModelProperty(value = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)")
- private Integer delFlag;
- /**浼佷笟ID*/
- @Excel(name = "浼佷笟ID", width = 15)
- @ApiModelProperty(value = "浼佷笟ID")
- private String enterpriseId;
-}
diff --git a/src/main/java/org/jeecg/modules/base/entity/WorkCenterUser.java b/src/main/java/org/jeecg/modules/base/entity/WorkCenterUser.java
deleted file mode 100644
index d769734..0000000
--- a/src/main/java/org/jeecg/modules/base/entity/WorkCenterUser.java
+++ /dev/null
@@ -1,94 +0,0 @@
-package org.jeecg.modules.base.entity;
-
-import java.io.Serializable;
-import java.io.UnsupportedEncodingException;
-import java.util.Date;
-import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.jeecgframework.poi.excel.annotation.Excel;
-import org.jeecg.common.aspect.annotation.Dict;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * @Description: mom_base_work_center_user
- * @Author: jeecg-boot
- * @Date: 2022-12-06
- * @Version: V1.0
- */
-@Data
-@TableName("mom_base_work_center_user")
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value="mom_base_work_center_user瀵硅薄", description="mom_base_work_center_user")
-public class WorkCenterUser implements Serializable {
- private static final long serialVersionUID = 1L;
-
- /**涓婚敭ID*/
- @TableId(type = IdType.ASSIGN_ID)
- @ApiModelProperty(value = "涓婚敭ID")
- private String id;
- /**宸ヤ綔涓績id*/
- @Excel(name = "宸ヤ綔涓績id", width = 15)
- @ApiModelProperty(value = "宸ヤ綔涓績id")
- private String workCenterId;
- /**鐢ㄦ埛id*/
- @Excel(name = "鐢ㄦ埛id", width = 15)
- @ApiModelProperty(value = "鐢ㄦ埛id")
- private String userId;
- /**澶囩敤瀛楁1*/
- @Excel(name = "澶囩敤瀛楁1", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁1")
- private String workCenterUserUda1;
- /**澶囩敤瀛楁2*/
- @Excel(name = "澶囩敤瀛楁2", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁2")
- private String workCenterUserUda2;
- /**澶囩敤瀛楁3*/
- @Excel(name = "澶囩敤瀛楁3", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁3")
- private String workCenterUserUda3;
- /**澶囩敤瀛楁4*/
- @Excel(name = "澶囩敤瀛楁4", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁4")
- private String workCenterUserUda4;
- /**澶囩敤瀛楁5*/
- @Excel(name = "澶囩敤瀛楁5", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁5")
- private String workCenterUserUda5;
- /**鐘舵��*/
- @Excel(name = "鐘舵��", width = 15)
- @ApiModelProperty(value = "鐘舵��")
- private String status;
- /**鍒涘缓浜�*/
- @ApiModelProperty(value = "鍒涘缓浜�")
- private String createBy;
- /**鍒涘缓鏃堕棿*/
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
- @DateTimeFormat(pattern="yyyy-MM-dd")
- @ApiModelProperty(value = "鍒涘缓鏃堕棿")
- private Date createTime;
- /**鏇存柊浜�*/
- @ApiModelProperty(value = "鏇存柊浜�")
- private String updateBy;
- /**鏇存柊鏃堕棿*/
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
- @DateTimeFormat(pattern="yyyy-MM-dd")
- @ApiModelProperty(value = "鏇存柊鏃堕棿")
- private Date updateTime;
- /**鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)*/
- @Excel(name = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)", width = 15)
- @ApiModelProperty(value = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)")
- private Integer delFlag;
- /**浼佷笟ID*/
- @Excel(name = "浼佷笟ID", width = 15)
- @ApiModelProperty(value = "浼佷笟ID")
- private String enterpriseId;
-}
diff --git a/src/main/java/org/jeecg/modules/base/mapper/ClientCategoryMapper.java b/src/main/java/org/jeecg/modules/base/mapper/ClientCategoryMapper.java
deleted file mode 100644
index 2fea6bd..0000000
--- a/src/main/java/org/jeecg/modules/base/mapper/ClientCategoryMapper.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.jeecg.modules.base.mapper;
-
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.jeecg.modules.base.entity.ClientCategory;
-
-
-/**
- * @author jeecg-boot
- */
-public interface ClientCategoryMapper extends BaseMapper<ClientCategory> {
-
-}
diff --git a/src/main/java/org/jeecg/modules/base/mapper/ClientContactMapper.java b/src/main/java/org/jeecg/modules/base/mapper/ClientContactMapper.java
deleted file mode 100644
index 839e858..0000000
--- a/src/main/java/org/jeecg/modules/base/mapper/ClientContactMapper.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.jeecg.modules.base.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.jeecg.modules.base.entity.ClientContact;
-
-public interface ClientContactMapper extends BaseMapper<ClientContact> {
-
-}
diff --git a/src/main/java/org/jeecg/modules/base/mapper/ClientMapper.java b/src/main/java/org/jeecg/modules/base/mapper/ClientMapper.java
deleted file mode 100644
index ff88805..0000000
--- a/src/main/java/org/jeecg/modules/base/mapper/ClientMapper.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.jeecg.modules.base.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.jeecg.modules.base.entity.Client;
-
-public interface ClientMapper extends BaseMapper<Client> {
-
-}
diff --git a/src/main/java/org/jeecg/modules/base/mapper/ConstructorMapper.java b/src/main/java/org/jeecg/modules/base/mapper/ConstructorMapper.java
deleted file mode 100644
index 84df68f..0000000
--- a/src/main/java/org/jeecg/modules/base/mapper/ConstructorMapper.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.jeecg.modules.base.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-import org.jeecg.modules.base.entity.Constructor;
-import org.jeecg.modules.base.entity.Supplier;
-
-public interface ConstructorMapper extends BaseMapper<Constructor> {
-
- /**
- * 閫氳繃鍒堕�犲晢鍚嶇О鏌ヨ鍒堕�犲晢淇℃伅
- *
- * @param name
- * @return
- */
- public Constructor getByName(@Param("name") String name);
-}
diff --git a/src/main/java/org/jeecg/modules/base/mapper/EnterpriseAdministratorMapper.java b/src/main/java/org/jeecg/modules/base/mapper/EnterpriseAdministratorMapper.java
deleted file mode 100644
index c066783..0000000
--- a/src/main/java/org/jeecg/modules/base/mapper/EnterpriseAdministratorMapper.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package org.jeecg.modules.base.mapper;
-
-import java.util.List;
-import java.util.Map;
-
-import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.jeecg.modules.base.entity.EnterpriseAdministrator;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-/**
- * @Description: mom_base_enterprise_administrator
- * @Author: jeecg-boot
- * @Date: 2023-01-12
- * @Version: V1.0
- */
-public interface EnterpriseAdministratorMapper extends BaseMapper<EnterpriseAdministrator> {
-
- /**
- * 閫氳繃涓昏〃id鍒犻櫎瀛愯〃鏁版嵁
- *
- * @param mainId 涓昏〃id
- * @return boolean
- */
- public boolean deleteByMainId(@Param("mainId") String mainId);
-
- /**
- * 閫氳繃涓昏〃id鏌ヨ瀛愯〃鏁版嵁
- *
- * @param mainId 涓昏〃id
- * @return List<EnterpriseAdministrator>
- */
- public List<EnterpriseAdministrator> selectByMainId(@Param("mainId") String mainId);
-
- /**
- * 鏍规嵁绯荤粺绠＄悊鍛業d鏌ュ叾鎺岀鐨勫叕鍙�
- * @param page
- * @param mainId 涓昏〃id
- * @param enterpriseId 涓昏〃id
- * @return
- */
- List<Map<String,Object>> mapList(Page<Map<String,Object>> page,@Param("mainId") String mainId,@Param("enterpriseId")String enterpriseId );
-
-}
diff --git a/src/main/java/org/jeecg/modules/base/mapper/EnterpriseMapper.java b/src/main/java/org/jeecg/modules/base/mapper/EnterpriseMapper.java
deleted file mode 100644
index f90354b..0000000
--- a/src/main/java/org/jeecg/modules/base/mapper/EnterpriseMapper.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package org.jeecg.modules.base.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.apache.ibatis.annotations.Param;
-import org.jeecg.common.system.vo.SelectTreeModel;
-import org.jeecg.modules.base.entity.Enterprise;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * @Description: 浼佷笟鏋舵瀯
- * @Author: jeecg-boot
- * @Date: 2022-11-21
- * @Version: V1.0
- */
-@Repository
-public interface EnterpriseMapper extends BaseMapper<Enterprise> {
- /**
- * 鑾峰彇鐗堟湰鏍�
- * @param pid
- * @param version
- * @return
- *
- */
- List<SelectTreeModel> getEnterpriseVersionTree(@Param("pid") String pid,@Param("version") Integer version);
- /**
- * 鑾峰彇鎵�鏈夌増鏈彿
- * @return
- *
- */
- List<Integer> getAllVersion();
- /**
- * 鑾峰彇瀛╁瓙鍒楄〃
- * @param page
- * @param version
- * @param parentId
- * @return
- *
- */
- List<Map<String,Object>> getEnterpriseListByIds(Page<Map<String,Object>> page,
- @Param("version") Integer version,
- @Param("parentId") String parentId);
- /**
- * 鑾峰彇瀛╁瓙鍒楄〃//宸茬粡寮冪敤
- * @param
- * @return
- *
- */
- List<Map<String,Object>> getEnterpriseList();
- /**
- * 鑾峰彇瀛╁瓙Id
- * @param parentId
- * @return
- *
- */
- List<String> getAllChildrenIdByParentId(@Param("parentId") String parentId);
- /**
- * 鏌ユ鍦ㄧ敓鏁堢殑鐗堟湰鍙�
- * @return
- *
- */
- List<Integer> getUsableVersion();
- /**
- * 鏌ユ渶鍚庝竴娆＄殑鐢熸晥鐗堟湰
- * @return
- *
- */
- List<Enterprise> getLastUsableList();
- /**
- * 鏌ユ鍦ㄧ敓鏁堢殑鐗堟湰鍒楄〃
- * @return
- *
- */
- List<Enterprise> getUsableList();
- /**
- * 鏌ユ鍦ㄧ敓鏁堢殑鐗堟湰鍒楄〃
- * @return
- *
- */
- List<String> getUsableIdList();
-
-}
diff --git a/src/main/java/org/jeecg/modules/base/mapper/FactoryElementCategoryMapper.java b/src/main/java/org/jeecg/modules/base/mapper/FactoryElementCategoryMapper.java
deleted file mode 100644
index b9bed04..0000000
--- a/src/main/java/org/jeecg/modules/base/mapper/FactoryElementCategoryMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.jeecg.modules.base.mapper;
-
-import org.jeecg.modules.base.entity.FactoryElementCategory;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.springframework.stereotype.Repository;
-
-/**
- * @Description: 宸ュ巶瑕佺礌绫诲瀷
- * @Author: jeecg-boot
- * @Date: 2022-11-07
- * @Version: V1.0
- */
-@Repository
-public interface FactoryElementCategoryMapper extends BaseMapper<FactoryElementCategory> {
-
-}
diff --git a/src/main/java/org/jeecg/modules/base/mapper/FactoryMapper.java b/src/main/java/org/jeecg/modules/base/mapper/FactoryMapper.java
new file mode 100644
index 0000000..893ab77
--- /dev/null
+++ b/src/main/java/org/jeecg/modules/base/mapper/FactoryMapper.java
@@ -0,0 +1,17 @@
+package org.jeecg.modules.base.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.base.entity.Factory;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 宸ュ巶/杞﹂棿/浜х嚎
+ * @Author: jeecg-boot
+ * @Date: 2025-06-24
+ * @Version: V1.0
+ */
+public interface FactoryMapper extends BaseMapper<Factory> {
+
+}
diff --git a/src/main/java/org/jeecg/modules/base/mapper/FactoryModelMapper.java b/src/main/java/org/jeecg/modules/base/mapper/FactoryModelMapper.java
deleted file mode 100644
index d21229d..0000000
--- a/src/main/java/org/jeecg/modules/base/mapper/FactoryModelMapper.java
+++ /dev/null
@@ -1,120 +0,0 @@
-package org.jeecg.modules.base.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.apache.ibatis.annotations.Param;
-import org.jeecg.common.system.vo.SelectTreeModel;
-import org.jeecg.modules.base.entity.FactoryModel;
-import org.jeecg.modules.base.entity.FactoryModelDetail;
-import org.jeecg.modules.system.entity.SysDepart;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * @Description: 宸ュ巶寤烘ā
- * @Author: jeecg-boot
- * @Date: 2022-11-08
- * @Version: V1.0
- */
-@Repository
-public interface FactoryModelMapper extends BaseMapper<FactoryModel> {
- /**
- * 銆恦ue3涓撶敤銆戞牴鎹埗绾D鏌ヨ鏍戣妭鐐规暟鎹�
- *
- * @param parentId
- * @param version
- * @return
- */
- List<SelectTreeModel> loadTreeByEnterpriseIdAndVersion(@Param("parentId") String parentId, @Param("version")Integer version);
- /**
- * 鏍规嵁褰撳墠鐧诲綍绯荤粺绠＄悊鍛樻煡璇㈠叾鎵�鍦ㄥ叕鍙哥殑id
- *
- * @param uid
- * @return
- */
- String selectEnterpriseIdByUid(String uid);
- /**
- * 鑾峰彇鐗堟湰鍒楄〃
- * @param page
- * @param parentId
- * @param version
- * @param ids
- * @return
- */
- List<Map<String,Object>> getFactoryList(Page<Map<String,Object>> page,
- @Param("version") Integer version,
- @Param("parentId") String parentId,
- @Param("ids") List<String> ids
- );
- /**
- * 鑾峰彇閮ㄩ棬鍒楄〃
- *
- * @param
- * @return
- */
- List<SysDepart> getDepartList();
- /**
- * 鑾峰彇鐖惰妭鐐�
- *
- * @param id
- * @return
- */
- FactoryModelDetail getFatherIdById(String id);
- /**
- * 鏍规嵁鐖惰妭鐐筰d鑾峰彇瀛╁瓙鍒楄〃
- *
- * @param eid
- * @return
- */
- List<FactoryModelDetail> getListByEid(String eid);
- /**
- * 鑾峰彇鎵�鏈夌増鏈彿
- * @param
- *
- * @return
- */
- List<Integer> getAllVersion();
- /**
- * 鑾峰彇鐢熸晥鐗堟湰鍙�
- *
- * @return
- */
- List<Integer> getUsableVersion();
- /**
- * 鑾峰彇鐢熸晥鐗堟湰鍙�
- *
- * @return
- */
- List<Integer> getLastUsableVersion();
- /**
- * 鏍规嵁鐖禝d鑾峰彇鎵�鏈夊瀛怚d
- * @param parentId
- * @return
- */
- List<String> getAllChildrenIdByParentId(@Param("parentId")String parentId);
- /**
- * 鑾峰彇鏈�鍚庝竴娆＄敓鏁堝垪琛�
- * @param enterpriseIds
- * @return
- */
- List<FactoryModel> getLastUsableList(@Param("enterpriseIds") List<String> enterpriseIds);
- /**
- * 鑾峰彇褰撳墠鐢熸晥鍒楄〃
- * @param enterpriseIds
- * @return
- */
- List<FactoryModel> getUsableList(@Param("enterpriseIds") List<String> enterpriseIds);
- /**
- * 鑾峰彇鐗堟湰鐘舵�佹牴鎹増鏈彿
- * @param version
- * @return
- */
- List<String> getVersionStatusByVersion(@Param("version") Integer version);
- /**
- * 鑾峰彇褰撳墠鐢熸晥杞﹂棿鍒楄〃
- * @return
- */
- List<Map<String,Object>> getUsableWorkShopList();
-}
diff --git a/src/main/java/org/jeecg/modules/base/mapper/LineSideWarehouseMapper.java b/src/main/java/org/jeecg/modules/base/mapper/LineSideWarehouseMapper.java
new file mode 100644
index 0000000..c1efcb8
--- /dev/null
+++ b/src/main/java/org/jeecg/modules/base/mapper/LineSideWarehouseMapper.java
@@ -0,0 +1,17 @@
+package org.jeecg.modules.base.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.base.entity.LineSideWarehouse;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 绾胯竟浠撳簱淇℃伅
+ * @Author: jeecg-boot
+ * @Date: 2025-06-24
+ * @Version: V1.0
+ */
+public interface LineSideWarehouseMapper extends BaseMapper<LineSideWarehouse> {
+
+}
diff --git a/src/main/java/org/jeecg/modules/base/mapper/MaterialCategoryMapper.java b/src/main/java/org/jeecg/modules/base/mapper/MaterialCategoryMapper.java
deleted file mode 100644
index 07371fb..0000000
--- a/src/main/java/org/jeecg/modules/base/mapper/MaterialCategoryMapper.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package org.jeecg.modules.base.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.apache.ibatis.annotations.Param;
-import org.jeecg.common.system.vo.SelectTreeModel;
-import org.jeecg.modules.base.entity.Enterprise;
-import org.jeecg.modules.base.entity.MaterialCategory;
-
-import java.util.List;
-import java.util.Map;
-
-public interface MaterialCategoryMapper extends BaseMapper<MaterialCategory> {
-
- /**
- * 鑾峰彇鐗堟湰鏍�
- *
- * @param pid
- * @param version
- * @return
- */
- List<SelectTreeModel> getMaterialCategoryVersionTree(@Param("pid") String pid, @Param("version") Integer version);
-
- /**
- * 鑾峰彇瀛╁瓙鍒楄〃
- *
- * @param page
- * @param version
- * @param parentId
- * @return
- */
- List<Map<String, Object>> getMaterialCategoryListByIds(Page<Map<String, Object>> page,
- @Param("version") Integer version,
- @Param("parentId") String parentId);
-
- /**
- * 鑾峰彇鎵�鏈夌増鏈彿
- *
- * @return
- */
- List<Integer> getAllVersion();
-
- /**
- * 鏌ユ鍦ㄧ敓鏁堢殑鐗堟湰鍙�
- *
- * @return
- */
- List<Integer> getUsableVersion();
-
- /**
- * 鏌ユ渶鍚庝竴娆＄殑鐢熸晥鐗堟湰
- *
- * @return
- */
- List<MaterialCategory> getLastUsableList();
-
- /**
- * 鏌ユ鍦ㄧ敓鏁堢殑鐗堟湰鍒楄〃
- *
- * @return
- */
- List<MaterialCategory> getUsableList();
-
- /**
- * 鏌ユ鍦ㄧ敓鏁堢殑鐗堟湰鍒楄〃
- *
- * @return
- */
- List<String> getUsableIdList();
-}
diff --git a/src/main/java/org/jeecg/modules/base/mapper/MaterialMapper.java b/src/main/java/org/jeecg/modules/base/mapper/MaterialMapper.java
deleted file mode 100644
index 128d941..0000000
--- a/src/main/java/org/jeecg/modules/base/mapper/MaterialMapper.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.jeecg.modules.base.mapper;
-
-import org.jeecg.modules.base.entity.Material;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * @Description: 鐗╂枡琛�
- * @Author: jeecg-boot
- * @Date: 2023-04-28
- * @Version: V1.0
- */
-public interface MaterialMapper extends BaseMapper<Material> {
-
-}
diff --git a/src/main/java/org/jeecg/modules/base/mapper/ProductionLineWarehouseClientMapper.java b/src/main/java/org/jeecg/modules/base/mapper/ProductionLineWarehouseClientMapper.java
deleted file mode 100644
index 86e2794..0000000
--- a/src/main/java/org/jeecg/modules/base/mapper/ProductionLineWarehouseClientMapper.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package org.jeecg.modules.base.mapper;
-
-import java.util.List;
-import java.util.Map;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.jeecg.modules.base.entity.ProductionLineWarehouseClient;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-/**
- * @Description: 绾胯竟搴撴湇鍔″璞�
- * @Author: jeecg-boot
- * @Date: 2023-01-28
- * @Version: V1.0
- */
-public interface ProductionLineWarehouseClientMapper extends BaseMapper<ProductionLineWarehouseClient> {
-
- /**
- * 閫氳繃涓昏〃id鍒犻櫎瀛愯〃鏁版嵁
- *
- * @param mainId 涓昏〃id
- * @return boolean
- */
- public boolean deleteByMainId(@Param("mainId") String mainId);
-
- /**
- * 閫氳繃涓昏〃id鏌ヨ瀛愯〃鏁版嵁
- *
- * @param mainId 涓昏〃id
- * @return List<ProductionLineWarehouseClient>
- */
- public List<ProductionLineWarehouseClient> selectByMainId(@Param("mainId") String mainId);
- /**
- * 鑾峰彇鐗堟湰鍒楄〃
- * @param page
- * @param parentIds
- * @param version
- * @return
- */
- List<Map<String,Object>> getFactoryList(Page<Map<String,Object>> page,
- @Param("version") Integer version,
- @Param("parentIds") List<String> parentIds,
- @Param("ids") List<String> ids
- );
-
-
-}
diff --git a/src/main/java/org/jeecg/modules/base/mapper/ProductionLineWarehouseMapper.java b/src/main/java/org/jeecg/modules/base/mapper/ProductionLineWarehouseMapper.java
deleted file mode 100644
index 7ea9dd4..0000000
--- a/src/main/java/org/jeecg/modules/base/mapper/ProductionLineWarehouseMapper.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package org.jeecg.modules.base.mapper;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.apache.ibatis.annotations.Param;
-import org.jeecg.modules.base.entity.ProductionLineWarehouse;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.jeecg.modules.base.entity.Warehouse;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * @Description: 绾胯竟搴撶鐞�
- * @Author: jeecg-boot
- * @Date: 2023-01-28
- * @Version: V1.0
- */
-public interface ProductionLineWarehouseMapper extends BaseMapper<ProductionLineWarehouse> {
- /**
- * 鑾峰彇鐗堟湰浠撳簱鍒楄〃
- * @param page
- * @param workshopId
- * @param version
- * @return
- */
- List<Map<String,Object>> getWarehouseList(Page<Map<String,Object>> page,
- @Param("version") Integer version,
- @Param("workshopId") String workshopId
- );
- /**
- * 鑾峰彇鎵�鏈夌増鏈彿
- * @param
- *
- * @return
- */
- List<Integer> getAllVersion();
- /**
- * 鑾峰彇鏈�鍚庝竴娆＄敓鏁堝垪琛�
- * @return
- */
- List<ProductionLineWarehouse> getLastUsableList();
- /**
- * 鑾峰彇褰撳墠鐢熸晥鍒楄〃
- * @return
- */
- List<ProductionLineWarehouse> getUsableList();
- /**
- * 鑾峰彇鐗堟湰鐘舵�佹牴鎹増鏈彿
- * @param veison
- * @return
- */
- List<String> getVersionStatusByVersion(Integer veison);
-}
diff --git a/src/main/java/org/jeecg/modules/base/mapper/ShiftGroupMapper.java b/src/main/java/org/jeecg/modules/base/mapper/ShiftGroupMapper.java
new file mode 100644
index 0000000..991cbb8
--- /dev/null
+++ b/src/main/java/org/jeecg/modules/base/mapper/ShiftGroupMapper.java
@@ -0,0 +1,17 @@
+package org.jeecg.modules.base.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.base.entity.ShiftGroup;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 鐝粍浜哄憳淇℃伅
+ * @Author: jeecg-boot
+ * @Date: 2025-06-24
+ * @Version: V1.0
+ */
+public interface ShiftGroupMapper extends BaseMapper<ShiftGroup> {
+
+}
diff --git a/src/main/java/org/jeecg/modules/base/mapper/ShiftMapper.java b/src/main/java/org/jeecg/modules/base/mapper/ShiftMapper.java
new file mode 100644
index 0000000..66fe3af
--- /dev/null
+++ b/src/main/java/org/jeecg/modules/base/mapper/ShiftMapper.java
@@ -0,0 +1,17 @@
+package org.jeecg.modules.base.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.base.entity.Shift;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 鐝
+ * @Author: jeecg-boot
+ * @Date: 2025-06-24
+ * @Version: V1.0
+ */
+public interface ShiftMapper extends BaseMapper<Shift> {
+
+}
diff --git a/src/main/java/org/jeecg/modules/base/mapper/SupplierCategoryMapper.java b/src/main/java/org/jeecg/modules/base/mapper/SupplierCategoryMapper.java
deleted file mode 100644
index 134280b..0000000
--- a/src/main/java/org/jeecg/modules/base/mapper/SupplierCategoryMapper.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.jeecg.modules.base.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.jeecg.modules.base.entity.SupplierCategory;
-
-public interface SupplierCategoryMapper extends BaseMapper<SupplierCategory> {
-
-}
diff --git a/src/main/java/org/jeecg/modules/base/mapper/SupplierContactMapper.java b/src/main/java/org/jeecg/modules/base/mapper/SupplierContactMapper.java
deleted file mode 100644
index b940ed6..0000000
--- a/src/main/java/org/jeecg/modules/base/mapper/SupplierContactMapper.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package org.jeecg.modules.base.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.jeecg.modules.base.entity.Constructor;
-import org.jeecg.modules.base.entity.SupplierContact;
-
-public interface SupplierContactMapper extends BaseMapper<SupplierContact> {
-
-}
diff --git a/src/main/java/org/jeecg/modules/base/mapper/SupplierMapper.java b/src/main/java/org/jeecg/modules/base/mapper/SupplierMapper.java
index 4376bd1..0101412 100644
--- a/src/main/java/org/jeecg/modules/base/mapper/SupplierMapper.java
+++ b/src/main/java/org/jeecg/modules/base/mapper/SupplierMapper.java
@@ -1,16 +1,17 @@
package org.jeecg.modules.base.mapper;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-import org.jeecg.modules.base.entity.Constructor;
-import org.jeecg.modules.base.entity.Supplier;
-import org.jeecg.modules.base.entity.Unit;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.base.entity.Supplier;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 渚涘簲鍟嗙鐞�
+ * @Author: jeecg-boot
+ * @Date: 2025-06-24
+ * @Version: V1.0
+ */
public interface SupplierMapper extends BaseMapper<Supplier> {
- /**
- * 閫氳繃渚涘簲鍟嗗悕绉版煡璇緵搴斿晢淇℃伅
- * @param name
- * @return
- */
- public Supplier getByName(@Param("name") String name);
+
}
diff --git a/src/main/java/org/jeecg/modules/base/mapper/UnitCategoryMapper.java b/src/main/java/org/jeecg/modules/base/mapper/UnitCategoryMapper.java
deleted file mode 100644
index 5f69186..0000000
--- a/src/main/java/org/jeecg/modules/base/mapper/UnitCategoryMapper.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.jeecg.modules.base.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.jeecg.modules.base.entity.UnitCategory;
-
-import java.util.List;
-
-public interface UnitCategoryMapper extends BaseMapper<UnitCategory> {
- public List<UnitCategory> getList(String id);
-}
diff --git a/src/main/java/org/jeecg/modules/base/mapper/UnitConversionMapper.java b/src/main/java/org/jeecg/modules/base/mapper/UnitConversionMapper.java
deleted file mode 100644
index 5586dfc..0000000
--- a/src/main/java/org/jeecg/modules/base/mapper/UnitConversionMapper.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.jeecg.modules.base.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.jeecg.modules.base.entity.UnitConversion;
-
-import java.util.List;
-
-public interface UnitConversionMapper extends BaseMapper<UnitConversion> {
- public List<UnitConversion> getListByUnitId(String[] ids);
-}
diff --git a/src/main/java/org/jeecg/modules/base/mapper/UnitMapper.java b/src/main/java/org/jeecg/modules/base/mapper/UnitMapper.java
deleted file mode 100644
index 99bec21..0000000
--- a/src/main/java/org/jeecg/modules/base/mapper/UnitMapper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.jeecg.modules.base.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-import org.jeecg.modules.base.entity.Unit;
-
-import java.util.List;
-
-public interface UnitMapper extends BaseMapper<Unit> {
- public List<Unit> getListByUnitCategoryId(String unitCategoryId);
- public List<Unit> getTreeList();
- /**
- * 閫氳繃鍗曚綅鍚嶇О鏌ヨ鍗曚綅淇℃伅
- * @param name
- * @return
- */
- public Unit getUnitByName(@Param("name") String name);
-}
diff --git a/src/main/java/org/jeecg/modules/base/mapper/UserFactoryMapper.java b/src/main/java/org/jeecg/modules/base/mapper/UserFactoryMapper.java
new file mode 100644
index 0000000..f1253a4
--- /dev/null
+++ b/src/main/java/org/jeecg/modules/base/mapper/UserFactoryMapper.java
@@ -0,0 +1,17 @@
+package org.jeecg.modules.base.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.base.entity.UserFactory;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 鐢ㄦ埛宸ュ巶/杞﹂棿/浜х嚎鍏崇郴
+ * @Author: jeecg-boot
+ * @Date: 2025-06-24
+ * @Version: V1.0
+ */
+public interface UserFactoryMapper extends BaseMapper<UserFactory> {
+
+}
diff --git a/src/main/java/org/jeecg/modules/base/mapper/UserGroupMapper.java b/src/main/java/org/jeecg/modules/base/mapper/UserGroupMapper.java
new file mode 100644
index 0000000..0229817
--- /dev/null
+++ b/src/main/java/org/jeecg/modules/base/mapper/UserGroupMapper.java
@@ -0,0 +1,17 @@
+package org.jeecg.modules.base.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.base.entity.UserGroup;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 鐝粍
+ * @Author: jeecg-boot
+ * @Date: 2025-06-24
+ * @Version: V1.0
+ */
+public interface UserGroupMapper extends BaseMapper<UserGroup> {
+
+}
diff --git a/src/main/java/org/jeecg/modules/base/mapper/WarehouseAreaMapper.java b/src/main/java/org/jeecg/modules/base/mapper/WarehouseAreaMapper.java
deleted file mode 100644
index 44012ec..0000000
--- a/src/main/java/org/jeecg/modules/base/mapper/WarehouseAreaMapper.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.jeecg.modules.base.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-import org.jeecg.modules.base.entity.WarehouseArea;
-
-/**
- * @Description: mom_base_warehouse_area
- * @Author: jeecg-boot
- * @Date: 2023-07-06
- * @Version: V1.0
- */
-public interface WarehouseAreaMapper extends BaseMapper<WarehouseArea> {
-
-
- /**
- * 閫氳繃搴撳尯鍚嶇О鏌ヨ搴撳尯淇℃伅
- *
- * @param name
- * @return
- */
- public WarehouseArea getByName(@Param("name") String name);
-}
diff --git a/src/main/java/org/jeecg/modules/base/mapper/WarehouseClientMapper.java b/src/main/java/org/jeecg/modules/base/mapper/WarehouseClientMapper.java
deleted file mode 100644
index f4f8167..0000000
--- a/src/main/java/org/jeecg/modules/base/mapper/WarehouseClientMapper.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.jeecg.modules.base.mapper;
-
-import java.util.List;
-import org.jeecg.modules.base.entity.WarehouseClient;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-import org.springframework.stereotype.Repository;
-
-/**
- * @Description: 浠撳簱鏈嶅姟瀵硅薄
- * @Author: jeecg-boot
- * @Date: 2022-11-07
- * @Version: V1.0
- */
-@Repository
-public interface WarehouseClientMapper extends BaseMapper<WarehouseClient> {
-
- /**
- * 閫氳繃涓昏〃id鍒犻櫎瀛愯〃鏁版嵁
- *
- * @param mainId 涓昏〃id
- * @return boolean
- */
- public boolean deleteByMainId(@Param("mainId") String mainId);
-
- /**
- * 閫氳繃涓昏〃id鏌ヨ瀛愯〃鏁版嵁
- *
- * @param mainId 涓昏〃id
- * @return List<WarehouseClient>
- */
- public List<WarehouseClient> selectByMainId(@Param("mainId") String mainId);
-
-}
diff --git a/src/main/java/org/jeecg/modules/base/mapper/WarehouseLocationMapper.java b/src/main/java/org/jeecg/modules/base/mapper/WarehouseLocationMapper.java
deleted file mode 100644
index 3eecfef..0000000
--- a/src/main/java/org/jeecg/modules/base/mapper/WarehouseLocationMapper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package org.jeecg.modules.base.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-import org.jeecg.modules.base.entity.WarehouseLocation;
-
-/**
- * @Description: mom_base_warehouse_location
- * @Author: jeecg-boot
- * @Date: 2023-07-06
- * @Version: V1.0
- */
-public interface WarehouseLocationMapper extends BaseMapper<WarehouseLocation> {
- /**
- * 閫氳繃搴撲綅鍚嶇О鏌ヨ搴撲綅淇℃伅
- * @param name
- * @return
- */
- public WarehouseLocation getByName(@Param("name") String name);
-}
diff --git a/src/main/java/org/jeecg/modules/base/mapper/WarehouseMapper.java b/src/main/java/org/jeecg/modules/base/mapper/WarehouseMapper.java
deleted file mode 100644
index e7e0109..0000000
--- a/src/main/java/org/jeecg/modules/base/mapper/WarehouseMapper.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package org.jeecg.modules.base.mapper;//package org.jeecg.modules.base.mapper;
-//
-//import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-//import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-//import org.apache.ibatis.annotations.Param;
-//import org.jeecg.modules.base.entity.Warehouse;
-//import org.springframework.stereotype.Repository;
-//
-//import java.util.List;
-//import java.util.Map;
-//
-///**
-// * @Description: 浠撳簱
-// * @Author: jeecg-boot
-// * @Date: 2022-11-07
-// * @Version: V1.0
-// */
-//@Repository
-//public interface WarehouseMapper extends BaseMapper<Warehouse> {
-// /**
-// * 鑾峰彇鐗堟湰浠撳簱鍒楄〃
-// * @param page
-// * @param enterpriseId
-// * @param version
-// * @return
-// */
-// List<Map<String,Object>> getWarehouseList(Page<Map<String,Object>> page,
-// @Param("version") Integer version,
-// @Param("enterpriseId") String enterpriseId);
-// /**
-// * 鑾峰彇鎵�鏈夌増鏈彿
-// * @param
-// *
-// * @return
-// */
-// List<Integer> getAllVersion();
-// /**
-// * 鑾峰彇鏈�鍚庝竴娆＄敓鏁堝垪琛�
-// * @return
-// */
-// List<Warehouse> getLastUsableList();
-// /**
-// * 鑾峰彇褰撳墠鐢熸晥鍒楄〃
-// * @return
-// */
-// List<Warehouse> getUsableList();
-// /**
-// * 鑾峰彇鐗堟湰鐘舵�佹牴鎹増鏈彿
-// * @return
-// */
-// List<String> getVersionStatusByVersion(Integer veison);
-//
-// /**
-// * 閫氳繃浠撳簱鍚嶇О鏌ヨ浠撳簱淇℃伅
-// * @param name
-// * @return
-// */
-// public Warehouse getByName(@Param("name") String name);
-//}
diff --git a/src/main/java/org/jeecg/modules/base/mapper/WorkCenterEquipmentMapper.java b/src/main/java/org/jeecg/modules/base/mapper/WorkCenterEquipmentMapper.java
deleted file mode 100644
index bea74c2..0000000
--- a/src/main/java/org/jeecg/modules/base/mapper/WorkCenterEquipmentMapper.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package org.jeecg.modules.base.mapper;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.apache.ibatis.annotations.Param;
-import org.jeecg.modules.base.entity.WorkCenterEquipment;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * @Description: mom_base_work_center_equipment
- * @Author: jeecg-boot
- * @Date: 2022-12-06
- * @Version: V1.0
- */
-@Repository
-public interface WorkCenterEquipmentMapper extends BaseMapper<WorkCenterEquipment> {
- /**
- * 鏍规嵁宸ヤ綔涓績Id鏌ュ垪琛�
- *
- * @param page
- * @param workCenterId
- * @return
- */
- List<Map<String,Object>> listByWorkCenterId(Page<Map<String,Object>> page, @Param("workCenterId")String workCenterId);
- /**
- * 鏍规嵁璁惧缁処d鏌ユ坊鍔犺澶囧垪琛�
- *
- * @param page
- * @param equipmentCategoryId
- * @param equipmentIdList
- * @return
- */
- List<Map<String,Object>> getAddEquipmentListByEquipmentCategoryId(Page<Map<String,Object>> page,
- @Param("equipmentCategoryId")String equipmentCategoryId,
- @Param("equipmentIdList") List<String> equipmentIdList);
-}
diff --git a/src/main/java/org/jeecg/modules/base/mapper/WorkCenterMapper.java b/src/main/java/org/jeecg/modules/base/mapper/WorkCenterMapper.java
deleted file mode 100644
index 5eab6a4..0000000
--- a/src/main/java/org/jeecg/modules/base/mapper/WorkCenterMapper.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package org.jeecg.modules.base.mapper;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.apache.ibatis.annotations.Param;
-import org.jeecg.modules.base.entity.WorkCenter;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.jeecg.modules.base.entity.WorkCenterDetail;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * @Description: mom_base_work_center
- * @Author: jeecg-boot
- * @Date: 2022-11-17
- * @Version: V1.0
- */
-@Repository
-public interface WorkCenterMapper extends BaseMapper<WorkCenter> {
- /**
- * 鑾峰彇宸ヤ綔涓績鍒楄〃
- * @param page
- * @param parentFactoryModelIds
- * @param version
- * @return
- */
- List<WorkCenterDetail> selectWorkCenterByPMFIds(Page<WorkCenterDetail>page,
- @Param("parentFactoryModelIds") List<String> parentFactoryModelIds
- , @Param("version") Integer version);
- /**
- * 鑾峰彇鐗堟湰鍒楄〃
- *
- * @return
- */
- List<Integer> getVersionList();
- /**
- * 鑾峰彇姝ｅ湪鍗囩増宸ヤ綔涓績
- * @param version
- * @return
- */
- List<WorkCenter> getUpdateVersionlist (@Param("version")Integer version);
- /**
- * 鑾峰彇鐢熸晥鐗堟湰
- * @return
- */
- List<WorkCenter> getUsableList();
- /**
- * 鑾峰彇褰撳墠浼佷笟鐨勮澶囩粍
- * @param enterpriseId
- * @return
- */
- List<Map<String,Object>>getEquipmentCategoryListByEnterpriseId(@Param("enterpriseId") String enterpriseId);
- /**
- * 鑾峰彇涓婃鐢熺敓鏁堢増鏈�
- * @return
- */
- List<WorkCenter> getLastUsableList();
- /**
- * 鑾峰彇鐗堟湰鐘舵�佹牴鎹増鏈彿
- * @param version
- * @return
- */
- List<String> getVersionStatusByVersion(@Param("version") Integer version);
- /**
- * 鑾峰彇宸ュ巶寤烘ā鐢熸晥澶辨晥鍒楄〃
- * @return
- */
- List<Map<String,Object>> getFactoryVersionList();
-}
diff --git a/src/main/java/org/jeecg/modules/base/mapper/WorkCenterUserMapper.java b/src/main/java/org/jeecg/modules/base/mapper/WorkCenterUserMapper.java
deleted file mode 100644
index 8d3499b..0000000
--- a/src/main/java/org/jeecg/modules/base/mapper/WorkCenterUserMapper.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package org.jeecg.modules.base.mapper;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.apache.ibatis.annotations.Param;
-import org.jeecg.common.system.vo.SelectTreeModel;
-import org.jeecg.modules.base.entity.WorkCenterDetail;
-import org.jeecg.modules.base.entity.WorkCenterUser;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * @Description: mom_base_work_center_user
- * @Author: jeecg-boot
- * @Date: 2022-12-06
- * @Version: V1.0
- */
-@Repository
-public interface WorkCenterUserMapper extends BaseMapper<WorkCenterUser> {
- /**
- * 鏍规嵁宸ヤ綔涓績Id鏌ュ垪琛�
- *
- * @param page
- * @param workCenterId
- * @return
- */
- List<Map<String,Object>> listByWorkCenterId(Page<Map<String,Object>> page, @Param("workCenterId")String workCenterId);
- /**
- * 鏌ュ皻鏈垎閰嶇殑閮ㄩ棬浜哄憳
- *
- * @param page
- * @param departId
- * @param userIdList
- * @return
- */
- List<Map<String,Object>> getAddUserList(Page<Map<String,Object>> page,
- @Param("departId")String departId,
- @Param("userIdList")List<String> userIdList
- );
- /**
- * 閮ㄩ棬鏍�
- *
- * @param parentId
- * @param departId
- * @param version
- * @return
- */
- List<SelectTreeModel> getAddDepartTree( @Param("parentId")String parentId,
- @Param("departId")String departId,
- @Param("version")Integer version
- );
- /**
- * 鏌ュ叕鍙稿叾浠栭儴闂ㄤ汉鍛�
- *
- * @param page
- * @param enterpriseId
- * @param userIdList
- * @param departIds
- * @return
- */
- List<Map<String,Object>> listByEnterpriseId(Page<Map<String,Object>> page,
- @Param("enterpriseId")String enterpriseId,
- @Param("userIdList")List<String> userIdList,
- @Param("departIds") List<String> departIds
- );
- /**
- * 鏌ュ皻鏈垎閰嶇殑鏈儴闂ㄤ汉鍛�
- *
- * @param page
- * @param parentId
- * @param userIdList
- * @return
- */
- List<Map<String,Object>> getUserList (Page<Map<String,Object>> page,
- @Param("userIdList")List<String> userIdList,
- @Param("parentId") String parentId
- );
-
-}
diff --git a/src/main/java/org/jeecg/modules/base/mapper/xml/ClientContactMapper.xml b/src/main/java/org/jeecg/modules/base/mapper/xml/ClientContactMapper.xml
deleted file mode 100644
index 2a441d8..0000000
--- a/src/main/java/org/jeecg/modules/base/mapper/xml/ClientContactMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.base.mapper.ClientContactMapper">
-
-</mapper>
\ No newline at end of file
diff --git a/src/main/java/org/jeecg/modules/base/mapper/xml/ConstructorMapper.xml b/src/main/java/org/jeecg/modules/base/mapper/xml/ConstructorMapper.xml
deleted file mode 100644
index 4f6b679..0000000
--- a/src/main/java/org/jeecg/modules/base/mapper/xml/ConstructorMapper.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.base.mapper.ConstructorMapper">
-
-
- <select id="getByName" resultType="org.jeecg.modules.base.entity.Constructor">
- select * from mom_base_constructor where name = #{name} and del_flag = 0
- </select>
-</mapper>
\ No newline at end of file
diff --git a/src/main/java/org/jeecg/modules/base/mapper/xml/EnterpriseAdministratorMapper.xml b/src/main/java/org/jeecg/modules/base/mapper/xml/EnterpriseAdministratorMapper.xml
deleted file mode 100644
index 580d89e..0000000
--- a/src/main/java/org/jeecg/modules/base/mapper/xml/EnterpriseAdministratorMapper.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.base.mapper.EnterpriseAdministratorMapper">
-
- <delete id="deleteByMainId" parameterType="java.lang.String">
- DELETE
- FROM mom_base_enterprise_administrator
- WHERE
- administrator_id = #{mainId}
- </delete>
-
- <select id="selectByMainId" parameterType="java.lang.String" resultType="org.jeecg.modules.base.entity.EnterpriseAdministrator">
- SELECT *
- FROM mom_base_enterprise_administrator
- WHERE
- administrator_id = #{mainId}
- </select>
- <select id="mapList" resultType="Map">
- select
- t3.id id,
- t3.administrator_id administratorId,
- t3.auth_name authName,
- t3.create_time createTime,
- t4.id enterpriseId,
- t4.code enterpriseCode,
- t4.name enterpriseName,
- t5.account account,
- t5.name name
- from mom_base_enterprise_administrator t3
- left join
- (
- select
- t1.id id,
- t1.code code,
- t1.name name,
- t1.parent_id parentId,
- t1.version version
- from mom_base_enterprise t1
- where t1.del_flag=0
- ) t4
- on t4.id=t3.enterprise_id
- left join (select * from mom_sys_administrator where del_flag=0) t5
- on t3.administrator_id=t5.id
- where
- t3.del_flag = 0
- <if test="mainId != null and mainId != ''">
- and t3.administrator_id = #{mainId}
- </if>
- <if test="enterpriseId != null and enterpriseId != ''">
- and t4.id = #{enterpriseId}
- </if>
- </select>
-</mapper>
diff --git a/src/main/java/org/jeecg/modules/base/mapper/xml/EnterpriseMapper.xml b/src/main/java/org/jeecg/modules/base/mapper/xml/EnterpriseMapper.xml
deleted file mode 100644
index 6b5ca09..0000000
--- a/src/main/java/org/jeecg/modules/base/mapper/xml/EnterpriseMapper.xml
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.base.mapper.EnterpriseMapper">
- <select id="getEnterpriseVersionTree" resultType="org.jeecg.common.system.vo.SelectTreeModel">
- select
- id as "key",
- name as "title",
- parent_id as parentId,
- code as value
- from mom_base_enterprise
- where parent_id = #{pid} and version=#{version}
- and del_flag=0
- </select>
- <select id="getAllVersion" resultType="Integer">
- select
- version
- from mom_base_enterprise
- where del_flag = 0;
- </select>
- <select id="getEnterpriseListByIds" resultType="Map">
- select
- t1.id id,
- t1.code code,
- t1.name name,
- t1.version version,
- t1.create_by createBy,
- t1.create_time createTime,
- t1.update_by updateBy,
- t1.update_time updateTime,
- t1.remark remark,
- t1.status status,
- t2.name parentName,
- t3.version_status versionStatus
- from mom_base_enterprise t1
- left join (select * from mom_sys_data_version where del_flag=0) t3 on t1.data_version_id = t3.id
- left join (select * from mom_base_enterprise where del_flag=0) t2 on t1.parent_id = t2.id
- where t1.id in
- (
- select id from (
- select t4.id,
- if(find_in_set(parent_id, @pids) > 0, @pids := concat(@pids, ',', id), -1) as ischild
- from (
- select id,parent_id from mom_base_enterprise where del_flag = 0
- ) t4,
- (select @pids := #{parentId}) t5
- ) t6 where ischild != -1)
- and t1.version = #{version}
- and t1.del_flag = 0
- </select>
- <select id="getAllChildrenIdByParentId" resultType="String">
- select
- id
- from mom_base_enterprise
- where parent_id = #{parentId}
- and del_flag = 0
- </select>
- <select id="getEnterpriseList" resultType="Map">
- select
- t1.id id,
- t1.code code,
- t1.name name,
- t1.version version,
- t2.version_status versionStatus
- from mom_base_enterprise t1
- left join (select * from mom_sys_data_version where business_type='闆嗗洟鏋舵瀯' and del_flag=0) t2
- on t1.data_version_id = t2.id
- where t1.del_flag=0
- and t2.version_status in('2','3')
- order by t1.version asc
- </select>
- <select id="getUsableVersion" resultType="Integer">
- select
- t1.version usableVersion
- from mom_base_enterprise t1
- left join (select * from mom_sys_data_version where business_type='闆嗗洟鏋舵瀯' and del_flag=0) t2
- on t1.data_version_id = t2.id
- where t2.version_status='2'
- and t1.del_flag=0
- </select>
- <select id="getLastUsableList" resultType="org.jeecg.modules.base.entity.Enterprise">
- select
- t1.id id,
- t1.code code,
- t1.name name,
- t1.parent_id parentId,
- t1.remark remark,
- t1.version version,
- t1.data_version_id dataVersionId,
- t1.status status,
- t1.create_by createBy,
- t1.create_time createTime,
- t1.update_by updateBy,
- t1.update_time updateTime
- from
- mom_base_enterprise t1
- left join
- (select * from mom_sys_data_version where business_type='闆嗗洟鏋舵瀯' and del_flag=0) t2
- on t1.data_version_id = t2.id
- where t1.del_flag = 0
- and
- t2.is_last_usable='1'
- </select>
- <select id="getUsableList" resultType="org.jeecg.modules.base.entity.Enterprise">
- select
- t1.id id,
- t1.code code,
- t1.name name,
- t1.parent_id parentId,
- t1.remark remark,
- t1.version version,
- t1.data_version_id dataVersionId,
- t1.status status,
- t1.create_by createBy,
- t1.create_time createTime,
- t1.update_by updateBy,
- t1.update_time updateTime
- from mom_base_enterprise t1
- left join (select * from mom_sys_data_version where business_type='闆嗗洟鏋舵瀯' and del_flag=0) t2
- on t1.data_version_id = t2.id
- where t2.version_status='2'
- and t1.del_flag=0
- </select>
- <select id="getUsableIdList" resultType="String">
- select business_id as id from mom_sys_data_version where business_type='闆嗗洟鏋舵瀯' and version_status='2' and del_flag=0
- </select>
-</mapper>
diff --git a/src/main/java/org/jeecg/modules/base/mapper/xml/FactoryElementCategoryMapper.xml b/src/main/java/org/jeecg/modules/base/mapper/xml/FactoryElementCategoryMapper.xml
deleted file mode 100644
index 892708d..0000000
--- a/src/main/java/org/jeecg/modules/base/mapper/xml/FactoryElementCategoryMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.base.mapper.FactoryElementCategoryMapper">
-
-</mapper>
diff --git a/src/main/java/org/jeecg/modules/base/mapper/xml/MaterialMapper.xml b/src/main/java/org/jeecg/modules/base/mapper/xml/FactoryMapper.xml
similarity index 70%
rename from src/main/java/org/jeecg/modules/base/mapper/xml/MaterialMapper.xml
rename to src/main/java/org/jeecg/modules/base/mapper/xml/FactoryMapper.xml
index 20e24d5..0832f10 100644
--- a/src/main/java/org/jeecg/modules/base/mapper/xml/MaterialMapper.xml
+++ b/src/main/java/org/jeecg/modules/base/mapper/xml/FactoryMapper.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.base.mapper.MaterialMapper">
+<mapper namespace="org.jeecg.modules.base.mapper.FactoryMapper">
-</mapper>
+</mapper>
\ No newline at end of file
diff --git a/src/main/java/org/jeecg/modules/base/mapper/xml/FactoryModelMapper.xml b/src/main/java/org/jeecg/modules/base/mapper/xml/FactoryModelMapper.xml
deleted file mode 100644
index e4665c3..0000000
--- a/src/main/java/org/jeecg/modules/base/mapper/xml/FactoryModelMapper.xml
+++ /dev/null
@@ -1,240 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.base.mapper.FactoryModelMapper">
- <select id="getAllVersion" resultType="Integer">
- select
- version
- from mom_base_factory_model
- where del_flag = 0
- </select>
- <select id="getUsableVersion" resultType="Integer">
- select
- t1.version version
- from mom_base_factory_model t1
- left join
- (select * from mom_sys_data_version where business_type='宸ュ巶寤烘ā' and del_flag=0) t2
- on t1.data_version_id = t2.id
- where t2.version_status='2'
- and t1.del_flag=0
- </select>
- <select id="getLastUsableVersion" resultType="String">
- select
- t1.version version
- from
- mom_base_factory_model t1
- left join
- (select * from mom_sys_data_version where business_type='宸ュ巶寤烘ā' and del_flag=0) t2
- on t1.data_version_id = t2.id
- where t1.del_flag = 0
- and
- t2.is_last_usable='1'
- </select>
- <select id="loadTreeByEnterpriseIdAndVersion" resultType="org.jeecg.common.system.vo.SelectTreeModel">
- select
- id as "key",
- name as "title",
- parent_id as parentId,
- code as value
- from mom_base_factory_model
- where parent_id = #{parentId}
- and version = #{version}
- and del_flag='0'
- </select>
- <select id="selectEnterpriseIdByUid" resultType="java.lang.String">
- select enterprise_id from mom_sys_administrator where id = #{uid} and del_flag=0
- </select>
- <select id="getFactoryList" resultType="Map">
- select
- t1.id id,
- t1.code code,
- t1.name name,
- t1.version version,
- t1.virtual_flag virtualFlag,t1.create_by createBy,
- t1.create_time createTime,
- t1.update_by updateBy,
- t1.update_time updateTime,
- t1.remark remark,
- t2.id factoryElementCategoryId,
- t2.name factoryElementCategoryName,
- t3.id departId,
- t3.depart_name departName,
- t4.version_status versionStatus,
- t5.name parentName
- from mom_base_factory_model t1
- left join(select * from mom_base_factory_element_category where del_flag = 0) t2
- on t1.factory_element_category_id= t2.id
- left join (select * from sys_depart where del_flag = 0) t3
- on t1.depart_id = t3.id
- left join (select * from mom_sys_data_version where business_type='宸ュ巶寤烘ā' and del_flag=0) t4
- on t1.data_version_id = t4.id
- left join (select * from mom_base_factory_model where del_flag = 0) t5
- on t1.parent_id = t5.id
- where t1.id in
- (
- select id from (
- select t4.id,
- if(find_in_set(parent_id, @pids) > 0, @pids := concat(@pids, ',', id), -1) as ischild
- from (
- select id,parent_id from mom_base_factory_model where del_flag = 0
- ) t4,
- (select @pids := #{parentId}) t5
- ) t6 where ischild != -1
- )
- and t1.version = #{version}
- and t1.del_flag = 0
- <if test="ids != null and ids.size > 0">
- and t1.id not in
- <foreach collection="ids" open="(" separator="," close=")" item="id">
- #{id}
- </foreach>
- </if>
- </select>
- <select id="getDepartList" resultType="org.jeecg.modules.system.entity.SysDepart">
- select
- id id,
- depart_name departName
- from sys_depart
- where
- del_flag = 0
- </select>
- <select id="getFatherIdById" resultType="org.jeecg.modules.base.entity.FactoryModelDetail">
- select
- id,
- code,
- name,
- parent_id parentId
- from mom_base_factory_model where id = #{id} and del_flag=0
- </select>
- <select id="getListByEid" resultType="org.jeecg.modules.base.entity.FactoryModelDetail" parameterType="String">
- select
- t1.id id,
- t1.code code,
- t1.name name,
- t2.id depart_id,
- t2.depart_name departName,
- t3.name factoryElementCategoryName,
- t3.id factoryElementCategoryId,
- t1.id parentId,
- t1.enterprise_id enterpriseId,
- t4.name parentName,
- t1.status status,
- t1.create_by createBy,
- t1.create_time createTime,
- t1.update_by updateBy,
- t1.update_time updateTime,
- t1.remark remark
- from
- mom_base_factory_model t1 left join
- (select * from sys_depart where del_flag = 0) t2 on t1.depart_id=t2.id
- left join
- (select * from mom_base_factory_element_category where del_flag = 0) t3 on t1.factory_element_category_id = t3.id
- left join
- (select * from mom_base_factory_model where del_flag = 0) t4 on t4.id = t1.parent_id
- where t1.del_flag = 0 and t1.enterprise_id=#{eid}
- </select>
- <select id="getAllChildrenIdByParentId" resultType="String">
- select
- id
- from mom_base_factory_model
- where del_flag=0
- and parent_id = #{parentId}
- </select>
- <select id="getLastUsableList" resultType="org.jeecg.modules.base.entity.FactoryModel">
- select
- t1.id id,
- t1.code code,
- t1.name name,
- t1.version version,
- t1.virtual_flag virtualFlag,
- t1.factory_element_category_id factoryElementCategoryId,
- t1.enterprise_id enterpriseId,
- t1.depart_id departId,
- t1.parent_id parentId,
- t1.create_by createBy,
- t1.create_time createTime,
- t1.update_by updateBy,
- t1.update_time updateTime,
- t1.remark remark,
- t1.del_flag delFlag
- from
- mom_base_factory_model t1
- left join
- (select * from mom_sys_data_version where business_type='宸ュ巶寤烘ā' and del_flag=0) t2
- on t1.data_version_id = t2.id
- where t1.del_flag = 0
- <if test="enterpriseIds != null and enterpriseIds.size > 0">
- and t1.enterprise_id in
- <foreach collection="enterpriseIds" open="(" separator="," close=")" item="enterpriseId">
- #{enterpriseId}
- </foreach>
- </if>
- and
- t2.is_last_usable='1'
- </select>
- <select id="getUsableList" resultType="org.jeecg.modules.base.entity.FactoryModel">
- select
- t1.id id,
- t1.code code,
- t1.name name,
- t1.version version,
- t1.virtual_flag virtualFlag,
- t1.factory_element_category_id factoryElementCategoryId,
- t1.enterprise_id enterpriseId,
- t1.depart_id departId,
- t1.parent_id parentId,
- t1.create_by createBy,
- t1.create_time createTime,
- t1.update_by updateBy,
- t1.update_time updateTime,
- t1.remark remark,
- t1.del_flag delFlag
- from mom_base_factory_model t1
- left join (select * from mom_sys_data_version where business_type='宸ュ巶寤烘ā' and del_flag=0) t2
- on t1.data_version_id = t2.id
- where t2.version_status='2'
- <if test="enterpriseIds != null and enterpriseIds.size > 0">
- and t1.enterprise_id in
- <foreach collection="enterpriseIds" open="(" separator="," close=")" item="enterpriseId">
- #{enterpriseId}
- </foreach>
- </if>
- and t1.del_flag=0
- </select>
- <select id="getVersionStatusByVersion" resultType="String">
- select
- t2.version_status versionStatus
- from mom_base_factory_model t1
- left join (select * from mom_sys_data_version where business_type='宸ュ巶寤烘ā' and del_flag=0) t2
- on t1.data_version_id = t2.id
- where t1.version = #{version}
- and t1.del_flag=0
- </select>
- <select id="getUsableWorkShopList" resultType="Map">
- select
- t1.id id,
- t1.code code,
- t1.name name,
- t1.version version,
- t1.virtual_flag virtualFlag,
- t1.factory_element_category_id factoryElementCategoryId,
- t1.enterprise_id enterpriseId,
- t1.depart_id departId,
- t1.parent_id parentId,
- t1.create_by createBy,
- t1.create_time createTime,
- t1.update_by updateBy,
- t1.update_time updateTime,
- t1.remark remark,
- t1.del_flag delFlag,
- t2.version_status versionStatus
- from mom_base_factory_model t1
- left join (select * from mom_sys_data_version where business_type='宸ュ巶寤烘ā' and del_flag=0) t2
- on t1.data_version_id = t2.id
- left join (select * from mom_base_factory_element_category where del_flag = 0) t3
- on t1.factory_element_category_id = t3.id
- where t2.version_status in ('2','3')
- and t3.name = '杞﹂棿'
- and t1.del_flag=0
- order by t1.version asc
- </select>
-</mapper>
diff --git a/src/main/java/org/jeecg/modules/base/mapper/xml/ClientCategoryMapper.xml b/src/main/java/org/jeecg/modules/base/mapper/xml/LineSideWarehouseMapper.xml
similarity index 67%
rename from src/main/java/org/jeecg/modules/base/mapper/xml/ClientCategoryMapper.xml
rename to src/main/java/org/jeecg/modules/base/mapper/xml/LineSideWarehouseMapper.xml
index 35d7699..87ff328 100644
--- a/src/main/java/org/jeecg/modules/base/mapper/xml/ClientCategoryMapper.xml
+++ b/src/main/java/org/jeecg/modules/base/mapper/xml/LineSideWarehouseMapper.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.base.mapper.ClientCategoryMapper">
+<mapper namespace="org.jeecg.modules.base.mapper.LineSideWarehouseMapper">
</mapper>
\ No newline at end of file
diff --git a/src/main/java/org/jeecg/modules/base/mapper/xml/MaterialCategoryMapper.xml b/src/main/java/org/jeecg/modules/base/mapper/xml/MaterialCategoryMapper.xml
deleted file mode 100644
index 3bd8123..0000000
--- a/src/main/java/org/jeecg/modules/base/mapper/xml/MaterialCategoryMapper.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.base.mapper.MaterialCategoryMapper">
-
- <select id="getMaterialCategoryListByIds" resultType="java.util.Map">
- select t1.id id,
- t1.code code,
- t1.name name,
- t1.version version,
- t1.create_by createBy,
- t1.create_time createTime,
- t1.update_by updateBy,
- t1.update_time updateTime,
- t1.remark remark,
- t2.name parentName,
- t3.version_status versionStatus
- from mom_base_material_category t1
- left join (select * from mom_sys_data_version where del_flag = 0) t3 on t1.data_version_id = t3.id
- left join (select * from mom_base_material_category where del_flag = 0) t2 on t1.parent_id = t2.id
- where t1.id in
- (
- select id
- from (
- select t4.id,
- if(find_in_set(parent_id, @pids) > 0, @pids := concat(@pids, ',', id), -1) as ischild
- from (
- select id, parent_id
- from mom_base_material_category
- where del_flag = 0
- ) t4,
- (select @pids := #{parentId}) t5
- ) t6
- where ischild
- != -1)
- and t1.version = #{version}
- and t1.del_flag = 0
- </select>
-
- <select id="getAllVersion" resultType="Integer">
- select version
- from mom_base_material_category
- where del_flag = 0;
- </select>
- <select id="getMaterialCategoryVersionTree" resultType="org.jeecg.common.system.vo.SelectTreeModel">
- select id as "key",
- name as "title",
- parent_id as parentId,
- code as value
- from mom_base_material_category
- where parent_id = #{pid}
- and version=#{version}
- and del_flag=0
- </select>
- <select id="getUsableVersion" resultType="java.lang.Integer">
- SELECT t1.version usableVersion
- FROM mom_base_material_category t1
- LEFT JOIN (SELECT * FROM mom_sys_data_version WHERE business_type = '鐗╂枡鍒嗙被' AND del_flag = 0) t2
- ON t1.data_version_id = t2.id
- WHERE t2.version_status = '2'
- AND t1.del_flag = 0
- </select>
-
- <select id="getUsableIdList" resultType="java.lang.String">
- select business_id as id
- from mom_sys_data_version
- where business_type = '鐗╂枡鍒嗙被'
- and version_status = '2'
- and del_flag = 0
- </select>
-
- <select id="getUsableList" resultType="org.jeecg.modules.base.entity.MaterialCategory">
- select t1.id id,
- t1.code code,
- t1.name name,
- t1.parent_id parentId,
- t1.remark remark,
- t1.version version,
- t1.data_version_id dataVersionId,
- t1.create_by createBy,
- t1.create_time createTime,
- t1.update_by updateBy,
- t1.update_time updateTime
- from mom_base_material_category t1
- left join (select * from mom_sys_data_version where business_type = '鐗╂枡鍒嗙被' and del_flag = 0) t2
- on t1.data_version_id = t2.id
- where t2.version_status = '2'
- and t1.del_flag = 0
- </select>
- <select id="getLastUsableList" resultType="org.jeecg.modules.base.entity.MaterialCategory">
- select t1.id id,
- t1.code code,
- t1.name name,
- t1.parent_id parentId,
- t1.remark remark,
- t1.version version,
- t1.data_version_id dataVersionId,
- #t1.status status,
- t1.create_by createBy,
- t1.create_time createTime,
- t1.update_by updateBy,
- t1.update_time updateTime
- from mom_base_material_category t1
- left join
- (select * from mom_sys_data_version where business_type = '鐗╂枡鍒嗙被' and del_flag = 0) t2
- on t1.data_version_id = t2.id
- where t1.del_flag = 0
- and t2.is_last_usable = '1'
- </select>
-</mapper>
\ No newline at end of file
diff --git a/src/main/java/org/jeecg/modules/base/mapper/xml/ProductionLineWarehouseClientMapper.xml b/src/main/java/org/jeecg/modules/base/mapper/xml/ProductionLineWarehouseClientMapper.xml
deleted file mode 100644
index 5de5b2d..0000000
--- a/src/main/java/org/jeecg/modules/base/mapper/xml/ProductionLineWarehouseClientMapper.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.base.mapper.ProductionLineWarehouseClientMapper">
-
- <delete id="deleteByMainId" parameterType="java.lang.String">
- DELETE
- FROM mom_base_production_line_warehouse_client
- WHERE
- warehouse_id = #{mainId}
- </delete>
-
- <select id="selectByMainId" parameterType="java.lang.String" resultType="org.jeecg.modules.base.entity.ProductionLineWarehouseClient">
- SELECT *
- FROM mom_base_production_line_warehouse_client
- WHERE
- warehouse_id = #{mainId}
- </select>
- <select id="getFactoryList" resultType="Map">
- select
- t1.id id,
- t1.code code,
- t1.name name
- from mom_base_factory_model t1
- left join(select * from mom_base_factory_element_category where del_flag = 0) t2
- on t1.factory_element_category_id= t2.id
- left join (select * from sys_depart where del_flag = 0) t3
- on t1.depart_id = t3.id
- left join (select * from mom_sys_data_version where business_type='宸ュ巶寤烘ā' and del_flag=0) t4
- on t1.data_version_id = t4.id
- left join (select * from mom_base_factory_model where del_flag = 0) t5
- on t1.parent_id = t5.id
- where t1.del_flag = 0
- and t1.version = #{version}
- <if test="parentIds != null and parentIds.size > 0">
- and t1.parent_id in
- <foreach collection="parentIds" open="(" separator="," close=")" item="parentId">
- #{parentId}
- </foreach>
- </if>
- <if test="ids != null and ids.size > 0">
- and t1.id not in
- <foreach collection="ids" open="(" separator="," close=")" item="id">
- #{id}
- </foreach>
- </if>
- and t2.name != '宸ュ巶'
- and t2.name != '杞﹂棿'
- </select>
-</mapper>
diff --git a/src/main/java/org/jeecg/modules/base/mapper/xml/ProductionLineWarehouseMapper.xml b/src/main/java/org/jeecg/modules/base/mapper/xml/ProductionLineWarehouseMapper.xml
deleted file mode 100644
index 8d0246f..0000000
--- a/src/main/java/org/jeecg/modules/base/mapper/xml/ProductionLineWarehouseMapper.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.base.mapper.ProductionLineWarehouseMapper">
- <select id="getWarehouseList" resultType="Map">
- select
- t1.id id,
- t1.code code,
- t1.name name,
- t1.status status,
- t1.version version,
- t2.version_status versionStatus,
- t1.data_version_id dataVersionId,
- t1.create_by createBy,
- t1.create_time createTime,
- t1.update_by updateBy,
- t1.update_time updateTime,
- t1.del_flag delFlag,
- t1.remark remark,
- t1.workshop_id workshopId
- from mom_base_production_line_warehouse t1
- left join (select * from mom_sys_data_version where business_type='绾胯竟搴撶鐞�' and del_flag=0) t2
- on t1.data_version_id = t2.id
- where t1.version=#{version}
- <if test="workshopId != null and workshopId != ''">
- and t1.workshop_id=#{workshopId}
- </if>
- and t1.del_flag = 0
- </select>
- <select id="getAllVersion" resultType="Integer">
- select
- version
- from mom_base_production_line_warehouse
- where del_flag = 0
- </select>
- <select id="getUsableList" resultType="org.jeecg.modules.base.entity.ProductionLineWarehouse">
- select
- t1.id id,
- t1.code code,
- t1.name name,
- t1.status status,
- t1.version version,
- t1.data_version_id dataVersionId,
- t1.create_by createBy,
- t1.create_time createTime,
- t1.update_by updateBy,
- t1.update_time updateTime,
- t1.del_flag delFlag,
- t1.remark remark,
- t1.workshop_id workshopId
- from mom_base_production_line_warehouse t1
- left join (select * from mom_sys_data_version where business_type='绾胯竟搴撶鐞�' and del_flag=0) t2
- on t1.data_version_id = t2.id
- where t2.version_status='2'
- and t1.del_flag=0
- </select>
- <select id="getLastUsableList" resultType="org.jeecg.modules.base.entity.ProductionLineWarehouse">
- select
- t1.id id,
- t1.code code,
- t1.name name,
- t1.status status,
- t1.version version,
- t1.data_version_id dataVersionId,
- t1.create_by createBy,
- t1.create_time createTime,
- t1.update_by updateBy,
- t1.update_time updateTime,
- t1.del_flag delFlag,
- t1.remark remark,
- t1.workshop_id workshopId
- from mom_base_production_line_warehouse t1
- left join
- (select * from mom_sys_data_version where business_type='绾胯竟搴撶鐞�' and del_flag=0) t2
- on t1.data_version_id = t2.id
- where t1.del_flag = 0
- and
- t2.is_last_usable='1'
- </select>
- <select id="getVersionStatusByVersion" resultType="String">
- select
- t2.version_status versionStatus
- from mom_base_production_line_warehouse t1
- left join (select * from mom_sys_data_version where business_type='绾胯竟搴撶鐞�' and del_flag=0) t2
- on t1.data_version_id = t2.id
- where t1.version = #{version}
- and t1.del_flag=0
- </select>
-</mapper>
diff --git a/src/main/java/org/jeecg/modules/base/mapper/xml/MaterialMapper.xml b/src/main/java/org/jeecg/modules/base/mapper/xml/ShiftGroupMapper.xml
similarity index 69%
copy from src/main/java/org/jeecg/modules/base/mapper/xml/MaterialMapper.xml
copy to src/main/java/org/jeecg/modules/base/mapper/xml/ShiftGroupMapper.xml
index 20e24d5..da31b43 100644
--- a/src/main/java/org/jeecg/modules/base/mapper/xml/MaterialMapper.xml
+++ b/src/main/java/org/jeecg/modules/base/mapper/xml/ShiftGroupMapper.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.base.mapper.MaterialMapper">
+<mapper namespace="org.jeecg.modules.base.mapper.ShiftGroupMapper">
-</mapper>
+</mapper>
\ No newline at end of file
diff --git a/src/main/java/org/jeecg/modules/base/mapper/xml/ClientMapper.xml b/src/main/java/org/jeecg/modules/base/mapper/xml/ShiftMapper.xml
similarity index 71%
rename from src/main/java/org/jeecg/modules/base/mapper/xml/ClientMapper.xml
rename to src/main/java/org/jeecg/modules/base/mapper/xml/ShiftMapper.xml
index c3844c6..cb85843 100644
--- a/src/main/java/org/jeecg/modules/base/mapper/xml/ClientMapper.xml
+++ b/src/main/java/org/jeecg/modules/base/mapper/xml/ShiftMapper.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.base.mapper.ClientMapper">
+<mapper namespace="org.jeecg.modules.base.mapper.ShiftMapper">
</mapper>
\ No newline at end of file
diff --git a/src/main/java/org/jeecg/modules/base/mapper/xml/SupplierContactMapper.xml b/src/main/java/org/jeecg/modules/base/mapper/xml/SupplierContactMapper.xml
deleted file mode 100644
index 95920e5..0000000
--- a/src/main/java/org/jeecg/modules/base/mapper/xml/SupplierContactMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.base.mapper.SupplierContactMapper">
-
-</mapper>
\ No newline at end of file
diff --git a/src/main/java/org/jeecg/modules/base/mapper/xml/SupplierMapper.xml b/src/main/java/org/jeecg/modules/base/mapper/xml/SupplierMapper.xml
index fefd408..600fb84 100644
--- a/src/main/java/org/jeecg/modules/base/mapper/xml/SupplierMapper.xml
+++ b/src/main/java/org/jeecg/modules/base/mapper/xml/SupplierMapper.xml
@@ -2,9 +2,4 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.base.mapper.SupplierMapper">
-
- <!-- 鏍规嵁渚涘簲鍟嗗悕绉版煡璇� -->
- <select id="getByName" resultType="org.jeecg.modules.base.entity.Supplier">
- select * from mom_base_supplier where name = #{name} and del_flag = 0
- </select>
</mapper>
\ No newline at end of file
diff --git a/src/main/java/org/jeecg/modules/base/mapper/xml/UnitCategoryMapper.xml b/src/main/java/org/jeecg/modules/base/mapper/xml/UnitCategoryMapper.xml
deleted file mode 100644
index 9adcfac..0000000
--- a/src/main/java/org/jeecg/modules/base/mapper/xml/UnitCategoryMapper.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.base.mapper.UnitCategoryMapper">
-
- <resultMap id="UnitCategory" type="org.jeecg.modules.base.entity.UnitCategory" >
- <result column="id" property="id" jdbcType="VARCHAR"/>
- <result column="code" property="code" jdbcType="VARCHAR"/>
- <result column="name" property="name" jdbcType="VARCHAR"/>
- <result column="pid" property="pid" jdbcType="VARCHAR"/>
- <result column="unit_category_uda1" property="unitCategoryUda1" jdbcType="VARCHAR"/>
- <result column="unit_category_uda2" property="unitCategoryUda2" jdbcType="VARCHAR"/>
- <result column="unit_category_uda3" property="unitCategoryUda3" jdbcType="VARCHAR"/>
- <result column="unit_category_uda4" property="unitCategoryUda4" jdbcType="VARCHAR"/>
- <result column="unit_category_uda5" property="unitCategoryUda5" jdbcType="VARCHAR"/>
- <result column="create_by" property="createBy" jdbcType="VARCHAR"/>
- <result column="create_time" property="createTime" jdbcType="TIMESTAMP"/>
- <result column="update_by" property="updateBy" jdbcType="VARCHAR"/>
- <result column="update_time" property="updateTime" jdbcType="TIMESTAMP"/>
- <result column="del_flag" property="delFlag" jdbcType="VARCHAR"/>
- <result column="remark" property="remark" jdbcType="VARCHAR"/>
- </resultMap>
-
- <select id="getList" resultMap="UnitCategory">
- select id,code,name,pid,create_by,create_time,update_by,update_time,del_flag,remark from mom_base_unit_category where pid = #{id}
- </select>
-</mapper>
\ No newline at end of file
diff --git a/src/main/java/org/jeecg/modules/base/mapper/xml/UnitConversionMapper.xml b/src/main/java/org/jeecg/modules/base/mapper/xml/UnitConversionMapper.xml
deleted file mode 100644
index 1292971..0000000
--- a/src/main/java/org/jeecg/modules/base/mapper/xml/UnitConversionMapper.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.base.mapper.UnitConversionMapper">
-
- <resultMap id="UnitConversion" type="org.jeecg.modules.base.entity.UnitConversion" >
- <result column="id" property="id" jdbcType="VARCHAR"/>
- <result column="unit_id" property="unitId" jdbcType="VARCHAR"/>
- <result column="target_unit_id" property="targetUnitId" jdbcType="VARCHAR"/>
- <result column="conversion_ratio" property="conversionRatio" jdbcType="VARCHAR"/>
- <result column="status" property="status" jdbcType="VARCHAR"/>
- <result column="tenant_id" property="tenantId" jdbcType="VARCHAR"/>
- <result column="create_by" property="createBy" jdbcType="VARCHAR"/>
- <result column="create_time" property="createTime" jdbcType="TIMESTAMP"/>
- <result column="update_by" property="updateBy" jdbcType="VARCHAR"/>
- <result column="update_time" property="updateTime" jdbcType="TIMESTAMP"/>
- <result column="del_flag" property="delFlag" jdbcType="VARCHAR"/>
- <result column="remark" property="remark" jdbcType="VARCHAR"/>
- </resultMap>
-
- <select id="getListByUnitId" resultMap="UnitConversion">
- select m.id,m.unit_id,m.target_unit_id,m.conversion_ratio,m.status,m.tenant_id,m.create_by,
- m.create_time,m.update_by,m.update_time,m.del_flag,m.remark,u.num targetUnitNum,u.name targetUnitName from mom_base_unit_conversion m
- left join mom_base_unit u on m.target_unit_id = u.id
- <if test="ids.length > 0">
- where m.unit_id in
- <foreach collection="ids" item="id" index="index" open="(" separator="," close=")">
- #{id}
- </foreach>
- </if>
- </select>
-</mapper>
\ No newline at end of file
diff --git a/src/main/java/org/jeecg/modules/base/mapper/xml/UnitMapper.xml b/src/main/java/org/jeecg/modules/base/mapper/xml/UnitMapper.xml
deleted file mode 100644
index 34fe8de..0000000
--- a/src/main/java/org/jeecg/modules/base/mapper/xml/UnitMapper.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.base.mapper.UnitMapper">
-
- <resultMap id="Unit" type="org.jeecg.modules.base.entity.Unit" >
- <result column="id" property="id" jdbcType="VARCHAR"/>
- <result column="num" property="num" jdbcType="VARCHAR"/>
- <result column="unit_category_id" property="unitCategoryId" jdbcType="VARCHAR"/>
- <result column="status" property="status" jdbcType="VARCHAR"/>
- <result column="tenant_id" property="tenantId" jdbcType="VARCHAR"/>
- <result column="create_by" property="createBy" jdbcType="VARCHAR"/>
- <result column="create_time" property="createTime" jdbcType="TIMESTAMP"/>
- <result column="update_by" property="updateBy" jdbcType="VARCHAR"/>
- <result column="update_time" property="updateTime" jdbcType="TIMESTAMP"/>
- <result column="del_flag" property="delFlag" jdbcType="VARCHAR"/>
- <result column="remark" property="remark" jdbcType="VARCHAR"/>
- </resultMap>
-
- <select id="getListByUnitCategoryId" resultMap="Unit">
- select m.id,m.num,m.name,m.unit_category_id,m.status,m.tenant_id,m.create_by,m.create_time,m.update_by,
- m.update_time,m.del_flag,m.remark,concat(u.code,u.name) categoryName from mom_base_unit m left join mom_base_unit_category u on m.unit_category_id=u.id
- <if test=" unitCategoryId !='' and unitCategoryId != null ">
- where m.unit_category_id = #{unitCategoryId}
- </if>
-
- </select>
-
- <select id="getTreeList" resultMap="Unit">
- select concat(m.code,m.name) categoryName,concat(u.num,u.name) unitName,m.id,m.pid,u.id,
- u.unit_category_id from mom_base_unit_category m LEFT join mom_base_unit u on m.id=u.unit_category_id
- </select>
-
- <!-- 鏍规嵁鍗曚綅鍚嶇О鏌ヨ -->
- <select id="getUnitByName" resultType="org.jeecg.modules.base.entity.Unit">
- select * from mom_base_unit where name = #{name} and del_flag = 0
- </select>
-</mapper>
\ No newline at end of file
diff --git a/src/main/java/org/jeecg/modules/base/mapper/xml/MaterialMapper.xml b/src/main/java/org/jeecg/modules/base/mapper/xml/UserFactoryMapper.xml
similarity index 69%
copy from src/main/java/org/jeecg/modules/base/mapper/xml/MaterialMapper.xml
copy to src/main/java/org/jeecg/modules/base/mapper/xml/UserFactoryMapper.xml
index 20e24d5..a1118b4 100644
--- a/src/main/java/org/jeecg/modules/base/mapper/xml/MaterialMapper.xml
+++ b/src/main/java/org/jeecg/modules/base/mapper/xml/UserFactoryMapper.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.base.mapper.MaterialMapper">
+<mapper namespace="org.jeecg.modules.base.mapper.UserFactoryMapper">
-</mapper>
+</mapper>
\ No newline at end of file
diff --git a/src/main/java/org/jeecg/modules/base/mapper/xml/MaterialMapper.xml b/src/main/java/org/jeecg/modules/base/mapper/xml/UserGroupMapper.xml
similarity index 70%
copy from src/main/java/org/jeecg/modules/base/mapper/xml/MaterialMapper.xml
copy to src/main/java/org/jeecg/modules/base/mapper/xml/UserGroupMapper.xml
index 20e24d5..0bf52ed 100644
--- a/src/main/java/org/jeecg/modules/base/mapper/xml/MaterialMapper.xml
+++ b/src/main/java/org/jeecg/modules/base/mapper/xml/UserGroupMapper.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.base.mapper.MaterialMapper">
+<mapper namespace="org.jeecg.modules.base.mapper.UserGroupMapper">
-</mapper>
+</mapper>
\ No newline at end of file
diff --git a/src/main/java/org/jeecg/modules/base/mapper/xml/WarehouseAreaMapper.xml b/src/main/java/org/jeecg/modules/base/mapper/xml/WarehouseAreaMapper.xml
deleted file mode 100644
index 62f5063..0000000
--- a/src/main/java/org/jeecg/modules/base/mapper/xml/WarehouseAreaMapper.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.base.mapper.WarehouseAreaMapper">
-
-
- <select id="getByName" resultType="org.jeecg.modules.base.entity.WarehouseArea">
- select * from mom_base_warehouse_area where name = #{name} and del_flag = 0
- </select>
-</mapper>
\ No newline at end of file
diff --git a/src/main/java/org/jeecg/modules/base/mapper/xml/WarehouseClientMapper.xml b/src/main/java/org/jeecg/modules/base/mapper/xml/WarehouseClientMapper.xml
deleted file mode 100644
index 9b7e875..0000000
--- a/src/main/java/org/jeecg/modules/base/mapper/xml/WarehouseClientMapper.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.base.mapper.WarehouseClientMapper">
-
- <delete id="deleteByMainId" parameterType="java.lang.String">
- DELETE
- FROM mom_base_warehouse_client
- WHERE
- warehouse_id = #{mainId}
- </delete>
-
- <select id="selectByMainId" parameterType="java.lang.String" resultType="org.jeecg.modules.base.entity.WarehouseClient">
- SELECT *
- FROM mom_base_warehouse_client
- WHERE
- warehouse_id = #{mainId}
- </select>
-</mapper>
diff --git a/src/main/java/org/jeecg/modules/base/mapper/xml/WarehouseLocationMapper.xml b/src/main/java/org/jeecg/modules/base/mapper/xml/WarehouseLocationMapper.xml
deleted file mode 100644
index e419c84..0000000
--- a/src/main/java/org/jeecg/modules/base/mapper/xml/WarehouseLocationMapper.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.base.mapper.WarehouseLocationMapper">
-
- <select id="getByName" resultType="org.jeecg.modules.base.entity.WarehouseLocation">
- select * from mom_base_warehouse_location where name = #{name} and del_flag = 0
- </select>
-</mapper>
\ No newline at end of file
diff --git a/src/main/java/org/jeecg/modules/base/mapper/xml/WarehouseMapper.xml b/src/main/java/org/jeecg/modules/base/mapper/xml/WarehouseMapper.xml
deleted file mode 100644
index 2fcf5cf..0000000
--- a/src/main/java/org/jeecg/modules/base/mapper/xml/WarehouseMapper.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.base.mapper.WarehouseMapper">
- <select id="getWarehouseList" resultType="Map">
- select t1.id id,
- t1.code code,
- t1.name name,
- t1.status status,
- t1.version version,
- t2.version_status versionStatus,
- t1.data_version_id dataVersionId,
- t1.create_by createBy,
- t1.create_time createTime,
- t1.update_by updateBy,
- t1.update_time updateTime,
- t1.del_flag delFlag,
- t1.remark remark,
- t1.enterprise_id enterpriseId
- from mom_base_warehouse t1
- left join (select * from mom_sys_data_version where business_type = '浠撳簱绠＄悊' and del_flag = 0) t2
- on t1.data_version_id = t2.id
- where t1.version = #{version}
- and t1.enterprise_id = #{enterpriseId}
- and t1.del_flag = 0
- </select>
- <select id="getAllVersion" resultType="Integer">
- select version
- from mom_base_warehouse
- where del_flag = 0
- </select>
- <select id="getUsableList" resultType="org.jeecg.modules.base.entity.Warehouse">
- select t1.id id,
- t1.code code,
- t1.name name,
- t1.status status,
- t1.version version,
- t1.data_version_id dataVersionId,
- t1.create_by createBy,
- t1.create_time createTime,
- t1.update_by updateBy,
- t1.update_time updateTime,
- t1.del_flag delFlag,
- t1.remark remark,
- t1.enterprise_id enterpriseId
- from mom_base_warehouse t1
- left join (select * from mom_sys_data_version where business_type = '浠撳簱绠＄悊' and del_flag = 0) t2
- on t1.data_version_id = t2.id
- where t2.version_status = '2'
- and t1.del_flag = 0
- </select>
- <select id="getLastUsableList" resultType="org.jeecg.modules.base.entity.Warehouse">
- select t1.id id,
- t1.code code,
- t1.name name,
- t1.status status,
- t1.version version,
- t1.data_version_id dataVersionId,
- t1.create_by createBy,
- t1.create_time createTime,
- t1.update_by updateBy,
- t1.update_time updateTime,
- t1.del_flag delFlag,
- t1.remark remark,
- t1.enterprise_id enterpriseId
- from mom_base_warehouse t1
- left join
- (select * from mom_sys_data_version where business_type = '浠撳簱绠＄悊' and del_flag = 0) t2
- on t1.data_version_id = t2.id
- where t1.del_flag = 0
- and t2.is_last_usable = '1'
- </select>
- <select id="getVersionStatusByVersion" resultType="String">
- select t2.version_status versionStatus
- from mom_base_warehouse t1
- left join (select * from mom_sys_data_version where business_type = '浠撳簱绠＄悊' and del_flag = 0) t2
- on t1.data_version_id = t2.id
- where t1.version = #{version}
- and t1.del_flag = 0
- </select>
-
-
- <select id="getByName" resultType="org.jeecg.modules.base.entity.Warehouse">
- SELECT
- t1.*
-
- FROM
- mom_base_warehouse t1
- left join mom_sys_data_version t2 on t1.data_version_id = t2.id
-
- where t2.version_status = '2' and t1.del_flag = 0 and t1.name = #{name}
-
-
- </select>
-</mapper>
diff --git a/src/main/java/org/jeecg/modules/base/mapper/xml/WorkCenterEquipmentMapper.xml b/src/main/java/org/jeecg/modules/base/mapper/xml/WorkCenterEquipmentMapper.xml
deleted file mode 100644
index c502349..0000000
--- a/src/main/java/org/jeecg/modules/base/mapper/xml/WorkCenterEquipmentMapper.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.base.mapper.WorkCenterEquipmentMapper">
-<select id="listByWorkCenterId" resultType="Map">
- select
- t1.id id,
- t2.id equipmentId,
- t2.num equipmentCode,
- t2.name equipmentName,
- t2.model equipmentModel,
- t2.equipment_category_id equipmentCategoryId,
- t2.standard equipmentStandard,
- t2.manufacturer equipmentManufacturer
- from
- mom_base_work_center_equipment t1
- left join (select * from mom_base_equipment where del_flag=0) t2
- on t1.equipment_id = t2.id
- where t1.work_center_id = #{workCenterId}
- and t1.del_flag = 0
-</select>
- <select id="getAddEquipmentListByEquipmentCategoryId" resultType="Map">
- select
- id id,
- num equipmentCode,
- name equipmentName,
- model equipmentModel,
- equipment_category_id equipmentCategoryId,
- standard equipmentStandard,
- manufacturer equipmentManufacturer
- from
- mom_base_equipment
- where equipment_category_id = #{equipmentCategoryId}
- <if test="equipmentIdList != null and equipmentIdList.size > 0">
- and id not in (
- select id from mom_base_equipment where del_flag=0 and id in
- <foreach collection="equipmentIdList" open="(" separator="," close=")" item="equipId">
- #{equipId}
- </foreach>
- )
- </if>
- and del_flag = 0
- </select>
-</mapper>
diff --git a/src/main/java/org/jeecg/modules/base/mapper/xml/WorkCenterMapper.xml b/src/main/java/org/jeecg/modules/base/mapper/xml/WorkCenterMapper.xml
deleted file mode 100644
index 1d2d2bc..0000000
--- a/src/main/java/org/jeecg/modules/base/mapper/xml/WorkCenterMapper.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.base.mapper.WorkCenterMapper">
- <select id="selectWorkCenterByPMFIds" resultType="org.jeecg.modules.base.entity.WorkCenterDetail">
- select
- t1.id id,
- t1.code code,
- t1.name name,
- t1.service_category serviceCategory,
- t1.work_center_category workCenterCategory,
- t2.id equipmentTeamId,
- t2.name equipmentTeamName,
- t1.feeding_area feedingArea,
- t1.baiting_area baitingArea,
- t1.factory_model_id factoryModelId,
- t1.version version,
- t3.version_status versionStatus,
- t3.audit_status auditStatus,
- t3.is_last_usable isLastUsable,
- t1.create_by createBy,
- t1.create_time createTime,
- t1.update_by updateBy,
- t1.update_time updateTime,
- t1.remark remark,
- t1.parent_factory_model_id parentFactoryModelId
- from mom_base_work_center t1 left join
- (select * from mom_eam_equipment_category where del_flag=0) t2
- on t1.equipment_team_id = t2.id
- left join(select * from mom_sys_data_version where del_flag=0) t3
- on t1.data_version_id = t3.id
- where t1.del_flag=0
- <if test="parentFactoryModelIds != null and parentFactoryModelIds.size > 0">
- and t1.parent_factory_model_id in
- <foreach collection="parentFactoryModelIds" open="(" separator="," close=")" item="pid">
- #{pid}
- </foreach>
- </if>
- and t1.version=#{version}
- </select>
- <select id="getVersionList" resultType="Integer">
- select version
- from mom_base_work_center
- where del_flag=0
- </select>
- <select id="getUpdateVersionlist" resultType="org.jeecg.modules.base.entity.WorkCenter">
- select *
- from mom_base_work_center
- where del_flag=0
- and version = #{version}
- </select>
- <select id="getUsableList" resultType="org.jeecg.modules.base.entity.WorkCenter">
- select
- t1.id id,
- t1.name name,
- t1.code code,
- t1.service_category serviceCategory,
- t1.work_center_category workCenterCategory,
- t1.equipment_team_id equipmentTeamId,
- t1.factory_model_id factoryModelId,
- t1.feeding_area feedingArea,
- t1.baiting_area baitingArea,
- t1.data_version_id dataVersionId,
- t1.version version,
- t1.parent_factory_model_id parentFactoryModelId
- from mom_base_work_center t1
- left join (select * from mom_sys_data_version where del_flag=0) t2
- on t1.id = t2.business_id
- where t1.del_flag=0
- and t2.version_status = '2'
- </select>
- <select id="getEquipmentCategoryListByEnterpriseId" resultType="Map">
- select
- id id,
- code code,
- name name
- from mom_eam_equipment_category
- where enterprise_id=#{enterpriseId}
- and del_flag = 0
- </select>
- <select id="getLastUsableList" resultType="org.jeecg.modules.base.entity.WorkCenter">
- select
- t1.id id,
- t1.name name,
- t1.code code,
- t1.service_category serviceCategory,
- t1.work_center_category workCenterCategory,
- t1.equipment_team_id equipmentTeamId,
- t1.factory_model_id factoryModelId,
- t1.feeding_area feedingArea,
- t1.baiting_area baitingArea,
- t1.data_version_id dataVersionId,
- t1.version version,
- t1.parent_factory_model_id parentFactoryModelId
- from mom_base_work_center t1
- left join (select * from mom_sys_data_version where del_flag=0) t2
- on t1.id = t2.business_id
- where t1.del_flag=0
- and t2.is_last_usable = '1'
- and t2.version_status='3'
- </select>
- <select id="getVersionStatusByVersion" resultType="String">
- select
- t2.version_status versionStatus
- from mom_base_work_center t1
- left join (select * from mom_sys_data_version where business_type='宸ヤ綔涓績' and del_flag=0) t2
- on t1.data_version_id = t2.id
- where t1.version = #{version}
- and t1.del_flag=0
- </select>
- <select id="getFactoryVersionList" resultType="Map">
- select
- distinct t1.version version,
- t2.version_status versionStatus
- from mom_base_factory_model t1
- left join (select * from mom_sys_data_version where business_type='宸ュ巶寤烘ā' and del_flag=0)t2
- on t1.data_version_id = t2.id
- where t2.version_status in ('2','3')
- and t1.del_flag = 0
- order by t1.version asc
- </select>
-</mapper>
diff --git a/src/main/java/org/jeecg/modules/base/mapper/xml/WorkCenterUserMapper.xml b/src/main/java/org/jeecg/modules/base/mapper/xml/WorkCenterUserMapper.xml
deleted file mode 100644
index e1a7dd4..0000000
--- a/src/main/java/org/jeecg/modules/base/mapper/xml/WorkCenterUserMapper.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.base.mapper.WorkCenterUserMapper">
- <select id="listByWorkCenterId" resultType="Map">
- select
- t1.id id,
- t2.id userId,
- t2.realname realName,
- t3.depart_name departName
- from mom_base_work_center_user t1
- left join (select * from sys_user where del_flag=0) t2
- on t1.user_id = t2.id
- left join (select * from sys_depart where del_flag=0) t3
- on t2.depart_id = t3.id
- where t1.work_center_id =#{workCenterId}
- and t1.del_flag=0
- </select>
- <select id="listByEnterpriseId" resultType="Map">
- select
- t1.id id,
- t1.username userName,
- t1.realname realName,
- t2.depart_name departName
- from sys_user t1
- left join (select * from sys_depart where del_flag=0) t2
- on t1.depart_id=t2.id
- where t1.del_flag=0
- and t1.enterprise_id=#{enterpriseId}
- <if test="userIdList != null and userIdList.size > 0">
- and t1.id not in (
- select id from sys_user where del_flag=0 and id in
- <foreach collection="userIdList" open="(" separator="," close=")" item="uid">
- #{uid}
- </foreach>
- )
- </if>
- <if test="departIds != null and departIds.size > 0">
- and t1.depart_id not in
- <foreach collection="departIds" open="(" separator="," close=")" item="did">
- #{did}
- </foreach>
- </if>
- </select>
- <select id="getAddUserList" resultType="Map">
- select
- t1.id id,
- t1.username userName,
- t1.realname realName,
- t2.depart_name departName
- from sys_user t1
- left join (select * from sys_depart where del_flag=0) t2
- on t1.depart_id=t2.id
- where t1.del_flag=0
- and t1.depart_id=#{departId}
- <if test="userIdList != null and userIdList.size > 0">
- and t1.id not in (
- select id from sys_user where del_flag=0 and id in
- <foreach collection="userIdList" open="(" separator="," close=")" item="uid">
- #{uid}
- </foreach>
- )
- </if>
- </select>
- <select id="getUserList" resultType="Map">
- select
- t1.id id,
- t1.username userName,
- t1.realname realName,
- t2.depart_name departName
- from sys_user t1
- left join (select * from sys_depart where del_flag=0) t2
- on t1.depart_id=t2.id
- where t1.del_flag=0
- and t1.depart_id in
- (
- SELECT
- id
- FROM
- (
- SELECT
- t4.id,
- IF
- ( find_in_set( parent_id, @pids ) > 0, @pids := concat( @pids, ',', id ), - 1 ) AS ischild
- FROM
- ( SELECT id, parent_id FROM sys_depart WHERE del_flag = 0 ) t4,
- ( SELECT @pids := #{parentId} ) t5
- ) t6
- WHERE
- ischild != -1
- )
- and t1.id in (#{parentId})
- <if test="userIdList != null and userIdList.size > 0">
- and t1.id not in (
- select id from sys_user where del_flag=0 and id in
- <foreach collection="userIdList" open="(" separator="," close=")" item="uid">
- #{uid}
- </foreach>
- )
- </if>
- </select>
- <select id="getAddDepartTree" resultType="org.jeecg.common.system.vo.SelectTreeModel">
- select
- id as "key",
- depart_name as "title",
- parent_id as parentId
- from sys_depart
- where parent_id = #{parentId}
- and id != #{departId}
- and version = #{version}
- and del_flag='0'
- </select>
-</mapper>
diff --git a/src/main/java/org/jeecg/modules/system/model/ProductionIdModel.java b/src/main/java/org/jeecg/modules/base/model/FactoryIdModel.java
similarity index 60%
rename from src/main/java/org/jeecg/modules/system/model/ProductionIdModel.java
rename to src/main/java/org/jeecg/modules/base/model/FactoryIdModel.java
index a6cd48a..de2a1f8 100644
--- a/src/main/java/org/jeecg/modules/system/model/ProductionIdModel.java
+++ b/src/main/java/org/jeecg/modules/base/model/FactoryIdModel.java
@@ -1,9 +1,9 @@
-package org.jeecg.modules.system.model;
+package org.jeecg.modules.base.model;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
-import org.jeecg.modules.system.entity.MdcProduction;
+import org.jeecg.modules.base.entity.Factory;
import java.io.Serializable;
import java.util.ArrayList;
@@ -18,7 +18,7 @@
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
-public class ProductionIdModel implements Serializable {
+public class FactoryIdModel implements Serializable {
private static final long serialVersionUID = 6403075134223338239L;
@@ -42,18 +42,18 @@
*/
private Boolean selectable = true;
- List<ProductionIdModel> children = new ArrayList<>();
+ List<FactoryIdModel> children = new ArrayList<>();
/**
- * 灏哅dcProductionTreeModel鐨勯儴鍒嗘暟鎹斁鍦ㄨ瀵硅薄褰撲腑
+ * 灏咶actoryTreeModel鐨勯儴鍒嗘暟鎹斁鍦ㄨ瀵硅薄褰撲腑
*
* @param treeModel
* @return
*/
- public ProductionIdModel convert(MdcProductionTreeModel treeModel) {
+ public FactoryIdModel convert(FactoryTreeModel treeModel) {
this.key = treeModel.getId();
this.value = treeModel.getId();
- this.title = treeModel.getProductionName();
+ this.title = treeModel.getFactoryName();
return this;
}
@@ -62,10 +62,10 @@
*
* @return
*/
- public ProductionIdModel convertByUserProduction(MdcProduction mdcProduction) {
- this.key = mdcProduction.getId();
- this.value = mdcProduction.getId();
- this.title = mdcProduction.getProductionName();
+ public FactoryIdModel convertByUserFactory(Factory factory) {
+ this.key = factory.getId();
+ this.value = factory.getId();
+ this.title = factory.getFactoryName();
return this;
}
}
diff --git a/src/main/java/org/jeecg/modules/base/model/FactoryTreeModel.java b/src/main/java/org/jeecg/modules/base/model/FactoryTreeModel.java
new file mode 100644
index 0000000..8138de7
--- /dev/null
+++ b/src/main/java/org/jeecg/modules/base/model/FactoryTreeModel.java
@@ -0,0 +1,104 @@
+package org.jeecg.modules.base.model;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecg.modules.base.entity.Factory;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author: LiuS
+ * @create: 2023-03-23 14:16
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "浜х嚎琛ㄦ爲缁撴瀯鏁版嵁瀹炰綋", description = "浜х嚎琛�")
+public class FactoryTreeModel implements Serializable {
+
+ private static final long serialVersionUID = -1309711609760828658L;
+
+ /**
+ * 瀵瑰簲Factory涓殑id瀛楁,鍓嶇鏁版嵁鏍戜腑鐨刱ey
+ */
+ private String key;
+
+ /**
+ * 瀵瑰簲Factory涓殑id瀛楁,鍓嶇鏁版嵁鏍戜腑鐨剉alue
+ */
+ private String value;
+
+ /**
+ * 瀵瑰簲factory_name瀛楁,鍓嶇鏁版嵁鏍戜腑鐨則itle
+ */
+ private String title;
+
+ private boolean isLeaf;
+
+ /**
+ * 绫诲瀷
+ */
+ private Integer type;
+ //浠ヤ笅鎵�鏈夊瓧娈靛潎涓嶧actory鐩稿悓
+
+ private String id;
+
+ private String parentId;
+
+ private String factoryName;
+
+ private String address;
+
+ private Integer sorter;
+
+ private String factoryCode;
+
+ private String remark;
+
+ private Integer delFlag;
+
+ private String createBy;
+
+ private Date createTime;
+
+ private String updateBy;
+
+ private Date updateTime;
+
+ private String mdcFlag;
+
+ private List<FactoryTreeModel> children = new ArrayList<>();
+
+ public FactoryTreeModel() {
+
+ }
+
+ /**
+ * 灏咶actory瀵硅薄杞崲鎴怓actoryTreeModel瀵硅薄
+ *
+ * @param factory
+ */
+ public FactoryTreeModel(Factory factory) {
+ this.key = factory.getId();
+ this.value = factory.getId();
+ this.title = factory.getFactoryName();
+ this.id = factory.getId();
+ this.parentId = factory.getParentId();
+ this.factoryName = factory.getFactoryName();
+ this.address = factory.getAddress();
+ this.sorter = factory.getSorter();
+ this.factoryCode = factory.getFactoryCode();
+ this.remark = factory.getRemark();
+ this.delFlag = factory.getDelFlag();
+ this.createBy = factory.getCreateBy();
+ this.createTime = factory.getCreateTime();
+ this.updateBy = factory.getUpdateBy();
+ this.updateTime = factory.getUpdateTime();
+ this.mdcFlag = factory.getMdcFlag();
+ }
+}
diff --git a/src/main/java/org/jeecg/modules/base/service/IClientCategoryService.java b/src/main/java/org/jeecg/modules/base/service/IClientCategoryService.java
deleted file mode 100644
index 765a690..0000000
--- a/src/main/java/org/jeecg/modules/base/service/IClientCategoryService.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.jeecg.modules.base.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import org.jeecg.common.api.vo.CommonGenericTree;
-import org.jeecg.modules.base.entity.ClientCategory;
-
-import java.util.List;
-
-/**
- * @Description: mom_base_supplier_category
- * @Author: jeecg-boot
- * @Date: 2023-03-10
- * @Version: V1.0
- */
-public interface IClientCategoryService extends IService<ClientCategory> {
- public List<CommonGenericTree> loadTree();
-}
diff --git a/src/main/java/org/jeecg/modules/base/service/IClientContactService.java b/src/main/java/org/jeecg/modules/base/service/IClientContactService.java
deleted file mode 100644
index 9c8c6d1..0000000
--- a/src/main/java/org/jeecg/modules/base/service/IClientContactService.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.jeecg.modules.base.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import org.jeecg.modules.base.entity.ClientContact;
-import org.jeecg.modules.base.entity.SupplierContact;
-
-/**
- * @Description: mom_base_supplier
- * @Author: jeecg-boot
- * @Date: 2023-03-10
- * @Version: V1.0
- */
-public interface IClientContactService extends IService<ClientContact> {
-
-}
diff --git a/src/main/java/org/jeecg/modules/base/service/IClientService.java b/src/main/java/org/jeecg/modules/base/service/IClientService.java
deleted file mode 100644
index d3be858..0000000
--- a/src/main/java/org/jeecg/modules/base/service/IClientService.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.jeecg.modules.base.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import org.jeecg.modules.base.entity.Client;
-import org.jeecg.modules.base.entity.Supplier;
-
-/**
- * @Description: mom_base_supplier
- * @Author: jeecg-boot
- * @Date: 2023-03-10
- * @Version: V1.0
- */
-public interface IClientService extends IService<Client> {
-
-}
diff --git a/src/main/java/org/jeecg/modules/base/service/IConstructorService.java b/src/main/java/org/jeecg/modules/base/service/IConstructorService.java
deleted file mode 100644
index d3d42a9..0000000
--- a/src/main/java/org/jeecg/modules/base/service/IConstructorService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.jeecg.modules.base.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import org.jeecg.modules.base.entity.Constructor;
-import org.jeecg.modules.base.entity.Supplier;
-
-/**
- * @Description: 鍒堕�犲晢
- * @Author: houjie
- * @Date: 2023-03-06
- * @Version: V1.0
- */
-public interface IConstructorService extends IService<Constructor> {
-
- public Constructor getByName(String name);
-}
diff --git a/src/main/java/org/jeecg/modules/base/service/IEnterpriseAdministratorService.java b/src/main/java/org/jeecg/modules/base/service/IEnterpriseAdministratorService.java
deleted file mode 100644
index 62c245d..0000000
--- a/src/main/java/org/jeecg/modules/base/service/IEnterpriseAdministratorService.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.jeecg.modules.base.service;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.jeecg.modules.base.entity.EnterpriseAdministrator;
-import com.baomidou.mybatisplus.extension.service.IService;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @Description: mom_base_enterprise_administrator
- * @Author: jeecg-boot
- * @Date: 2023-01-12
- * @Version: V1.0
- */
-public interface IEnterpriseAdministratorService extends IService<EnterpriseAdministrator> {
-
- /**
- * 閫氳繃涓昏〃id鏌ヨ瀛愯〃鏁版嵁
- *
- * @param mainId
- * @return List<EnterpriseAdministrator>
- */
- public List<EnterpriseAdministrator> selectByMainId(String mainId);
- /**
- * 閫氳繃涓昏〃id鏌ヨ瀛愯〃鏁版嵁
- * @param page
- * @param mainId
- * @param enterpriseId
- * @return
- */
- Page<Map<String,Object>> mapList(Page<Map<String,Object>> page,String mainId,String enterpriseId);
-}
diff --git a/src/main/java/org/jeecg/modules/base/service/IEnterpriseService.java b/src/main/java/org/jeecg/modules/base/service/IEnterpriseService.java
deleted file mode 100644
index db97843..0000000
--- a/src/main/java/org/jeecg/modules/base/service/IEnterpriseService.java
+++ /dev/null
@@ -1,89 +0,0 @@
-package org.jeecg.modules.base.service;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.apache.ibatis.annotations.Param;
-import org.jeecg.common.system.vo.SelectTreeModel;
-import org.jeecg.modules.base.entity.Enterprise;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * @Description: 浼佷笟鏋舵瀯
- * @Author: jeecg-boot
- * @Date: 2022-11-21
- * @Version: V1.0
- */
-public interface IEnterpriseService extends IService<Enterprise> {
- /**
- * 鑾峰彇鐗堟湰鏍�
- * @param pid
- * @param version
- * @return
- *
- *
- */
- public List<SelectTreeModel> getEnterpriseVersionTree(String pid,Integer version);
- /**
- * 鏍规嵁鐖禝d鑾峰彇瀛╁瓙鍒楄〃
- * @param page
- * @param parentId
- * @param version
- * @return
- */
- Page<Map<String,Object>> getEnterpriseListByPid(Page<Map<String,Object>> page,Integer version,String parentId);
- /**
- * 鏍规嵁鐖禝d鑾峰彇瀛╁瓙鍒楄〃
- * @param
- * @return
- *
- *
- */
- List<Map<String,Object>> getEnterprise();
- /**
- * 鑾峰彇鎵�鏈夌増鏈�
- * @param
- * @return
- *
- *
- */
- Set<Integer> getAllVersion();
- /**
- * 鏌ユ鍦ㄧ敓鏁堢殑鐗堟湰鍙�
- * @param
- * @return
- *
- *
- */
- Integer getInitVersion();
- /**
- * 鏌ユ渶鍚庝竴娆＄殑鐢熸晥鐗堟湰
- * @return
- *
- *
- */
- List<Enterprise> getLastUsableList();
- /**
- * 鏌ユ鍦ㄧ敓鏁堢殑鐗堟湰鍒楄〃
- * @return
- *
- *
- */
- List<Enterprise> getUsableList();
- /**
- * 鏌ュ綋鍓嶇敓鏁堢増鏈拰涓婃鐢熸晥鐗堟湰
- * @return
- *
- *
- */
- Map<String,Object> getNowAndLastUsableVersion();
- /**
- * 鏌ユ鍦ㄧ敓鏁堢殑id鍒楄〃
- * @return
- *
- *
- */
- List<String> getUsableIdList();
-}
diff --git a/src/main/java/org/jeecg/modules/base/service/IFactoryElementCategoryService.java b/src/main/java/org/jeecg/modules/base/service/IFactoryElementCategoryService.java
deleted file mode 100644
index d848330..0000000
--- a/src/main/java/org/jeecg/modules/base/service/IFactoryElementCategoryService.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.jeecg.modules.base.service;
-
-import org.jeecg.modules.base.entity.FactoryElementCategory;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * @Description: 宸ュ巶瑕佺礌绫诲瀷
- * @Author: jeecg-boot
- * @Date: 2022-11-07
- * @Version: V1.0
- */
-public interface IFactoryElementCategoryService extends IService<FactoryElementCategory> {
-
-}
diff --git a/src/main/java/org/jeecg/modules/base/service/IFactoryModelService.java b/src/main/java/org/jeecg/modules/base/service/IFactoryModelService.java
deleted file mode 100644
index bdd92fb..0000000
--- a/src/main/java/org/jeecg/modules/base/service/IFactoryModelService.java
+++ /dev/null
@@ -1,113 +0,0 @@
-package org.jeecg.modules.base.service;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.apache.ibatis.annotations.Param;
-import org.jeecg.common.system.vo.SelectTreeModel;
-import org.jeecg.modules.base.entity.FactoryModel;
-import com.baomidou.mybatisplus.extension.service.IService;
-import org.jeecg.common.exception.JeecgBootException;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import org.jeecg.modules.base.entity.FactoryModelDetail;
-import org.jeecg.modules.system.entity.SysDepart;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * @Description: 宸ュ巶寤烘ā
- * @Author: jeecg-boot
- * @Date: 2022-11-08
- * @Version: V1.0
- */
-public interface IFactoryModelService extends IService<FactoryModel> {
- /**
- * @param enterpriseId
- * @param version
- * 鍔犺浇鏍�
- * @return
- */
- List<SelectTreeModel> loadTree(String enterpriseId,Integer version);
- /**
- * 鑾峰彇鐗堟湰鍒楄〃
- * @param page
- * @param ids
- * @param parentId
- * @param version
- * @return
- */
- Page<Map<String, Object>> getFactoryList(Page<Map<String,Object>> page,
- Integer version,
- String parentId,
- List<String> ids
-
- );
- /**
- * 寮冪敤
- * @return
- */
- List<SysDepart> getDepartList();
- /**
- * 寮冪敤
- * @param uid
- * @return
- */
- public String getEidByUid(String uid);
- /**
- * 寮冪敤
- * @param eid
- * @return
- */
- List<FactoryModelDetail> getListByEid(String eid);
- /**
- * 鑾峰彇鎵�鏈夌増鏈彿
- * @param
- * @return
- */
- public Set<Integer> getVersionList();
- /**
- * 鑾峰彇鍒濆鐗堟湰鍙�
- * @return
- */
- public Integer getInitVersion();
- /**
- * 鑾峰彇鏈�鍚庝竴娆＄敓鏁堝垪琛�
- * @param parentIds
- * @return
- */
- List<FactoryModel> getLastUsableList(List<String> parentIds);
- /**
- * 鑾峰彇褰撳墠鐢熸晥鍒楄〃
- * @param parentIds
- * @return
- */
- List<FactoryModel> getUsableList(List<String> parentIds);
- /**
- * 鏌ュ綋鍓嶇敓鏁堢増鏈拰涓婃鐢熸晥鐗堟湰
- * @return
- */
- Map<String,Object> getNowAndLastUsableVersion();
- /**
- * 鏍规嵁鐖禝d鑾峰彇鎵�鏈夊瀛愬垪琛�
- * @param version
- * @return
- */
- List<FactoryModel> getAllDepartByPid(Integer version);
- /**
- * 鑾峰彇鐗堟湰鐘舵�佹牴鎹増鏈彿
- * @param version
- * @return
- */
- List<String> getVersionStatusByVersion(Integer version);
- /**
- * 鑾峰彇褰撳墠鐢熸晥杞﹂棿鍒楄〃
- * @return
- */
- List<Map<String,Object>> getUsableWorkShopList();
- /**
- * 鑾峰彇鐢熸晥鐗堟湰鍙�
- * @return
- */
- List<Integer> getUsableVersion();
-
-}
diff --git a/src/main/java/org/jeecg/modules/base/service/IFactoryService.java b/src/main/java/org/jeecg/modules/base/service/IFactoryService.java
new file mode 100644
index 0000000..5ac34ff
--- /dev/null
+++ b/src/main/java/org/jeecg/modules/base/service/IFactoryService.java
@@ -0,0 +1,41 @@
+package org.jeecg.modules.base.service;
+
+import org.jeecg.modules.base.entity.Factory;
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.base.model.FactoryIdModel;
+import org.jeecg.modules.base.model.FactoryTreeModel;
+
+import java.util.List;
+
+/**
+ * @Description: 宸ュ巶/杞﹂棿/浜х嚎
+ * @Author: jeecg-boot
+ * @Date: 2025-06-24
+ * @Version: V1.0
+ */
+public interface IFactoryService extends IService<Factory> {
+
+ /**
+ * 淇濆瓨浜х嚎鏁版嵁
+ */
+ void saveFactoryData(Factory factory);
+ /**
+ * 鏌ヨ鎵�鏈変骇绾夸俊鎭紝骞跺垎鑺傜偣杩涜鏄剧ず
+ */
+ List<FactoryTreeModel> queryTreeList();
+
+ /**
+ * 鏌ヨ鎵�鏈変骇绾夸俊鎭紝骞跺垎鑺傜偣杩涜鏄剧ず
+ */
+ List<FactoryTreeModel> queryTreeList(String ids);
+
+ /**
+ * 鏍规嵁浜х嚎id鍒犻櫎骞跺垹闄ゅ叾鍙兘瀛樺湪鐨勫瓙绾т骇绾�
+ */
+ boolean delete(String id);
+
+ /**
+ * 鏌ヨ鎵�鏈塮actoryId淇℃伅,骞跺垎鑺傜偣杩涜鏄剧ず
+ */
+ List<FactoryIdModel> queryFactoryIdTreeList();
+}
diff --git a/src/main/java/org/jeecg/modules/base/service/ILineSideWarehouseService.java b/src/main/java/org/jeecg/modules/base/service/ILineSideWarehouseService.java
new file mode 100644
index 0000000..202b90d
--- /dev/null
+++ b/src/main/java/org/jeecg/modules/base/service/ILineSideWarehouseService.java
@@ -0,0 +1,14 @@
+package org.jeecg.modules.base.service;
+
+import org.jeecg.modules.base.entity.LineSideWarehouse;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 绾胯竟浠撳簱淇℃伅
+ * @Author: jeecg-boot
+ * @Date: 2025-06-24
+ * @Version: V1.0
+ */
+public interface ILineSideWarehouseService extends IService<LineSideWarehouse> {
+
+}
diff --git a/src/main/java/org/jeecg/modules/base/service/IMaterialCategoryService.java b/src/main/java/org/jeecg/modules/base/service/IMaterialCategoryService.java
deleted file mode 100644
index 0d442e5..0000000
--- a/src/main/java/org/jeecg/modules/base/service/IMaterialCategoryService.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package org.jeecg.modules.base.service;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.IService;
-import org.jeecg.common.system.vo.SelectTreeModel;
-import org.jeecg.modules.base.entity.Enterprise;
-import org.jeecg.modules.base.entity.MaterialCategory;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * @Description: 鐗╂枡鍒嗙被
- * @Author: jeecg-boot
- * @Date: 2023-04-20
- * @Version: V1.0
- */
-public interface IMaterialCategoryService extends IService<MaterialCategory> {
-
- /**
- * 鑾峰彇鐗堟湰鏍�
- *
- * @param pid
- * @param version
- * @return
- */
- List<SelectTreeModel> getMaterialCategoryVersionTree(String pid, Integer version);
-
- /**
- * 鏍规嵁鐖禝d鑾峰彇瀛╁瓙鍒楄〃
- *
- * @param page
- * @param parentId
- * @param version
- * @return
- */
- Page<Map<String, Object>> getMaterialCategoryListByPid(Page<Map<String, Object>> page, Integer version, String parentId);
-
- /**
- * 鑾峰彇鎵�鏈夌増鏈�
- *
- * @return
- */
- Set<Integer> getAllVersion();
-
- /**
- * 鏌ユ鍦ㄧ敓鏁堢殑鐗堟湰鍙�
- *
- * @param
- * @return
- */
- Integer getInitVersion();
-
- /**
- * 鏌ュ綋鍓嶇敓鏁堢増鏈拰涓婃鐢熸晥鐗堟湰
- *
- * @return
- */
- Map<String, Object> getNowAndLastUsableVersion();
-
- /**
- * 鏌ユ鍦ㄧ敓鏁堢殑鐗堟湰鍒楄〃
- *
- * @return
- */
- List<MaterialCategory> getUsableList();
-
- /**
- * 鏌ユ渶鍚庝竴娆＄殑鐢熸晥鐗堟湰
- *
- * @return
- */
- List<MaterialCategory> getLastUsableList();
-}
diff --git a/src/main/java/org/jeecg/modules/base/service/IMaterialService.java b/src/main/java/org/jeecg/modules/base/service/IMaterialService.java
deleted file mode 100644
index 47b4f1b..0000000
--- a/src/main/java/org/jeecg/modules/base/service/IMaterialService.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.jeecg.modules.base.service;
-
-import org.jeecg.modules.base.entity.Material;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * @Description: 鐗╂枡琛�
- * @Author: jeecg-boot
- * @Date: 2023-04-28
- * @Version: V1.0
- */
-public interface IMaterialService extends IService<Material> {
-
-}
diff --git a/src/main/java/org/jeecg/modules/base/service/IProductionLineWarehouseClientService.java b/src/main/java/org/jeecg/modules/base/service/IProductionLineWarehouseClientService.java
deleted file mode 100644
index 48cde2f..0000000
--- a/src/main/java/org/jeecg/modules/base/service/IProductionLineWarehouseClientService.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package org.jeecg.modules.base.service;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.jeecg.modules.base.entity.ProductionLineWarehouseClient;
-import com.baomidou.mybatisplus.extension.service.IService;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @Description: 绾胯竟搴撴湇鍔″璞�
- * @Author: jeecg-boot
- * @Date: 2023-01-28
- * @Version: V1.0
- */
-public interface IProductionLineWarehouseClientService extends IService<ProductionLineWarehouseClient> {
-
- /**
- * 閫氳繃涓昏〃id鏌ヨ瀛愯〃鏁版嵁
- *
- * @param mainId
- * @return List<ProductionLineWarehouseClient>
- */
- public List<ProductionLineWarehouseClient> selectByMainId(String mainId);
- /**
- * 鑾峰彇绛涢�夊伐鍘傚垪琛�
- * @param page
- * @param parentId
- * @param version
- * @param ids
- * @return
- */
- Page<Map<String, Object>> getFactoryList(Page<Map<String,Object>> page,
- Integer version,
- String parentId,
- List<String> ids
- );
-}
diff --git a/src/main/java/org/jeecg/modules/base/service/IProductionLineWarehouseService.java b/src/main/java/org/jeecg/modules/base/service/IProductionLineWarehouseService.java
deleted file mode 100644
index 96cc2f2..0000000
--- a/src/main/java/org/jeecg/modules/base/service/IProductionLineWarehouseService.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package org.jeecg.modules.base.service;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.jeecg.modules.base.entity.ProductionLineWarehouse;
-import com.baomidou.mybatisplus.extension.service.IService;
-import org.jeecg.modules.base.entity.Warehouse;
-
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * @Description: 绾胯竟搴撶鐞�
- * @Author: jeecg-boot
- * @Date: 2023-01-28
- * @Version: V1.0
- */
-public interface IProductionLineWarehouseService extends IService<ProductionLineWarehouse> {
- /**
- * 鑾峰彇鍒濆鐗堟湰鍙�
- * @return
- */
- public Integer getInitVersion();
- /**
- * 鑾峰彇鐗堟湰鍒楄〃
- * @param page
- * @param workshopId
- * @param version
- * @return
- */
- Page<Map<String, Object>> getWarehouseList(Page<Map<String,Object>> page,
- Integer version,
- String workshopId
- );
-
- /**
- * 鍒犻櫎涓�瀵瑰
- *
- * @param id
- */
- public void delMain (String id);
-
- /**
- * 鎵归噺鍒犻櫎涓�瀵瑰
- *
- * @param idList
- */
- public void delBatchMain (Collection<? extends Serializable> idList);
- /**
- * 鑾峰彇鎵�鏈夌増鏈彿
- * @param
- * @return
- */
- public Set<Integer> getVersionList();
- /**
- * 鑾峰彇鏈�鍚庝竴娆＄敓鏁堝垪琛�
- * @return
- */
- List<ProductionLineWarehouse> getLastUsableList();
- /**
- * 鑾峰彇褰撳墠鐢熸晥鍒楄〃
- * @return
- */
- List<ProductionLineWarehouse> getUsableList();
- /**
- * 鏌ュ綋鍓嶇敓鏁堢増鏈拰涓婃鐢熸晥鐗堟湰
- * @return
- */
- Map<String,Object> getNowAndLastUsableVersion();
- /**
- * 鑾峰彇鐗堟湰鐘舵�佹牴鎹増鏈彿
- * @param version
- * @return
- */
- List<String> getVersionStatusByVersion(Integer version);
-
-
-
-}
diff --git a/src/main/java/org/jeecg/modules/base/service/IShiftGroupService.java b/src/main/java/org/jeecg/modules/base/service/IShiftGroupService.java
new file mode 100644
index 0000000..6032b37
--- /dev/null
+++ b/src/main/java/org/jeecg/modules/base/service/IShiftGroupService.java
@@ -0,0 +1,14 @@
+package org.jeecg.modules.base.service;
+
+import org.jeecg.modules.base.entity.ShiftGroup;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 鐝粍浜哄憳淇℃伅
+ * @Author: jeecg-boot
+ * @Date: 2025-06-24
+ * @Version: V1.0
+ */
+public interface IShiftGroupService extends IService<ShiftGroup> {
+
+}
diff --git a/src/main/java/org/jeecg/modules/base/service/IShiftService.java b/src/main/java/org/jeecg/modules/base/service/IShiftService.java
new file mode 100644
index 0000000..a1d955c
--- /dev/null
+++ b/src/main/java/org/jeecg/modules/base/service/IShiftService.java
@@ -0,0 +1,14 @@
+package org.jeecg.modules.base.service;
+
+import org.jeecg.modules.base.entity.Shift;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 鐝
+ * @Author: jeecg-boot
+ * @Date: 2025-06-24
+ * @Version: V1.0
+ */
+public interface IShiftService extends IService<Shift> {
+
+}
diff --git a/src/main/java/org/jeecg/modules/base/service/ISupplierCategoryService.java b/src/main/java/org/jeecg/modules/base/service/ISupplierCategoryService.java
deleted file mode 100644
index 6b543bb..0000000
--- a/src/main/java/org/jeecg/modules/base/service/ISupplierCategoryService.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.jeecg.modules.base.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import org.jeecg.common.api.vo.CommonGenericTree;
-import org.jeecg.modules.base.entity.SupplierCategory;
-
-import java.util.List;
-
-/**
- * @Description: mom_base_supplier_category
- * @Author: jeecg-boot
- * @Date: 2023-03-10
- * @Version: V1.0
- */
-public interface ISupplierCategoryService extends IService<SupplierCategory> {
- public List<CommonGenericTree> loadTree();
-}
diff --git a/src/main/java/org/jeecg/modules/base/service/ISupplierContactService.java b/src/main/java/org/jeecg/modules/base/service/ISupplierContactService.java
deleted file mode 100644
index 62652f3..0000000
--- a/src/main/java/org/jeecg/modules/base/service/ISupplierContactService.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.jeecg.modules.base.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import org.jeecg.modules.base.entity.Supplier;
-import org.jeecg.modules.base.entity.SupplierContact;
-
-/**
- * @Description: mom_base_supplier
- * @Author: jeecg-boot
- * @Date: 2023-03-10
- * @Version: V1.0
- */
-public interface ISupplierContactService extends IService<SupplierContact> {
-
-}
diff --git a/src/main/java/org/jeecg/modules/base/service/ISupplierService.java b/src/main/java/org/jeecg/modules/base/service/ISupplierService.java
index 073e3be..53947cd 100644
--- a/src/main/java/org/jeecg/modules/base/service/ISupplierService.java
+++ b/src/main/java/org/jeecg/modules/base/service/ISupplierService.java
@@ -1,17 +1,14 @@
package org.jeecg.modules.base.service;
-import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.base.entity.Supplier;
-import org.jeecg.modules.base.entity.SupplierCategory;
+import com.baomidou.mybatisplus.extension.service.IService;
/**
- * @Description: mom_base_supplier
+ * @Description: 渚涘簲鍟嗙鐞�
* @Author: jeecg-boot
- * @Date: 2023-03-10
+ * @Date: 2025-06-24
* @Version: V1.0
*/
public interface ISupplierService extends IService<Supplier> {
-
- public Supplier getByName(String name);
}
diff --git a/src/main/java/org/jeecg/modules/base/service/IUnitCategoryService.java b/src/main/java/org/jeecg/modules/base/service/IUnitCategoryService.java
deleted file mode 100644
index 70204f0..0000000
--- a/src/main/java/org/jeecg/modules/base/service/IUnitCategoryService.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package org.jeecg.modules.base.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import org.jeecg.modules.base.entity.UnitCategory;
-
-import java.util.List;
-
-public interface IUnitCategoryService extends IService<UnitCategory> {
- /**
- * 鏌ヨ璁￠噺鍗曚綅鍒嗙被鏍戝舰鍒楄〃
- * @return
- */
- List<UnitCategory> getTreeList();
-
- public void initFristUnitCategory();
-
- /**
- * 鏌ヨ璁￠噺鍗曚綅鏍戝舰鍒楄〃
- * @return
- */
- List<UnitCategory> getUnitTreeList();
-
- /**
- * 鏍规嵁璁￠噺鍗曚綅鏌ヨ璇ヨ閲忓崟浣嶄笅鐨勬墍鏈夎閲忓崟浣�
- * @return
- */
- List<UnitCategory> getList(String id);
-
-}
diff --git a/src/main/java/org/jeecg/modules/base/service/IUnitConversionService.java b/src/main/java/org/jeecg/modules/base/service/IUnitConversionService.java
deleted file mode 100644
index ec359ee..0000000
--- a/src/main/java/org/jeecg/modules/base/service/IUnitConversionService.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.jeecg.modules.base.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import org.jeecg.modules.base.entity.UnitConversion;
-
-import java.util.List;
-
-public interface IUnitConversionService extends IService<UnitConversion> {
- List<UnitConversion> getListByUnitId(String ids);
-}
diff --git a/src/main/java/org/jeecg/modules/base/service/IUnitService.java b/src/main/java/org/jeecg/modules/base/service/IUnitService.java
deleted file mode 100644
index 6a90f08..0000000
--- a/src/main/java/org/jeecg/modules/base/service/IUnitService.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.jeecg.modules.base.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import org.jeecg.modules.base.entity.Unit;
-
-import java.util.List;
-
-public interface IUnitService extends IService<Unit> {
- List<Unit> getListByUnitCategoryId(String unitCategoryId);
- List<Unit> getTreeList();
- /**
- * 鏍规嵁鍗曚綅鍚嶇О鏌ヨ
- * @param name 鍚嶇О
- * @return Unit
- */
- public Unit getUnitByName(String name);
-}
diff --git a/src/main/java/org/jeecg/modules/base/service/IUserFactoryService.java b/src/main/java/org/jeecg/modules/base/service/IUserFactoryService.java
new file mode 100644
index 0000000..9c3b490
--- /dev/null
+++ b/src/main/java/org/jeecg/modules/base/service/IUserFactoryService.java
@@ -0,0 +1,21 @@
+package org.jeecg.modules.base.service;
+
+import org.jeecg.modules.base.entity.UserFactory;
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.base.model.FactoryIdModel;
+
+import java.util.List;
+
+/**
+ * @Description: 鐢ㄦ埛宸ュ巶/杞﹂棿/浜х嚎鍏崇郴
+ * @Author: jeecg-boot
+ * @Date: 2025-06-24
+ * @Version: V1.0
+ */
+public interface IUserFactoryService extends IService<UserFactory> {
+
+ /**
+ * 鏍规嵁鎸囧畾鐢ㄦ埛id鏌ヨ浜х嚎淇℃伅
+ */
+ List<FactoryIdModel> queryFactoryIdsOfUser(String userId);
+}
diff --git a/src/main/java/org/jeecg/modules/base/service/IUserGroupService.java b/src/main/java/org/jeecg/modules/base/service/IUserGroupService.java
new file mode 100644
index 0000000..2be2903
--- /dev/null
+++ b/src/main/java/org/jeecg/modules/base/service/IUserGroupService.java
@@ -0,0 +1,14 @@
+package org.jeecg.modules.base.service;
+
+import org.jeecg.modules.base.entity.UserGroup;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 鐝粍
+ * @Author: jeecg-boot
+ * @Date: 2025-06-24
+ * @Version: V1.0
+ */
+public interface IUserGroupService extends IService<UserGroup> {
+
+}
diff --git a/src/main/java/org/jeecg/modules/base/service/IWarehouseAreaService.java b/src/main/java/org/jeecg/modules/base/service/IWarehouseAreaService.java
deleted file mode 100644
index 11d046a..0000000
--- a/src/main/java/org/jeecg/modules/base/service/IWarehouseAreaService.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.jeecg.modules.base.service;
-
-import org.jeecg.modules.base.entity.Warehouse;
-import org.jeecg.modules.base.entity.WarehouseArea;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * @Description: mom_base_warehouse_area
- * @Author: jeecg-boot
- * @Date: 2023-07-06
- * @Version: V1.0
- */
-public interface IWarehouseAreaService extends IService<WarehouseArea> {
-
- /**
- * 鏍规嵁搴撳尯鍚嶇О鏌ヨ
- *
- * @param name 鍚嶇О
- * @return WarehouseArea
- */
- public WarehouseArea getByName(String name);
-}
diff --git a/src/main/java/org/jeecg/modules/base/service/IWarehouseClientService.java b/src/main/java/org/jeecg/modules/base/service/IWarehouseClientService.java
deleted file mode 100644
index e033260..0000000
--- a/src/main/java/org/jeecg/modules/base/service/IWarehouseClientService.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package org.jeecg.modules.base.service;
-
-import org.jeecg.common.system.vo.SelectTreeModel;
-import org.jeecg.modules.base.entity.WarehouseClient;
-import com.baomidou.mybatisplus.extension.service.IService;
-import org.jeecg.modules.system.entity.SysDepart;
-
-import java.util.List;
-
-/**
- * @Description: 浠撳簱鏈嶅姟瀵硅薄
- * @Author: jeecg-boot
- * @Date: 2022-11-07
- * @Version: V1.0
- */
-public interface IWarehouseClientService extends IService<WarehouseClient> {
-
- /**
- * 閫氳繃涓昏〃id鏌ヨ瀛愯〃鏁版嵁
- *
- * @param mainId
- * @return List<WarehouseClient>
- */
- public List<WarehouseClient> selectByMainId(String mainId);
- public List<SelectTreeModel> getDepartTreeByEnterpriseId(String enterpriseid);
- public List<SysDepart> getDepartListByParentId(List<String> parentIds);
-}
diff --git a/src/main/java/org/jeecg/modules/base/service/IWarehouseLocationService.java b/src/main/java/org/jeecg/modules/base/service/IWarehouseLocationService.java
deleted file mode 100644
index afc3fc3..0000000
--- a/src/main/java/org/jeecg/modules/base/service/IWarehouseLocationService.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package org.jeecg.modules.base.service;
-
-import org.jeecg.modules.base.entity.WarehouseArea;
-import org.jeecg.modules.base.entity.WarehouseLocation;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * @Description: mom_base_warehouse_location
- * @Author: jeecg-boot
- * @Date: 2023-07-06
- * @Version: V1.0
- */
-public interface IWarehouseLocationService extends IService<WarehouseLocation> {
- /**
- * 鏍规嵁搴撲綅鍚嶇О鏌ヨ
- *
- * @param name 鍚嶇О
- * @return WarehouseLocation
- */
- public WarehouseLocation getByName(String name);
-}
diff --git a/src/main/java/org/jeecg/modules/base/service/IWarehouseService.java b/src/main/java/org/jeecg/modules/base/service/IWarehouseService.java
deleted file mode 100644
index 8123f66..0000000
--- a/src/main/java/org/jeecg/modules/base/service/IWarehouseService.java
+++ /dev/null
@@ -1,98 +0,0 @@
-package org.jeecg.modules.base.service;//package org.jeecg.modules.base.service;
-//
-//import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-//import com.baomidou.mybatisplus.extension.service.IService;
-//import org.jeecg.modules.base.entity.Warehouse;
-//
-//import java.io.Serializable;
-//import java.util.Collection;
-//import java.util.List;
-//import java.util.Map;
-//import java.util.Set;
-//
-///**
-// * @Description: 浠撳簱
-// * @Author: jeecg-boot
-// * @Date: 2022-11-07
-// * @Version: V1.0
-// */
-//public interface IWarehouseService extends IService<Warehouse> {
-// /**
-// * 鑾峰彇鐗堟湰鍒楄〃
-// *
-// * @param page
-// * @param enterpriseId
-// * @param version
-// * @return
-// */
-// Page<Map<String, Object>> getWarehouseList(Page<Map<String, Object>> page,
-// Integer version,
-// String enterpriseId);
-//
-// /**
-// * 鑾峰彇鍒濆鐗堟湰鍙�
-// *
-// * @return
-// */
-// public Integer getInitVersion();
-//
-// /**
-// * 鍒犻櫎涓�瀵瑰
-// *
-// * @param id
-// */
-// public void delMain(String id);
-//
-// /**
-// * 鎵归噺鍒犻櫎涓�瀵瑰
-// *
-// * @param idList
-// */
-// public void delBatchMain(Collection<? extends Serializable> idList);
-//
-// /**
-// * 鑾峰彇鎵�鏈夌増鏈彿
-// *
-// * @param
-// * @return
-// */
-// public Set<Integer> getVersionList();
-//
-// /**
-// * 鑾峰彇鏈�鍚庝竴娆＄敓鏁堝垪琛�
-// *
-// * @return
-// */
-// List<Warehouse> getLastUsableList();
-//
-// /**
-// * 鑾峰彇褰撳墠鐢熸晥鍒楄〃
-// *
-// * @return
-// */
-// List<Warehouse> getUsableList();
-//
-// /**
-// * 鏌ュ綋鍓嶇敓鏁堢増鏈拰涓婃鐢熸晥鐗堟湰
-// *
-// * @return
-// */
-// Map<String, Object> getNowAndLastUsableVersion();
-//
-// /**
-// * 鑾峰彇鐗堟湰鐘舵�佹牴鎹増鏈彿
-// *
-// * @param version
-// * @return
-// */
-// List<String> getVersionStatusByVersion(Integer version);
-//
-//
-// /**
-// * 鏍规嵁浠撳簱鍚嶇О鏌ヨ
-// *
-// * @param name 鍚嶇О
-// * @return Warehouse
-// */
-// public Warehouse getByName(String name);
-//}
diff --git a/src/main/java/org/jeecg/modules/base/service/IWorkCenterEquipmentService.java b/src/main/java/org/jeecg/modules/base/service/IWorkCenterEquipmentService.java
deleted file mode 100644
index c4ff43f..0000000
--- a/src/main/java/org/jeecg/modules/base/service/IWorkCenterEquipmentService.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package org.jeecg.modules.base.service;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.apache.ibatis.annotations.Param;
-import org.jeecg.modules.base.entity.WorkCenterEquipment;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * @Description: mom_base_work_center_equipment
- * @Author: jeecg-boot
- * @Date: 2022-12-06
- * @Version: V1.0
- */
-public interface IWorkCenterEquipmentService extends IService<WorkCenterEquipment> {
- /**
- * 鍒楄〃鏌ヨ
- *
- * @param page
- * @param workCenterId
- * @param
- * @return
- */
- Page<Map<String,Object>> listByWorkCenterId(Page<Map<String,Object>> page, String workCenterId);
- /**
- * 鏌ュ垎閰嶈澶囧垪鏌ヨ
- *
- * @param page
- * @param equipmentCategoryId
- * @param equipmentIdList
- * @return
- */
- Page<Map<String,Object>> getAddEquipmentListByEquipmentCategoryId(Page<Map<String,Object>> page,
- String equipmentCategoryId,
- List<String> equipmentIdList);
-
-
-}
diff --git a/src/main/java/org/jeecg/modules/base/service/IWorkCenterService.java b/src/main/java/org/jeecg/modules/base/service/IWorkCenterService.java
deleted file mode 100644
index 0828db7..0000000
--- a/src/main/java/org/jeecg/modules/base/service/IWorkCenterService.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package org.jeecg.modules.base.service;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.apache.ibatis.annotations.Param;
-import org.jeecg.modules.base.entity.FactoryModelDetail;
-import org.jeecg.modules.base.entity.WorkCenter;
-import com.baomidou.mybatisplus.extension.service.IService;
-import org.jeecg.modules.base.entity.WorkCenterDetail;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * @Description: mom_base_work_center
- * @Author: jeecg-boot
- * @Date: 2022-11-17
- * @Version: V1.0
- */
-
-public interface IWorkCenterService extends IService<WorkCenter> {
- /**
- * 鑾峰彇鐗堟湰鐘舵�佹牴鎹増鏈彿
- * @param page
- * @param version
- * @param factoryModelVersion
- * @param parentFactoryModelId
- * @return
- */
- Page<WorkCenterDetail> getAllWorkCenterByPMFId(Page<WorkCenterDetail> page,String parentFactoryModelId,Integer factoryModelVersion,Integer version);
- /**
- * 鑾峰彇鏍硅妭鐐�
- * @param eid
- * @param fid
- * @return
- */
- FactoryModelDetail getTop(String eid,String fid);
- /**
- * 鑾峰彇鎵�鏈夌増鏈�
- * @param
- * @return
- */
- Set<Integer> getVersionList();
- /**
- * 鑾峰彇鍗囩増宸ヤ綔涓績鍒楄〃
- * @param version
- * @return
- */
- List<WorkCenter> getUpdateVersionlist (Integer version);
- /**
- * 鑾峰彇鐢熸晥宸ヤ綔涓績鍒楄〃
- * @return
- */
- List<WorkCenter> getUsableList();
- /**
- * 鑾峰彇浼佷笟璁惧缁�
- * @param enterpriseId
- * @return
- */
- List<Map<String,Object>>getEquipmentCategoryListByEnterpriseId(String enterpriseId);
- /**
- * 鑾峰彇鏈鐢熸晥鐗堟湰涓庝笂娆＄敓鏁�
- * @param
- * @return
- */
- Map<String,Object> getNowAndLastUsableVersion();
- /**
- * 鑾峰彇涓婃鐢熸晥鐗堟湰
- * @param
- * @return
- */
- List<WorkCenter> getLastUsableVersion ();
- /**
- * 鑾峰彇鍒濆鐗堟湰鍙�
- * @param
- * @return
- */
- Integer getInitVersion();
- /**
- * 鑾峰彇鐗堟湰鐘舵�佹牴鎹増鏈彿
- * @param version
- * @return
- */
- List<String> getVersionStatusByVersion(Integer version);
- /**
- * 鑾峰彇宸ュ巶寤烘ā鐢熸晥澶辨晥鍒楄〃
- * @return
- */
- List<Map<String,Object>> getFactoryVersionList();
-}
diff --git a/src/main/java/org/jeecg/modules/base/service/IWorkCenterUserService.java b/src/main/java/org/jeecg/modules/base/service/IWorkCenterUserService.java
deleted file mode 100644
index 998649a..0000000
--- a/src/main/java/org/jeecg/modules/base/service/IWorkCenterUserService.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package org.jeecg.modules.base.service;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.apache.ibatis.annotations.Param;
-import org.jeecg.common.system.vo.SelectTreeModel;
-import org.jeecg.modules.base.entity.WorkCenterDetail;
-import org.jeecg.modules.base.entity.WorkCenterUser;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * @Description: mom_base_work_center_user
- * @Author: jeecg-boot
- * @Date: 2022-12-06
- * @Version: V1.0
- */
-public interface IWorkCenterUserService extends IService<WorkCenterUser> {
- /**
- * 鍒楄〃鏌ヨ
- *
- * @param page
- * @param workCenterId
- * @param
- * @return
- */
- Page<Map<String,Object>> listByWorkCenterId(Page<Map<String,Object>> page, String workCenterId);
- /**
- * 娣诲姞鍒嗛厤浜哄憳
- *
- * @param page
- * @param departId
- * @param userIdList
- * @return
- */
- Page<Map<String,Object>> getAddUserList(Page<Map<String,Object>> page,String departId,
- List<String> userIdList);
-
- /**
- * 鏌ュ皻鏈垎閰嶇殑鏈儴闂ㄤ汉鍛�
- *
- * @param page
- * @param departId
- * @param userIdList
- * @return
- */
- Page<Map<String,Object>> getUserList (Page<Map<String,Object>> page,
- List<String> userIdList,
- String departId
- );
- /**
- * 鑾峰彇澶栧�熶汉鍛橀儴闂ㄦ爲
- *
- * @param enterpriseId
- * @param departId
- * @return
- */
- public List<SelectTreeModel> getDepartTreeByEnterpriseId(String enterpriseId,String departId,Integer version);
- /**
- * 鑾峰彇澶栧�熶汉鍛橀儴闂ㄦ爲
- * @param page
- * @param enterpriseId
- * @param userIdList
- * @return
- */
- Page<Map<String,Object>> listByEnterpriseId(Page<Map<String,Object>> page,
- String enterpriseId,
- List<String> userIdList,
- String departId);
-}
diff --git a/src/main/java/org/jeecg/modules/base/service/impl/ClientCategoryServiceImpl.java b/src/main/java/org/jeecg/modules/base/service/impl/ClientCategoryServiceImpl.java
deleted file mode 100644
index 3984e76..0000000
--- a/src/main/java/org/jeecg/modules/base/service/impl/ClientCategoryServiceImpl.java
+++ /dev/null
@@ -1,219 +0,0 @@
-package org.jeecg.modules.base.service.impl;
-
-import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.jeecg.common.api.vo.CommonGenericTree;
-import org.jeecg.common.constant.CommonConstant;
-import org.jeecg.modules.base.entity.ClientCategory;
-import org.jeecg.modules.base.mapper.ClientCategoryMapper;
-import org.jeecg.modules.base.service.IClientCategoryService;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @Description: mom_base_client_category
- * @Author: jeecg-boot
- * @Date: 2023-03-10
- * @Version: V1.0
- */
-@Service
-public class ClientCategoryServiceImpl extends ServiceImpl<ClientCategoryMapper, ClientCategory> implements IClientCategoryService {
- @Override
- public List<CommonGenericTree> loadTree() {
- List<ClientCategory> clientCategoryList = this.lambdaQuery().eq(ClientCategory::getDelFlag, CommonConstant.DEL_FLAG_0).list();
- List<CommonGenericTree> commonGenericTrees = loadTree(clientCategoryList);
- return commonGenericTrees;
- }
-
- @SuppressWarnings("unchecked")
- public List<CommonGenericTree> loadTree(List<ClientCategory> clientCategoryList) {
- @SuppressWarnings("unused")
- ClientCategory clientCategory = new ClientCategory();
- List<CommonGenericTree> list = new ArrayList<>();
- Map<String, CommonGenericTree> map = new HashMap<>();
- Map<String, CommonGenericTree> map2 = new HashMap<>();
- Map<String, CommonGenericTree> map3 = new HashMap<>();
- Map<String, CommonGenericTree> map4 = new HashMap<>();
- Map<String, CommonGenericTree> map5 = new HashMap<>();
- Map<String, CommonGenericTree> map6 = new HashMap<>();
- Map<String, CommonGenericTree> map7 = new HashMap<>();
- CommonGenericTree<ClientCategory> node = new CommonGenericTree<>();
- node.setKey("-1");
- node.setValue("-1");
- node.setTitle("瀹㈡埛鍒嗙被");
- node.setRField1("");
- node.setRField2("");
- node.setDisabled(false);
- node.setEntity(new ClientCategory());
- list.add(node);
- if (CollectionUtils.isNotEmpty(list)) {
- CommonGenericTree<ClientCategory> pcNode;
- for (ClientCategory projectType : clientCategoryList) {
- if (projectType.getParentId().equals("-1")) {
- pcNode = new CommonGenericTree<>();
- pcNode.setKey(projectType.getId());
- pcNode.setTitle(projectType.getNum() + "/" + projectType.getName());
- pcNode.setParentId(node.getKey());
- pcNode.setIcon("");
- pcNode.setType(0);
- pcNode.setValue(projectType.getId());
- pcNode.setDisabled(false);
- pcNode.setRField1(projectType.getNum());
- pcNode.setRField2(projectType.getName());
- pcNode.setEntity(projectType);
- node.addChildren(pcNode);
- map.put(projectType.getId(), pcNode);
- }
- }
- CommonGenericTree<ClientCategory> childNode;
- for (ClientCategory projectType : clientCategoryList) {
- if (map.containsKey(projectType.getParentId())) {
- pcNode = map.get(projectType.getParentId());
- childNode = new CommonGenericTree<>();
- childNode.setKey(projectType.getId());
- childNode.setTitle(projectType.getNum() + "/" + projectType.getName());
- childNode.setParentId(projectType.getParentId());
- childNode.setIcon("");
- childNode.setType(0);
- childNode.setValue(projectType.getId());
- childNode.setDisabled(false);
- childNode.setRField1(projectType.getNum());
- childNode.setRField2(projectType.getName());
- childNode.setEntity(projectType);
- pcNode.addChildren(childNode);
- map2.put(projectType.getId(), childNode);
- }
- }
- if (map2.size() > 0) {
- CommonGenericTree<ClientCategory> child2Node;
- for (ClientCategory projectType : clientCategoryList) {
- if (map2.containsKey(projectType.getParentId())) {
- pcNode = map2.get(projectType.getParentId());
- child2Node = new CommonGenericTree<>();
- child2Node.setKey(projectType.getId());
- child2Node.setTitle(projectType.getNum() + "/" + projectType.getName());
- child2Node.setParentId(projectType.getParentId());
- child2Node.setIcon("");
- child2Node.setType(0);
- child2Node.setValue(projectType.getId());
- child2Node.setDisabled(false);
- child2Node.setRField1(projectType.getNum());
- child2Node.setRField2(projectType.getName());
- child2Node.setEntity(projectType);
- pcNode.addChildren(child2Node);
- map3.put(projectType.getId(), child2Node);
- }
- }
- if (map3.size() > 0) {
- CommonGenericTree<ClientCategory> child3Node;
- for (ClientCategory projectType : clientCategoryList) {
- if (map3.containsKey(projectType.getParentId())) {
- pcNode = map3.get(projectType.getParentId());
- child3Node = new CommonGenericTree<>();
- child3Node.setKey(projectType.getId());
- child3Node.setTitle(projectType.getNum() + "/" + projectType.getName());
- child3Node.setParentId(projectType.getParentId());
- child3Node.setIcon("");
- child3Node.setType(0);
- child3Node.setValue(projectType.getId());
- child3Node.setDisabled(false);
- child3Node.setRField1(projectType.getNum());
- child3Node.setRField2(projectType.getName());
- child3Node.setEntity(projectType);
- pcNode.addChildren(child3Node);
- map4.put(projectType.getId(), child3Node);
- }
- }
- if (map4.size() > 0) {
- CommonGenericTree<ClientCategory> child4Node;
- for (ClientCategory projectType : clientCategoryList) {
- if (map4.containsKey(projectType.getParentId())) {
- pcNode = map4.get(projectType.getParentId());
- child4Node = new CommonGenericTree<>();
- child4Node.setKey(projectType.getId());
- child4Node.setTitle(projectType.getNum() + "/" + projectType.getName());
- child4Node.setParentId(projectType.getParentId());
- child4Node.setIcon("");
- child4Node.setType(0);
- child4Node.setValue(projectType.getId());
- child4Node.setDisabled(false);
- child4Node.setRField1(projectType.getNum());
- child4Node.setRField2(projectType.getName());
- child4Node.setEntity(projectType);
- pcNode.addChildren(child4Node);
- map5.put(projectType.getId(), child4Node);
- }
- }
- if (map5.size() > 0) {
- CommonGenericTree<ClientCategory> child5Node;
- for (ClientCategory projectType : clientCategoryList) {
- if (map5.containsKey(projectType.getParentId())) {
- pcNode = map5.get(projectType.getParentId());
- child5Node = new CommonGenericTree<>();
- child5Node.setKey(projectType.getId());
- child5Node.setTitle(projectType.getNum() + "/" + projectType.getName());
- child5Node.setParentId(projectType.getParentId());
- child5Node.setIcon("");
- child5Node.setType(0);
- child5Node.setValue(projectType.getId());
- child5Node.setDisabled(false);
- child5Node.setRField1(projectType.getNum());
- child5Node.setRField2(projectType.getName());
- child5Node.setEntity(projectType);
- pcNode.addChildren(child5Node);
- map6.put(projectType.getId(), child5Node);
- }
- }
- if (map6.size() > 0) {
- CommonGenericTree<ClientCategory> child6Node;
- for (ClientCategory projectType : clientCategoryList) {
- if (map6.containsKey(projectType.getParentId())) {
- pcNode = map6.get(projectType.getParentId());
- child6Node = new CommonGenericTree<>();
- child6Node.setKey(projectType.getId());
- child6Node.setTitle(projectType.getNum() + "/" + projectType.getName());
- child6Node.setParentId(projectType.getParentId());
- child6Node.setIcon("");
- child6Node.setType(0);
- child6Node.setValue(projectType.getId());
- child6Node.setDisabled(false);
- child6Node.setRField1(projectType.getNum());
- child6Node.setRField2(projectType.getName());
- child6Node.setEntity(projectType);
- pcNode.addChildren(child6Node);
- map7.put(projectType.getId(), child6Node);
- }
- }
- if (map7.size() > 0) {
- CommonGenericTree<ClientCategory> child7Node;
- for (ClientCategory projectType : clientCategoryList) {
- if (map.containsKey(projectType.getParentId())) {
- pcNode = map7.get(projectType.getParentId());
- child7Node = new CommonGenericTree<>();
- child7Node.setKey(projectType.getId());
- child7Node.setTitle(projectType.getNum() + "/" + projectType.getName());
- child7Node.setParentId(projectType.getParentId());
- child7Node.setIcon("");
- child7Node.setType(0);
- child7Node.setValue(projectType.getId());
- child7Node.setDisabled(false);
- child7Node.setRField1(projectType.getNum());
- child7Node.setRField2(projectType.getName());
- child7Node.setEntity(projectType);
-
- }
- }
- }
- }
- }
- }
- }
- }
- }
- return list;
- }
-}
diff --git a/src/main/java/org/jeecg/modules/base/service/impl/ClientContactServiceImpl.java b/src/main/java/org/jeecg/modules/base/service/impl/ClientContactServiceImpl.java
deleted file mode 100644
index 8143eaf..0000000
--- a/src/main/java/org/jeecg/modules/base/service/impl/ClientContactServiceImpl.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.jeecg.modules.base.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.jeecg.modules.base.entity.ClientContact;
-import org.jeecg.modules.base.mapper.ClientContactMapper;
-import org.jeecg.modules.base.service.IClientContactService;
-import org.springframework.stereotype.Service;
-
-/**
- * @Description: mom_base_supplier
- * @Author: jeecg-boot
- * @Date: 2023-03-10
- * @Version: V1.0
- */
-@Service
-public class ClientContactServiceImpl extends ServiceImpl<ClientContactMapper, ClientContact> implements IClientContactService {
-
-}
diff --git a/src/main/java/org/jeecg/modules/base/service/impl/ClientServiceImpl.java b/src/main/java/org/jeecg/modules/base/service/impl/ClientServiceImpl.java
deleted file mode 100644
index e7d13f8..0000000
--- a/src/main/java/org/jeecg/modules/base/service/impl/ClientServiceImpl.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.jeecg.modules.base.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.jeecg.modules.base.entity.Client;
-import org.jeecg.modules.base.mapper.ClientMapper;
-import org.jeecg.modules.base.service.IClientService;
-import org.springframework.stereotype.Service;
-
-/**
- * @Description: 瀹㈡埛
- * @Author: jeecg-boot
- * @Date: 2023-03-10
- * @Version: V1.0
- */
-@Service
-public class ClientServiceImpl extends ServiceImpl<ClientMapper, Client> implements IClientService {
-
-}
diff --git a/src/main/java/org/jeecg/modules/base/service/impl/ConstructorServiceImpl.java b/src/main/java/org/jeecg/modules/base/service/impl/ConstructorServiceImpl.java
deleted file mode 100644
index 8763421..0000000
--- a/src/main/java/org/jeecg/modules/base/service/impl/ConstructorServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package org.jeecg.modules.base.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.jeecg.modules.base.entity.Constructor;
-import org.jeecg.modules.base.mapper.ConstructorMapper;
-import org.jeecg.modules.base.service.IConstructorService;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-
-
-@Service
-public class ConstructorServiceImpl extends ServiceImpl<ConstructorMapper, Constructor> implements IConstructorService {
- @Resource
- private ConstructorMapper constructorMapper;
- @Override
- public Constructor getByName(String name) {
- return constructorMapper.getByName(name);
- }
-}
diff --git a/src/main/java/org/jeecg/modules/base/service/impl/EncodeRuleServiceDetailImpl.java b/src/main/java/org/jeecg/modules/base/service/impl/EncodeRuleServiceDetailImpl.java
index 31c1a73..d2ce490 100644
--- a/src/main/java/org/jeecg/modules/base/service/impl/EncodeRuleServiceDetailImpl.java
+++ b/src/main/java/org/jeecg/modules/base/service/impl/EncodeRuleServiceDetailImpl.java
@@ -3,7 +3,6 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.jeecg.modules.base.entity.EncodeRuleDetail;
import org.jeecg.modules.base.mapper.EncodeRuleDetailMapper;
-import org.jeecg.modules.base.mapper.EnterpriseAdministratorMapper;
import org.jeecg.modules.base.service.IEncodeRuleDetailService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
diff --git a/src/main/java/org/jeecg/modules/base/service/impl/EnterpriseAdministratorServiceImpl.java b/src/main/java/org/jeecg/modules/base/service/impl/EnterpriseAdministratorServiceImpl.java
deleted file mode 100644
index 959bbb1..0000000
--- a/src/main/java/org/jeecg/modules/base/service/impl/EnterpriseAdministratorServiceImpl.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package org.jeecg.modules.base.service.impl;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.jeecg.modules.base.entity.EnterpriseAdministrator;
-import org.jeecg.modules.base.mapper.EnterpriseAdministratorMapper;
-import org.jeecg.modules.base.service.IEnterpriseAdministratorService;
-import org.springframework.stereotype.Service;
-import java.util.List;
-import java.util.Map;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.beans.factory.annotation.Autowired;
-
-/**
- * @Description: mom_base_enterprise_administrator
- * @Author: jeecg-boot
- * @Date: 2023-01-12
- * @Version: V1.0
- */
-@Service
-public class EnterpriseAdministratorServiceImpl extends ServiceImpl<EnterpriseAdministratorMapper, EnterpriseAdministrator> implements IEnterpriseAdministratorService {
-
- @Autowired
- private EnterpriseAdministratorMapper enterpriseAdministratorMapper;
-
- @Override
- public List<EnterpriseAdministrator> selectByMainId(String mainId) {
- return enterpriseAdministratorMapper.selectByMainId(mainId);
- }
-
- @Override
- public Page<Map<String, Object>> mapList(Page<Map<String, Object>> page, String mainId, String enterpriseId) {
- return page.setRecords(enterpriseAdministratorMapper.mapList(page,mainId,enterpriseId));
- }
-}
diff --git a/src/main/java/org/jeecg/modules/base/service/impl/EnterpriseServiceImpl.java b/src/main/java/org/jeecg/modules/base/service/impl/EnterpriseServiceImpl.java
deleted file mode 100644
index a297f68..0000000
--- a/src/main/java/org/jeecg/modules/base/service/impl/EnterpriseServiceImpl.java
+++ /dev/null
@@ -1,119 +0,0 @@
-package org.jeecg.modules.base.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-import com.baomidou.mybatisplus.core.toolkit.StringUtils;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import net.sf.saxon.expr.Component;
-import org.jeecg.common.system.vo.SelectTreeModel;
-import org.jeecg.modules.base.entity.Enterprise;
-import org.jeecg.modules.base.mapper.EnterpriseMapper;
-import org.jeecg.modules.base.service.IEnterpriseService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.*;
-import java.util.concurrent.CopyOnWriteArrayList;
-import java.util.stream.Collectors;
-
-/**
- * @Description: 浼佷笟鏋舵瀯
- * @Author: jeecg-boot
- * @Date: 2022-11-21
- * @Version: V1.0
- */
-@Service
-@Transactional
-public class EnterpriseServiceImpl extends ServiceImpl<EnterpriseMapper, Enterprise> implements IEnterpriseService {
-
- @Autowired
- private EnterpriseMapper enterpriseMapper;
- @Override
- public List<SelectTreeModel> getEnterpriseVersionTree(String pid,Integer version) {
- List<SelectTreeModel> list = baseMapper.getEnterpriseVersionTree(pid,version)
- .stream().sorted((e1,e2)->{
- Integer subfix1 = Integer.parseInt(e1.getValue().substring(e1.getValue().lastIndexOf(".")+1));
- Integer subfix2 = Integer.parseInt(e2.getValue().substring(e2.getValue().lastIndexOf(".")+1));
- return Integer.compare(subfix1,subfix2);
- }).collect(Collectors.toList());
- if(CollectionUtils.isNotEmpty(list)) {
- for (SelectTreeModel selectTreeModel : list) {
- selectTreeModel.setChildren(getEnterpriseVersionTree(selectTreeModel.getKey(),version));
- }
- }
- return list;
- }
-
- @Override
- public Page<Map<String,Object>> getEnterpriseListByPid(Page<Map<String,Object>> page,Integer version,String parentId) {
- return page.setRecords(baseMapper.getEnterpriseListByIds(page,version,parentId));
- }
-
- @Override
- public List<Map<String, Object>> getEnterprise() {
- return baseMapper.getEnterpriseList();
- }
-
- @Override
- public Set<Integer> getAllVersion() {
- Set<Integer> set = new TreeSet<Integer>(Comparator.reverseOrder());
- set.addAll(enterpriseMapper.getAllVersion());
- return set;
- }
- @Override
- public Integer getInitVersion() {
- List<Integer> usableVersionList = baseMapper.getUsableVersion();
- Set<Integer> allVersionList = getAllVersion();
- if(CollectionUtils.isNotEmpty(usableVersionList)){
- return usableVersionList.get(0);
- }else if(CollectionUtils.isNotEmpty(allVersionList)){
- return allVersionList.stream().findFirst().get();
- }
- return null;
- }
-
- @Override
- public List<Enterprise> getLastUsableList() {
- return baseMapper.getLastUsableList();
- }
-
- @Override
- public List<Enterprise> getUsableList() {
- return baseMapper.getUsableList();
- }
-
- @Override
- public Map<String, Object> getNowAndLastUsableVersion() {
- List<Enterprise> usableList = baseMapper.getUsableList();
- List<Enterprise> lastUsableList = baseMapper.getLastUsableList();
- Map<String,Object> map = new HashMap<>(2);
- if(CollectionUtils.isNotEmpty(usableList)){
- map.put("usableVersion",usableList.get(0).getVersion());
- }
- if(CollectionUtils.isNotEmpty(lastUsableList)){
- map.put("lastUsableVersion",lastUsableList.get(0).getVersion());
- }
- return map;
- }
-
- @Override
- public List<String> getUsableIdList() {
- return enterpriseMapper.getUsableIdList();
- }
-
- public List<String> getAllChild(String parentId){
- List<String> list =enterpriseMapper.getAllChildrenIdByParentId(parentId);
- List<String> child = new ArrayList<>();
- if(CollectionUtils.isNotEmpty(list)){
- list.forEach(str->{
- child.add(str);
- child.addAll(getAllChild(str));
- });
- }
- return child;
- }
-
-}
diff --git a/src/main/java/org/jeecg/modules/base/service/impl/FactoryElementCategoryServiceImpl.java b/src/main/java/org/jeecg/modules/base/service/impl/FactoryElementCategoryServiceImpl.java
deleted file mode 100644
index ca07a63..0000000
--- a/src/main/java/org/jeecg/modules/base/service/impl/FactoryElementCategoryServiceImpl.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.jeecg.modules.base.service.impl;
-
-import org.jeecg.modules.base.entity.FactoryElementCategory;
-import org.jeecg.modules.base.mapper.FactoryElementCategoryMapper;
-import org.jeecg.modules.base.service.IFactoryElementCategoryService;
-import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-/**
- * @Description: 宸ュ巶瑕佺礌绫诲瀷
- * @Author: jeecg-boot
- * @Date: 2022-11-07
- * @Version: V1.0
- */
-@Service
-public class FactoryElementCategoryServiceImpl extends ServiceImpl<FactoryElementCategoryMapper, FactoryElementCategory> implements IFactoryElementCategoryService {
-
-}
diff --git a/src/main/java/org/jeecg/modules/base/service/impl/FactoryModelServiceImpl.java b/src/main/java/org/jeecg/modules/base/service/impl/FactoryModelServiceImpl.java
deleted file mode 100644
index c0021f8..0000000
--- a/src/main/java/org/jeecg/modules/base/service/impl/FactoryModelServiceImpl.java
+++ /dev/null
@@ -1,147 +0,0 @@
-package org.jeecg.modules.base.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.jeecg.common.system.vo.SelectTreeModel;
-import org.jeecg.modules.base.entity.FactoryModel;
-import org.jeecg.modules.base.entity.FactoryModelDetail;
-import org.jeecg.modules.base.mapper.FactoryModelMapper;
-import org.jeecg.modules.base.service.IFactoryModelService;
-import org.jeecg.modules.system.entity.SysDepart;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.*;
-import java.util.concurrent.CopyOnWriteArrayList;
-import java.util.stream.Collectors;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-/**
- * @Description: 宸ュ巶寤烘ā
- * @Author: jeecg-boot
- * @Date: 2022-11-08
- * @Version: V1.0
- */
-@Service
-@Transactional
-public class FactoryModelServiceImpl extends ServiceImpl<FactoryModelMapper, FactoryModel> implements IFactoryModelService {
- @Autowired
- private FactoryModelMapper factoryModelMapper;
-
- @Override
- public List<SelectTreeModel> loadTree(String enterpriseId,Integer version) {
- List<SelectTreeModel> list = baseMapper.loadTreeByEnterpriseIdAndVersion(enterpriseId,version).stream().sorted((e1,e2)->{
- Integer subfix1 = Integer.parseInt(e1.getValue().substring(e1.getValue().lastIndexOf(".")+1));
- Integer subfix2 = Integer.parseInt(e2.getValue().substring(e2.getValue().lastIndexOf(".")+1));
- return Integer.compare(subfix1,subfix2);
- }).collect(Collectors.toList());
- if(CollectionUtils.isNotEmpty(list)){
- for(SelectTreeModel selectTreeModel:list){
- selectTreeModel.setChildren(loadTree(selectTreeModel.getKey(),version));
- }
- }
- return list;
- }
-
- @Override
- public Page<Map<String, Object>> getFactoryList(Page<Map<String,Object>> page,
- Integer version,
- String parentId,
- List<String> ids
- ) {
-// List<String> list = getAllChild(parentId);
-// list.add("-1");
- return page.setRecords(baseMapper.getFactoryList(page,version,parentId,ids));
- }
-
- @Override
- public List<SysDepart> getDepartList() {
- return baseMapper.getDepartList();
- }
-
- @Override//鏍规嵁鐢ㄦ埛id鏌ヤ紒涓歩d
- public String getEidByUid(String uid) {
- return baseMapper.selectEnterpriseIdByUid(uid);
- }
-
- @Override
- public List<FactoryModelDetail> getListByEid(String eid) {
- return baseMapper.getListByEid(eid);
- }
-
- @Override
- public Set<Integer> getVersionList() {
- Set<Integer> set = new TreeSet<Integer>(Comparator.reverseOrder());
- set.addAll(baseMapper.getAllVersion());
- return set;
- }
- @Override
- public List<FactoryModel> getLastUsableList(List<String> parentIds) {
- return baseMapper.getLastUsableList(parentIds);
- }
-
- @Override
- public List<FactoryModel> getUsableList(List<String> parentIds) {
- return baseMapper.getUsableList(parentIds);
- }
-
- @Override
- public Map<String, Object> getNowAndLastUsableVersion() {
- List<Integer> usableList = baseMapper.getUsableVersion();
- List<Integer> lastUsableList = baseMapper.getLastUsableVersion();
- Map<String,Object> map = new HashMap<>(2);
- if(CollectionUtils.isNotEmpty(usableList)){
- map.put("usableVersion",usableList.get(0));
- }
- if(CollectionUtils.isNotEmpty(lastUsableList)){
- map.put("lastUsableVersion",lastUsableList.get(0));
- }
- return map;
- }
- @Override
- public Integer getInitVersion() {
- List<Integer> usableVersionList = baseMapper.getUsableVersion();
- Set<Integer> allVersionList = getVersionList();
- if(CollectionUtils.isNotEmpty(usableVersionList)){
- return usableVersionList.get(0);
- }else if(CollectionUtils.isNotEmpty(allVersionList)){
- return allVersionList.stream().findFirst().get();
- }
- return null;
- }
- public List<String> getAllChild(String parentId){
- List<String> list = baseMapper.getAllChildrenIdByParentId(parentId);
- List<String> child = new ArrayList<>();
- if(CollectionUtils.isNotEmpty(list)){
- list.forEach(str->{
- child.add(str);
- child.addAll(getAllChild(str));
- });
- }
- return child;
- }
- @Override
- public List<FactoryModel> getAllDepartByPid(Integer version) {
- return baseMapper.selectList(new QueryWrapper<FactoryModel>()
- .eq("version",version)
- .eq("del_flag",0));
- }
-
- @Override
- public List<String> getVersionStatusByVersion(Integer version) {
- return baseMapper.getVersionStatusByVersion(version);
- }
-
- @Override
- public List<Map<String,Object>> getUsableWorkShopList() {
- return baseMapper.getUsableWorkShopList();
- }
-
- @Override
- public List<Integer> getUsableVersion() {
- return baseMapper.getUsableVersion();
- }
-}
diff --git a/src/main/java/org/jeecg/modules/base/service/impl/FactoryServiceImpl.java b/src/main/java/org/jeecg/modules/base/service/impl/FactoryServiceImpl.java
new file mode 100644
index 0000000..049a30c
--- /dev/null
+++ b/src/main/java/org/jeecg/modules/base/service/impl/FactoryServiceImpl.java
@@ -0,0 +1,201 @@
+package org.jeecg.modules.base.service.impl;
+
+import cn.hutool.core.collection.CollectionUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+import org.apache.commons.lang3.StringUtils;
+import org.jeecg.common.constant.CommonConstant;
+import org.jeecg.common.constant.FillRuleConstant;
+import org.jeecg.common.util.FillRuleUtil;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.base.entity.Factory;
+import org.jeecg.modules.base.entity.UserFactory;
+import org.jeecg.modules.base.mapper.FactoryMapper;
+import org.jeecg.modules.base.mapper.UserFactoryMapper;
+import org.jeecg.modules.base.model.FactoryIdModel;
+import org.jeecg.modules.base.model.FactoryTreeModel;
+import org.jeecg.modules.base.service.IFactoryService;
+import org.jeecg.modules.system.mapper.SysUserMapper;
+import org.jeecg.modules.system.util.FindsProductionsChildrenUtil;
+import org.springframework.cache.annotation.Cacheable;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Description: 宸ュ巶/杞﹂棿/浜х嚎
+ * @Author: jeecg-boot
+ * @Date: 2025-06-24
+ * @Version: V1.0
+ */
+@Service
+public class FactoryServiceImpl extends ServiceImpl<FactoryMapper, Factory> implements IFactoryService {
+
+ @Resource
+ private SysUserMapper sysUserMapper;
+
+ @Resource
+ private UserFactoryMapper userFactoryMapper;
+
+ /**
+ * saveFactoryData 瀵瑰簲 add 淇濆瓨鐢ㄦ埛鍦ㄩ〉闈㈡坊鍔犵殑鏂扮殑浜х嚎瀵硅薄鏁版嵁
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void saveFactoryData(Factory factory) {
+ if (factory != null) {
+ if (factory.getParentId() == null) {
+ factory.setParentId("");
+ }
+ factory.setId(IdWorker.getIdStr(factory));
+ // 鍏堝垽鏂瀵硅薄鏈夋棤鐖剁骇ID,鏈夊垯鎰忓懗鐫�涓嶆槸鏈�楂樼骇,鍚﹀垯鎰忓懗鐫�鏄渶楂樼骇
+ // 鑾峰彇鐖剁骇ID
+ String parentId = factory.getParentId();
+ JSONObject formData = new JSONObject();
+ formData.put("parentId",parentId);
+ String factoryCategory = "";
+ if(StringUtils.isBlank(parentId)){
+ factoryCategory = "1";
+ }else {
+ // 鏌ヨ鍑虹埗绾т骇绾�
+ Factory parentFactory = super.getById(parentId);
+ // 鏍规嵁鐖剁骇浜х嚎绫诲瀷绠楀嚭褰撳墠浜х嚎鐨勭被鍨�
+ factoryCategory = String.valueOf(Integer.valueOf(parentFactory.getFactoryCategory()) + 1);
+ }
+ factory.setFactoryCategory(factoryCategory);
+ factory.setDelFlag(CommonConstant.DEL_FLAG_0);
+ this.save(factory);
+
+ //澶勭悊瀛樺湪鐖跺瓙鍏崇郴 mdc鏍囪缁熶竴鐨勯棶棰�
+ //1.mdc鏍囪 涓� 1 寮�鍚� 鐖剁骇鑺傜偣瑕佺粺涓�寮�鍚�
+ //2.mdc鏍囪 涓� 0 鍏抽棴 瀛愮骇鑺傜偣瑕佺粺涓�鍏抽棴 鏂板鎿嶄綔 涓嶅瓨鍦ㄦ鎯呭喌
+ if(StringUtils.isNotBlank(parentId) && CommonConstant.DEFAULT_1.equals(factory.getMdcFlag())){
+ openParentMdcFlag(parentId);
+ }
+ }
+ }
+
+ /**
+ * queryTreeList 瀵瑰簲 queryTreeList 鏌ヨ鎵�鏈夌殑浜х嚎鏁版嵁,浠ユ爲缁撴瀯褰㈠紡鍝嶅簲缁欏墠绔�
+ */
+ @Override
+ //@Cacheable(value = "mdc:cache:production:alldata")
+ public List<FactoryTreeModel> queryTreeList() {
+ LambdaQueryWrapper<Factory> query = new LambdaQueryWrapper<Factory>();
+ query.eq(Factory::getDelFlag, CommonConstant.DEL_FLAG_0.toString());
+ query.orderByAsc(Factory::getSorter);
+ List<Factory> list = this.list(query);
+ //璋冪敤wrapTreeDataToTreeList鏂规硶鐢熸垚鏍戠姸鏁版嵁
+ return FindsProductionsChildrenUtil.wrapTreeDataToTreeList(list);
+ }
+
+ /**
+ * queryTreeList 鏍规嵁浜х嚎id鏌ヨ,鍓嶇鍥炴樉璋冪敤
+ */
+ @Override
+ public List<FactoryTreeModel> queryTreeList(String ids) {
+ List<FactoryTreeModel> listResult = new ArrayList<>();
+ LambdaQueryWrapper<Factory> query = new LambdaQueryWrapper<Factory>();
+ query.eq(Factory::getDelFlag, CommonConstant.DEL_FLAG_0.toString());
+ if (oConvertUtils.isNotEmpty(ids)) {
+ query.in(true, Factory::getId, ids.split(","));
+ }
+ query.orderByAsc(Factory::getSorter);
+ List<Factory> list = this.list(query);
+ for (Factory factory : list) {
+ if (factory.getRemark().isEmpty()){
+ factory.setRemark("");
+ }
+ listResult.add(new FactoryTreeModel(factory));
+ }
+ return listResult;
+ }
+
+ /**
+ * 鏍规嵁浜х嚎id鍒犻櫎骞跺垹闄ゅ叾鍙兘瀛樺湪鐨勫瓙绾т骇绾�
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public boolean delete(String id) {
+ List<String> idList = new ArrayList<>();
+ idList.add(id);
+ this.checkChildrenExists(id, idList);
+ boolean result = this.removeByIds(idList);
+ //鏍规嵁浜х嚎id鍒犻櫎鐢ㄦ埛涓庝骇绾垮叧绯�
+ userFactoryMapper.delete(new LambdaQueryWrapper<UserFactory>().in(UserFactory::getFactoryId, idList));
+ //鏍规嵁浜х嚎id鍒犻櫎浜х嚎涓庤澶囧叧绯�
+ //productionEquipmentMapper.delete(new LambdaQueryWrapper<MdcProductionEquipment>().in(MdcProductionEquipment::getProductionId, idList));
+ return result;
+ }
+
+ /**
+ * delete 鏂规硶璋冪敤 閫掑綊鏌ユ壘瀛愰泦id
+ */
+ private void checkChildrenExists(String id, List<String> idList) {
+ LambdaQueryWrapper<Factory> query = new LambdaQueryWrapper<>();
+ query.eq(Factory::getParentId, id);
+ List<Factory> factoryList = this.list(query);
+ if (factoryList != null && !factoryList.isEmpty()) {
+ for (Factory factory : factoryList) {
+ idList.add(factory.getId());
+ this.checkChildrenExists(factory.getId(), idList);
+ }
+ }
+ }
+
+ @Override
+ //@Cacheable(value = "mdc:cache:production:allids")
+ public List<FactoryIdModel> queryFactoryIdTreeList() {
+ LambdaQueryWrapper<Factory> query = new LambdaQueryWrapper<>();
+ query.eq(Factory::getDelFlag, CommonConstant.DEL_FLAG_0.toString());
+ query.orderByAsc(Factory::getSorter);
+ List<Factory> list = this.list(query);
+ //璋冪敤wrapTreeDataToTreeList鏂规硶鐢熸垚鏍戠姸鏁版嵁
+ return FindsProductionsChildrenUtil.wrapTreeDataToProductionIdTreeList(list);
+ }
+
+ /**
+ * 鎵撳紑 鐖惰妭鐐� 鍙� 浠ヤ笂鐨刴dc鏍囪
+ * @param parentId
+ */
+ private void openParentMdcFlag(String parentId) {
+ List<String> listParentTree = findParentIdsForFactory(parentId, new ArrayList<>());
+ if (!CollectionUtil.isEmpty(listParentTree)) {
+ UpdateWrapper<Factory> updateWrapper = new UpdateWrapper<>();
+ updateWrapper.in("id", listParentTree);
+ updateWrapper.set("mdc_flag", "1");
+ super.update(updateWrapper);
+ }
+ }
+
+ public List<String> findParentIdsForFactory(String parentId, List<String> idList) {
+ if (StringUtils.isEmpty(parentId)) {
+ return null;
+ }
+ if (idList == null || idList.isEmpty()) {
+ idList = new ArrayList<>();
+ }
+ boolean p = true;
+ if (p) {
+ Factory en = super.getById(parentId);
+ if (en != null) {
+ idList.add(0, en.getId());
+ }
+ if (StringUtils.isNotBlank(en.getParentId())) {
+ parentId = en.getParentId();
+ findParentIdsForFactory(parentId, idList);
+ } else {
+ p = false;
+ return idList;
+ }
+ }
+ return idList;
+ }
+}
diff --git a/src/main/java/org/jeecg/modules/base/service/impl/LineSideWarehouseServiceImpl.java b/src/main/java/org/jeecg/modules/base/service/impl/LineSideWarehouseServiceImpl.java
new file mode 100644
index 0000000..a430910
--- /dev/null
+++ b/src/main/java/org/jeecg/modules/base/service/impl/LineSideWarehouseServiceImpl.java
@@ -0,0 +1,19 @@
+package org.jeecg.modules.base.service.impl;
+
+import org.jeecg.modules.base.entity.LineSideWarehouse;
+import org.jeecg.modules.base.mapper.LineSideWarehouseMapper;
+import org.jeecg.modules.base.service.ILineSideWarehouseService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 绾胯竟浠撳簱淇℃伅
+ * @Author: jeecg-boot
+ * @Date: 2025-06-24
+ * @Version: V1.0
+ */
+@Service
+public class LineSideWarehouseServiceImpl extends ServiceImpl<LineSideWarehouseMapper, LineSideWarehouse> implements ILineSideWarehouseService {
+
+}
diff --git a/src/main/java/org/jeecg/modules/base/service/impl/MaterialCategoryImpl.java b/src/main/java/org/jeecg/modules/base/service/impl/MaterialCategoryImpl.java
deleted file mode 100644
index 356797b..0000000
--- a/src/main/java/org/jeecg/modules/base/service/impl/MaterialCategoryImpl.java
+++ /dev/null
@@ -1,112 +0,0 @@
-package org.jeecg.modules.base.service.impl;
-
-import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.jeecg.common.constant.CommonConstant;
-import org.jeecg.common.system.vo.SelectTreeModel;
-import org.jeecg.modules.base.entity.Enterprise;
-import org.jeecg.modules.base.entity.MaterialCategory;
-import org.jeecg.modules.base.mapper.MaterialCategoryMapper;
-import org.jeecg.modules.base.service.IMaterialCategoryService;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.*;
-import java.util.stream.Collectors;
-
-/**
- * @Description: 鐗╂枡鍒嗙被
- * @Author: jeecg-boot
- * @Date: 2023-04-20
- * @Version: V1.0
- */
-@Service
-@Transactional
-public class MaterialCategoryImpl extends ServiceImpl<MaterialCategoryMapper, MaterialCategory> implements IMaterialCategoryService {
-
- /**
- * 鑾峰彇鐗堟湰鏍�
- *
- * @param pid
- * @param version
- * @return
- */
- @Override
- public List<SelectTreeModel> getMaterialCategoryVersionTree(String pid, Integer version) {
- List<SelectTreeModel> list = baseMapper.getMaterialCategoryVersionTree(pid, version)
- .stream().sorted((e1, e2) -> {
- Integer subfix1 = Integer.parseInt(e1.getValue().substring(e1.getValue().lastIndexOf(".") + 1));
- Integer subfix2 = Integer.parseInt(e2.getValue().substring(e2.getValue().lastIndexOf(".") + 1));
- return Integer.compare(subfix1, subfix2);
- }).collect(Collectors.toList());
- if (CollectionUtils.isNotEmpty(list)) {
- for (SelectTreeModel selectTreeModel : list) {
- selectTreeModel.setChildren(getMaterialCategoryVersionTree(selectTreeModel.getKey(), version));
- }
- }
- return list;
- }
-
- /**
- * 鏍规嵁鐖禝d鑾峰彇瀛╁瓙鍒楄〃
- *
- * @param page
- * @param parentId
- * @param version
- * @return
- */
- @Override
- public Page<Map<String, Object>> getMaterialCategoryListByPid(Page<Map<String, Object>> page, Integer version, String parentId) {
- return page.setRecords(baseMapper.getMaterialCategoryListByIds(page, version, parentId));
- }
-
- /**
- * 鑾峰彇鎵�鏈夌増鏈�
- *
- * @return
- */
- @Override
- public Set<Integer> getAllVersion() {
- Set<Integer> set = new TreeSet<>(Comparator.reverseOrder());
- set.addAll(baseMapper.getAllVersion());
- return set;
- }
-
- @Override
- public Integer getInitVersion() {
- Set<Integer> allVersionList = getAllVersion();
- List<Integer> usableVersionList = baseMapper.getUsableVersion();
- if (CollectionUtils.isNotEmpty(usableVersionList)) {
- return usableVersionList.get(0);
- } else if (CollectionUtils.isNotEmpty(allVersionList)) {
- return allVersionList.stream().findFirst().get();
- }
- return null;
- }
-
- @Override
- public Map<String, Object> getNowAndLastUsableVersion() {
- List<MaterialCategory> usableList = baseMapper.getUsableList();
- List<MaterialCategory> lastUsableList = baseMapper.getLastUsableList();
- Map<String, Object> map = new HashMap<>(2);
- if (CollectionUtils.isNotEmpty(usableList)) {
- map.put("usableVersion", usableList.get(0).getVersion());
- }
- if (CollectionUtils.isNotEmpty(lastUsableList)) {
- map.put("lastUsableVersion", lastUsableList.get(0).getVersion());
- }
- return map;
- }
-
- @Override
- public List<MaterialCategory> getUsableList() {
- return baseMapper.getUsableList();
- }
-
- @Override
- public List<MaterialCategory> getLastUsableList() {
- return baseMapper.getLastUsableList();
- }
-}
diff --git a/src/main/java/org/jeecg/modules/base/service/impl/MaterialServiceImpl.java b/src/main/java/org/jeecg/modules/base/service/impl/MaterialServiceImpl.java
deleted file mode 100644
index 3dd61bd..0000000
--- a/src/main/java/org/jeecg/modules/base/service/impl/MaterialServiceImpl.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.jeecg.modules.base.service.impl;
-
-import org.jeecg.modules.base.entity.Material;
-import org.jeecg.modules.base.mapper.MaterialMapper;
-import org.jeecg.modules.base.service.IMaterialService;
-import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-/**
- * @Description: 鐗╂枡琛�
- * @Author: jeecg-boot
- * @Date: 2023-04-28
- * @Version: V1.0
- */
-@Service
-public class MaterialServiceImpl extends ServiceImpl<MaterialMapper, Material> implements IMaterialService {
-
-}
diff --git a/src/main/java/org/jeecg/modules/base/service/impl/ProductionLineWarehouseClientServiceImpl.java b/src/main/java/org/jeecg/modules/base/service/impl/ProductionLineWarehouseClientServiceImpl.java
deleted file mode 100644
index 5867e50..0000000
--- a/src/main/java/org/jeecg/modules/base/service/impl/ProductionLineWarehouseClientServiceImpl.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package org.jeecg.modules.base.service.impl;
-
-import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.jeecg.modules.base.entity.ProductionLineWarehouseClient;
-import org.jeecg.modules.base.mapper.FactoryModelMapper;
-import org.jeecg.modules.base.mapper.ProductionLineWarehouseClientMapper;
-import org.jeecg.modules.base.service.IProductionLineWarehouseClientService;
-import org.springframework.stereotype.Service;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.CopyOnWriteArrayList;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.beans.factory.annotation.Autowired;
-
-/**
- * @Description: 绾胯竟搴撴湇鍔″璞�
- * @Author: jeecg-boot
- * @Date: 2023-01-28
- * @Version: V1.0
- */
-@Service
-public class ProductionLineWarehouseClientServiceImpl extends ServiceImpl<ProductionLineWarehouseClientMapper, ProductionLineWarehouseClient> implements IProductionLineWarehouseClientService {
-
- @Autowired
- private ProductionLineWarehouseClientMapper productionLineWarehouseClientMapper;
- @Autowired
- private FactoryModelMapper factoryModelMapper;
-
- @Override
- public List<ProductionLineWarehouseClient> selectByMainId(String mainId) {
- return productionLineWarehouseClientMapper.selectByMainId(mainId);
- }
-
- @Override
- public Page<Map<String, Object>> getFactoryList(Page<Map<String, Object>> page, Integer version, String parentId, List<String> ids) {
- return page.setRecords(baseMapper.getFactoryList(page,version,getAllChild(parentId),ids));
- }
- public List<String> getAllChild(String parentId){
- List<String> list = factoryModelMapper.getAllChildrenIdByParentId(parentId);
- CopyOnWriteArrayList<String> cowList = new CopyOnWriteArrayList<>();
- cowList.addAll(list);
- if(CollectionUtils.isNotEmpty(cowList)){
- cowList.forEach(str->{
- cowList.addAll(getAllChild(str));
- });
- }
- cowList.add(parentId);
- return cowList;
- }
-}
diff --git a/src/main/java/org/jeecg/modules/base/service/impl/ProductionLineWarehouseServiceImpl.java b/src/main/java/org/jeecg/modules/base/service/impl/ProductionLineWarehouseServiceImpl.java
deleted file mode 100644
index 1ffad8f..0000000
--- a/src/main/java/org/jeecg/modules/base/service/impl/ProductionLineWarehouseServiceImpl.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package org.jeecg.modules.base.service.impl;
-
-import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.jeecg.modules.base.entity.ProductionLineWarehouse;
-import org.jeecg.modules.base.entity.Warehouse;
-import org.jeecg.modules.base.mapper.ProductionLineWarehouseClientMapper;
-import org.jeecg.modules.base.mapper.ProductionLineWarehouseMapper;
-import org.jeecg.modules.base.service.IProductionLineWarehouseService;
-import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
-import java.io.Serializable;
-import java.util.*;
-
-/**
- * @Description: 绾胯竟搴撶鐞�
- * @Author: jeecg-boot
- * @Date: 2023-01-28
- * @Version: V1.0
- */
-@Service
-public class ProductionLineWarehouseServiceImpl extends ServiceImpl<ProductionLineWarehouseMapper, ProductionLineWarehouse> implements IProductionLineWarehouseService {
-
- @Autowired
- private ProductionLineWarehouseMapper productionLineWarehouseMapper;
- @Autowired
- private ProductionLineWarehouseClientMapper productionLineWarehouseClientMapper;
-
- @Override
- public Integer getInitVersion() {
- List<ProductionLineWarehouse> usableVersionList = productionLineWarehouseMapper.getUsableList();
- Set<Integer> allVersionList = getVersionList();
- if(CollectionUtils.isNotEmpty(usableVersionList)){
- return usableVersionList.get(0).getVersion();
- }else if(CollectionUtils.isNotEmpty(allVersionList)){
- return allVersionList.stream().findFirst().get();
- }
- return null;
- }
-
- @Override
- public Page<Map<String, Object>> getWarehouseList(Page<Map<String, Object>> page, Integer version, String workshopId) {
- return page.setRecords(productionLineWarehouseMapper.getWarehouseList(page,version,workshopId));
- }
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void delMain(String id) {
- productionLineWarehouseClientMapper.deleteByMainId(id);
- productionLineWarehouseMapper.deleteById(id);
- }
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void delBatchMain(Collection<? extends Serializable> idList) {
- for(Serializable id:idList) {
- productionLineWarehouseClientMapper.deleteByMainId(id.toString());
- productionLineWarehouseMapper.deleteById(id);
- }
- }
-
- @Override
- public Set<Integer> getVersionList() {
- Set<Integer> set = new TreeSet<Integer>(Comparator.reverseOrder());
- set.addAll(productionLineWarehouseMapper.getAllVersion());
- return set;
- }
-
- @Override
- public List<ProductionLineWarehouse> getLastUsableList() {
- return productionLineWarehouseMapper.getLastUsableList();
- }
-
- @Override
- public List<ProductionLineWarehouse> getUsableList() {
- return productionLineWarehouseMapper.getUsableList();
- }
-
- @Override
- public Map<String, Object> getNowAndLastUsableVersion() {
- List<ProductionLineWarehouse> usableList = productionLineWarehouseMapper.getUsableList();
- List<ProductionLineWarehouse> lastUsableList = productionLineWarehouseMapper.getLastUsableList();
- Map<String,Object> map = new HashMap<>(2);
- if(CollectionUtils.isNotEmpty(usableList)){
- map.put("usableVersion",usableList.get(0).getVersion());
- }
- if(CollectionUtils.isNotEmpty(lastUsableList)){
- map.put("lastUsableVersion",lastUsableList.get(0).getVersion());
- }
- return map;
- }
-
- @Override
- public List<String> getVersionStatusByVersion(Integer version) {
- return productionLineWarehouseMapper.getVersionStatusByVersion(version);
- }
-
-}
diff --git a/src/main/java/org/jeecg/modules/base/service/impl/ShiftGroupServiceImpl.java b/src/main/java/org/jeecg/modules/base/service/impl/ShiftGroupServiceImpl.java
new file mode 100644
index 0000000..dbcb5e4
--- /dev/null
+++ b/src/main/java/org/jeecg/modules/base/service/impl/ShiftGroupServiceImpl.java
@@ -0,0 +1,19 @@
+package org.jeecg.modules.base.service.impl;
+
+import org.jeecg.modules.base.entity.ShiftGroup;
+import org.jeecg.modules.base.mapper.ShiftGroupMapper;
+import org.jeecg.modules.base.service.IShiftGroupService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 鐝粍浜哄憳淇℃伅
+ * @Author: jeecg-boot
+ * @Date: 2025-06-24
+ * @Version: V1.0
+ */
+@Service
+public class ShiftGroupServiceImpl extends ServiceImpl<ShiftGroupMapper, ShiftGroup> implements IShiftGroupService {
+
+}
diff --git a/src/main/java/org/jeecg/modules/base/service/impl/ShiftServiceImpl.java b/src/main/java/org/jeecg/modules/base/service/impl/ShiftServiceImpl.java
new file mode 100644
index 0000000..58f99ff
--- /dev/null
+++ b/src/main/java/org/jeecg/modules/base/service/impl/ShiftServiceImpl.java
@@ -0,0 +1,19 @@
+package org.jeecg.modules.base.service.impl;
+
+import org.jeecg.modules.base.entity.Shift;
+import org.jeecg.modules.base.mapper.ShiftMapper;
+import org.jeecg.modules.base.service.IShiftService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 鐝
+ * @Author: jeecg-boot
+ * @Date: 2025-06-24
+ * @Version: V1.0
+ */
+@Service
+public class ShiftServiceImpl extends ServiceImpl<ShiftMapper, Shift> implements IShiftService {
+
+}
diff --git a/src/main/java/org/jeecg/modules/base/service/impl/SupplierCategoryServiceImpl.java b/src/main/java/org/jeecg/modules/base/service/impl/SupplierCategoryServiceImpl.java
deleted file mode 100644
index b4a1b18..0000000
--- a/src/main/java/org/jeecg/modules/base/service/impl/SupplierCategoryServiceImpl.java
+++ /dev/null
@@ -1,246 +0,0 @@
-package org.jeecg.modules.base.service.impl;
-
-import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.jeecg.common.api.vo.CommonGenericTree;
-import org.jeecg.modules.base.entity.SupplierCategory;
-import org.jeecg.modules.base.mapper.SupplierCategoryMapper;
-import org.jeecg.modules.base.service.ISupplierCategoryService;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @Description: mom_base_supplier_category
- * @Author: jeecg-boot
- * @Date: 2023-03-10
- * @Version: V1.0
- */
-@Service
-public class SupplierCategoryServiceImpl extends ServiceImpl<SupplierCategoryMapper, SupplierCategory> implements ISupplierCategoryService {
-// @Override
-// public List<CommonGenericTree> loadTree() {
-// List<SupplierCategory> supplierCategoryList = this.lambdaQuery().eq(SupplierCategory::getDelFlag, "0").list();
-// List<CommonGenericTree> commonGenericTrees = buildTree(supplierCategoryList, "-1");
-// return commonGenericTrees;
-// }
-
-// private List<CommonGenericTree> buildTree(List<SupplierCategory> supplierCategoryList, String parentId) {
-// List<CommonGenericTree> treeNodes = new ArrayList<>();
-// for (SupplierCategory supplierCategory : supplierCategoryList) {
-// if (supplierCategory.getParentId().equals(parentId)) {
-// CommonGenericTree<SupplierCategory> treeNode = new CommonGenericTree<>();
-// treeNode.setKey(supplierCategory.getId());
-// treeNode.setValue(supplierCategory.getId());
-// treeNode.setTitle(supplierCategory.getNum() + "/" + supplierCategory.getName());
-// treeNode.setRField1(supplierCategory.getNum());
-// treeNode.setRField2(supplierCategory.getName());
-// treeNode.setDisabled(false);
-// treeNode.setEntity(supplierCategory);
-// List<CommonGenericTree> children = buildTree(supplierCategoryList, supplierCategory.getId());
-// if (!children.isEmpty()) {
-// treeNode.setChildren(children);
-// }
-// treeNodes.add(treeNode);
-// }
-// }
-// return treeNodes;
-// }
- @Override
- public List<CommonGenericTree> loadTree() {
- List<SupplierCategory> supplierCategoryList = this.lambdaQuery().eq(SupplierCategory::getDelFlag, "0").list();
- List<CommonGenericTree> commonGenericTrees = loadTree(supplierCategoryList);
- return commonGenericTrees;
- }
-
- @SuppressWarnings("unchecked")
- public List<CommonGenericTree> loadTree(List<SupplierCategory> supplierCategoryList) {
- @SuppressWarnings("unused")
- SupplierCategory supplierCategory = new SupplierCategory();
- List<CommonGenericTree> list = new ArrayList<>();
- Map<String, CommonGenericTree> map = new HashMap<>();
- Map<String, CommonGenericTree> map2 = new HashMap<>();
- Map<String, CommonGenericTree> map3 = new HashMap<>();
- Map<String, CommonGenericTree> map4 = new HashMap<>();
- Map<String, CommonGenericTree> map5 = new HashMap<>();
- Map<String, CommonGenericTree> map6 = new HashMap<>();
- Map<String, CommonGenericTree> map7 = new HashMap<>();
- CommonGenericTree<SupplierCategory> node = new CommonGenericTree<>();
- node.setKey("-1");
- node.setValue("-1");
- node.setTitle("渚涘簲鍟嗗垎绫�");
- node.setRField1("");
- node.setRField2("");
- node.setDisabled(false);
- node.setEntity(new SupplierCategory());
- list.add(node);
- if (CollectionUtils.isNotEmpty(list)) {
- CommonGenericTree<SupplierCategory> pcNode;
- for (SupplierCategory projectType : supplierCategoryList) {
- if (projectType.getParentId().equals("-1")) {
- pcNode = new CommonGenericTree<>();
- pcNode.setKey(projectType.getId());
- pcNode.setTitle(projectType.getNum() + "/" + projectType.getName());
- pcNode.setParentId(node.getKey());
- pcNode.setIcon("");
- pcNode.setType(0);
- pcNode.setValue(projectType.getId());
- pcNode.setDisabled(false);
- pcNode.setRField1(projectType.getNum());
- pcNode.setRField2(projectType.getName());
- pcNode.setEntity(projectType);
- node.addChildren(pcNode);
- map.put(projectType.getId(), pcNode);
- }
- }
- CommonGenericTree<SupplierCategory> childNode;
- for (SupplierCategory projectType : supplierCategoryList) {
- if (map.containsKey(projectType.getParentId())) {
- pcNode = map.get(projectType.getParentId());
- childNode = new CommonGenericTree<>();
- childNode.setKey(projectType.getId());
- childNode.setTitle(projectType.getNum() + "/" + projectType.getName());
- childNode.setParentId(projectType.getParentId());
- childNode.setIcon("");
- childNode.setType(0);
- childNode.setValue(projectType.getId());
- childNode.setDisabled(false);
- childNode.setRField1(projectType.getNum());
- childNode.setRField2(projectType.getName());
- childNode.setEntity(projectType);
- pcNode.addChildren(childNode);
- map2.put(projectType.getId(), childNode);
- }
- }
- if (map2.size() > 0) {
- CommonGenericTree<SupplierCategory> child2Node;
- for (SupplierCategory projectType : supplierCategoryList) {
- if (map2.containsKey(projectType.getParentId())) {
- pcNode = map2.get(projectType.getParentId());
- child2Node = new CommonGenericTree<>();
- child2Node.setKey(projectType.getId());
- child2Node.setTitle(projectType.getNum() + "/" + projectType.getName());
- child2Node.setParentId(projectType.getParentId());
- child2Node.setIcon("");
- child2Node.setType(0);
- child2Node.setValue(projectType.getId());
- child2Node.setDisabled(false);
- child2Node.setRField1(projectType.getNum());
- child2Node.setRField2(projectType.getName());
- child2Node.setEntity(projectType);
- pcNode.addChildren(child2Node);
- map3.put(projectType.getId(), child2Node);
- }
- }
- if (map3.size() > 0) {
- CommonGenericTree<SupplierCategory> child3Node;
- for (SupplierCategory projectType : supplierCategoryList) {
- if (map3.containsKey(projectType.getParentId())) {
- pcNode = map3.get(projectType.getParentId());
- child3Node = new CommonGenericTree<>();
- child3Node.setKey(projectType.getId());
- child3Node.setTitle(projectType.getNum() + "/" + projectType.getName());
- child3Node.setParentId(projectType.getParentId());
- child3Node.setIcon("");
- child3Node.setType(0);
- child3Node.setValue(projectType.getId());
- child3Node.setDisabled(false);
- child3Node.setRField1(projectType.getNum());
- child3Node.setRField2(projectType.getName());
- child3Node.setEntity(projectType);
- pcNode.addChildren(child3Node);
- map4.put(projectType.getId(), child3Node);
- }
- }
- if (map4.size() > 0) {
- CommonGenericTree<SupplierCategory> child4Node;
- for (SupplierCategory projectType : supplierCategoryList) {
- if (map4.containsKey(projectType.getParentId())) {
- pcNode = map4.get(projectType.getParentId());
- child4Node = new CommonGenericTree<>();
- child4Node.setKey(projectType.getId());
- child4Node.setTitle(projectType.getNum() + "/" + projectType.getName());
- child4Node.setParentId(projectType.getParentId());
- child4Node.setIcon("");
- child4Node.setType(0);
- child4Node.setValue(projectType.getId());
- child4Node.setDisabled(false);
- child4Node.setRField1(projectType.getNum());
- child4Node.setRField2(projectType.getName());
- child4Node.setEntity(projectType);
- pcNode.addChildren(child4Node);
- map5.put(projectType.getId(), child4Node);
- }
- }
- if (map5.size() > 0) {
- CommonGenericTree<SupplierCategory> child5Node;
- for (SupplierCategory projectType : supplierCategoryList) {
- if (map5.containsKey(projectType.getParentId())) {
- pcNode = map5.get(projectType.getParentId());
- child5Node = new CommonGenericTree<>();
- child5Node.setKey(projectType.getId());
- child5Node.setTitle(projectType.getNum() + "/" + projectType.getName());
- child5Node.setParentId(projectType.getParentId());
- child5Node.setIcon("");
- child5Node.setType(0);
- child5Node.setValue(projectType.getId());
- child5Node.setDisabled(false);
- child5Node.setRField1(projectType.getNum());
- child5Node.setRField2(projectType.getName());
- child5Node.setEntity(projectType);
- pcNode.addChildren(child5Node);
- map6.put(projectType.getId(), child5Node);
- }
- }
- if (map6.size() > 0) {
- CommonGenericTree<SupplierCategory> child6Node;
- for (SupplierCategory projectType : supplierCategoryList) {
- if (map6.containsKey(projectType.getParentId())) {
- pcNode = map6.get(projectType.getParentId());
- child6Node = new CommonGenericTree<>();
- child6Node.setKey(projectType.getId());
- child6Node.setTitle(projectType.getNum() + "/" + projectType.getName());
- child6Node.setParentId(projectType.getParentId());
- child6Node.setIcon("");
- child6Node.setType(0);
- child6Node.setValue(projectType.getId());
- child6Node.setDisabled(false);
- child6Node.setRField1(projectType.getNum());
- child6Node.setRField2(projectType.getName());
- child6Node.setEntity(projectType);
- pcNode.addChildren(child6Node);
- map7.put(projectType.getId(), child6Node);
- }
- }
- if (map7.size() > 0) {
- CommonGenericTree<SupplierCategory> child7Node;
- for (SupplierCategory projectType : supplierCategoryList) {
- if (map.containsKey(projectType.getParentId())) {
- pcNode = map7.get(projectType.getParentId());
- child7Node = new CommonGenericTree<>();
- child7Node.setKey(projectType.getId());
- child7Node.setTitle(projectType.getNum() + "/" + projectType.getName());
- child7Node.setParentId(projectType.getParentId());
- child7Node.setIcon("");
- child7Node.setType(0);
- child7Node.setValue(projectType.getId());
- child7Node.setDisabled(false);
- child7Node.setRField1(projectType.getNum());
- child7Node.setRField2(projectType.getName());
- child7Node.setEntity(projectType);
-
- }
- }
- }
- }
- }
- }
- }
- }
- }
- return list;
- }
-}
diff --git a/src/main/java/org/jeecg/modules/base/service/impl/SupplierContactServiceImpl.java b/src/main/java/org/jeecg/modules/base/service/impl/SupplierContactServiceImpl.java
deleted file mode 100644
index 9217a2d..0000000
--- a/src/main/java/org/jeecg/modules/base/service/impl/SupplierContactServiceImpl.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package org.jeecg.modules.base.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.jeecg.modules.base.entity.Supplier;
-import org.jeecg.modules.base.entity.SupplierContact;
-import org.jeecg.modules.base.mapper.SupplierContactMapper;
-import org.jeecg.modules.base.mapper.SupplierMapper;
-import org.jeecg.modules.base.service.ISupplierContactService;
-import org.jeecg.modules.base.service.ISupplierService;
-import org.springframework.stereotype.Service;
-
-/**
- * @Description: mom_base_supplier
- * @Author: jeecg-boot
- * @Date: 2023-03-10
- * @Version: V1.0
- */
-@Service
-public class SupplierContactServiceImpl extends ServiceImpl<SupplierContactMapper, SupplierContact> implements ISupplierContactService {
-
-}
diff --git a/src/main/java/org/jeecg/modules/base/service/impl/SupplierServiceImpl.java b/src/main/java/org/jeecg/modules/base/service/impl/SupplierServiceImpl.java
index 97883f8..a688666 100644
--- a/src/main/java/org/jeecg/modules/base/service/impl/SupplierServiceImpl.java
+++ b/src/main/java/org/jeecg/modules/base/service/impl/SupplierServiceImpl.java
@@ -1,27 +1,19 @@
package org.jeecg.modules.base.service.impl;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.jeecg.modules.base.entity.Supplier;
import org.jeecg.modules.base.mapper.SupplierMapper;
-import org.jeecg.modules.base.mapper.UnitMapper;
import org.jeecg.modules.base.service.ISupplierService;
import org.springframework.stereotype.Service;
-import javax.annotation.Resource;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
- * @Description: mom_base_supplier
+ * @Description: 渚涘簲鍟嗙鐞�
* @Author: jeecg-boot
- * @Date: 2023-03-10
+ * @Date: 2025-06-24
* @Version: V1.0
*/
@Service
public class SupplierServiceImpl extends ServiceImpl<SupplierMapper, Supplier> implements ISupplierService {
- @Resource
- private SupplierMapper supplierMapper;
- @Override
- public Supplier getByName(String name) {
- return supplierMapper.getByName(name);
- }
}
diff --git a/src/main/java/org/jeecg/modules/base/service/impl/UnitCategoryServiceImpl.java b/src/main/java/org/jeecg/modules/base/service/impl/UnitCategoryServiceImpl.java
deleted file mode 100644
index b1aaa1f..0000000
--- a/src/main/java/org/jeecg/modules/base/service/impl/UnitCategoryServiceImpl.java
+++ /dev/null
@@ -1,163 +0,0 @@
-package org.jeecg.modules.base.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.jeecg.modules.base.entity.Unit;
-import org.jeecg.modules.base.entity.UnitCategory;
-import org.jeecg.modules.base.mapper.UnitMapper;
-import org.jeecg.modules.base.mapper.UnitCategoryMapper;
-import org.jeecg.modules.base.service.IUnitCategoryService;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-@Service
-public class UnitCategoryServiceImpl extends ServiceImpl<UnitCategoryMapper, UnitCategory> implements IUnitCategoryService {
-
- @Resource
- private UnitCategoryMapper unitCategoryMapper;
- @Resource
- private UnitMapper unitMapper;
-
- // 鍒濆鍖栧伐瑁呯被鍒�
-// private static final String initUnitCategory = "璁￠噺鍗曚綅鍒嗙被";
- /**
- * 鏌ヨ璁￠噺鍗曚綅鍒嗙被鏍�
- * @return
- */
- @Override
- public List<UnitCategory> getTreeList() {
- List<UnitCategory> treeList = new ArrayList<>();
- LambdaQueryWrapper<UnitCategory> query = new LambdaQueryWrapper<UnitCategory>();
- List<UnitCategory> list = this.list(query);
- for(UnitCategory unitCategory1 :list){
- LambdaQueryWrapper<UnitCategory> momBaseUnitCategoryLambdaQueryWrapper = new LambdaQueryWrapper<UnitCategory>();
- momBaseUnitCategoryLambdaQueryWrapper.eq(UnitCategory::getId, unitCategory1.getPid());
- UnitCategory unitCategory = unitCategoryMapper.selectOne(momBaseUnitCategoryLambdaQueryWrapper);
- if(unitCategory ==null||"".equals(unitCategory)){
- unitCategory1.setPName("");
- }else{
- unitCategory1.setPName(unitCategory.getCode()+ unitCategory.getName());
- }
- if(Objects.equals(unitCategory1.getPid(), "-1")){
- treeList.add(findChild(list, unitCategory1));
- }
- }
- return treeList;
- }
-
- @Override
- public void initFristUnitCategory() {
-
- UnitCategory unitCategory;
- List<UnitCategory> unitCategoryList = super.lambdaQuery()
- .eq(UnitCategory::getName, "璁￠噺鍗曚綅鍒嗙被")
- .eq(UnitCategory::getDelFlag, "0").list();
- if (unitCategoryList.size() == 0) {
- unitCategory = new UnitCategory();
- unitCategory.setCode("0");
-// unitCategory.setId("-1");
- unitCategory.setCodeName("璁￠噺鍗曚綅鍒嗙被");
- unitCategory.setPid("-1");
- super.save(unitCategory);
- }
- }
-
- /**
- * 鏌ヨ璁￠噺鍗曚綅鏍�
- * @return
- */
- @Override
- public List<UnitCategory> getUnitTreeList() {
- List<UnitCategory> treeList = new ArrayList<>();
- LambdaQueryWrapper<UnitCategory> query = new LambdaQueryWrapper<UnitCategory>();
- List<UnitCategory> list = this.list(query);
- for(UnitCategory unitCategory1 :list){
- LambdaQueryWrapper<UnitCategory> momBaseUnitCategoryLambdaQueryWrapper = new LambdaQueryWrapper<UnitCategory>();
- momBaseUnitCategoryLambdaQueryWrapper.eq(UnitCategory::getId, unitCategory1.getPid());
- UnitCategory unitCategory = unitCategoryMapper.selectOne(momBaseUnitCategoryLambdaQueryWrapper);
- if(unitCategory ==null||"".equals(unitCategory)){
- unitCategory1.setPName("");
- }else{
- unitCategory1.setPName(unitCategory.getCode()+ unitCategory.getName());
- }
- if(Objects.equals(unitCategory1.getPid(), "-1")){
- treeList.add(findUnitChild(list, unitCategory1));
- }
- }
- return treeList;
- }
-
- /**
- * 鏌ヨ璁￠噺鍗曚綅鍒嗙被鐨勪笅绾ц閲忓崟浣嶅垎绫�
- * @param id
- * @return
- */
- @Override
- public List<UnitCategory> getList(String id) {
- List<UnitCategory> list = unitCategoryMapper.getList(id);
- list.forEach( l ->{
- LambdaQueryWrapper<UnitCategory> query = new LambdaQueryWrapper<>();
- query.eq(UnitCategory::getId,id);
- UnitCategory unitCategory = unitCategoryMapper.selectOne(query);
- l.setPName(l.getCode()+l.getName());
- l.setCodeName(unitCategory.getCode()+ unitCategory.getName());
- });
- return list;
- }
- /**
- * 鏌ヨ璁￠噺鍗曚綅鍒嗙被鐨勬墍鏈変笅绾ц閲忓崟浣嶅垎绫�
- * @return
- */
- private static UnitCategory findChild(List<UnitCategory> list, UnitCategory unitCategory){
- for(UnitCategory unitCategory1 : list){
- unitCategory1.setCodeName(unitCategory1.getCode()+ unitCategory1.getName());
- if(Objects.equals(unitCategory1.getPid(), unitCategory.getId())){
- if(unitCategory.getChildren() == null){
- unitCategory.setChildren(new ArrayList<UnitCategory>());
- }
- unitCategory.getChildren().add(findChild(list, unitCategory1));
- }
- }
- return unitCategory;
- }
-
- /**
- * 鏌ヨ璁￠噺鍗曚綅鏍�
- * @return
- */
- private UnitCategory findUnitChild(List<UnitCategory> list, UnitCategory unitCategory){
- for(UnitCategory unitCategory1 : list){
- unitCategory1.setCodeName(unitCategory1.getCode()+ unitCategory1.getName());
- if(Objects.equals(unitCategory1.getPid(), unitCategory.getId())){
- if(unitCategory.getChildren() == null){
- unitCategory.setChildren(new ArrayList<UnitCategory>());
- }
- unitCategory.getChildren().add(findUnitChild(list, unitCategory1));
- }else{
- if(unitCategory.getChildren() == null){
- unitCategory.setChildren(new ArrayList<UnitCategory>());
- List<Unit> units = unitMapper.getListByUnitCategoryId(unitCategory.getId());
- for(Unit l : units){
-
- UnitCategory mom = new UnitCategory();
- mom.setCodeName(l.getNum()+l.getName());
- mom.setId(l.getId());
- mom.setCode(l.getNum());
- mom.setName(l.getName());
- unitCategory.getChildren().add(mom);
-
- }
-
- }
-
- }
- }
- return unitCategory;
- }
-
-}
diff --git a/src/main/java/org/jeecg/modules/base/service/impl/UnitConversionServiceImpl.java b/src/main/java/org/jeecg/modules/base/service/impl/UnitConversionServiceImpl.java
deleted file mode 100644
index db5ec91..0000000
--- a/src/main/java/org/jeecg/modules/base/service/impl/UnitConversionServiceImpl.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.jeecg.modules.base.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.jeecg.modules.base.entity.UnitConversion;
-import org.jeecg.modules.base.mapper.UnitConversionMapper;
-import org.jeecg.modules.base.service.IUnitConversionService;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-@Service
-public class UnitConversionServiceImpl extends ServiceImpl<UnitConversionMapper, UnitConversion> implements IUnitConversionService {
-
- @Resource
- private UnitConversionMapper unitConversionMapper;
- @Override
- public List<UnitConversion> getListByUnitId(String ids) {
- String[] ls = ids.split(",");
- List<UnitConversion> list = unitConversionMapper.getListByUnitId(ls);
- return list;
- }
-}
diff --git a/src/main/java/org/jeecg/modules/base/service/impl/UnitServiceImpl.java b/src/main/java/org/jeecg/modules/base/service/impl/UnitServiceImpl.java
deleted file mode 100644
index bf47192..0000000
--- a/src/main/java/org/jeecg/modules/base/service/impl/UnitServiceImpl.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package org.jeecg.modules.base.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.jeecg.modules.base.entity.Unit;
-import org.jeecg.modules.base.mapper.UnitCategoryMapper;
-import org.jeecg.modules.base.mapper.UnitMapper;
-import org.jeecg.modules.base.service.IUnitService;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
-
-@Service
-public class UnitServiceImpl extends ServiceImpl<UnitMapper, Unit> implements IUnitService {
-
- @Resource
- private UnitMapper unitMapper;
- @Resource
- private UnitCategoryMapper unitCategoryMapper;
-
- @Override
- public List<Unit> getListByUnitCategoryId(String unitCategoryId) {
- List<Unit> list = new ArrayList<>();
- list = unitMapper.getListByUnitCategoryId(unitCategoryId);
- return list;
- }
-
- @Override
- public List<Unit> getTreeList() {
- List<Unit> list = unitMapper.getTreeList();
- return list;
- }
-
- @Override
- public Unit getUnitByName(String name) {
- return unitMapper.getUnitByName(name);
- }
-
-
-}
diff --git a/src/main/java/org/jeecg/modules/base/service/impl/UserFactoryServiceImpl.java b/src/main/java/org/jeecg/modules/base/service/impl/UserFactoryServiceImpl.java
new file mode 100644
index 0000000..38addc4
--- /dev/null
+++ b/src/main/java/org/jeecg/modules/base/service/impl/UserFactoryServiceImpl.java
@@ -0,0 +1,59 @@
+package org.jeecg.modules.base.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import org.jeecg.modules.base.entity.Factory;
+import org.jeecg.modules.base.entity.UserFactory;
+import org.jeecg.modules.base.mapper.UserFactoryMapper;
+import org.jeecg.modules.base.model.FactoryIdModel;
+import org.jeecg.modules.base.service.IFactoryService;
+import org.jeecg.modules.base.service.IUserFactoryService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Description: 鐢ㄦ埛宸ュ巶/杞﹂棿/浜х嚎鍏崇郴
+ * @Author: jeecg-boot
+ * @Date: 2025-06-24
+ * @Version: V1.0
+ */
+@Service
+public class UserFactoryServiceImpl extends ServiceImpl<UserFactoryMapper, UserFactory> implements IUserFactoryService {
+
+ @Autowired
+ private IFactoryService factoryService;
+ /**
+ * 鏍规嵁鐢ㄦ埛id鏌ヨ浜х嚎淇℃伅
+ */
+ @Override
+ public List<FactoryIdModel> queryFactoryIdsOfUser(String userId) {
+ LambdaQueryWrapper<UserFactory> queryUserFactory = new LambdaQueryWrapper<>();
+ LambdaQueryWrapper<Factory> queryFactory = new LambdaQueryWrapper<>();
+ try {
+ queryUserFactory.eq(UserFactory::getUserId, userId);
+ List<String> factoryIdList = new ArrayList<>();
+ List<FactoryIdModel> factoryIdModelList = new ArrayList<>();
+ List<UserFactory> userFactoryList = this.list(queryUserFactory);
+ if (userFactoryList != null && !userFactoryList.isEmpty()) {
+ for (UserFactory userFactory : userFactoryList) {
+ factoryIdList.add(userFactory.getFactoryId());
+ }
+ queryFactory.in(Factory::getId, factoryIdList);
+ List<Factory> factoryList = factoryService.list(queryFactory);
+ if (factoryList != null && !factoryList.isEmpty()) {
+ for (Factory factory : factoryList) {
+ factoryIdModelList.add(new FactoryIdModel().convertByUserFactory(factory));
+ }
+ }
+ return factoryIdModelList;
+ }
+ } catch (Exception e) {
+ e.fillInStackTrace();
+ }
+ return null;
+ }
+}
diff --git a/src/main/java/org/jeecg/modules/base/service/impl/UserGroupServiceImpl.java b/src/main/java/org/jeecg/modules/base/service/impl/UserGroupServiceImpl.java
new file mode 100644
index 0000000..0413af6
--- /dev/null
+++ b/src/main/java/org/jeecg/modules/base/service/impl/UserGroupServiceImpl.java
@@ -0,0 +1,19 @@
+package org.jeecg.modules.base.service.impl;
+
+import org.jeecg.modules.base.entity.UserGroup;
+import org.jeecg.modules.base.mapper.UserGroupMapper;
+import org.jeecg.modules.base.service.IUserGroupService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 鐝粍
+ * @Author: jeecg-boot
+ * @Date: 2025-06-24
+ * @Version: V1.0
+ */
+@Service
+public class UserGroupServiceImpl extends ServiceImpl<UserGroupMapper, UserGroup> implements IUserGroupService {
+
+}
diff --git a/src/main/java/org/jeecg/modules/base/service/impl/WarehouseAreaServiceImpl.java b/src/main/java/org/jeecg/modules/base/service/impl/WarehouseAreaServiceImpl.java
deleted file mode 100644
index 948994c..0000000
--- a/src/main/java/org/jeecg/modules/base/service/impl/WarehouseAreaServiceImpl.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.jeecg.modules.base.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.jeecg.modules.base.entity.WarehouseArea;
-import org.jeecg.modules.base.mapper.WarehouseAreaMapper;
-import org.jeecg.modules.base.service.IWarehouseAreaService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-/**
- * @Description: mom_base_warehouse_area
- * @Author: jeecg-boot
- * @Date: 2023-07-06
- * @Version: V1.0
- */
-@Service
-public class WarehouseAreaServiceImpl extends ServiceImpl<WarehouseAreaMapper, WarehouseArea> implements IWarehouseAreaService {
- @Autowired
- private WarehouseAreaMapper warehouseAreaMapper;
- @Override
- public WarehouseArea getByName(String name) {
- return warehouseAreaMapper.getByName(name);
- }
-}
diff --git a/src/main/java/org/jeecg/modules/base/service/impl/WarehouseClientServiceImpl.java b/src/main/java/org/jeecg/modules/base/service/impl/WarehouseClientServiceImpl.java
deleted file mode 100644
index 8497ad4..0000000
--- a/src/main/java/org/jeecg/modules/base/service/impl/WarehouseClientServiceImpl.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package org.jeecg.modules.base.service.impl;
-
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.jeecg.common.system.vo.SelectTreeModel;
-import org.jeecg.modules.base.entity.WarehouseClient;
-import org.jeecg.modules.base.mapper.WarehouseClientMapper;
-import org.jeecg.modules.base.service.IWarehouseClientService;
-import org.jeecg.modules.system.entity.SysDepart;
-import org.jeecg.modules.system.mapper.SysDepartMapper;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @Description: 浠撳簱鏈嶅姟瀵硅薄
- * @Author: jeecg-boot
- * @Date: 2022-11-07
- * @Version: V1.0
- */
-@Service
-@Transactional
-public class WarehouseClientServiceImpl extends ServiceImpl<WarehouseClientMapper, WarehouseClient> implements IWarehouseClientService {
-
- @Autowired
- private WarehouseClientMapper warehouseClientMapper;
- @Autowired
- private SysDepartMapper sysDepartMapper;
-
- @Override
- public List<WarehouseClient> selectByMainId(String mainId) {
- return warehouseClientMapper.selectByMainId(mainId);
- }
-
- @Override
- public List<SelectTreeModel> getDepartTreeByEnterpriseId(String enterpriseId) {
- return loadDepartTreeByParentId(enterpriseId);
- }
-
- @Override
- public List<SysDepart> getDepartListByParentId(List<String> parentIds) {
- List<SysDepart> list = sysDepartMapper.getDepartListByParentId(parentIds);
- List<String> list1 = new ArrayList<>();
- for(SysDepart sysDepart:list){
- list1.add(sysDepart.getId());
- }
- List<SysDepart> list2 = new ArrayList<>();
- if(list1.size()!=0){
- list2 = getDepartListByParentId(list1);
- list.addAll(list2);
- }
- return list;
- }
-
-
- public List<SelectTreeModel> loadDepartTreeByParentId(String parentId){
- List<SelectTreeModel> list = sysDepartMapper.getDepartTreeByParentId(parentId);
- if(list.size()!=0){
- for(SelectTreeModel selectTreeModel:list){
- selectTreeModel.setChildren(loadDepartTreeByParentId(selectTreeModel.getKey()));
- }
- }
- return list;
- }
-
-
-}
diff --git a/src/main/java/org/jeecg/modules/base/service/impl/WarehouseLocationServiceImpl.java b/src/main/java/org/jeecg/modules/base/service/impl/WarehouseLocationServiceImpl.java
deleted file mode 100644
index 6bdcdda..0000000
--- a/src/main/java/org/jeecg/modules/base/service/impl/WarehouseLocationServiceImpl.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.jeecg.modules.base.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.jeecg.modules.base.entity.WarehouseLocation;
-import org.jeecg.modules.base.mapper.WarehouseLocationMapper;
-import org.jeecg.modules.base.service.IWarehouseLocationService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-/**
- * @Description: mom_base_warehouse_location
- * @Author: jeecg-boot
- * @Date: 2023-07-06
- * @Version: V1.0
- */
-@Service
-public class WarehouseLocationServiceImpl extends ServiceImpl<WarehouseLocationMapper, WarehouseLocation> implements IWarehouseLocationService {
- @Autowired
- private WarehouseLocationMapper warehouseLocationMapper;
- @Override
- public WarehouseLocation getByName(String name) {
- return warehouseLocationMapper.getByName(name);
- }
-}
diff --git a/src/main/java/org/jeecg/modules/base/service/impl/WarehouseServiceImpl.java b/src/main/java/org/jeecg/modules/base/service/impl/WarehouseServiceImpl.java
deleted file mode 100644
index da6d7f3..0000000
--- a/src/main/java/org/jeecg/modules/base/service/impl/WarehouseServiceImpl.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package org.jeecg.modules.base.service.impl;//package org.jeecg.modules.base.service.impl;
-//
-//import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-//import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-//import org.jeecg.modules.base.entity.FactoryModel;
-//import org.jeecg.modules.base.entity.Warehouse;
-//import org.jeecg.modules.base.mapper.WarehouseClientMapper;
-//import org.jeecg.modules.base.mapper.WarehouseMapper;
-//import org.jeecg.modules.base.service.IWarehouseService;
-//import org.springframework.stereotype.Service;
-//import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.transaction.annotation.Transactional;
-//import java.io.Serializable;
-//import java.util.*;
-//
-///**
-// * @Description: 浠撳簱
-// * @Author: jeecg-boot
-// * @Date: 2022-11-07
-// * @Version: V1.0
-// */
-//@Service
-//public class WarehouseServiceImpl extends ServiceImpl<WarehouseMapper, Warehouse> implements IWarehouseService {
-//
-// @Autowired
-// private WarehouseMapper warehouseMapper;
-// @Autowired
-// private WarehouseClientMapper warehouseClientMapper;
-//
-// @Override
-// public Page<Map<String, Object>> getWarehouseList(Page<Map<String, Object>> page, Integer version, String enterpriseId) {
-// return page.setRecords(warehouseMapper.getWarehouseList(page,version,enterpriseId));
-// }
-//
-// @Override
-// public Integer getInitVersion() {
-// List<Warehouse> usableVersionList = warehouseMapper.getUsableList();
-// Set<Integer> allVersionList = getVersionList();
-// if(CollectionUtils.isNotEmpty(usableVersionList)){
-// return usableVersionList.get(0).getVersion();
-// }else if(CollectionUtils.isNotEmpty(allVersionList)){
-// return allVersionList.stream().findFirst().get();
-// }
-// return null;
-// }
-//
-// @Override
-// @Transactional(rollbackFor = Exception.class)
-// public void delMain(String id) {
-// warehouseClientMapper.deleteByMainId(id);
-// warehouseMapper.deleteById(id);
-// }
-//
-// @Override
-// @Transactional(rollbackFor = Exception.class)
-// public void delBatchMain(Collection<? extends Serializable> idList) {
-// for(Serializable id:idList) {
-// warehouseClientMapper.deleteByMainId(id.toString());
-// warehouseMapper.deleteById(id);
-// }
-// }
-//
-// @Override
-// public Set<Integer> getVersionList() {
-// Set<Integer> set = new TreeSet<Integer>(Comparator.reverseOrder());
-// set.addAll(warehouseMapper.getAllVersion());
-// return set;
-// }
-//
-// @Override
-// public List<Warehouse> getLastUsableList() {
-// return warehouseMapper.getLastUsableList();
-// }
-//
-// @Override
-// public List<Warehouse> getUsableList() {
-// return warehouseMapper.getUsableList();
-// }
-//
-// @Override
-// public Map<String, Object> getNowAndLastUsableVersion() {
-// List<Warehouse> usableList = warehouseMapper.getUsableList();
-// List<Warehouse> lastUsableList = warehouseMapper.getLastUsableList();
-// Map<String,Object> map = new HashMap<>(2);
-// if(CollectionUtils.isNotEmpty(usableList)){
-// map.put("usableVersion",usableList.get(0).getVersion());
-// }
-// if(CollectionUtils.isNotEmpty(lastUsableList)){
-// map.put("lastUsableVersion",lastUsableList.get(0).getVersion());
-// }
-// return map;
-// }
-//
-// @Override
-// public List<String> getVersionStatusByVersion(Integer version) {
-// return warehouseMapper.getVersionStatusByVersion(version);
-// }
-//
-// @Override
-// public Warehouse getByName(String name) {
-// return warehouseMapper.getByName(name);
-// }
-//
-//
-//}
diff --git a/src/main/java/org/jeecg/modules/base/service/impl/WorkCenterEquipmentServiceImpl.java b/src/main/java/org/jeecg/modules/base/service/impl/WorkCenterEquipmentServiceImpl.java
deleted file mode 100644
index 499101b..0000000
--- a/src/main/java/org/jeecg/modules/base/service/impl/WorkCenterEquipmentServiceImpl.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package org.jeecg.modules.base.service.impl;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.jeecg.modules.base.entity.WorkCenterEquipment;
-import org.jeecg.modules.base.mapper.WorkCenterEquipmentMapper;
-import org.jeecg.modules.base.service.IWorkCenterEquipmentService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * @Description: mom_base_work_center_equipment
- * @Author: jeecg-boot
- * @Date: 2022-12-06
- * @Version: V1.0
- */
-@Service
-public class WorkCenterEquipmentServiceImpl extends ServiceImpl<WorkCenterEquipmentMapper, WorkCenterEquipment> implements IWorkCenterEquipmentService {
- @Autowired
- private WorkCenterEquipmentMapper workCenterEquipmentMapper;
-
- @Override
- public Page<Map<String,Object>> listByWorkCenterId(Page<Map<String, Object>> page, String workCenterId) {
- return page.setRecords(workCenterEquipmentMapper.listByWorkCenterId(page,workCenterId));
- }
-
- @Override
- public Page<Map<String, Object>> getAddEquipmentListByEquipmentCategoryId(Page<Map<String, Object>> page, String equipmentCategoryId, List<String> equipmentIdList) {
- return page.setRecords(workCenterEquipmentMapper.getAddEquipmentListByEquipmentCategoryId(page,equipmentCategoryId,equipmentIdList));
- }
-}
diff --git a/src/main/java/org/jeecg/modules/base/service/impl/WorkCenterServiceImpl.java b/src/main/java/org/jeecg/modules/base/service/impl/WorkCenterServiceImpl.java
deleted file mode 100644
index 589f06d..0000000
--- a/src/main/java/org/jeecg/modules/base/service/impl/WorkCenterServiceImpl.java
+++ /dev/null
@@ -1,149 +0,0 @@
-package org.jeecg.modules.base.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.jeecg.modules.base.entity.FactoryModel;
-import org.jeecg.modules.base.entity.FactoryModelDetail;
-import org.jeecg.modules.base.entity.WorkCenter;
-import org.jeecg.modules.base.entity.WorkCenterDetail;
-import org.jeecg.modules.base.mapper.FactoryModelMapper;
-import org.jeecg.modules.base.mapper.WorkCenterMapper;
-import org.jeecg.modules.base.service.IWorkCenterService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.*;
-import java.util.function.Predicate;
-import java.util.stream.Collectors;
-
-/**
- * @Description: mom_base_work_center
- * @Author: jeecg-boot
- * @Date: 2022-11-17
- * @Version: V1.0
- */
-@Service
-@Transactional
-public class WorkCenterServiceImpl extends ServiceImpl<WorkCenterMapper, WorkCenter> implements IWorkCenterService {
- @Autowired
- private FactoryModelMapper factoryModelMapper;
- @Autowired
- private WorkCenterMapper workCenterMapper;
- @Override//鏍规嵁宸ュ巶寤烘āid瀵绘壘璇ュ伐鍘傛墍鏈夊伐浣滀腑蹇�
- public Page<WorkCenterDetail> getAllWorkCenterByPMFId(Page<WorkCenterDetail> page,String parentFactoryModelId,Integer factoryModelVersion,Integer version) {
- return page.setRecords(workCenterMapper.selectWorkCenterByPMFIds(page,trueGetLeaves(factoryModelVersion,parentFactoryModelId),version));
- }
-
- @Override//閫掑綊瀵绘壘宸ヤ綔涓績鐨剅oot鑺傜偣
- public FactoryModelDetail getTop(String eid, String fid) {
- FactoryModelDetail factoryModelDetail = factoryModelMapper.getFatherIdById(fid);
- if(!factoryModelDetail.getParentId().equals(eid)){
- return getTop(eid,factoryModelDetail.getParentId());
- }
- else{
- return factoryModelDetail;
- }
- }
-
- @Override
- public Set<Integer> getVersionList(){
- Set<Integer> set = new TreeSet(Comparator.reverseOrder());
- set.addAll(workCenterMapper.getVersionList());
- return set;
- }
- @Override
- public List<WorkCenter> getUpdateVersionlist(Integer version) {
- return workCenterMapper.getUpdateVersionlist(version);
- }
-
- @Override
- public List<WorkCenter> getUsableList() {
- return workCenterMapper.getUsableList();
- }
-
- @Override
- public Map<String,Object> getNowAndLastUsableVersion() {
- List<WorkCenter> usableList = workCenterMapper.getUsableList();
- List<WorkCenter> lastUsableList=workCenterMapper.getLastUsableList();
- Map<String,Object> map = new HashMap<>(2);
- if(CollectionUtils.isNotEmpty(usableList)){
- map.put("usableVersion",usableList.get(0).getVersion());
- }
- if(CollectionUtils.isNotEmpty(lastUsableList)){
- map.put("lastUsableVersion",lastUsableList.get(0).getVersion());
- }
- return map;
- }
-
- @Override
- public List<WorkCenter> getLastUsableVersion() {
- return workCenterMapper.getLastUsableList();
- }
-
- @Override
- public Integer getInitVersion() {
- List<WorkCenter> usableVersionList = baseMapper.getUsableList();
- Set<Integer> versionList = getVersionList();
- if(CollectionUtils.isNotEmpty(usableVersionList)){
- return usableVersionList.get(0).getVersion();
- }else if(CollectionUtils.isNotEmpty(versionList)){
- return versionList.stream().findFirst().get();
- }
- return null;
- }
- @Override
- public List<String> getVersionStatusByVersion(Integer version) {
- return baseMapper.getVersionStatusByVersion(version);
- }
-
- @Override
- public List<Map<String, Object>> getFactoryVersionList() {
- return baseMapper.getFactoryVersionList();
- }
-
- @Override
- public List<Map<String, Object>> getEquipmentCategoryListByEnterpriseId(String enterpriseId) {
- return workCenterMapper.getEquipmentCategoryListByEnterpriseId(enterpriseId);
- }
- /**
- * 鑾峰彇鍙跺瓙鑺傜偣
- * @param
- * @return
- */
- public List<String> trueGetLeaves(Integer version,String parentId){
- List<FactoryModel> children = factoryModelMapper.selectList(
- new QueryWrapper<FactoryModel>()
- .eq("parent_id",parentId)
- .eq("version",version)
- .eq("del_flag",0)
- );
- List<String> leaves = new ArrayList<>();
- if(CollectionUtils.isNotEmpty(children)){
- children.forEach(factoryModel -> {
- String id = factoryModel.getId();
- if(
- CollectionUtils.isEmpty(
- factoryModelMapper.selectList(new QueryWrapper<FactoryModel>()
- .eq("parent_id",id)
- .eq("version",version)
- .eq("del_flag",0)))
- ){
- leaves.add(id);
- }
- else {
- leaves.addAll(trueGetLeaves(version,id));
- }
- });
- }
- else {
- leaves.add(parentId);
- }
- return leaves;
- }
-
-
-}
diff --git a/src/main/java/org/jeecg/modules/base/service/impl/WorkCenterUserServiceImpl.java b/src/main/java/org/jeecg/modules/base/service/impl/WorkCenterUserServiceImpl.java
deleted file mode 100644
index bc4153f..0000000
--- a/src/main/java/org/jeecg/modules/base/service/impl/WorkCenterUserServiceImpl.java
+++ /dev/null
@@ -1,89 +0,0 @@
-package org.jeecg.modules.base.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.jeecg.common.system.vo.SelectTreeModel;
-import org.jeecg.modules.base.entity.WorkCenterUser;
-import org.jeecg.modules.base.mapper.WorkCenterUserMapper;
-import org.jeecg.modules.base.service.IWorkCenterUserService;
-import org.jeecg.modules.system.entity.SysDepart;
-import org.jeecg.modules.system.mapper.SysDepartMapper;
-import org.jeecg.modules.system.mapper.SysUserMapper;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-import java.util.*;
-import java.util.stream.Collectors;
-
-/**
- * @Description: mom_base_work_center_user
- * @Author: jeecg-boot
- * @Date: 2022-12-06
- * @Version: V1.0
- */
-@Service
-public class WorkCenterUserServiceImpl extends ServiceImpl<WorkCenterUserMapper, WorkCenterUser> implements IWorkCenterUserService {
- @Autowired
- private WorkCenterUserMapper workCenterUserMapper;
-
- @Autowired
- private SysDepartMapper sysDepartMapper;
-
- @Override
- public Page<Map<String,Object>> listByWorkCenterId(Page<Map<String, Object>> page, String workCenterId) {
- return page.setRecords(workCenterUserMapper.listByWorkCenterId(page,workCenterId));
- }
-
- @Override
- public Page<Map<String, Object>> getAddUserList(Page<Map<String, Object>> page, String departId, List<String> userIdList) {
-
- return page.setRecords(workCenterUserMapper.getAddUserList(page,departId,userIdList));
- }
-
- @Override
- public Page<Map<String, Object>> getUserList(Page<Map<String, Object>> page, List<String> userIdList, String departId) {
- return page.setRecords(workCenterUserMapper.getUserList(page,userIdList,departId));
- }
-
- @Override
- public List<SelectTreeModel> getDepartTreeByEnterpriseId(String enterpriseId, String departId,Integer version) {
- return loadDepartTreeByParentId(enterpriseId,departId,version);
- }
-
- @Override
- public Page<Map<String, Object>> listByEnterpriseId(Page<Map<String, Object>> page, String enterpriseId, List<String> userIdList,String departId) {
- Set<String> departIds = getDepartIds(departId);
- departIds.add(departId);
- return page.setRecords(workCenterUserMapper.listByEnterpriseId(page,enterpriseId,userIdList,departIds.stream().collect(Collectors.toList())));
- }
-
- public List<SelectTreeModel> loadDepartTreeByParentId(String parentId,String departId,Integer version){
- List<SelectTreeModel> list = workCenterUserMapper.getAddDepartTree(parentId,departId,version);
- if(list.size()!=0){
- for(SelectTreeModel selectTreeModel:list){
- selectTreeModel.setChildren(loadDepartTreeByParentId(selectTreeModel.getKey(),departId,version));
- }
- }
- return list;
- }
- public Set<String> getDepartIds(String parentId){
- Set<String> departIds = new HashSet<>();
- List <String> child = sysDepartMapper.selectList(
- new QueryWrapper<SysDepart>()
- .eq("parent_id",parentId)
- .eq("del_flag",0)
- ).stream().map(SysDepart::getId).collect(Collectors.toList());
- if(CollectionUtils.isNotEmpty(child)){
- child.forEach(id->{
- departIds.add(id);
- departIds.addAll(getDepartIds(id));
- });
- }
- return departIds;
-
- }
-
-}
diff --git a/src/main/java/org/jeecg/modules/system/controller/AdministratorController.java b/src/main/java/org/jeecg/modules/system/controller/AdministratorController.java
deleted file mode 100644
index af70b1a..0000000
--- a/src/main/java/org/jeecg/modules/system/controller/AdministratorController.java
+++ /dev/null
@@ -1,350 +0,0 @@
-package org.jeecg.modules.system.controller;
-
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import org.jeecg.common.system.query.QueryGenerator;
-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.jeecg.common.api.vo.Result;
-import org.jeecg.modules.system.entity.SysUser;
-import org.jeecg.modules.system.service.ISysUserService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.springframework.web.servlet.ModelAndView;
-
-import java.util.*;
-
-import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.base.entity.EnterpriseAdministrator;
-import org.jeecg.modules.system.entity.Administrator;
-import org.jeecg.modules.system.service.IAdministratorService;
-import org.jeecg.modules.base.service.IEnterpriseAdministratorService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.jeecg.common.aspect.annotation.AutoLog;
-import org.apache.shiro.SecurityUtils;
-import org.jeecg.common.system.vo.LoginUser;
-import org.jeecgframework.poi.excel.ExcelImportUtil;
-import org.jeecgframework.poi.excel.def.NormalExcelConstants;
-import org.jeecgframework.poi.excel.entity.ExportParams;
-import org.jeecgframework.poi.excel.entity.ImportParams;
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
-import java.io.IOException;
-import java.util.stream.Collectors;
-
- /**
- * @Description: mom_sys_administrator
- * @Author: jeecg-boot
- * @Date: 2023-01-12
- * @Version: V1.0
- */
-@Api(tags="绯荤粺绠＄悊鍛�")
-@RestController
-@RequestMapping("/sys/administrator")
-@Slf4j
-public class AdministratorController extends JeecgController<Administrator, IAdministratorService> {
-
- @Autowired
- private IAdministratorService administratorService;
-
- @Autowired
- private IEnterpriseAdministratorService enterpriseAdministratorService;
-
- @Autowired
- private ISysUserService sysUserService;
-
-
- /*---------------------------------涓昏〃澶勭悊-begin-------------------------------------*/
-
- /**
- * 鍒嗛〉鍒楄〃鏌ヨ
- * @param map
- * @param pageNo
- * @param pageSize
- * @param req
- * @return
- */
- //@AutoLog(value = "mom_sys_administrator-鍒嗛〉鍒楄〃鏌ヨ")
- @ApiOperation(value="mom_sys_administrator-鍒嗛〉鍒楄〃鏌ヨ", notes="mom_sys_administrator-鍒嗛〉鍒楄〃鏌ヨ")
- @GetMapping(value = "/list")
- public Result<IPage<Map<String,Object>>> queryPageList(Map map,
- @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
- @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
- HttpServletRequest req) {
- Page<Map<String,Object>> page = new Page<>(pageNo, pageSize);
- IPage<Map<String,Object>> pageList = administratorService.mapList(page);
- return Result.OK(pageList);
- }
-
- /**
- * 娣诲姞
- * @param administrator
- * @return
- */
- @AutoLog(value = "mom_sys_administrator-娣诲姞")
- @ApiOperation(value="mom_sys_administrator-娣诲姞", notes="mom_sys_administrator-娣诲姞")
- @PostMapping(value = "/add")
- @Transactional
- public Result<String> add(@RequestBody Administrator administrator) {
- administratorService.save(administrator);
- Administrator savedAamin = administratorService
- .getOne(
- new QueryWrapper<Administrator>()
- .eq("code",administrator.getCode())
- .eq("del_flag",0),
- true
- );
- //鏁版嵁鍚屾鑷崇敤鎴疯〃鏂逛究鐧诲綍浣跨敤
- SysUser sysUser = new SysUser();
- sysUser.setId(savedAamin.getId())
- .setUsername(administrator.getAccount())
- .setPassword(administrator.getPassword())
- .setRealname(administrator.getName())
- .setDelFlag(0);
- sysUserService.save(sysUser);
- return Result.OK("娣诲姞鎴愬姛锛�");
- }
-
- /**
- * 缂栬緫
- * @param administrator
- * @return
- */
- @AutoLog(value = "mom_sys_administrator-缂栬緫")
- @ApiOperation(value="mom_sys_administrator-缂栬緫", notes="mom_sys_administrator-缂栬緫")
- @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
- @Transactional
- public Result<String> edit(@RequestBody Administrator administrator) {
- administratorService.updateById(administrator);
- SysUser sysUser = new SysUser();
- sysUser.setId(administrator.getId())
- .setUsername(administrator.getAccount())
- .setPassword(administrator.getPassword())
- .setRealname(administrator.getName());
- sysUserService.updateById(sysUser);
- return Result.OK("缂栬緫鎴愬姛!");
- }
-
- /**
- * 閫氳繃id鍒犻櫎
- * @param id
- * @return
- */
- @AutoLog(value = "mom_sys_administrator-閫氳繃id鍒犻櫎")
- @ApiOperation(value="mom_sys_administrator-閫氳繃id鍒犻櫎", notes="mom_sys_administrator-閫氳繃id鍒犻櫎")
- @DeleteMapping(value = "/delete")
- public Result<String> delete(@RequestParam(name="id",required=true) String id) {
- administratorService.update(new UpdateWrapper<Administrator>()
- .set("del_flag",1)
- .eq("id",id));
- return Result.OK("鍒犻櫎鎴愬姛!");
- }
-
- /**
- * 鎵归噺鍒犻櫎
- * @param ids
- * @return
- */
- @AutoLog(value = "mom_sys_administrator-鎵归噺鍒犻櫎")
- @ApiOperation(value="mom_sys_administrator-鎵归噺鍒犻櫎", notes="mom_sys_administrator-鎵归噺鍒犻櫎")
- @DeleteMapping(value = "/deleteBatch")
- public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
- this.administratorService.update(new UpdateWrapper<Administrator>()
- .set("del_flag",1)
- .in("id",Arrays.asList(ids.split(","))));
- return Result.OK("鎵归噺鍒犻櫎鎴愬姛!");
- }
-
- /**
- * 瀵煎嚭
- * @return
- */
- //@RequiresPermissions("org.jeecg.modules.demo:mom_sys_administrator:exportXls")
- @RequestMapping(value = "/exportXls")
- public ModelAndView exportXls(HttpServletRequest request, Administrator administrator) {
- return super.exportXls(request, administrator, Administrator.class, "mom_sys_administrator");
- }
-
- /**
- * 瀵煎叆
- * @return
- */
- //@RequiresPermissions("org.jeecg.modules.demo:mom_sys_administrator:importExcel")
- @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
- public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
- return super.importExcel(request, response, Administrator.class);
- }
- /*---------------------------------涓昏〃澶勭悊-end-------------------------------------*/
-
-
- /*--------------------------------瀛愯〃澶勭悊-mom_base_enterprise_administrator-begin----------------------------------------------*/
- /**
- * 閫氳繃涓昏〃ID鏌ヨ
- * @return
- */
- //@AutoLog(value = "mom_base_enterprise_administrator-閫氳繃涓昏〃ID鏌ヨ")
- @ApiOperation(value="mom_base_enterprise_administrator-閫氳繃涓昏〃ID鏌ヨ", notes="mom_base_enterprise_administrator-閫氳繃涓昏〃ID鏌ヨ")
- @GetMapping(value = "/listEnterpriseAdministratorByMainId")
- public Result<IPage<Map<String,Object>>> listEnterpriseAdministratorByMainId(
- @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
- @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
- @RequestParam(name = "administratorId",defaultValue = "") String administratorId,
- @RequestParam(name = "enterpriseId",defaultValue = "") String enterpriseId
- ) {
- Page<Map<String,Object>> page = new Page<Map<String,Object>>(pageNo, pageSize);
- IPage<Map<String,Object>> pageList = enterpriseAdministratorService.mapList(page, administratorId,enterpriseId);
- return Result.OK(pageList);
- }
-
- /**
- * 娣诲姞
- * @param map
- * @return
- */
- @Transactional(rollbackFor = {})
- @AutoLog(value = "mom_base_enterprise_administrator-娣诲姞")
- @ApiOperation(value="mom_base_enterprise_administrator-娣诲姞", notes="mom_base_enterprise_administrator-娣诲姞")
- @PostMapping(value = "/addEnterpriseAdministrator")
- public Result<String> addEnterpriseAdministrator(@RequestBody Map<String,Object> map) {
- String administratorId = String.valueOf(map.get("administratorId"));
- List<String> targetKeys = (List<String>) map.get("targetKeys");
- LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal();
- enterpriseAdministratorService.remove(new QueryWrapper<EnterpriseAdministrator>()
- .eq("administrator_id",administratorId));
- List<EnterpriseAdministrator> administrators = new ArrayList<>();
- targetKeys.forEach(eid->{
- EnterpriseAdministrator enterpriseAdministrator = new EnterpriseAdministrator();
- enterpriseAdministrator
- .setEnterpriseId(eid)
- .setAdministratorId(administratorId)
- .setAuthName(sysUser.getRealname())
- .setDelFlag(0);
- administrators.add(enterpriseAdministrator);
- });
- enterpriseAdministratorService.saveBatch(administrators);
- return Result.OK("鍒嗛厤鎴愬姛锛�");
- }
-
- /**
- * 缂栬緫
- * @param enterpriseAdministrator
- * @return
- */
- @AutoLog(value = "mom_base_enterprise_administrator-缂栬緫")
- @ApiOperation(value="mom_base_enterprise_administrator-缂栬緫", notes="mom_base_enterprise_administrator-缂栬緫")
- @RequestMapping(value = "/editEnterpriseAdministrator", method = {RequestMethod.PUT,RequestMethod.POST})
- public Result<String> editEnterpriseAdministrator(@RequestBody EnterpriseAdministrator enterpriseAdministrator) {
- enterpriseAdministratorService.updateById(enterpriseAdministrator);
- return Result.OK("缂栬緫鎴愬姛!");
- }
-
- /**
- * 閫氳繃id鍒犻櫎
- * @param id
- * @return
- */
- @AutoLog(value = "mom_base_enterprise_administrator-閫氳繃id鍒犻櫎")
- @ApiOperation(value="mom_base_enterprise_administrator-閫氳繃id鍒犻櫎", notes="mom_base_enterprise_administrator-閫氳繃id鍒犻櫎")
- @DeleteMapping(value = "/deleteEnterpriseAdministrator")
- public Result<String> deleteEnterpriseAdministrator(@RequestParam(name="id",required=true) String id) {
- enterpriseAdministratorService.removeById(id);
- return Result.OK("鍒犻櫎鎴愬姛!");
- }
-
- /**
- * 鎵归噺鍒犻櫎
- * @param ids
- * @return
- */
- @AutoLog(value = "mom_base_enterprise_administrator-鎵归噺鍒犻櫎")
- @ApiOperation(value="mom_base_enterprise_administrator-鎵归噺鍒犻櫎", notes="mom_base_enterprise_administrator-鎵归噺鍒犻櫎")
- @DeleteMapping(value = "/deleteBatchEnterpriseAdministrator")
- public Result<String> deleteBatchEnterpriseAdministrator(@RequestParam(name="ids",required=true) String ids) {
- this.enterpriseAdministratorService.removeByIds(Arrays.asList(ids.split(",")));
- return Result.OK("鎵归噺鍒犻櫎鎴愬姛!");
- }
-
- /**
- * 瀵煎嚭
- * @return
- */
- @RequestMapping(value = "/exportEnterpriseAdministrator")
- public ModelAndView exportEnterpriseAdministrator(HttpServletRequest request, EnterpriseAdministrator enterpriseAdministrator) {
- // Step.1 缁勮鏌ヨ鏉′欢
- QueryWrapper<EnterpriseAdministrator> queryWrapper = QueryGenerator.initQueryWrapper(enterpriseAdministrator, request.getParameterMap());
- LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-
- // Step.2 鑾峰彇瀵煎嚭鏁版嵁
- List<EnterpriseAdministrator> pageList = enterpriseAdministratorService.list(queryWrapper);
- List<EnterpriseAdministrator> exportList = null;
-
- // 杩囨护閫変腑鏁版嵁
- String selections = request.getParameter("selections");
- if (oConvertUtils.isNotEmpty(selections)) {
- List<String> selectionList = Arrays.asList(selections.split(","));
- exportList = pageList.stream().filter(item -> selectionList.contains(item.getId())).collect(Collectors.toList());
- } else {
- exportList = pageList;
- }
-
- // Step.3 AutoPoi 瀵煎嚭Excel
- ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
- //姝ゅ璁剧疆鐨刦ilename鏃犳晥,鍓嶇浼氶噸鏇存柊璁剧疆涓�涓�
- mv.addObject(NormalExcelConstants.FILE_NAME, "mom_base_enterprise_administrator");
- mv.addObject(NormalExcelConstants.CLASS, EnterpriseAdministrator.class);
- mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("mom_base_enterprise_administrator鎶ヨ〃", "瀵煎嚭浜�:" + sysUser.getRealname(), "mom_base_enterprise_administrator"));
- mv.addObject(NormalExcelConstants.DATA_LIST, exportList);
- return mv;
- }
-
- /**
- * 瀵煎叆
- * @return
- */
- @RequestMapping(value = "/importEnterpriseAdministrator/{mainId}")
- public Result<?> importEnterpriseAdministrator(HttpServletRequest request, HttpServletResponse response, @PathVariable("mainId") String mainId) {
- MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
- Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
- for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
- // 鑾峰彇涓婁紶鏂囦欢瀵硅薄
- MultipartFile file = entity.getValue();
- ImportParams params = new ImportParams();
- params.setTitleRows(2);
- params.setHeadRows(1);
- params.setNeedSave(true);
- try {
- List<EnterpriseAdministrator> list = ExcelImportUtil.importExcel(file.getInputStream(), EnterpriseAdministrator.class, params);
- for (EnterpriseAdministrator temp : list) {
- temp.setAdministratorId(mainId);
- }
- long start = System.currentTimeMillis();
- enterpriseAdministratorService.saveBatch(list);
- log.info("娑堣�楁椂闂�" + (System.currentTimeMillis() - start) + "姣");
- return Result.OK("鏂囦欢瀵煎叆鎴愬姛锛佹暟鎹鏁帮細" + list.size());
- } catch (Exception e) {
- log.error(e.getMessage(), e);
- return Result.error("鏂囦欢瀵煎叆澶辫触:" + e.getMessage());
- } finally {
- try {
- file.getInputStream().close();
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
- }
- return Result.error("鏂囦欢瀵煎叆澶辫触锛�");
- }
-
- /*--------------------------------瀛愯〃澶勭悊-mom_base_enterprise_administrator-end----------------------------------------------*/
-
-
-
-
-}
diff --git a/src/main/java/org/jeecg/modules/system/controller/MdcProductionController.java b/src/main/java/org/jeecg/modules/system/controller/MdcProductionController.java
deleted file mode 100644
index 555cd8c..0000000
--- a/src/main/java/org/jeecg/modules/system/controller/MdcProductionController.java
+++ /dev/null
@@ -1,357 +0,0 @@
-package org.jeecg.modules.system.controller;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.shiro.SecurityUtils;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
-import org.jeecg.common.constant.CommonConstant;
-import org.jeecg.common.system.base.controller.JeecgController;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.system.vo.LoginUser;
-import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.system.entity.MdcProduction;
-import org.jeecg.modules.system.model.MdcProductionTreeModel;
-import org.jeecg.modules.system.model.ProductionIdModel;
-import org.jeecg.modules.system.service.IMdcProductionService;
-import org.jeecg.modules.system.vo.MdcProOptionsVo;
-import org.springframework.cache.annotation.CacheEvict;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.servlet.ModelAndView;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * @Description: 浜х嚎琛�
- * @Author: liuS
- * @Date: 2023-03-23
- * @Version: V1.0
- */
-@Slf4j
-@Api(tags = "浜х嚎琛�")
-@RestController
-@RequestMapping("/mdc/mdcProduction")
-public class MdcProductionController extends JeecgController<MdcProduction, IMdcProductionService> {
- @Resource
- private IMdcProductionService mdcProductionService;
-
- /**
- * 鍒嗛〉鍒楄〃鏌ヨ
- *
- * @param mdcProduction
- * @param pageNo
- * @param pageSize
- * @param req
- * @return
- */
- @AutoLog(value = "浜х嚎琛�-鍒嗛〉鍒楄〃鏌ヨ")
- @ApiOperation(value = "浜х嚎琛�-鍒嗛〉鍒楄〃鏌ヨ", notes = "浜х嚎琛�-鍒嗛〉鍒楄〃鏌ヨ")
- @GetMapping(value = "/list")
- public Result<?> queryPageList(MdcProduction mdcProduction,
- @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
- @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
- HttpServletRequest req) {
- QueryWrapper<MdcProduction> queryWrapper = QueryGenerator.initQueryWrapper(mdcProduction, req.getParameterMap());
- Page<MdcProduction> page = new Page<MdcProduction>(pageNo, pageSize);
- IPage<MdcProduction> pageList = mdcProductionService.page(page, queryWrapper);
- return Result.OK(pageList);
- }
-
- @AutoLog(value = "浜х嚎琛�-鏍戝舰鍒楄〃")
- @ApiOperation(value = "浜х嚎琛�-鏍戝舰鍒楄〃", notes = "浜х嚎琛�-鏍戝舰鍒楄〃")
- @GetMapping(value = "/queryTreeList")
- public Result<List<MdcProductionTreeModel>> queryTreeList(@RequestParam(name = "ids", required = false) String ids) {
- Result<List<MdcProductionTreeModel>> result = new Result<>();
- try {
- if (oConvertUtils.isNotEmpty(ids)) {
- List<MdcProductionTreeModel> productionList = mdcProductionService.queryTreeList(ids);
- result.setResult(productionList);
- } else {
- List<MdcProductionTreeModel> list = mdcProductionService.queryTreeList();
- result.setResult(list);
- }
- result.setSuccess(true);
- } catch (Exception e) {
- log.error(e.getMessage(), e);
- }
- return result;
- }
-
- @AutoLog(value = "浜х嚎琛�-鏍戝舰鍒楄〃(MDC)")
- @ApiOperation(value = "浜х嚎琛�-鏍戝舰鍒楄〃(MDC)", notes = "浜х嚎琛�-鏍戝舰鍒楄〃(MDC)")
- @GetMapping(value = "/queryTreeListByMdc")
- public Result<List<MdcProductionTreeModel>> queryTreeListByMdc(@RequestParam(name = "ids", required = false) String ids) {
- Result<List<MdcProductionTreeModel>> result = new Result<>();
- try {
- if (oConvertUtils.isNotEmpty(ids)) {
- List<MdcProductionTreeModel> productionList = mdcProductionService.queryTreeListByMdc(ids);
- result.setResult(productionList);
- } else {
- List<MdcProductionTreeModel> list = mdcProductionService.queryTreeListByMdc();
- result.setResult(list);
- }
- result.setSuccess(true);
- } catch (Exception e) {
- log.error(e.getMessage(), e);
- }
- return result;
- }
-
- @AutoLog(value = "浜х嚎琛�-鏍戝舰鍒楄〃(娣诲姞绯荤粺閰嶇疆)")
- @ApiOperation(value = "浜х嚎琛�-鏍戝舰鍒楄〃(娣诲姞绯荤粺閰嶇疆)", notes = "浜х嚎琛�-鏍戝舰鍒楄〃(娣诲姞绯荤粺閰嶇疆)")
- @GetMapping(value = "/queryTreeListByConfig")
- public Result<List<MdcProductionTreeModel>> queryTreeListByConfig(@RequestParam(name = "ids", required = false) String ids) {
- Result<List<MdcProductionTreeModel>> result = new Result<>();
- try {
- if (oConvertUtils.isNotEmpty(ids)) {
- List<MdcProductionTreeModel> productionList = mdcProductionService.queryTreeList(ids);
- result.setResult(productionList);
- } else {
- List<MdcProductionTreeModel> list = mdcProductionService.queryTreeListByConfig();
- result.setResult(list);
- }
- result.setSuccess(true);
- } catch (Exception e) {
- log.error(e.getMessage(), e);
- }
- return result;
- }
-
- @ApiOperation(value = "浜х嚎琛�-鏍规嵁鐢ㄦ埛id鑾峰彇浜х嚎涓嬫媺鏍戦�夐」", notes = "浜х嚎琛�-鏍规嵁鐢ㄦ埛id鑾峰彇浜х嚎涓嬫媺鏍戦�夐」")
- @GetMapping(value = "/loadProductionTreeOptions")
- public Result<List<ProductionIdModel>> loadProductionTreeOptions() {
- Result<List<ProductionIdModel>> result = new Result<>();
- LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
- String userId = user.getId();
- try {
- List<ProductionIdModel> list = mdcProductionService.loadProductionTreeOptions(userId);
- result.setSuccess(true);
- result.setResult(list);
- } catch (Exception e) {
- log.error(e.getMessage(), e);
- }
- return result;
- }
-
- @AutoLog(value = "浜х嚎琛�-id闆嗗悎")
- @ApiOperation(value = "浜х嚎琛�-id闆嗗悎", notes = "浜х嚎琛�-id闆嗗悎")
- @GetMapping(value = "/queryTreeIdList")
- public Result<List<String>> queryTreeIdList() {
- Result<List<String>> result = new Result<>();
- try {
- List<MdcProduction> productionList = mdcProductionService.list(new LambdaQueryWrapper<MdcProduction>().eq(MdcProduction::getDelFlag, CommonConstant.DEL_FLAG_0).orderByAsc(MdcProduction::getProductionOrder));
- List<String> ids = productionList.stream().map(MdcProduction::getId).collect(Collectors.toList());
- result.setSuccess(true);
- result.setResult(ids);
- } catch (Exception e) {
- log.error(e.getMessage(), e);
- }
- return result;
- }
-
- /**
- * 娣诲姞
- *
- * @param mdcProduction
- * @return
- */
- @AutoLog(value = "浜х嚎琛�-娣诲姞")
- @ApiOperation(value = "浜х嚎琛�-娣诲姞", notes = "浜х嚎琛�-娣诲姞")
- @PostMapping(value = "/add")
- @CacheEvict(value = {"mdc:cache:production:alldata", "mdc:cache:production:allids"}, allEntries = true)
- public Result<MdcProduction> add(@RequestBody MdcProduction mdcProduction) {
- Result<MdcProduction> result = new Result<>();
- try {
- mdcProductionService.saveProductionData(mdcProduction);
- result.success("娣诲姞鎴愬姛锛�");
- } catch (Exception e) {
- log.error(e.getMessage(), e);
- result.error500("鎿嶄綔澶辫触");
- }
- return result;
- }
-
- /**
- * 缂栬緫
- *
- * @param mdcProduction
- * @return
- */
- @AutoLog(value = "浜х嚎琛�-缂栬緫")
- @ApiOperation(value = "浜х嚎琛�-缂栬緫", notes = "浜х嚎琛�-缂栬緫")
- @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
- @CacheEvict(value = {"mdc:cache:production:alldata", "mdc:cache:production:allids"}, allEntries = true)
- public Result<MdcProduction> edit(@RequestBody MdcProduction mdcProduction) {
- Result<MdcProduction> result = new Result<>();
- MdcProduction mdcProductionEntity = mdcProductionService.getById(mdcProduction.getId());
- if (mdcProductionEntity == null) {
- result.error500("鏈壘鍒板搴斿疄浣�");
- } else {
- boolean ok = mdcProductionService.updateProductionDataById(mdcProduction);
- if (ok) {
- result.success("淇敼鎴愬姛!");
- }
- }
- return result;
- }
-
- /**
- * 閫氳繃id鍒犻櫎
- *
- * @param id
- * @return
- */
- @AutoLog(value = "浜х嚎琛�-閫氳繃id鍒犻櫎")
- @ApiOperation(value = "浜х嚎琛�-閫氳繃id鍒犻櫎", notes = "浜х嚎琛�-閫氳繃id鍒犻櫎")
- @DeleteMapping(value = "/delete")
- @CacheEvict(value = {"mdc:cache:production:alldata", "mdc:cache:production:allids"}, allEntries = true)
- public Result<MdcProduction> delete(@RequestParam(name = "id", required = true) String id) {
- Result<MdcProduction> result = new Result<>();
- MdcProduction mdcProduction = mdcProductionService.getById(id);
- if (mdcProduction == null) {
- result.error500("鏈壘鍒板搴斿疄浣�");
- } else {
- boolean ok = mdcProductionService.delete(id);
- if (ok) {
- result.success("鍒犻櫎鎴愬姛!");
- }
- }
- return result;
- }
-
- /**
- * 鎵归噺鍒犻櫎
- *
- * @param ids
- * @return
- */
- @AutoLog(value = "浜х嚎琛�-鎵归噺鍒犻櫎")
- @ApiOperation(value = "浜х嚎琛�-鎵归噺鍒犻櫎", notes = "浜х嚎琛�-鎵归噺鍒犻櫎")
- @DeleteMapping(value = "/deleteBatch")
- @CacheEvict(value = {"mdc:cache:production:alldata", "mdc:cache:production:allids"}, allEntries = true)
- public Result<MdcProduction> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
- Result<MdcProduction> result = new Result<>();
- if (ids == null || "".equals(ids.trim())) {
- result.error500("鍙傛暟涓嶈瘑鍒紒");
- } else {
- this.mdcProductionService.deleteBatchWithChildren(Arrays.asList(ids.split(",")));
- result.success("鍒犻櫎鎴愬姛!");
- }
- return result;
- }
-
- @AutoLog(value = "浜х嚎琛�-鏌ヨ鏍戝舰缁撴瀯鎵�鏈変骇绾垮悕绉�")
- @ApiOperation(value = "浜х嚎琛�-鏌ヨ鏍戝舰缁撴瀯鎵�鏈変骇绾垮悕绉�", notes = "浜х嚎琛�-鏌ヨ鏍戝舰缁撴瀯鎵�鏈変骇绾垮悕绉�")
- @GetMapping(value = "/queryIdTree")
- public Result<List<ProductionIdModel>> queryIdTree() {
- Result<List<ProductionIdModel>> result = new Result<>();
- try {
- List<ProductionIdModel> list = mdcProductionService.queryProductionIdTreeList();
- result.setResult(list);
- result.setSuccess(true);
- } catch (Exception e) {
- log.error(e.getMessage(), e);
- }
- return result;
- }
-
- @AutoLog(value = "浜х嚎琛�-鏍规嵁鍏抽敭瀛楁ā绯婃悳绱㈢浉鍏充骇绾�")
- @ApiOperation(value = "浜х嚎琛�-鏍规嵁鍏抽敭瀛楁ā绯婃悳绱㈢浉鍏充骇绾�", notes = "浜х嚎琛�-鏍规嵁鍏抽敭瀛楁ā绯婃悳绱㈢浉鍏充骇绾�")
- @GetMapping(value = "/searchBy")
- public Result<List<MdcProductionTreeModel>> searchBy(@RequestParam(name = "keyWord", required = true) String keyWord) {
- Result<List<MdcProductionTreeModel>> result = new Result<>();
- List<MdcProductionTreeModel> treeList = mdcProductionService.searchByKeyWord(keyWord);
- if (treeList == null || treeList.isEmpty()) {
- result.setSuccess(false);
- result.setMessage("鏈煡璇㈠尮閰嶆暟鎹紒");
- return result;
- }
- result.setResult(treeList);
- return result;
- }
-
- /**
- * 閫氳繃id鏌ヨ
- *
- * @param id
- * @return
- */
- @AutoLog(value = "浜х嚎琛�-閫氳繃id鏌ヨ")
- @ApiOperation(value = "浜х嚎琛�-閫氳繃id鏌ヨ", notes = "浜х嚎琛�-閫氳繃id鏌ヨ")
- @GetMapping(value = "/queryById")
- public Result<?> queryById(@RequestParam(name = "id", required = true) String id) {
- MdcProduction mdcProduction = mdcProductionService.getById(id);
- return Result.OK(mdcProduction);
- }
-
- /**
- * 瀵煎嚭excel
- *
- * @param request
- * @param mdcProduction
- */
- @AutoLog(value = "浜х嚎琛�-瀵煎嚭excel")
- @ApiOperation(value = "浜х嚎琛�-瀵煎嚭excel", notes = "浜х嚎琛�-瀵煎嚭excel")
- @RequestMapping(value = "/exportXls")
- public ModelAndView exportXls(HttpServletRequest request, MdcProduction mdcProduction) {
- return super.exportXls(request, mdcProduction, MdcProduction.class, "浜х嚎琛�");
- }
-
- /**
- * 閫氳繃excel瀵煎叆鏁版嵁
- *
- * @param request
- * @param response
- * @return
- */
- @AutoLog(value = "浜х嚎琛�-閫氳繃excel瀵煎叆鏁版嵁")
- @ApiOperation(value = "浜х嚎琛�-閫氳繃excel瀵煎叆鏁版嵁", notes = "浜х嚎琛�-閫氳繃excel瀵煎叆鏁版嵁")
- @PostMapping(value = "/importExcel")
- @CacheEvict(value = {"mdc:cache:production:alldata", "mdc:cache:production:allids"}, allEntries = true)
- public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
- return super.importExcel(request, response, MdcProduction.class);
- }
-
- @ApiOperation(value = "浜х嚎琛�-鏍规嵁鐢ㄦ埛id鑾峰彇MDC浜х嚎(涓績)鎴栫彮缁勪笅鎷夐�夐」", notes = "浜х嚎琛�-鏍规嵁鐢ㄦ埛id鑾峰彇MDC浜х嚎(涓績)鎴栫彮缁勪笅鎷夐�夐」")
- @GetMapping(value = "/loadProductionOptions")
- public Result<?> loadProductionOptions(String productionId) {
- Result<List<MdcProOptionsVo>> result = new Result<>();
- LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
- String userId = user.getId();
- try {
- List<MdcProOptionsVo> list = mdcProductionService.loadProductionOptions(userId, productionId);
- result.setSuccess(true);
- result.setResult(list);
- } catch (Exception e) {
- log.error(e.getMessage(), e);
- }
- return result;
- }
-
- @ApiOperation(value = "浜х嚎琛�-鏍规嵁鐝粍id鑾峰彇閰嶉�佺粍涓嬫媺閫夐」", notes = "浜х嚎琛�-鏍规嵁鐝粍id鑾峰彇閰嶉�佺粍涓嬫媺閫夐」")
- @GetMapping(value = "/loadTeamOptions")
- public Result<?> loadTeamOptions(@RequestParam(name = "productionId", required = true) String productionId) {
- Result<List<MdcProOptionsVo>> result = new Result<>();
- LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
- String userId = user.getId();
- try {
- List<MdcProOptionsVo> list = mdcProductionService.loadTeamOptions(userId, productionId);
- result.setSuccess(true);
- result.setResult(list);
- } catch (Exception e) {
- log.error(e.getMessage(), e);
- }
- return result;
- }
-
-}
diff --git a/src/main/java/org/jeecg/modules/system/controller/SysUserController.java b/src/main/java/org/jeecg/modules/system/controller/SysUserController.java
index ba318e0..b1de9f0 100644
--- a/src/main/java/org/jeecg/modules/system/controller/SysUserController.java
+++ b/src/main/java/org/jeecg/modules/system/controller/SysUserController.java
@@ -25,13 +25,17 @@
import org.jeecg.common.system.util.JwtUtil;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.common.util.*;
+import org.jeecg.modules.base.entity.UserGroup;
import org.jeecg.modules.base.service.BaseCommonService;
+import org.jeecg.modules.base.service.IUserFactoryService;
+import org.jeecg.modules.base.service.IUserGroupService;
import org.jeecg.modules.system.entity.*;
import org.jeecg.modules.system.model.DepartIdModel;
-import org.jeecg.modules.system.model.ProductionIdModel;
+import org.jeecg.modules.base.model.FactoryIdModel;
import org.jeecg.modules.system.model.SysUserSysDepartModel;
import org.jeecg.modules.system.service.*;
import org.jeecg.modules.system.vo.SysDepartUsersVO;
+import org.jeecg.modules.system.vo.SysUserGroupVO;
import org.jeecg.modules.system.vo.SysUserRoleVO;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
@@ -97,7 +101,10 @@
private BaseCommonService baseCommonService;
@Resource
- private IMdcUserProductionService userProductionService;
+ private IUserFactoryService userFactoryService;
+
+ @Resource
+ private IUserGroupService userGroupService;
/**
* 鑾峰彇鐢ㄦ埛鍒楄〃鏁版嵁
@@ -464,10 +471,10 @@
@AutoLog(value = "鐢ㄦ埛琛�-鏌ヨ鎸囧畾鐢ㄦ埛鍜屼骇绾垮叧鑱旂殑鏁版嵁")
@ApiOperation(value = "鐢ㄦ埛琛�-鏌ヨ鎸囧畾鐢ㄦ埛鍜屼骇绾垮叧鑱旂殑鏁版嵁", notes = "鐢ㄦ埛琛�-鏌ヨ鎸囧畾鐢ㄦ埛鍜屼骇绾垮叧鑱旂殑鏁版嵁")
@GetMapping(value = "/userProductionList")
- public Result<List<ProductionIdModel>> getUserProductionsList(@RequestParam(name = "userId", required = true) String userId) {
- Result<List<ProductionIdModel>> result = new Result<>();
+ public Result<List<FactoryIdModel>> getUserProductionsList(@RequestParam(name = "userId", required = true) String userId) {
+ Result<List<FactoryIdModel>> result = new Result<>();
try {
- List<ProductionIdModel> proIdModelList = this.userProductionService.queryProductionIdsOfUser(userId);
+ List<FactoryIdModel> proIdModelList = this.userFactoryService.queryFactoryIdsOfUser(userId);
if (proIdModelList != null && !proIdModelList.isEmpty()) {
result.setSuccess(true);
result.setMessage("鏌ユ壘鎴愬姛");
@@ -1588,4 +1595,99 @@
return ls;
}
+
+ @RequestMapping(value = "/userGroupList", method = RequestMethod.GET)
+ public Result<IPage<SysUser>> userGroupList(@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+ @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
+ Result<IPage<SysUser>> result = new Result<IPage<SysUser>>();
+ Page<SysUser> page = new Page<SysUser>(pageNo, pageSize);
+ String groupId = req.getParameter("groupId");
+ String username = req.getParameter("username");
+ IPage<SysUser> pageList = sysUserService.getUserByGroupId(page, groupId, username);
+ result.setSuccess(true);
+ result.setResult(pageList);
+ return result;
+ }
+
+ /**
+ * 缁欐寚瀹氱彮缁勬坊鍔犱汉鍛�
+ *
+ * @param
+ * @return
+ */
+ //@RequiresRoles({"admin"})
+ @RequestMapping(value = "/addBaseUserGroup", method = RequestMethod.POST)
+ public Result<String> addBaseUserGroup(@RequestBody SysUserGroupVO sysUserGroupVO) {
+ Result<String> result = new Result<String>();
+ try {
+ String groupId = sysUserGroupVO.getGroupId();
+ for (String userId : sysUserGroupVO.getUserIdList()) {
+ UserGroup userGroup = new UserGroup(groupId,userId);
+ QueryWrapper<UserGroup> queryWrapper = new QueryWrapper<UserGroup>();
+ queryWrapper.eq("group_id", groupId).eq("user_id", userId);
+ UserGroup one = userGroupService.getOne(queryWrapper);
+ if (one == null) {
+ userGroupService.save(userGroup);
+ }
+
+ }
+ result.setMessage("娣诲姞鎴愬姛!");
+ result.setSuccess(true);
+ return result;
+ } catch (Exception e) {
+ log.error(e.getMessage(), e);
+ result.setSuccess(false);
+ result.setMessage("鍑洪敊浜�: " + e.getMessage());
+ return result;
+ }
+ }
+
+ /**
+ * 鍒犻櫎鎸囧畾鐝粍鐨勪汉鍛樺叧绯�
+ *
+ * @param
+ * @return
+ */
+ //@RequiresRoles({"admin"})
+ @RequestMapping(value = "/deleteUserGroup", method = RequestMethod.DELETE)
+ public Result<UserGroup> deleteUserGroup(@RequestParam(name = "groupId") String groupId,
+ @RequestParam(name = "userId", required = true) String userId
+ ) {
+ Result<UserGroup> result = new Result<UserGroup>();
+ try {
+ QueryWrapper<UserGroup> queryWrapper = new QueryWrapper<UserGroup>();
+ queryWrapper.eq("group_id", groupId).eq("user_id", userId);
+ userGroupService.remove(queryWrapper);
+ result.success("鍒犻櫎鎴愬姛!");
+ } catch (Exception e) {
+ log.error(e.getMessage(), e);
+ result.error500("鍒犻櫎澶辫触锛�");
+ }
+ return result;
+ }
+
+ /**
+ * 鎵归噺鍒犻櫎鎸囧畾鐝粍鐨勪汉鍛樺叧绯�
+ *
+ * @param
+ * @return
+ */
+ //@RequiresRoles({"admin"})
+ @RequestMapping(value = "/deleteUserGroupBatch", method = RequestMethod.DELETE)
+ public Result<UserGroup> deleteUserGroupBatch(
+ @RequestParam(name = "groupId") String groupId,
+ @RequestParam(name = "userIds", required = true) String userIds) {
+ Result<UserGroup> result = new Result<UserGroup>();
+ try {
+ QueryWrapper<UserGroup> queryWrapper = new QueryWrapper<UserGroup>();
+ queryWrapper.eq("group_id", groupId).in("user_id", Arrays.asList(userIds.split(",")));
+ userGroupService.remove(queryWrapper);
+ result.success("鍒犻櫎鎴愬姛!");
+ } catch (Exception e) {
+ log.error(e.getMessage(), e);
+ result.error500("鍒犻櫎澶辫触锛�");
+ }
+ return result;
+ }
+
}
diff --git a/src/main/java/org/jeecg/modules/system/entity/Administrator.java b/src/main/java/org/jeecg/modules/system/entity/Administrator.java
deleted file mode 100644
index 693e46c..0000000
--- a/src/main/java/org/jeecg/modules/system/entity/Administrator.java
+++ /dev/null
@@ -1,109 +0,0 @@
-package org.jeecg.modules.system.entity;
-
-import java.io.Serializable;
-import java.io.UnsupportedEncodingException;
-import java.util.Date;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import org.jeecgframework.poi.excel.annotation.Excel;
-import lombok.Data;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.jeecg.common.aspect.annotation.Dict;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-/**
- * @Description: mom_sys_administrator
- * @Author: jeecg-boot
- * @Date: 2023-01-12
- * @Version: V1.0
- */
-@Data
-@TableName("mom_sys_administrator")
-@ApiModel(value="mom_sys_administrator瀵硅薄", description="mom_sys_administrator")
-public class Administrator implements Serializable {
- private static final long serialVersionUID = 1L;
-
- /**涓婚敭ID*/
- @TableId(type = IdType.ASSIGN_ID)
- @ApiModelProperty(value = "涓婚敭ID")
- private String id;
- /**缂栫爜*/
- @Excel(name = "缂栫爜", width = 15)
- @ApiModelProperty(value = "缂栫爜")
- private String code;
- /**浼佷笟ID*/
- @Excel(name = "浼佷笟ID", width = 15)
- @ApiModelProperty(value = "浼佷笟ID")
- private String enterpriseId;
- /**璐︽埛*/
- @Excel(name = "璐︽埛", width = 15)
- @ApiModelProperty(value = "璐︽埛")
- private String account;
- /**鍚嶇О*/
- @Excel(name = "鍚嶇О", width = 15)
- @ApiModelProperty(value = "鍚嶇О")
- private String name;
- /**瀵嗙爜*/
- @Excel(name = "瀵嗙爜", width = 15)
- @ApiModelProperty(value = "瀵嗙爜")
- private String password;
- /**瀵嗙爜绛栫暐ID*/
- @Excel(name = "瀵嗙爜绛栫暐ID", width = 15)
- @ApiModelProperty(value = "瀵嗙爜绛栫暐ID")
- private String passwordStrategyId;
- /**澶囨敞*/
- @Excel(name = "澶囨敞", width = 15)
- @ApiModelProperty(value = "澶囨敞")
- private String remark;
- /**鐘舵�� 0 绂佺敤 1 鍚敤 2 鏂板缓*/
- @Excel(name = "鐘舵�� 0 绂佺敤 1 鍚敤 2 鏂板缓", width = 15)
- @ApiModelProperty(value = "鐘舵�� 0 鏂板缓 1 鍚敤 2 绂佺敤")
- private Integer statusFlag;
- /**澶囩敤瀛楁1*/
- @Excel(name = "澶囩敤瀛楁1", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁1")
- private String sysAdministratorUda1;
- /**澶囩敤瀛楁2*/
- @Excel(name = "澶囩敤瀛楁2", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁2")
- private String sysAdministratorUda2;
- /**澶囩敤瀛楁3*/
- @Excel(name = "澶囩敤瀛楁3", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁3")
- private String sysAdministratorUda3;
- /**澶囩敤瀛楁4*/
- @Excel(name = "澶囩敤瀛楁4", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁4")
- private String sysAdministratorUda4;
- /**澶囩敤瀛楁5*/
- @Excel(name = "澶囩敤瀛楁5", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁5")
- private String sysAdministratorUda5;
- /**鍒涘缓浜�*/
- @ApiModelProperty(value = "鍒涘缓浜�")
- private String createBy;
- /**鍒涘缓鏃堕棿*/
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
- @DateTimeFormat(pattern="yyyy-MM-dd")
- @ApiModelProperty(value = "鍒涘缓鏃堕棿")
- private Date createTime;
- /**鏇存柊浜�*/
- @ApiModelProperty(value = "鏇存柊浜�")
- private String updateBy;
- /**鏇存柊鏃堕棿*/
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
- @DateTimeFormat(pattern="yyyy-MM-dd")
- @ApiModelProperty(value = "鏇存柊鏃堕棿")
- private Date updateTime;
- /**绉熸埛ID*/
- @Excel(name = "绉熸埛ID", width = 15)
- @ApiModelProperty(value = "绉熸埛ID")
- private String tenantId;
- /**鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)*/
- @Excel(name = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)", width = 15)
- @ApiModelProperty(value = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)")
- private Integer delFlag;
-}
diff --git a/src/main/java/org/jeecg/modules/system/entity/MdcProduction.java b/src/main/java/org/jeecg/modules/system/entity/MdcProduction.java
deleted file mode 100644
index ce30a19..0000000
--- a/src/main/java/org/jeecg/modules/system/entity/MdcProduction.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package org.jeecg.modules.system.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-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;
-import org.jeecgframework.poi.excel.annotation.Excel;
-
-/**
- * @Description: 浜х嚎琛�
- * @Author: liuS
- * @Date: 2023-03-23
- * @Version: V1.0
- */
-@Data
-@TableName("mdc_production")
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value = "mdc_production瀵硅薄", description = "浜х嚎琛�")
-public class MdcProduction extends JeecgEntity {
-
- private static final long serialVersionUID = -2291458618745528389L;
-
- /**
- * 鐖朵骇绾縄D
- */
- @ApiModelProperty(value = "鐖朵骇绾縄D")
- private String parentId;
- /**
- * 浜х嚎鍚嶇О
- */
- @Excel(name = "浜х嚎鍚嶇О", width = 20)
- @ApiModelProperty(value = "浜х嚎鍚嶇О")
- private String productionName;
- /**
- * 缂╁啓
- */
- @ApiModelProperty(value = "缂╁啓")
- private String productionNameAbbr;
- /**
- * 鎺掑簭
- */
- @Excel(name = "鎺掑簭", width = 15)
- @ApiModelProperty(value = "鎺掑簭")
- private Integer productionOrder;
- /**
- * 鎻忚堪
- */
- @Excel(name = "鎻忚堪", width = 15)
- @ApiModelProperty(value = "鎻忚堪")
- private String description;
- /**
- * 浜х嚎绫诲瀷 1涓�绾ч儴闂� 2瀛愰儴闂�
- */
- @ApiModelProperty(value = "浜х嚎绫诲瀷 1涓�绾ч儴闂� 2瀛愰儴闂�")
- private String orgType;
- /**
- * 浜х嚎缂栫爜
- */
- @ApiModelProperty(value = "浜х嚎缂栫爜")
- private String orgCode;
- /**
- * 浜х嚎缂栫爜
- */
- @ApiModelProperty(value = "杞﹂棿缂栫爜")
- private String productionCode;
- /**
- * 鍦板潃
- */
- @Excel(name = "鍦板潃", width = 15)
- @ApiModelProperty(value = "鍦板潃")
- private String address;
- /**
- * 澶囨敞
- */
- @Excel(name = "澶囨敞", width = 20)
- @ApiModelProperty(value = "澶囨敞")
- private String memo;
- /**
- * 鐘舵�侊紙1鍚敤锛�0涓嶅惎鐢級
- */
- @ApiModelProperty(value = "鐘舵�侊紙1鍚敤锛�0涓嶅惎鐢級")
- private String status;
- /**
- * 鍒犻櫎鐘舵�侊紙0锛屾甯革紝1宸插垹闄わ級
- */
- @Excel(name = "鍒犻櫎鐘舵��", width = 15, dicCode = "del_flag")
- @ApiModelProperty(value = "鍒犻櫎鐘舵�侊紙0锛屾甯革紝1宸插垹闄わ級")
- private String delFlag;
-
- /**閮ㄩ棬璐熻矗浜虹殑ids*/
- @TableField(exist = false)
- private String directorUserIds;
-
- /**
- * 鏄惁涓篗DC浣跨敤
- */
- @ApiModelProperty(value = "鏄惁涓篗DC浣跨敤")
- private String mdcFlag;
-}
diff --git a/src/main/java/org/jeecg/modules/system/entity/MdcUserProduction.java b/src/main/java/org/jeecg/modules/system/entity/MdcUserProduction.java
deleted file mode 100644
index 884b85c..0000000
--- a/src/main/java/org/jeecg/modules/system/entity/MdcUserProduction.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:39
- */
-@Data
-@TableName("mdc_user_production")
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value="mdc_user_production瀵硅薄", description="鐢ㄦ埛浜х嚎琛�")
-public class MdcUserProduction implements Serializable {
-
- private static final long serialVersionUID = 108430837598974955L;
-
- /**
- * 涓婚敭id
- */
- @TableId(type = IdType.ASSIGN_ID)
- private String id;
- /**
- * 鐢ㄦ埛id
- */
- private String userId;
- /**
- * 浜х嚎id
- */
- private String proId;
-
- public MdcUserProduction(String id, String userId, String proId) {
- super();
- this.id = id;
- this.userId = userId;
- this.proId = proId;
- }
-
- public MdcUserProduction(String id, String productionId) {
- this.userId = id;
- this.proId = productionId;
- }
-}
diff --git a/src/main/java/org/jeecg/modules/system/mapper/AdministratorMapper.java b/src/main/java/org/jeecg/modules/system/mapper/AdministratorMapper.java
deleted file mode 100644
index 6d0faf6..0000000
--- a/src/main/java/org/jeecg/modules/system/mapper/AdministratorMapper.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.jeecg.modules.system.mapper;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.jeecg.modules.system.entity.Administrator;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * @Description: mom_sys_administrator
- * @Author: jeecg-boot
- * @Date: 2023-01-12
- * @Version: V1.0
- */
-
-public interface AdministratorMapper extends BaseMapper<Administrator> {
- /**
- * 鍒楄〃鏌ヨ
- * @param page
- * @return
- */
- List<Map<String,Object>> mapList(Page<Map<String,Object>> page);
-}
diff --git a/src/main/java/org/jeecg/modules/system/mapper/MdcProductionMapper.java b/src/main/java/org/jeecg/modules/system/mapper/MdcProductionMapper.java
deleted file mode 100644
index f53d482..0000000
--- a/src/main/java/org/jeecg/modules/system/mapper/MdcProductionMapper.java
+++ /dev/null
@@ -1,64 +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.MdcProduction;
-
-import java.util.List;
-
-
-/**
- * @Description: 浜х嚎琛�
- * @Author: liuS
- * @Date: 2023-03-23
- * @Version: V1.0
- */
-public interface MdcProductionMapper extends BaseMapper<MdcProduction> {
-
- /**
- * 鏍规嵁id涓嬬骇浜х嚎
- */
- @Select("SELECT * FROM mdc_production where del_flag ='0' AND parent_id = #{parentId,jdbcType=VARCHAR}")
- List<MdcProduction> queryProdByPid(@Param("parentId") String parentId);
-
- /**
- * 閫掑綊鏌ヨ鎵�鏈夊瓙鑺傜偣
- */
- List<String> recursionChildren(@Param("productionId") String productionId);
-
- /**
- * 涓�缁刬d閫掑綊鎵�鏈夊瓙鑺傜偣
- */
- List<String> recursionChildrenByList(@Param("productionIds") List<String> productionIds);
-
- /**
- * 鏍规嵁鐢ㄦ埛id鍜岃溅闂磇d鑾峰彇鐢ㄦ埛鎷ユ湁鐨勮溅闂磇d
- * @param userId
- * @param productionId
- * @return
- */
- String findFirstProduction(@Param("userId") String userId, @Param("productionId") String productionId);
-
- /**
- * 鏍规嵁鐢ㄦ埛id鏌ヨ鐢ㄦ埛宸ユ鏉冮檺
- * @param userId
- * @return
- */
- String findThreeProductionId(@Param("userId") String userId);
-
- /**
- * 鏍规嵁鐢ㄦ埛id鏌ヨ鐢ㄦ埛鍏ㄩ儴杞﹂棿鏉冮檺
- * @param userId
- * @return
- */
- List<MdcProduction> findAllProductionId(@Param("userId") String userId);
-
- List<String> findChildren(@Param("mdcProductionIds") List<String> mdcProductionIds);
-
- List<MdcProduction> loadProductionOptions(@Param("userId") String userId, @Param("productionId") String productionId);
-
- List<String> findTeamValue(@Param("userId") String userId, @Param("productionList") List<String> productionList);
-
- List<String> findProIdsByUId(@Param("userId") String userId, @Param("allProductionIds") List<String> allProductionIds);
-}
diff --git a/src/main/java/org/jeecg/modules/system/mapper/MdcUserProductionMapper.java b/src/main/java/org/jeecg/modules/system/mapper/MdcUserProductionMapper.java
deleted file mode 100644
index e7c392f..0000000
--- a/src/main/java/org/jeecg/modules/system/mapper/MdcUserProductionMapper.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package org.jeecg.modules.system.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-import org.jeecg.modules.system.entity.MdcUserProduction;
-import org.jeecg.modules.system.entity.SysUser;
-
-import java.util.List;
-
-/**
- * 鐢ㄦ埛浜х嚎Mapper鎺ュ彛
- *
- * @author: LiuS
- * @create: 2023-03-24 15:43
- */
-public interface MdcUserProductionMapper extends BaseMapper<MdcUserProduction> {
-
- /**
- * 鏍规嵁鎸囧畾鐢ㄦ埛id鏌ヨ浜х嚎id闆嗗悎
- */
- List<String> queryProductionIdsByUserId(@Param("userId") String userId);
-
- /**
- * 鑾峰彇宸插垎閰嶇殑鐢ㄦ埛鍒楄〃
- * @param proId
- * @return
- */
- List<SysUser> getUserPermsByGroupId(@Param("proId") String proId);
-
- /**
- * 鑾峰彇鏈垎閰嶇殑鐢ㄦ埛鍒楄〃
- * @param proId
- * @return
- */
- List<SysUser> getUserNonPermsByGroupId(@Param("proId") String proId);
-
- /**
- * 鑾峰彇璁惧鏈垎閰嶇殑鐢ㄦ埛
- * @param proId
- * @return
- */
- List<SysUser> getUserNonPermsByDeviceId(String proId);
-
-
- /**
- * 鑾峰彇璁惧宸插垎閰嶇殑鐢ㄦ埛
- * @param deviceId
- * @return
- */
- List<SysUser> getUserPermsByDeviceId(String deviceId);
-
- /**
- * 閫氳繃杞﹂棿id涓庡矖浣峣d绛涢�夌敤鎴�
- * @param post
- * @param proId
- * @return
- */
- List<SysUser> queryByPostAndProId(@Param("post") String post, @Param("proId") String proId);
-}
diff --git a/src/main/java/org/jeecg/modules/system/mapper/SysUserMapper.java b/src/main/java/org/jeecg/modules/system/mapper/SysUserMapper.java
index 3200bfe..da8346a 100644
--- a/src/main/java/org/jeecg/modules/system/mapper/SysUserMapper.java
+++ b/src/main/java/org/jeecg/modules/system/mapper/SysUserMapper.java
@@ -188,4 +188,13 @@
* @param userNames 鐢ㄦ埛鍚嶅垪琛紙闇�纭繚闈炵┖锛�
*/
List<SysUser> selectUsersByNames(@Param("userNames") List<String> userNames);
+
+ /**
+ * 鏍规嵁鐝粍Id鏌ヨ鐢ㄦ埛淇℃伅
+ * @param page
+ * @param groupId 鐝粍id
+ * @param username 鐢ㄦ埛鐧诲綍璐︽埛
+ * @return
+ */
+ IPage<SysUser> getUserByGroupId(Page page, @Param("groupId") String groupId, @Param("username") String username);
}
diff --git a/src/main/java/org/jeecg/modules/system/mapper/xml/AdministratorMapper.xml b/src/main/java/org/jeecg/modules/system/mapper/xml/AdministratorMapper.xml
deleted file mode 100644
index 4d4a78f..0000000
--- a/src/main/java/org/jeecg/modules/system/mapper/xml/AdministratorMapper.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.system.mapper.AdministratorMapper">
- <select id="mapList" resultType="Map">
- select
- t1.id id,
- t1.account account,
- t1.code code,
- t1.name name,
- t1.password password,
- t1.password_strategy_id passwordStrategyId,
- t1.status_flag statusFlag,
- t1.create_by createBy,
- t1.create_time createTime,
- t1.update_by updateBy,
- t1.update_time updateTime,
- t1.remark remark,
- t2.name passwordStrategyName,
- t2.certification_type certificationType
- from mom_sys_administrator t1
- left join (select * from mom_sys_password_strategy where del_flag = 0) t2
- on t1.password_strategy_id=t2.id
- where t1.del_flag = 0
- </select>
-
-</mapper>
diff --git a/src/main/java/org/jeecg/modules/system/mapper/xml/MdcProductionMapper.xml b/src/main/java/org/jeecg/modules/system/mapper/xml/MdcProductionMapper.xml
deleted file mode 100644
index 7d0b8f2..0000000
--- a/src/main/java/org/jeecg/modules/system/mapper/xml/MdcProductionMapper.xml
+++ /dev/null
@@ -1,141 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.system.mapper.MdcProductionMapper">
-
- <!--閫掑綊鏌ヨ鎵�鏈夊瓙鑺傜偣-->
- <select id="recursionChildren" resultType="java.lang.String">
- WITH temp ( id ) AS (
- SELECT
- id
- FROM
- mdc_production
- WHERE
- id = #{ productionId } UNION ALL
- SELECT
- a.id
- FROM
- mdc_production a
- INNER JOIN temp ON a.parent_id = temp.id
- ) SELECT
- *
- FROM
- temp
- </select>
-
- <!--鏍规嵁鐢ㄦ埛id鍜岃溅闂磇d鑾峰彇鐢ㄦ埛鎷ユ湁鐨勮溅闂磇d-->
- <select id="findFirstProduction" resultType="java.lang.String">
- SELECT TOP 1 t2.id FROM mdc_user_production t1 LEFT JOIN mdc_production t2 ON t1.pro_id = t2.id WHERE t1.user_id = #{ userId } AND t2.parent_id = #{productionId}
- </select>
-
- <!--鏍规嵁鐢ㄦ埛id鏌ヨ鐢ㄦ埛宸ユ鏉冮檺-->
- <select id="findThreeProductionId" resultType="java.lang.String">
- SELECT TOP 1 t2.id id FROM mdc_user_production t1 LEFT JOIN mdc_production t2 ON t1.pro_id = t2.id WHERE t1.user_id = #{userId} AND t2.org_type = '3'
- </select>
- <select id="findAllProductionId" resultType="org.jeecg.modules.system.entity.MdcProduction">
- SELECT
- t1.*
- FROM
- mdc_production t1
- LEFT JOIN mdc_user_production t2 ON t1.id = t2.pro_id
- LEFT JOIN sys_user t3 on t3.ID=t2.user_id
- WHERE
- t3.id = #{userId}
- AND t1.org_type = '3'
- </select>
-
- <select id="recursionChildrenByList" resultType="java.lang.String">
- WITH temp (id) AS (
- -- 鍒濆鏌ヨ锛岃幏鍙栨寚瀹� id 鐨勮褰�
- SELECT
- id
- FROM
- mdc_production
- WHERE
- id IN
- <foreach collection = "productionIds" item = "id" index = "index" open = "(" close = ")" separator = ",">
- #{id}
- </foreach>
- UNION ALL
- -- 閫掑綊鏌ヨ锛屾煡鎵惧瓙鑺傜偣
- SELECT
- a.id
- FROM
- mdc_production a
- INNER JOIN temp ON a.parent_id = temp.id
- )
--- 鏈�缁堟煡璇紝浣跨敤 DISTINCT 鍘婚噸
- SELECT DISTINCT
- id
- FROM
- temp;
- </select>
-
- <select id="findChildren" resultType="java.lang.String">
- WITH temp ( id ) AS (
- SELECT
- id
- FROM
- mdc_production
- WHERE
- id IN
- <foreach collection="mdcProductionIds" item = "id" index = "index" open = "(" close = ")" separator = ",">
- #{id}
- </foreach>
- AND mdc_flag = '1' UNION ALL
- SELECT
- a.id
- FROM
- mdc_production a
- INNER JOIN temp ON a.parent_id = temp.id
- WHERE
- a.mdc_flag = '1'
- ) SELECT
- *
- FROM
- temp
- </select>
-
- <select id="loadProductionOptions" resultType="org.jeecg.modules.system.entity.MdcProduction">
- SELECT
- t1.*
- FROM
- mdc_production t1
- LEFT JOIN mdc_user_production t2 ON t1.id = t2.pro_id
- WHERE
- t2.user_id = #{userId} AND t1.mdc_flag = '1'
- <choose>
- <when test="productionId != null and productionId != ''">
- AND t1.org_type = '3' AND t1.parent_id = #{productionId}
- </when>
- <otherwise>
- AND t1.org_type = '2'
- </otherwise>
- </choose>
- ORDER BY t1.production_order
- </select>
-
- <select id="findTeamValue" resultType="java.lang.String">
- SELECT DISTINCT
- t1.team_code deamCode
- FROM
- mdc_equipment t1
- LEFT JOIN mdc_production_equipment t2 ON t1.id = t2.equipment_id
- WHERE t2.production_id IN
- <foreach collection="productionList" item = "productionId" index = "index" open = "(" close= ")" separator = ",">
- #{productionId}
- </foreach>
- </select>
-
- <select id="findProIdsByUId" resultType="java.lang.String">
- SELECT
- pro_id
- FROM
- mdc_user_production
- WHERE
- pro_id IN
- <foreach collection="allProductionIds" item = "productionId" index = "index" open = "(" close= ")" separator = ",">
- #{productionId}
- </foreach>
- AND user_id = #{userId}
- </select>
-</mapper>
diff --git a/src/main/java/org/jeecg/modules/system/mapper/xml/MdcUserProductionMapper.xml b/src/main/java/org/jeecg/modules/system/mapper/xml/MdcUserProductionMapper.xml
deleted file mode 100644
index 2127abf..0000000
--- a/src/main/java/org/jeecg/modules/system/mapper/xml/MdcUserProductionMapper.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.system.mapper.MdcUserProductionMapper">
-
- <!--鏍规嵁鎸囧畾鐢ㄦ埛id鏌ヨ浜х嚎id闆嗗悎-->
- <select id="queryProductionIdsByUserId" resultType="java.lang.String">
- SELECT pro_id FROM mdc_user_production WHERE user_id = #{userId}
- </select>
- <select id="getUserPermsByGroupId" resultType="org.jeecg.modules.system.entity.SysUser">
- select u.id
- , u.username
- , u.realname
- , u.avatar
- , u.phone
- , u.email
- from sys_user u
- inner join
- (select user_id from mdc_user_production where pro_id=#{proId}) p
- on u.id=p.user_id
- </select>
- <select id="getUserNonPermsByGroupId" resultType="org.jeecg.modules.system.entity.SysUser">
- select u.id
- , u.username
- , u.realname
- , u.avatar
- , u.phone
- , u.email
- from sys_user u
- where u.id not in (select user_id from mdc_user_production where pro_id=#{proId})
- </select>
- <select id="getUserNonPermsByDeviceId" resultType="org.jeecg.modules.system.entity.SysUser">
- select u.id
- , u.username
- , u.realname
- , u.avatar
- , u.phone
- , u.email
- from sys_user u
- where u.id not in (select user_id from nc_device_permission where device_id=#{deviceId})
- </select>
- <select id="getUserPermsByDeviceId" resultType="org.jeecg.modules.system.entity.SysUser">
- select u.id
- , u.username
- , u.realname
- , u.avatar
- , u.phone
- , u.email
- from sys_user u
- inner join
- (select user_id from nc_device_permission where device_id=#{deviceId}) p
- on u.id=p.user_id
- </select>
- <select id="queryByPostAndProId" resultType="org.jeecg.modules.system.entity.SysUser">
- select u.*
- from sys_user u
- inner join
- (select user_id from mdc_user_production where pro_id=#{proId}) p
- on u.id=p.user_id
- where u.post = #{post}
- </select>
-</mapper>
diff --git a/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserMapper.xml b/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserMapper.xml
index 535c50d..e646445 100644
--- a/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserMapper.xml
+++ b/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserMapper.xml
@@ -228,4 +228,12 @@
#{name}
</foreach>
</select>
+
+ <!-- 鏍规嵁鐝粍Id鏌ヨ -->
+ <select id="getUserByGroupId" resultType="org.jeecg.modules.system.entity.SysUser">
+ select * from sys_user where del_flag = 0 and id in (select user_id from base_user_group where group_id=#{groupId})
+ <if test="username!=null and username!=''">
+ and username = #{username}
+ </if>
+ </select>
</mapper>
diff --git a/src/main/java/org/jeecg/modules/system/model/MdcProductionTreeModel.java b/src/main/java/org/jeecg/modules/system/model/MdcProductionTreeModel.java
deleted file mode 100644
index 2ad8b57..0000000
--- a/src/main/java/org/jeecg/modules/system/model/MdcProductionTreeModel.java
+++ /dev/null
@@ -1,125 +0,0 @@
-package org.jeecg.modules.system.model;
-
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import org.jeecg.modules.system.entity.MdcProduction;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-/**
- * @author: LiuS
- * @create: 2023-03-23 14:16
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value = "浜х嚎琛ㄦ爲缁撴瀯鏁版嵁瀹炰綋", description = "浜х嚎琛�")
-public class MdcProductionTreeModel implements Serializable {
-
- private static final long serialVersionUID = -1309711609760828658L;
-
- /**
- * 瀵瑰簲MdcProduction涓殑id瀛楁,鍓嶇鏁版嵁鏍戜腑鐨刱ey
- */
- private String key;
-
- /**
- * 瀵瑰簲MdcProduction涓殑id瀛楁,鍓嶇鏁版嵁鏍戜腑鐨剉alue
- */
- private String value;
-
- /**
- * 瀵瑰簲depart_name瀛楁,鍓嶇鏁版嵁鏍戜腑鐨則itle
- */
- private String title;
-
- private boolean isLeaf;
-
- /**
- * 绫诲瀷
- */
- private Integer type;
- //浠ヤ笅鎵�鏈夊瓧娈靛潎涓嶮dcProduction鐩稿悓
-
- private String id;
-
- private String parentId;
-
- private String productionName;
-
- private String productionNameAbbr;
-
- private Integer productionOrder;
-
- private String description;
-
- private String orgType;
-
- private String orgCode;
-
- private String productionCode;
-
- private String address;
-
- private String memo;
-
- private String status;
-
- private String delFlag;
-
- private String createBy;
-
- private Date createTime;
-
- private String updateBy;
-
- private Date updateTime;
-
- private String mdcFlag;
-
- /**
- * 浜х嚎璐熻矗浜篿ds
- */
- private String directorUserIds;
-
- private List<MdcProductionTreeModel> children = new ArrayList<>();
-
- public MdcProductionTreeModel() {
-
- }
-
- /**
- * 灏哅dcProduction瀵硅薄杞崲鎴怣dcProductionTreeModel瀵硅薄
- *
- * @param mdcProduction
- */
- public MdcProductionTreeModel(MdcProduction mdcProduction) {
- this.key = mdcProduction.getId();
- this.value = mdcProduction.getId();
- this.title = mdcProduction.getProductionName();
- this.id = mdcProduction.getId();
- this.parentId = mdcProduction.getParentId();
- this.productionName = mdcProduction.getProductionName();
- this.productionNameAbbr = mdcProduction.getProductionNameAbbr();
- this.productionOrder = mdcProduction.getProductionOrder();
- this.description = mdcProduction.getDescription();
- this.orgType = mdcProduction.getOrgType();
- this.orgCode = mdcProduction.getOrgCode();
- this.productionCode = mdcProduction.getProductionCode();
- this.address = mdcProduction.getAddress();
- this.memo = mdcProduction.getMemo();
- this.status = mdcProduction.getStatus();
- this.delFlag = mdcProduction.getDelFlag();
- this.createBy = mdcProduction.getCreateBy();
- this.createTime = mdcProduction.getCreateTime();
- this.updateBy = mdcProduction.getUpdateBy();
- this.updateTime = mdcProduction.getUpdateTime();
- this.directorUserIds = mdcProduction.getDirectorUserIds();
- this.mdcFlag = mdcProduction.getMdcFlag();
- }
-}
diff --git a/src/main/java/org/jeecg/modules/system/rule/OrgCodeProRule.java b/src/main/java/org/jeecg/modules/system/rule/OrgCodeProRule.java
deleted file mode 100644
index cc7ee4a..0000000
--- a/src/main/java/org/jeecg/modules/system/rule/OrgCodeProRule.java
+++ /dev/null
@@ -1,98 +0,0 @@
-package org.jeecg.modules.system.rule;
-
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import io.netty.util.internal.StringUtil;
-import org.jeecg.common.handler.IFillRuleHandler;
-import org.jeecg.common.util.SpringContextUtils;
-import org.jeecg.common.util.YouBianCodeUtil;
-import org.jeecg.modules.system.entity.MdcProduction;
-import org.jeecg.modules.system.service.IMdcProductionService;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author: LiuS
- * @create: 2023-07-04 16:15
- * @Description: 杞﹂棿鏈烘瀯缂栫爜鐢熸垚瑙勫垯
- */
-public class OrgCodeProRule implements IFillRuleHandler {
-
- @Override
- public Object execute(JSONObject params, JSONObject formData) {
- IMdcProductionService mdcProductionService = (IMdcProductionService) SpringContextUtils.getBean("mdcProductionServiceImpl");
-
- LambdaQueryWrapper<MdcProduction> query = new LambdaQueryWrapper<MdcProduction>();
- LambdaQueryWrapper<MdcProduction> query1 = new LambdaQueryWrapper<MdcProduction>();
- // 鍒涘缓涓�涓狶ist闆嗗悎,瀛樺偍鏌ヨ杩斿洖鐨勬墍鏈塎dcProduction瀵硅薄
- List<MdcProduction> mdcProductionList = new ArrayList<>();
- String[] strArray = new String[2];
- //瀹氫箟杞﹂棿绫诲瀷
- String orgType = "";
- // 瀹氫箟鏂扮紪鐮佸瓧绗︿覆
- String newOrgCode = "";
- // 瀹氫箟鏃х紪鐮佸瓧绗︿覆
- String oldOrgCode = "";
-
- String parentId = null;
- if (formData != null && formData.size() > 0) {
- Object obj = formData.get("parentId");
- if (obj != null) {
- parentId = obj.toString();
- }
- } else {
- if (params != null) {
- Object obj = params.get("parentId");
- if (obj != null) {
- parentId = obj.toString();
- }
- }
- }
-
- //濡傛灉鏄渶楂樼骇,鍒欐煡璇㈠嚭鍚岀骇鐨刼rg_code, 璋冪敤宸ュ叿绫荤敓鎴愮紪鐮佸苟杩斿洖
- if (StringUtil.isNullOrEmpty(parentId)) {
- // 绾垮垽鏂暟鎹簱涓殑琛ㄦ槸鍚︿负绌�,绌哄垯鐩存帴杩斿洖鍒濆缂栫爜
- query1.eq(MdcProduction::getParentId, "").or().isNull(MdcProduction::getParentId);
- query1.orderByDesc(MdcProduction::getOrgCode);
- mdcProductionList = mdcProductionService.list(query1);
- if (mdcProductionList == null || mdcProductionList.size() == 0) {
- strArray[0] = YouBianCodeUtil.getNextYouBianCode(null);
- strArray[1] = "1";
- return strArray;
- } else {
- MdcProduction mdcProduction = mdcProductionList.get(0);
- oldOrgCode = mdcProduction.getOrgCode();
- orgType = mdcProduction.getOrgType();
- newOrgCode = YouBianCodeUtil.getNextYouBianCode(oldOrgCode);
- }
- } else {//鍙嶄箣鍒欐煡璇㈠嚭鎵�鏈夊悓绾х殑杞﹂棿,鑾峰彇缁撴灉鍚庢湁涓ょ鎯呭喌,鏈夊悓绾у拰娌℃湁鍚岀骇
- // 灏佽鏌ヨ鍚岀骇鐨勬潯浠�
- query.eq(MdcProduction::getParentId, parentId);
- // 闄嶅簭鎺掑簭
- query.orderByDesc(MdcProduction::getOrgCode);
- // 鏌ヨ鍑哄悓绾т骇绾跨殑闆嗗悎
- List<MdcProduction> parentList = mdcProductionService.list(query);
- // 鏌ヨ鍑虹埗绾т骇绾�
- MdcProduction production = mdcProductionService.getById(parentId);
- // 鑾峰彇鐖剁骇浜х嚎鐨刢ode
- String parentCode = production.getOrgCode();
- // 鏍规嵁鐖剁骇浜х嚎绫诲瀷绠楀嚭褰撳墠浜х嚎鐨勭被鍨�
- orgType = String.valueOf(Integer.valueOf(production.getOrgType()) + 1);
- // 澶勭悊鍚岀骇浜х嚎涓簄ull鐨勬儏鍐�
- if (parentList == null || parentList.size() == 0) {
- // 鐩存帴鐢熸垚褰撳墠鐨勪骇绾跨紪鐮佸苟杩斿洖
- newOrgCode = YouBianCodeUtil.getSubYouBianCode(parentCode, null);
- } else { //澶勭悊鏈夊悓绾т骇绾跨殑鎯呭喌
- // 鑾峰彇鍚岀骇浜х嚎鐨勭紪鐮�,鍒╃敤宸ュ叿绫�
- String subCode = parentList.get(0).getOrgCode();
- // 杩斿洖鐢熸垚鐨勫綋鍓嶄骇绾跨紪鐮�
- newOrgCode = YouBianCodeUtil.getSubYouBianCode(parentCode, subCode);
- }
- }
- // 杩斿洖鏈�缁堝皝瑁呬簡浜х嚎缂栫爜鍜屼骇绾跨被鍨嬬殑鏁扮粍
- strArray[0] = newOrgCode;
- strArray[1] = orgType;
- return strArray;
- }
-}
diff --git a/src/main/java/org/jeecg/modules/system/service/IAdministratorService.java b/src/main/java/org/jeecg/modules/system/service/IAdministratorService.java
deleted file mode 100644
index 0f6f8db..0000000
--- a/src/main/java/org/jeecg/modules/system/service/IAdministratorService.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package org.jeecg.modules.system.service;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.jeecg.modules.system.entity.Administrator;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Map;
-
-/**
- * @Description: mom_sys_administrator
- * @Author: jeecg-boot
- * @Date: 2023-01-12
- * @Version: V1.0
- */
-public interface IAdministratorService extends IService<Administrator> {
-
- /**
- * 鍒犻櫎涓�瀵瑰
- *
- * @param id
- */
- public void delMain (String id);
-
- /**
- * 鎵归噺鍒犻櫎涓�瀵瑰
- *
- * @param idList
- */
- public void delBatchMain (Collection<? extends Serializable> idList);
-
- /**
- * 鍒楄〃鏌ヨ
- * @param page
- * @return
- */
- Page<Map<String,Object>> mapList(Page<Map<String,Object>> page);
-
-
-}
diff --git a/src/main/java/org/jeecg/modules/system/service/IMdcProductionService.java b/src/main/java/org/jeecg/modules/system/service/IMdcProductionService.java
deleted file mode 100644
index 104a9db..0000000
--- a/src/main/java/org/jeecg/modules/system/service/IMdcProductionService.java
+++ /dev/null
@@ -1,178 +0,0 @@
-package org.jeecg.modules.system.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import org.jeecg.modules.system.entity.MdcProduction;
-import org.jeecg.modules.system.model.MdcProductionTreeModel;
-import org.jeecg.modules.system.model.ProductionIdModel;
-import org.jeecg.modules.system.vo.MdcProOptionsVo;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * @Description: 浜х嚎琛�
- * @Author: liuS
- * @Date: 2023-03-23
- * @Version: V1.0
- */
-public interface IMdcProductionService extends IService<MdcProduction> {
-
- /**
- * 鏌ヨ鎵�鏈変骇绾夸俊鎭紝骞跺垎鑺傜偣杩涜鏄剧ず
- */
- List<MdcProductionTreeModel> queryTreeList();
-
- /**
- * 鏌ヨ鎵�鏈変骇绾夸俊鎭紝骞跺垎鑺傜偣杩涜鏄剧ず(娣诲姞绯荤粺閰嶇疆)
- */
- List<MdcProductionTreeModel> queryTreeListByConfig();
-
- /**
- * 鏌ヨ鎵�鏈変骇绾夸俊鎭紝骞跺垎鑺傜偣杩涜鏄剧ず
- */
- List<MdcProductionTreeModel> queryTreeList(String ids);
-
- /**
- * 鏌ヨ鎵�鏈夐儴闂―epartId淇℃伅,骞跺垎鑺傜偣杩涜鏄剧ず
- */
- List<ProductionIdModel> queryProductionIdTreeList();
-
- /**
- * 鏍规嵁鍏抽敭瀛楁悳绱㈢浉鍏崇殑浜х嚎鏁版嵁
- */
- List<MdcProductionTreeModel> searchByKeyWord(String keyWord);
-
- /**
- * 淇濆瓨浜х嚎鏁版嵁
- */
- void saveProductionData(MdcProduction mdcProduction);
-
- /**
- * 鏇存柊浜х嚎鏁版嵁
- */
- boolean updateProductionDataById(MdcProduction mdcProduction);
-
- /**
- * 鏍规嵁浜х嚎id鍒犻櫎骞跺垹闄ゅ叾鍙兘瀛樺湪鐨勫瓙绾т骇绾�
- */
- boolean delete(String id);
-
- /**
- * 鏍规嵁浜х嚎id鎵归噺鍒犻櫎骞跺垹闄ゅ叾鍙兘瀛樺湪鐨勫瓙绾т骇绾�
- */
- void deleteBatchWithChildren(List<String> ids);
-
- /**
- * 鑾峰彇涓嬬骇浜х嚎
- */
- List<MdcProduction> queryProdByPid(String pid);
-
- /**
- * 閫掑綊鏌ヨ鎵�鏈夊瓙鑺傜偣
- */
- List<MdcProduction> recursionChildrenByPid(String pid);
-
- /**
- * 鏍规嵁鐢ㄦ埛id鑾峰彇浜х嚎涓嬫媺鏍戦�夐」
- */
- List<ProductionIdModel> loadProductionTreeOptions(String userId);
-
- /**
- * 閫掑綊鏌ヨ鎵�鏈夊瓙鑺傜偣
- */
- List<String> recursionChildren(String productionId);
-
- /**
- * 鏍规嵁鐢ㄦ埛id鍜岃溅闂磇d鑾峰彇鐢ㄦ埛鎷ユ湁鐨勮溅闂磇d
- *
- * @param userId
- * @param productionId
- * @return
- */
- String findFirstProduction(String userId, String productionId);
-
- /**
- * 鏍规嵁鐢ㄦ埛id鏌ヨ鐢ㄦ埛宸ユ鏉冮檺
- */
- String findThreeProductionId(String userId);
-
- /**
- * 鏌ヨ鎵�鏈夌埗鑺傜偣鍜屾湰鑺傜偣鍚嶇О
- * @param id
- * @return
- */
- List<String> findListParentTreeAll(String id);
-
- /**
- * 鏌ヨ鎵�鏈夌埗鑺傜偣鍚嶇О
- * @param parentId
- * @param stringList
- * @return
- */
- List<String> findListParentTree(String parentId,List<String> stringList);
-
- /**
- * 鑾峰彇鐢ㄦ埛鎵�鍦ㄧ殑閮ㄩ棬
- * @param userId
- * @return
- */
- Map<String, MdcProduction> getUserAssignedDepart(String userId);
-
- /**
- * 閫氳繃涓�缁刬d鑾峰彇閮ㄩ棬
- * @param ids
- * @return
- */
- List<String> findAllProductionIds(List<String> ids);
-
- /**
- * 鑾峰彇鏌愪釜鑺傜偣鎵�鏈変笂绾ц妭鐐圭殑id
- * @param parentId 鐖惰妭鐐� id
- * @param idList 鎺ユ敹缁撴灉闆�
- * @return
- */
- List<String> findParentIdsForProduction(String parentId, List<String> idList);
-
- /**
- * 鏌ヨ鎵�鏈変骇绾夸俊鎭紝骞跺垎鑺傜偣杩涜鏄剧ず
- */
- List<MdcProductionTreeModel> queryTreeListByMdc(String ids);
-
- /**
- * 鏌ヨ鎵�鏈変骇绾夸俊鎭紝骞跺垎鑺傜偣杩涜鏄剧ず
- */
- List<MdcProductionTreeModel> queryTreeListByMdc();
-
- /**
- * 鏌ヨ瀛愯妭鐐�
- * @param mdcProductionIds
- * @return
- */
- List<String> findChildren(List<String> mdcProductionIds);
-
- /**
- * 鏍规嵁鐢ㄦ埛id鑾峰彇浜х嚎(涓績)鎴栫彮缁勪笅鎷夐�夐」
- * @param userId
- * @param productionId
- * @return
- */
- List<MdcProOptionsVo> loadProductionOptions(String userId, String productionId);
-
- List<MdcProduction> findMdcPros(String userId, String productionId);
-
- /**
- *
- * @param userId
- * @param productionId
- * @return
- */
- List<MdcProOptionsVo> loadTeamOptions(String userId, String productionId);
-
- /**
- *
- * @param userId
- * @param allProductionIds
- * @return
- */
- List<String> findProIdsByUId(String userId, List<String> allProductionIds);
-}
diff --git a/src/main/java/org/jeecg/modules/system/service/IMdcUserProductionService.java b/src/main/java/org/jeecg/modules/system/service/IMdcUserProductionService.java
deleted file mode 100644
index a321830..0000000
--- a/src/main/java/org/jeecg/modules/system/service/IMdcUserProductionService.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package org.jeecg.modules.system.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import org.jeecg.modules.system.entity.MdcUserProduction;
-import org.jeecg.modules.system.entity.SysUser;
-import org.jeecg.modules.system.model.ProductionIdModel;
-
-import java.util.List;
-
-/**
- * @Description: 鐢ㄦ埛浜х嚎琛�
- * @author: LiuS
- * @create: 2023-03-27 11:56
- */
-public interface IMdcUserProductionService extends IService<MdcUserProduction> {
-
- /**
- * 鏍规嵁鎸囧畾鐢ㄦ埛id鏌ヨ浜х嚎淇℃伅
- */
- List<ProductionIdModel> queryProductionIdsOfUser(String userId);
-
- /**
- * 鏍规嵁鎸囧畾鐢ㄦ埛id鏌ヨ浜х嚎id闆嗗悎
- */
- List<String> queryProductionIdsByUserId(String userId);
-
- /**
- * 鏍规嵁涓�缁勮溅闂磇d鏌ヨ鐢ㄦ埛浜х嚎淇℃伅
- * @param productionIds
- */
- List<MdcUserProduction> queryByProductionIds(List<String> productionIds);
-
- /**
- * 鍒犻櫎涓�缁勫璞�
- * @param mdcUserProductions
- * @return
- */
- boolean removeByCollection(List<MdcUserProduction> mdcUserProductions);
-
- /**
- * 鑾峰彇宸插垎閰嶇殑鐢ㄦ埛鍒楄〃
- * @param proId
- * @return
- */
- List<SysUser> getUserPermsByGroupId(String proId);
-
- /**
- * 鑾峰彇鏈垎閰嶇殑鐢ㄦ埛鍒楄〃
- * @param proId
- * @return
- */
- List<SysUser> getUserNonPermsByGroupId(String proId);
-
- /**
- * 鑾峰彇鏈垎閰嶇殑鐢ㄦ埛
- * @param proId
- * @return
- */
- List<SysUser> getUserNonPermsByDeviceId(String proId);
-
- /**
- * 鑾峰彇宸插垎閰嶇殑鐢ㄦ埛
- * @param proId
- * @return
- */
- List<SysUser> getUserPermsByDeviceId(String proId);
-
- /**
- * 閫氳繃杞﹂棿id涓庡矖浣峣d绛涢�夌敤鎴�
- * @param post
- * @param proId
- * @return
- */
- List<SysUser> queryByPostAndProId(String post, String proId);
-
-
- MdcUserProduction getByUserIdAndGroupId(String userId, String proId);
-}
diff --git a/src/main/java/org/jeecg/modules/system/service/ISysUserService.java b/src/main/java/org/jeecg/modules/system/service/ISysUserService.java
index 48fad04..a2cf793 100644
--- a/src/main/java/org/jeecg/modules/system/service/ISysUserService.java
+++ b/src/main/java/org/jeecg/modules/system/service/ISysUserService.java
@@ -344,4 +344,14 @@
* @return 鐢ㄦ埛鍚�->鐪熷疄濮撳悕鐨勬槧灏勶紙涓嶅瓨鍦ㄦ椂鍊间负null锛�
*/
Map<String, String> getUserRealNamesByUserNames(List<String> userNames);
+
+
+ /**
+ * 鏍规嵁鐝粍Id鏌ヨ
+ * @param page
+ * @param groupId 鐝粍id
+ * @param username 鐢ㄦ埛璐︽埛鍚嶇О
+ * @return
+ */
+ IPage<SysUser> getUserByGroupId(Page<SysUser> page, String groupId, String username);
}
diff --git a/src/main/java/org/jeecg/modules/system/service/impl/AdministratorServiceImpl.java b/src/main/java/org/jeecg/modules/system/service/impl/AdministratorServiceImpl.java
deleted file mode 100644
index 3bebf27..0000000
--- a/src/main/java/org/jeecg/modules/system/service/impl/AdministratorServiceImpl.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package org.jeecg.modules.system.service.impl;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.jeecg.modules.system.entity.Administrator;
-import org.jeecg.modules.base.mapper.EnterpriseAdministratorMapper;
-import org.jeecg.modules.system.mapper.AdministratorMapper;
-import org.jeecg.modules.system.service.IAdministratorService;
-import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Map;
-
-/**
- * @Description: mom_sys_administrator
- * @Author: jeecg-boot
- * @Date: 2023-01-12
- * @Version: V1.0
- */
-@Service
-public class AdministratorServiceImpl extends ServiceImpl<AdministratorMapper, Administrator> implements IAdministratorService {
-
- @Autowired
- private AdministratorMapper administratorMapper;
- @Autowired
- private EnterpriseAdministratorMapper enterpriseAdministratorMapper;
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void delMain(String id) {
- enterpriseAdministratorMapper.deleteByMainId(id);
- administratorMapper.deleteById(id);
- }
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void delBatchMain(Collection<? extends Serializable> idList) {
- for(Serializable id:idList) {
- enterpriseAdministratorMapper.deleteByMainId(id.toString());
- administratorMapper.deleteById(id);
- }
- }
-
- @Override
- public Page<Map<String, Object>> mapList(Page<Map<String, Object>> page) {
- return page.setRecords(administratorMapper.mapList(page));
- }
-
-}
diff --git a/src/main/java/org/jeecg/modules/system/service/impl/MdcProductionServiceImpl.java b/src/main/java/org/jeecg/modules/system/service/impl/MdcProductionServiceImpl.java
deleted file mode 100644
index c502486..0000000
--- a/src/main/java/org/jeecg/modules/system/service/impl/MdcProductionServiceImpl.java
+++ /dev/null
@@ -1,630 +0,0 @@
-package org.jeecg.modules.system.service.impl;
-
-import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.util.StrUtil;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.core.toolkit.IdWorker;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.shiro.SecurityUtils;
-import org.jeecg.common.constant.CommonConstant;
-import org.jeecg.common.constant.FillRuleConstant;
-import org.jeecg.common.system.vo.DictModel;
-import org.jeecg.common.system.vo.LoginUser;
-import org.jeecg.common.util.FillRuleUtil;
-import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.system.entity.*;
-import org.jeecg.modules.system.mapper.MdcProductionEquipmentMapper;
-import org.jeecg.modules.system.mapper.MdcProductionMapper;
-import org.jeecg.modules.system.mapper.MdcUserProductionMapper;
-import org.jeecg.modules.system.mapper.SysUserMapper;
-import org.jeecg.modules.system.model.MdcProductionTreeModel;
-import org.jeecg.modules.system.model.ProductionIdModel;
-import org.jeecg.modules.system.service.IMdcProductionService;
-import org.jeecg.modules.system.service.ISysDictService;
-import org.jeecg.modules.system.service.ISysParamsService;
-import org.jeecg.modules.system.util.FindsProductionsChildrenUtil;
-import org.jeecg.modules.system.vo.MdcProOptionsVo;
-import org.springframework.cache.annotation.Cacheable;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import javax.annotation.Resource;
-import java.util.*;
-import java.util.stream.Collectors;
-
-/**
- * @Description: 浜х嚎琛�
- * @Author: liuS
- * @Date: 2023-03-23
- * @Version: V1.0
- */
-@Service
-public class MdcProductionServiceImpl extends ServiceImpl<MdcProductionMapper, MdcProduction> implements IMdcProductionService {
-
- @Resource
- private SysUserMapper sysUserMapper;
-
- @Resource
- private MdcUserProductionMapper userProductionMapper;
-
- @Resource
- private MdcProductionEquipmentMapper productionEquipmentMapper;
-
- @Resource
- private ISysParamsService sysParamsService;
-
- @Resource
- private ISysDictService sysDictService;
- /**
- * queryTreeList 瀵瑰簲 queryTreeList 鏌ヨ鎵�鏈夌殑浜х嚎鏁版嵁,浠ユ爲缁撴瀯褰㈠紡鍝嶅簲缁欏墠绔�
- */
- @Override
- @Cacheable(value = "mdc:cache:production:alldata")
- public List<MdcProductionTreeModel> queryTreeList() {
- LambdaQueryWrapper<MdcProduction> query = new LambdaQueryWrapper<MdcProduction>();
- query.eq(MdcProduction::getDelFlag, CommonConstant.DEL_FLAG_0.toString());
- query.orderByAsc(MdcProduction::getProductionOrder);
- List<MdcProduction> list = this.list(query);
- //璁剧疆鐢ㄦ埛id锛岃鍓嶅彴鏄剧ず
- this.setUserIdsByProList(list);
- //璋冪敤wrapTreeDataToTreeList鏂规硶鐢熸垚鏍戠姸鏁版嵁
- return FindsProductionsChildrenUtil.wrapTreeDataToTreeList(list);
- }
-
- /**
- * 鏌ヨ鎵�鏈変骇绾夸俊鎭紝骞跺垎鑺傜偣杩涜鏄剧ず(娣诲姞绯荤粺閰嶇疆)
- */
- @Override
- public List<MdcProductionTreeModel> queryTreeListByConfig(){
- SysParams sysParams = sysParamsService.getSysPramBySettingKey("dnc_production");
- LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
- LambdaQueryWrapper<MdcProduction> query = new LambdaQueryWrapper<MdcProduction>();
- if (sysParams == null) {
- return null;
- }else {
- List<String> productionIds = new ArrayList<>();
- if (!("admin").equals(loginUser.getUsername())) {
- //涓嶆槸瓒呯骇绠＄悊鍛橈紝鑾峰彇鐢ㄦ埛鎷ユ湁鐨勪骇绾�
- if (loginUser.getProductionIds() != null) {
- if (loginUser.getProductionIds().contains(",")) {
- productionIds = Arrays.asList(loginUser.getProductionIds().split(","));
- } else {
- productionIds = Collections.singletonList(loginUser.getProductionIds());
- }
- }
- }
- if (("0").equals(sysParams.getSettingValue())){
- query.eq(MdcProduction::getOrgType,"2");
- query.in(!productionIds.isEmpty(), MdcProduction::getId, productionIds);
- query.eq(MdcProduction::getDelFlag, CommonConstant.DEL_FLAG_0.toString());
- query.orderByAsc(MdcProduction::getProductionOrder);
- List<MdcProduction> list = this.list(query);
- //璁剧疆鐢ㄦ埛id锛岃鍓嶅彴鏄剧ず
- this.setUserIdsByProList(list);
- //灏佽涓�绾ф爲
- List<MdcProductionTreeModel> listResult = new ArrayList<>();
- for (MdcProduction production : list) {
- if (production.getDescription().isEmpty()){
- production.setDescription("");
- }
- listResult.add(new MdcProductionTreeModel(production));
- }
- //璋冪敤wrapTreeDataToTreeList鏂规硶鐢熸垚鏍戠姸鏁版嵁
- return listResult;
- }else {
- query.eq(MdcProduction::getDelFlag, CommonConstant.DEL_FLAG_0.toString());
- query.orderByAsc(MdcProduction::getProductionOrder);
- List<MdcProduction> list = this.list(query);
- //璁剧疆鐢ㄦ埛id锛岃鍓嶅彴鏄剧ず
- this.setUserIdsByProList(list);
- //璋冪敤wrapTreeDataToTreeList鏂规硶鐢熸垚鏍戠姸鏁版嵁
- return FindsProductionsChildrenUtil.wrapTreeDataToTreeList(list);
- }
- }
- }
-
- /**
- * queryTreeList 鏍规嵁浜х嚎id鏌ヨ,鍓嶇鍥炴樉璋冪敤
- */
- @Override
- public List<MdcProductionTreeModel> queryTreeList(String ids) {
- List<MdcProductionTreeModel> listResult = new ArrayList<>();
- LambdaQueryWrapper<MdcProduction> query = new LambdaQueryWrapper<MdcProduction>();
- query.eq(MdcProduction::getDelFlag, CommonConstant.DEL_FLAG_0.toString());
- if (oConvertUtils.isNotEmpty(ids)) {
- query.in(true, MdcProduction::getId, ids.split(","));
- }
- query.orderByAsc(MdcProduction::getProductionOrder);
- List<MdcProduction> list = this.list(query);
- for (MdcProduction production : list) {
- if (production.getDescription().isEmpty()){
- production.setDescription("");
- }
- listResult.add(new MdcProductionTreeModel(production));
- }
- return listResult;
- }
-
- @Override
- @Cacheable(value = "mdc:cache:production:allids")
- public List<ProductionIdModel> queryProductionIdTreeList() {
- LambdaQueryWrapper<MdcProduction> query = new LambdaQueryWrapper<>();
- query.eq(MdcProduction::getDelFlag, CommonConstant.DEL_FLAG_0.toString());
- query.orderByAsc(MdcProduction::getProductionOrder);
- List<MdcProduction> list = this.list(query);
- //璋冪敤wrapTreeDataToTreeList鏂规硶鐢熸垚鏍戠姸鏁版嵁
- return FindsProductionsChildrenUtil.wrapTreeDataToProductionIdTreeList(list);
- }
-
- /**
- * 鏍规嵁鍏抽敭瀛楁悳绱㈢浉鍏崇殑閮ㄩ棬鏁版嵁
- */
- @Override
- public List<MdcProductionTreeModel> searchByKeyWord(String keyWord) {
- LambdaQueryWrapper<MdcProduction> query = new LambdaQueryWrapper<>();
- List<MdcProductionTreeModel> newList = new ArrayList<>();
- query.like(MdcProduction::getProductionName, keyWord);
- MdcProductionTreeModel model = new MdcProductionTreeModel();
- List<MdcProduction> productionList = this.list(query);
- if (!productionList.isEmpty()) {
- for (MdcProduction mdcProduction : productionList) {
- model = new MdcProductionTreeModel(mdcProduction);
- model.setChildren(null);
- newList.add(model);
- }
- return newList;
- }
- return Collections.emptyList();
- }
-
- /**
- * saveProductionData 瀵瑰簲 add 淇濆瓨鐢ㄦ埛鍦ㄩ〉闈㈡坊鍔犵殑鏂扮殑浜х嚎瀵硅薄鏁版嵁
- */
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void saveProductionData(MdcProduction mdcProduction) {
- if (mdcProduction != null) {
- if (mdcProduction.getParentId() == null) {
- mdcProduction.setParentId("");
- }
- mdcProduction.setId(IdWorker.getIdStr(mdcProduction));
- // 鍏堝垽鏂瀵硅薄鏈夋棤鐖剁骇ID,鏈夊垯鎰忓懗鐫�涓嶆槸鏈�楂樼骇,鍚﹀垯鎰忓懗鐫�鏄渶楂樼骇
- // 鑾峰彇鐖剁骇ID
- String parentId = mdcProduction.getParentId();
- JSONObject formData = new JSONObject();
- formData.put("parentId",parentId);
- String[] codeArray = (String[]) FillRuleUtil.executeRule(FillRuleConstant.PRODUCTION,formData);
- mdcProduction.setOrgCode(codeArray[0]);
- String orgType = codeArray[1];
- mdcProduction.setOrgType(String.valueOf(orgType));
- mdcProduction.setDelFlag(CommonConstant.DEL_FLAG_0.toString());
- this.save(mdcProduction);
-
- //澶勭悊瀛樺湪鐖跺瓙鍏崇郴 mdc鏍囪缁熶竴鐨勯棶棰�
- //1.mdc鏍囪 涓� 1 寮�鍚� 鐖剁骇鑺傜偣瑕佺粺涓�寮�鍚�
- //2.mdc鏍囪 涓� 0 鍏抽棴 瀛愮骇鑺傜偣瑕佺粺涓�鍏抽棴 鏂板鎿嶄綔 涓嶅瓨鍦ㄦ鎯呭喌
- if(StringUtils.isNotBlank(parentId) && CommonConstant.DEFAULT_1.equals(mdcProduction.getMdcFlag())){
- openParentMdcFlag(parentId);
- }
- }
- }
-
- /**
- * updateProductionDataById 瀵瑰簲 edit 鏍规嵁浜х嚎涓婚敭鏉ユ洿鏂板搴旂殑浜х嚎鏁版嵁
- */
- @Override
- @Transactional(rollbackFor = Exception.class)
- public boolean updateProductionDataById(MdcProduction mdcProduction) {
- if (mdcProduction != null) {
- this.updateById(mdcProduction);
-
- //澶勭悊瀛樺湪鐖跺瓙鍏崇郴 mdc鏍囪缁熶竴鐨勯棶棰�
- //1.mdc鏍囪 涓� 1 寮�鍚� 鐖剁骇鑺傜偣瑕佺粺涓�寮�鍚�
- //2.mdc鏍囪 涓� 0 鍏抽棴 瀛愮骇鑺傜偣瑕佺粺涓�鍏抽棴
- String parentId = mdcProduction.getParentId();
- if(StringUtils.isNotBlank(parentId) && CommonConstant.DEFAULT_1.equals(mdcProduction.getMdcFlag())){
- openParentMdcFlag(parentId);
- }
- if(CommonConstant.DEFAULT_0.equals(mdcProduction.getMdcFlag())){
- //鍏抽棴
- closeChildrenMdcFlag(mdcProduction.getId());
- }
- return true;
- }
- return false;
- }
-
- /**
- * 鏍规嵁浜х嚎id鍒犻櫎骞跺垹闄ゅ叾鍙兘瀛樺湪鐨勫瓙绾т骇绾�
- */
- @Override
- @Transactional(rollbackFor = Exception.class)
- public boolean delete(String id) {
- List<String> idList = new ArrayList<>();
- idList.add(id);
- this.checkChildrenExists(id, idList);
- boolean result = this.removeByIds(idList);
- //鏍规嵁浜х嚎id鍒犻櫎鐢ㄦ埛涓庝骇绾垮叧绯�
- userProductionMapper.delete(new LambdaQueryWrapper<MdcUserProduction>().in(MdcUserProduction::getProId, idList));
- //鏍规嵁浜х嚎id鍒犻櫎浜х嚎涓庤澶囧叧绯�
- productionEquipmentMapper.delete(new LambdaQueryWrapper<MdcProductionEquipment>().in(MdcProductionEquipment::getProductionId, idList));
- return result;
- }
-
- /**
- * 鏍规嵁浜х嚎id鎵归噺鍒犻櫎骞跺垹闄ゅ叾鍙兘瀛樺湪鐨勫瓙绾т骇绾�
- */
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void deleteBatchWithChildren(List<String> ids) {
- List<String> idList = new ArrayList<>();
- for (String id : ids) {
- idList.add(id);
- this.checkChildrenExists(id, idList);
- }
- this.removeByIds(idList);
- //鏍规嵁浜х嚎id鍒犻櫎鐢ㄦ埛涓庝骇绾垮叧绯�
- userProductionMapper.delete(new LambdaQueryWrapper<MdcUserProduction>().in(MdcUserProduction::getProId, idList));
- //鏍规嵁浜х嚎id鍒犻櫎浜х嚎涓庤澶囧叧绯�
- productionEquipmentMapper.delete(new LambdaQueryWrapper<MdcProductionEquipment>().in(MdcProductionEquipment::getProductionId, idList));
- }
-
- /**
- * 鏍规嵁id鏌ヨ涓嬬骇浜х嚎
- */
- @Override
- public List<MdcProduction> queryProdByPid(String pid) {
- return this.baseMapper.queryProdByPid(pid);
- }
-
- /**
- * 閫掑綊鏌ヨ鎵�鏈夊瓙鑺傜偣
- */
- @Override
- public List<MdcProduction> recursionChildrenByPid(String pid){
- List<String> ids=this.recursionChildren(pid);
- return super.list(new LambdaQueryWrapper<MdcProduction>().eq(MdcProduction::getDelFlag, CommonConstant.DEL_FLAG_0.toString()).in(MdcProduction::getId, ids));
- }
-
- /**
- * 鏍规嵁鐢ㄦ埛id鑾峰彇浜х嚎涓嬫媺鏍戦�夐」
- */
- @Override
- public List<ProductionIdModel> loadProductionTreeOptions(String userId) {
- //鑾峰彇鎵�鏈変骇绾挎暟鎹�
- List<MdcProduction> productionList = this.baseMapper.selectList(new LambdaQueryWrapper<MdcProduction>().eq(MdcProduction::getDelFlag, CommonConstant.DEL_FLAG_0.toString()).orderByAsc(MdcProduction::getProductionOrder));
- //鏍规嵁鐢ㄦ埛id鑾峰彇鎷ユ湁鐨勪骇绾夸俊鎭泦鍚�
- List<String> productionIds = userProductionMapper.queryProductionIdsByUserId(userId);
- List<String> allProductionIds = new ArrayList<>();
- //鎵惧埌鎵�鏈変骇绾縤d鐨勪笂绾d
- if (productionIds != null && !productionIds.isEmpty()) {
- for (String productionId : productionIds) {
- this.getAllProductionIds(productionList, productionId, allProductionIds);
- }
- }
- //杩囨护浜х嚎鏁版嵁
- List<MdcProduction> list = productionList.stream().filter((MdcProduction mdcProduction) -> allProductionIds.contains(mdcProduction.getId())).collect(Collectors.toList());
- return FindsProductionsChildrenUtil.wrapTreeDataToProductionIdTreeList(list);
- }
-
- /**
- * 閫掑綊鏌ヨ鎵�鏈夊瓙鑺傜偣id
- */
- @Override
- public List<String> recursionChildren(String productionId) {
- return this.baseMapper.recursionChildren(productionId);
- }
-
- /**
- * 鏍规嵁鐢ㄦ埛id鍜岃溅闂磇d鑾峰彇鐢ㄦ埛鎷ユ湁鐨勮溅闂磇d
- * @param userId
- * @param productionId
- * @return
- */
- @Override
- public String findFirstProduction(String userId, String productionId) {
- return this.baseMapper.findFirstProduction(userId, productionId);
- }
-
- /**
- * 鏍规嵁鐢ㄦ埛id鏌ヨ鐢ㄦ埛宸ユ鏉冮檺
- */
- @Override
- public String findThreeProductionId(String userId) {
- return this.baseMapper.findThreeProductionId(userId);
- }
-
- /**
- * delete 鏂规硶璋冪敤 閫掑綊鏌ユ壘瀛愰泦id
- */
- private void checkChildrenExists(String id, List<String> idList) {
- LambdaQueryWrapper<MdcProduction> query = new LambdaQueryWrapper<>();
- query.eq(MdcProduction::getParentId, id);
- List<MdcProduction> productionList = this.list(query);
- if (productionList != null && !productionList.isEmpty()) {
- for (MdcProduction production : productionList) {
- idList.add(production.getId());
- this.checkChildrenExists(production.getId(), idList);
- }
- }
- }
-
- /**
- * 鑾峰彇鎵�鏈夌殑浜х嚎id锛堝寘鍚墍鏈変笂绾э級
- */
- private void getAllProductionIds(List<MdcProduction> productionList, String productionId, List<String> allProductionIds) {
- if (!allProductionIds.contains(productionId)) {
- allProductionIds.add(productionId);
- }
- for (MdcProduction mdcProduction : productionList) {
- if (StringUtils.isEmpty(mdcProduction.getParentId())) {
- continue;
- }
- if (productionId.equals(mdcProduction.getId())) {
- if (!allProductionIds.contains(mdcProduction.getParentId())) {
- allProductionIds.add(mdcProduction.getParentId());
- getAllProductionIds(productionList, mdcProduction.getParentId(), allProductionIds);
- }
- }
- }
- }
-
- /**
- * 閫氳繃浜х嚎闆嗗悎涓轰骇绾胯缃敤鎴穒d锛岀敤浜庡墠鍙板睍绀�
- */
- private void setUserIdsByProList(List<MdcProduction> productionList) {
- //鏌ヨ璐熻矗閮ㄩ棬涓嶄负绌虹殑鎯呭喌
- LambdaQueryWrapper<SysUser> query = new LambdaQueryWrapper<>();
- query.isNotNull(SysUser::getDepartIds);
- List<SysUser> users = sysUserMapper.selectList(query);
- Map<String, Object> map = new HashMap(5);
- //鍏堝惊鐜竴閬嶆壘鍒颁笉鍚岀殑璐熻矗浜х嚎id
- for (SysUser user : users) {
- String productionIds = user.getProductionIds();
- if (StringUtils.isNotBlank(productionIds)) {
- String[] productionIdArray = productionIds.split(",");
- for (String productionId : productionIdArray) {
- if (map.containsKey(productionId)) {
- String userIds = map.get(productionId) + "," + user.getId();
- map.put(productionId, userIds);
- } else {
- map.put(productionId, user.getId());
- }
- }
- }
- }
- //寰幆浜х嚎闆嗗悎鎵惧埌浜х嚎id瀵瑰簲鐨勮礋璐ｇ敤鎴�
- for (MdcProduction mdcProduction : productionList) {
- if (map.containsKey(mdcProduction.getId())) {
- mdcProduction.setDirectorUserIds(map.get(mdcProduction.getId()).toString());
- }
- }
- }
-
- /**
- * 鏌ヨ鎵�鏈夌埗鑺傜偣鍜屾湰鑺傜偣鍚嶇О
- * @param id
- * @return
- */
- @Override
- public List<String> findListParentTreeAll(String id){
- MdcProductionEquipment mdcProductionEquipment=productionEquipmentMapper.selectOne(new QueryWrapper<MdcProductionEquipment>().eq("equipment_id",id));
- if (mdcProductionEquipment==null) {
- return null;
- }
- List<String> strings = new ArrayList<>();
- MdcProduction en=super.getById(mdcProductionEquipment.getProductionId());
- if (en == null) {
- return null;
- }
- strings.add(en.getProductionName());
- if (StringUtils.isEmpty(en.getParentId())) {
- return strings;
- } else {
- return findListParentTree(en.getParentId(),strings);
- }
- }
-
- // 鏌ヨ鎵�浠ョ埗鑺傜偣
- @Override
- public List<String> findListParentTree(String parentId,List<String> stringList){
- if (StringUtils.isEmpty(parentId)) {
- return null;
- }
- if (stringList == null || stringList.isEmpty()) {
- stringList = new ArrayList<>();
- }
- boolean p = true;
- if (p) {
- MdcProduction en = super.getById(parentId);
- if (en != null) {
- stringList.add(0,en.getProductionName());
- }
- if (StringUtils.isNotBlank(en.getParentId())) {
- parentId = en.getParentId();
- findListParentTree(parentId,stringList);
- } else {
- p = false;
- return stringList;
- }
- }
- return stringList;
- }
-
- /**
- * 鑾峰彇鐢ㄦ埛宸插垎閰嶇殑閮ㄩ棬鍒楄〃
- * @param userId
- * @return
- */
- @Override
- public Map<String, MdcProduction> getUserAssignedDepart(String userId){
- if(StrUtil.isEmpty(userId))
- return null;
- List<MdcProduction> userPermDepart = this.baseMapper.findAllProductionId(userId);
- if(userPermDepart == null || userPermDepart.isEmpty())
- return null;
- Map<String, MdcProduction> map = new HashMap<>();
- userPermDepart.forEach(item -> {
- map.put(item.getId(), item);
- });
- return map;
- }
-
- /**
- * 閫氳繃涓�缁刬d鑾峰彇閮ㄩ棬
- * @param ids
- * @return
- */
- @Override
- public List<String> findAllProductionIds(List<String> ids){
- return this.baseMapper.recursionChildrenByList(ids);
- }
-
- @Override
- public List<String> findParentIdsForProduction(String parentId, List<String> idList) {
- if (StringUtils.isEmpty(parentId)) {
- return null;
- }
- if (idList == null || idList.isEmpty()) {
- idList = new ArrayList<>();
- }
- boolean p = true;
- if (p) {
- MdcProduction en = super.getById(parentId);
- if (en != null) {
- idList.add(0, en.getId());
- }
- if (StringUtils.isNotBlank(en.getParentId())) {
- parentId = en.getParentId();
- findParentIdsForProduction(parentId, idList);
- } else {
- p = false;
- return idList;
- }
- }
- return idList;
- }
-
- @Override
- public List<MdcProductionTreeModel> queryTreeListByMdc(String ids) {
- List<MdcProductionTreeModel> listResult = new ArrayList<>();
- LambdaQueryWrapper<MdcProduction> query = new LambdaQueryWrapper<MdcProduction>();
- query.eq(MdcProduction::getDelFlag, CommonConstant.DEL_FLAG_0.toString());
- query.eq(MdcProduction::getMdcFlag, CommonConstant.DEFAULT_1);
- if (oConvertUtils.isNotEmpty(ids)) {
- query.in(true, MdcProduction::getId, ids.split(","));
- }
- query.orderByAsc(MdcProduction::getProductionOrder);
- List<MdcProduction> list = this.list(query);
- for (MdcProduction production : list) {
- if (production.getDescription().isEmpty()){
- production.setDescription("");
- }
- listResult.add(new MdcProductionTreeModel(production));
- }
- return listResult;
- }
-
- @Override
- public List<MdcProductionTreeModel> queryTreeListByMdc() {
- LambdaQueryWrapper<MdcProduction> query = new LambdaQueryWrapper<MdcProduction>();
- query.eq(MdcProduction::getDelFlag, CommonConstant.DEL_FLAG_0.toString());
- query.eq(MdcProduction::getMdcFlag, CommonConstant.DEFAULT_1);
- query.orderByAsc(MdcProduction::getProductionOrder);
- List<MdcProduction> list = this.list(query);
- //璁剧疆鐢ㄦ埛id锛岃鍓嶅彴鏄剧ず
- this.setUserIdsByProList(list);
- //璋冪敤wrapTreeDataToTreeList鏂规硶鐢熸垚鏍戠姸鏁版嵁
- return FindsProductionsChildrenUtil.wrapTreeDataToTreeList(list);
- }
-
- @Override
- public List<String> findChildren(List<String> mdcProductionIds) {
- return this.baseMapper.findChildren(mdcProductionIds);
- }
-
- /**
- * 鏍规嵁鐢ㄦ埛id鑾峰彇浜х嚎(涓績)鎴栫彮缁勪笅鎷夐�夐」
- * @param userId
- * @param productionId
- * @return
- */
- @Override
- public List<MdcProOptionsVo> loadProductionOptions(String userId, String productionId) {
- List<MdcProOptionsVo> result = new ArrayList<>();
- List<MdcProduction> mdcProductionList = this.baseMapper.loadProductionOptions(userId, productionId);
- if (mdcProductionList != null && !mdcProductionList.isEmpty()) {
- for (MdcProduction mdcProduction : mdcProductionList) {
- MdcProOptionsVo vo = new MdcProOptionsVo().convert(mdcProduction);
- result.add(vo);
- }
- }
- return result;
- }
-
- @Override
- public List<MdcProduction> findMdcPros(String userId, String productionId) {
- return this.baseMapper.loadProductionOptions(userId, productionId);
- }
-
- @Override
- public List<MdcProOptionsVo> loadTeamOptions(String userId, String productionId) {
- List<MdcProOptionsVo> result = new ArrayList<>();
- List<String> productionList = this.findChildren(Arrays.asList(productionId.split(",")));
- if (productionList != null && !productionList.isEmpty()) {
- List<String> dictValues = this.baseMapper.findTeamValue(userId, productionList);
- if (dictValues != null && !dictValues.isEmpty()) {
- List<DictModel> dictModels = sysDictService.queryEnableDictItemsByCode(CommonConstant.DICT_MDC_STAFF_TEAM);
- if (dictModels != null && !dictModels.isEmpty()) {
- for (DictModel dictModel : dictModels) {
- if (dictValues.contains(dictModel.getValue())) {
- MdcProOptionsVo vo = new MdcProOptionsVo();
- vo.setKey(dictModel.getValue());
- vo.setValue(dictModel.getValue());
- vo.setTitle(dictModel.getText());
- result.add(vo);
- }
- }
- }
- }
- }
- return result;
- }
-
- @Override
- public List<String> findProIdsByUId(String userId, List<String> allProductionIds) {
- return this.baseMapper.findProIdsByUId(userId, allProductionIds);
- }
-
- /**
- * 鎵撳紑 鐖惰妭鐐� 鍙� 浠ヤ笂鐨刴dc鏍囪
- * @param parentId
- */
- private void openParentMdcFlag(String parentId) {
- List<String> listParentTree = findParentIdsForProduction(parentId, new ArrayList<>());
- if (!CollectionUtil.isEmpty(listParentTree)) {
- UpdateWrapper<MdcProduction> updateWrapper = new UpdateWrapper<>();
- updateWrapper.in("id", listParentTree);
- updateWrapper.set("mdc_flag", "1");
- super.update(updateWrapper);
- }
- }
-
- /**
- * 鍏抽棴鎵�鏈夊瓙鑺傜偣鐨刴dc鏍囪
- * @param productionId
- */
- private void closeChildrenMdcFlag(String productionId) {
- List<String> childrenList = recursionChildren(productionId);
- if (!CollectionUtil.isEmpty(childrenList)) {
- UpdateWrapper<MdcProduction> updateWrapper = new UpdateWrapper<>();
- updateWrapper.in("id", childrenList);
- updateWrapper.set("mdc_flag", "0");
- super.update(updateWrapper);
- }
- }
-}
diff --git a/src/main/java/org/jeecg/modules/system/service/impl/MdcUserProductionServiceImpl.java b/src/main/java/org/jeecg/modules/system/service/impl/MdcUserProductionServiceImpl.java
deleted file mode 100644
index f236c24..0000000
--- a/src/main/java/org/jeecg/modules/system/service/impl/MdcUserProductionServiceImpl.java
+++ /dev/null
@@ -1,152 +0,0 @@
-package org.jeecg.modules.system.service.impl;
-
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.jeecg.modules.system.entity.MdcProduction;
-import org.jeecg.modules.system.entity.MdcUserProduction;
-import org.jeecg.modules.system.entity.SysUser;
-import org.jeecg.modules.system.mapper.MdcUserProductionMapper;
-import org.jeecg.modules.system.model.ProductionIdModel;
-import org.jeecg.modules.system.service.IMdcProductionService;
-import org.jeecg.modules.system.service.IMdcUserProductionService;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @Description: 鐢ㄦ埛浜х嚎琛�
- * @author: LiuS
- * @create: 2023-03-27 11:58
- */
-@Service
-public class MdcUserProductionServiceImpl extends ServiceImpl<MdcUserProductionMapper, MdcUserProduction> implements IMdcUserProductionService {
-
- @Resource
- private IMdcProductionService mdcProductionService;
-
- /**
- * 鏍规嵁鐢ㄦ埛id鏌ヨ浜х嚎淇℃伅
- */
- @Override
- public List<ProductionIdModel> queryProductionIdsOfUser(String userId) {
- LambdaQueryWrapper<MdcUserProduction> queryUserPro = new LambdaQueryWrapper<>();
- LambdaQueryWrapper<MdcProduction> queryPro = new LambdaQueryWrapper<>();
- try {
- queryUserPro.eq(MdcUserProduction::getUserId, userId);
- List<String> proIdList = new ArrayList<>();
- List<ProductionIdModel> proIdModelList = new ArrayList<>();
- List<MdcUserProduction> userProList = this.list(queryUserPro);
- if (userProList != null && !userProList.isEmpty()) {
- for (MdcUserProduction userProduction : userProList) {
- proIdList.add(userProduction.getProId());
- }
- queryPro.in(MdcProduction::getId, proIdList);
- List<MdcProduction> proList = mdcProductionService.list(queryPro);
- if (proList != null && !proList.isEmpty()) {
- for (MdcProduction mdcProduction : proList) {
- proIdModelList.add(new ProductionIdModel().convertByUserProduction(mdcProduction));
- }
- }
- return proIdModelList;
- }
- } catch (Exception e) {
- e.fillInStackTrace();
- }
- return null;
- }
-
- /**
- * 鏍规嵁鎸囧畾鐢ㄦ埛id鏌ヨ浜х嚎id闆嗗悎
- */
- @Override
- public List<String> queryProductionIdsByUserId(String userId) {
- return this.baseMapper.queryProductionIdsByUserId(userId);
- }
-
- /**
- * 鏍规嵁涓�缁勮溅闂磇d鏌ヨ鐢ㄦ埛浜х嚎淇℃伅
- * @param productionIds
- */
- @Override
- public List<MdcUserProduction> queryByProductionIds(List<String> productionIds){
- if (!productionIds.isEmpty()){
- return super.list(new LambdaQueryWrapper<MdcUserProduction>().in(MdcUserProduction::getProId, productionIds));
- }
- return null;
- }
-
- @Override
- @Transactional(rollbackFor = {Exception.class})
- public boolean removeByCollection(List<MdcUserProduction> mdcUserProductions) {
- if(mdcUserProductions == null || mdcUserProductions.isEmpty())
- return false;
- if(mdcUserProductions.size() == 1){
- return super.removeById(mdcUserProductions.get(0).getId());
- }
- List<String> ids = new ArrayList<>();
- mdcUserProductions.forEach(item -> {
- ids.add(item.getId());
- });
- return super.removeByIds(ids);
- }
-
- /**
- * 鑾峰彇宸插垎閰嶇殑鐢ㄦ埛鍒楄〃
- * @param proId
- * @return
- */
- @Override
- public List<SysUser> getUserPermsByGroupId(String proId){
- return super.getBaseMapper().getUserPermsByGroupId(proId);
- }
-
- /**
- * 鑾峰彇鏈垎閰嶇殑鐢ㄦ埛鍒楄〃
- * @param proId
- * @return
- */
- @Override
- public List<SysUser> getUserNonPermsByGroupId(String proId){
- return super.getBaseMapper().getUserNonPermsByGroupId(proId);
- }
-
- /**
- * 鑾峰彇鏈垎閰嶇殑鐢ㄦ埛
- * @param proId
- * @return
- */
- @Override
- public List<SysUser> getUserNonPermsByDeviceId(String proId){
- return super.getBaseMapper().getUserNonPermsByDeviceId(proId);
- }
-
- @Override
- public List<SysUser> getUserPermsByDeviceId(String proId) {
- return super.getBaseMapper().getUserPermsByDeviceId(proId);
- }
-
- /**
- * 閫氳繃杞﹂棿id涓庡矖浣峣d绛涢�夌敤鎴�
- * @param post
- * @param proId
- * @return
- */
- @Override
- public List<SysUser> queryByPostAndProId(String post, String proId){
- return super.getBaseMapper().queryByPostAndProId(post, proId);
- }
-
- @Override
- public MdcUserProduction getByUserIdAndGroupId(String userId, String proId){
- if(StrUtil.isEmpty(userId) || StrUtil.isEmpty(proId))
- return null;
- List<MdcUserProduction> list = super.lambdaQuery().eq(MdcUserProduction::getUserId, userId).eq(MdcUserProduction::getProId, proId).list();
- if(list == null || list.isEmpty())
- return null;
- return list.get(0);
- }
-}
diff --git a/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java b/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java
index 60e2b6f..5df4f8b 100644
--- a/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java
+++ b/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java
@@ -29,9 +29,6 @@
import org.jeecg.common.system.vo.*;
import org.jeecg.common.util.*;
import org.jeecg.common.util.dynamic.db.FreemarkerParseFactory;
-import org.jeecg.modules.base.entity.Unit;
-import org.jeecg.modules.base.service.IEnterpriseService;
-import org.jeecg.modules.base.service.IUnitService;
import org.jeecg.modules.message.entity.SysMessageTemplate;
import org.jeecg.modules.message.handle.impl.DdSendMsgHandle;
import org.jeecg.modules.message.handle.impl.EmailSendMsgHandle;
@@ -126,10 +123,6 @@
@Autowired
private IDataVersionService dataVersionService;
- @Autowired
- private IUnitService unitService;
- @Autowired
- private IEnterpriseService enterpriseService;
@Autowired
@@ -1381,15 +1374,7 @@
uploadRelaService.delSysUploadRelaByBusIdAndBusType(busId, busType);
}
- @Override
- public String getUnitNameById(String unitId) {
- Unit unit = unitService.getById(unitId);
- String unitName = "";
- if(unit != null){
- unitName = unit.getName();
- }
- return unitName;
- }
+
@Override
public String queryDictTextByKey(String dictCode, String key) {
@@ -1418,17 +1403,6 @@
dataVersionService.removeById(id);
}
- /**
- * 鏍规嵁浼佷笟ID鑾峰彇浼佷笟鍚嶇О
- *
- * @param enterpriseId
- * @return
- */
- @Override
- public String getEnterpriseNameById(String enterpriseId) {
- String enterpriseName = enterpriseService.getById(enterpriseId).getName();
- return enterpriseName;
- }
@Override
public List<DataVersion> getLastDataVersion(String businessType, String enterpriseId, String isLastusable) {
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 37f72de..35ecc9a 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
@@ -7,6 +7,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.extern.slf4j.Slf4j;
+import org.apache.catalina.User;
import org.apache.commons.lang3.StringUtils;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.constant.CacheConstant;
@@ -20,6 +21,8 @@
import org.jeecg.common.util.PasswordUtil;
import org.jeecg.common.util.UUIDGenerator;
import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.base.entity.UserFactory;
+import org.jeecg.modules.base.mapper.UserFactoryMapper;
import org.jeecg.modules.base.service.BaseCommonService;
import org.jeecg.modules.system.entity.*;
import org.jeecg.modules.system.mapper.*;
@@ -79,7 +82,7 @@
@Autowired
SysRoleIndexMapper sysRoleIndexMapper;
@Resource
- MdcUserProductionMapper mdcUserProductionMapper;
+ UserFactoryMapper userFactoryMapper;
@Resource
private ISysDictService sysDictService;
@Resource
@@ -519,7 +522,7 @@
// 2. 鍒犻櫎鐢ㄦ埛閮ㄩ棬鍏崇郴
line += sysUserDepartMapper.delete(new LambdaQueryWrapper<SysUserDepart>().in(SysUserDepart::getUserId, userIds));
// 3. 鍒犻櫎鐢ㄦ埛浜х嚎鍏崇郴
- line += mdcUserProductionMapper.delete(new LambdaQueryWrapper<MdcUserProduction>().in(MdcUserProduction::getUserId, userIds));
+ line += userFactoryMapper.delete(new LambdaQueryWrapper<UserFactory>().in(UserFactory::getUserId, userIds));
//3. 鍒犻櫎鐢ㄦ埛瑙掕壊鍏崇郴
line += sysUserRoleMapper.delete(new LambdaQueryWrapper<SysUserRole>().in(SysUserRole::getUserId, userIds));
//4.鍚屾鍒犻櫎绗笁鏂笰pp鐨勭敤鎴�
@@ -588,9 +591,9 @@
//step.4 淇濆瓨鎵�灞炰骇绾�
if (oConvertUtils.isNotEmpty(selectedProductions)) {
arr = selectedProductions.split(",");
- for (String productionId : arr) {
- MdcUserProduction mdcUserProduction = new MdcUserProduction(user.getId(), productionId);
- mdcUserProductionMapper.insert(mdcUserProduction);
+ for (String factoryId : arr) {
+ UserFactory userFactory = new UserFactory(user.getId(), factoryId);
+ userFactoryMapper.insert(userFactory);
}
}
//step.5 淇濆瓨璁惧鏉冮檺
@@ -658,11 +661,11 @@
array = productions.split(",");
}
//鍏堝垹鍚庡姞
- mdcUserProductionMapper.delete(new QueryWrapper<MdcUserProduction>().lambda().eq(MdcUserProduction::getUserId, user.getId()));
+ userFactoryMapper.delete(new QueryWrapper<UserFactory>().lambda().eq(UserFactory::getUserId, user.getId()));
if (oConvertUtils.isNotEmpty(productions)) {
- for (String productionId : array) {
- MdcUserProduction mdcUserProduction = new MdcUserProduction(user.getId(), productionId);
- mdcUserProductionMapper.insert(mdcUserProduction);
+ for (String factoryId : array) {
+ UserFactory userFactory = new UserFactory(user.getId(), factoryId);
+ userFactoryMapper.insert(userFactory);
}
}
//step.5 淇敼璁惧鏉冮檺
@@ -806,4 +809,17 @@
(existing, replacement) -> existing // 閲嶅閿鐞�
));
}
+
+
+ /**
+ * 鏍规嵁鐝粍Id鏌ヨ
+ * @param page
+ * @param groupId 鐝粍id
+ * @param username 鐢ㄦ埛璐︽埛鍚嶇О
+ * @return
+ */
+ @Override
+ public IPage<SysUser> getUserByGroupId(Page<SysUser> page, String groupId, String username) {
+ return userMapper.getUserByGroupId(page,groupId,username);
+ }
}
diff --git a/src/main/java/org/jeecg/modules/system/util/FindsProductionsChildrenUtil.java b/src/main/java/org/jeecg/modules/system/util/FindsProductionsChildrenUtil.java
index 3857c1d..541d32d 100644
--- a/src/main/java/org/jeecg/modules/system/util/FindsProductionsChildrenUtil.java
+++ b/src/main/java/org/jeecg/modules/system/util/FindsProductionsChildrenUtil.java
@@ -2,9 +2,9 @@
import cn.hutool.core.util.StrUtil;
import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.system.entity.MdcProduction;
-import org.jeecg.modules.system.model.MdcProductionTreeModel;
-import org.jeecg.modules.system.model.ProductionIdModel;
+import org.jeecg.modules.base.entity.Factory;
+import org.jeecg.modules.base.model.FactoryTreeModel;
+import org.jeecg.modules.base.model.FactoryIdModel;
import java.util.ArrayList;
import java.util.List;
@@ -21,17 +21,14 @@
* queryTreeList鐨勫瓙鏂规硶 ====1=====
* 璇ユ柟娉曟槸s灏哅dcProduction绫诲瀷鐨刲ist闆嗗悎杞崲鎴怣dcProductionTreeModel绫诲瀷鐨勯泦鍚�
*/
- public static List<MdcProductionTreeModel> wrapTreeDataToTreeList(List<MdcProduction> recordList) {
- List<ProductionIdModel> idList = new ArrayList<>();
- List<MdcProductionTreeModel> records = new ArrayList<>();
+ public static List<FactoryTreeModel> wrapTreeDataToTreeList(List<Factory> recordList) {
+ List<FactoryIdModel> idList = new ArrayList<>();
+ List<FactoryTreeModel> records = new ArrayList<>();
for (int i = 0; i < recordList.size(); i++) {
- MdcProduction mdcProduction = recordList.get(i);
- if (StrUtil.isEmpty(mdcProduction.getDescription())){
- mdcProduction.setDescription("");
- }
- records.add(new MdcProductionTreeModel(mdcProduction));
+ Factory factory = recordList.get(i);
+ records.add(new FactoryTreeModel(factory));
}
- List<MdcProductionTreeModel> tree = findChildren(records, idList);
+ List<FactoryTreeModel> tree = findChildren(records, idList);
setEmptyChildrenAsNull(tree);
return tree;
}
@@ -40,14 +37,14 @@
* queryTreeList鐨勫瓙鏂规硶 ====1=====
* 璇ユ柟娉曟槸鎵惧埌骞跺皝瑁呴《绾х埗绫荤殑鑺傜偣鍒癟reeList闆嗗悎
*/
- public static List<MdcProductionTreeModel> findChildren(List<MdcProductionTreeModel> recordList, List<ProductionIdModel> productionIdList) {
- List<MdcProductionTreeModel> treeList = new ArrayList<>();
+ public static List<FactoryTreeModel> findChildren(List<FactoryTreeModel> recordList, List<FactoryIdModel> productionIdList) {
+ List<FactoryTreeModel> treeList = new ArrayList<>();
for (int i = 0; i < recordList.size(); i++) {
- MdcProductionTreeModel branch = recordList.get(i);
+ FactoryTreeModel branch = recordList.get(i);
if (oConvertUtils.isEmpty(branch.getParentId())) {
treeList.add(branch);
- ProductionIdModel productionIdModel = new ProductionIdModel().convert(branch);
- productionIdList.add(productionIdModel);
+ FactoryIdModel factoryIdModel = new FactoryIdModel().convert(branch);
+ productionIdList.add(factoryIdModel);
}
}
getGrandChildren(treeList, recordList, productionIdList);
@@ -58,15 +55,15 @@
* queryTreeList鐨勫瓙鏂规硶====3====
*璇ユ柟娉曟槸鎵惧埌椤剁骇鐖剁被涓嬬殑鎵�鏈夊瓙鑺傜偣闆嗗悎骞跺皝瑁呭埌TreeList闆嗗悎
*/
- private static void getGrandChildren(List<MdcProductionTreeModel> treeList, List<MdcProductionTreeModel> recordList, List<ProductionIdModel> idList) {
+ private static void getGrandChildren(List<FactoryTreeModel> treeList, List<FactoryTreeModel> recordList, List<FactoryIdModel> idList) {
for (int i = 0; i < treeList.size(); i++) {
- MdcProductionTreeModel model = treeList.get(i);
- ProductionIdModel idModel = idList.get(i);
+ FactoryTreeModel model = treeList.get(i);
+ FactoryIdModel idModel = idList.get(i);
for (int i1 = 0; i1 < recordList.size(); i1++) {
- MdcProductionTreeModel m = recordList.get(i1);
+ FactoryTreeModel m = recordList.get(i1);
if (m.getParentId() != null && m.getParentId().equals(model.getId())) {
model.getChildren().add(m);
- ProductionIdModel pim = new ProductionIdModel().convert(m);
+ FactoryIdModel pim = new FactoryIdModel().convert(m);
idModel.setSelectable(false);
idModel.getChildren().add(pim);
}
@@ -79,9 +76,9 @@
* queryTreeList鐨勫瓙鏂规硶 ====4====
* 璇ユ柟娉曟槸灏嗗瓙鑺傜偣涓虹┖鐨凩ist闆嗗悎璁剧疆涓篘ull鍊�
*/
- private static void setEmptyChildrenAsNull(List<MdcProductionTreeModel> treeList) {
+ private static void setEmptyChildrenAsNull(List<FactoryTreeModel> treeList) {
for (int i = 0; i < treeList.size(); i++) {
- MdcProductionTreeModel model = treeList.get(i);
+ FactoryTreeModel model = treeList.get(i);
if (model.getChildren().size() == 0) {
model.setChildren(null);
model.setLeaf(true);
@@ -95,12 +92,12 @@
/**
* 鑾峰彇 DepartIdModel
*/
- public static List<ProductionIdModel> wrapTreeDataToProductionIdTreeList(List<MdcProduction> recordList) {
- List<ProductionIdModel> idList = new ArrayList<>();
- List<MdcProductionTreeModel> records = new ArrayList<>();
+ public static List<FactoryIdModel> wrapTreeDataToProductionIdTreeList(List<Factory> recordList) {
+ List<FactoryIdModel> idList = new ArrayList<>();
+ List<FactoryTreeModel> records = new ArrayList<>();
for (int i = 0; i < recordList.size(); i++) {
- MdcProduction mdcProduction = recordList.get(i);
- records.add(new MdcProductionTreeModel(mdcProduction));
+ Factory factory = recordList.get(i);
+ records.add(new FactoryTreeModel(factory));
}
findChildren(records, idList);
return idList;
diff --git a/src/main/java/org/jeecg/modules/system/vo/MdcProOptionsVo.java b/src/main/java/org/jeecg/modules/system/vo/MdcProOptionsVo.java
deleted file mode 100644
index 24b6d97..0000000
--- a/src/main/java/org/jeecg/modules/system/vo/MdcProOptionsVo.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.jeecg.modules.system.vo;
-
-import lombok.Data;
-import org.jeecg.modules.system.entity.MdcProduction;
-
-/**
- * @Author: Lius
- * @CreateTime: 2025-03-27
- * @Description:
- */
-@Data
-public class MdcProOptionsVo {
- /**
- * id
- */
- private String key;
- /**
- * id
- */
- private String value;
- /**
- * 鍚嶇О
- */
- private String title;
-
- /**
- *
- *
- * @param mdcProduction
- * @return
- */
- public MdcProOptionsVo convert(MdcProduction mdcProduction) {
- this.key = mdcProduction.getId();
- this.value = mdcProduction.getId();
- this.title = mdcProduction.getProductionName();
- return this;
- }
-}
diff --git a/src/main/java/org/jeecg/modules/system/vo/SysUserGroupVO.java b/src/main/java/org/jeecg/modules/system/vo/SysUserGroupVO.java
new file mode 100644
index 0000000..ffca8ad
--- /dev/null
+++ b/src/main/java/org/jeecg/modules/system/vo/SysUserGroupVO.java
@@ -0,0 +1,31 @@
+package org.jeecg.modules.system.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description: 鐝粍浜哄憳vo
+ * @author: jeecg-boot
+ */
+@Data
+public class SysUserGroupVO implements Serializable{
+ private static final long serialVersionUID = 1L;
+
+ /**鐝粍id*/
+ private String groupId;
+ /**瀵瑰簲鐨勭敤鎴穒d闆嗗悎*/
+ private List<String> userIdList;
+
+ public SysUserGroupVO() {
+ super();
+ }
+
+ public SysUserGroupVO(String groupId, List<String> userIdList) {
+ super();
+ this.groupId = groupId;
+ this.userIdList = userIdList;
+ }
+
+}
--
Gitblit v1.9.3