From 057d3af95ae0346b98e394bdbbaa2c5a7c34f4af Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期二, 19 八月 2025 13:57:04 +0800
Subject: [PATCH] mdc算法公式自定义
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcEquProDto.java | 2
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/EquipmentAlarmMapper.xml | 2
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcDowntimeMapper.java | 23
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMapper.xml | 4
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysAnnouncementSendMapper.xml | 2
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentStatisticalInfoMapper.xml | 9
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcDowntimeReasonController.java | 168 ++++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcDowntimeReasonServiceImpl.java | 24
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcOeeInfoService.java | 49 +
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcOeeInfoMapper.xml | 31
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcParameterMapper.xml | 4
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcOeeInfoController.java | 100 ++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/util/JexlFormulaCalculator.java | 63 +
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcOeeInfoVo.java | 20
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/EquipmentMapper.java | 4
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/job/RunningOEEJob.java | 83 ++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcDowntime.java | 74 +
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcEquipmentStatisticalInfoMapper.java | 9
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcEquipmentStatisticalInfoService.java | 9
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentStatisticalShiftInfoMapper.xml | 3
lxzn-boot-base-core/pom.xml | 6
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/MdcProductionMapper.xml | 14
lxzn-boot-base-core/src/main/java/org/jeecg/common/constant/CommonConstant.java | 6
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentRunningSectionServiceImpl.java | 6
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcOeeInfoServiceImpl.java | 253 ++++++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcPlanCloseServiceImpl.java | 8
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcDowntimeReasonService.java | 16
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcOeeComputeVo.java | 13
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/ControlSystemMapper.xml | 2
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcOeeInfoMapper.java | 29
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcDowntimeServiceImpl.java | 117 ++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcEquDepDto.java | 2
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/EquipmentLogMapper.xml | 4
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEfficiencyReportServiceImpl.java | 386 ++------
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcParameterMapper.java | 14
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java | 31
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcDowntimeController.java | 163 +++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcOeeInfo.java | 114 ++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcDowntimeReasonMapper.xml | 2
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcDowntimeVo.java | 38
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentStatisticalInfoServiceImpl.java | 18
pom.xml | 2
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/MdcEfficiencyReportService.java | 3
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/EquipmentWorklineMapper.xml | 4
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcDowntimeMapper.xml | 43 +
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcEquipmentTypeController.java | 2
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcParameter.java | 66 +
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcDowntimeReason.java | 49 +
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcDowntimeService.java | 45 +
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcEfficiencyReportMapper.java | 1
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcParameterServiceImpl.java | 18
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcParameterController.java | 126 +++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcDowntimeDto.java | 16
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcDowntimeReasonMapper.java | 13
/dev/null | 51 -
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcParameterService.java | 14
lxzn-module-system/lxzn-system-api/lxzn-system-local-api/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.java | 4
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentRunningSectionMapper.xml | 6
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcProcessQuantityMapper.xml | 2
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEfficiencyReportMapper.xml | 18
60 files changed, 1,998 insertions(+), 410 deletions(-)
diff --git a/lxzn-boot-base-core/pom.xml b/lxzn-boot-base-core/pom.xml
index d956bcc..c211a60 100644
--- a/lxzn-boot-base-core/pom.xml
+++ b/lxzn-boot-base-core/pom.xml
@@ -219,6 +219,12 @@
<groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-kotlin</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-jexl3</artifactId>
+ <version>${jexl.version}</version> <!-- 鏈�鏂扮ǔ瀹氱増 -->
+ </dependency>
</dependencies>
</project>
\ No newline at end of file
diff --git a/lxzn-boot-base-core/src/main/java/org/jeecg/common/constant/CommonConstant.java b/lxzn-boot-base-core/src/main/java/org/jeecg/common/constant/CommonConstant.java
index 5ffcb6c..9533ec8 100644
--- a/lxzn-boot-base-core/src/main/java/org/jeecg/common/constant/CommonConstant.java
+++ b/lxzn-boot-base-core/src/main/java/org/jeecg/common/constant/CommonConstant.java
@@ -598,4 +598,10 @@
Integer AUTO_FLAG_Y = 1;
Integer AUTO_FLAG_N = 2;
+ /**
+ * 鍋滄満绫诲瀷 0(璁″垝鍋滄満) 1 (闈炶鍒掑仠鏈�)
+ */
+ String CLOSE_TYPE_0 = "0";
+ String CLOSE_TYPE_1 = "1";
+
}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/constant/MdcConstant.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/constant/MdcConstant.java
deleted file mode 100644
index 7409866..0000000
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/constant/MdcConstant.java
+++ /dev/null
@@ -1,91 +0,0 @@
-package org.jeecg.modules.mdc.constant;
-
-/**
- * @author Lius
- * @date 2023/11/1 16:05
- */
-public class MdcConstant {
-
- /**
- * 鏁呴殰鍋滄満
- */
- public static final String BREAKDOWN_DOWN = "鏁呴殰鍋滄満";
-
- /**
- * 鎹㈠瀷璋冭瘯
- */
- public static final String CONVERSION_DEBUG = "鎹㈠瀷璋冭瘯";
-
- /**
- * 鐗╂枡鐭己
- */
- public static final String MATERIAL_SHORTAGE = "鐗╂枡鐭己";
-
- /**
- * 璁″垝绛変换鍔�
- */
- public static final String PLANNED_TASK = "璁″垝绛変换鍔�";
-
- /**
- * 妫�楠�
- */
- public static final String INSPECT = "妫�楠�";
-
- /**
- * 鍏跺畠
- */
- public static final String OTHER = "鍏跺畠";
-
- /**
- * 璁″垝淇濆吇
- */
- public static final String PLANNED_MAINTENANCE = "鏃ヤ繚,鍛ㄤ繚";
-
- /**
- * 浼氳鍩硅
- */
- public static final String CONFERENCE_TRAINING = "OPL鍩硅,鐝墠浼�";
-
- /**
- * 鍏朵粬浼戞伅
- */
- public static final String OTHER_REST = "浼戞伅鐢ㄩ,棰勯槻鎬х淮淇�";
-
- public static final String DAY = "澶�";
-
- public static final String WEEK = "鍛�";
-
- public static final String MONTH = "鏈�";
-
- /**
- * 璁惧绠＄悊鍛�
- */
- public static final String MDC_EQUIPMENT_MANAGER = "mdcEquipmentManager";
-
- /**
- * 璁惧瓒呯骇绠＄悊鍛�
- */
- public static final String MDC_EQUIPMENT_SUPER_MANAGER = "mdcEquipmentSuperManager";
-
- /**
- * 娑堟伅鐘舵�侊紙0寰呭鐞嗭紝1寰呯‘璁�, 2宸茬‘璁わ紝3宸叉嫆缁濓級
- */
- public static final String MSG_STATUS_0 = "0";
- public static final String MSG_STATUS_1 = "1";
- public static final String MSG_STATUS_2 = "2";
- public static final String MSG_STATUS_3 = "3";
-
- /**
- * 鐢ㄦ埛绫诲瀷(1 鏅�氭垚鍛� 2 宸ユ 3 杞﹂棿 4 鍏徃锛�
- */
- public static final Integer USER_TYPE_1 = 1;
- public static final Integer USER_TYPE_2 = 2;
- public static final Integer USER_TYPE_3 = 3;
- public static final Integer USER_TYPE_4 = 4;
-
- /**
- * 涓插彛璁惧绫诲瀷
- */
- public static final String SERIA_TYPE = "seria_equipment_type";
-
-}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcDowntimeController.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcDowntimeController.java
new file mode 100644
index 0000000..4c1dfcc
--- /dev/null
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcDowntimeController.java
@@ -0,0 +1,163 @@
+package org.jeecg.modules.mdc.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+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.apache.shiro.SecurityUtils;
+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.vo.LoginUser;
+import org.jeecg.modules.mdc.dto.MdcDowntimeDto;
+import org.jeecg.modules.mdc.entity.MdcDowntime;
+import org.jeecg.modules.mdc.service.IMdcDowntimeService;
+import org.jeecg.modules.mdc.vo.MdcDowntimeVo;
+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;
+
+/**
+ * @Description: 寰呮満鍋滄満琛�
+ * @Author: lius
+ * @Date: 2025-03-12
+ */
+@Slf4j
+@Api(tags = "寰呮満鍋滄満琛�")
+@RestController
+@RequestMapping("/mdc/mdcDowntime")
+public class MdcDowntimeController extends JeecgController<MdcDowntime, IMdcDowntimeService> {
+
+ @Resource
+ private IMdcDowntimeService mdcDowntimeService;
+
+ /**
+ * 鍒嗛〉鍒楄〃鏌ヨ
+ *
+ * @param mdcDowntimeVo
+ * @param pageNo
+ * @param pageSize
+ * @param req
+ * @return
+ */
+ @AutoLog(value = "寰呮満鍋滄満琛�-鍒嗛〉鍒楄〃鏌ヨ")
+ @ApiOperation(value = "寰呮満鍋滄満琛�-鍒嗛〉鍒楄〃鏌ヨ", notes = "寰呮満鍋滄満琛�-鍒嗛〉鍒楄〃鏌ヨ")
+ @GetMapping(value = "/list")
+ public Result<?> queryPageList(MdcDowntimeVo mdcDowntimeVo,
+ @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+ @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+ HttpServletRequest req) {
+ LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ String userId = user.getId();
+ Page<MdcDowntimeDto> page = new Page<MdcDowntimeDto>(pageNo, pageSize);
+ IPage<MdcDowntimeDto> pageList = mdcDowntimeService.pageList(userId, page, mdcDowntimeVo, req);
+ return Result.OK(pageList);
+ }
+
+ /**
+ * 娣诲姞
+ *
+ * @param mdcDowntime
+ * @return
+ */
+ @AutoLog(value = "寰呮満鍋滄満琛�-娣诲姞")
+ @ApiOperation(value = "寰呮満鍋滄満琛�-娣诲姞", notes = "寰呮満鍋滄満琛�-娣诲姞")
+ @PostMapping(value = "/add")
+ public Result<?> add(@RequestBody MdcDowntime mdcDowntime) {
+ if (StringUtils.isBlank(mdcDowntime.getEquipmentIds())) {
+ return Result.error("鏈�夋嫨璁惧锛岃鎺掓煡");
+ }
+ if (CollectionUtils.isEmpty(mdcDowntime.getDateList())) {
+ return Result.error("鏈�夋嫨鏃ユ湡锛岃鎺掓煡");
+ }
+ boolean flag = mdcDowntimeService.saveDowntime(mdcDowntime);
+ return flag ? Result.ok("娣诲姞鎴愬姛") : Result.error("娣诲姞澶辫触");
+ }
+
+ /**
+ * 缂栬緫
+ *
+ * @param mdcDowntime
+ * @return
+ */
+ @AutoLog(value = "寰呮満鍋滄満琛�-缂栬緫")
+ @ApiOperation(value = "寰呮満鍋滄満琛�-缂栬緫", notes = "寰呮満鍋滄満琛�-缂栬緫")
+ @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
+ public Result<?> edit(@RequestBody MdcDowntime mdcDowntime) {
+ mdcDowntimeService.updateById(mdcDowntime);
+ return Result.OK("缂栬緫鎴愬姛!");
+ }
+
+ /**
+ * 閫氳繃id鍒犻櫎
+ *
+ * @param id
+ * @return
+ */
+ @AutoLog(value = "寰呮満鍋滄満琛�-閫氳繃id鍒犻櫎")
+ @ApiOperation(value = "寰呮満鍋滄満琛�-閫氳繃id鍒犻櫎", notes = "寰呮満鍋滄満琛�-閫氳繃id鍒犻櫎")
+ @DeleteMapping(value = "/delete")
+ public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
+ mdcDowntimeService.removeById(id);
+ return Result.OK("鍒犻櫎鎴愬姛!");
+ }
+
+ /**
+ * 鎵归噺鍒犻櫎
+ *
+ * @param ids
+ * @return
+ */
+ @AutoLog(value = "寰呮満鍋滄満琛�-鎵归噺鍒犻櫎")
+ @ApiOperation(value = "寰呮満鍋滄満琛�-鎵归噺鍒犻櫎", notes = "寰呮満鍋滄満琛�-鎵归噺鍒犻櫎")
+ @DeleteMapping(value = "/deleteBatch")
+ public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+ this.mdcDowntimeService.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<?> queryById(@RequestParam(name = "id", required = true) String id) {
+ MdcDowntime mdcDowntime = mdcDowntimeService.getById(id);
+ return Result.OK(mdcDowntime);
+ }
+
+ /**
+ * 瀵煎嚭excel
+ *
+ * @param request
+ * @param mdcDowntime
+ */
+ @RequestMapping(value = "/exportXls")
+ public ModelAndView exportXls(HttpServletRequest request, MdcDowntime mdcDowntime) {
+ return super.exportXls(request, mdcDowntime, MdcDowntime.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, MdcDowntime.class);
+ }
+
+}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcDowntimeReasonController.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcDowntimeReasonController.java
new file mode 100644
index 0000000..e47ca34
--- /dev/null
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcDowntimeReasonController.java
@@ -0,0 +1,168 @@
+package org.jeecg.modules.mdc.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.mdc.entity.MdcDowntimeReason;
+import org.jeecg.modules.mdc.service.IMdcDowntimeReasonService;
+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;
+
+/**
+ * @Description: 鍋滄満鍘熷洜琛�
+ * @Author: lius
+ * @Date: 2025-03-11
+ */
+@Slf4j
+@Api(tags = "鍋滄満鍘熷洜琛�")
+@RestController
+@RequestMapping("/mdc/mdcDowntimeReason")
+public class MdcDowntimeReasonController extends JeecgController<MdcDowntimeReason, IMdcDowntimeReasonService> {
+
+
+ @Resource
+ private IMdcDowntimeReasonService mdcDowntimeReasonService;
+
+ /**
+ * 鍒嗛〉鍒楄〃鏌ヨ
+ *
+ * @param mdcDowntimeReason
+ * @param pageNo
+ * @param pageSize
+ * @param req
+ * @return
+ */
+ @AutoLog(value = "鍋滄満鍘熷洜琛�-鍒嗛〉鍒楄〃鏌ヨ")
+ @ApiOperation(value = "鍋滄満鍘熷洜琛�-鍒嗛〉鍒楄〃鏌ヨ", notes = "鍋滄満鍘熷洜琛�-鍒嗛〉鍒楄〃鏌ヨ")
+ @GetMapping(value = "/list")
+ public Result<?> queryPageList(MdcDowntimeReason mdcDowntimeReason,
+ @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+ @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+ HttpServletRequest req) {
+ QueryWrapper<MdcDowntimeReason> queryWrapper = QueryGenerator.initQueryWrapper(mdcDowntimeReason, req.getParameterMap());
+ Page<MdcDowntimeReason> page = new Page<MdcDowntimeReason>(pageNo, pageSize);
+ IPage<MdcDowntimeReason> pageList = mdcDowntimeReasonService.page(page, queryWrapper);
+ return Result.OK(pageList);
+ }
+
+ /**
+ * 娣诲姞
+ *
+ * @param mdcDowntimeReason
+ * @return
+ */
+ @AutoLog(value = "鍋滄満鍘熷洜琛�-娣诲姞")
+ @ApiOperation(value = "鍋滄満鍘熷洜琛�-娣诲姞", notes = "鍋滄満鍘熷洜琛�-娣诲姞")
+ @PostMapping(value = "/add")
+ public Result<?> add(@RequestBody MdcDowntimeReason mdcDowntimeReason) {
+ mdcDowntimeReasonService.save(mdcDowntimeReason);
+ return Result.OK("娣诲姞鎴愬姛锛�");
+ }
+
+ /**
+ * 缂栬緫
+ *
+ * @param mdcDowntimeReason
+ * @return
+ */
+ @AutoLog(value = "鍋滄満鍘熷洜琛�-缂栬緫")
+ @ApiOperation(value = "鍋滄満鍘熷洜琛�-缂栬緫", notes = "鍋滄満鍘熷洜琛�-缂栬緫")
+ @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
+ public Result<?> edit(@RequestBody MdcDowntimeReason mdcDowntimeReason) {
+ mdcDowntimeReasonService.updateById(mdcDowntimeReason);
+ return Result.OK("缂栬緫鎴愬姛!");
+ }
+
+ /**
+ * 閫氳繃id鍒犻櫎
+ *
+ * @param id
+ * @return
+ */
+ @AutoLog(value = "鍋滄満鍘熷洜琛�-閫氳繃id鍒犻櫎")
+ @ApiOperation(value = "鍋滄満鍘熷洜琛�-閫氳繃id鍒犻櫎", notes = "鍋滄満鍘熷洜琛�-閫氳繃id鍒犻櫎")
+ @DeleteMapping(value = "/delete")
+ public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
+ mdcDowntimeReasonService.removeById(id);
+ return Result.OK("鍒犻櫎鎴愬姛!");
+ }
+
+ /**
+ * 鎵归噺鍒犻櫎
+ *
+ * @param ids
+ * @return
+ */
+ @AutoLog(value = "鍋滄満鍘熷洜琛�-鎵归噺鍒犻櫎")
+ @ApiOperation(value = "鍋滄満鍘熷洜琛�-鎵归噺鍒犻櫎", notes = "鍋滄満鍘熷洜琛�-鎵归噺鍒犻櫎")
+ @DeleteMapping(value = "/deleteBatch")
+ public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+ this.mdcDowntimeReasonService.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<?> queryById(@RequestParam(name = "id", required = true) String id) {
+ MdcDowntimeReason mdcDowntimeReason = mdcDowntimeReasonService.getById(id);
+ return Result.OK(mdcDowntimeReason);
+ }
+
+ /**
+ * 瀵煎嚭excel
+ *
+ * @param request
+ * @param mdcDowntimeReason
+ */
+ @RequestMapping(value = "/exportXls")
+ public ModelAndView exportXls(HttpServletRequest request, MdcDowntimeReason mdcDowntimeReason) {
+ return super.exportXls(request, mdcDowntimeReason, MdcDowntimeReason.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, MdcDowntimeReason.class);
+ }
+
+ /**
+ * 鏍规嵁鍋滄満绫诲瀷鑾峰彇鍋滄満鍘熷洜鍒楄〃
+ *
+ * @param downtimeType
+ * @return
+ */
+ @AutoLog(value = "鍋滄満鍘熷洜琛�-鏍规嵁鍋滄満绫诲瀷鑾峰彇鍋滄満鍘熷洜鍒楄〃")
+ @ApiOperation(value = "鍋滄満鍘熷洜琛�-鏍规嵁鍋滄満绫诲瀷鑾峰彇鍋滄満鍘熷洜鍒楄〃", notes = "鍋滄満鍘熷洜琛�-鏍规嵁鍋滄満绫诲瀷鑾峰彇鍋滄満鍘熷洜鍒楄〃")
+ @GetMapping(value = "/downtimeReasonList")
+ public Result<?> downtimeReasonList(@RequestParam(name = "downtimeType", required = true) String downtimeType) {
+ List<MdcDowntimeReason> result = mdcDowntimeReasonService.downtimeReasonList(downtimeType);
+ return Result.OK(result);
+ }
+
+}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcEquipmentTypeController.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcEquipmentTypeController.java
index 741c414..1105cdd 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcEquipmentTypeController.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcEquipmentTypeController.java
@@ -8,9 +8,7 @@
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.modules.mdc.entity.MdcDriveTypeParamConfig;
import org.jeecg.modules.mdc.entity.MdcEquipmentType;
-import org.jeecg.modules.mdc.service.IMdcDriveTypeParamConfigService;
import org.jeecg.modules.mdc.service.IMdcEquipmentTypeService;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcOeeInfoController.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcOeeInfoController.java
new file mode 100644
index 0000000..642d400
--- /dev/null
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcOeeInfoController.java
@@ -0,0 +1,100 @@
+package org.jeecg.modules.mdc.controller;
+
+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.system.base.controller.JeecgController;
+import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.modules.mdc.entity.MdcOeeInfo;
+import org.jeecg.modules.mdc.service.IMdcOeeInfoService;
+import org.jeecg.modules.mdc.vo.MdcOeeComputeVo;
+import org.jeecg.modules.mdc.vo.MdcOeeInfoVo;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * @Description: OEE琛�
+ * @Author: lius
+ * @Date: 2024-12-12
+ */
+@Slf4j
+@Api(tags = "OEE琛�")
+@RestController
+@RequestMapping("/mdc/mdcOeeInfo")
+public class MdcOeeInfoController extends JeecgController<MdcOeeInfo, IMdcOeeInfoService> {
+
+ @Resource
+ private IMdcOeeInfoService mdcOeeInfoService;
+
+ /**
+ * 鍒嗛〉鍒楄〃鏌ヨ
+ *
+ * @param mdcOeeInfoVo
+ * @param pageNo
+ * @param pageSize
+ * @param req
+ * @return
+ */
+ @AutoLog(value = "OEE琛�-鍒嗛〉鍒楄〃鏌ヨ")
+ @ApiOperation(value = "OEE琛�-鍒嗛〉鍒楄〃鏌ヨ", notes = "OEE琛�-鍒嗛〉鍒楄〃鏌ヨ")
+ @GetMapping(value = "/list")
+ public Result<?> queryPageList(MdcOeeInfoVo mdcOeeInfoVo,
+ @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+ @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+ HttpServletRequest req) {
+ LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ String userId = user.getId();
+ Page<MdcOeeInfo> page = new Page<MdcOeeInfo>(pageNo, pageSize);
+ IPage<MdcOeeInfo> pageList = mdcOeeInfoService.pageList(userId, page, mdcOeeInfoVo, req);
+ return Result.OK(pageList);
+ }
+
+ /**
+ * 閫氳繃id鏌ヨ
+ *
+ * @param id
+ * @return
+ */
+ @AutoLog(value = "OEE琛�-閫氳繃id鏌ヨ")
+ @ApiOperation(value = "OEE琛�-閫氳繃id鏌ヨ", notes = "OEE琛�-閫氳繃id鏌ヨ")
+ @GetMapping(value = "/queryById")
+ public Result<?> queryById(@RequestParam(name = "id", required = true) String id) {
+ MdcOeeInfo mdcOeeInfo = mdcOeeInfoService.getById(id);
+ return Result.OK(mdcOeeInfo);
+ }
+
+ /**
+ * 瀵煎嚭excel
+ *
+ * @param request
+ * @param mdcOeeInfoVo
+ */
+ @RequestMapping(value = "/exportXls")
+ public ModelAndView exportXls(HttpServletRequest request, MdcOeeInfoVo mdcOeeInfoVo) {
+ LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ String userId = user.getId();
+ return mdcOeeInfoService.exportXls(userId, mdcOeeInfoVo);
+ }
+
+ /**
+ * 璁＄畻OEE
+ *
+ * @return
+ */
+ @AutoLog(value = "OEE琛�-璁＄畻OEE")
+ @ApiOperation(value = "OEE琛�-璁＄畻OEE", notes = "OEE琛�-璁＄畻OEE")
+ @PostMapping(value = "/computeOee")
+ public Result<?> computeOee(@RequestBody MdcOeeComputeVo mdcOeeComputeVo) {
+ mdcOeeInfoService.computeOee(mdcOeeComputeVo);
+ return Result.OK("璁＄畻鎴愬姛锛�");
+ }
+
+}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcParameterController.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcParameterController.java
new file mode 100644
index 0000000..862ebe6
--- /dev/null
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcParameterController.java
@@ -0,0 +1,126 @@
+package org.jeecg.modules.mdc.controller;
+
+import java.util.Arrays;
+import javax.servlet.http.HttpServletRequest;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.modules.mdc.entity.MdcParameter;
+import org.jeecg.modules.mdc.service.IMdcParameterService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * @Description: mdc绠楁硶鍏紡
+ * @Author: lius
+ * @Date: 2025-08-13
+ * @Version: V1.0
+ */
+@Slf4j
+@Api(tags = "mdc绠楁硶鍏紡")
+@RestController
+@RequestMapping("/mdc/mdcParameter")
+public class MdcParameterController extends JeecgController<MdcParameter, IMdcParameterService> {
+ @Autowired
+ private IMdcParameterService mdcParameterService;
+
+ /**
+ * 鍒嗛〉鍒楄〃鏌ヨ
+ *
+ * @param mdcParameter
+ * @param pageNo
+ * @param pageSize
+ * @param req
+ * @return
+ */
+ @AutoLog(value = "mdc绠楁硶鍏紡-鍒嗛〉鍒楄〃鏌ヨ")
+ @ApiOperation(value = "mdc绠楁硶鍏紡-鍒嗛〉鍒楄〃鏌ヨ", notes = "mdc绠楁硶鍏紡-鍒嗛〉鍒楄〃鏌ヨ")
+ @GetMapping(value = "/list")
+ public Result<?> queryPageList(MdcParameter mdcParameter,
+ @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+ @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+ HttpServletRequest req) {
+ QueryWrapper<MdcParameter> queryWrapper = QueryGenerator.initQueryWrapper(mdcParameter, req.getParameterMap());
+ Page<MdcParameter> page = new Page<MdcParameter>(pageNo, pageSize);
+ IPage<MdcParameter> pageList = mdcParameterService.page(page, queryWrapper);
+ return Result.OK(pageList);
+ }
+
+ /**
+ * 娣诲姞
+ *
+ * @param mdcParameter
+ * @return
+ */
+ @AutoLog(value = "mdc绠楁硶鍏紡-娣诲姞")
+ @ApiOperation(value = "mdc绠楁硶鍏紡-娣诲姞", notes = "mdc绠楁硶鍏紡-娣诲姞")
+ @PostMapping(value = "/add")
+ public Result<?> add(@RequestBody MdcParameter mdcParameter) {
+ mdcParameterService.save(mdcParameter);
+ return Result.OK("娣诲姞鎴愬姛锛�");
+ }
+
+ /**
+ * 缂栬緫
+ *
+ * @param mdcParameter
+ * @return
+ */
+ @AutoLog(value = "mdc绠楁硶鍏紡-缂栬緫")
+ @ApiOperation(value = "mdc绠楁硶鍏紡-缂栬緫", notes = "mdc绠楁硶鍏紡-缂栬緫")
+ @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
+ public Result<?> edit(@RequestBody MdcParameter mdcParameter) {
+ mdcParameterService.updateById(mdcParameter);
+ return Result.OK("缂栬緫鎴愬姛!");
+ }
+
+ /**
+ * 閫氳繃id鍒犻櫎
+ *
+ * @param id
+ * @return
+ */
+ @AutoLog(value = "mdc绠楁硶鍏紡-閫氳繃id鍒犻櫎")
+ @ApiOperation(value = "mdc绠楁硶鍏紡-閫氳繃id鍒犻櫎", notes = "mdc绠楁硶鍏紡-閫氳繃id鍒犻櫎")
+ @DeleteMapping(value = "/delete")
+ public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
+ mdcParameterService.removeById(id);
+ return Result.OK("鍒犻櫎鎴愬姛!");
+ }
+
+ /**
+ * 鎵归噺鍒犻櫎
+ *
+ * @param ids
+ * @return
+ */
+ @AutoLog(value = "mdc绠楁硶鍏紡-鎵归噺鍒犻櫎")
+ @ApiOperation(value = "mdc绠楁硶鍏紡-鎵归噺鍒犻櫎", notes = "mdc绠楁硶鍏紡-鎵归噺鍒犻櫎")
+ @DeleteMapping(value = "/deleteBatch")
+ public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+ this.mdcParameterService.removeByIds(Arrays.asList(ids.split(",")));
+ return Result.OK("鎵归噺鍒犻櫎鎴愬姛锛�");
+ }
+
+ /**
+ * 閫氳繃id鏌ヨ
+ *
+ * @param id
+ * @return
+ */
+ @AutoLog(value = "mdc绠楁硶鍏紡-閫氳繃id鏌ヨ")
+ @ApiOperation(value = "mdc绠楁硶鍏紡-閫氳繃id鏌ヨ", notes = "mdc绠楁硶鍏紡-閫氳繃id鏌ヨ")
+ @GetMapping(value = "/queryById")
+ public Result<?> queryById(@RequestParam(name = "id", required = true) String id) {
+ MdcParameter mdcParameter = mdcParameterService.getById(id);
+ return Result.OK(mdcParameter);
+ }
+
+}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcDowntimeDto.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcDowntimeDto.java
new file mode 100644
index 0000000..08cd980
--- /dev/null
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcDowntimeDto.java
@@ -0,0 +1,16 @@
+package org.jeecg.modules.mdc.dto;
+
+import lombok.Data;
+import org.jeecg.modules.mdc.entity.MdcDowntime;
+
+/**
+ * @Author: Lius
+ * @CreateTime: 2025-03-17
+ * @Description: 寰呮満鍋滄満鍘熷洜
+ */
+@Data
+public class MdcDowntimeDto extends MdcDowntime {
+ private Integer downtimeType;
+ private String downtimeDescription;
+
+}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcEquDepDto.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcEquDepDto.java
index 434328f..1eb3c53 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcEquDepDto.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcEquDepDto.java
@@ -23,7 +23,7 @@
/**
* 灞傜骇缂栧彿
*/
- private String orgType;
+ private String orgCode;
/**
* 璁惧id
*/
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcEquProDto.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcEquProDto.java
index ebba0d4..8a1928d 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcEquProDto.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcEquProDto.java
@@ -24,7 +24,7 @@
/**
* 灞傜骇缂栧彿
*/
- private String orgType;
+ private String orgCode;
/**
* 璁惧id
*/
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcDowntime.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcDowntime.java
new file mode 100644
index 0000000..41d8523
--- /dev/null
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcDowntime.java
@@ -0,0 +1,74 @@
+package org.jeecg.modules.mdc.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;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description: 寰呮満鍋滄満琛�
+ * @Author: lius
+ * @Date: 2025-03-12
+ */
+@Data
+@TableName("mdc_downtime")
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "mdc_downtime瀵硅薄", description = "寰呮満鍋滄満琛�")
+public class MdcDowntime extends JeecgEntity implements Serializable {
+
+ private static final long serialVersionUID = 7151231815767722285L;
+
+ /**
+ * 璁惧缂栧彿
+ */
+ @Excel(name = "璁惧缂栧彿", width = 15)
+ @ApiModelProperty(value = "璁惧缂栧彿")
+ private String equipmentId;
+ /**
+ * 璁惧鍚嶇О
+ */
+ @Excel(name = "璁惧鍚嶇О", width = 15)
+ @ApiModelProperty(value = "璁惧鍚嶇О")
+ private String equipmentName;
+ /**
+ * 鍋滄満鍘熷洜id
+ */
+ @Excel(name = "鍋滄満鍘熷洜id", width = 15)
+ @ApiModelProperty(value = "鍋滄満鍘熷洜id")
+ private String reasonId;
+
+ /**
+ * 鍋滄満鏃堕暱
+ */
+ @Excel(name = "鍋滄満鏃堕暱", width = 15)
+ @ApiModelProperty(value = "鍋滄満鏃堕暱")
+ private Integer downLong;
+ /**
+ * 鏃ユ湡
+ */
+ @Excel(name = "鏃ユ湡", width = 15)
+ @ApiModelProperty(value = "鏃ユ湡")
+ private String theDate;
+ /**
+ * 澶囨敞
+ */
+ @Excel(name = "澶囨敞", width = 15)
+ @ApiModelProperty(value = "澶囨敞")
+ private String remark;
+
+ @TableField(exist = false)
+ private String equipmentIds;
+
+ @TableField(exist = false)
+ private List<String> dateList;
+
+}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcDowntimeReason.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcDowntimeReason.java
new file mode 100644
index 0000000..ecce552
--- /dev/null
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcDowntimeReason.java
@@ -0,0 +1,49 @@
+package org.jeecg.modules.mdc.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.system.base.entity.JeecgEntity;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+import java.io.Serializable;
+
+/**
+ * @Description: 鍋滄満鍘熷洜琛�
+ * @Author: lius
+ * @Date: 2025-03-11
+ */
+@Data
+@TableName("mdc_downtime_reason")
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "mdc_downtime_reason瀵硅薄", description = "鍋滄満鍘熷洜琛�")
+public class MdcDowntimeReason extends JeecgEntity implements Serializable {
+
+ private static final long serialVersionUID = -4421631921207859780L;
+
+ /**
+ * 鍋滄満绫诲瀷锛�0锛氳鍒掑仠鏈� 1锛氶潪璁″垝鍋滄満锛�
+ */
+ @Excel(name = "鍋滄満绫诲瀷锛�0锛氳鍒掑仠鏈� 1锛氶潪璁″垝鍋滄満锛�", width = 15)
+ @ApiModelProperty(value = "鍋滄満绫诲瀷锛�0锛氳鍒掑仠鏈� 1锛氶潪璁″垝鍋滄満锛�")
+ @Dict(dicCode = "mdc_downtime_type")
+ private Integer downtimeType;
+ /**
+ * 鍋滄満鍘熷洜鎻忚堪
+ */
+ @Excel(name = "鍋滄満鍘熷洜鎻忚堪", width = 15)
+ @ApiModelProperty(value = "鍋滄満鍘熷洜鎻忚堪")
+ private String downtimeDescription;
+ /**
+ * 澶囨敞
+ */
+ @Excel(name = "澶囨敞", width = 15)
+ @ApiModelProperty(value = "澶囨敞")
+ private String remark;
+
+}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcOeeInfo.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcOeeInfo.java
new file mode 100644
index 0000000..6832055
--- /dev/null
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcOeeInfo.java
@@ -0,0 +1,114 @@
+package org.jeecg.modules.mdc.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecg.common.system.base.entity.JeecgEntity;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * @Description: OEE琛�
+ * @Author: lius
+ * @Date: 2024-12-12
+ */
+@Data
+@TableName("mdc_oee_info")
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "mdc_oee_info瀵硅薄", description = "OEE琛�")
+public class MdcOeeInfo extends JeecgEntity implements Serializable {
+
+ private static final long serialVersionUID = -1029070983514140912L;
+
+ /**
+ * 璁惧缂栧彿
+ */
+ @Excel(name = "璁惧缂栧彿", width = 15)
+ @ApiModelProperty(value = "璁惧缂栧彿")
+ private String equipmentId;
+ /**
+ * 鏃ユ湡
+ */
+ @Excel(name = "鏃ユ湡", width = 15)
+ @ApiModelProperty(value = "鏃ユ湡")
+ private String theDate;
+ /**
+ * 宸ヤ綔鏃ュ巻鏃堕棿(min)
+ */
+ @Excel(name = "宸ヤ綔鏃ュ巻鏃堕棿(min)", width = 15)
+ @ApiModelProperty(value = "宸ヤ綔鏃ュ巻鏃堕棿(min)")
+ private Integer calendarLong;
+ /**
+ * 璁″垝鍋滄満鏃堕棿(min)
+ */
+ @Excel(name = "璁″垝鍋滄満鏃堕棿(min)", width = 15)
+ @ApiModelProperty(value = "璁″垝鍋滄満鏃堕棿(min)")
+ private Integer planCloseLong;
+ /**
+ * 璐熻嵎鏃堕棿(min)
+ */
+ @Excel(name = "璐熻嵎鏃堕棿(min)", width = 15)
+ @ApiModelProperty(value = "璐熻嵎鏃堕棿(min)")
+ private Integer loadLong;
+ /**
+ * 闈炶鍒掑仠鏈烘椂闂�(min)
+ */
+ @Excel(name = "闈炶鍒掑仠鏈烘椂闂�(min)", width = 15)
+ @ApiModelProperty(value = "闈炶鍒掑仠鏈烘椂闂�(min)")
+ private Integer noplanCloseLong;
+ /**
+ * 寮�鍔ㄦ椂闂�(min)
+ */
+ @Excel(name = "寮�鍔ㄦ椂闂�(min)", width = 15)
+ @ApiModelProperty(value = "寮�鍔ㄦ椂闂�(min)")
+ private Integer actuateLong;
+ /**
+ * 鏃堕棿寮�鍔ㄧ巼
+ */
+ @Excel(name = "鏃堕棿寮�鍔ㄧ巼", width = 15)
+ @ApiModelProperty(value = "鏃堕棿寮�鍔ㄧ巼")
+ private BigDecimal timeActuationRate;
+ /**
+ * 鏈夋晥杩愯鏃堕棿
+ */
+ @Excel(name = "鏈夋晥杩愯鏃堕棿", width = 15)
+ @ApiModelProperty(value = "鏈夋晥杩愯鏃堕棿")
+ private Integer effectiveRunLong;
+ /**
+ * 鎬ц兘寮�鍔ㄧ巼
+ */
+ @Excel(name = "鎬ц兘寮�鍔ㄧ巼", width = 15)
+ @ApiModelProperty(value = "鎬ц兘寮�鍔ㄧ巼")
+ private BigDecimal performanceRate;
+ /**
+ * 鍔犲伐闆朵欢鏁伴噺
+ */
+ @Excel(name = "鍔犲伐闆朵欢鏁伴噺", width = 15)
+ @ApiModelProperty(value = "鍔犲伐闆朵欢鏁伴噺")
+ private Integer processCount;
+ /**
+ * 鍚堟牸闆朵欢鏁伴噺
+ */
+ @Excel(name = "鍚堟牸闆朵欢鏁伴噺", width = 15)
+ @ApiModelProperty(value = "鍚堟牸闆朵欢鏁伴噺")
+ private Integer passCount;
+ /**
+ * 鍚堟牸鐜�
+ */
+ @Excel(name = "鍚堟牸鐜�", width = 15)
+ @ApiModelProperty(value = "鍚堟牸鐜�")
+ private BigDecimal passRate;
+ /**
+ * OEE
+ */
+ @Excel(name = "OEE", width = 15)
+ @ApiModelProperty(value = "OEE")
+ private BigDecimal oee;
+
+}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcParameter.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcParameter.java
new file mode 100644
index 0000000..321c589
--- /dev/null
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcParameter.java
@@ -0,0 +1,66 @@
+package org.jeecg.modules.mdc.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecg.common.system.base.entity.JeecgEntity;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+import java.io.Serializable;
+
+/**
+ * @Description: mdc绠楁硶鍏紡
+ * @Author: lius
+ * @Date: 2025-08-13
+ * @Version: V1.0
+ */
+@Data
+@TableName("mdc_parameter")
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "mdc_parameter瀵硅薄", description = "mdc绠楁硶鍏紡")
+public class MdcParameter extends JeecgEntity implements Serializable {
+
+ private static final long serialVersionUID = -1935799306658540361L;
+
+ /**
+ * 缂栫爜
+ */
+ @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 description;
+ /**
+ * 鍊�
+ */
+ @Excel(name = "鍊�", width = 15)
+ @ApiModelProperty(value = "鍊�")
+ private String value;
+ /**
+ * 绫诲瀷
+ */
+ @Excel(name = "绫诲瀷", width = 15)
+ @ApiModelProperty(value = "绫诲瀷")
+ private Boolean type;
+ /**
+ * 澶囨敞
+ */
+ @Excel(name = "澶囨敞", width = 15)
+ @ApiModelProperty(value = "澶囨敞")
+ private String remark;
+
+}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/job/RunningOEEJob.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/job/RunningOEEJob.java
new file mode 100644
index 0000000..57c88ca
--- /dev/null
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/job/RunningOEEJob.java
@@ -0,0 +1,83 @@
+package org.jeecg.modules.mdc.job;
+
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.jeecg.common.util.DateUtils;
+import org.jeecg.modules.mdc.service.IMdcOeeInfoService;
+import org.jeecg.modules.mdc.util.ThrowableUtil;
+import org.jeecg.modules.mdc.vo.MdcOeeComputeVo;
+import org.jeecg.modules.quartz.entity.QuartzJob;
+import org.jeecg.modules.quartz.entity.SysQuartzLog;
+import org.jeecg.modules.quartz.service.IQuartzJobService;
+import org.jeecg.modules.quartz.service.ISysQuartzLogService;
+import org.jeecg.modules.system.service.ISysAnnouncementService;
+import org.quartz.*;
+
+import javax.annotation.Resource;
+import java.time.LocalDate;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Author: Lius
+ * @CreateTime: 2025-04-24
+ * @Description: OEE
+ */
+@PersistJobDataAfterExecution
+@DisallowConcurrentExecution
+@Slf4j
+public class RunningOEEJob implements Job {
+
+ /**
+ * 鑻ュ弬鏁板彉閲忓悕淇敼 QuartzJobController涓篃闇�瀵瑰簲淇敼 鏃堕棿锛� yyyyMMdd 渚嬶細 20230414
+ */
+ private String parameter;
+
+ public void setParameter(String parameter) {
+ this.parameter = parameter;
+ }
+
+ @Resource
+ private IQuartzJobService quartzJobService;
+
+ @Resource
+ private ISysAnnouncementService sysAnnouncementService;
+
+ @Resource
+ private ISysQuartzLogService sysQuartzLogService;
+
+ @Resource
+ private IMdcOeeInfoService mdcOeeInfoService;
+
+ @Override
+ public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
+ SysQuartzLog quartzLog = new SysQuartzLog();
+ quartzLog.setCreateTime(new Date());
+ List<QuartzJob> byJobClassName = this.quartzJobService.findByJobClassName(this.getClass().getName());
+ if (byJobClassName != null && !byJobClassName.isEmpty()) {
+ quartzLog.setJobId(byJobClassName.get(0).getId());
+ }
+ quartzLog.setParams(this.parameter);
+ log.info("瀹氭椂璁＄畻璁惧缁煎悎鏁堢巼OEE浠诲姟 RunningOEEJob start! 鏃堕棿:" + DateUtils.now(), this.parameter);
+ long startTime = System.currentTimeMillis();
+ try {
+ MdcOeeComputeVo mdcOeeComputeVo = new MdcOeeComputeVo();
+ String dateTime = LocalDate.now().plusDays(-1).toString();
+ if (StringUtils.isNotBlank(this.parameter)) {
+ dateTime = DateUtils.date2Str(DateUtils.str2Date(this.parameter, DateUtils.yyyyMMdd.get()), DateUtils.date_sdf.get());
+ }
+ mdcOeeComputeVo.setStartTime(dateTime);
+ mdcOeeComputeVo.setEndTime(dateTime);
+ mdcOeeInfoService.computeOee(mdcOeeComputeVo);
+ quartzLog.setIsSuccess(0);
+ } catch (Exception e) {
+ quartzLog.setIsSuccess(-1);
+ quartzLog.setExceptionDetail(ThrowableUtil.getStackTrace(e));
+ // 鍙戦�佹秷鎭�氱煡
+ sysAnnouncementService.jobSendMessage("瀹氭椂璁＄畻璁惧缁煎悎鏁堢巼OEE浠诲姟", quartzLog.getExceptionDetail());
+ }
+ long endTime = System.currentTimeMillis();
+ quartzLog.setExecutionTime(Integer.parseInt(String.valueOf(endTime - startTime)));
+ sysQuartzLogService.save(quartzLog);
+ }
+}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/EquipmentMapper.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/EquipmentMapper.java
index 5cdf91e..1257bac 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/EquipmentMapper.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/EquipmentMapper.java
@@ -16,7 +16,7 @@
public interface EquipmentMapper extends BaseMapper<Equipment> {
- @Select(" SELECT name FROM SysObjects Where XType='U' AND name = '${saveTableName}' ")
+ @Select(" SELECT TABLE_NAME FROM information_schema.TABLES WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = '${saveTableName}' ")
String checkTableExists(@Param("saveTableName") String saveTableName);
@Select(" SELECT COUNT(CollectTime) num FROM ${saveTableName} WHERE CollectTime < '${day}' ")
@@ -28,6 +28,6 @@
@Delete(" delete from ${tableName} where CollectTime < '${day}' ")
void deleteTableData(@Param("tableName") String saveTableName, @Param("day") String day);
- @Insert(" SELECT * INTO ${tableName} FROM ${lastTableName} WHERE CollectTime < '${date}' ")
+ @Insert("CREATE TABLE `{tableName}` AS SELECT * FROM `{lastTableName}` WHERE CollectTime < '${date}' ")
void insertNoTableData(@Param("tableName") String tableName, @Param("lastTableName") String lastTableName, @Param("date") String date);
}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcDowntimeMapper.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcDowntimeMapper.java
new file mode 100644
index 0000000..5446655
--- /dev/null
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcDowntimeMapper.java
@@ -0,0 +1,23 @@
+package org.jeecg.modules.mdc.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.mdc.dto.MdcDowntimeDto;
+import org.jeecg.modules.mdc.entity.MdcDowntime;
+import org.jeecg.modules.mdc.vo.MdcDowntimeVo;
+
+import java.util.List;
+
+/**
+ * @Description: 寰呮満鍋滄満琛�
+ * @Author: lius
+ * @Date: 2025-03-12
+ */
+public interface MdcDowntimeMapper extends BaseMapper<MdcDowntime> {
+
+ IPage<MdcDowntimeDto> pageList(Page<MdcDowntimeDto> page, @Param("mdcDowntimeVo") MdcDowntimeVo mdcDowntimeVo);
+
+ List<MdcDowntime> findPlanTimeDuration(@Param("equipmentId") String equipmentId, @Param("validDate") String validDate, @Param("closeType") String closeType);
+}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcDowntimeReasonMapper.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcDowntimeReasonMapper.java
new file mode 100644
index 0000000..9bfefe7
--- /dev/null
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcDowntimeReasonMapper.java
@@ -0,0 +1,13 @@
+package org.jeecg.modules.mdc.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.mdc.entity.MdcDowntimeReason;
+
+/**
+ * @Description: 鍋滄満鍘熷洜琛�
+ * @Author: lius
+ * @Date: 2025-03-11
+ */
+public interface MdcDowntimeReasonMapper extends BaseMapper<MdcDowntimeReason> {
+
+}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcEfficiencyReportMapper.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcEfficiencyReportMapper.java
index 80ff59a..0ca9e11 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcEfficiencyReportMapper.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcEfficiencyReportMapper.java
@@ -8,7 +8,6 @@
import org.jeecg.modules.mdc.vo.MdcEfficiencyReportQueryVo;
import org.jeecg.modules.mdc.vo.MdcEfficiencyReportShiftQueryVo;
-import java.math.BigDecimal;
import java.util.List;
/**
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcEquipmentStatisticalInfoMapper.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcEquipmentStatisticalInfoMapper.java
index c542e18..3815783 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcEquipmentStatisticalInfoMapper.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcEquipmentStatisticalInfoMapper.java
@@ -16,4 +16,13 @@
* 鑾峰彇璁惧鏈�鏂版棩鏈熺殑杩愯鏁版嵁
*/
MdcEquipmentStatisticalInfo getMaxStaticsData(@Param("equipmentId") String equipmentId);
+
+ /**
+ * 鏌ヨ璁惧杩愯鏃堕棿
+ *
+ * @param equipmentId
+ * @param validDate
+ * @return
+ */
+ Integer selectProcessLong(@Param("equipmentId") String equipmentId, @Param("validDate") String validDate);
}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcOeeInfoMapper.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcOeeInfoMapper.java
new file mode 100644
index 0000000..cce3c27
--- /dev/null
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcOeeInfoMapper.java
@@ -0,0 +1,29 @@
+package org.jeecg.modules.mdc.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.mdc.entity.MdcOeeInfo;
+import org.jeecg.modules.mdc.vo.MdcOeeInfoVo;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * @Description: OEE琛�
+ * @Author: lius
+ * @Date: 2024-12-12
+ */
+public interface MdcOeeInfoMapper extends BaseMapper<MdcOeeInfo> {
+
+ /**
+ * 鍒嗛〉鍒楄〃
+ *
+ * @param page
+ * @param mdcOeeInfoVo
+ * @return
+ */
+ IPage<MdcOeeInfo> pageList(Page<MdcOeeInfo> page, @Param("mdcOeeInfoVo") MdcOeeInfoVo mdcOeeInfoVo);
+
+}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcParameterMapper.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcParameterMapper.java
new file mode 100644
index 0000000..1c8460c
--- /dev/null
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcParameterMapper.java
@@ -0,0 +1,14 @@
+package org.jeecg.modules.mdc.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.mdc.entity.MdcParameter;
+
+/**
+ * @Description: mdc绠楁硶鍏紡
+ * @Author: lius
+ * @Date: 2025-08-13
+ * @Version: V1.0
+ */
+public interface MdcParameterMapper extends BaseMapper<MdcParameter> {
+
+}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/XYZAliasesMapper.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/XYZAliasesMapper.java
deleted file mode 100644
index 1253be4..0000000
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/XYZAliasesMapper.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.jeecg.modules.mdc.mapper;
-
-import org.apache.ibatis.annotations.Param;
-import org.jeecg.modules.mdc.entity.XYZAliases;
-
-import java.util.List;
-
-/**
- * @author: LiuS
- * @create: 2023-04-07 14:33
- */
-public interface XYZAliasesMapper {
- List<XYZAliases> getCoordinateByEquipmentId(@Param("equipmentId") String equipmentId);
-}
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/xml/ClientCategoryMapper.xml b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/ControlSystemMapper.xml
similarity index 68%
rename from lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/xml/ClientCategoryMapper.xml
rename to lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/ControlSystemMapper.xml
index 35d7699..6456878 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/xml/ClientCategoryMapper.xml
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/ControlSystemMapper.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.mdc.mapper.ControlSystemMapper">
</mapper>
\ No newline at end of file
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/xml/ClientContactMapper.xml b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/EquipmentAlarmMapper.xml
similarity index 71%
rename from lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/xml/ClientContactMapper.xml
rename to lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/EquipmentAlarmMapper.xml
index 2a441d8..c3aebe8 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/xml/ClientContactMapper.xml
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/EquipmentAlarmMapper.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.ClientContactMapper">
+<mapper namespace="org.jeecg.modules.mdc.mapper.EquipmentAlarmMapper">
</mapper>
\ No newline at end of file
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/EquipmentLogMapper.xml b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/EquipmentLogMapper.xml
index 64c7b73..2bd8cc0 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/EquipmentLogMapper.xml
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/EquipmentLogMapper.xml
@@ -3,11 +3,11 @@
<mapper namespace="org.jeecg.modules.mdc.mapper.EquipmentLogMapper">
<select id="getRow" resultType="org.jeecg.modules.mdc.entity.EquipmentLog">
- SELECT top 1 * FROM EquipmentLog WHERE EquipmentID = #{ equipmentid } AND CollectTime <= #{ startTime } AND Oporation in ('0','1','2','3') ORDER BY CollectTime ASC
+ SELECT * FROM EquipmentLog WHERE EquipmentID = #{ equipmentid } AND CollectTime <= #{ startTime } AND Oporation in ('0','1','2','3') ORDER BY CollectTime ASC LIMIT 1
</select>
<select id="selectEquipmentOporation" resultType="org.jeecg.modules.mdc.entity.EquipmentLog">
- SELECT TOP 1 * FROM EquipmentLog WHERE EquipmentID = #{ equipmentId } ORDER BY CollectTime DESC
+ SELECT * FROM EquipmentLog WHERE EquipmentID = #{ equipmentId } ORDER BY CollectTime DESC LIMIT 1
</select>
</mapper>
\ No newline at end of file
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/EquipmentWorklineMapper.xml b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/EquipmentWorklineMapper.xml
index 9c37648..b6d5d89 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/EquipmentWorklineMapper.xml
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/EquipmentWorklineMapper.xml
@@ -3,10 +3,10 @@
<mapper namespace="org.jeecg.modules.mdc.mapper.EquipmentWorklineMapper">
<select id="getEquipProgramNum" resultType="org.jeecg.modules.mdc.dto.EquipmentMachingDto">
- select Programnumber,CollectTime from [${tableName}] where CollectTime > #{startTime} and CollectTime <= #{endTime} and Programnumber is not null
+ select Programnumber,CollectTime from ${tableName} where CollectTime > #{startTime} and CollectTime <= #{endTime} and Programnumber is not null
</select>
<select id="getDataList" resultType="java.util.Map">
- select top 1 [${tableName}].* from [${tableName}] order by CollectTime desc
+ select ${tableName}.* from ${tableName} order by CollectTime desc limit 1
</select>
</mapper>
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcDowntimeMapper.xml b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcDowntimeMapper.xml
new file mode 100644
index 0000000..e4339e2
--- /dev/null
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcDowntimeMapper.xml
@@ -0,0 +1,43 @@
+<?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.mdc.mapper.MdcDowntimeMapper">
+
+ <select id="pageList" resultType="org.jeecg.modules.mdc.dto.MdcDowntimeDto">
+ SELECT
+ t1.* ,
+ t2.downtime_type downtimeType,
+ t2.downtime_description downtimeDescription
+ FROM mdc_downtime t1 LEFT JOIN mdc_downtime_reason t2 ON t1.reason_id = t2.id
+ <where>
+ <if test="mdcDowntimeVo.equipmentId != null and mdcDowntimeVo.equipmentId != ''">
+ AND t1.equipment_id = #{ mdcDowntimeVo.equipmentId }
+ </if>
+ <if test="mdcDowntimeVo.equipmentName != null and mdcDowntimeVo.equipmentName != ''">
+ AND t1.equipment_name = #{ mdcDowntimeVo.equipmentName }
+ </if>
+ <if test="mdcDowntimeVo.theDate != null and mdcDowntimeVo.theDate != ''">
+ AND t1.the_date = #{ mdcDowntimeVo.theDate }
+ </if>
+ <if test="mdcDowntimeVo.equipmentIdList != null and mdcDowntimeVo.equipmentIdList.size() > 0 ">
+ AND t1.equipment_id IN
+ <foreach collection="mdcDowntimeVo.equipmentIdList" item="equipmentId" index="index" open="(" close=")" separator=",">
+ #{ equipmentId }
+ </foreach>
+ </if>
+ </where>
+ ORDER BY t1.create_time DESC
+ </select>
+
+ <select id="findPlanTimeDuration" resultType="org.jeecg.modules.mdc.entity.MdcDowntime">
+ SELECT
+ t1.*
+ FROM
+ mdc_downtime t1
+ LEFT JOIN mdc_downtime_reason t2 ON t1.reason_id = t2.id
+ WHERE
+ t1.equipment_id = #{equipmentId}
+ AND t2.downtime_type = #{closeType}
+ AND t1.the_date = #{validDate}
+ </select>
+
+</mapper>
\ No newline at end of file
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/xml/ClientCategoryMapper.xml b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcDowntimeReasonMapper.xml
similarity index 67%
copy from lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/xml/ClientCategoryMapper.xml
copy to lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcDowntimeReasonMapper.xml
index 35d7699..9b4edba 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/xml/ClientCategoryMapper.xml
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcDowntimeReasonMapper.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.mdc.mapper.MdcDowntimeReasonMapper">
</mapper>
\ No newline at end of file
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEfficiencyReportMapper.xml b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEfficiencyReportMapper.xml
index 919a5a7..922a620 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEfficiencyReportMapper.xml
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEfficiencyReportMapper.xml
@@ -102,11 +102,11 @@
t1.the_date theDate,
t1.shift_id shiftId,
t1.shift_sub_id shiftSubId,
- SUM ( t1.process_long ) processLong,
- SUM ( t1.open_long ) openLong,
- SUM ( t1.wait_long ) waitLong,
- SUM ( t1.close_long ) closeLong,
- sum ( t1.total_long ) totalLong
+ SUM( t1.process_long ) processLong,
+ SUM( t1.open_long ) openLong,
+ SUM( t1.wait_long ) waitLong,
+ SUM( t1.close_long ) closeLong,
+ sum( t1.total_long ) totalLong
FROM
mdc_equipment t2
LEFT JOIN mdc_equipment_statistical_shift_info t1 ON t1.equipment_id = t2.equipment_id
@@ -153,10 +153,10 @@
<select id="comparativeAnalysis" resultType="org.jeecg.modules.mdc.dto.MdcComAnaDto">
SELECT
mesi.equipment_id equipmentId,
- SUM ( mesi.open_long ) openLong,
- SUM ( mesi.close_long ) closeLong,
- SUM ( mesi.wait_long ) waitLong,
- SUM ( mesi.process_long ) processLong
+ SUM( mesi.open_long ) openLong,
+ SUM( mesi.close_long ) closeLong,
+ SUM( mesi.wait_long ) waitLong,
+ SUM( mesi.process_long ) processLong
FROM
mdc_equipment_statistical_info mesi
LEFT JOIN mdc_equipment me ON mesi.equipment_id = me.equipment_id
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMapper.xml b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMapper.xml
index 1b3d0e9..c760022 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMapper.xml
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMapper.xml
@@ -129,7 +129,7 @@
sd.id,
sd.parent_id,
sd.depart_name,
- sd.org_type,
+ sd.org_code,
me.equipment_id,
me.equipment_name,
me.equipment_type
@@ -152,7 +152,7 @@
mp.id,
mp.parent_id,
mp.production_name,
- mp.org_type,
+ mp.org_code,
me.equipment_id,
me.equipment_name,
me.equipment_type
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentRunningSectionMapper.xml b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentRunningSectionMapper.xml
index dc0c94e..e2afb97 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentRunningSectionMapper.xml
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentRunningSectionMapper.xml
@@ -4,17 +4,17 @@
<!--鏌ヨ鍗曞彴璁惧鏈�鍚庢椂闂存璁板綍锛堥潪鎶ヨ锛�-->
<select id="getMaxNormal" resultType="org.jeecg.modules.mdc.entity.MdcEquipmentRunningSection">
- SELECT TOP 1 * FROM mdc_equipment_running_section WHERE equipment_id = #{equipmentId} AND status <![CDATA[ <> ]]> '22' ORDER BY end_time DESC
+ SELECT * FROM mdc_equipment_running_section WHERE equipment_id = #{equipmentId} AND status <![CDATA[ <> ]]> '22' ORDER BY end_time DESC LIMIT 1
</select>
<!--鑾峰彇璁＄畻娈垫椂闂村悗鐨勬渶鍚庝竴鏉¤褰曪紙鎶ヨ锛�-->
<select id="getMaxError" resultType="org.jeecg.modules.mdc.entity.MdcEquipmentRunningSection">
- SELECT TOP 1 * FROM mdc_equipment_running_section WHERE equipment_id = #{equipmentId} AND status = '22' ORDER BY end_time DESC
+ SELECT * FROM mdc_equipment_running_section WHERE equipment_id = #{equipmentId} AND status = '22' ORDER BY end_time DESC LIMIT 1
</select>
<!--鑾峰彇璁惧杩愯璁板綍鏈�鏃╃殑鏁版嵁-->
<select id="getFirstData" resultType="org.jeecg.modules.mdc.entity.MdcEquipmentRunningSection">
- SELECT TOP 1 * FROM mdc_equipment_running_section WHERE equipment_id = #{equipmentId} ORDER BY start_time
+ SELECT * FROM mdc_equipment_running_section WHERE equipment_id = #{equipmentId} ORDER BY start_time LIMIT 1
</select>
<!--鏌ヨ璁惧鍗曟棩杩愯鐘舵�佹椂闂存璁板綍-->
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentStatisticalInfoMapper.xml b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentStatisticalInfoMapper.xml
index 77c17f3..ecb557d 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentStatisticalInfoMapper.xml
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentStatisticalInfoMapper.xml
@@ -2,9 +2,14 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.mdc.mapper.MdcEquipmentStatisticalInfoMapper">
-
<!--鑾峰彇璁惧鏈�鏂版棩鏈熺殑杩愯鏁版嵁-->
<select id="getMaxStaticsData" resultType="org.jeecg.modules.mdc.entity.MdcEquipmentStatisticalInfo">
- SELECT TOP 1 * FROM mdc_equipment_statistical_info WHERE equipment_id = #{equipmentId} ORDER BY the_date DESC
+ SELECT * FROM mdc_equipment_statistical_info WHERE equipment_id = #{equipmentId} ORDER BY the_date DESC LIMIT 1
</select>
+
+ <!--鏌ヨ璁惧杩愯鏃堕棿-->
+ <select id="selectProcessLong" resultType="java.lang.Integer">
+ SELECT process_long FROM mdc_equipment_statistical_info WHERE equipment_id = #{equipmentId} AND the_date = #{validDate} LIMIT 1
+ </select>
+
</mapper>
\ No newline at end of file
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentStatisticalShiftInfoMapper.xml b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentStatisticalShiftInfoMapper.xml
index 1036ded..a437b11 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentStatisticalShiftInfoMapper.xml
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentStatisticalShiftInfoMapper.xml
@@ -2,9 +2,8 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.mdc.mapper.MdcEquipmentStatisticalShiftInfoMapper">
-
<select id="getMaxStaticsData" resultType="org.jeecg.modules.mdc.entity.MdcEquipmentStatisticalShiftInfo">
- SELECT TOP 1 * FROM mdc_equipment_statistical_shift_info WHERE equipment_id = #{equipmentId} ORDER BY the_date DESC
+ SELECT * FROM mdc_equipment_statistical_shift_info WHERE equipment_id = #{equipmentId} ORDER BY the_date DESC LIMIT 1
</select>
</mapper>
\ No newline at end of file
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcOeeInfoMapper.xml b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcOeeInfoMapper.xml
new file mode 100644
index 0000000..f78eb9e
--- /dev/null
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcOeeInfoMapper.xml
@@ -0,0 +1,31 @@
+<?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.mdc.mapper.MdcOeeInfoMapper">
+
+ <!--鍒嗛〉鍒楄〃-->
+ <select id="pageList" resultType="org.jeecg.modules.mdc.entity.MdcOeeInfo">
+ SELECT
+ *
+ FROM
+ mdc_oee_info
+ <where>
+ <if test="mdcOeeInfoVo.equipmentId != null and mdcOeeInfoVo.equipmentId != ''">
+ AND equipment_id = #{ mdcOeeInfoVo.equipmentId }
+ </if>
+ <if test="mdcOeeInfoVo.startTime != null and mdcOeeInfoVo.startTime != ''">
+ AND the_date >= #{ mdcOeeInfoVo.startTime }
+ </if>
+ <if test="mdcOeeInfoVo.endTime != null and mdcOeeInfoVo.endTime != ''">
+ AND the_date <= #{mdcOeeInfoVo.endTime }
+ </if>
+ <if test="mdcOeeInfoVo.equipmentIdList != null and mdcOeeInfoVo.equipmentIdList.size() > 0 ">
+ AND equipment_id IN
+ <foreach collection="mdcOeeInfoVo.equipmentIdList" item="id" index="index" open="(" close=")" separator=",">
+ #{ id }
+ </foreach>
+ </if>
+ </where>
+ ORDER BY the_date DESC, equipment_id ASC
+ </select>
+
+</mapper>
\ No newline at end of file
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/xml/MaterialMapper.xml b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcParameterMapper.xml
similarity index 69%
rename from lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/xml/MaterialMapper.xml
rename to lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcParameterMapper.xml
index 20e24d5..6c45378 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/xml/MaterialMapper.xml
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcParameterMapper.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.mdc.mapper.MdcParameterMapper">
-</mapper>
+</mapper>
\ No newline at end of file
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcProcessQuantityMapper.xml b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcProcessQuantityMapper.xml
index f484955..4d83492 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcProcessQuantityMapper.xml
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcProcessQuantityMapper.xml
@@ -123,6 +123,6 @@
mpq.update_by updateBy,
mpq.update_time updateTime
FROM mdc_process_quantity mpq LEFT JOIN mdc_standard_process_duration mspd ON mpq.standard_id = mspd.id
- WHERE mpq.id = { id }
+ WHERE mpq.id = #{ id }
</select>
</mapper>
\ No newline at end of file
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/XYZAliasesMapper.xml b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/XYZAliasesMapper.xml
deleted file mode 100644
index c70017e..0000000
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/XYZAliasesMapper.xml
+++ /dev/null
@@ -1,11 +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.mdc.mapper.XYZAliasesMapper">
-
- <select id="getCoordinateByEquipmentId" resultType="org.jeecg.modules.mdc.entity.XYZAliases">
- SELECT
- XYZAliases.*
- FROM
- dbo.XYZAliases where equipmentId = #{equipmentId}
- </select>
-</mapper>
\ No newline at end of file
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcDowntimeReasonService.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcDowntimeReasonService.java
new file mode 100644
index 0000000..f4d01bb
--- /dev/null
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcDowntimeReasonService.java
@@ -0,0 +1,16 @@
+package org.jeecg.modules.mdc.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.mdc.entity.MdcDowntimeReason;
+
+import java.util.List;
+
+/**
+ * @Description: 鍋滄満鍘熷洜琛�
+ * @Author: lius
+ * @Date: 2025-03-11
+ */
+public interface IMdcDowntimeReasonService extends IService<MdcDowntimeReason> {
+
+ List<MdcDowntimeReason> downtimeReasonList(String downtimeType);
+}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcDowntimeService.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcDowntimeService.java
new file mode 100644
index 0000000..ff528c1
--- /dev/null
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcDowntimeService.java
@@ -0,0 +1,45 @@
+package org.jeecg.modules.mdc.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.mdc.dto.MdcDowntimeDto;
+import org.jeecg.modules.mdc.entity.MdcDowntime;
+import org.jeecg.modules.mdc.vo.MdcDowntimeVo;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * @Description: 寰呮満鍋滄満琛�
+ * @Author: lius
+ * @Date: 2025-03-12
+ */
+public interface IMdcDowntimeService extends IService<MdcDowntime> {
+
+ /**
+ * 鍒嗛〉鍒楄〃鏌ヨ
+ *
+ * @param userId
+ * @param page
+ * @param mdcDowntimeVo
+ * @param req
+ * @return
+ */
+ IPage<MdcDowntimeDto> pageList(String userId, Page<MdcDowntimeDto> page, MdcDowntimeVo mdcDowntimeVo, HttpServletRequest req);
+
+ /**
+ * 娣诲姞
+ * @param mdcDowntime
+ * @return
+ */
+ boolean saveDowntime(MdcDowntime mdcDowntime);
+
+ /**
+ * 鏌ヨ鍋滄満鏃堕暱
+ * @param equipmentId
+ * @param validDate
+ * @param closeType
+ * @return
+ */
+ Integer findPlanTimeDuration(String equipmentId, String validDate, String closeType);
+}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcEquipmentStatisticalInfoService.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcEquipmentStatisticalInfoService.java
index 51473ea..51d56e6 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcEquipmentStatisticalInfoService.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcEquipmentStatisticalInfoService.java
@@ -17,4 +17,13 @@
* @param dateTime
*/
void runningAllEquipmentStatisticalProcess(String dateTime);
+
+ /**
+ * 鏌ヨ璁惧杩愯鏃堕棿
+ *
+ * @param equipmentId
+ * @param validDate
+ * @return
+ */
+ Integer selectProcessLong(String equipmentId, String validDate);
}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcOeeInfoService.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcOeeInfoService.java
new file mode 100644
index 0000000..2a61763
--- /dev/null
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcOeeInfoService.java
@@ -0,0 +1,49 @@
+package org.jeecg.modules.mdc.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.mdc.entity.MdcOeeInfo;
+import org.jeecg.modules.mdc.vo.MdcOeeComputeVo;
+import org.jeecg.modules.mdc.vo.MdcOeeInfoVo;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * @Description: OEE琛�
+ * @Author: lius
+ * @Date: 2024-12-12
+ */
+public interface IMdcOeeInfoService extends IService<MdcOeeInfo> {
+
+ /**
+ * 鍒嗛〉鍒楄〃
+ *
+ * @param userId
+ * @param page
+ * @param mdcOeeInfoVo
+ * @param req
+ * @return
+ */
+ IPage<MdcOeeInfo> pageList(String userId, Page<MdcOeeInfo> page, MdcOeeInfoVo mdcOeeInfoVo, HttpServletRequest req);
+
+ /**
+ * 瀵煎嚭
+ *
+ * @param userId
+ * @param mdcOeeInfoVo
+ * @return
+ */
+ ModelAndView exportXls(String userId, MdcOeeInfoVo mdcOeeInfoVo);
+
+ /**
+ * 璁＄畻OEE
+ *
+ * @param mdcOeeComputeVo
+ */
+ void computeOee(MdcOeeComputeVo mdcOeeComputeVo);
+
+}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcParameterService.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcParameterService.java
new file mode 100644
index 0000000..bfc7b07
--- /dev/null
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcParameterService.java
@@ -0,0 +1,14 @@
+package org.jeecg.modules.mdc.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.mdc.entity.MdcParameter;
+
+/**
+ * @Description: mdc绠楁硶鍏紡
+ * @Author: jeecg-boot
+ * @Date: 2025-08-13
+ * @Version: V1.0
+ */
+public interface IMdcParameterService extends IService<MdcParameter> {
+
+}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/MdcEfficiencyReportService.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/MdcEfficiencyReportService.java
index adafdf6..10907bd 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/MdcEfficiencyReportService.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/MdcEfficiencyReportService.java
@@ -4,9 +4,6 @@
import org.jeecg.modules.mdc.dto.DayUtilizationRateDto;
import org.jeecg.modules.mdc.vo.*;
-import java.math.BigDecimal;
-import java.util.List;
-
/**
* @author: LiuS
* @create: 2023-06-15 17:25
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcDowntimeReasonServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcDowntimeReasonServiceImpl.java
new file mode 100644
index 0000000..45c0946
--- /dev/null
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcDowntimeReasonServiceImpl.java
@@ -0,0 +1,24 @@
+package org.jeecg.modules.mdc.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jeecg.modules.mdc.entity.MdcDowntimeReason;
+import org.jeecg.modules.mdc.mapper.MdcDowntimeReasonMapper;
+import org.jeecg.modules.mdc.service.IMdcDowntimeReasonService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @Description: 鍋滄満鍘熷洜琛�
+ * @Author: lius
+ * @Date: 2025-03-11
+ */
+@Service
+public class MdcDowntimeReasonServiceImpl extends ServiceImpl<MdcDowntimeReasonMapper, MdcDowntimeReason> implements IMdcDowntimeReasonService {
+
+ @Override
+ public List<MdcDowntimeReason> downtimeReasonList(String downtimeType) {
+ return this.baseMapper.selectList(new LambdaQueryWrapper<MdcDowntimeReason>().eq(MdcDowntimeReason::getDowntimeType, downtimeType));
+ }
+}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcDowntimeServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcDowntimeServiceImpl.java
new file mode 100644
index 0000000..7ed5673
--- /dev/null
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcDowntimeServiceImpl.java
@@ -0,0 +1,117 @@
+package org.jeecg.modules.mdc.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.commons.lang3.StringUtils;
+import org.jeecg.modules.mdc.dto.MdcDowntimeDto;
+import org.jeecg.modules.mdc.entity.MdcDowntime;
+import org.jeecg.modules.mdc.entity.MdcEquipment;
+import org.jeecg.modules.mdc.mapper.MdcDowntimeMapper;
+import org.jeecg.modules.mdc.service.IMdcDowntimeService;
+import org.jeecg.modules.mdc.service.IMdcEquipmentService;
+import org.jeecg.modules.mdc.util.DateUtils;
+import org.jeecg.modules.mdc.vo.MdcDowntimeVo;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * @Description: 寰呮満鍋滄満琛�
+ * @Author: lius
+ * @Date: 2025-03-12
+ */
+@Service
+public class MdcDowntimeServiceImpl extends ServiceImpl<MdcDowntimeMapper, MdcDowntime> implements IMdcDowntimeService {
+
+ @Resource
+ private IMdcEquipmentService mdcEquipmentService;
+
+ /**
+ * 鍒嗛〉鍒楄〃鏌ヨ
+ *
+ * @param userId
+ * @param page
+ * @param mdcDowntimeVo
+ * @param req
+ * @return
+ */
+ @Override
+ public IPage<MdcDowntimeDto> pageList(String userId, Page<MdcDowntimeDto> page, MdcDowntimeVo mdcDowntimeVo, HttpServletRequest req) {
+ // 鑾峰彇璁惧ID鍒楄〃
+ List<String> equipmentIds = getEquipmentIds(userId, mdcDowntimeVo);
+
+ // 濡傛灉璁惧ID鍒楄〃涓虹┖锛岀洿鎺ヨ繑鍥炵┖鍒嗛〉
+ if (equipmentIds == null || equipmentIds.isEmpty()) {
+ return new Page<>(page.getCurrent(), page.getSize(), 0);
+ }
+
+ // 璁剧疆璁惧ID鍒楄〃鍒版煡璇㈡潯浠朵腑
+ mdcDowntimeVo.setEquipmentIdList(equipmentIds);
+
+ // 鎵ц鍒嗛〉鏌ヨ
+ return this.baseMapper.pageList(page, mdcDowntimeVo);
+ }
+
+ /**
+ * 娣诲姞
+ * @param mdcDowntime
+ * @return
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public boolean saveDowntime(MdcDowntime mdcDowntime) {
+ String[] equipmentIds = mdcDowntime.getEquipmentIds().split(",");
+ List<String> dateList = mdcDowntime.getDateList();
+ List<MdcDowntime> mdcDowntimeList = new ArrayList<>();
+ for (String equipmentId : equipmentIds) {
+ for (String date : dateList) {
+ String format = DateUtils.format(DateUtils.toDate(date, DateUtils.STRDATE), DateUtils.STR_DATE);
+ MdcEquipment mdcEquipment = mdcEquipmentService.findEquipmentNameByEquipmentId(equipmentId);
+ MdcDowntime downtime = new MdcDowntime();
+ BeanUtils.copyProperties(mdcDowntime, downtime);
+ downtime.setEquipmentId(mdcEquipment.getEquipmentId());
+ downtime.setEquipmentName(mdcEquipment.getEquipmentName());
+ downtime.setTheDate(format);
+ mdcDowntimeList.add(downtime);
+ }
+ }
+ this.saveBatch(mdcDowntimeList);
+ return true;
+ }
+
+ @Override
+ public Integer findPlanTimeDuration(String equipmentId, String validDate, String closeType) {
+ int result = 0;
+ List<MdcDowntime> mdcDowntimeList = this.baseMapper.findPlanTimeDuration(equipmentId, validDate, closeType);
+ if (mdcDowntimeList != null && !mdcDowntimeList.isEmpty()) {
+ for (MdcDowntime mdcDowntime : mdcDowntimeList) {
+ result = mdcDowntime.getDownLong() + result;
+ }
+ }
+ return result;
+ }
+
+ private List<String> getEquipmentIds(String userId, MdcDowntimeVo mdcDowntimeVo) {
+ if (StringUtils.isNotEmpty(mdcDowntimeVo.getEquipmentId())) {
+ return Collections.singletonList(mdcDowntimeVo.getEquipmentId());
+ }
+
+ if (StringUtils.isNotEmpty(mdcDowntimeVo.getParentId())) {
+ return "2".equals(mdcDowntimeVo.getTypeTree())
+ ? mdcEquipmentService.getEquipmentIdsByDepart(userId, mdcDowntimeVo.getParentId())
+ : mdcEquipmentService.getEquipmentIdsProduction(userId, mdcDowntimeVo.getParentId());
+ }
+
+ return "2".equals(mdcDowntimeVo.getTypeTree())
+ ? mdcEquipmentService.getEquipmentIdsByDepart(userId, null)
+ : mdcEquipmentService.getEquipmentIdsProduction(userId, null);
+ }
+
+}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEfficiencyReportServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEfficiencyReportServiceImpl.java
index cddc90d..441d1ec 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEfficiencyReportServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEfficiencyReportServiceImpl.java
@@ -9,12 +9,14 @@
import org.jeecg.modules.mdc.mapper.MdcEfficiencyReportMapper;
import org.jeecg.modules.mdc.service.*;
import org.jeecg.modules.mdc.util.DateUtils;
+import org.jeecg.modules.mdc.util.JexlFormulaCalculator;
import org.jeecg.modules.mdc.vo.MdcUtilizationRateDto;
import org.jeecg.modules.mdc.vo.*;
import org.jeecg.modules.system.entity.MdcProduction;
import org.jeecg.modules.system.entity.SysDepart;
import org.jeecg.modules.system.service.IMdcProductionService;
import org.jeecg.modules.system.service.ISysDepartService;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -53,6 +55,12 @@
@Resource
private IMdcEquipmentRunningSectionService mdcEquipmentRunningSectionService;
+
+ @Resource
+ private IMdcParameterService mdcParameterService;
+
+ @Resource
+ private JexlFormulaCalculator formulaCalculator;
/**
* 鍒╃敤鐜囨姤琛�
@@ -115,56 +123,22 @@
if ("2".equals(vo.getTypeTree())) {
// 閮ㄩ棬灞傜骇
List<MdcEquDepDto> equipmentList = mdcEquipmentService.findEquDepList(vo.getEquipmentIdList());
- // 鏌ヨ鎵�鏈夐儴闂ㄤ俊鎭�
- List<SysDepart> departList = sysDepartService.list(new LambdaQueryWrapper<SysDepart>().ne(SysDepart::getDelFlag, CommonConstant.DEL_FLAG_1.toString()).orderByAsc(SysDepart::getDepartOrder));
for (MdcEquDepDto mdcEquDepDto : equipmentList) {
MdcEfficiencyListDto mdcEfficiencyListDto = new MdcEfficiencyListDto();
mdcEfficiencyListDto.setEquipmentId(mdcEquDepDto.getEquipmentId());
mdcEfficiencyListDto.setEquipmentName(mdcEquDepDto.getEquipmentName());
mdcEfficiencyListDto.setEquipmentType(mdcEquDepDto.getEquipmentType());
- switch (mdcEquDepDto.getOrgType()) {
- case "1":
- mdcEfficiencyListDto.setLevel1(mdcEquDepDto.getDepartName());
- break;
- case "2":
- mdcEfficiencyListDto.setLevel2(mdcEquDepDto.getDepartName());
- break;
- case "3":
- mdcEfficiencyListDto.setLevel3(mdcEquDepDto.getDepartName());
- break;
- default:
- }
-
- SysDepart sysDepart = departList.stream().filter(depart -> depart.getId().equals(mdcEquDepDto.getParentId())).findAny().orElse(null);
- if (sysDepart != null) {
- switch (sysDepart.getOrgType()) {
- case "1":
- mdcEfficiencyListDto.setLevel1(sysDepart.getDepartName());
- break;
- case "2":
- mdcEfficiencyListDto.setLevel2(sysDepart.getDepartName());
- break;
- case "3":
- mdcEfficiencyListDto.setLevel3(sysDepart.getDepartName());
- break;
- default:
+ String orgCode = mdcEquDepDto.getOrgCode();
+ if (orgCode != null) {
+ if (orgCode.length() >= 3) {
+ mdcEfficiencyListDto.setLevel1(sysDepartService.getOne(new LambdaQueryWrapper<SysDepart>().ne(SysDepart::getDelFlag, CommonConstant.DEL_FLAG_1.toString()).eq(SysDepart::getOrgCode, orgCode.substring(0, 3))).getDepartName());
}
- if (StringUtils.isNotEmpty(sysDepart.getParentId())) {
- departList.stream().filter(depart -> depart.getId().equals(sysDepart.getParentId())).findAny().ifPresent(depart1 -> {
- switch (depart1.getOrgType()) {
- case "1":
- mdcEfficiencyListDto.setLevel1(depart1.getDepartName());
- break;
- case "2":
- mdcEfficiencyListDto.setLevel2(depart1.getDepartName());
- break;
- case "3":
- mdcEfficiencyListDto.setLevel3(depart1.getDepartName());
- break;
- default:
- }
- });
+ if (orgCode.length() >= 6) {
+ mdcEfficiencyListDto.setLevel2(sysDepartService.getOne(new LambdaQueryWrapper<SysDepart>().ne(SysDepart::getDelFlag, CommonConstant.DEL_FLAG_1.toString()).eq(SysDepart::getOrgCode, orgCode.substring(0, 6))).getDepartName());
+ }
+ if (orgCode.length() >= 9) {
+ mdcEfficiencyListDto.setLevel3(sysDepartService.getOne(new LambdaQueryWrapper<SysDepart>().ne(SysDepart::getDelFlag, CommonConstant.DEL_FLAG_1.toString()).eq(SysDepart::getOrgCode, orgCode.substring(0, 9))).getDepartName());
}
}
List<MdcEfficiencyResultDto> list = new ArrayList<>();
@@ -204,55 +178,22 @@
} else {
// 浜х嚎灞傜骇
List<MdcEquProDto> equipmentList = mdcEquipmentService.findEquProList(vo.getEquipmentIdList());
- // 鏌ヨ鎵�鏈変骇绾夸俊鎭�
- List<MdcProduction> productionList = mdcProductionService.list(new LambdaQueryWrapper<MdcProduction>().ne(MdcProduction::getDelFlag, CommonConstant.DEL_FLAG_1.toString()).orderByAsc(MdcProduction::getProductionOrder));
for (MdcEquProDto mdcEquProDto : equipmentList) {
MdcEfficiencyListDto mdcEfficiencyListDto = new MdcEfficiencyListDto();
mdcEfficiencyListDto.setEquipmentId(mdcEquProDto.getEquipmentId());
mdcEfficiencyListDto.setEquipmentName(mdcEquProDto.getEquipmentName());
mdcEfficiencyListDto.setEquipmentType(mdcEquProDto.getEquipmentType());
- switch (mdcEquProDto.getOrgType()) {
- case "1":
- mdcEfficiencyListDto.setLevel1(mdcEquProDto.getProductionName());
- break;
- case "2":
- mdcEfficiencyListDto.setLevel2(mdcEquProDto.getProductionName());
- break;
- case "3":
- mdcEfficiencyListDto.setLevel3(mdcEquProDto.getProductionName());
- break;
- default:
- }
- MdcProduction mdcProduction = productionList.stream().filter(production -> production.getId().equals(mdcEquProDto.getParentId())).findAny().orElse(null);
- if (mdcProduction != null) {
- switch (mdcProduction.getOrgType()) {
- case "1":
- mdcEfficiencyListDto.setLevel1(mdcProduction.getProductionName());
- break;
- case "2":
- mdcEfficiencyListDto.setLevel2(mdcProduction.getProductionName());
- break;
- case "3":
- mdcEfficiencyListDto.setLevel3(mdcProduction.getProductionName());
- break;
- default:
+ String orgCode = mdcEquProDto.getOrgCode();
+ if (orgCode != null) {
+ if (orgCode.length() >= 3) {
+ mdcEfficiencyListDto.setLevel1(mdcProductionService.getOne(new LambdaQueryWrapper<MdcProduction>().ne(MdcProduction::getDelFlag, CommonConstant.DEL_FLAG_1.toString()).eq(MdcProduction::getOrgCode, orgCode.substring(0, 3))).getProductionName());
}
- if (StringUtils.isNotEmpty(mdcProduction.getParentId())) {
- productionList.stream().filter(production -> production.getId().equals(mdcProduction.getParentId())).findAny().ifPresent(production1 -> {
- switch (production1.getOrgType()) {
- case "1":
- mdcEfficiencyListDto.setLevel1(production1.getProductionName());
- break;
- case "2":
- mdcEfficiencyListDto.setLevel2(production1.getProductionName());
- break;
- case "3":
- mdcEfficiencyListDto.setLevel3(production1.getProductionName());
- break;
- default:
- }
- });
+ if (orgCode.length() >= 6) {
+ mdcEfficiencyListDto.setLevel2(mdcProductionService.getOne(new LambdaQueryWrapper<MdcProduction>().ne(MdcProduction::getDelFlag, CommonConstant.DEL_FLAG_1.toString()).eq(MdcProduction::getOrgCode, orgCode.substring(0, 6))).getProductionName());
+ }
+ if (orgCode.length() >= 9) {
+ mdcEfficiencyListDto.setLevel3(mdcProductionService.getOne(new LambdaQueryWrapper<MdcProduction>().ne(MdcProduction::getDelFlag, CommonConstant.DEL_FLAG_1.toString()).eq(MdcProduction::getOrgCode, orgCode.substring(0, 9))).getProductionName());
}
}
List<MdcEfficiencyResultDto> list = new ArrayList<>();
@@ -448,7 +389,7 @@
if (vo.getEquipmentIdList() == null || vo.getEquipmentIdList().isEmpty()) {
result.setMdcEfficiencyList(listDtos);
} else {
-
+
List<String> equipmentIdList = mdcEquipmentService.listEquipmentId(vo);
if (equipmentIdList != null && !equipmentIdList.isEmpty()) {
vo.setEquipmentIdList(equipmentIdList);
@@ -463,56 +404,22 @@
if ("2".equals(vo.getTypeTree())) {
// 閮ㄩ棬灞傜骇
List<MdcEquDepDto> equipmentList = mdcEquipmentService.findEquDepList(vo.getEquipmentIdList());
- // 鏌ヨ鎵�鏈夐儴闂ㄤ俊鎭�
- List<SysDepart> departList = sysDepartService.list(new LambdaQueryWrapper<SysDepart>().ne(SysDepart::getDelFlag, CommonConstant.DEL_FLAG_1.toString()).orderByAsc(SysDepart::getDepartOrder));
for (MdcEquDepDto mdcEquDepDto : equipmentList) {
MdcEfficiencyListDto mdcEfficiencyListDto = new MdcEfficiencyListDto();
mdcEfficiencyListDto.setEquipmentId(mdcEquDepDto.getEquipmentId());
mdcEfficiencyListDto.setEquipmentName(mdcEquDepDto.getEquipmentName());
mdcEfficiencyListDto.setEquipmentType(mdcEquDepDto.getEquipmentType());
- switch (mdcEquDepDto.getOrgType()) {
- case "1":
- mdcEfficiencyListDto.setLevel1(mdcEquDepDto.getDepartName());
- break;
- case "2":
- mdcEfficiencyListDto.setLevel2(mdcEquDepDto.getDepartName());
- break;
- case "3":
- mdcEfficiencyListDto.setLevel3(mdcEquDepDto.getDepartName());
- break;
- default:
- }
-
- SysDepart sysDepart = departList.stream().filter(depart -> depart.getId().equals(mdcEquDepDto.getParentId())).findAny().orElse(null);
- if (sysDepart != null) {
- switch (sysDepart.getOrgType()) {
- case "1":
- mdcEfficiencyListDto.setLevel1(sysDepart.getDepartName());
- break;
- case "2":
- mdcEfficiencyListDto.setLevel2(sysDepart.getDepartName());
- break;
- case "3":
- mdcEfficiencyListDto.setLevel3(sysDepart.getDepartName());
- break;
- default:
+ String orgCode = mdcEquDepDto.getOrgCode();
+ if (orgCode != null) {
+ if (orgCode.length() >= 3) {
+ mdcEfficiencyListDto.setLevel1(sysDepartService.getOne(new LambdaQueryWrapper<SysDepart>().ne(SysDepart::getDelFlag, CommonConstant.DEL_FLAG_1.toString()).eq(SysDepart::getOrgCode, orgCode.substring(0, 3))).getDepartName());
}
- if (StringUtils.isNotEmpty(sysDepart.getParentId())) {
- departList.stream().filter(depart -> depart.getId().equals(sysDepart.getParentId())).findAny().ifPresent(depart1 -> {
- switch (depart1.getOrgType()) {
- case "1":
- mdcEfficiencyListDto.setLevel1(depart1.getDepartName());
- break;
- case "2":
- mdcEfficiencyListDto.setLevel2(depart1.getDepartName());
- break;
- case "3":
- mdcEfficiencyListDto.setLevel3(depart1.getDepartName());
- break;
- default:
- }
- });
+ if (orgCode.length() >= 6) {
+ mdcEfficiencyListDto.setLevel2(sysDepartService.getOne(new LambdaQueryWrapper<SysDepart>().ne(SysDepart::getDelFlag, CommonConstant.DEL_FLAG_1.toString()).eq(SysDepart::getOrgCode, orgCode.substring(0, 6))).getDepartName());
+ }
+ if (orgCode.length() >= 9) {
+ mdcEfficiencyListDto.setLevel3(sysDepartService.getOne(new LambdaQueryWrapper<SysDepart>().ne(SysDepart::getDelFlag, CommonConstant.DEL_FLAG_1.toString()).eq(SysDepart::getOrgCode, orgCode.substring(0, 9))).getDepartName());
}
}
List<MdcEfficiencyResultDto> list = new ArrayList<>();
@@ -552,55 +459,22 @@
} else {
// 浜х嚎灞傜骇
List<MdcEquProDto> equipmentList = mdcEquipmentService.findEquProList(vo.getEquipmentIdList());
- // 鏌ヨ鎵�鏈変骇绾夸俊鎭�
- List<MdcProduction> productionList = mdcProductionService.list(new LambdaQueryWrapper<MdcProduction>().ne(MdcProduction::getDelFlag, CommonConstant.DEL_FLAG_1.toString()).orderByAsc(MdcProduction::getProductionOrder));
for (MdcEquProDto mdcEquProDto : equipmentList) {
MdcEfficiencyListDto mdcEfficiencyListDto = new MdcEfficiencyListDto();
mdcEfficiencyListDto.setEquipmentId(mdcEquProDto.getEquipmentId());
mdcEfficiencyListDto.setEquipmentName(mdcEquProDto.getEquipmentName());
mdcEfficiencyListDto.setEquipmentType(mdcEquProDto.getEquipmentType());
- switch (mdcEquProDto.getOrgType()) {
- case "1":
- mdcEfficiencyListDto.setLevel1(mdcEquProDto.getProductionName());
- break;
- case "2":
- mdcEfficiencyListDto.setLevel2(mdcEquProDto.getProductionName());
- break;
- case "3":
- mdcEfficiencyListDto.setLevel3(mdcEquProDto.getProductionName());
- break;
- default:
- }
- MdcProduction mdcProduction = productionList.stream().filter(production -> production.getId().equals(mdcEquProDto.getParentId())).findAny().orElse(null);
- if (mdcProduction != null) {
- switch (mdcProduction.getOrgType()) {
- case "1":
- mdcEfficiencyListDto.setLevel1(mdcProduction.getProductionName());
- break;
- case "2":
- mdcEfficiencyListDto.setLevel2(mdcProduction.getProductionName());
- break;
- case "3":
- mdcEfficiencyListDto.setLevel3(mdcProduction.getProductionName());
- break;
- default:
+ String orgCode = mdcEquProDto.getOrgCode();
+ if (orgCode != null) {
+ if (orgCode.length() >= 3) {
+ mdcEfficiencyListDto.setLevel1(mdcProductionService.getOne(new LambdaQueryWrapper<MdcProduction>().ne(MdcProduction::getDelFlag, CommonConstant.DEL_FLAG_1.toString()).eq(MdcProduction::getOrgCode, orgCode.substring(0, 3))).getProductionName());
}
- if (StringUtils.isNotEmpty(mdcProduction.getParentId())) {
- productionList.stream().filter(production -> production.getId().equals(mdcProduction.getParentId())).findAny().ifPresent(production1 -> {
- switch (production1.getOrgType()) {
- case "1":
- mdcEfficiencyListDto.setLevel1(production1.getProductionName());
- break;
- case "2":
- mdcEfficiencyListDto.setLevel2(production1.getProductionName());
- break;
- case "3":
- mdcEfficiencyListDto.setLevel3(production1.getProductionName());
- break;
- default:
- }
- });
+ if (orgCode.length() >= 6) {
+ mdcEfficiencyListDto.setLevel2(mdcProductionService.getOne(new LambdaQueryWrapper<MdcProduction>().ne(MdcProduction::getDelFlag, CommonConstant.DEL_FLAG_1.toString()).eq(MdcProduction::getOrgCode, orgCode.substring(0, 6))).getProductionName());
+ }
+ if (orgCode.length() >= 9) {
+ mdcEfficiencyListDto.setLevel3(mdcProductionService.getOne(new LambdaQueryWrapper<MdcProduction>().ne(MdcProduction::getDelFlag, CommonConstant.DEL_FLAG_1.toString()).eq(MdcProduction::getOrgCode, orgCode.substring(0, 9))).getProductionName());
}
}
List<MdcEfficiencyResultDto> list = new ArrayList<>();
@@ -813,8 +687,6 @@
if ("2".equals(vo.getTypeTree())) {
// 閮ㄩ棬灞傜骇
List<MdcEquDepDto> equipmentList = mdcEquipmentService.findEquDepList(vo.getEquipmentIdList());
- // 鏌ヨ鎵�鏈夐儴闂ㄤ俊鎭�
- List<SysDepart> departList = sysDepartService.list(new LambdaQueryWrapper<SysDepart>().ne(SysDepart::getDelFlag, CommonConstant.DEL_FLAG_1.toString()).orderByAsc(SysDepart::getDepartOrder));
// 鐝鍚嶇О鏄剧ず澶勭悊
String shiftSubName = "";
if (StringUtils.isBlank(vo.getShiftId())) {
@@ -842,48 +714,16 @@
mdcEfficiencyShiftListDto.setEquipmentName(mdcEquDepDto.getEquipmentName());
mdcEfficiencyShiftListDto.setEquipmentType(mdcEquDepDto.getEquipmentType());
mdcEfficiencyShiftListDto.setShiftSubName(shiftSubName);
- switch (mdcEquDepDto.getOrgType()) {
- case "1":
- mdcEfficiencyShiftListDto.setLevel1(mdcEquDepDto.getDepartName());
- break;
- case "2":
- mdcEfficiencyShiftListDto.setLevel2(mdcEquDepDto.getDepartName());
- break;
- case "3":
- mdcEfficiencyShiftListDto.setLevel3(mdcEquDepDto.getDepartName());
- break;
- default:
- }
-
- SysDepart sysDepart = departList.stream().filter(depart -> depart.getId().equals(mdcEquDepDto.getParentId())).findAny().orElse(null);
- if (sysDepart != null) {
- switch (sysDepart.getOrgType()) {
- case "1":
- mdcEfficiencyShiftListDto.setLevel1(sysDepart.getDepartName());
- break;
- case "2":
- mdcEfficiencyShiftListDto.setLevel2(sysDepart.getDepartName());
- break;
- case "3":
- mdcEfficiencyShiftListDto.setLevel3(sysDepart.getDepartName());
- break;
- default:
+ String orgCode = mdcEquDepDto.getOrgCode();
+ if (orgCode != null) {
+ if (orgCode.length() >= 3) {
+ mdcEfficiencyShiftListDto.setLevel1(sysDepartService.getOne(new LambdaQueryWrapper<SysDepart>().ne(SysDepart::getDelFlag, CommonConstant.DEL_FLAG_1.toString()).eq(SysDepart::getOrgCode, orgCode.substring(0, 3))).getDepartName());
}
- if (StringUtils.isNotEmpty(sysDepart.getParentId())) {
- departList.stream().filter(depart -> depart.getId().equals(sysDepart.getParentId())).findAny().ifPresent(depart1 -> {
- switch (depart1.getOrgType()) {
- case "1":
- mdcEfficiencyShiftListDto.setLevel1(depart1.getDepartName());
- break;
- case "2":
- mdcEfficiencyShiftListDto.setLevel2(depart1.getDepartName());
- break;
- case "3":
- mdcEfficiencyShiftListDto.setLevel3(depart1.getDepartName());
- break;
- default:
- }
- });
+ if (orgCode.length() >= 6) {
+ mdcEfficiencyShiftListDto.setLevel2(sysDepartService.getOne(new LambdaQueryWrapper<SysDepart>().ne(SysDepart::getDelFlag, CommonConstant.DEL_FLAG_1.toString()).eq(SysDepart::getOrgCode, orgCode.substring(0, 6))).getDepartName());
+ }
+ if (orgCode.length() >= 9) {
+ mdcEfficiencyShiftListDto.setLevel3(sysDepartService.getOne(new LambdaQueryWrapper<SysDepart>().ne(SysDepart::getDelFlag, CommonConstant.DEL_FLAG_1.toString()).eq(SysDepart::getOrgCode, orgCode.substring(0, 9))).getDepartName());
}
}
List<MdcEfficiencyShiftResultDto> list = new ArrayList<>();
@@ -923,8 +763,6 @@
} else {
// 浜х嚎灞傜骇
List<MdcEquProDto> equipmentList = mdcEquipmentService.findEquProList(vo.getEquipmentIdList());
- // 鏌ヨ鎵�鏈変骇绾夸俊鎭�
- List<MdcProduction> productionList = mdcProductionService.list(new LambdaQueryWrapper<MdcProduction>().ne(MdcProduction::getDelFlag, CommonConstant.DEL_FLAG_1.toString()).orderByAsc(MdcProduction::getProductionOrder));
// 鐝鍚嶇О鏄剧ず澶勭悊
String shiftSubName = "";
@@ -953,47 +791,16 @@
mdcEfficiencyShiftListDto.setEquipmentName(mdcEquProDto.getEquipmentName());
mdcEfficiencyShiftListDto.setEquipmentType(mdcEquProDto.getEquipmentType());
mdcEfficiencyShiftListDto.setShiftSubName(shiftSubName);
- switch (mdcEquProDto.getOrgType()) {
- case "1":
- mdcEfficiencyShiftListDto.setLevel1(mdcEquProDto.getProductionName());
- break;
- case "2":
- mdcEfficiencyShiftListDto.setLevel2(mdcEquProDto.getProductionName());
- break;
- case "3":
- mdcEfficiencyShiftListDto.setLevel3(mdcEquProDto.getProductionName());
- break;
- default:
- }
- MdcProduction mdcProduction = productionList.stream().filter(production -> production.getId().equals(mdcEquProDto.getParentId())).findAny().orElse(null);
- if (mdcProduction != null) {
- switch (mdcProduction.getOrgType()) {
- case "1":
- mdcEfficiencyShiftListDto.setLevel1(mdcProduction.getProductionName());
- break;
- case "2":
- mdcEfficiencyShiftListDto.setLevel2(mdcProduction.getProductionName());
- break;
- case "3":
- mdcEfficiencyShiftListDto.setLevel3(mdcProduction.getProductionName());
- break;
- default:
+ String orgCode = mdcEquProDto.getOrgCode();
+ if (orgCode != null) {
+ if (orgCode.length() >= 3) {
+ mdcEfficiencyShiftListDto.setLevel1(mdcProductionService.getOne(new LambdaQueryWrapper<MdcProduction>().ne(MdcProduction::getDelFlag, CommonConstant.DEL_FLAG_1.toString()).eq(MdcProduction::getOrgCode, orgCode.substring(0, 3))).getProductionName());
}
- if (StringUtils.isNotEmpty(mdcProduction.getParentId())) {
- productionList.stream().filter(production -> production.getId().equals(mdcProduction.getParentId())).findAny().ifPresent(production1 -> {
- switch (production1.getOrgType()) {
- case "1":
- mdcEfficiencyShiftListDto.setLevel1(production1.getProductionName());
- break;
- case "2":
- mdcEfficiencyShiftListDto.setLevel2(production1.getProductionName());
- break;
- case "3":
- mdcEfficiencyShiftListDto.setLevel3(production1.getProductionName());
- break;
- default:
- }
- });
+ if (orgCode.length() >= 6) {
+ mdcEfficiencyShiftListDto.setLevel2(mdcProductionService.getOne(new LambdaQueryWrapper<MdcProduction>().ne(MdcProduction::getDelFlag, CommonConstant.DEL_FLAG_1.toString()).eq(MdcProduction::getOrgCode, orgCode.substring(0, 6))).getProductionName());
+ }
+ if (orgCode.length() >= 9) {
+ mdcEfficiencyShiftListDto.setLevel3(mdcProductionService.getOne(new LambdaQueryWrapper<MdcProduction>().ne(MdcProduction::getDelFlag, CommonConstant.DEL_FLAG_1.toString()).eq(MdcProduction::getOrgCode, orgCode.substring(0, 9))).getProductionName());
}
}
List<MdcEfficiencyShiftResultDto> list = new ArrayList<>();
@@ -1151,19 +958,45 @@
if (date.equals(equipmentStatisticalShiftInfo.getTheDate()) && equipmentStatisticalShiftInfo.getEquipmentId().equals(equipmentId)) {
mdcEfficiencyShiftResultDto.setTheDate(equipmentStatisticalShiftInfo.getTheDate());
mdcEfficiencyShiftResultDto.setProcessLong(equipmentStatisticalShiftInfo.getProcessLong());
- if (equipmentStatisticalShiftInfo.getTotalLong().compareTo(BigDecimal.ZERO) == 0) {
- mdcEfficiencyShiftResultDto.setUtilizationRate(BigDecimal.ZERO);
- } else {
- mdcEfficiencyShiftResultDto.setUtilizationRate(equipmentStatisticalShiftInfo.getProcessLong().divide(equipmentStatisticalShiftInfo.getTotalLong(), 6, RoundingMode.HALF_UP));
- }
mdcEfficiencyShiftResultDto.setCloseLong(equipmentStatisticalShiftInfo.getCloseLong());
mdcEfficiencyShiftResultDto.setOpenLong(equipmentStatisticalShiftInfo.getOpenLong());
mdcEfficiencyShiftResultDto.setWaitLong(equipmentStatisticalShiftInfo.getWaitLong());
- if (equipmentStatisticalShiftInfo.getTotalLong().compareTo(BigDecimal.ZERO) == 0) {
- mdcEfficiencyShiftResultDto.setOpenRate(BigDecimal.ZERO);
+
+ Map<String, Object> variables = new HashMap<>();
+ variables.put("processLong", equipmentStatisticalShiftInfo.getProcessLong());
+ variables.put("openLong", equipmentStatisticalShiftInfo.getOpenLong());
+ variables.put("totalLong", equipmentStatisticalShiftInfo.getTotalLong());
+ MdcParameter shiftUtilizationRate = mdcParameterService.getOne(new LambdaQueryWrapper<MdcParameter>().eq(MdcParameter::getCode, "shiftUtilizationRate"));
+ if (shiftUtilizationRate != null) {
+ mdcEfficiencyShiftResultDto.setUtilizationRate(formulaCalculator.calculate(shiftUtilizationRate.getValue(), variables));
} else {
- mdcEfficiencyShiftResultDto.setOpenRate(equipmentStatisticalShiftInfo.getOpenLong().divide(equipmentStatisticalShiftInfo.getTotalLong(), 6, RoundingMode.HALF_UP));
+ if (equipmentStatisticalShiftInfo.getTotalLong().compareTo(BigDecimal.ZERO) == 0) {
+ mdcEfficiencyShiftResultDto.setUtilizationRate(BigDecimal.ZERO);
+ } else {
+ mdcEfficiencyShiftResultDto.setUtilizationRate(equipmentStatisticalShiftInfo.getProcessLong().divide(equipmentStatisticalShiftInfo.getTotalLong(), 6, RoundingMode.HALF_UP));
+ }
}
+ MdcParameter shiftOpenRate = mdcParameterService.getOne(new LambdaQueryWrapper<MdcParameter>().eq(MdcParameter::getCode, "shiftOpenRate"));
+ if (shiftOpenRate != null) {
+ mdcEfficiencyShiftResultDto.setOpenRate(formulaCalculator.calculate(shiftOpenRate.getValue(), variables));
+ } else {
+ if (equipmentStatisticalShiftInfo.getTotalLong().compareTo(BigDecimal.ZERO) == 0) {
+ mdcEfficiencyShiftResultDto.setOpenRate(BigDecimal.ZERO);
+ } else {
+ mdcEfficiencyShiftResultDto.setOpenRate(equipmentStatisticalShiftInfo.getOpenLong().divide(equipmentStatisticalShiftInfo.getTotalLong(), 6, RoundingMode.HALF_UP));
+ }
+ }
+ MdcParameter startRate = mdcParameterService.getOne(new LambdaQueryWrapper<MdcParameter>().eq(MdcParameter::getCode, "startRate"));
+ if (startRate != null) {
+ mdcEfficiencyShiftResultDto.setStartRate(formulaCalculator.calculate(startRate.getValue(), variables));
+ } else {
+ if (equipmentStatisticalShiftInfo.getOpenLong().compareTo(BigDecimal.ZERO) == 0) {
+ mdcEfficiencyShiftResultDto.setStartRate(BigDecimal.ZERO);
+ } else {
+ mdcEfficiencyShiftResultDto.setStartRate(equipmentStatisticalShiftInfo.getProcessLong().divide(equipmentStatisticalShiftInfo.getOpenLong(), 6, RoundingMode.HALF_UP));
+ }
+ }
+
long rate = mdcEfficiencyShiftResultDto.getUtilizationRate().multiply(new BigDecimal("100")).longValue();
for (MdcUtilizationRate mdcUtilizationRate : mdcUtilizationRateList) {
if (rate >= mdcUtilizationRate.getMinimumRange() && rate < mdcUtilizationRate.getMaximumRange()) {
@@ -1792,12 +1625,31 @@
if (date.equals(efficiencyDto.getTheDate()) && efficiencyDto.getEquipmentId().equals(equipmentId)) {
mdcEfficiencyResultDto.setTheDate(efficiencyDto.getTheDate());
mdcEfficiencyResultDto.setProcessLong(efficiencyDto.getProcessLong());
- mdcEfficiencyResultDto.setUtilizationRate(efficiencyDto.getUtilizationRate());
- mdcEfficiencyResultDto.setStartRate(efficiencyDto.getStartRate());
- mdcEfficiencyResultDto.setOpenRate(efficiencyDto.getOpenRate());
mdcEfficiencyResultDto.setOpenLong(efficiencyDto.getOpenLong());
mdcEfficiencyResultDto.setWaitLong(efficiencyDto.getWaitLong());
mdcEfficiencyResultDto.setCloseLong(efficiencyDto.getCloseLong());
+ Map<String, Object> variables = new HashMap<>();
+ variables.put("processLong", efficiencyDto.getProcessLong());
+ variables.put("openLong", efficiencyDto.getOpenLong());
+ variables.put("measureTime", new BigDecimal("86400"));
+ MdcParameter utilizationRate = mdcParameterService.getOne(new LambdaQueryWrapper<MdcParameter>().eq(MdcParameter::getCode, "utilizationRate"));
+ if (utilizationRate != null) {
+ mdcEfficiencyResultDto.setUtilizationRate(formulaCalculator.calculate(utilizationRate.getValue(), variables));
+ } else {
+ mdcEfficiencyResultDto.setUtilizationRate(efficiencyDto.getUtilizationRate());
+ }
+ MdcParameter openRate = mdcParameterService.getOne(new LambdaQueryWrapper<MdcParameter>().eq(MdcParameter::getCode, "openRate"));
+ if (openRate != null) {
+ mdcEfficiencyResultDto.setOpenRate(formulaCalculator.calculate(openRate.getValue(), variables));
+ } else {
+ mdcEfficiencyResultDto.setOpenRate(efficiencyDto.getOpenRate());
+ }
+ MdcParameter startRate = mdcParameterService.getOne(new LambdaQueryWrapper<MdcParameter>().eq(MdcParameter::getCode, "startRate"));
+ if (startRate != null) {
+ mdcEfficiencyResultDto.setStartRate(formulaCalculator.calculate(startRate.getValue(), variables));
+ } else {
+ mdcEfficiencyResultDto.setStartRate(efficiencyDto.getStartRate());
+ }
long rate = efficiencyDto.getUtilizationRate().multiply(new BigDecimal("100")).longValue();
for (MdcUtilizationRate mdcUtilizationRate : mdcUtilizationRateList) {
if (rate >= mdcUtilizationRate.getMinimumRange() && rate < mdcUtilizationRate.getMaximumRange()) {
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentRunningSectionServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentRunningSectionServiceImpl.java
index 27430fa..0eec07c 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentRunningSectionServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentRunningSectionServiceImpl.java
@@ -519,9 +519,9 @@
//鑾峰彇running杩愯鐨勬棩蹇楄褰�
List<MdcEquipmentRunningSection> list = this.equipmentRunningTracesLog(equipment.getEquipmentid());
if (list != null && !list.isEmpty()) {
- List<MdcEquipmentRunningSection> equipList = addSequenceNumber(list); //娣诲姞绋嬪簭鍙�
- this.ergodicTrim(equipList);
- super.saveBatch(equipList);
+// List<MdcEquipmentRunningSection> equipList = addSequenceNumber(list); //娣诲姞绋嬪簭鍙�
+ this.ergodicTrim(list);
+ super.saveBatch(list);
}
//鑾峰彇鎶ヨ鐨勬棩蹇楄褰�
List<MdcEquipmentRunningSection> errorList = this.equipmentRunningTracesErrorLog(equipment.getEquipmentid());
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentStatisticalInfoServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentStatisticalInfoServiceImpl.java
index 5f89d3e..7bbf531 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentStatisticalInfoServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentStatisticalInfoServiceImpl.java
@@ -14,6 +14,7 @@
import javax.annotation.Resource;
import java.math.BigDecimal;
+import java.math.RoundingMode;
import java.util.*;
/**
@@ -299,4 +300,21 @@
}
return equipmentStatisticalInfos;
}
+
+ /**
+ * 鏌ヨ璁惧杩愯鏃堕棿
+ *
+ * @param equipmentId
+ * @param validDate
+ * @return
+ */
+ @Override
+ public Integer selectProcessLong(String equipmentId, String validDate) {
+ Integer processLong = this.baseMapper.selectProcessLong(equipmentId, validDate);
+ if (processLong == null) {
+ return 0;
+ } else {
+ return Integer.parseInt(new BigDecimal(processLong).divide(new BigDecimal("60"), 0, RoundingMode.HALF_UP).toString());
+ }
+ }
}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcOeeInfoServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcOeeInfoServiceImpl.java
new file mode 100644
index 0000000..65eb877
--- /dev/null
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcOeeInfoServiceImpl.java
@@ -0,0 +1,253 @@
+package org.jeecg.modules.mdc.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.commons.lang.StringUtils;
+import org.apache.shiro.SecurityUtils;
+import org.jeecg.common.constant.CommonConstant;
+import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.modules.mdc.entity.MdcEquipment;
+import org.jeecg.modules.mdc.entity.MdcOeeInfo;
+import org.jeecg.modules.mdc.mapper.MdcOeeInfoMapper;
+import org.jeecg.modules.mdc.service.IMdcDowntimeService;
+import org.jeecg.modules.mdc.service.IMdcEquipmentService;
+import org.jeecg.modules.mdc.service.IMdcEquipmentStatisticalInfoService;
+import org.jeecg.modules.mdc.service.IMdcOeeInfoService;
+import org.jeecg.modules.mdc.util.DateUtils;
+import org.jeecg.modules.mdc.vo.MdcOeeComputeVo;
+import org.jeecg.modules.mdc.vo.MdcOeeInfoVo;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * @Description: OEE琛�
+ * @Author: lius
+ * @Date: 2024-12-12
+ */
+@Service
+public class MdcOeeInfoServiceImpl extends ServiceImpl<MdcOeeInfoMapper, MdcOeeInfo> implements IMdcOeeInfoService {
+
+ @Resource
+ private IMdcEquipmentService mdcEquipmentService;
+
+ @Resource
+ private IMdcDowntimeService mdcDowntimeService;
+
+ @Resource
+ private IMdcEquipmentStatisticalInfoService mdcEquipmentStatisticalInfoService;
+
+ /**
+ * 鍒嗛〉鍒楄〃
+ *
+ * @param userId
+ * @param page
+ * @param mdcOeeInfoVo
+ * @param req
+ * @return
+ */
+ @Override
+ public IPage<MdcOeeInfo> pageList(String userId, Page<MdcOeeInfo> page, MdcOeeInfoVo mdcOeeInfoVo, HttpServletRequest req) {
+ List<String> equipmentIds = new ArrayList<>();
+ if (StringUtils.isNotEmpty(mdcOeeInfoVo.getParentId()) && StringUtils.isEmpty(mdcOeeInfoVo.getEquipmentId())) {
+ if ("2".equals(mdcOeeInfoVo.getTypeTree())) {
+ //閮ㄩ棬灞傜骇
+ equipmentIds = mdcEquipmentService.getEquipmentIdsByDepart(userId, mdcOeeInfoVo.getParentId());
+ } else {
+ //浜х嚎灞傜骇
+ equipmentIds = mdcEquipmentService.getEquipmentIdsProduction(userId, mdcOeeInfoVo.getParentId());
+ }
+ } else if (StringUtils.isNotEmpty(mdcOeeInfoVo.getEquipmentId())) {
+ //鍗曞彴璁惧淇℃伅
+ mdcOeeInfoVo.setEquipmentIdList(Collections.singletonList(mdcOeeInfoVo.getEquipmentId()));
+ } else {
+ //鏌ヨ鐢ㄦ埛鎷ユ湁鐨勬墍鏈夎澶囦俊鎭�
+ if ("2".equals(mdcOeeInfoVo.getTypeTree())) {
+ //閮ㄩ棬灞傜骇
+ equipmentIds = mdcEquipmentService.getEquipmentIdsByDepart(userId, null);
+ } else {
+ //浜х嚎灞傜骇
+ equipmentIds = mdcEquipmentService.getEquipmentIdsProduction(userId, null);
+ }
+ }
+
+ if (mdcOeeInfoVo.getEquipmentIdList() == null || mdcOeeInfoVo.getEquipmentIdList().isEmpty()) {
+ mdcOeeInfoVo.setEquipmentIdList(equipmentIds);
+ }
+
+ if (mdcOeeInfoVo.getEquipmentIdList() == null || mdcOeeInfoVo.getEquipmentIdList().isEmpty()) {
+ return null;
+ }
+ return this.baseMapper.pageList(page, mdcOeeInfoVo);
+ }
+
+ /**
+ * 瀵煎嚭
+ *
+ * @param userId
+ * @param mdcOeeInfoVo
+ * @return
+ */
+ @Override
+ public ModelAndView exportXls(String userId, MdcOeeInfoVo mdcOeeInfoVo) {
+ LambdaQueryWrapper<MdcOeeInfo> queryWrapper = new LambdaQueryWrapper<>();
+ List<String> equipmentIds = new ArrayList<>();
+ if (StringUtils.isNotEmpty(mdcOeeInfoVo.getParentId()) && StringUtils.isEmpty(mdcOeeInfoVo.getEquipmentId())) {
+ if ("2".equals(mdcOeeInfoVo.getTypeTree())) {
+ //閮ㄩ棬灞傜骇
+ equipmentIds = mdcEquipmentService.getEquipmentIdsByDepart(userId, mdcOeeInfoVo.getParentId());
+ } else {
+ //浜х嚎灞傜骇
+ equipmentIds = mdcEquipmentService.getEquipmentIdsProduction(userId, mdcOeeInfoVo.getParentId());
+ }
+ } else if (StringUtils.isNotEmpty(mdcOeeInfoVo.getEquipmentId())) {
+ //鍗曞彴璁惧淇℃伅
+ mdcOeeInfoVo.setEquipmentIdList(Collections.singletonList(mdcOeeInfoVo.getEquipmentId()));
+ } else {
+ //鏌ヨ鐢ㄦ埛鎷ユ湁鐨勬墍鏈夎澶囦俊鎭�
+ if ("2".equals(mdcOeeInfoVo.getTypeTree())) {
+ //閮ㄩ棬灞傜骇
+ equipmentIds = mdcEquipmentService.getEquipmentIdsByDepart(userId, null);
+ } else {
+ //浜х嚎灞傜骇
+ equipmentIds = mdcEquipmentService.getEquipmentIdsProduction(userId, null);
+ }
+ }
+
+ if (mdcOeeInfoVo.getEquipmentIdList() == null || mdcOeeInfoVo.getEquipmentIdList().isEmpty()) {
+ mdcOeeInfoVo.setEquipmentIdList(equipmentIds);
+ }
+
+ if (mdcOeeInfoVo.getEquipmentIdList() == null || mdcOeeInfoVo.getEquipmentIdList().isEmpty()) {
+ return null;
+ } else {
+ queryWrapper.in(MdcOeeInfo::getEquipmentId, mdcOeeInfoVo.getEquipmentIdList());
+ }
+ if (StringUtils.isNotEmpty(mdcOeeInfoVo.getEquipmentId())) {
+ queryWrapper.eq(MdcOeeInfo::getEquipmentId, mdcOeeInfoVo.getEquipmentId());
+ }
+ if (StringUtils.isNotEmpty(mdcOeeInfoVo.getStartTime()) && StringUtils.isNotEmpty(mdcOeeInfoVo.getEndTime())) {
+ queryWrapper.between(MdcOeeInfo::getTheDate, mdcOeeInfoVo.getStartTime(), mdcOeeInfoVo.getEndTime());
+ }
+ queryWrapper.orderByDesc(MdcOeeInfo::getTheDate).orderByDesc(MdcOeeInfo::getEquipmentId);
+ ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+ List<MdcOeeInfo> mdcOeeInfos = this.baseMapper.selectList(queryWrapper);
+ // 瀵煎嚭鏂囦欢鍚嶇О
+ mv.addObject(NormalExcelConstants.FILE_NAME, "OEE鏁版嵁鍒楄〃");
+ mv.addObject(NormalExcelConstants.CLASS, MdcOeeInfo.class);
+ LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("OEE鏁版嵁鍒楄〃鏁版嵁", "瀵煎嚭浜�:" + user.getRealname(), "OEE鏁版嵁"));
+ //update-end---author:wangshuai ---date:20211227 for锛歔JTC-116]瀵煎嚭浜哄啓姝讳簡------------
+ mv.addObject(NormalExcelConstants.DATA_LIST, mdcOeeInfos);
+ return mv;
+ }
+
+ /**
+ * 璁＄畻OEE
+ *
+ * @param mdcOeeComputeVo
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void computeOee(MdcOeeComputeVo mdcOeeComputeVo) {
+ List<MdcOeeInfo> result = new ArrayList<>();
+ String startDate = mdcOeeComputeVo.getStartTime();
+ String endDate = mdcOeeComputeVo.getEndTime();
+ List<String> dateList = DateUtils.getDatesStringList(DateUtils.getShortDate(startDate), DateUtils.getShortDate(endDate));
+ if (!dateList.isEmpty()) {
+ //鑾峰彇璁惧鍒楄〃
+ List<MdcEquipment> equipmentList = mdcEquipmentService.list();
+
+ for (String validDate : dateList) {
+ try {
+ this.remove(new LambdaQueryWrapper<MdcOeeInfo>().eq(MdcOeeInfo::getTheDate, validDate));
+ } catch (Exception e) {
+ log.error("鍙傛暟鏍煎紡涓嶅", e);
+ }
+ for (MdcEquipment mdcEquipment : equipmentList) {
+ String equipmentId = mdcEquipment.getEquipmentId();
+ MdcOeeInfo mdcOeeInfo = new MdcOeeInfo();
+ // 璁惧缂栧彿
+ mdcOeeInfo.setEquipmentId(equipmentId);
+ // 璁＄畻鏃ユ湡
+ mdcOeeInfo.setTheDate(validDate);
+ // 宸ヤ綔鏃ュ巻鏃堕棿(min) --- 鎸夋瘡澶�24灏忔椂绠�
+ mdcOeeInfo.setCalendarLong(1440);
+ // 璁″垝鍋滄満鏃堕棿(min) --- 鎸夌淮鎶ゆ暟鎹粺璁″綋澶╂�绘椂闀�
+ Integer planCloseLong = mdcDowntimeService.findPlanTimeDuration(equipmentId, validDate, CommonConstant.CLOSE_TYPE_0);
+ mdcOeeInfo.setPlanCloseLong(planCloseLong);
+ // 璐熻嵎鏃堕棿(min) --- 鏃ュ巻宸ヤ綔鏃堕棿-璁″垝鍋滄満鏃堕棿
+ Integer loadLong = mdcOeeInfo.getCalendarLong() - planCloseLong;
+ mdcOeeInfo.setLoadLong(loadLong);
+ // 闈炶鍒掑仠鏈烘椂闂�(min) --- 鎸夌淮鎶ゆ暟鎹粺璁″綋澶╂�绘椂闀�
+ Integer noPlanCloseLong = mdcDowntimeService.findPlanTimeDuration(equipmentId, validDate, CommonConstant.CLOSE_TYPE_1);
+ mdcOeeInfo.setNoplanCloseLong(noPlanCloseLong);
+ // 寮�鍔ㄦ椂闂�(min) --- 璐熻嵎鏃堕棿-闈炶鍒掑仠鏈烘椂闂�
+ int actuateLong = loadLong - noPlanCloseLong;
+ mdcOeeInfo.setActuateLong(actuateLong);
+ // 鏃堕棿寮�鍔ㄧ巼 --- 寮�鍔ㄦ椂闂�/璐熻嵎鏃堕棿
+ BigDecimal timeActuationRate = BigDecimal.ZERO;
+ if (loadLong == 0) {
+ mdcOeeInfo.setTimeActuationRate(timeActuationRate);
+ } else {
+ timeActuationRate = new BigDecimal(actuateLong).divide(new BigDecimal(loadLong), 4, RoundingMode.HALF_UP).multiply(new BigDecimal("100")).setScale(2, RoundingMode.HALF_UP);
+ mdcOeeInfo.setTimeActuationRate(timeActuationRate.compareTo(new BigDecimal(100)) > 0 ? new BigDecimal(100) : timeActuationRate);
+ }
+ // 鏈夋晥杩愯鏃堕棿 --- 鎸夐渶姹傜淮鎶ら浂浠跺姞宸ユ�绘椂闀縷|绯荤粺涓昏酱璐熻浇鏃堕棿
+ Integer effectiveRunLong = 0;
+ //鏌ヨ璁惧杩愯鏃堕棿
+ effectiveRunLong = mdcEquipmentStatisticalInfoService.selectProcessLong(equipmentId, validDate.replace("-", ""));
+ if (effectiveRunLong == null) {
+ effectiveRunLong = 0;
+ }
+ mdcOeeInfo.setEffectiveRunLong(effectiveRunLong);
+ // 鎬ц兘寮�鍔ㄧ巼 --- 鏈夋晥杩愯鏃堕棿/寮�鍔ㄦ椂闂�
+ BigDecimal performanceRate = BigDecimal.ZERO;
+ if (effectiveRunLong != 0 && actuateLong != 0) {
+ performanceRate = new BigDecimal(effectiveRunLong).divide(new BigDecimal(actuateLong), 4, RoundingMode.HALF_UP).multiply(new BigDecimal("100")).setScale(2, RoundingMode.HALF_UP);
+ }
+ mdcOeeInfo.setPerformanceRate(performanceRate.compareTo(new BigDecimal(100)) > 0 ? new BigDecimal(100) : performanceRate);
+ // 鍔犲伐闆朵欢鏁伴噺 --- 鎸夌淮鎶ゆ暟鎹粺璁″綋澶�
+ // 鍔犲伐闆朵欢鏁伴噺
+ // TODO
+// Integer processCount = mdcJcRcJobreportService.selectTotalProcessCount(equipmentId, validDate);
+ int processCount = 0;
+ mdcOeeInfo.setProcessCount(processCount);
+ // 鍚堟牸闆朵欢鏁伴噺
+ // TODO
+// Integer passCount = mdcJcRcJobreportService.selectTotalPassCount(equipmentId, validDate);
+ int passCount = 0;
+ mdcOeeInfo.setPassCount(passCount);
+ // 鍚堟牸鐜� --- 鍚堟牸鏁�/鍔犲伐鏁�
+ BigDecimal passRate = new BigDecimal("100");
+ if (processCount != 0 && passCount != 0) {
+ passRate = new BigDecimal(passCount).divide(new BigDecimal(processCount), 4, RoundingMode.HALF_UP).multiply(new BigDecimal("100")).setScale(2, RoundingMode.HALF_UP);
+ }
+ mdcOeeInfo.setPassRate(passRate.compareTo(new BigDecimal(100)) > 0 ? new BigDecimal(100) : passRate);
+ // OEE --- 鏃堕棿寮�鍔ㄧ巼 * 鎬ц兘寮�鍔ㄧ巼 * 涓�娆″悎鏍肩巼
+ BigDecimal oee = BigDecimal.ZERO;
+ if (!timeActuationRate.equals(BigDecimal.ZERO) && !performanceRate.equals(BigDecimal.ZERO) && !passRate.equals(BigDecimal.ZERO)) {
+ oee = timeActuationRate.multiply(performanceRate).multiply(passRate).divide(new BigDecimal("10000"), 4, RoundingMode.HALF_UP);
+ }
+ mdcOeeInfo.setOee(oee.compareTo(new BigDecimal(100)) > 0 ? new BigDecimal(100) : oee);
+ result.add(mdcOeeInfo);
+ }
+ }
+ }
+ super.saveBatch(result);
+ }
+
+}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcParameterServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcParameterServiceImpl.java
new file mode 100644
index 0000000..d6e9ccd
--- /dev/null
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcParameterServiceImpl.java
@@ -0,0 +1,18 @@
+package org.jeecg.modules.mdc.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jeecg.modules.mdc.entity.MdcParameter;
+import org.jeecg.modules.mdc.mapper.MdcParameterMapper;
+import org.jeecg.modules.mdc.service.IMdcParameterService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Description: mdc绠楁硶鍏紡
+ * @Author: lius
+ * @Date: 2025-08-13
+ * @Version: V1.0
+ */
+@Service
+public class MdcParameterServiceImpl extends ServiceImpl<MdcParameterMapper, MdcParameter> implements IMdcParameterService {
+
+}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcPlanCloseServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcPlanCloseServiceImpl.java
index b23684c..9efd272 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcPlanCloseServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcPlanCloseServiceImpl.java
@@ -1,18 +1,10 @@
package org.jeecg.modules.mdc.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.jeecg.modules.mdc.constant.MdcConstant;
import org.jeecg.modules.mdc.entity.MdcPlanClose;
import org.jeecg.modules.mdc.mapper.MdcPlanCloseMapper;
import org.jeecg.modules.mdc.service.IMdcPlanCloseService;
import org.springframework.stereotype.Service;
-
-import java.math.BigDecimal;
-import java.util.Arrays;
-import java.util.List;
-
/**
* @Description: mdc璁″垝鍋滄満缁存姢琛�
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/util/JexlFormulaCalculator.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/util/JexlFormulaCalculator.java
new file mode 100644
index 0000000..5780824
--- /dev/null
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/util/JexlFormulaCalculator.java
@@ -0,0 +1,63 @@
+package org.jeecg.modules.mdc.util;
+
+import org.apache.commons.jexl3.*;
+import org.springframework.stereotype.Component;
+import java.math.BigDecimal;
+import java.util.Map;
+
+/**
+ * @Author: Lius
+ * @CreateTime: 2025-08-19
+ * @Description: 鑷畾涔夊叕寮忚绠楃被
+ */
+@Component
+public class JexlFormulaCalculator {
+
+ // 閫氳繃JexlBuilder鍒涘缓JexlEngine瀹炰緥
+ private static final JexlEngine jexl = new JexlBuilder().create();
+
+ /**
+ * 璁＄畻鑷畾涔夊叕寮忥紝闄ゆ暟涓�0鏃惰繑鍥�0
+ * @param formula 鍏紡瀛楃涓诧紝濡� "processLong/measureTime*1.0"
+ * @param variables 鍏紡涓殑鍙橀噺閿�煎
+ * @return 璁＄畻缁撴灉锛圔igDecimal绫诲瀷锛岄櫎鏁颁负0鏃惰繑鍥�0锛�
+ */
+ public BigDecimal calculate(String formula, Map<String, Object> variables) {
+ try {
+ // 瑙ｆ瀽鍏紡
+ JexlExpression expression = jexl.createExpression(formula);
+
+ // 鍒涘缓涓婁笅鏂囧苟娉ㄥ叆鍙橀噺
+ MapContext context = new MapContext();
+ for (Map.Entry<String, Object> entry : variables.entrySet()) {
+ String varName = entry.getKey();
+ Object value = entry.getValue();
+ // 纭繚鍙橀噺涓烘暟瀛楃被鍨�
+ if (value instanceof Number) {
+ context.set(varName, value);
+ } else {
+ throw new IllegalArgumentException("鍙橀噺" + varName + "蹇呴』鏄暟瀛楃被鍨�");
+ }
+ }
+
+ // 鎵ц璁＄畻
+ Object result = expression.evaluate(context);
+
+ // 杞崲涓築igDecimal杩斿洖
+ if (result instanceof Number) {
+ return new BigDecimal(result.toString());
+ } else {
+ throw new RuntimeException("鍏紡璁＄畻缁撴灉涓嶆槸鏁板瓧");
+ }
+ } catch (JexlException e) {
+ // 鍏抽敭锛氫笉渚濊禆鍐呴儴绫伙紝鐩存帴閫氳繃寮傚父娑堟伅鍒ゆ柇闄ゆ暟涓�0
+ if (e.getMessage() != null && e.getMessage().contains("division by zero")) {
+ return BigDecimal.ZERO; // 闄ゆ暟涓�0杩斿洖0
+ }
+ // 鍏朵粬JEXL寮傚父姝ｅ父鎶涘嚭
+ throw new RuntimeException("鍏紡璁＄畻澶辫触: " + formula, e);
+ } catch (Exception e) {
+ throw new RuntimeException("鍏紡璁＄畻澶辫触: " + formula, e);
+ }
+ }
+}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcDowntimeVo.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcDowntimeVo.java
new file mode 100644
index 0000000..97cc304
--- /dev/null
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcDowntimeVo.java
@@ -0,0 +1,38 @@
+package org.jeecg.modules.mdc.vo;
+
+import lombok.Data;
+import org.jeecg.modules.mdc.entity.MdcDowntime;
+
+import java.util.List;
+
+/**
+ * @Author: Lius
+ * @CreateTime: 2025-03-12
+ * @Description:
+ */
+@Data
+public class MdcDowntimeVo extends MdcDowntime {
+ /**
+ * 寮�濮嬫椂闂� -> 20220101
+ */
+ private String startTime;
+ /**
+ * 缁撴潫鏃堕棿 -> 20220101
+ */
+ private String endTime;
+ private String effectiveDate;
+ /**
+ * 鏍戠被鍨� -> 1:杞﹂棿灞傜骇 2:閮ㄩ棬灞傜骇
+ */
+ private String typeTree;
+ /**
+ * 灞傜骇ID
+ */
+ private String parentId;
+
+ /**
+ * 璁惧ids
+ */
+ private List<String> equipmentIdList;
+ private List<String> mdcSectionIds;
+}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcOeeComputeVo.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcOeeComputeVo.java
new file mode 100644
index 0000000..bc8f5f4
--- /dev/null
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcOeeComputeVo.java
@@ -0,0 +1,13 @@
+package org.jeecg.modules.mdc.vo;
+
+import lombok.Data;
+
+/**
+ * @author Lius
+ * @date 2025/1/20 14:41
+ */
+@Data
+public class MdcOeeComputeVo {
+ private String startTime;
+ private String endTime;
+}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcOeeInfoVo.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcOeeInfoVo.java
new file mode 100644
index 0000000..783ebfc
--- /dev/null
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcOeeInfoVo.java
@@ -0,0 +1,20 @@
+package org.jeecg.modules.mdc.vo;
+
+import lombok.Data;
+import org.jeecg.modules.mdc.entity.MdcOeeInfo;
+
+import java.util.List;
+
+/**
+ * @author Lius
+ * @date 2024/12/12 10:14
+ */
+@Data
+public class MdcOeeInfoVo extends MdcOeeInfo {
+ private String startTime;
+ private String endTime;
+ private String parentId;
+ private String typeTree;
+ private List<String> equipmentIdList;
+ private String equipmentIds;
+}
diff --git a/lxzn-module-system/lxzn-system-api/lxzn-system-local-api/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.java b/lxzn-module-system/lxzn-system-api/lxzn-system-local-api/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.java
index c9594c9..b88f825 100644
--- a/lxzn-module-system/lxzn-system-api/lxzn-system-local-api/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.java
+++ b/lxzn-module-system/lxzn-system-api/lxzn-system-local-api/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.java
@@ -411,8 +411,6 @@
void delSysUploadRelaByBusIdAndBusType(String busId, String busType);
- String getUnitNameById(String unitId);
-
String queryDictTextByKey(String dictCode, String key);
String getVersionStatusByVersionAndBusinessType(Integer version, String businessType);
@@ -422,8 +420,6 @@
DataVersion getDataVersionByBusinessId(String id);
void removeDataVersionById(String id);
-
- String getEnterpriseNameById(String enterpriseId);
List<DataVersion> getLastDataVersion(String businessType, String enterpriseId, String isLastusable);
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/controller/ClientCategoryController.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/controller/ClientCategoryController.java
deleted file mode 100644
index fbd8981..0000000
--- a/lxzn-module-system/lxzn-system-biz/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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/controller/ClientContactController.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/controller/ClientContactController.java
deleted file mode 100644
index 78f3e0f..0000000
--- a/lxzn-module-system/lxzn-system-biz/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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/controller/ClientController.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/controller/ClientController.java
deleted file mode 100644
index f8ee67e..0000000
--- a/lxzn-module-system/lxzn-system-biz/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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/controller/ConstructorController.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/controller/ConstructorController.java
deleted file mode 100644
index 1af2524..0000000
--- a/lxzn-module-system/lxzn-system-biz/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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/controller/DepartmentCategoryController.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/controller/DepartmentCategoryController.java
deleted file mode 100644
index 4069f91..0000000
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/controller/DepartmentCategoryController.java
+++ /dev/null
@@ -1,197 +0,0 @@
-package org.jeecg.modules.base.controller;
-
-import java.util.ArrayList;
-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.DepartmentCategory;
-import org.jeecg.modules.base.service.IDepartmentCategoryService;
-
-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/departmentCategory")
-@Slf4j
-public class DepartmentCategoryController extends JeecgController<DepartmentCategory, IDepartmentCategoryService> {
- @Autowired
- private IDepartmentCategoryService departmentCategoryService;
-
- /**
- * 琛ㄥ崟楠岃瘉
- *
- *
- */
- @GetMapping("/check")
- public Result<?> check(@RequestParam(name="name",required = false) String name,
- @RequestParam(name="code",required = false) String code
- ){
- QueryWrapper<DepartmentCategory> 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(departmentCategoryService.list(queryWrapper));
- }
- /**
- * 鍒嗛〉鍒楄〃鏌ヨ
- *
- * @param departmentCategory
- * @param pageNo
- * @param pageSize
- * @param req
- * @return
- */
- //@AutoLog(value = "鍩虹鏁版嵁-缁勭粐鏋舵瀯-閮ㄩ棬绫诲瀷-鍒嗛〉鍒楄〃鏌ヨ")
- @ApiOperation(value="鍩虹鏁版嵁-缁勭粐鏋舵瀯-閮ㄩ棬绫诲瀷-鍒嗛〉鍒楄〃鏌ヨ", notes="鍩虹鏁版嵁-缁勭粐鏋舵瀯-閮ㄩ棬绫诲瀷-鍒嗛〉鍒楄〃鏌ヨ")
- @GetMapping(value = "/list")
- public Result<IPage<DepartmentCategory>> queryPageList(DepartmentCategory departmentCategory,
- @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
- @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
- HttpServletRequest req) {
- QueryWrapper<DepartmentCategory> queryWrapper = QueryGenerator.initQueryWrapper(departmentCategory, req.getParameterMap());
- queryWrapper.eq("del_flag","0");
- Page<DepartmentCategory> page = new Page<DepartmentCategory>(pageNo, pageSize);
- IPage<DepartmentCategory> pageList = departmentCategoryService.page(page, queryWrapper);
- return Result.OK(pageList);
- }
-
- /**
- * 娣诲姞
- *
- * @param departmentCategory
- * @return
- */
- @AutoLog(value = "鍩虹鏁版嵁-缁勭粐鏋舵瀯-閮ㄩ棬绫诲瀷-娣诲姞")
- @ApiOperation(value="鍩虹鏁版嵁-缁勭粐鏋舵瀯-閮ㄩ棬绫诲瀷-娣诲姞", notes="鍩虹鏁版嵁-缁勭粐鏋舵瀯-閮ㄩ棬绫诲瀷-娣诲姞")
- //@RequiresPermissions("org.jeecg.modules.demo:mom_base_department_category:add")
- @PostMapping(value = "/add")
- public Result<String> add(@RequestBody DepartmentCategory departmentCategory) {
- departmentCategory.setDelFlag("0");
- departmentCategoryService.save(departmentCategory);
- return Result.OK("娣诲姞鎴愬姛锛�");
- }
-
- /**
- * 缂栬緫
- *
- * @param departmentCategory
- * @return
- */
- @AutoLog(value = "鍩虹鏁版嵁-缁勭粐鏋舵瀯-閮ㄩ棬绫诲瀷-缂栬緫")
- @ApiOperation(value="鍩虹鏁版嵁-缁勭粐鏋舵瀯-閮ㄩ棬绫诲瀷-缂栬緫", notes="鍩虹鏁版嵁-缁勭粐鏋舵瀯-閮ㄩ棬绫诲瀷-缂栬緫")
- //@RequiresPermissions("org.jeecg.modules.demo:mom_base_department_category:edit")
- @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
- public Result<String> edit(@RequestBody DepartmentCategory departmentCategory) {
- departmentCategoryService.updateById(departmentCategory);
- return Result.OK("缂栬緫鎴愬姛!");
- }
-
- /**
- * 閫氳繃id鍒犻櫎
- *
- * @param id
- * @return
- */
- @AutoLog(value = "鍩虹鏁版嵁-缁勭粐鏋舵瀯-閮ㄩ棬绫诲瀷-閫氳繃id鍒犻櫎")
- @ApiOperation(value="鍩虹鏁版嵁-缁勭粐鏋舵瀯-閮ㄩ棬绫诲瀷-閫氳繃id鍒犻櫎", notes="鍩虹鏁版嵁-缁勭粐鏋舵瀯-閮ㄩ棬绫诲瀷-閫氳繃id鍒犻櫎")
- //@RequiresPermissions("org.jeecg.modules.demo:mom_base_department_category:delete")
- @DeleteMapping(value = "/delete")
- public Result<String> delete(@RequestParam(name="id",required=true) String id) {
- DepartmentCategory departmentCategory = new DepartmentCategory();
- departmentCategory.setId(id);
- departmentCategory.setDelFlag("1");
- departmentCategoryService.updateById(departmentCategory);
- return Result.OK("鍒犻櫎鎴愬姛!");
- }
-
- /**
- * 鎵归噺鍒犻櫎
- *
- * @param ids
- * @return
- */
- @AutoLog(value = "鍩虹鏁版嵁-缁勭粐鏋舵瀯-閮ㄩ棬绫诲瀷-鎵归噺鍒犻櫎")
- @ApiOperation(value="鍩虹鏁版嵁-缁勭粐鏋舵瀯-閮ㄩ棬绫诲瀷-鎵归噺鍒犻櫎", notes="鍩虹鏁版嵁-缁勭粐鏋舵瀯-閮ㄩ棬绫诲瀷-鎵归噺鍒犻櫎")
- //@RequiresPermissions("org.jeecg.modules.demo:mom_base_department_category:deleteBatch")
- @DeleteMapping(value = "/deleteBatch")
- public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
- List<DepartmentCategory> list = new ArrayList<>();
- String realIds[] = ids.split(",");
- for(String id:realIds){
- DepartmentCategory departmentCategory = new DepartmentCategory();
- departmentCategory.setId(id);
- departmentCategory.setDelFlag("1");
- list.add(departmentCategory);
- }
- this.departmentCategoryService.removeByIds(list);
- return Result.OK("鎵归噺鍒犻櫎鎴愬姛!");
- }
-
- /**
- * 閫氳繃id鏌ヨ
- *
- * @param id
- * @return
- */
- //@AutoLog(value = "鍩虹鏁版嵁-缁勭粐鏋舵瀯-閮ㄩ棬绫诲瀷-閫氳繃id鏌ヨ")
- @ApiOperation(value="鍩虹鏁版嵁-缁勭粐鏋舵瀯-閮ㄩ棬绫诲瀷-閫氳繃id鏌ヨ", notes="鍩虹鏁版嵁-缁勭粐鏋舵瀯-閮ㄩ棬绫诲瀷-閫氳繃id鏌ヨ")
- @GetMapping(value = "/queryById")
- public Result<DepartmentCategory> queryById(@RequestParam(name="id",required=true) String id) {
- DepartmentCategory departmentCategory = departmentCategoryService.getById(id);
- if(departmentCategory==null) {
- return Result.error("鏈壘鍒板搴旀暟鎹�");
- }
- return Result.OK(departmentCategory);
- }
-
- /**
- * 瀵煎嚭excel
- *
- * @param request
- * @param departmentCategory
- */
- //@RequiresPermissions("org.jeecg.modules.demo:mom_base_department_category:exportXls")
- @RequestMapping(value = "/exportXls")
- public ModelAndView exportXls(HttpServletRequest request, DepartmentCategory departmentCategory) {
- return super.exportXls(request, departmentCategory, DepartmentCategory.class, "鍩虹鏁版嵁-缁勭粐鏋舵瀯-閮ㄩ棬绫诲瀷");
- }
-
- /**
- * 閫氳繃excel瀵煎叆鏁版嵁
- *
- * @param request
- * @param response
- * @return
- */
- //@RequiresPermissions("mom_base_department_category:importExcel")
- @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
- public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
- return super.importExcel(request, response, DepartmentCategory.class);
- }
-
-}
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/controller/EncodeRuleController.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/controller/EncodeRuleController.java
deleted file mode 100644
index 3c59b8d..0000000
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/controller/EncodeRuleController.java
+++ /dev/null
@@ -1,133 +0,0 @@
-package org.jeecg.modules.base.controller;
-
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import lombok.extern.slf4j.Slf4j;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.constant.CommonConstant;
-import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.base.entity.EncodeRule;
-import org.jeecg.modules.base.entity.EncodeRuleDetail;
-import org.jeecg.modules.base.entity.EncodeRuleTableFieldRelate;
-import org.jeecg.modules.base.service.IEncodeRuleDetailService;
-import org.jeecg.modules.base.service.IEncodeRuleService;
-import org.jeecg.modules.base.service.IEncodeRuleTableFieldRelateService;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * @Title: Controller
- * @Description: 缂栫爜瑙勫垯琛� 鍓嶇鎺у埗鍣�
- * @Author: cuijian
- * @Date: 2022-11-03
- * @Version: V1.0
- */
-@RestController
-@RequestMapping("/base/codeRule")
-@Slf4j
-public class EncodeRuleController {
-
- @Resource
- private IEncodeRuleService encodeRuleService;
- @Resource
- private IEncodeRuleDetailService encodeRuleDetailService;
- @Resource
- private IEncodeRuleTableFieldRelateService encodeRuleTableFieldRelateService;
- /**
- * 鏌ヨ鏁版嵁 鏍规嵁鑿滃崟id鏌ヨ缂栫爜瑙勫垯淇℃伅
- * @author cj
- * @param permissionId
- * @return
- */
- @GetMapping(value = "/getCodeRuleByPermissionId")
- public Result<List<EncodeRule>> getCodeRuleByPermissionId(@RequestParam String permissionId, String enterpriseId){
- Result<List<EncodeRule>> result = new Result<>();
- LambdaQueryWrapper<EncodeRule> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(EncodeRule::getPermissionId,permissionId);
- queryWrapper.eq(EncodeRule::getEnterpriseId,enterpriseId);
- List<EncodeRule> list = encodeRuleService.list(queryWrapper);
- result.setResult(list);
- return result;
- }
- /**
- * 澧炲姞鏁版嵁 娣诲姞鍜屼慨鏀圭紪鐮佽鍒欎俊鎭�
- * @author cj
- * @param encodeRule
- * @return
- */
- @PostMapping(value = "/addEncodeRule")
- public Result<EncodeRule> addEncodeRule(@RequestBody EncodeRule encodeRule){
- Result<EncodeRule> result = new Result<>();
- try{
- encodeRuleService.saveOrUpdate(encodeRule);
- EncodeRuleTableFieldRelate encodeRuleTableFieldRelate = new EncodeRuleTableFieldRelate();
- encodeRuleTableFieldRelate.setEncodeRuleId(encodeRule.getId());
- encodeRuleTableFieldRelate.setFieldName(encodeRule.getFieldName());
- encodeRuleTableFieldRelate.setTableName(encodeRule.getTableName());
- encodeRuleTableFieldRelateService.save(encodeRuleTableFieldRelate);
- result.success("鎿嶄綔鎴愬姛");
- }catch (Exception e){
- result.error500("鎿嶄綔澶辫触");
- }
- return result;
- }
-
- /**
- * 鍚敤鍋滅敤缂栫爜瑙勫垯淇℃伅
- * @author cj
- * @param json
- * @return
- */
- @PostMapping(value = "/changeStatus")
- public Result<EncodeRule> changeStatus(@RequestBody JSONObject json){
- Result<EncodeRule> result = new Result<>();
- String ids = json.getString("ids");
- String flag = json.getString("flag");
- if(oConvertUtils.isEmpty(ids)) {
- result.error500("鏈�変腑缂栫爜瑙勫垯锛�");
- }else {
- String[] ls = ids.split(",");
- for (String id : ls) {
- EncodeRule encodeRule = encodeRuleService.lambdaQuery().eq(EncodeRule::getId,id).eq(EncodeRule::getDelFlag, CommonConstant.STATUS_0).one();
- encodeRule.setStatus(flag);
- encodeRuleService.updateById(encodeRule);
- }
- result.success("鍙樻洿鎴愬姛锛�");
- }
- return result;
- }
- /**
- * 鍒犻櫎鏁版嵁 鍒犻櫎閫変腑鐨勭紪鐮佽鍒欎俊鎭�
- * @author cj
- * @param ids
- * @return
- */
- @DeleteMapping(value = "/deleteEncodeRule")
- public Result<EncodeRule> deleteEncodeRule(@RequestParam String ids){
- Result<EncodeRule> result = new Result<>();
- if(oConvertUtils.isEmpty(ids)) {
- result.error500("鏈�変腑缂栫爜瑙勫垯锛�");
- }else {
- String[] ls = ids.split(",");
- for (String id : ls) {
- //鍒犻櫎瑙勫垯璇︽儏淇℃伅
- LambdaQueryWrapper<EncodeRuleDetail> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(EncodeRuleDetail::getCodeRuleId ,id);
- List<EncodeRuleDetail> list = encodeRuleDetailService.list(queryWrapper);
- for(EncodeRuleDetail l : list){
- encodeRuleDetailService.removeById(l.getId());
- }
- if(encodeRuleService.removeById(id)){
- result.success("鍒犻櫎鎴愬姛锛�");
- }else {
- result.success("鍒犻櫎澶辫触锛�");
- }
-
- }
- }
- return result;
- }
-
-}
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/controller/EncodeRuleDepartController.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/controller/EncodeRuleDepartController.java
deleted file mode 100644
index 31272cc..0000000
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/controller/EncodeRuleDepartController.java
+++ /dev/null
@@ -1,131 +0,0 @@
-package org.jeecg.modules.base.controller;
-
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.StringUtils;
-import lombok.extern.slf4j.Slf4j;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.constant.CommonConstant;
-import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.base.entity.EncodeRuleDepart;
-import org.jeecg.modules.base.service.IEncodeRuleDepartService;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @Title: Controller
- * @Description: 缂栫爜瑙勫垯閮ㄩ棬鍏宠仈琛� 鍓嶇鎺у埗鍣�
- * @Author: cuijian
- * @Date: 2022-11-04
- * @Version: V1.0
- */
-@RestController
-@RequestMapping("/base/codeRuleDepart")
-@Slf4j
-public class EncodeRuleDepartController {
-
- @Resource
- private IEncodeRuleDepartService encodeRuleDepartService;
- /* *//**
- * 鏌ヨ鏁版嵁 鏍规嵁缂栫爜瑙勫垯id鏌ヨ閮ㄩ棬淇℃伅
- * @author cj
- * @param codeRuleId
- * @return
- *//*
- @GetMapping(value = "/getDepartBycodeRuleId")
- public Result<List<MomBaseEncodeRuleDepart>> getDepartBycodeRuleId(@RequestParam String codeRuleId){
- Result<List<MomBaseEncodeRuleDepart>> result = new Result<>();
- if(oConvertUtils.isEmpty(codeRuleId)){
- return null;
- }else {
- List<MomBaseEncodeRuleDepart> list = encodeRuleDepartService.getDepartBycodeRuleId(codeRuleId);
- result.setResult(list);
- return result;
- }
- }*/
-
- /**
- * 鏌ヨ鏁版嵁 鏍规嵁缂栫爜瑙勫垯id鏌ヨ鏈夋潈闄愮殑閮ㄩ棬淇℃伅
- * @author cj
- * @param codeRuleId
- * @return
- */
- @GetMapping(value = "/getDepartBycodeRuleId")
- public Result<Map<String,Object>> getDepartList(@RequestParam String codeRuleId){
- Result<Map<String,Object>> result = new Result<>();
- //鍏ㄩ儴鏉冮檺ids
- List<String> ids = new ArrayList<>();
- Map<String,Object> map = new HashMap();
- try {
- List<EncodeRuleDepart> list = encodeRuleDepartService.getDepartBycodeRuleId(codeRuleId);
- //鍏ㄩ儴鏍戣妭鐐规暟鎹�
- map.put("treeList", list);
- List<EncodeRuleDepart> encodeRuleDepartList = encodeRuleDepartService.lambdaQuery().eq(EncodeRuleDepart::getCodeRuleId,codeRuleId)
- .eq(EncodeRuleDepart::getDelFlag,CommonConstant.STATUS_0).list();
- for(EncodeRuleDepart encodeRuleDepart : encodeRuleDepartList) {
- ids.add(encodeRuleDepart.getDepartId());
- }
- map.put("ids",ids);
- result.setResult(map);
- result.setSuccess(true);
- } catch (Exception e) {
- log.error(e.getMessage(), e);
- }
- return result;
- }
-
- /**
- * 澧炲姞鏁版嵁 娣诲姞缂栫爜瑙勫垯鍜岄儴闂ㄥ叧鑱斾俊鎭�
- * @author cj
- * @param json
- * @return
- */
- @PostMapping(value = "/addEncodeRuleDepart")
- public Result<String> addEncodeRuleDepart(@RequestBody JSONObject json){
- Result<String> result = new Result<>();
- try{
- String codeRuleId = json.getString("codeRuleId");
- this.deleteEncodeRuleDepart(codeRuleId);
- String departIds = json.getString("departIds");
- if(StringUtils.isNotBlank(departIds)){
- String[] departIdList = departIds.split(",");
- for(String departId : departIdList){
- EncodeRuleDepart encodeRuleDepart = new EncodeRuleDepart();
- encodeRuleDepart.setCodeRuleId(codeRuleId);
- encodeRuleDepart.setDepartId(departId);
- encodeRuleDepartService.save(encodeRuleDepart);
- }
- }
- result.success("鏂板鎴愬姛");
- }catch (Exception e){
- result.error500("鏂板澶辫触");
- }
- return result;
- }
-
- /**
- * 鍒犻櫎鏁版嵁 鏍规嵁缂栫爜瑙勫垯id鍒犻櫎鍜岄儴闂ㄧ殑鍏宠仈淇℃伅
- * @author cj
- * @param codeRuleId
- * @return
- */
- @DeleteMapping(value = "/deleteEncodeRuleDepart")
- public Result<EncodeRuleDepart> deleteEncodeRuleDepart(@RequestParam String codeRuleId){
- Result<EncodeRuleDepart> result = new Result<>();
- LambdaQueryWrapper<EncodeRuleDepart> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(EncodeRuleDepart::getCodeRuleId,codeRuleId);
- List<EncodeRuleDepart> list = encodeRuleDepartService.list(queryWrapper);
- if(oConvertUtils.isNotEmpty(list)){
- list.forEach(l->{
- encodeRuleDepartService.removeById(l.getId());
- });
- }
- return result;
- }
-
-}
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/controller/EncodeRuleDetailController.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/controller/EncodeRuleDetailController.java
deleted file mode 100644
index 737c2e1..0000000
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/controller/EncodeRuleDetailController.java
+++ /dev/null
@@ -1,160 +0,0 @@
-package org.jeecg.modules.base.controller;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-import com.baomidou.mybatisplus.core.toolkit.StringUtils;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.shiro.SecurityUtils;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.constant.CommonConstant;
-import org.jeecg.common.system.vo.LoginUser;
-import org.jeecg.common.util.DateUtils;
-import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.base.entity.EncodeRule;
-import org.jeecg.modules.base.entity.EncodeRuleDepart;
-import org.jeecg.modules.base.entity.EncodeRuleDetail;
-import org.jeecg.modules.base.service.IEncodeRuleDepartService;
-import org.jeecg.modules.base.service.IEncodeRuleDetailService;
-import org.jeecg.modules.base.service.IEncodeRuleService;
-import org.jeecg.modules.system.service.SysIdentityService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.List;
-
-/**
- * @Title: Controller
- * @Description: 缂栫爜瑙勫垯璇︽儏琛� 鍓嶇鎺у埗鍣�
- * @Author: cuijian
- * @Date: 2022-11-03
- * @Version: V1.0
- */
-@RestController
-@RequestMapping("/base/codeRuleDetail")
-@Slf4j
-public class EncodeRuleDetailController {
-
- @Resource
- private IEncodeRuleService encodeRuleService;
- @Resource
- private IEncodeRuleDetailService encodeRuleDetailService;
- @Autowired
- private IEncodeRuleDepartService encodeRuleDepartService;
- @Autowired
- private SysIdentityService sysIdentityService;
- /**
- * 鏌ヨ鏁版嵁 鏍规嵁瑙勫垯缂栫爜id鏌ヨ瑙勫垯缂栫爜璇︾粏淇℃伅
- * @author cj
- * @param ruleCodeId
- * @return
- */
- @GetMapping(value = "/getCodeRuleDetailByRuleCodeId")
- public Result<List<EncodeRuleDetail>> getCodeRuleDetailByCodeRuleId(@RequestParam String ruleCodeId){
- Result<List<EncodeRuleDetail>> result = new Result<>();
- if(StringUtils.isNotBlank(ruleCodeId)){
- List<EncodeRuleDetail> list = encodeRuleDetailService.getCodeRuleDetailByCodeRuleId(ruleCodeId);
- result.setResult(list);
- }
- return result;
- }
- /**
- * 澧炲姞鏁版嵁 娣诲姞鍜屼慨鏀圭紪鐮佽鍒欒缁嗕俊鎭�
- * @author cj
- * @param encodeRuleDetail
- * @return
- */
- @PostMapping(value = "/addEncodeRuleDetail")
- public Result<EncodeRuleDetail> addEncodeRuleDetail(@RequestBody EncodeRuleDetail encodeRuleDetail){
- Result<EncodeRuleDetail> result = new Result<>();
- try{
- encodeRuleDetailService.saveOrUpdate(encodeRuleDetail);
- result.success("鎿嶄綔鎴愬姛");
- }catch (Exception e){
- result.error500("鎿嶄綔澶辫触");
- }
- return result;
- }
-
- /**
- * 鍒犻櫎鏁版嵁 鍒犻櫎閫変腑鐨勭紪鐮佽鍒欒鎯呬俊鎭�
- * @author cj
- * @param ids
- * @return
- */
- @DeleteMapping(value = "/deleteEncodeRuleDetail")
- public Result<EncodeRuleDetail> deleteEncodeRuleDetail(@RequestParam String ids){
- Result<EncodeRuleDetail> result = new Result<>();
- if(oConvertUtils.isEmpty(ids)) {
- result.error500("鏈�変腑缂栫爜瑙勫垯璇︽儏锛�");
- }else {
- String[] ls = ids.split(",");
- for (String id : ls) {
- encodeRuleDetailService.removeById(id);
- }
- result.success("鍒犻櫎鎴愬姛锛�");
- }
- return result;
- }
-
- /**
- * 鐢熸垚缂栫爜
- * @author cj
- * @param permissionId
- * @return
- */
- @GetMapping(value = "/getCode")
- public Result<String> getCode(@RequestParam String permissionId){
- //鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛
- LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
- Result<String> result = new Result<>();
- String prifix = "";
- //鏌ヨ浼佷笟涓嬮拡瀵硅彍鍗曟槸鍚︽湁鍚敤鐨勭紪鐮佽鍒�
- List<EncodeRule> encodeRuleList = encodeRuleService.lambdaQuery()
- .eq(EncodeRule::getPermissionId,permissionId)
-// .eq(EncodeRule::getEnterpriseId,user.getEnterpriseId())
- .eq(EncodeRule::getStatus,"1")
- .eq(EncodeRule::getDelFlag, CommonConstant.DEL_FLAG_0).list();
- if(CollectionUtils.isNotEmpty(encodeRuleList)){
- //鏌ヨ鐧诲綍浜虹殑閮ㄩ棬鏄惁鍏宠仈浜嗙紪鐮佽鍒�
- List<EncodeRuleDepart> encodeRuleDepartList = encodeRuleDepartService.lambdaQuery()
- .eq(EncodeRuleDepart::getCodeRuleId,encodeRuleList.get(0).getId())
- .eq(EncodeRuleDepart::getDelFlag,CommonConstant.DEL_FLAG_0)
-// .eq(EncodeRuleDepart::getDepartId,user.getDepartId())
- .list();
- if(CollectionUtils.isNotEmpty(encodeRuleDepartList)){
- //鏌ヨ缂栫爜瑙勫垯鏄惁鏈夌紪鐮佽鍒欒鎯�
- List<EncodeRuleDetail> encodeRuleDetailList = encodeRuleDetailService.lambdaQuery()
- .eq(EncodeRuleDetail::getCodeRuleId,encodeRuleList.get(0).getId())
- .eq(EncodeRuleDetail::getDelFlag,CommonConstant.DEL_FLAG_0).orderByAsc(EncodeRuleDetail::getSequence).list();
- if(CollectionUtils.isNotEmpty(encodeRuleDetailList)){
- for(EncodeRuleDetail encodeRuleDetail : encodeRuleDetailList){
- if("2".equals(encodeRuleDetail.getCodeElement())){
- prifix += encodeRuleDetail.getElementValue();
- }else if("1".equals(encodeRuleDetail.getCodeElement())){
- if("1".equals(encodeRuleDetail.getTimeFormat())){
- prifix += DateUtils.date2Str(new Date(),DateUtils.yyyyMMdd.get());
- }else if("2".equals(encodeRuleDetail.getTimeFormat())){
- prifix += DateUtils.date2Str(new Date(),new SimpleDateFormat("yyyyMM"));
- }else if("3".equals(encodeRuleDetail.getTimeFormat())){
- prifix += DateUtils.date2Str(new Date(),DateUtils.yearFormat.get());
- }
- }else if("3".equals(encodeRuleDetail.getCodeElement())){
- prifix += sysIdentityService.getNumByTypeAndLength(permissionId,encodeRuleDetail.getLength());
- }
- }
- }else {
- result.error500("璇风淮鎶ょ紪鐮佽鍒欒鎯�");
- }
- }else {
- result.error500("鎮ㄧ殑璐﹀彿娌℃湁鍏宠仈缂栫爜瑙勫垯");
- }
- }else{
- result.error500("璇风淮鎶ょ紪鐮佽鍒�");
- }
- return Result.OK(prifix);
- }
-
-}
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/controller/EncodeRuleTableFieldRelateController.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/controller/EncodeRuleTableFieldRelateController.java
deleted file mode 100644
index cdee486..0000000
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/controller/EncodeRuleTableFieldRelateController.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.EncodeRuleTableFieldRelate;
-import org.jeecg.modules.base.service.IEncodeRuleTableFieldRelateService;
-
-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_sys_encode_rule_table_field_relate
- * @Author: jeecg-boot
- * @Date: 2023-05-06
- * @Version: V1.0
- */
-@Api(tags="mom_sys_encode_rule_table_field_relate")
-@RestController
-@RequestMapping("/base/encodeRuleTableFieldRelate")
-@Slf4j
-public class EncodeRuleTableFieldRelateController extends JeecgController<EncodeRuleTableFieldRelate, IEncodeRuleTableFieldRelateService> {
- @Autowired
- private IEncodeRuleTableFieldRelateService encodeRuleTableFieldRelateService;
-
- /**
- * 鍒嗛〉鍒楄〃鏌ヨ
- *
- * @param encodeRuleTableFieldRelate
- * @param pageNo
- * @param pageSize
- * @param req
- * @return
- */
- //@AutoLog(value = "mom_sys_encode_rule_table_field_relate-鍒嗛〉鍒楄〃鏌ヨ")
- @ApiOperation(value="mom_sys_encode_rule_table_field_relate-鍒嗛〉鍒楄〃鏌ヨ", notes="mom_sys_encode_rule_table_field_relate-鍒嗛〉鍒楄〃鏌ヨ")
- @GetMapping(value = "/list")
- public Result<IPage<EncodeRuleTableFieldRelate>> queryPageList(EncodeRuleTableFieldRelate encodeRuleTableFieldRelate,
- @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
- @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
- HttpServletRequest req) {
- QueryWrapper<EncodeRuleTableFieldRelate> queryWrapper = QueryGenerator.initQueryWrapper(encodeRuleTableFieldRelate, req.getParameterMap());
- Page<EncodeRuleTableFieldRelate> page = new Page<EncodeRuleTableFieldRelate>(pageNo, pageSize);
- IPage<EncodeRuleTableFieldRelate> pageList = encodeRuleTableFieldRelateService.page(page, queryWrapper);
- return Result.OK(pageList);
- }
-
- /**
- * 娣诲姞
- *
- * @param encodeRuleTableFieldRelate
- * @return
- */
- @AutoLog(value = "mom_sys_encode_rule_table_field_relate-娣诲姞")
- @ApiOperation(value="mom_sys_encode_rule_table_field_relate-娣诲姞", notes="mom_sys_encode_rule_table_field_relate-娣诲姞")
- //@RequiresPermissions("org.jeecg.modules:mom_sys_encode_rule_table_field_relate:add")
- @PostMapping(value = "/add")
- public Result<String> add(@RequestBody EncodeRuleTableFieldRelate encodeRuleTableFieldRelate) {
- encodeRuleTableFieldRelateService.save(encodeRuleTableFieldRelate);
- return Result.OK("娣诲姞鎴愬姛锛�");
- }
-
- /**
- * 缂栬緫
- *
- * @param encodeRuleTableFieldRelate
- * @return
- */
- @AutoLog(value = "mom_sys_encode_rule_table_field_relate-缂栬緫")
- @ApiOperation(value="mom_sys_encode_rule_table_field_relate-缂栬緫", notes="mom_sys_encode_rule_table_field_relate-缂栬緫")
- //@RequiresPermissions("org.jeecg.modules:mom_sys_encode_rule_table_field_relate:edit")
- @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
- public Result<String> edit(@RequestBody EncodeRuleTableFieldRelate encodeRuleTableFieldRelate) {
- encodeRuleTableFieldRelateService.updateById(encodeRuleTableFieldRelate);
- return Result.OK("缂栬緫鎴愬姛!");
- }
-
- /**
- * 閫氳繃id鍒犻櫎
- *
- * @param id
- * @return
- */
- @AutoLog(value = "mom_sys_encode_rule_table_field_relate-閫氳繃id鍒犻櫎")
- @ApiOperation(value="mom_sys_encode_rule_table_field_relate-閫氳繃id鍒犻櫎", notes="mom_sys_encode_rule_table_field_relate-閫氳繃id鍒犻櫎")
- //@RequiresPermissions("org.jeecg.modules:mom_sys_encode_rule_table_field_relate:delete")
- @DeleteMapping(value = "/delete")
- public Result<String> delete(@RequestParam(name="id",required=true) String id) {
- encodeRuleTableFieldRelateService.removeById(id);
- return Result.OK("鍒犻櫎鎴愬姛!");
- }
-
- /**
- * 鎵归噺鍒犻櫎
- *
- * @param ids
- * @return
- */
- @AutoLog(value = "mom_sys_encode_rule_table_field_relate-鎵归噺鍒犻櫎")
- @ApiOperation(value="mom_sys_encode_rule_table_field_relate-鎵归噺鍒犻櫎", notes="mom_sys_encode_rule_table_field_relate-鎵归噺鍒犻櫎")
- //@RequiresPermissions("org.jeecg.modules:mom_sys_encode_rule_table_field_relate:deleteBatch")
- @DeleteMapping(value = "/deleteBatch")
- public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
- this.encodeRuleTableFieldRelateService.removeByIds(Arrays.asList(ids.split(",")));
- return Result.OK("鎵归噺鍒犻櫎鎴愬姛!");
- }
-
- /**
- * 閫氳繃id鏌ヨ
- *
- * @param id
- * @return
- */
- //@AutoLog(value = "mom_sys_encode_rule_table_field_relate-閫氳繃id鏌ヨ")
- @ApiOperation(value="mom_sys_encode_rule_table_field_relate-閫氳繃id鏌ヨ", notes="mom_sys_encode_rule_table_field_relate-閫氳繃id鏌ヨ")
- @GetMapping(value = "/queryById")
- public Result<EncodeRuleTableFieldRelate> queryById(@RequestParam(name="id",required=true) String id) {
- EncodeRuleTableFieldRelate encodeRuleTableFieldRelate = encodeRuleTableFieldRelateService.getById(id);
- if(encodeRuleTableFieldRelate==null) {
- return Result.error("鏈壘鍒板搴旀暟鎹�");
- }
- return Result.OK(encodeRuleTableFieldRelate);
- }
-
- /**
- * 瀵煎嚭excel
- *
- * @param request
- * @param encodeRuleTableFieldRelate
- */
- //@RequiresPermissions("org.jeecg.modules:mom_sys_encode_rule_table_field_relate:exportXls")
- @RequestMapping(value = "/exportXls")
- public ModelAndView exportXls(HttpServletRequest request, EncodeRuleTableFieldRelate encodeRuleTableFieldRelate) {
- return super.exportXls(request, encodeRuleTableFieldRelate, EncodeRuleTableFieldRelate.class, "mom_sys_encode_rule_table_field_relate");
- }
-
- /**
- * 閫氳繃excel瀵煎叆鏁版嵁
- *
- * @param request
- * @param response
- * @return
- */
- //@RequiresPermissions("mom_sys_encode_rule_table_field_relate:importExcel")
- @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
- public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
- return super.importExcel(request, response, EncodeRuleTableFieldRelate.class);
- }
-
-}
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/controller/EnterpriseAdministratorController.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/controller/EnterpriseAdministratorController.java
deleted file mode 100644
index b65c0c5..0000000
--- a/lxzn-module-system/lxzn-system-biz/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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/controller/EnterpriseController.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/controller/EnterpriseController.java
deleted file mode 100644
index d1b5f98..0000000
--- a/lxzn-module-system/lxzn-system-biz/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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/controller/FactoryElementCategoryController.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/controller/FactoryElementCategoryController.java
deleted file mode 100644
index d37d7e5..0000000
--- a/lxzn-module-system/lxzn-system-biz/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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/controller/FactoryModelController.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/controller/FactoryModelController.java
deleted file mode 100644
index 81ba9cc..0000000
--- a/lxzn-module-system/lxzn-system-biz/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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/controller/MaterialCategoryController.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/controller/MaterialCategoryController.java
deleted file mode 100644
index df042ef..0000000
--- a/lxzn-module-system/lxzn-system-biz/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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/controller/MaterialController.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/controller/MaterialController.java
deleted file mode 100644
index 40bd652..0000000
--- a/lxzn-module-system/lxzn-system-biz/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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/controller/ProductionLineWarehouseController.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/controller/ProductionLineWarehouseController.java
deleted file mode 100644
index c761443..0000000
--- a/lxzn-module-system/lxzn-system-biz/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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/controller/SupplierCategoryController.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/controller/SupplierCategoryController.java
deleted file mode 100644
index 6cc96f0..0000000
--- a/lxzn-module-system/lxzn-system-biz/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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/controller/SupplierContactController.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/controller/SupplierContactController.java
deleted file mode 100644
index ae467f8..0000000
--- a/lxzn-module-system/lxzn-system-biz/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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/controller/SupplierController.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/controller/SupplierController.java
deleted file mode 100644
index 6ed75b9..0000000
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/controller/SupplierController.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.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/supplier")
-@Slf4j
-public class SupplierController extends JeecgController<Supplier, ISupplierService> {
- @Autowired
- private ISupplierService inspectionProjectService;
- @Autowired
- private ISupplierCategoryService inspectionProjectCategoryService;
-
-
- /**
- * 鍒嗛〉鍒楄〃鏌ヨ
- *
- * @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
- */
- @RequestMapping(value = "/exportXls")
- public ModelAndView exportXls(HttpServletRequest request, Supplier inspectionProject) {
- return super.exportXls(request, inspectionProject, Supplier.class, "mom_base_supplier");
- }
-
- /**
- * 閫氳繃excel瀵煎叆鏁版嵁
- *
- * @param request
- * @param response
- * @return
- */
- @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
- public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
- return super.importExcel(request, response, Supplier.class);
- }
-
-}
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/controller/UnitCategoryController.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/controller/UnitCategoryController.java
deleted file mode 100644
index 6f68ecf..0000000
--- a/lxzn-module-system/lxzn-system-biz/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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/controller/UnitController.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/controller/UnitController.java
deleted file mode 100644
index 3c13036..0000000
--- a/lxzn-module-system/lxzn-system-biz/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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/controller/UnitConversionController.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/controller/UnitConversionController.java
deleted file mode 100644
index ac2c6ea..0000000
--- a/lxzn-module-system/lxzn-system-biz/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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/controller/WarehouseAreaController.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/controller/WarehouseAreaController.java
deleted file mode 100644
index b197fcd..0000000
--- a/lxzn-module-system/lxzn-system-biz/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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/controller/WarehouseController.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/controller/WarehouseController.java
deleted file mode 100644
index f20c382..0000000
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/controller/WarehouseController.java
+++ /dev/null
@@ -1,772 +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.*;
-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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/controller/WarehouseLocationController.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/controller/WarehouseLocationController.java
deleted file mode 100644
index 234bf04..0000000
--- a/lxzn-module-system/lxzn-system-biz/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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/controller/WorkCenterController.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/controller/WorkCenterController.java
deleted file mode 100644
index 3b577b0..0000000
--- a/lxzn-module-system/lxzn-system-biz/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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/controller/WorkCenterEquipmentController.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/controller/WorkCenterEquipmentController.java
deleted file mode 100644
index a8646f7..0000000
--- a/lxzn-module-system/lxzn-system-biz/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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/controller/WorkCenterUserController.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/controller/WorkCenterUserController.java
deleted file mode 100644
index 749a57e..0000000
--- a/lxzn-module-system/lxzn-system-biz/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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/entity/Client.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/entity/Client.java
deleted file mode 100644
index 3a969e4..0000000
--- a/lxzn-module-system/lxzn-system-biz/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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/entity/ClientCategory.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/entity/ClientCategory.java
deleted file mode 100644
index 59344d9..0000000
--- a/lxzn-module-system/lxzn-system-biz/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 java.lang.String parentId;
- /**缂栫爜*/
- @Excel(name = "缂栫爜", width = 15)
- @ApiModelProperty(value = "缂栫爜")
- private java.lang.String num;
- /**鍚嶇О*/
- @Excel(name = "鍚嶇О", width = 15)
- @ApiModelProperty(value = "鍚嶇О")
- private java.lang.String name;
- /**绉熸埛id*/
- @Excel(name = "绉熸埛id", width = 15)
- @ApiModelProperty(value = "绉熸埛id")
- private java.lang.String tenantId;
- /**鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)*/
- @Excel(name = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)", width = 15)
- @ApiModelProperty(value = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)")
- private java.lang.Integer delFlag = CommonConstant.DEL_FLAG_0;
- /**澶囨敞*/
- @Excel(name = "澶囨敞", width = 15)
- @ApiModelProperty(value = "澶囨敞")
- private java.lang.String remark;
- /**澶囩敤瀛楁1*/
- @Excel(name = "澶囩敤瀛楁1", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁1")
- private java.lang.String clientCategoryUda1;
- /**澶囩敤瀛楁2*/
- @Excel(name = "澶囩敤瀛楁2", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁2")
- private java.lang.String clientCategoryUda2;
- /**澶囩敤瀛楁3*/
- @Excel(name = "澶囩敤瀛楁3", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁3")
- private java.lang.String clientCategoryUda3;
- /**澶囩敤瀛楁4*/
- @Excel(name = "澶囩敤瀛楁4", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁4")
- private java.lang.String clientCategoryUda4;
- /**澶囩敤瀛楁5*/
- @Excel(name = "澶囩敤瀛楁5", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁5")
- private java.lang.String clientCategoryUda5;
- /**鐘舵�� 0 绂佺敤 1 鍚敤*/
- @Excel(name = "鐘舵�� 0 绂佺敤 1 鍚敤", width = 15)
- @ApiModelProperty(value = "鐘舵�� 0 绂佺敤 1 鍚敤")
- private java.lang.String status = CommonConstant.STATUS_1;
-}
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/entity/ClientContact.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/entity/ClientContact.java
deleted file mode 100644
index 08281dd..0000000
--- a/lxzn-module-system/lxzn-system-biz/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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/entity/Constructor.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/entity/Constructor.java
deleted file mode 100644
index 6143765..0000000
--- a/lxzn-module-system/lxzn-system-biz/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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/entity/DepartmentCategory.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/entity/DepartmentCategory.java
deleted file mode 100644
index ca9e7ec..0000000
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/entity/DepartmentCategory.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_department_category")
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value="mom_base_department_category瀵硅薄", description="鍩虹鏁版嵁-缁勭粐鏋舵瀯-閮ㄩ棬绫诲瀷")
-public class DepartmentCategory implements Serializable {
- private static final long serialVersionUID = 1L;
-
- /**涓婚敭*/
- @TableId(type = IdType.ASSIGN_ID)
- @ApiModelProperty(value = "涓婚敭")
- private java.lang.String id;
- /**绫诲瀷缂栫爜*/
- @Excel(name = "绫诲瀷缂栫爜", width = 15)
- @ApiModelProperty(value = "绫诲瀷缂栫爜")
- private java.lang.String code;
- /**绫诲瀷鍚嶇О*/
- @Excel(name = "绫诲瀷鍚嶇О", width = 15)
- @ApiModelProperty(value = "绫诲瀷鍚嶇О")
- private java.lang.String name;
- /**澶囩敤瀛楁1*/
- @ApiModelProperty(value = "澶囩敤瀛楁1")
- private java.lang.String departCategoryUda1;
- /**澶囩敤瀛楁2*/
- @ApiModelProperty(value = "澶囩敤瀛楁2")
- private java.lang.String departCategoryUda2;
- /**澶囩敤瀛楁3*/
- @ApiModelProperty(value = "澶囩敤瀛楁3")
- private java.lang.String departCategoryUda3;
- /**澶囩敤瀛楁5*/
- @ApiModelProperty(value = "澶囩敤瀛楁5")
- private java.lang.String departCategoryUda5;
- /**澶囩敤瀛楁4*/
- @ApiModelProperty(value = "澶囩敤瀛楁4")
- private java.lang.String departCategoryUda4;
- /**鍒涘缓浜�*/
- @Excel(name = "鍒涘缓浜�", width = 15)
- @ApiModelProperty(value = "鍒涘缓浜�")
- private java.lang.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 java.util.Date createTime;
- /**鏇存柊浜�*/
- @Excel(name = "鏇存柊浜�", width = 15)
- @ApiModelProperty(value = "鏇存柊浜�")
- private java.lang.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 java.util.Date updateTime;
- /**鐘舵�侊紝0锛氭甯革紝1锛氬垹闄�*/
- @ApiModelProperty(value = "鐘舵�侊紝0锛氭甯革紝1锛氬垹闄�")
- private java.lang.String delFlag;
- /**澶囨敞*/
- @Excel(name = "澶囨敞", width = 15)
- @ApiModelProperty(value = "澶囨敞")
- private java.lang.String remark;
-}
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/entity/EncodeRule.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/entity/EncodeRule.java
deleted file mode 100644
index 1d3c747..0000000
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/entity/EncodeRule.java
+++ /dev/null
@@ -1,124 +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;
-
-/**
- * <p>
- * 缂栫爜瑙勫垯琛�
- * </p>
- *
- * @Author cuijian
- * @since 2022-11-03
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@TableName("mom_base_encode_rule")
-@Accessors(chain = true)
-public class EncodeRule implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * id
- */
- @TableId(type = IdType.ASSIGN_ID)
- private String id;
-
- /**
- * 瑙勫垯缂栫爜
- */
- private String ruleCode;
-
- /**
- * 瑙勫垯鍚嶇О
- */
- private String ruleName;
-
- /**
- * 鑿滃崟id
- */
- private String permissionId;
-
- /**
- * 褰掗浂渚濇嵁
- */
- private String zeroBasis;
-
- /**
- * 缂栫爜闀垮害
- */
- private Integer codeLength;
-
- /**
- * 鐘舵�� 0锛氱鐢� 1锛氬惎鐢�
- */
- private String status;
-
- /**
- * 缂栫爜绀轰緥
- */
- private String codeExample;
-
-
- /**
- * 鍒涘缓浜�
- */
- 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;
-
- /**
- * 鍏徃id
- */
- private String enterpriseId;
-
- /**
- * 鏄惁鏂爜琛ョ爜
- */
- private String isBrokenCode;
-
- /**
- * 琛ㄥ悕
- */
- private String tableName;
-
- /**
- * 瀛楁鍚�
- */
- private String fieldName;
-
-}
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/entity/EncodeRuleDepart.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/entity/EncodeRuleDepart.java
deleted file mode 100644
index 3dbee85..0000000
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/entity/EncodeRuleDepart.java
+++ /dev/null
@@ -1,82 +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;
-
-/**
- * <p>
- * 缂栫爜瑙勫垯鍜岄儴闂ㄧ鐞嗚〃
- * </p>
- *
- * @Author cuijian
- * @since 2022-11-04
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@TableName("mom_base_encode_rule_depart")
-@Accessors(chain = true)
-public class EncodeRuleDepart implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * id
- */
- @TableId(type = IdType.ASSIGN_ID)
- private String id;
-
- /**
- * 瑙勫垯缂栫爜id
- */
- private String codeRuleId;
-
- /**
- * 閮ㄩ棬id
- */
- private String departId;
-
- /**
- * 鍒涘缓浜�
- */
- 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;
-
- //閮ㄩ棬缂栫爜
- @TableField(exist = false)
- private String orgCode;
-
- //閮ㄩ棬鍚嶇О
- @TableField(exist = false)
- private String departName;
-}
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/entity/EncodeRuleDetail.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/entity/EncodeRuleDetail.java
deleted file mode 100644
index 8a9a8e7..0000000
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/entity/EncodeRuleDetail.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.springframework.format.annotation.DateTimeFormat;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 缂栫爜瑙勫垯璇︽儏琛�
- * </p>
- *
- * @Author cuijian
- * @since 2022-11-03
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@TableName("mom_base_encode_rule_detail")
-@Accessors(chain = true)
-public class EncodeRuleDetail implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * id
- */
- @TableId(type = IdType.ASSIGN_ID)
- private String id;
-
- /**
- * 缂栫爜瑙勫垯id
- */
- private String codeRuleId;
-
- /**
- * 缂栫爜瑕佺礌
- */
- private String codeElement;
-
- /**
- * 闀垮害
- */
- private Integer length;
-
- /**
- * 瑕佺礌鍊�
- */
- private String elementValue;
-
- /**
- * 椤哄簭
- */
- private Integer sequence;
-
-
- /**
- * 鍒涘缓浜�
- */
- 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;
-
- /**
- * 鏃堕棿鏍煎紡
- */
- private String timeFormat;
-
- /**
- * 缂栫爜瑕佺礌鍚嶇О
- */
- @TableField(exist = false)
- private String codeElementName;
-
-}
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/entity/EncodeRuleTableFieldRelate.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/entity/EncodeRuleTableFieldRelate.java
deleted file mode 100644
index c118b60..0000000
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/entity/EncodeRuleTableFieldRelate.java
+++ /dev/null
@@ -1,58 +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_sys_encode_rule_table_field_relate
- * @Author: jeecg-boot
- * @Date: 2023-05-06
- * @Version: V1.0
- */
-@Data
-@TableName("mom_sys_encode_rule_table_field_relate")
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value="缂栫爜瑙勫垯鍜屾暟鎹瓧娈靛叧鑱旇〃", description="缂栫爜瑙勫垯鍜屾暟鎹瓧娈靛叧鑱旇〃")
-public class EncodeRuleTableFieldRelate implements Serializable {
- private static final long serialVersionUID = 1L;
-
- /**涓婚敭*/
- @TableId(type = IdType.ASSIGN_ID)
- @ApiModelProperty(value = "涓婚敭")
- private String id;
- /**缂栫爜瑙勫垯琛╥d*/
- @Excel(name = "缂栫爜瑙勫垯琛╥d", width = 15)
- @ApiModelProperty(value = "缂栫爜瑙勫垯琛╥d")
- private String encodeRuleId;
- /**瀛楁鍚�*/
- @Excel(name = "瀛楁鍚�", width = 15)
- @ApiModelProperty(value = "瀛楁鍚�")
- private String fieldName;
- /**鏁版嵁搴撹〃鍚�*/
- @Excel(name = "鏁版嵁搴撹〃鍚�", width = 15)
- @ApiModelProperty(value = "鏁版嵁搴撹〃鍚�")
- private String tableName;
- /**鏁版嵁搴撹〃ID*/
- @Excel(name = "鏁版嵁搴撹〃ID", width = 15)
- @ApiModelProperty(value = "鏁版嵁搴撹〃ID")
- private String tableId;
- /**瀛楁ID*/
- @Excel(name = "瀛楁ID", width = 15)
- @ApiModelProperty(value = "瀛楁ID")
- private String fieldId;
-}
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/entity/Enterprise.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/entity/Enterprise.java
deleted file mode 100644
index 9145761..0000000
--- a/lxzn-module-system/lxzn-system-biz/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 java.lang.String id;
- /**鍏徃缂栫爜*/
- @Excel(name = "鍏徃缂栫爜", width = 15)
- @ApiModelProperty(value = "鍏徃缂栫爜")
- private java.lang.String code;
- /**鍏徃鍚嶇О锛堢畝绉帮級*/
- @Excel(name = "鍏徃鍚嶇О锛堢畝绉帮級", width = 15)
- @ApiModelProperty(value = "鍏徃鍚嶇О锛堢畝绉帮級")
- private java.lang.String name;
- /**涓婄骇ID*/
- @Excel(name = "涓婄骇ID", width = 15)
- @ApiModelProperty(value = "涓婄骇ID")
- private java.lang.String parentId;
- /**缁熶竴绀句細淇＄敤浠ｇ爜*/
- @Excel(name = "缁熶竴绀句細淇＄敤浠ｇ爜", width = 15)
- @ApiModelProperty(value = "缁熶竴绀句細淇＄敤浠ｇ爜")
- private java.lang.String creditCode;
- /**鍏ㄧО*/
- @Excel(name = "鍏ㄧО", width = 15)
- @ApiModelProperty(value = "鍏ㄧО")
- private java.lang.String fullName;
- /**鑻辨枃鍚�*/
- @Excel(name = "鑻辨枃鍚�", width = 15)
- @ApiModelProperty(value = "鑻辨枃鍚�")
- private java.lang.String englishName;
- /**鍦板潃*/
- @Excel(name = "鍦板潃", width = 15)
- @ApiModelProperty(value = "鍦板潃")
- private java.lang.String address;
- /**寮�鎴疯*/
- @Excel(name = "寮�鎴疯", width = 15)
- @ApiModelProperty(value = "寮�鎴疯")
- private java.lang.String openingBank;
- /**閾惰璐︽埛*/
- @Excel(name = "閾惰璐︽埛", width = 15)
- @ApiModelProperty(value = "閾惰璐︽埛")
- private java.lang.String account;
- /**鑱旂郴浜�*/
- @Excel(name = "鑱旂郴浜�", width = 15)
- @ApiModelProperty(value = "鑱旂郴浜�")
- private java.lang.String contact;
- /**鎵嬫満*/
- @Excel(name = "鎵嬫満", width = 15)
- @ApiModelProperty(value = "鎵嬫満")
- private java.lang.String phoneNumber;
- /**鐢佃瘽*/
- @Excel(name = "鐢佃瘽", width = 15)
- @ApiModelProperty(value = "鐢佃瘽")
- private java.lang.String companyTelephone;
- /**閭*/
- @Excel(name = "閭", width = 15)
- @ApiModelProperty(value = "閭")
- private java.lang.String email;
- /**澶囨敞*/
- @Excel(name = "澶囨敞", width = 15)
- @ApiModelProperty(value = "澶囨敞")
- private java.lang.String remark;
- /**鐗堟湰*/
- @Excel(name = "鐗堟湰", width = 15)
- @ApiModelProperty(value = "鐗堟湰")
- private Integer version;
- /**鐘舵��(1- 姝ｅ父 ,0- 鍐荤粨)*/
- @Excel(name = "鐘舵��(1- 姝ｅ父 ,0- 鍐荤粨)", width = 15)
- @ApiModelProperty(value = "鐘舵��(1- 姝ｅ父 ,0- 鍐荤粨)")
- private java.lang.String status;
- /**浼佷笟澶囩敤瀛楁1*/
- @Excel(name = "浼佷笟澶囩敤瀛楁1", width = 15)
- @ApiModelProperty(value = "浼佷笟澶囩敤瀛楁1")
- private java.lang.String enterpriseUda1;
- /**浼佷笟澶囩敤瀛楁2*/
- @Excel(name = "浼佷笟澶囩敤瀛楁2", width = 15)
- @ApiModelProperty(value = "浼佷笟澶囩敤瀛楁2")
- private java.lang.String enterpriseUda2;
- /**浼佷笟澶囩敤瀛楁3*/
- @Excel(name = "浼佷笟澶囩敤瀛楁3", width = 15)
- @ApiModelProperty(value = "浼佷笟澶囩敤瀛楁3")
- private java.lang.String enterpriseUda3;
- /**浼佷笟澶囩敤瀛楁4*/
- @Excel(name = "浼佷笟澶囩敤瀛楁4", width = 15)
- @ApiModelProperty(value = "浼佷笟澶囩敤瀛楁4")
- private java.lang.String enterpriseUda4;
- /**浼佷笟澶囩敤瀛楁5*/
- @Excel(name = "浼佷笟澶囩敤瀛楁5", width = 15)
- @ApiModelProperty(value = "浼佷笟澶囩敤瀛楁5")
- private java.lang.String enterpriseUda5;
- /**鍒涘缓浜�*/
- @ApiModelProperty(value = "鍒涘缓浜�")
- private java.lang.String createBy;
- /**鍒涘缓鏃堕棿*/
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
- @DateTimeFormat(pattern="yyyy-MM-dd")
- @ApiModelProperty(value = "鍒涘缓鏃堕棿")
- private java.util.Date createTime;
- /**鏇存柊浜�*/
- @ApiModelProperty(value = "鏇存柊浜�")
- private java.lang.String updateBy;
- /**鏇存柊鏃堕棿*/
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
- @DateTimeFormat(pattern="yyyy-MM-dd")
- @ApiModelProperty(value = "鏇存柊鏃堕棿")
- private java.util.Date updateTime;
- /**绉熸埛ID*/
- @Excel(name = "绉熸埛ID", width = 15)
- @ApiModelProperty(value = "绉熸埛ID")
- private java.lang.String tenantId;
- /**鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)*/
- @Excel(name = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)", width = 15)
- @ApiModelProperty(value = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)")
- private java.lang.Integer delFlag;
- @ApiModelProperty(value = "鐗堟湰鏁版嵁Id")
- private java.lang.String dataVersionId;
-}
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/entity/EnterpriseAdministrator.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/entity/EnterpriseAdministrator.java
deleted file mode 100644
index a528e84..0000000
--- a/lxzn-module-system/lxzn-system-biz/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 java.lang.String id;
- /**浼佷笟ID*/
- @Excel(name = "浼佷笟ID", width = 15)
- @ApiModelProperty(value = "浼佷笟ID")
- private java.lang.String enterpriseId;
- /**绯荤粺绠＄悊鍛業D*/
- @ApiModelProperty(value = "绯荤粺绠＄悊鍛業D")
- private java.lang.String administratorId;
- /**鎺堟潈浜�*/
- @ApiModelProperty(value = "鎺堟潈鏃堕棿")
- private java.lang.String authName;
- /**澶囩敤瀛楁1*/
- @Excel(name = "澶囩敤瀛楁1", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁1")
- private java.lang.String sysAdministratorUda1;
- /**澶囩敤瀛楁2*/
- @Excel(name = "澶囩敤瀛楁2", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁2")
- private java.lang.String sysAdministratorUda2;
- /**澶囩敤瀛楁3*/
- @Excel(name = "澶囩敤瀛楁3", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁3")
- private java.lang.String sysAdministratorUda3;
- /**澶囩敤瀛楁4*/
- @Excel(name = "澶囩敤瀛楁4", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁4")
- private java.lang.String sysAdministratorUda4;
- /**澶囩敤瀛楁5*/
- @Excel(name = "澶囩敤瀛楁5", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁5")
- private java.lang.String sysAdministratorUda5;
- /**鍒涘缓浜�*/
- @ApiModelProperty(value = "鍒涘缓浜�")
- private java.lang.String createBy;
- /**鍒涘缓鏃堕棿*/
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
- @DateTimeFormat(pattern="yyyy-MM-dd")
- @ApiModelProperty(value = "鍒涘缓鏃堕棿")
- private java.util.Date createTime;
- /**鏇存柊浜�*/
- @ApiModelProperty(value = "鏇存柊浜�")
- private java.lang.String updateBy;
- /**鏇存柊鏃堕棿*/
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
- @DateTimeFormat(pattern="yyyy-MM-dd")
- @ApiModelProperty(value = "鏇存柊鏃堕棿")
- private java.util.Date updateTime;
- /**鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)*/
- @Excel(name = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)", width = 15)
- @ApiModelProperty(value = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)")
- private java.lang.Integer delFlag;
-}
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/entity/FactoryElementCategory.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/entity/FactoryElementCategory.java
deleted file mode 100644
index 8c978d4..0000000
--- a/lxzn-module-system/lxzn-system-biz/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 java.lang.String id;
- /**绫诲瀷缂栫爜*/
- @Excel(name = "绫诲瀷缂栫爜", width = 15)
- @ApiModelProperty(value = "绫诲瀷缂栫爜")
- private java.lang.String code;
- /**绫诲瀷鍚嶇О*/
- @Excel(name = "绫诲瀷鍚嶇О", width = 15)
- @ApiModelProperty(value = "绫诲瀷鍚嶇О")
- private java.lang.String name;
- /**澶囩敤瀛楁1*/
- @ApiModelProperty(value = "澶囩敤瀛楁1")
- private java.lang.String factoryElementCategoryUda1;
- /**澶囩敤瀛楁2*/
- @ApiModelProperty(value = "澶囩敤瀛楁2")
- private java.lang.String factoryElementCategoryUda2;
- /**澶囩敤瀛楁3*/
- @ApiModelProperty(value = "澶囩敤瀛楁3")
- private java.lang.String factoryElementCategoryUda3;
- /**澶囩敤瀛楁4*/
- @ApiModelProperty(value = "澶囩敤瀛楁4")
- private java.lang.String factoryElementCategoryUda4;
- /**澶囩敤瀛楁5*/
- @ApiModelProperty(value = "澶囩敤瀛楁5")
- private java.lang.String factoryElementCategoryUda5;
- /**鍒涘缓浜�*/
- @ApiModelProperty(value = "鍒涘缓浜�")
- @Excel(name = "鍒涘缓浜�", width = 15)
- private java.lang.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 java.util.Date createTime;
- /**鏇存柊浜�*/
- @Excel(name = "鏇存柊浜�", width = 15)
- @ApiModelProperty(value = "鏇存柊浜�")
- private java.lang.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 java.util.Date updateTime;
- /**澶囨敞*/
- @Excel(name = "澶囨敞", width = 15)
- @ApiModelProperty(value = "澶囨敞")
- private java.lang.String remark;
- /**鐘舵�侊紝0锛氭甯革紝1锛氬垹闄�*/
- @ApiModelProperty(value = "鐘舵�侊紝0锛氭甯革紝1锛氬垹闄�")
- private java.lang.String delFlag;
-}
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/entity/FactoryModel.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/entity/FactoryModel.java
deleted file mode 100644
index be238c6..0000000
--- a/lxzn-module-system/lxzn-system-biz/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 java.lang.String id;
- /**浼佷笟ID*/
- @Excel(name = "浼佷笟ID", width = 15)
- @ApiModelProperty(value = "浼佷笟ID")
- private java.lang.String enterpriseId;
- /**宸ュ巶瑕佺礌缂栫爜*/
- @Excel(name = "宸ュ巶瑕佺礌缂栫爜", width = 15)
- @ApiModelProperty(value = "宸ュ巶瑕佺礌缂栫爜")
- private java.lang.String code;
- /**宸ュ巶瑕佺礌鍚嶇О*/
- @Excel(name = "宸ュ巶瑕佺礌鍚嶇О", width = 15)
- @ApiModelProperty(value = "宸ュ巶瑕佺礌鍚嶇О")
- private java.lang.String name;
- /**璐ｄ换缁勭粐ID*/
- @Excel(name = "璐ｄ换缁勭粐ID", width = 15)
- @ApiModelProperty(value = "璐ｄ换缁勭粐ID")
- private java.lang.String departId;
- /**涓婄骇瑕佺礌ID*/
- @Excel(name = "涓婄骇瑕佺礌ID", width = 15)
- @ApiModelProperty(value = "涓婄骇瑕佺礌ID")
- private java.lang.String parentId;
- /**宸ュ巶瑕佺礌绫诲瀷ID*/
- @Excel(name = "宸ュ巶瑕佺礌绫诲瀷ID", width = 15)
- @ApiModelProperty(value = "宸ュ巶瑕佺礌绫诲瀷ID")
- private java.lang.String factoryElementCategoryId;
- /**鏄惁铏氭嫙锛�1鏄� 0鍚︼級*/
- @Excel(name = "鏄惁铏氭嫙锛�1鏄� 0鍚︼級", width = 15)
- @ApiModelProperty(value = "鏄惁铏氭嫙锛�1鏄� 0鍚︼級")
- private java.lang.Integer virtualFlag;
- /**鐗堟湰*/
- @Excel(name = "鐗堟湰", width = 15)
- @ApiModelProperty(value = "鐗堟湰")
- private Integer version;
- /**鐗堟湰鏁版嵁ID*/
- @ApiModelProperty(value = "鐗堟湰鏁版嵁ID")
- private java.lang.String dataVersionId;
- /**澶囨敞*/
- @Excel(name = "澶囨敞", width = 15)
- @ApiModelProperty(value = "澶囨敞")
- private java.lang.String remark;
- /**鐘舵�� 0 绂佺敤 1 鍚敤*/
- @Excel(name = "鐘舵�� 0 绂佺敤 1 鍚敤", width = 15)
- @ApiModelProperty(value = "鐘舵�� 0 绂佺敤 1 鍚敤")
- private java.lang.String status;
- /**澶囩敤瀛楁1*/
- @Excel(name = "澶囩敤瀛楁1", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁1")
- private java.lang.String factoryModelUda1;
- /**澶囩敤瀛楁2*/
- @Excel(name = "澶囩敤瀛楁2", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁2")
- private java.lang.String factoryModelUda2;
- /**澶囩敤瀛楁3*/
- @Excel(name = "澶囩敤瀛楁3", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁3")
- private java.lang.String factoryModelUda3;
- /**澶囩敤瀛楁4*/
- @Excel(name = "澶囩敤瀛楁4", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁4")
- private java.lang.String factoryModelUda4;
- /**澶囩敤瀛楁5*/
- @Excel(name = "澶囩敤瀛楁5", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁5")
- private java.lang.String factoryModelUda5;
- /**鍒涘缓浜�*/
- @ApiModelProperty(value = "鍒涘缓浜�")
- private java.lang.String createBy;
- /**鍒涘缓鏃堕棿*/
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
- @DateTimeFormat(pattern="yyyy-MM-dd")
- @ApiModelProperty(value = "鍒涘缓鏃堕棿")
- private java.util.Date createTime;
- /**鏇存柊浜�*/
- @ApiModelProperty(value = "鏇存柊浜�")
- private java.lang.String updateBy;
- /**鏇存柊鏃堕棿*/
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
- @DateTimeFormat(pattern="yyyy-MM-dd")
- @ApiModelProperty(value = "鏇存柊鏃堕棿")
- private java.util.Date updateTime;
- /**绉熸埛ID*/
- @Excel(name = "绉熸埛ID", width = 15)
- @ApiModelProperty(value = "绉熸埛ID")
- private java.lang.String tenantId;
- /**鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)*/
- @Excel(name = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)", width = 15)
- @ApiModelProperty(value = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)")
- private java.lang.Integer delFlag;
-}
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/entity/FactoryModelDetail.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/entity/FactoryModelDetail.java
deleted file mode 100644
index 9658e58..0000000
--- a/lxzn-module-system/lxzn-system-biz/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 java.lang.String id;
- private java.lang.String enterpriseId;
- private java.lang.String code;
- private java.lang.String name;
- private java.lang.String departId;
- private java.lang.String parentId;
- private java.lang.String factoryElementCategoryName;
- private java.lang.String factoryElementCategoryId;
- private java.lang.Integer virtualFlag;
- private java.lang.String version;
- private java.lang.String remark;
- private java.lang.String status;
- private java.lang.String auditStatus;
- private java.lang.String createBy;
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
- @DateTimeFormat(pattern="yyyy-MM-dd")
- private java.util.Date createTime;
- private java.lang.String updateBy;
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
- @DateTimeFormat(pattern="yyyy-MM-dd")
- private java.util.Date updateTime;
- private java.lang.String tenantId;
- private java.lang.Integer delFlag;
- private java.lang.String hasChild;
- private String departName;
- private String parentName;
-}
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/entity/Material.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/entity/Material.java
deleted file mode 100644
index 7d85801..0000000
--- a/lxzn-module-system/lxzn-system-biz/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 java.lang.String num;
- /**鐗╂枡鍚嶇О*/
- @Excel(name = "鐗╂枡鍚嶇О", width = 15)
- @ApiModelProperty(value = "鐗╂枡鍚嶇О")
- private java.lang.String name;
- /**鐗╂枡瑙勬牸*/
- @Excel(name = "鐗╂枡瑙勬牸", width = 15)
- @ApiModelProperty(value = "鐗╂枡瑙勬牸")
- private java.lang.String specification;
- /**鐗╂枡鍨嬪彿*/
- @Excel(name = "鐗╂枡鍨嬪彿", width = 15)
- @ApiModelProperty(value = "鐗╂枡鍨嬪彿")
- private java.lang.String model;
- /**璁￠噺鍗曚綅ID*/
- @Excel(name = "璁￠噺鍗曚綅ID", width = 15)
- @ApiModelProperty(value = "璁￠噺鍗曚綅ID")
- @Dict(dictTable = "mom_base_unit",dicText = "name",dicCode = "id")
- private java.lang.String unitId;
- /**鐗╂枡绫诲埆ID*/
- @Excel(name = "鐗╂枡绫诲埆ID", width = 15)
- @ApiModelProperty(value = "鐗╂枡绫诲埆ID")
- private java.lang.String materialCategoryId;
- /**鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)*/
- @Excel(name = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)", width = 15)
- @ApiModelProperty(value = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)")
- private java.lang.Integer delFlag = CommonConstant.DEL_FLAG_0;;
-}
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/entity/MaterialCategory.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/entity/MaterialCategory.java
deleted file mode 100644
index 918d647..0000000
--- a/lxzn-module-system/lxzn-system-biz/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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/entity/ProductionLineWarehouse.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/entity/ProductionLineWarehouse.java
deleted file mode 100644
index 0d156b0..0000000
--- a/lxzn-module-system/lxzn-system-biz/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 java.lang.String id;
- /**绾胯竟搴撶紪鐮�*/
- @Excel(name = "绾胯竟搴撶紪鐮�", width = 15)
- @ApiModelProperty(value = "绾胯竟搴撶紪鐮�")
- private java.lang.String code;
- /**绾胯竟搴撳悕绉�*/
- @Excel(name = "绾胯竟搴撳悕绉�", width = 15)
- @ApiModelProperty(value = "绾胯竟搴撳悕绉�")
- private java.lang.String name;
- /**鏄惁铏氭嫙锛�0锛氭槸锛�1锛氬惁*/
- @Excel(name = "鏄惁铏氭嫙锛�0锛氭槸锛�1锛氬惁", width = 15)
- @ApiModelProperty(value = "鏄惁铏氭嫙锛�0锛氭槸锛�1锛氬惁")
- private java.lang.String status;
- /**鐗堟湰鍙�*/
- @Excel(name = "鐗堟湰鍙�", width = 15)
- @ApiModelProperty(value = "鐗堟湰鍙�")
- private java.lang.Integer version;
- /**鐗堟湰鏁版嵁ID*/
- @Excel(name = "鐗堟湰鏁版嵁ID", width = 15)
- @ApiModelProperty(value = "鐗堟湰鏁版嵁ID")
- private java.lang.String dataVersionId;
- /**澶囩敤瀛楁1*/
- @Excel(name = "澶囩敤瀛楁1", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁1")
- private java.lang.String warehouseUda1;
- /**澶囩敤瀛楁2*/
- @Excel(name = "澶囩敤瀛楁2", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁2")
- private java.lang.String warehouseUda2;
- /**澶囩敤瀛楁3*/
- @Excel(name = "澶囩敤瀛楁3", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁3")
- private java.lang.String warehouseUda3;
- /**澶囩敤瀛楁4*/
- @Excel(name = "澶囩敤瀛楁4", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁4")
- private java.lang.String warehouseUda4;
- /**澶囩敤瀛楁5*/
- @Excel(name = "澶囩敤瀛楁5", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁5")
- private java.lang.String warehouseUda5;
- /**鍒涘缓浜�*/
- @ApiModelProperty(value = "鍒涘缓浜�")
- private java.lang.String createBy;
- /**鍒涘缓鏃ユ湡*/
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
- @DateTimeFormat(pattern="yyyy-MM-dd")
- @ApiModelProperty(value = "鍒涘缓鏃ユ湡")
- private java.util.Date createTime;
- /**鏇存柊浜�*/
- @ApiModelProperty(value = "鏇存柊浜�")
- private java.lang.String updateBy;
- /**鏇存柊鏃ユ湡*/
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
- @DateTimeFormat(pattern="yyyy-MM-dd")
- @ApiModelProperty(value = "鏇存柊鏃ユ湡")
- private java.util.Date updateTime;
- /**鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)*/
- @Excel(name = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)", width = 15)
- @ApiModelProperty(value = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)")
- private java.lang.Integer delFlag;
- /**澶囨敞*/
- @Excel(name = "澶囨敞", width = 15)
- @ApiModelProperty(value = "澶囨敞")
- private java.lang.String remark;
- /**杞﹂棿ID*/
- @Excel(name = "杞﹂棿ID", width = 15)
- @ApiModelProperty(value = "杞﹂棿ID")
- private java.lang.String workshopId;
-}
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/entity/ProductionLineWarehouseClient.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/entity/ProductionLineWarehouseClient.java
deleted file mode 100644
index 80d12fb..0000000
--- a/lxzn-module-system/lxzn-system-biz/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 java.lang.String id;
- /**鏈嶅姟瀵硅薄ID*/
- @Excel(name = "鏈嶅姟瀵硅薄ID", width = 15)
- @ApiModelProperty(value = "鏈嶅姟瀵硅薄ID")
- private java.lang.String clientId;
- /**瀵硅薄缂栫爜*/
- @Excel(name = "瀵硅薄缂栫爜", width = 15)
- @ApiModelProperty(value = "瀵硅薄缂栫爜")
- private java.lang.String code;
- /**瀵硅薄鍚嶇О*/
- @Excel(name = "瀵硅薄鍚嶇О", width = 15)
- @ApiModelProperty(value = "瀵硅薄鍚嶇О")
- private java.lang.String name;
- /**浠撳簱id*/
- @ApiModelProperty(value = "浠撳簱id")
- private java.lang.String warehouseId;
- /**澶囩敤瀛楁1*/
- @Excel(name = "澶囩敤瀛楁1", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁1")
- private java.lang.String warehouseClientUda1;
- /**澶囩敤瀛楁2*/
- @Excel(name = "澶囩敤瀛楁2", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁2")
- private java.lang.String warehouseClientUda2;
- /**澶囩敤瀛楁3*/
- @Excel(name = "澶囩敤瀛楁3", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁3")
- private java.lang.String warehouseClientUda3;
- /**澶囩敤瀛楁4*/
- @Excel(name = "澶囩敤瀛楁4", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁4")
- private java.lang.String warehouseClientUda4;
- /**澶囩敤瀛楁5*/
- @Excel(name = "澶囩敤瀛楁5", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁5")
- private java.lang.String warehouseClientUda5;
- /**鍒涘缓浜�*/
- @ApiModelProperty(value = "鍒涘缓浜�")
- private java.lang.String createBy;
- /**鍒涘缓鏃ユ湡*/
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
- @DateTimeFormat(pattern="yyyy-MM-dd")
- @ApiModelProperty(value = "鍒涘缓鏃ユ湡")
- private java.util.Date createTime;
- /**鏇存柊浜�*/
- @ApiModelProperty(value = "鏇存柊浜�")
- private java.lang.String updateBy;
- /**鏇存柊鏃ユ湡*/
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
- @DateTimeFormat(pattern="yyyy-MM-dd")
- @ApiModelProperty(value = "鏇存柊鏃ユ湡")
- private java.util.Date updateTime;
- /**鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)*/
- @Excel(name = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)", width = 15)
- @ApiModelProperty(value = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)")
- private java.lang.Integer delFlag;
- /**澶囨敞*/
- @Excel(name = "澶囨敞", width = 15)
- @ApiModelProperty(value = "澶囨敞")
- private java.lang.String remark;
-}
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/entity/Supplier.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/entity/Supplier.java
deleted file mode 100644
index 0bb7323..0000000
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/entity/Supplier.java
+++ /dev/null
@@ -1,150 +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")
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "mom_base_supplier瀵硅薄", description = "mom_base_supplier")
-public class Supplier 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 = "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-宸插垹闄�)")
- 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 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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/entity/SupplierCategory.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/entity/SupplierCategory.java
deleted file mode 100644
index 9983d16..0000000
--- a/lxzn-module-system/lxzn-system-biz/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 java.lang.String parentId;
- /**缂栫爜*/
- @Excel(name = "缂栫爜", width = 15)
- @ApiModelProperty(value = "缂栫爜")
- private java.lang.String num;
- /**鍚嶇О*/
- @Excel(name = "鍚嶇О", width = 15)
- @ApiModelProperty(value = "鍚嶇О")
- private java.lang.String name;
- /**绉熸埛id*/
- @Excel(name = "绉熸埛id", width = 15)
- @ApiModelProperty(value = "绉熸埛id")
- private java.lang.String tenantId;
- /**鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)*/
- @Excel(name = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)", width = 15)
- @ApiModelProperty(value = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)")
- private java.lang.Integer delFlag = CommonConstant.DEL_FLAG_0;
- /**澶囨敞*/
- @Excel(name = "澶囨敞", width = 15)
- @ApiModelProperty(value = "澶囨敞")
- private java.lang.String remark;
- /**澶囩敤瀛楁1*/
- @Excel(name = "澶囩敤瀛楁1", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁1")
- private java.lang.String supplierCategoryUda1;
- /**澶囩敤瀛楁2*/
- @Excel(name = "澶囩敤瀛楁2", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁2")
- private java.lang.String supplierCategoryUda2;
- /**澶囩敤瀛楁3*/
- @Excel(name = "澶囩敤瀛楁3", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁3")
- private java.lang.String supplierCategoryUda3;
- /**澶囩敤瀛楁4*/
- @Excel(name = "澶囩敤瀛楁4", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁4")
- private java.lang.String supplierCategoryUda4;
- /**澶囩敤瀛楁5*/
- @Excel(name = "澶囩敤瀛楁5", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁5")
- private java.lang.String supplierCategoryUda5;
- /**鐘舵�� 0 绂佺敤 1 鍚敤*/
- @Excel(name = "鐘舵�� 0 绂佺敤 1 鍚敤", width = 15)
- @ApiModelProperty(value = "鐘舵�� 0 绂佺敤 1 鍚敤")
- private java.lang.String status = CommonConstant.STATUS_1;
-}
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/entity/SupplierContact.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/entity/SupplierContact.java
deleted file mode 100644
index 68e1b7e..0000000
--- a/lxzn-module-system/lxzn-system-biz/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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/entity/Unit.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/entity/Unit.java
deleted file mode 100644
index e8edb15..0000000
--- a/lxzn-module-system/lxzn-system-biz/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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/entity/UnitCategory.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/entity/UnitCategory.java
deleted file mode 100644
index ec74abb..0000000
--- a/lxzn-module-system/lxzn-system-biz/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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/entity/UnitConversion.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/entity/UnitConversion.java
deleted file mode 100644
index c04ef6a..0000000
--- a/lxzn-module-system/lxzn-system-biz/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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/entity/Warehouse.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/entity/Warehouse.java
deleted file mode 100644
index aa0c7ca..0000000
--- a/lxzn-module-system/lxzn-system-biz/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 java.lang.String code;
- /**浠撳簱鍚嶇О*/
- @Excel(name = "浠撳簱鍚嶇О", width = 15)
- @ApiModelProperty(value = "浠撳簱鍚嶇О")
- private java.lang.String name;
- /**鏄惁铏氭嫙锛�0锛氭槸锛�1锛氬惁*/
- @Excel(name = "鏄惁铏氭嫙", width = 15)
- @ApiModelProperty(value = "鏄惁铏氭嫙锛�0锛氭槸锛�1锛氬惁")
- private java.lang.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 java.lang.String warehouseUda1;
- /**澶囩敤瀛楁2*/
- @ApiModelProperty(value = "澶囩敤瀛楁2")
- private java.lang.String warehouseUda2;
- /**澶囩敤瀛楁3*/
- @ApiModelProperty(value = "澶囩敤瀛楁3")
- private java.lang.String warehouseUda3;
- /**澶囩敤瀛楁4*/
- @ApiModelProperty(value = "澶囩敤瀛楁4")
- private java.lang.String warehouseUda4;
- /**澶囩敤瀛楁5*/
- @ApiModelProperty(value = "澶囩敤瀛楁5")
- private java.lang.String warehouseUda5;
-
- /**鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)*/
- @ApiModelProperty(value = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)")
- private Integer delFlag = CommonConstant.DEL_FLAG_0;
- /**澶囨敞*/
- @Excel(name = "澶囨敞", width = 15)
- @ApiModelProperty(value = "澶囨敞")
- private java.lang.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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/entity/WarehouseArea.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/entity/WarehouseArea.java
deleted file mode 100644
index 45775c9..0000000
--- a/lxzn-module-system/lxzn-system-biz/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 java.lang.String warehouseId;
- /**搴撳尯缂栧彿*/
- @Excel(name = "搴撳尯缂栧彿", width = 15)
- @ApiModelProperty(value = "搴撳尯缂栧彿")
- private java.lang.String num;
- /**搴撳尯鍚嶇О*/
- @Excel(name = "搴撳尯鍚嶇О", width = 15)
- @ApiModelProperty(value = "搴撳尯鍚嶇О")
- private java.lang.String name;
- /**搴撲綅鏁伴噺*/
- @Excel(name = "搴撲綅鏁伴噺", width = 15)
- @ApiModelProperty(value = "搴撲綅鏁伴噺")
- private java.math.BigDecimal quantity;
-
- /**鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)*/
- @Excel(name = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)", width = 15)
- @ApiModelProperty(value = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)")
- private java.lang.Integer delFlag = CommonConstant.DEL_FLAG_0;
-}
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/entity/WarehouseClient.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/entity/WarehouseClient.java
deleted file mode 100644
index 14cd0dc..0000000
--- a/lxzn-module-system/lxzn-system-biz/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 java.lang.String id;
- @ApiModelProperty(value = "鏈嶅姟瀵硅薄ID")
- private java.lang.String clientId;
- /**瀵硅薄缂栫爜*/
- @Excel(name = "瀵硅薄缂栫爜", width = 15)
- @ApiModelProperty(value = "瀵硅薄缂栫爜")
- private java.lang.String code;
- /**瀵硅薄鍚嶇О*/
- @Excel(name = "瀵硅薄鍚嶇О", width = 15)
- @ApiModelProperty(value = "瀵硅薄鍚嶇О")
- private java.lang.String name;
- /**瑕佺礌绫诲瀷*/
- @Excel(name = "瑕佺礌绫诲瀷", width = 15)
- @ApiModelProperty(value = "瑕佺礌绫诲瀷")
- private java.lang.String elementType;
- /**浠撳簱id*/
- @ApiModelProperty(value = "浠撳簱id")
- private java.lang.String warehouseId;
- /**澶囩敤瀛楁1*/
- @ApiModelProperty(value = "澶囩敤瀛楁1")
- private java.lang.String warehouseClientUda1;
- /**澶囩敤瀛楁2*/
- @ApiModelProperty(value = "澶囩敤瀛楁2")
- private java.lang.String warehouseClientUda2;
- /**澶囩敤瀛楁3*/
- @ApiModelProperty(value = "澶囩敤瀛楁3")
- private java.lang.String warehouseClientUda3;
- /**澶囩敤瀛楁4*/
- @ApiModelProperty(value = "澶囩敤瀛楁4")
- private java.lang.String warehouseClientUda4;
- /**澶囩敤瀛楁5*/
- @ApiModelProperty(value = "澶囩敤瀛楁5")
- private java.lang.String warehouseClientUda5;
- /**鍒涘缓浜�*/
- @ApiModelProperty(value = "鍒涘缓浜�")
- private java.lang.String createBy;
- /**鍒涘缓鏃ユ湡*/
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
- @DateTimeFormat(pattern="yyyy-MM-dd")
- @ApiModelProperty(value = "鍒涘缓鏃ユ湡")
- private java.util.Date createTime;
- /**鏇存柊浜�*/
- @ApiModelProperty(value = "鏇存柊浜�")
- private java.lang.String updateBy;
- /**鏇存柊鏃ユ湡*/
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
- @DateTimeFormat(pattern="yyyy-MM-dd")
- @ApiModelProperty(value = "鏇存柊鏃ユ湡")
- private java.util.Date updateTime;
- /**鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)*/
- @ApiModelProperty(value = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)")
- private Integer delFlag;
- /**澶囨敞*/
- @Excel(name = "澶囨敞", width = 15)
- @ApiModelProperty(value = "澶囨敞")
- private java.lang.String remark;
-}
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/entity/WarehouseLocation.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/entity/WarehouseLocation.java
deleted file mode 100644
index 3ebe5e5..0000000
--- a/lxzn-module-system/lxzn-system-biz/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 java.lang.String warehouseId;
- /**浠撳簱搴撳尯id*/
- @Excel(name = "浠撳簱搴撳尯id", width = 15)
- @ApiModelProperty(value = "浠撳簱搴撳尯id")
- private java.lang.String warehouseAreaId;
- /**搴撲綅缂栫爜*/
- @Excel(name = "搴撲綅缂栫爜", width = 15)
- @ApiModelProperty(value = "搴撲綅缂栫爜")
- private java.lang.String num;
- /**琛屽彿*/
- @Excel(name = "琛屽彿", width = 15)
- @ApiModelProperty(value = "琛屽彿")
- private java.math.BigDecimal xnum;
- /**鍒楀彿*/
- @Excel(name = "鍒楀彿", width = 15)
- @ApiModelProperty(value = "鍒楀彿")
- private java.math.BigDecimal ynum;
- /**灞傚彿*/
- @Excel(name = "灞傚彿", width = 15)
- @ApiModelProperty(value = "灞傚彿")
- private java.math.BigDecimal znum;
-
- /**鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)*/
- @Excel(name = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)", width = 15)
- @ApiModelProperty(value = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)")
- private java.lang.Integer delFlag = CommonConstant.DEL_FLAG_0;
-}
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/entity/WorkCenter.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/entity/WorkCenter.java
deleted file mode 100644
index 4339563..0000000
--- a/lxzn-module-system/lxzn-system-biz/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 java.lang.String id;
- /**宸ヤ綔涓績缂栫爜*/
- @Excel(name = "宸ヤ綔涓績缂栫爜", width = 15)
- @ApiModelProperty(value = "宸ヤ綔涓績缂栫爜")
- private java.lang.String code;
- /**宸ヤ綔涓績鍚嶇О*/
- @Excel(name = "宸ヤ綔涓績鍚嶇О", width = 15)
- @ApiModelProperty(value = "宸ヤ綔涓績鍚嶇О")
- private java.lang.String name;
- /**涓氬姟绫诲瀷ID*/
- @Excel(name = "涓氬姟绫诲瀷", width = 15)
- @ApiModelProperty(value = "涓氬姟绫诲瀷")
- private java.lang.String serviceCategory;
- /**宸ヤ綔涓績绫诲瀷ID*/
- @Excel(name = "宸ヤ綔涓績绫诲瀷ID", width = 15)
- @ApiModelProperty(value = "宸ヤ綔涓績绫诲瀷ID")
- private java.lang.String workCenterCategory;
- /**璁惧缁処D*/
- @Excel(name = "璁惧缁処D", width = 15)
- @ApiModelProperty(value = "璁惧缁処D")
- private java.lang.String equipmentTeamId;
- /**涓婃枡鍖�*/
- @Excel(name = "涓婃枡鍖�", width = 15)
- @ApiModelProperty(value = "涓婃枡鍖�")
- private java.lang.String feedingArea;
- /**涓嬫枡鍖�*/
- @Excel(name = "涓嬫枡鍖�", width = 15)
- @ApiModelProperty(value = "涓嬫枡鍖�")
- private java.lang.String baitingArea;
- /**鐗堟湰*/
- @Excel(name = "鐗堟湰", width = 15)
- @ApiModelProperty(value = "鐗堟湰")
- private Integer version;
- /**宸ュ巶寤烘āID*/
- @Excel(name = "宸ュ巶寤烘āID", width = 15)
- @ApiModelProperty(value = "椤跺眰宸ュ巶寤烘āID")
- private java.lang.String factoryModelId;
- /**澶囩敤瀛楁1*/
- @Excel(name = "澶囩敤瀛楁1", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁1")
- private java.lang.String workCenterUda1;
- /**澶囩敤瀛楁2*/
- @Excel(name = "澶囩敤瀛楁2", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁2")
- private java.lang.String workCenterUda2;
- /**澶囩敤瀛楁3*/
- @Excel(name = "澶囩敤瀛楁3", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁3")
- private java.lang.String workCenterUda3;
- /**澶囩敤瀛楁4*/
- @Excel(name = "澶囩敤瀛楁4", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁4")
- private java.lang.String workCenterUda4;
- /**澶囩敤瀛楁5*/
- @Excel(name = "澶囩敤瀛楁5", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁5")
- private java.lang.String workCenterUda5;
- /**鍒涘缓浜�*/
- @ApiModelProperty(value = "鍒涘缓浜�")
- private java.lang.String createBy;
- /**鍒涘缓鏃堕棿*/
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
- @DateTimeFormat(pattern="yyyy-MM-dd")
- @ApiModelProperty(value = "鍒涘缓鏃堕棿")
- private java.util.Date createTime;
- /**淇敼浜�*/
- @ApiModelProperty(value = "淇敼浜�")
- private java.lang.String updateBy;
- /**淇敼鏃堕棿*/
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
- @DateTimeFormat(pattern="yyyy-MM-dd")
- @ApiModelProperty(value = "淇敼鏃堕棿")
- private java.util.Date updateTime;
- /**澶囨敞*/
- @Excel(name = "澶囨敞", width = 15)
- @ApiModelProperty(value = "澶囨敞")
- private java.lang.String remark;
- @ApiModelProperty(value = "鐖跺眰宸ュ巶寤烘āid")
- private String parentFactoryModelId;
- @ApiModelProperty(value = "0锛氭湭鍒犻櫎锛�1锛氬凡鍒犻櫎")
- private Integer delFlag;
- @ApiModelProperty(value = "鐗堟湰ID")
- private String dataVersionId;
-}
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/entity/WorkCenterDetail.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/entity/WorkCenterDetail.java
deleted file mode 100644
index 183b452..0000000
--- a/lxzn-module-system/lxzn-system-biz/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 java.lang.String id;
- private java.lang.String code;
- private java.lang.String name;
- private java.lang.String serviceCategory;
- private java.lang.String workCenterCategory;
- private java.lang.String equipmentTeamId;
- private java.lang.String equipmentTeamName;
- private java.lang.String feedingArea;
- private java.lang.String baitingArea;
- private java.lang.String isLastUsable;
- private Integer version;
- private String versionStatus;
- private String auditStatus;
- private java.lang.String factoryModelId;
- private java.lang.String createBy;
- private java.util.Date createTime;
- private java.lang.String updateBy;
- private java.util.Date updateTime;
- private java.lang.String remark;
- private String parentFactoryModelId;
- private Integer delFlag;
- private String dataVersionId;
-}
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/entity/WorkCenterEquipment.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/entity/WorkCenterEquipment.java
deleted file mode 100644
index bc10b79..0000000
--- a/lxzn-module-system/lxzn-system-biz/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 java.lang.String id;
- /**宸ヤ綔涓績id*/
- @Excel(name = "宸ヤ綔涓績id", width = 15)
- @ApiModelProperty(value = "宸ヤ綔涓績id")
- private java.lang.String workCenterId;
- /**璁惧id*/
- @Excel(name = "璁惧id", width = 15)
- @ApiModelProperty(value = "璁惧id")
- private java.lang.String equipmentId;
- /**澶囩敤瀛楁1*/
- @Excel(name = "澶囩敤瀛楁1", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁1")
- private java.lang.String workCenterEquipmentUda1;
- /**澶囩敤瀛楁2*/
- @Excel(name = "澶囩敤瀛楁2", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁2")
- private java.lang.String workCenterEquipmentUda2;
- /**澶囩敤瀛楁3*/
- @Excel(name = "澶囩敤瀛楁3", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁3")
- private java.lang.String workCenterEquipmentUda3;
- /**澶囩敤瀛楁4*/
- @Excel(name = "澶囩敤瀛楁4", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁4")
- private java.lang.String workCenterEquipmentUda4;
- /**澶囩敤瀛楁5*/
- @Excel(name = "澶囩敤瀛楁5", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁5")
- private java.lang.String workCenterEquipmentUda5;
- /**鐘舵��*/
- @Excel(name = "鐘舵��", width = 15)
- @ApiModelProperty(value = "鐘舵��")
- private java.lang.String status;
- /**鍒涘缓浜�*/
- @ApiModelProperty(value = "鍒涘缓浜�")
- private java.lang.String createBy;
- /**鍒涘缓鏃堕棿*/
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
- @DateTimeFormat(pattern="yyyy-MM-dd")
- @ApiModelProperty(value = "鍒涘缓鏃堕棿")
- private java.util.Date createTime;
- /**鏇存柊浜�*/
- @ApiModelProperty(value = "鏇存柊浜�")
- private java.lang.String updateBy;
- /**鏇存柊鏃堕棿*/
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
- @DateTimeFormat(pattern="yyyy-MM-dd")
- @ApiModelProperty(value = "鏇存柊鏃堕棿")
- private java.util.Date updateTime;
- /**鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)*/
- @Excel(name = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)", width = 15)
- @ApiModelProperty(value = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)")
- private java.lang.Integer delFlag;
- /**浼佷笟ID*/
- @Excel(name = "浼佷笟ID", width = 15)
- @ApiModelProperty(value = "浼佷笟ID")
- private java.lang.String enterpriseId;
-}
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/entity/WorkCenterUser.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/entity/WorkCenterUser.java
deleted file mode 100644
index b844d64..0000000
--- a/lxzn-module-system/lxzn-system-biz/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 java.lang.String id;
- /**宸ヤ綔涓績id*/
- @Excel(name = "宸ヤ綔涓績id", width = 15)
- @ApiModelProperty(value = "宸ヤ綔涓績id")
- private java.lang.String workCenterId;
- /**鐢ㄦ埛id*/
- @Excel(name = "鐢ㄦ埛id", width = 15)
- @ApiModelProperty(value = "鐢ㄦ埛id")
- private java.lang.String userId;
- /**澶囩敤瀛楁1*/
- @Excel(name = "澶囩敤瀛楁1", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁1")
- private java.lang.String workCenterUserUda1;
- /**澶囩敤瀛楁2*/
- @Excel(name = "澶囩敤瀛楁2", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁2")
- private java.lang.String workCenterUserUda2;
- /**澶囩敤瀛楁3*/
- @Excel(name = "澶囩敤瀛楁3", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁3")
- private java.lang.String workCenterUserUda3;
- /**澶囩敤瀛楁4*/
- @Excel(name = "澶囩敤瀛楁4", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁4")
- private java.lang.String workCenterUserUda4;
- /**澶囩敤瀛楁5*/
- @Excel(name = "澶囩敤瀛楁5", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁5")
- private java.lang.String workCenterUserUda5;
- /**鐘舵��*/
- @Excel(name = "鐘舵��", width = 15)
- @ApiModelProperty(value = "鐘舵��")
- private java.lang.String status;
- /**鍒涘缓浜�*/
- @ApiModelProperty(value = "鍒涘缓浜�")
- private java.lang.String createBy;
- /**鍒涘缓鏃堕棿*/
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
- @DateTimeFormat(pattern="yyyy-MM-dd")
- @ApiModelProperty(value = "鍒涘缓鏃堕棿")
- private java.util.Date createTime;
- /**鏇存柊浜�*/
- @ApiModelProperty(value = "鏇存柊浜�")
- private java.lang.String updateBy;
- /**鏇存柊鏃堕棿*/
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
- @DateTimeFormat(pattern="yyyy-MM-dd")
- @ApiModelProperty(value = "鏇存柊鏃堕棿")
- private java.util.Date updateTime;
- /**鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)*/
- @Excel(name = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)", width = 15)
- @ApiModelProperty(value = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)")
- private java.lang.Integer delFlag;
- /**浼佷笟ID*/
- @Excel(name = "浼佷笟ID", width = 15)
- @ApiModelProperty(value = "浼佷笟ID")
- private java.lang.String enterpriseId;
-}
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/ClientCategoryMapper.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/ClientCategoryMapper.java
deleted file mode 100644
index 2fea6bd..0000000
--- a/lxzn-module-system/lxzn-system-biz/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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/ClientContactMapper.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/ClientContactMapper.java
deleted file mode 100644
index 839e858..0000000
--- a/lxzn-module-system/lxzn-system-biz/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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/ClientMapper.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/ClientMapper.java
deleted file mode 100644
index ff88805..0000000
--- a/lxzn-module-system/lxzn-system-biz/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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/ConstructorMapper.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/ConstructorMapper.java
deleted file mode 100644
index 84df68f..0000000
--- a/lxzn-module-system/lxzn-system-biz/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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/DepartmentCategoryMapper.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/DepartmentCategoryMapper.java
deleted file mode 100644
index 9680b9a..0000000
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/DepartmentCategoryMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.jeecg.modules.base.mapper;
-
-import org.jeecg.modules.base.entity.DepartmentCategory;
-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 DepartmentCategoryMapper extends BaseMapper<DepartmentCategory> {
-
-}
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/EncodeRuleDepartMapper.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/EncodeRuleDepartMapper.java
deleted file mode 100644
index 15e10bc..0000000
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/EncodeRuleDepartMapper.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.EncodeRuleDepart;
-
-import java.util.List;
-
-public interface EncodeRuleDepartMapper extends BaseMapper<EncodeRuleDepart> {
- public List<EncodeRuleDepart> getDepartBycodeRuleId(String codeRuleId);
-}
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/EncodeRuleDetailMapper.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/EncodeRuleDetailMapper.java
deleted file mode 100644
index 93ad910..0000000
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/EncodeRuleDetailMapper.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.jeecg.modules.base.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.jeecg.modules.base.entity.EncodeRuleDetail;
-
-import java.util.List;
-
-public interface EncodeRuleDetailMapper extends BaseMapper<EncodeRuleDetail> {
-
- public List<EncodeRuleDetail> getCodeRuleDetailByCodeRuleId(String ruleCodeId);
-
-}
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/EncodeRuleMapper.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/EncodeRuleMapper.java
deleted file mode 100644
index 74d0a23..0000000
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/EncodeRuleMapper.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.EncodeRule;
-
-public interface EncodeRuleMapper extends BaseMapper<EncodeRule> {
-
-}
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/EncodeRuleTableFieldRelateMapper.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/EncodeRuleTableFieldRelateMapper.java
deleted file mode 100644
index 0afcd8b..0000000
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/EncodeRuleTableFieldRelateMapper.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.jeecg.modules.base.mapper;
-
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-import org.jeecg.modules.base.entity.EncodeRuleTableFieldRelate;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * @Description: mom_sys_encode_rule_table_field_relate
- * @Author: jeecg-boot
- * @Date: 2023-05-06
- * @Version: V1.0
- */
-public interface EncodeRuleTableFieldRelateMapper extends BaseMapper<EncodeRuleTableFieldRelate> {
-
-}
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/EnterpriseAdministratorMapper.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/EnterpriseAdministratorMapper.java
deleted file mode 100644
index c066783..0000000
--- a/lxzn-module-system/lxzn-system-biz/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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/EnterpriseMapper.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/EnterpriseMapper.java
deleted file mode 100644
index f90354b..0000000
--- a/lxzn-module-system/lxzn-system-biz/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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/FactoryElementCategoryMapper.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/FactoryElementCategoryMapper.java
deleted file mode 100644
index b9bed04..0000000
--- a/lxzn-module-system/lxzn-system-biz/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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/FactoryModelMapper.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/FactoryModelMapper.java
deleted file mode 100644
index d21229d..0000000
--- a/lxzn-module-system/lxzn-system-biz/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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/MaterialCategoryMapper.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/MaterialCategoryMapper.java
deleted file mode 100644
index 07371fb..0000000
--- a/lxzn-module-system/lxzn-system-biz/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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/MaterialMapper.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/MaterialMapper.java
deleted file mode 100644
index 128d941..0000000
--- a/lxzn-module-system/lxzn-system-biz/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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/ProductionLineWarehouseClientMapper.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/ProductionLineWarehouseClientMapper.java
deleted file mode 100644
index 86e2794..0000000
--- a/lxzn-module-system/lxzn-system-biz/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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/ProductionLineWarehouseMapper.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/ProductionLineWarehouseMapper.java
deleted file mode 100644
index 7ea9dd4..0000000
--- a/lxzn-module-system/lxzn-system-biz/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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/SupplierCategoryMapper.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/SupplierCategoryMapper.java
deleted file mode 100644
index 134280b..0000000
--- a/lxzn-module-system/lxzn-system-biz/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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/SupplierContactMapper.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/SupplierContactMapper.java
deleted file mode 100644
index b940ed6..0000000
--- a/lxzn-module-system/lxzn-system-biz/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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/SupplierMapper.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/SupplierMapper.java
deleted file mode 100644
index 4376bd1..0000000
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/SupplierMapper.java
+++ /dev/null
@@ -1,16 +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;
-import org.jeecg.modules.base.entity.Unit;
-
-public interface SupplierMapper extends BaseMapper<Supplier> {
- /**
- * 閫氳繃渚涘簲鍟嗗悕绉版煡璇緵搴斿晢淇℃伅
- * @param name
- * @return
- */
- public Supplier getByName(@Param("name") String name);
-}
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/UnitCategoryMapper.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/UnitCategoryMapper.java
deleted file mode 100644
index 5f69186..0000000
--- a/lxzn-module-system/lxzn-system-biz/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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/UnitConversionMapper.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/UnitConversionMapper.java
deleted file mode 100644
index 5586dfc..0000000
--- a/lxzn-module-system/lxzn-system-biz/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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/UnitMapper.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/UnitMapper.java
deleted file mode 100644
index 99bec21..0000000
--- a/lxzn-module-system/lxzn-system-biz/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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/WarehouseAreaMapper.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/WarehouseAreaMapper.java
deleted file mode 100644
index 44012ec..0000000
--- a/lxzn-module-system/lxzn-system-biz/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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/WarehouseClientMapper.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/WarehouseClientMapper.java
deleted file mode 100644
index f4f8167..0000000
--- a/lxzn-module-system/lxzn-system-biz/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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/WarehouseLocationMapper.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/WarehouseLocationMapper.java
deleted file mode 100644
index 3eecfef..0000000
--- a/lxzn-module-system/lxzn-system-biz/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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/WarehouseMapper.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/WarehouseMapper.java
deleted file mode 100644
index 4ce0824..0000000
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/WarehouseMapper.java
+++ /dev/null
@@ -1,59 +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.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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/WorkCenterEquipmentMapper.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/WorkCenterEquipmentMapper.java
deleted file mode 100644
index bea74c2..0000000
--- a/lxzn-module-system/lxzn-system-biz/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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/WorkCenterMapper.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/WorkCenterMapper.java
deleted file mode 100644
index 5eab6a4..0000000
--- a/lxzn-module-system/lxzn-system-biz/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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/WorkCenterUserMapper.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/WorkCenterUserMapper.java
deleted file mode 100644
index 8d3499b..0000000
--- a/lxzn-module-system/lxzn-system-biz/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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/xml/ClientMapper.xml b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/xml/ClientMapper.xml
deleted file mode 100644
index c3844c6..0000000
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/xml/ClientMapper.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.ClientMapper">
-
-</mapper>
\ No newline at end of file
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/xml/ConstructorMapper.xml b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/xml/ConstructorMapper.xml
deleted file mode 100644
index 4f6b679..0000000
--- a/lxzn-module-system/lxzn-system-biz/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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/xml/DepartmentCategoryMapper.xml b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/xml/DepartmentCategoryMapper.xml
deleted file mode 100644
index c02731c..0000000
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/xml/DepartmentCategoryMapper.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.DepartmentCategoryMapper">
-
-</mapper>
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/xml/EncodeRuleDepartMapper.xml b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/xml/EncodeRuleDepartMapper.xml
deleted file mode 100644
index a1ce4ec..0000000
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/xml/EncodeRuleDepartMapper.xml
+++ /dev/null
@@ -1,25 +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.EncodeRuleDepartMapper">
-
- <resultMap id="EncodeRuleDepart" type="org.jeecg.modules.base.entity.EncodeRuleDepart" >
- <result column="id" property="id" jdbcType="VARCHAR"/>
- <result column="code_rule_id" property="codeRuleId" jdbcType="VARCHAR"/>
- <result column="depart_id" property="departId" 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"/>
- </resultMap>
-
- <select id="getDepartBycodeRuleId" resultMap="EncodeRuleDepart">
- select c.*,d.org_code orgCode,d.depart_name departName from mom_base_encode_rule_depart c
- left join sys_depart d on c.depart_id=d.id
-
- where c.code_rule_id = #{codeRuleId}
-
-
- </select>
-
-</mapper>
\ No newline at end of file
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/xml/EncodeRuleDetailMapper.xml b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/xml/EncodeRuleDetailMapper.xml
deleted file mode 100644
index b28c3f2..0000000
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/xml/EncodeRuleDetailMapper.xml
+++ /dev/null
@@ -1,28 +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.EncodeRuleDetailMapper">
-
-
- <select id="getCodeRuleDetailByCodeRuleId" resultType="Map">
- select
- t1.id,
- t1.code_rule_id codeRuleId,
- t1.code_element codeElement,
- t1.element_value elementValue,
- t1.length,
- t1.sequence,
- t1.create_by createBy,
- t1.create_time createTime,
- t1.update_by updateBy,
- t1.update_time updateTime,
- t1.remark,
- t2.item_text codeElementName
- from mom_base_encode_rule_detail t1
- left join ( SELECT * FROM v_sys_dict WHERE dict_code = 'code_element' ) t2 on t2.item_value = t1.code_element
- where 1=1
- <if test="ruleCodeId != null and ruleCodeId != ''">
- and t1.code_rule_id = #{ruleCodeId}
- </if>
- </select>
-
-</mapper>
\ No newline at end of file
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/xml/EncodeRuleMapper.xml b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/xml/EncodeRuleMapper.xml
deleted file mode 100644
index 59ce222..0000000
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/xml/EncodeRuleMapper.xml
+++ /dev/null
@@ -1,6 +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.EncodeRuleMapper">
-
-
-</mapper>
\ No newline at end of file
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/xml/EncodeRuleTableFieldRelateMapper.xml b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/xml/EncodeRuleTableFieldRelateMapper.xml
deleted file mode 100644
index b672cb7..0000000
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/xml/EncodeRuleTableFieldRelateMapper.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.EncodeRuleTableFieldRelateMapper">
-
-</mapper>
\ No newline at end of file
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/xml/EnterpriseAdministratorMapper.xml b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/xml/EnterpriseAdministratorMapper.xml
deleted file mode 100644
index 580d89e..0000000
--- a/lxzn-module-system/lxzn-system-biz/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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/xml/EnterpriseMapper.xml b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/xml/EnterpriseMapper.xml
deleted file mode 100644
index 6b5ca09..0000000
--- a/lxzn-module-system/lxzn-system-biz/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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/xml/FactoryElementCategoryMapper.xml b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/xml/FactoryElementCategoryMapper.xml
deleted file mode 100644
index 892708d..0000000
--- a/lxzn-module-system/lxzn-system-biz/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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/xml/FactoryModelMapper.xml b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/xml/FactoryModelMapper.xml
deleted file mode 100644
index e4665c3..0000000
--- a/lxzn-module-system/lxzn-system-biz/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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/xml/MaterialCategoryMapper.xml b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/xml/MaterialCategoryMapper.xml
deleted file mode 100644
index 3bd8123..0000000
--- a/lxzn-module-system/lxzn-system-biz/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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/xml/ProductionLineWarehouseClientMapper.xml b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/xml/ProductionLineWarehouseClientMapper.xml
deleted file mode 100644
index 5de5b2d..0000000
--- a/lxzn-module-system/lxzn-system-biz/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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/xml/ProductionLineWarehouseMapper.xml b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/xml/ProductionLineWarehouseMapper.xml
deleted file mode 100644
index 8d0246f..0000000
--- a/lxzn-module-system/lxzn-system-biz/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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/xml/SupplierContactMapper.xml b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/xml/SupplierContactMapper.xml
deleted file mode 100644
index 95920e5..0000000
--- a/lxzn-module-system/lxzn-system-biz/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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/xml/SupplierMapper.xml b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/xml/SupplierMapper.xml
deleted file mode 100644
index fefd408..0000000
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/xml/SupplierMapper.xml
+++ /dev/null
@@ -1,10 +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.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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/xml/UnitCategoryMapper.xml b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/xml/UnitCategoryMapper.xml
deleted file mode 100644
index 9adcfac..0000000
--- a/lxzn-module-system/lxzn-system-biz/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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/xml/UnitConversionMapper.xml b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/xml/UnitConversionMapper.xml
deleted file mode 100644
index 1292971..0000000
--- a/lxzn-module-system/lxzn-system-biz/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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/xml/UnitMapper.xml b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/xml/UnitMapper.xml
deleted file mode 100644
index 34fe8de..0000000
--- a/lxzn-module-system/lxzn-system-biz/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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/xml/WarehouseAreaMapper.xml b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/xml/WarehouseAreaMapper.xml
deleted file mode 100644
index 62f5063..0000000
--- a/lxzn-module-system/lxzn-system-biz/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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/xml/WarehouseClientMapper.xml b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/xml/WarehouseClientMapper.xml
deleted file mode 100644
index 9b7e875..0000000
--- a/lxzn-module-system/lxzn-system-biz/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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/xml/WarehouseLocationMapper.xml b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/xml/WarehouseLocationMapper.xml
deleted file mode 100644
index e419c84..0000000
--- a/lxzn-module-system/lxzn-system-biz/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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/xml/WarehouseMapper.xml b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/xml/WarehouseMapper.xml
deleted file mode 100644
index 2fcf5cf..0000000
--- a/lxzn-module-system/lxzn-system-biz/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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/xml/WorkCenterEquipmentMapper.xml b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/xml/WorkCenterEquipmentMapper.xml
deleted file mode 100644
index c502349..0000000
--- a/lxzn-module-system/lxzn-system-biz/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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/xml/WorkCenterMapper.xml b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/xml/WorkCenterMapper.xml
deleted file mode 100644
index 1d2d2bc..0000000
--- a/lxzn-module-system/lxzn-system-biz/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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/xml/WorkCenterUserMapper.xml b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/mapper/xml/WorkCenterUserMapper.xml
deleted file mode 100644
index e1a7dd4..0000000
--- a/lxzn-module-system/lxzn-system-biz/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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/IClientCategoryService.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/IClientCategoryService.java
deleted file mode 100644
index 765a690..0000000
--- a/lxzn-module-system/lxzn-system-biz/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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/IClientContactService.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/IClientContactService.java
deleted file mode 100644
index 9c8c6d1..0000000
--- a/lxzn-module-system/lxzn-system-biz/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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/IClientService.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/IClientService.java
deleted file mode 100644
index d3be858..0000000
--- a/lxzn-module-system/lxzn-system-biz/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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/IConstructorService.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/IConstructorService.java
deleted file mode 100644
index d3d42a9..0000000
--- a/lxzn-module-system/lxzn-system-biz/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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/IDepartmentCategoryService.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/IDepartmentCategoryService.java
deleted file mode 100644
index 0d0700c..0000000
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/IDepartmentCategoryService.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.jeecg.modules.base.service;
-
-import org.jeecg.modules.base.entity.DepartmentCategory;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * @Description: 鍩虹鏁版嵁-缁勭粐鏋舵瀯-閮ㄩ棬绫诲瀷
- * @Author: jeecg-boot
- * @Date: 2022-11-07
- * @Version: V1.0
- */
-public interface IDepartmentCategoryService extends IService<DepartmentCategory> {
-
-}
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/IEncodeRuleDepartService.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/IEncodeRuleDepartService.java
deleted file mode 100644
index d83f867..0000000
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/IEncodeRuleDepartService.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package org.jeecg.modules.base.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import org.jeecg.modules.base.entity.EncodeRuleDepart;
-
-import java.util.List;
-
-public interface IEncodeRuleDepartService extends IService<EncodeRuleDepart> {
-
- List<EncodeRuleDepart> getDepartBycodeRuleId(String codeRuleId);
-}
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/IEncodeRuleDetailService.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/IEncodeRuleDetailService.java
deleted file mode 100644
index 9c25cee..0000000
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/IEncodeRuleDetailService.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package org.jeecg.modules.base.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import org.jeecg.modules.base.entity.EncodeRuleDetail;
-
-import java.util.List;
-
-public interface IEncodeRuleDetailService extends IService<EncodeRuleDetail> {
-
- public List<EncodeRuleDetail> getCodeRuleDetailByCodeRuleId(String ruleCodeId);
-}
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/IEncodeRuleService.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/IEncodeRuleService.java
deleted file mode 100644
index 475905c..0000000
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/IEncodeRuleService.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.jeecg.modules.base.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import org.jeecg.modules.base.entity.EncodeRule;
-
-public interface IEncodeRuleService extends IService<EncodeRule> {
-
-}
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/IEncodeRuleTableFieldRelateService.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/IEncodeRuleTableFieldRelateService.java
deleted file mode 100644
index 583cdd9..0000000
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/IEncodeRuleTableFieldRelateService.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.jeecg.modules.base.service;
-
-import org.jeecg.modules.base.entity.EncodeRuleTableFieldRelate;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * @Description: mom_sys_encode_rule_table_field_relate
- * @Author: jeecg-boot
- * @Date: 2023-05-06
- * @Version: V1.0
- */
-public interface IEncodeRuleTableFieldRelateService extends IService<EncodeRuleTableFieldRelate> {
-
-}
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/IEnterpriseAdministratorService.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/IEnterpriseAdministratorService.java
deleted file mode 100644
index 62c245d..0000000
--- a/lxzn-module-system/lxzn-system-biz/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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/IEnterpriseService.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/IEnterpriseService.java
deleted file mode 100644
index db97843..0000000
--- a/lxzn-module-system/lxzn-system-biz/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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/IFactoryElementCategoryService.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/IFactoryElementCategoryService.java
deleted file mode 100644
index d848330..0000000
--- a/lxzn-module-system/lxzn-system-biz/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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/IFactoryModelService.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/IFactoryModelService.java
deleted file mode 100644
index bdd92fb..0000000
--- a/lxzn-module-system/lxzn-system-biz/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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/IMaterialCategoryService.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/IMaterialCategoryService.java
deleted file mode 100644
index 0d442e5..0000000
--- a/lxzn-module-system/lxzn-system-biz/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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/IMaterialService.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/IMaterialService.java
deleted file mode 100644
index 47b4f1b..0000000
--- a/lxzn-module-system/lxzn-system-biz/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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/IProductionLineWarehouseClientService.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/IProductionLineWarehouseClientService.java
deleted file mode 100644
index 48cde2f..0000000
--- a/lxzn-module-system/lxzn-system-biz/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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/IProductionLineWarehouseService.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/IProductionLineWarehouseService.java
deleted file mode 100644
index 96cc2f2..0000000
--- a/lxzn-module-system/lxzn-system-biz/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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/ISupplierCategoryService.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/ISupplierCategoryService.java
deleted file mode 100644
index 6b543bb..0000000
--- a/lxzn-module-system/lxzn-system-biz/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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/ISupplierContactService.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/ISupplierContactService.java
deleted file mode 100644
index 62652f3..0000000
--- a/lxzn-module-system/lxzn-system-biz/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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/ISupplierService.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/ISupplierService.java
deleted file mode 100644
index 073e3be..0000000
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/ISupplierService.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.Supplier;
-import org.jeecg.modules.base.entity.SupplierCategory;
-
-/**
- * @Description: mom_base_supplier
- * @Author: jeecg-boot
- * @Date: 2023-03-10
- * @Version: V1.0
- */
-public interface ISupplierService extends IService<Supplier> {
-
-
- public Supplier getByName(String name);
-}
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/IUnitCategoryService.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/IUnitCategoryService.java
deleted file mode 100644
index 70204f0..0000000
--- a/lxzn-module-system/lxzn-system-biz/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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/IUnitConversionService.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/IUnitConversionService.java
deleted file mode 100644
index ec359ee..0000000
--- a/lxzn-module-system/lxzn-system-biz/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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/IUnitService.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/IUnitService.java
deleted file mode 100644
index 6a90f08..0000000
--- a/lxzn-module-system/lxzn-system-biz/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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/IWarehouseAreaService.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/IWarehouseAreaService.java
deleted file mode 100644
index 11d046a..0000000
--- a/lxzn-module-system/lxzn-system-biz/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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/IWarehouseClientService.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/IWarehouseClientService.java
deleted file mode 100644
index e033260..0000000
--- a/lxzn-module-system/lxzn-system-biz/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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/IWarehouseLocationService.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/IWarehouseLocationService.java
deleted file mode 100644
index afc3fc3..0000000
--- a/lxzn-module-system/lxzn-system-biz/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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/IWarehouseService.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/IWarehouseService.java
deleted file mode 100644
index bff2d51..0000000
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/IWarehouseService.java
+++ /dev/null
@@ -1,98 +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.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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/IWorkCenterEquipmentService.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/IWorkCenterEquipmentService.java
deleted file mode 100644
index c4ff43f..0000000
--- a/lxzn-module-system/lxzn-system-biz/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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/IWorkCenterService.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/IWorkCenterService.java
deleted file mode 100644
index 0828db7..0000000
--- a/lxzn-module-system/lxzn-system-biz/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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/IWorkCenterUserService.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/IWorkCenterUserService.java
deleted file mode 100644
index 998649a..0000000
--- a/lxzn-module-system/lxzn-system-biz/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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/impl/ClientCategoryServiceImpl.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/impl/ClientCategoryServiceImpl.java
deleted file mode 100644
index 3984e76..0000000
--- a/lxzn-module-system/lxzn-system-biz/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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/impl/ClientContactServiceImpl.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/impl/ClientContactServiceImpl.java
deleted file mode 100644
index 8143eaf..0000000
--- a/lxzn-module-system/lxzn-system-biz/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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/impl/ClientServiceImpl.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/impl/ClientServiceImpl.java
deleted file mode 100644
index e7d13f8..0000000
--- a/lxzn-module-system/lxzn-system-biz/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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/impl/ConstructorServiceImpl.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/impl/ConstructorServiceImpl.java
deleted file mode 100644
index 8763421..0000000
--- a/lxzn-module-system/lxzn-system-biz/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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/impl/DepartmentCategoryServiceImpl.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/impl/DepartmentCategoryServiceImpl.java
deleted file mode 100644
index b4e92e8..0000000
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/impl/DepartmentCategoryServiceImpl.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.jeecg.modules.base.service.impl;
-
-import org.jeecg.modules.base.entity.DepartmentCategory;
-import org.jeecg.modules.base.mapper.DepartmentCategoryMapper;
-import org.jeecg.modules.base.service.IDepartmentCategoryService;
-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 DepartmentCategoryServiceImpl extends ServiceImpl<DepartmentCategoryMapper, DepartmentCategory> implements IDepartmentCategoryService {
-
-}
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/impl/EncodeRuleServiceDepartImpl.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/impl/EncodeRuleServiceDepartImpl.java
deleted file mode 100644
index 47e0611..0000000
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/impl/EncodeRuleServiceDepartImpl.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.EncodeRuleDepart;
-import org.jeecg.modules.base.mapper.EncodeRuleDepartMapper;
-import org.jeecg.modules.base.service.IEncodeRuleDepartService;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-@Service
-public class EncodeRuleServiceDepartImpl extends ServiceImpl<EncodeRuleDepartMapper, EncodeRuleDepart> implements IEncodeRuleDepartService {
- @Resource
- private EncodeRuleDepartMapper encodeRuleDepartMapper;
- @Override
- public List<EncodeRuleDepart> getDepartBycodeRuleId(String codeRuleId) {
- List<EncodeRuleDepart> list = encodeRuleDepartMapper.getDepartBycodeRuleId(codeRuleId);
- return list;
- }
-}
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/impl/EncodeRuleServiceDetailImpl.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/impl/EncodeRuleServiceDetailImpl.java
deleted file mode 100644
index 31c1a73..0000000
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/impl/EncodeRuleServiceDetailImpl.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.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;
-
-import java.util.List;
-
-@Service
-public class EncodeRuleServiceDetailImpl extends ServiceImpl<EncodeRuleDetailMapper, EncodeRuleDetail> implements IEncodeRuleDetailService {
-
- @Autowired
- private EncodeRuleDetailMapper encodeRuleDetailMapper;
-
- @Override
- public List<EncodeRuleDetail> getCodeRuleDetailByCodeRuleId(String ruleCodeId) {
- return encodeRuleDetailMapper.getCodeRuleDetailByCodeRuleId(ruleCodeId);
- }
-}
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/impl/EncodeRuleServiceImpl.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/impl/EncodeRuleServiceImpl.java
deleted file mode 100644
index c3c4d65..0000000
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/impl/EncodeRuleServiceImpl.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.jeecg.modules.base.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.jeecg.modules.base.entity.EncodeRule;
-import org.jeecg.modules.base.mapper.EncodeRuleMapper;
-import org.jeecg.modules.base.service.IEncodeRuleService;
-import org.springframework.stereotype.Service;
-
-@Service
-public class EncodeRuleServiceImpl extends ServiceImpl<EncodeRuleMapper, EncodeRule> implements IEncodeRuleService {
-
-
-}
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/impl/EncodeRuleTableFieldRelateServiceImpl.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/impl/EncodeRuleTableFieldRelateServiceImpl.java
deleted file mode 100644
index 3205641..0000000
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/impl/EncodeRuleTableFieldRelateServiceImpl.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.jeecg.modules.base.service.impl;
-
-import org.jeecg.modules.base.entity.EncodeRuleTableFieldRelate;
-import org.jeecg.modules.base.mapper.EncodeRuleTableFieldRelateMapper;
-import org.jeecg.modules.base.service.IEncodeRuleTableFieldRelateService;
-import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-/**
- * @Description: mom_sys_encode_rule_table_field_relate
- * @Author: jeecg-boot
- * @Date: 2023-05-06
- * @Version: V1.0
- */
-@Service
-public class EncodeRuleTableFieldRelateServiceImpl extends ServiceImpl<EncodeRuleTableFieldRelateMapper, EncodeRuleTableFieldRelate> implements IEncodeRuleTableFieldRelateService {
-
-}
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/impl/EnterpriseAdministratorServiceImpl.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/impl/EnterpriseAdministratorServiceImpl.java
deleted file mode 100644
index 959bbb1..0000000
--- a/lxzn-module-system/lxzn-system-biz/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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/impl/EnterpriseServiceImpl.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/impl/EnterpriseServiceImpl.java
deleted file mode 100644
index a297f68..0000000
--- a/lxzn-module-system/lxzn-system-biz/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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/impl/FactoryElementCategoryServiceImpl.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/impl/FactoryElementCategoryServiceImpl.java
deleted file mode 100644
index ca07a63..0000000
--- a/lxzn-module-system/lxzn-system-biz/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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/impl/FactoryModelServiceImpl.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/impl/FactoryModelServiceImpl.java
deleted file mode 100644
index c0021f8..0000000
--- a/lxzn-module-system/lxzn-system-biz/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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/impl/MaterialCategoryImpl.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/impl/MaterialCategoryImpl.java
deleted file mode 100644
index 356797b..0000000
--- a/lxzn-module-system/lxzn-system-biz/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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/impl/MaterialServiceImpl.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/impl/MaterialServiceImpl.java
deleted file mode 100644
index 3dd61bd..0000000
--- a/lxzn-module-system/lxzn-system-biz/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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/impl/ProductionLineWarehouseClientServiceImpl.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/impl/ProductionLineWarehouseClientServiceImpl.java
deleted file mode 100644
index 5867e50..0000000
--- a/lxzn-module-system/lxzn-system-biz/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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/impl/ProductionLineWarehouseServiceImpl.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/impl/ProductionLineWarehouseServiceImpl.java
deleted file mode 100644
index 1ffad8f..0000000
--- a/lxzn-module-system/lxzn-system-biz/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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/impl/SupplierCategoryServiceImpl.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/impl/SupplierCategoryServiceImpl.java
deleted file mode 100644
index b4a1b18..0000000
--- a/lxzn-module-system/lxzn-system-biz/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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/impl/SupplierContactServiceImpl.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/impl/SupplierContactServiceImpl.java
deleted file mode 100644
index 9217a2d..0000000
--- a/lxzn-module-system/lxzn-system-biz/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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/impl/SupplierServiceImpl.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/impl/SupplierServiceImpl.java
deleted file mode 100644
index 97883f8..0000000
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/impl/SupplierServiceImpl.java
+++ /dev/null
@@ -1,27 +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.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;
-
-/**
- * @Description: mom_base_supplier
- * @Author: jeecg-boot
- * @Date: 2023-03-10
- * @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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/impl/UnitCategoryServiceImpl.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/impl/UnitCategoryServiceImpl.java
deleted file mode 100644
index b1aaa1f..0000000
--- a/lxzn-module-system/lxzn-system-biz/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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/impl/UnitConversionServiceImpl.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/impl/UnitConversionServiceImpl.java
deleted file mode 100644
index db5ec91..0000000
--- a/lxzn-module-system/lxzn-system-biz/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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/impl/UnitServiceImpl.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/impl/UnitServiceImpl.java
deleted file mode 100644
index bf47192..0000000
--- a/lxzn-module-system/lxzn-system-biz/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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/impl/WarehouseAreaServiceImpl.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/impl/WarehouseAreaServiceImpl.java
deleted file mode 100644
index 948994c..0000000
--- a/lxzn-module-system/lxzn-system-biz/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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/impl/WarehouseClientServiceImpl.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/impl/WarehouseClientServiceImpl.java
deleted file mode 100644
index 8497ad4..0000000
--- a/lxzn-module-system/lxzn-system-biz/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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/impl/WarehouseLocationServiceImpl.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/impl/WarehouseLocationServiceImpl.java
deleted file mode 100644
index 256b2bf..0000000
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/impl/WarehouseLocationServiceImpl.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package org.jeecg.modules.base.service.impl;
-
-import org.jeecg.modules.base.entity.WarehouseLocation;
-import org.jeecg.modules.base.mapper.WarehouseLocationMapper;
-import org.jeecg.modules.base.mapper.WarehouseMapper;
-import org.jeecg.modules.base.service.IWarehouseLocationService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-/**
- * @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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/impl/WarehouseServiceImpl.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/impl/WarehouseServiceImpl.java
deleted file mode 100644
index d9e1038..0000000
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/impl/WarehouseServiceImpl.java
+++ /dev/null
@@ -1,106 +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.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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/impl/WorkCenterEquipmentServiceImpl.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/impl/WorkCenterEquipmentServiceImpl.java
deleted file mode 100644
index 499101b..0000000
--- a/lxzn-module-system/lxzn-system-biz/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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/impl/WorkCenterServiceImpl.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/impl/WorkCenterServiceImpl.java
deleted file mode 100644
index 589f06d..0000000
--- a/lxzn-module-system/lxzn-system-biz/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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/impl/WorkCenterUserServiceImpl.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/service/impl/WorkCenterUserServiceImpl.java
deleted file mode 100644
index bc4153f..0000000
--- a/lxzn-module-system/lxzn-system-biz/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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/AdministratorController.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/AdministratorController.java
deleted file mode 100644
index af70b1a..0000000
--- a/lxzn-module-system/lxzn-system-biz/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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/entity/Administrator.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/entity/Administrator.java
deleted file mode 100644
index 696bc01..0000000
--- a/lxzn-module-system/lxzn-system-biz/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 java.lang.String id;
- /**缂栫爜*/
- @Excel(name = "缂栫爜", width = 15)
- @ApiModelProperty(value = "缂栫爜")
- private java.lang.String code;
- /**浼佷笟ID*/
- @Excel(name = "浼佷笟ID", width = 15)
- @ApiModelProperty(value = "浼佷笟ID")
- private java.lang.String enterpriseId;
- /**璐︽埛*/
- @Excel(name = "璐︽埛", width = 15)
- @ApiModelProperty(value = "璐︽埛")
- private java.lang.String account;
- /**鍚嶇О*/
- @Excel(name = "鍚嶇О", width = 15)
- @ApiModelProperty(value = "鍚嶇О")
- private java.lang.String name;
- /**瀵嗙爜*/
- @Excel(name = "瀵嗙爜", width = 15)
- @ApiModelProperty(value = "瀵嗙爜")
- private java.lang.String password;
- /**瀵嗙爜绛栫暐ID*/
- @Excel(name = "瀵嗙爜绛栫暐ID", width = 15)
- @ApiModelProperty(value = "瀵嗙爜绛栫暐ID")
- private java.lang.String passwordStrategyId;
- /**澶囨敞*/
- @Excel(name = "澶囨敞", width = 15)
- @ApiModelProperty(value = "澶囨敞")
- private java.lang.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 java.lang.String sysAdministratorUda1;
- /**澶囩敤瀛楁2*/
- @Excel(name = "澶囩敤瀛楁2", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁2")
- private java.lang.String sysAdministratorUda2;
- /**澶囩敤瀛楁3*/
- @Excel(name = "澶囩敤瀛楁3", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁3")
- private java.lang.String sysAdministratorUda3;
- /**澶囩敤瀛楁4*/
- @Excel(name = "澶囩敤瀛楁4", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁4")
- private java.lang.String sysAdministratorUda4;
- /**澶囩敤瀛楁5*/
- @Excel(name = "澶囩敤瀛楁5", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁5")
- private java.lang.String sysAdministratorUda5;
- /**鍒涘缓浜�*/
- @ApiModelProperty(value = "鍒涘缓浜�")
- private java.lang.String createBy;
- /**鍒涘缓鏃堕棿*/
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
- @DateTimeFormat(pattern="yyyy-MM-dd")
- @ApiModelProperty(value = "鍒涘缓鏃堕棿")
- private java.util.Date createTime;
- /**鏇存柊浜�*/
- @ApiModelProperty(value = "鏇存柊浜�")
- private java.lang.String updateBy;
- /**鏇存柊鏃堕棿*/
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
- @DateTimeFormat(pattern="yyyy-MM-dd")
- @ApiModelProperty(value = "鏇存柊鏃堕棿")
- private java.util.Date updateTime;
- /**绉熸埛ID*/
- @Excel(name = "绉熸埛ID", width = 15)
- @ApiModelProperty(value = "绉熸埛ID")
- private java.lang.String tenantId;
- /**鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)*/
- @Excel(name = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)", width = 15)
- @ApiModelProperty(value = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)")
- private java.lang.Integer delFlag;
-}
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/AdministratorMapper.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/AdministratorMapper.java
deleted file mode 100644
index 6d0faf6..0000000
--- a/lxzn-module-system/lxzn-system-biz/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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/AdministratorMapper.xml b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/AdministratorMapper.xml
deleted file mode 100644
index 4d4a78f..0000000
--- a/lxzn-module-system/lxzn-system-biz/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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/MdcProductionMapper.xml b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/MdcProductionMapper.xml
index 119e935..e162190 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/MdcProductionMapper.xml
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/MdcProductionMapper.xml
@@ -4,31 +4,31 @@
<!--閫掑綊鏌ヨ鎵�鏈夊瓙鑺傜偣-->
<select id="recursionChildren" resultType="java.lang.String">
- WITH temp ( id ) AS (
+ WITH RECURSIVE temp ( id ) AS (
SELECT
id
FROM
mdc_production
WHERE
- id = #{ productionId } UNION ALL
+ id = #{productionId} UNION ALL
SELECT
a.id
FROM
mdc_production a
- INNER JOIN temp ON a.parent_id = temp.id
+ INNER JOIN temp ON a.parent_id = temp.id
) SELECT
*
- FROM
- temp
+ 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 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} LIMIT 1
</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 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' LIMIT 1
</select>
</mapper>
\ No newline at end of file
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysAnnouncementSendMapper.xml b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysAnnouncementSendMapper.xml
index df2baa5..e063f9b 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysAnnouncementSendMapper.xml
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysAnnouncementSendMapper.xml
@@ -126,7 +126,7 @@
</select>
<select id="findLastMessage" resultType="org.jeecg.modules.system.entity.SysAnnouncement">
- SELECT TOP 1 * FROM sys_announcement WHERE msg_content = #{messageContent} ORDER BY create_time DESC;
+ SELECT * FROM sys_announcement WHERE msg_content = #{messageContent} ORDER BY create_time DESC LIMIT 1
</select>
</mapper>
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/IAdministratorService.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/IAdministratorService.java
deleted file mode 100644
index 0f6f8db..0000000
--- a/lxzn-module-system/lxzn-system-biz/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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/AdministratorServiceImpl.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/AdministratorServiceImpl.java
deleted file mode 100644
index 3bebf27..0000000
--- a/lxzn-module-system/lxzn-system-biz/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/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java
index 60e2b6f..4c3ca95 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java
+++ b/lxzn-module-system/lxzn-system-biz/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;
@@ -125,12 +122,6 @@
@Autowired
private IDataVersionService dataVersionService;
-
- @Autowired
- private IUnitService unitService;
- @Autowired
- private IEnterpriseService enterpriseService;
-
@Autowired
private IQuartzJobService quartzJobService;
@@ -1382,16 +1373,6 @@
}
@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) {
return sysDictService.queryDictTextByKey(dictCode, key);
@@ -1416,18 +1397,6 @@
@Override
public void removeDataVersionById(String id) {
dataVersionService.removeById(id);
- }
-
- /**
- * 鏍规嵁浼佷笟ID鑾峰彇浼佷笟鍚嶇О
- *
- * @param enterpriseId
- * @return
- */
- @Override
- public String getEnterpriseNameById(String enterpriseId) {
- String enterpriseName = enterpriseService.getById(enterpriseId).getName();
- return enterpriseName;
}
@Override
diff --git a/pom.xml b/pom.xml
index b516fa3..9d48d3f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,6 +59,8 @@
<!-- Log4j2鐖嗛浄婕忔礊 -->
<log4j2.version>2.17.0</log4j2.version>
<logback.version>1.2.9</logback.version>
+ <!--jexl3-->
+ <jexl.version>3.2.1</jexl.version>
</properties>
<modules>
--
Gitblit v1.9.3