diff --git a/op-common/op-common-datasource/op-common-datasource.iml b/op-common/op-common-datasource/op-common-datasource.iml
index 973daa5e..0ed4ebdd 100644
--- a/op-common/op-common-datasource/op-common-datasource.iml
+++ b/op-common/op-common-datasource/op-common-datasource.iml
@@ -10,6 +10,7 @@
+
diff --git a/op-modules/op-device/op-modules-device.iml b/op-modules/op-device/op-modules-device.iml
new file mode 100644
index 00000000..87189627
--- /dev/null
+++ b/op-modules/op-device/op-modules-device.iml
@@ -0,0 +1,224 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/op-modules/op-device/pom.xml b/op-modules/op-device/pom.xml
new file mode 100644
index 00000000..d3789e64
--- /dev/null
+++ b/op-modules/op-device/pom.xml
@@ -0,0 +1,105 @@
+
+
+
+ com.op
+ op-modules
+ 0.0.1
+
+ 4.0.0
+
+ op-modules-device
+
+
+ op-modules-device系统模块
+
+
+
+
+
+
+ com.alibaba.cloud
+ spring-cloud-starter-alibaba-nacos-discovery
+
+
+
+
+ com.alibaba.cloud
+ spring-cloud-starter-alibaba-nacos-config
+
+
+
+
+ com.alibaba.cloud
+ spring-cloud-starter-alibaba-sentinel
+
+
+
+
+ org.springframework.boot
+ spring-boot-starter-actuator
+
+
+
+
+ io.springfox
+ springfox-swagger-ui
+ ${swagger.fox.version}
+
+
+
+
+ mysql
+ mysql-connector-java
+
+
+
+ com.microsoft.sqlserver
+ mssql-jdbc
+ 6.1.0.jre8
+
+
+
+ com.op
+ op-common-datasource
+
+
+
+
+ com.op
+ op-common-datascope
+
+
+
+
+ com.op
+ op-common-log
+
+
+
+
+ com.op
+ op-common-swagger
+
+
+
+
+
+ ${project.artifactId}
+
+
+ org.springframework.boot
+ spring-boot-maven-plugin
+
+
+
+ repackage
+
+
+
+
+
+
+
+
diff --git a/op-modules/op-device/src/main/java/com/op/device/DeviceApplication.java b/op-modules/op-device/src/main/java/com/op/device/DeviceApplication.java
new file mode 100644
index 00000000..e832dec7
--- /dev/null
+++ b/op-modules/op-device/src/main/java/com/op/device/DeviceApplication.java
@@ -0,0 +1,30 @@
+package com.op.device;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import com.op.common.security.annotation.EnableCustomConfig;
+import com.op.common.security.annotation.EnableRyFeignClients;
+import com.op.common.swagger.annotation.EnableCustomSwagger2;
+
+/**
+ * 系统模块
+ *
+ * @author OP
+ */
+@EnableCustomConfig
+@EnableCustomSwagger2
+@EnableRyFeignClients
+@SpringBootApplication
+public class DeviceApplication {
+ public static void main(String[] args) {
+ SpringApplication.run(DeviceApplication.class, args);
+ System.err.println("设备服务启动成功\n"
+ + " | | \r\n"
+ + " ___ _ __ ______ ___ _ _ ___| |_ ___ _ __ ___ \r\n"
+ + " / _ \\| '_ \\______/ __| | | / __| __/ _ \\ '_ ` _ \\ \r\n"
+ + "| (_) | |_) | \\__ \\ |_| \\__ \\ || __/ | | | | |\r\n"
+ + " \\___/| .__/ |___/\\__, |___/\\__\\___|_| |_| |_|\r\n"
+ + " | | __/ | \r\n"
+ + " |_| |___/ \r\n");
+ }
+}
diff --git a/op-modules/op-device/src/main/resources/banner.txt b/op-modules/op-device/src/main/resources/banner.txt
new file mode 100644
index 00000000..e8a75ab1
--- /dev/null
+++ b/op-modules/op-device/src/main/resources/banner.txt
@@ -0,0 +1,10 @@
+Spring Boot Version: ${spring-boot.version}
+Spring Application Name: ${spring.application.name}
+ _
+ | |
+ ___ _ __ ______ ___ _ _ ___| |_ ___ _ __ ___
+ / _ \| '_ \______/ __| | | / __| __/ _ \ '_ ` _ \
+| (_) | |_) | \__ \ |_| \__ \ || __/ | | | | |
+ \___/| .__/ |___/\__, |___/\__\___|_| |_| |_|
+ | | __/ |
+ |_| |___/
diff --git a/op-modules/op-device/src/main/resources/bootstrap.yml b/op-modules/op-device/src/main/resources/bootstrap.yml
new file mode 100644
index 00000000..ef6af865
--- /dev/null
+++ b/op-modules/op-device/src/main/resources/bootstrap.yml
@@ -0,0 +1,31 @@
+# Tomcat
+server:
+ port: 9208
+
+# Spring
+spring:
+ application:
+ # 应用名称
+ name: op-device
+ profiles:
+ # 环境配置
+ active: dev
+ cloud:
+ nacos:
+ discovery:
+ namespace: lanju-op
+ group: zxl
+ # 服务注册地址
+ server-addr: 140.249.53.142:8848
+ config:
+ namespace: lanju-op
+ group: zxl
+ #命名空间
+ #group: local
+ # 配置中心地址
+ server-addr: 140.249.53.142:8848
+ # 配置文件格式
+ file-extension: yml
+ # 共享配置
+ shared-configs:
+ - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
diff --git a/op-modules/op-device/src/main/resources/logback.xml b/op-modules/op-device/src/main/resources/logback.xml
new file mode 100644
index 00000000..1b5726ff
--- /dev/null
+++ b/op-modules/op-device/src/main/resources/logback.xml
@@ -0,0 +1,74 @@
+
+
+
+
+
+
+
+
+
+
+ ${log.pattern}
+
+
+
+
+
+ ${log.path}/info.log
+
+
+
+ ${log.path}/info.%d{yyyy-MM-dd}.log
+
+ 60
+
+
+ ${log.pattern}
+
+
+
+ INFO
+
+ ACCEPT
+
+ DENY
+
+
+
+
+ ${log.path}/error.log
+
+
+
+ ${log.path}/error.%d{yyyy-MM-dd}.log
+
+ 60
+
+
+ ${log.pattern}
+
+
+
+ ERROR
+
+ ACCEPT
+
+ DENY
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/op-modules/op-energy/op-modules-engery.iml b/op-modules/op-energy/op-modules-engery.iml
new file mode 100644
index 00000000..87189627
--- /dev/null
+++ b/op-modules/op-energy/op-modules-engery.iml
@@ -0,0 +1,224 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/op-modules/op-energy/pom.xml b/op-modules/op-energy/pom.xml
new file mode 100644
index 00000000..dcb43054
--- /dev/null
+++ b/op-modules/op-energy/pom.xml
@@ -0,0 +1,105 @@
+
+
+
+ com.op
+ op-modules
+ 0.0.1
+
+ 4.0.0
+
+ op-modules-engery
+
+
+ op-modules-engery系统模块
+
+
+
+
+
+
+ com.alibaba.cloud
+ spring-cloud-starter-alibaba-nacos-discovery
+
+
+
+
+ com.alibaba.cloud
+ spring-cloud-starter-alibaba-nacos-config
+
+
+
+
+ com.alibaba.cloud
+ spring-cloud-starter-alibaba-sentinel
+
+
+
+
+ org.springframework.boot
+ spring-boot-starter-actuator
+
+
+
+
+ io.springfox
+ springfox-swagger-ui
+ ${swagger.fox.version}
+
+
+
+
+ mysql
+ mysql-connector-java
+
+
+
+ com.microsoft.sqlserver
+ mssql-jdbc
+ 6.1.0.jre8
+
+
+
+ com.op
+ op-common-datasource
+
+
+
+
+ com.op
+ op-common-datascope
+
+
+
+
+ com.op
+ op-common-log
+
+
+
+
+ com.op
+ op-common-swagger
+
+
+
+
+
+ ${project.artifactId}
+
+
+ org.springframework.boot
+ spring-boot-maven-plugin
+
+
+
+ repackage
+
+
+
+
+
+
+
+
diff --git a/op-modules/op-energy/src/main/java/com/op/energy/EnergyApplication.java b/op-modules/op-energy/src/main/java/com/op/energy/EnergyApplication.java
new file mode 100644
index 00000000..a751742c
--- /dev/null
+++ b/op-modules/op-energy/src/main/java/com/op/energy/EnergyApplication.java
@@ -0,0 +1,30 @@
+package com.op.energy;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import com.op.common.security.annotation.EnableCustomConfig;
+import com.op.common.security.annotation.EnableRyFeignClients;
+import com.op.common.swagger.annotation.EnableCustomSwagger2;
+
+/**
+ * 系统模块
+ *
+ * @author OP
+ */
+@EnableCustomConfig
+@EnableCustomSwagger2
+@EnableRyFeignClients
+@SpringBootApplication
+public class EnergyApplication {
+ public static void main(String[] args) {
+ SpringApplication.run(EnergyApplication.class, args);
+ System.err.println("能源服务启动成功\n"
+ + " | | \r\n"
+ + " ___ _ __ ______ ___ _ _ ___| |_ ___ _ __ ___ \r\n"
+ + " / _ \\| '_ \\______/ __| | | / __| __/ _ \\ '_ ` _ \\ \r\n"
+ + "| (_) | |_) | \\__ \\ |_| \\__ \\ || __/ | | | | |\r\n"
+ + " \\___/| .__/ |___/\\__, |___/\\__\\___|_| |_| |_|\r\n"
+ + " | | __/ | \r\n"
+ + " |_| |___/ \r\n");
+ }
+}
diff --git a/op-modules/op-energy/src/main/resources/banner.txt b/op-modules/op-energy/src/main/resources/banner.txt
new file mode 100644
index 00000000..e8a75ab1
--- /dev/null
+++ b/op-modules/op-energy/src/main/resources/banner.txt
@@ -0,0 +1,10 @@
+Spring Boot Version: ${spring-boot.version}
+Spring Application Name: ${spring.application.name}
+ _
+ | |
+ ___ _ __ ______ ___ _ _ ___| |_ ___ _ __ ___
+ / _ \| '_ \______/ __| | | / __| __/ _ \ '_ ` _ \
+| (_) | |_) | \__ \ |_| \__ \ || __/ | | | | |
+ \___/| .__/ |___/\__, |___/\__\___|_| |_| |_|
+ | | __/ |
+ |_| |___/
diff --git a/op-modules/op-energy/src/main/resources/bootstrap.yml b/op-modules/op-energy/src/main/resources/bootstrap.yml
new file mode 100644
index 00000000..e1009be0
--- /dev/null
+++ b/op-modules/op-energy/src/main/resources/bootstrap.yml
@@ -0,0 +1,31 @@
+# Tomcat
+server:
+ port: 9209
+
+# Spring
+spring:
+ application:
+ # 应用名称
+ name: op-engery
+ profiles:
+ # 环境配置
+ active: dev
+ cloud:
+ nacos:
+ discovery:
+ namespace: lanju-op
+ group: zxl
+ # 服务注册地址
+ server-addr: 140.249.53.142:8848
+ config:
+ namespace: lanju-op
+ group: zxl
+ #命名空间
+ #group: local
+ # 配置中心地址
+ server-addr: 140.249.53.142:8848
+ # 配置文件格式
+ file-extension: yml
+ # 共享配置
+ shared-configs:
+ - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
diff --git a/op-modules/op-energy/src/main/resources/logback.xml b/op-modules/op-energy/src/main/resources/logback.xml
new file mode 100644
index 00000000..1b5726ff
--- /dev/null
+++ b/op-modules/op-energy/src/main/resources/logback.xml
@@ -0,0 +1,74 @@
+
+
+
+
+
+
+
+
+
+
+ ${log.pattern}
+
+
+
+
+
+ ${log.path}/info.log
+
+
+
+ ${log.path}/info.%d{yyyy-MM-dd}.log
+
+ 60
+
+
+ ${log.pattern}
+
+
+
+ INFO
+
+ ACCEPT
+
+ DENY
+
+
+
+
+ ${log.path}/error.log
+
+
+
+ ${log.path}/error.%d{yyyy-MM-dd}.log
+
+ 60
+
+
+ ${log.pattern}
+
+
+
+ ERROR
+
+ ACCEPT
+
+ DENY
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/op-modules/op-job/src/main/resources/bootstrap.yml b/op-modules/op-job/src/main/resources/bootstrap.yml
index 52a01cdd..efda0fba 100644
--- a/op-modules/op-job/src/main/resources/bootstrap.yml
+++ b/op-modules/op-job/src/main/resources/bootstrap.yml
@@ -14,12 +14,12 @@ spring:
nacos:
discovery:
namespace: lanju-op
- group: ywl
+ group: zxl
# 服务注册地址
server-addr: 140.249.53.142:8848
config:
namespace: lanju-op
- group: ywl
+ group: zxl
#命名空间
#group: local
# 配置中心地址
diff --git a/op-modules/op-mes/op-modules-mes.iml b/op-modules/op-mes/op-modules-mes.iml
index 0cd655a4..c65dbc08 100644
--- a/op-modules/op-mes/op-modules-mes.iml
+++ b/op-modules/op-mes/op-modules-mes.iml
@@ -23,12 +23,10 @@
-
-
@@ -119,7 +117,6 @@
-
@@ -214,6 +211,9 @@
+
+
+
diff --git a/op-modules/op-mes/pom.xml b/op-modules/op-mes/pom.xml
index e6d1bea4..c87eeab6 100644
--- a/op-modules/op-mes/pom.xml
+++ b/op-modules/op-mes/pom.xml
@@ -82,6 +82,12 @@
com.op
op-common-swagger
+
+
+ org.apache.httpcomponents
+ httpclient
+ 4.5.12
+
diff --git a/op-modules/op-mes/src/main/java/com/op/mes/controller/ProWorkorderProcessDetailController.java b/op-modules/op-mes/src/main/java/com/op/mes/controller/ProWorkorderProcessDetailController.java
new file mode 100644
index 00000000..9bd655f4
--- /dev/null
+++ b/op-modules/op-mes/src/main/java/com/op/mes/controller/ProWorkorderProcessDetailController.java
@@ -0,0 +1,97 @@
+package com.op.mes.controller;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.op.common.log.annotation.Log;
+import com.op.common.log.enums.BusinessType;
+//import com.op.common.security.annotation.RequiresPermissions;
+import com.op.mes.domain.ProWorkorderProcessDetail;
+import com.op.mes.service.IProWorkorderProcessDetailService;
+import com.op.common.core.web.controller.BaseController;
+import com.op.common.core.web.domain.AjaxResult;
+import com.op.common.core.utils.poi.ExcelUtil;
+import com.op.common.core.web.page.TableDataInfo;
+
+/**
+ * 生产工单制程明细Controller
+ *
+ * @author Open Platform
+ * @date 2023-07-28
+ */
+@RestController
+@RequestMapping("/detail")
+public class ProWorkorderProcessDetailController extends BaseController {
+ @Autowired
+ private IProWorkorderProcessDetailService proWorkorderProcessDetailService;
+
+ /**
+ * 查询生产工单制程明细列表
+ */
+ //@RequiresPermissions("mes:detail:list")
+ @GetMapping("/list")
+ public TableDataInfo list(ProWorkorderProcessDetail proWorkorderProcessDetail) {
+ startPage();
+ List list = proWorkorderProcessDetailService.selectProWorkorderProcessDetailList(proWorkorderProcessDetail);
+ return getDataTable(list);
+ }
+
+ /**
+ * 导出生产工单制程明细列表
+ */
+ //@RequiresPermissions("mes:detail:export")
+ @Log(title = "生产工单制程明细", businessType = BusinessType.EXPORT)
+ @PostMapping("/export")
+ public void export(HttpServletResponse response, ProWorkorderProcessDetail proWorkorderProcessDetail) {
+ List list = proWorkorderProcessDetailService.selectProWorkorderProcessDetailList(proWorkorderProcessDetail);
+ ExcelUtil util = new ExcelUtil(ProWorkorderProcessDetail.class);
+ util.exportExcel(response, list, "生产工单制程明细数据");
+ }
+
+ /**
+ * 获取生产工单制程明细详细信息
+ */
+ //@RequiresPermissions("mes:detail:query")
+ @GetMapping(value = "/{recordId}")
+ public AjaxResult getInfo(@PathVariable("recordId") String recordId) {
+ return success(proWorkorderProcessDetailService.selectProWorkorderProcessDetailByRecordId(recordId));
+ }
+
+ /**
+ * 新增生产工单制程明细
+ */
+ //@RequiresPermissions("mes:detail:add")
+ @Log(title = "生产工单制程明细", businessType = BusinessType.INSERT)
+ @PostMapping
+ public AjaxResult add(@RequestBody ProWorkorderProcessDetail proWorkorderProcessDetail) {
+ return toAjax(proWorkorderProcessDetailService.insertProWorkorderProcessDetail(proWorkorderProcessDetail));
+ }
+
+ /**
+ * 修改生产工单制程明细
+ */
+ //@RequiresPermissions("mes:detail:edit")
+ @Log(title = "生产工单制程明细", businessType = BusinessType.UPDATE)
+ @PutMapping
+ public AjaxResult edit(@RequestBody ProWorkorderProcessDetail proWorkorderProcessDetail) {
+ return toAjax(proWorkorderProcessDetailService.updateProWorkorderProcessDetail(proWorkorderProcessDetail));
+ }
+
+ /**
+ * 删除生产工单制程明细
+ */
+ //@RequiresPermissions("mes:detail:remove")
+ @Log(title = "生产工单制程明细", businessType = BusinessType.DELETE)
+ @DeleteMapping("/{recordIds}")
+ public AjaxResult remove(@PathVariable String[] recordIds) {
+ return toAjax(proWorkorderProcessDetailService.deleteProWorkorderProcessDetailByRecordIds(recordIds));
+ }
+}
diff --git a/op-modules/op-mes/src/main/java/com/op/mes/domain/ProWorkorderProcessDetail.java b/op-modules/op-mes/src/main/java/com/op/mes/domain/ProWorkorderProcessDetail.java
new file mode 100644
index 00000000..88086a34
--- /dev/null
+++ b/op-modules/op-mes/src/main/java/com/op/mes/domain/ProWorkorderProcessDetail.java
@@ -0,0 +1,207 @@
+package com.op.mes.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.op.common.core.annotation.Excel;
+import com.op.common.core.web.domain.BaseEntity;
+
+/**
+ * 生产工单制程明细对象 pro_workorder_process_detail
+ *
+ * @author Open Platform
+ * @date 2023-07-28
+ */
+public class ProWorkorderProcessDetail extends BaseEntity {
+ private static final long serialVersionUID = 1L;
+
+ /** 工单ID */
+ private String recordId;
+
+ /** 工单ID */
+ @Excel(name = "工单ID")
+ private String workorderId;
+
+ /** 工序ID */
+ @Excel(name = "工序ID")
+ private String processId;
+
+ /** 状态 */
+ @Excel(name = "状态")
+ private String status;
+
+ /** 预留字段1 */
+ @Excel(name = "预留字段1")
+ private String attr1;
+
+ /** 预留字段2 */
+ @Excel(name = "预留字段2")
+ private String attr2;
+
+ /** 预留字段3 */
+ @Excel(name = "预留字段3")
+ private String attr3;
+
+ /** 预留字段4 */
+ @Excel(name = "预留字段4")
+ private String attr4;
+
+ /** 产品类型 */
+ @Excel(name = "产品类型")
+ private String prodType;
+
+ /** $column.columnComment */
+ @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+ private String factoryCode;
+
+ /** 上位机id */
+ @Excel(name = "上位机id")
+ private String machineId;
+
+ /** 上位机编码 */
+ @Excel(name = "上位机编码")
+ private String machineCode;
+
+ /** 工艺id */
+ @Excel(name = "工艺id")
+ private String routeId;
+
+ /** 工艺版本 */
+ @Excel(name = "工艺版本")
+ private String routeVersion;
+
+ /** 工艺编码 */
+ @Excel(name = "工艺编码")
+ private String routeCode;
+
+ public void setRecordId(String recordId) {
+ this.recordId = recordId;
+ }
+
+ public String getRecordId() {
+ return recordId;
+ }
+ public void setWorkorderId(String workorderId) {
+ this.workorderId = workorderId;
+ }
+
+ public String getWorkorderId() {
+ return workorderId;
+ }
+ public void setProcessId(String processId) {
+ this.processId = processId;
+ }
+
+ public String getProcessId() {
+ return processId;
+ }
+ public void setStatus(String status) {
+ this.status = status;
+ }
+
+ public String getStatus() {
+ return status;
+ }
+ public void setAttr1(String attr1) {
+ this.attr1 = attr1;
+ }
+
+ public String getAttr1() {
+ return attr1;
+ }
+ public void setAttr2(String attr2) {
+ this.attr2 = attr2;
+ }
+
+ public String getAttr2() {
+ return attr2;
+ }
+ public void setAttr3(String attr3) {
+ this.attr3 = attr3;
+ }
+
+ public String getAttr3() {
+ return attr3;
+ }
+ public void setAttr4(String attr4) {
+ this.attr4 = attr4;
+ }
+
+ public String getAttr4() {
+ return attr4;
+ }
+ public void setProdType(String prodType) {
+ this.prodType = prodType;
+ }
+
+ public String getProdType() {
+ return prodType;
+ }
+ public void setFactoryCode(String factoryCode) {
+ this.factoryCode = factoryCode;
+ }
+
+ public String getFactoryCode() {
+ return factoryCode;
+ }
+ public void setMachineId(String machineId) {
+ this.machineId = machineId;
+ }
+
+ public String getMachineId() {
+ return machineId;
+ }
+ public void setMachineCode(String machineCode) {
+ this.machineCode = machineCode;
+ }
+
+ public String getMachineCode() {
+ return machineCode;
+ }
+ public void setRouteId(String routeId) {
+ this.routeId = routeId;
+ }
+
+ public String getRouteId() {
+ return routeId;
+ }
+ public void setRouteVersion(String routeVersion) {
+ this.routeVersion = routeVersion;
+ }
+
+ public String getRouteVersion() {
+ return routeVersion;
+ }
+ public void setRouteCode(String routeCode) {
+ this.routeCode = routeCode;
+ }
+
+ public String getRouteCode() {
+ return routeCode;
+ }
+
+ @Override
+ public String toString() {
+ return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+ .append("recordId", getRecordId())
+ .append("workorderId", getWorkorderId())
+ .append("processId", getProcessId())
+ .append("status", getStatus())
+ .append("remark", getRemark())
+ .append("attr1", getAttr1())
+ .append("attr2", getAttr2())
+ .append("attr3", getAttr3())
+ .append("attr4", getAttr4())
+ .append("createBy", getCreateBy())
+ .append("createTime", getCreateTime())
+ .append("updateBy", getUpdateBy())
+ .append("updateTime", getUpdateTime())
+ .append("prodType", getProdType())
+ .append("factoryCode", getFactoryCode())
+ .append("machineId", getMachineId())
+ .append("machineCode", getMachineCode())
+ .append("routeId", getRouteId())
+ .append("routeVersion", getRouteVersion())
+ .append("routeCode", getRouteCode())
+ .toString();
+ }
+}
diff --git a/op-modules/op-mes/src/main/java/com/op/mes/mapper/ProOrderMapper.java b/op-modules/op-mes/src/main/java/com/op/mes/mapper/ProOrderMapper.java
index d76ec4ae..75aec61d 100644
--- a/op-modules/op-mes/src/main/java/com/op/mes/mapper/ProOrderMapper.java
+++ b/op-modules/op-mes/src/main/java/com/op/mes/mapper/ProOrderMapper.java
@@ -8,6 +8,7 @@ import com.op.mes.domain.ProOrder;
import com.op.mes.domain.ProShift;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.op.mes.domain.*;
+import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
@@ -17,6 +18,7 @@ import org.apache.ibatis.annotations.Select;
* @author Open Platform
* @date 2023-07-13
*/
+@Mapper
public interface ProOrderMapper {
/**
diff --git a/op-modules/op-mes/src/main/java/com/op/mes/mapper/ProOrderWorkorderBatchMapper.java b/op-modules/op-mes/src/main/java/com/op/mes/mapper/ProOrderWorkorderBatchMapper.java
index 25837cf2..8ca73e08 100644
--- a/op-modules/op-mes/src/main/java/com/op/mes/mapper/ProOrderWorkorderBatchMapper.java
+++ b/op-modules/op-mes/src/main/java/com/op/mes/mapper/ProOrderWorkorderBatchMapper.java
@@ -1,6 +1,7 @@
package com.op.mes.mapper;
import com.op.mes.domain.ProOrderWorkorderBatch;
+import org.apache.ibatis.annotations.Mapper;
import java.util.List;
@@ -10,6 +11,7 @@ import java.util.List;
* @author Open Platform
* @date 2023-07-18
*/
+@Mapper
public interface ProOrderWorkorderBatchMapper {
/**
* 查询生产工单批次
diff --git a/op-modules/op-mes/src/main/java/com/op/mes/mapper/ProOrderWorkorderMapper.java b/op-modules/op-mes/src/main/java/com/op/mes/mapper/ProOrderWorkorderMapper.java
index 8cce613d..390bda7d 100644
--- a/op-modules/op-mes/src/main/java/com/op/mes/mapper/ProOrderWorkorderMapper.java
+++ b/op-modules/op-mes/src/main/java/com/op/mes/mapper/ProOrderWorkorderMapper.java
@@ -12,6 +12,7 @@ import java.util.List;
* @author Open Platform
* @date 2023-07-18
*/
+@Mapper
public interface ProOrderWorkorderMapper {
/**
* 查询生产工单
@@ -84,8 +85,6 @@ public interface ProOrderWorkorderMapper {
* @return
*/
List selectWorkOrderByTime(Date productDate);
- /**下发生产订单**/
- public int downProOrderWorkorderByWorkorderIds(String[] workorderIds);
/**
* 通过订单id查询最大的code的工单
@@ -94,4 +93,9 @@ public interface ProOrderWorkorderMapper {
* @return
*/
String selectEndWorkOrder(String id);
+
+ ProOrderWorkorder selectWorkOrderByCode(String workorderCode);
+ /**下发生产订单**/
+ public int downProOrderWorkorderByWorkorderIds(String[] workorderIds);
}
+
diff --git a/op-modules/op-mes/src/main/java/com/op/mes/mapper/ProWorkorderProcessDetailMapper.java b/op-modules/op-mes/src/main/java/com/op/mes/mapper/ProWorkorderProcessDetailMapper.java
new file mode 100644
index 00000000..86fd9308
--- /dev/null
+++ b/op-modules/op-mes/src/main/java/com/op/mes/mapper/ProWorkorderProcessDetailMapper.java
@@ -0,0 +1,61 @@
+package com.op.mes.mapper;
+
+import java.util.List;
+
+import com.op.mes.domain.ProWorkorderProcessDetail;
+
+/**
+ * 生产工单制程明细Mapper接口
+ *
+ * @author Open Platform
+ * @date 2023-07-28
+ */
+public interface ProWorkorderProcessDetailMapper {
+ /**
+ * 查询生产工单制程明细
+ *
+ * @param recordId 生产工单制程明细主键
+ * @return 生产工单制程明细
+ */
+ public ProWorkorderProcessDetail selectProWorkorderProcessDetailByRecordId(String recordId);
+
+ /**
+ * 查询生产工单制程明细列表
+ *
+ * @param proWorkorderProcessDetail 生产工单制程明细
+ * @return 生产工单制程明细集合
+ */
+ public List selectProWorkorderProcessDetailList(ProWorkorderProcessDetail proWorkorderProcessDetail);
+
+ /**
+ * 新增生产工单制程明细
+ *
+ * @param proWorkorderProcessDetail 生产工单制程明细
+ * @return 结果
+ */
+ public int insertProWorkorderProcessDetail(ProWorkorderProcessDetail proWorkorderProcessDetail);
+
+ /**
+ * 修改生产工单制程明细
+ *
+ * @param proWorkorderProcessDetail 生产工单制程明细
+ * @return 结果
+ */
+ public int updateProWorkorderProcessDetail(ProWorkorderProcessDetail proWorkorderProcessDetail);
+
+ /**
+ * 删除生产工单制程明细
+ *
+ * @param recordId 生产工单制程明细主键
+ * @return 结果
+ */
+ public int deleteProWorkorderProcessDetailByRecordId(String recordId);
+
+ /**
+ * 批量删除生产工单制程明细
+ *
+ * @param recordIds 需要删除的数据主键集合
+ * @return 结果
+ */
+ public int deleteProWorkorderProcessDetailByRecordIds(String[] recordIds);
+}
diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/IProWorkorderProcessDetailService.java b/op-modules/op-mes/src/main/java/com/op/mes/service/IProWorkorderProcessDetailService.java
new file mode 100644
index 00000000..09b52666
--- /dev/null
+++ b/op-modules/op-mes/src/main/java/com/op/mes/service/IProWorkorderProcessDetailService.java
@@ -0,0 +1,60 @@
+package com.op.mes.service;
+
+import java.util.List;
+import com.op.mes.domain.ProWorkorderProcessDetail;
+
+/**
+ * 生产工单制程明细Service接口
+ *
+ * @author Open Platform
+ * @date 2023-07-28
+ */
+public interface IProWorkorderProcessDetailService {
+ /**
+ * 查询生产工单制程明细
+ *
+ * @param recordId 生产工单制程明细主键
+ * @return 生产工单制程明细
+ */
+ public ProWorkorderProcessDetail selectProWorkorderProcessDetailByRecordId(String recordId);
+
+ /**
+ * 查询生产工单制程明细列表
+ *
+ * @param proWorkorderProcessDetail 生产工单制程明细
+ * @return 生产工单制程明细集合
+ */
+ public List selectProWorkorderProcessDetailList(ProWorkorderProcessDetail proWorkorderProcessDetail);
+
+ /**
+ * 新增生产工单制程明细
+ *
+ * @param proWorkorderProcessDetail 生产工单制程明细
+ * @return 结果
+ */
+ public int insertProWorkorderProcessDetail(ProWorkorderProcessDetail proWorkorderProcessDetail);
+
+ /**
+ * 修改生产工单制程明细
+ *
+ * @param proWorkorderProcessDetail 生产工单制程明细
+ * @return 结果
+ */
+ public int updateProWorkorderProcessDetail(ProWorkorderProcessDetail proWorkorderProcessDetail);
+
+ /**
+ * 批量删除生产工单制程明细
+ *
+ * @param recordIds 需要删除的生产工单制程明细主键集合
+ * @return 结果
+ */
+ public int deleteProWorkorderProcessDetailByRecordIds(String[] recordIds);
+
+ /**
+ * 删除生产工单制程明细信息
+ *
+ * @param recordId 生产工单制程明细主键
+ * @return 结果
+ */
+ public int deleteProWorkorderProcessDetailByRecordId(String recordId);
+}
diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/ProOrderServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/ProOrderServiceImpl.java
index 1a147ff0..dde468d7 100644
--- a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/ProOrderServiceImpl.java
+++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/ProOrderServiceImpl.java
@@ -3,6 +3,7 @@ package com.op.mes.service.impl;
import java.util.*;
import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
import com.op.common.core.context.SecurityContextHolder;
import com.op.common.core.utils.DateUtils;
import com.op.common.core.utils.uuid.IdUtils;
@@ -133,7 +134,7 @@ public class ProOrderServiceImpl implements IProOrderService {
}
// 设置为底层节点
- if (checkEnd == 1) {
+ if (checkEnd == 1){
updateWorker.setWorkorderId(secWorkOrder.getWorkorderId());
updateWorker.setIsEnd(1);
proOrderWorkorderMapper.updateProOrderWorkorder(updateWorker);
@@ -142,7 +143,7 @@ public class ProOrderServiceImpl implements IProOrderService {
}
// 设置为底层节点
- if (checkEnd == 1) {
+ if (checkEnd == 1){
updateWorker.setWorkorderId(firWorkOrder.getWorkorderId());
updateWorker.setIsEnd(1);
proOrderWorkorderMapper.updateProOrderWorkorder(updateWorker);
diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/ProOrderWorkorderServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/ProOrderWorkorderServiceImpl.java
index 8e41a1ac..539f9b7b 100644
--- a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/ProOrderWorkorderServiceImpl.java
+++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/ProOrderWorkorderServiceImpl.java
@@ -90,7 +90,7 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService {
*/
@Override
@DS("#header.poolName")
- @Transactional
+ @Transactional(rollbackFor = Exception.class)
public int deleteProOrderWorkorderByWorkorderIds(String[] workorderIds) {
for(String workorderId:workorderIds){
//要删除的工单id们
@@ -153,8 +153,13 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService {
*/
@Override
@DS("#header.poolName")
+ @Transactional(rollbackFor = Exception.class)
public int downProOrderWorkorderByWorkorderIds(String[] workorderIds) {
+ //下达工单
int m= proOrderWorkorderMapper.downProOrderWorkorderByWorkorderIds(workorderIds);
+ //关联工艺
+ //List workorders = proOrderWorkorderMapper.getWorkOrder
+ //
return m;
}
}
diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/ProWorkorderProcessDetailServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/ProWorkorderProcessDetailServiceImpl.java
new file mode 100644
index 00000000..8f013a8a
--- /dev/null
+++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/ProWorkorderProcessDetailServiceImpl.java
@@ -0,0 +1,89 @@
+package com.op.mes.service.impl;
+
+import java.util.List;
+import com.op.common.core.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.op.mes.mapper.ProWorkorderProcessDetailMapper;
+import com.op.mes.domain.ProWorkorderProcessDetail;
+import com.op.mes.service.IProWorkorderProcessDetailService;
+
+/**
+ * 生产工单制程明细Service业务层处理
+ *
+ * @author Open Platform
+ * @date 2023-07-28
+ */
+@Service
+public class ProWorkorderProcessDetailServiceImpl implements IProWorkorderProcessDetailService {
+ @Autowired
+ private ProWorkorderProcessDetailMapper proWorkorderProcessDetailMapper;
+
+ /**
+ * 查询生产工单制程明细
+ *
+ * @param recordId 生产工单制程明细主键
+ * @return 生产工单制程明细
+ */
+ @Override
+ public ProWorkorderProcessDetail selectProWorkorderProcessDetailByRecordId(String recordId) {
+ return proWorkorderProcessDetailMapper.selectProWorkorderProcessDetailByRecordId(recordId);
+ }
+
+ /**
+ * 查询生产工单制程明细列表
+ *
+ * @param proWorkorderProcessDetail 生产工单制程明细
+ * @return 生产工单制程明细
+ */
+ @Override
+ public List selectProWorkorderProcessDetailList(ProWorkorderProcessDetail proWorkorderProcessDetail) {
+ return proWorkorderProcessDetailMapper.selectProWorkorderProcessDetailList(proWorkorderProcessDetail);
+ }
+
+ /**
+ * 新增生产工单制程明细
+ *
+ * @param proWorkorderProcessDetail 生产工单制程明细
+ * @return 结果
+ */
+ @Override
+ public int insertProWorkorderProcessDetail(ProWorkorderProcessDetail proWorkorderProcessDetail) {
+ proWorkorderProcessDetail.setCreateTime(DateUtils.getNowDate());
+ return proWorkorderProcessDetailMapper.insertProWorkorderProcessDetail(proWorkorderProcessDetail);
+ }
+
+ /**
+ * 修改生产工单制程明细
+ *
+ * @param proWorkorderProcessDetail 生产工单制程明细
+ * @return 结果
+ */
+ @Override
+ public int updateProWorkorderProcessDetail(ProWorkorderProcessDetail proWorkorderProcessDetail) {
+ proWorkorderProcessDetail.setUpdateTime(DateUtils.getNowDate());
+ return proWorkorderProcessDetailMapper.updateProWorkorderProcessDetail(proWorkorderProcessDetail);
+ }
+
+ /**
+ * 批量删除生产工单制程明细
+ *
+ * @param recordIds 需要删除的生产工单制程明细主键
+ * @return 结果
+ */
+ @Override
+ public int deleteProWorkorderProcessDetailByRecordIds(String[] recordIds) {
+ return proWorkorderProcessDetailMapper.deleteProWorkorderProcessDetailByRecordIds(recordIds);
+ }
+
+ /**
+ * 删除生产工单制程明细信息
+ *
+ * @param recordId 生产工单制程明细主键
+ * @return 结果
+ */
+ @Override
+ public int deleteProWorkorderProcessDetailByRecordId(String recordId) {
+ return proWorkorderProcessDetailMapper.deleteProWorkorderProcessDetailByRecordId(recordId);
+ }
+}
diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/ProWorkorderProcessDetailMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/ProWorkorderProcessDetailMapper.xml
new file mode 100644
index 00000000..0a13b039
--- /dev/null
+++ b/op-modules/op-mes/src/main/resources/mapper/mes/ProWorkorderProcessDetailMapper.xml
@@ -0,0 +1,143 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ select record_id, workorder_id, process_id, status, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time, prod_type, factory_code, machine_id, machine_code, route_id, route_version, route_code from pro_workorder_process_detail
+
+
+
+
+
+
+
+ insert into pro_workorder_process_detail
+
+ record_id,
+ workorder_id,
+ process_id,
+ status,
+ remark,
+ attr1,
+ attr2,
+ attr3,
+ attr4,
+ create_by,
+ create_time,
+ update_by,
+ update_time,
+ prod_type,
+ factory_code,
+ machine_id,
+ machine_code,
+ route_id,
+ route_version,
+ route_code,
+
+
+ #{recordId},
+ #{workorderId},
+ #{processId},
+ #{status},
+ #{remark},
+ #{attr1},
+ #{attr2},
+ #{attr3},
+ #{attr4},
+ #{createBy},
+ #{createTime},
+ #{updateBy},
+ #{updateTime},
+ #{prodType},
+ #{factoryCode},
+ #{machineId},
+ #{machineCode},
+ #{routeId},
+ #{routeVersion},
+ #{routeCode},
+
+
+
+
+ update pro_workorder_process_detail
+
+ workorder_id = #{workorderId},
+ process_id = #{processId},
+ status = #{status},
+ remark = #{remark},
+ attr1 = #{attr1},
+ attr2 = #{attr2},
+ attr3 = #{attr3},
+ attr4 = #{attr4},
+ create_by = #{createBy},
+ create_time = #{createTime},
+ update_by = #{updateBy},
+ update_time = #{updateTime},
+ prod_type = #{prodType},
+ factory_code = #{factoryCode},
+ machine_id = #{machineId},
+ machine_code = #{machineCode},
+ route_id = #{routeId},
+ route_version = #{routeVersion},
+ route_code = #{routeCode},
+
+ where record_id = #{recordId}
+
+
+
+ delete from pro_workorder_process_detail where record_id = #{recordId}
+
+
+
+ delete from pro_workorder_process_detail where record_id in
+
+ #{recordId}
+
+
+
diff --git a/op-modules/op-plan/op-modules-plan.iml b/op-modules/op-plan/op-modules-plan.iml
new file mode 100644
index 00000000..87189627
--- /dev/null
+++ b/op-modules/op-plan/op-modules-plan.iml
@@ -0,0 +1,224 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/op-modules/op-plan/pom.xml b/op-modules/op-plan/pom.xml
new file mode 100644
index 00000000..36073e12
--- /dev/null
+++ b/op-modules/op-plan/pom.xml
@@ -0,0 +1,105 @@
+
+
+
+ com.op
+ op-modules
+ 0.0.1
+
+ 4.0.0
+
+ op-modules-plan
+
+
+ op-modules-plan系统模块
+
+
+
+
+
+
+ com.alibaba.cloud
+ spring-cloud-starter-alibaba-nacos-discovery
+
+
+
+
+ com.alibaba.cloud
+ spring-cloud-starter-alibaba-nacos-config
+
+
+
+
+ com.alibaba.cloud
+ spring-cloud-starter-alibaba-sentinel
+
+
+
+
+ org.springframework.boot
+ spring-boot-starter-actuator
+
+
+
+
+ io.springfox
+ springfox-swagger-ui
+ ${swagger.fox.version}
+
+
+
+
+ mysql
+ mysql-connector-java
+
+
+
+ com.microsoft.sqlserver
+ mssql-jdbc
+ 6.1.0.jre8
+
+
+
+ com.op
+ op-common-datasource
+
+
+
+
+ com.op
+ op-common-datascope
+
+
+
+
+ com.op
+ op-common-log
+
+
+
+
+ com.op
+ op-common-swagger
+
+
+
+
+
+ ${project.artifactId}
+
+
+ org.springframework.boot
+ spring-boot-maven-plugin
+
+
+
+ repackage
+
+
+
+
+
+
+
+
diff --git a/op-modules/op-plan/src/main/java/com/op/plan/PlanApplication.java b/op-modules/op-plan/src/main/java/com/op/plan/PlanApplication.java
new file mode 100644
index 00000000..50867e29
--- /dev/null
+++ b/op-modules/op-plan/src/main/java/com/op/plan/PlanApplication.java
@@ -0,0 +1,30 @@
+package com.op.wms;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import com.op.common.security.annotation.EnableCustomConfig;
+import com.op.common.security.annotation.EnableRyFeignClients;
+import com.op.common.swagger.annotation.EnableCustomSwagger2;
+
+/**
+ * 计划模块
+ *
+ * @author OP
+ */
+@EnableCustomConfig
+@EnableCustomSwagger2
+@EnableRyFeignClients
+@SpringBootApplication
+public class PlanApplication {
+ public static void main(String[] args) {
+ SpringApplication.run(PlanApplication.class, args);
+ System.err.println("生产计划服务启动成功\n"
+ + " | | \r\n"
+ + " ___ _ __ ______ ___ _ _ ___| |_ ___ _ __ ___ \r\n"
+ + " / _ \\| '_ \\______/ __| | | / __| __/ _ \\ '_ ` _ \\ \r\n"
+ + "| (_) | |_) | \\__ \\ |_| \\__ \\ || __/ | | | | |\r\n"
+ + " \\___/| .__/ |___/\\__, |___/\\__\\___|_| |_| |_|\r\n"
+ + " | | __/ | \r\n"
+ + " |_| |___/ \r\n");
+ }
+}
diff --git a/op-modules/op-plan/src/main/resources/banner.txt b/op-modules/op-plan/src/main/resources/banner.txt
new file mode 100644
index 00000000..e8a75ab1
--- /dev/null
+++ b/op-modules/op-plan/src/main/resources/banner.txt
@@ -0,0 +1,10 @@
+Spring Boot Version: ${spring-boot.version}
+Spring Application Name: ${spring.application.name}
+ _
+ | |
+ ___ _ __ ______ ___ _ _ ___| |_ ___ _ __ ___
+ / _ \| '_ \______/ __| | | / __| __/ _ \ '_ ` _ \
+| (_) | |_) | \__ \ |_| \__ \ || __/ | | | | |
+ \___/| .__/ |___/\__, |___/\__\___|_| |_| |_|
+ | | __/ |
+ |_| |___/
diff --git a/op-modules/op-plan/src/main/resources/bootstrap.yml b/op-modules/op-plan/src/main/resources/bootstrap.yml
new file mode 100644
index 00000000..11a15277
--- /dev/null
+++ b/op-modules/op-plan/src/main/resources/bootstrap.yml
@@ -0,0 +1,31 @@
+# Tomcat
+server:
+ port: 9206
+
+# Spring
+spring:
+ application:
+ # 应用名称
+ name: op-plan
+ profiles:
+ # 环境配置
+ active: dev
+ cloud:
+ nacos:
+ discovery:
+ namespace: lanju-op
+ group: zxl
+ # 服务注册地址
+ server-addr: 140.249.53.142:8848
+ config:
+ namespace: lanju-op
+ group: zxl
+ #命名空间
+ #group: local
+ # 配置中心地址
+ server-addr: 140.249.53.142:8848
+ # 配置文件格式
+ file-extension: yml
+ # 共享配置
+ shared-configs:
+ - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
diff --git a/op-modules/op-plan/src/main/resources/logback.xml b/op-modules/op-plan/src/main/resources/logback.xml
new file mode 100644
index 00000000..1b5726ff
--- /dev/null
+++ b/op-modules/op-plan/src/main/resources/logback.xml
@@ -0,0 +1,74 @@
+
+
+
+
+
+
+
+
+
+
+ ${log.pattern}
+
+
+
+
+
+ ${log.path}/info.log
+
+
+
+ ${log.path}/info.%d{yyyy-MM-dd}.log
+
+ 60
+
+
+ ${log.pattern}
+
+
+
+ INFO
+
+ ACCEPT
+
+ DENY
+
+
+
+
+ ${log.path}/error.log
+
+
+
+ ${log.path}/error.%d{yyyy-MM-dd}.log
+
+ 60
+
+
+ ${log.pattern}
+
+
+
+ ERROR
+
+ ACCEPT
+
+ DENY
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/op-modules/op-quality/op-modules-quality.iml b/op-modules/op-quality/op-modules-quality.iml
new file mode 100644
index 00000000..87189627
--- /dev/null
+++ b/op-modules/op-quality/op-modules-quality.iml
@@ -0,0 +1,224 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/op-modules/op-quality/pom.xml b/op-modules/op-quality/pom.xml
new file mode 100644
index 00000000..3dab6533
--- /dev/null
+++ b/op-modules/op-quality/pom.xml
@@ -0,0 +1,105 @@
+
+
+
+ com.op
+ op-modules
+ 0.0.1
+
+ 4.0.0
+
+ op-modules-quality
+
+
+ op-modules-quality系统模块
+
+
+
+
+
+
+ com.alibaba.cloud
+ spring-cloud-starter-alibaba-nacos-discovery
+
+
+
+
+ com.alibaba.cloud
+ spring-cloud-starter-alibaba-nacos-config
+
+
+
+
+ com.alibaba.cloud
+ spring-cloud-starter-alibaba-sentinel
+
+
+
+
+ org.springframework.boot
+ spring-boot-starter-actuator
+
+
+
+
+ io.springfox
+ springfox-swagger-ui
+ ${swagger.fox.version}
+
+
+
+
+ mysql
+ mysql-connector-java
+
+
+
+ com.microsoft.sqlserver
+ mssql-jdbc
+ 6.1.0.jre8
+
+
+
+ com.op
+ op-common-datasource
+
+
+
+
+ com.op
+ op-common-datascope
+
+
+
+
+ com.op
+ op-common-log
+
+
+
+
+ com.op
+ op-common-swagger
+
+
+
+
+
+ ${project.artifactId}
+
+
+ org.springframework.boot
+ spring-boot-maven-plugin
+
+
+
+ repackage
+
+
+
+
+
+
+
+
diff --git a/op-modules/op-quality/src/main/java/com/op/quality/QualityApplication.java b/op-modules/op-quality/src/main/java/com/op/quality/QualityApplication.java
new file mode 100644
index 00000000..be782321
--- /dev/null
+++ b/op-modules/op-quality/src/main/java/com/op/quality/QualityApplication.java
@@ -0,0 +1,30 @@
+package com.op.quality;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import com.op.common.security.annotation.EnableCustomConfig;
+import com.op.common.security.annotation.EnableRyFeignClients;
+import com.op.common.swagger.annotation.EnableCustomSwagger2;
+
+/**
+ * 系统模块
+ *
+ * @author OP
+ */
+@EnableCustomConfig
+@EnableCustomSwagger2
+@EnableRyFeignClients
+@SpringBootApplication
+public class QualityApplication {
+ public static void main(String[] args) {
+ SpringApplication.run(QualityApplication.class, args);
+ System.err.println("质量服务启动成功\n"
+ + " | | \r\n"
+ + " ___ _ __ ______ ___ _ _ ___| |_ ___ _ __ ___ \r\n"
+ + " / _ \\| '_ \\______/ __| | | / __| __/ _ \\ '_ ` _ \\ \r\n"
+ + "| (_) | |_) | \\__ \\ |_| \\__ \\ || __/ | | | | |\r\n"
+ + " \\___/| .__/ |___/\\__, |___/\\__\\___|_| |_| |_|\r\n"
+ + " | | __/ | \r\n"
+ + " |_| |___/ \r\n");
+ }
+}
diff --git a/op-modules/op-quality/src/main/resources/banner.txt b/op-modules/op-quality/src/main/resources/banner.txt
new file mode 100644
index 00000000..e8a75ab1
--- /dev/null
+++ b/op-modules/op-quality/src/main/resources/banner.txt
@@ -0,0 +1,10 @@
+Spring Boot Version: ${spring-boot.version}
+Spring Application Name: ${spring.application.name}
+ _
+ | |
+ ___ _ __ ______ ___ _ _ ___| |_ ___ _ __ ___
+ / _ \| '_ \______/ __| | | / __| __/ _ \ '_ ` _ \
+| (_) | |_) | \__ \ |_| \__ \ || __/ | | | | |
+ \___/| .__/ |___/\__, |___/\__\___|_| |_| |_|
+ | | __/ |
+ |_| |___/
diff --git a/op-modules/op-quality/src/main/resources/bootstrap.yml b/op-modules/op-quality/src/main/resources/bootstrap.yml
new file mode 100644
index 00000000..61ed7291
--- /dev/null
+++ b/op-modules/op-quality/src/main/resources/bootstrap.yml
@@ -0,0 +1,31 @@
+# Tomcat
+server:
+ port: 9210
+
+# Spring
+spring:
+ application:
+ # 应用名称
+ name: op-quality
+ profiles:
+ # 环境配置
+ active: dev
+ cloud:
+ nacos:
+ discovery:
+ namespace: lanju-op
+ group: zxl
+ # 服务注册地址
+ server-addr: 140.249.53.142:8848
+ config:
+ namespace: lanju-op
+ group: zxl
+ #命名空间
+ #group: local
+ # 配置中心地址
+ server-addr: 140.249.53.142:8848
+ # 配置文件格式
+ file-extension: yml
+ # 共享配置
+ shared-configs:
+ - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
diff --git a/op-modules/op-quality/src/main/resources/logback.xml b/op-modules/op-quality/src/main/resources/logback.xml
new file mode 100644
index 00000000..1b5726ff
--- /dev/null
+++ b/op-modules/op-quality/src/main/resources/logback.xml
@@ -0,0 +1,74 @@
+
+
+
+
+
+
+
+
+
+
+ ${log.pattern}
+
+
+
+
+
+ ${log.path}/info.log
+
+
+
+ ${log.path}/info.%d{yyyy-MM-dd}.log
+
+ 60
+
+
+ ${log.pattern}
+
+
+
+ INFO
+
+ ACCEPT
+
+ DENY
+
+
+
+
+ ${log.path}/error.log
+
+
+
+ ${log.path}/error.%d{yyyy-MM-dd}.log
+
+ 60
+
+
+ ${log.pattern}
+
+
+
+ ERROR
+
+ ACCEPT
+
+ DENY
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/op-modules/op-sap/op-modules-sap.iml b/op-modules/op-sap/op-modules-sap.iml
index f4b83a85..f42a9222 100644
--- a/op-modules/op-sap/op-modules-sap.iml
+++ b/op-modules/op-sap/op-modules-sap.iml
@@ -20,6 +20,7 @@
+
diff --git a/op-modules/op-sap/src/main/resources/bootstrap.yml b/op-modules/op-sap/src/main/resources/bootstrap.yml
index 5f449eb1..14dae316 100644
--- a/op-modules/op-sap/src/main/resources/bootstrap.yml
+++ b/op-modules/op-sap/src/main/resources/bootstrap.yml
@@ -1,6 +1,6 @@
# Tomcat
server:
- port: 9205
+ port: 9213
# Spring
spring:
@@ -14,12 +14,12 @@ spring:
nacos:
discovery:
namespace: lanju-op
- group: ywl
+ group: zxl
# 服务注册地址
server-addr: 140.249.53.142:8848
config:
namespace: lanju-op
- group: ywl
+ group: zxl
#命名空间
#group: local
# 配置中心地址
diff --git a/op-modules/op-scada/op-modules-scada.iml b/op-modules/op-scada/op-modules-scada.iml
new file mode 100644
index 00000000..87189627
--- /dev/null
+++ b/op-modules/op-scada/op-modules-scada.iml
@@ -0,0 +1,224 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/op-modules/op-scada/pom.xml b/op-modules/op-scada/pom.xml
new file mode 100644
index 00000000..2d99eba5
--- /dev/null
+++ b/op-modules/op-scada/pom.xml
@@ -0,0 +1,105 @@
+
+
+
+ com.op
+ op-modules
+ 0.0.1
+
+ 4.0.0
+
+ op-modules-scada
+
+
+ op-modules-scada系统模块
+
+
+
+
+
+
+ com.alibaba.cloud
+ spring-cloud-starter-alibaba-nacos-discovery
+
+
+
+
+ com.alibaba.cloud
+ spring-cloud-starter-alibaba-nacos-config
+
+
+
+
+ com.alibaba.cloud
+ spring-cloud-starter-alibaba-sentinel
+
+
+
+
+ org.springframework.boot
+ spring-boot-starter-actuator
+
+
+
+
+ io.springfox
+ springfox-swagger-ui
+ ${swagger.fox.version}
+
+
+
+
+ mysql
+ mysql-connector-java
+
+
+
+ com.microsoft.sqlserver
+ mssql-jdbc
+ 6.1.0.jre8
+
+
+
+ com.op
+ op-common-datasource
+
+
+
+
+ com.op
+ op-common-datascope
+
+
+
+
+ com.op
+ op-common-log
+
+
+
+
+ com.op
+ op-common-swagger
+
+
+
+
+
+ ${project.artifactId}
+
+
+ org.springframework.boot
+ spring-boot-maven-plugin
+
+
+
+ repackage
+
+
+
+
+
+
+
+
diff --git a/op-modules/op-scada/src/main/java/com/op/scada/ScadaApplication.java b/op-modules/op-scada/src/main/java/com/op/scada/ScadaApplication.java
new file mode 100644
index 00000000..2a62c303
--- /dev/null
+++ b/op-modules/op-scada/src/main/java/com/op/scada/ScadaApplication.java
@@ -0,0 +1,30 @@
+package com.op.wms;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import com.op.common.security.annotation.EnableCustomConfig;
+import com.op.common.security.annotation.EnableRyFeignClients;
+import com.op.common.swagger.annotation.EnableCustomSwagger2;
+
+/**
+ * 系统模块
+ *
+ * @author OP
+ */
+@EnableCustomConfig
+@EnableCustomSwagger2
+@EnableRyFeignClients
+@SpringBootApplication
+public class ScadaApplication {
+ public static void main(String[] args) {
+ SpringApplication.run(ScadaApplication.class, args);
+ System.err.println("Scada服务启动成功\n"
+ + " | | \r\n"
+ + " ___ _ __ ______ ___ _ _ ___| |_ ___ _ __ ___ \r\n"
+ + " / _ \\| '_ \\______/ __| | | / __| __/ _ \\ '_ ` _ \\ \r\n"
+ + "| (_) | |_) | \\__ \\ |_| \\__ \\ || __/ | | | | |\r\n"
+ + " \\___/| .__/ |___/\\__, |___/\\__\\___|_| |_| |_|\r\n"
+ + " | | __/ | \r\n"
+ + " |_| |___/ \r\n");
+ }
+}
diff --git a/op-modules/op-scada/src/main/resources/banner.txt b/op-modules/op-scada/src/main/resources/banner.txt
new file mode 100644
index 00000000..e8a75ab1
--- /dev/null
+++ b/op-modules/op-scada/src/main/resources/banner.txt
@@ -0,0 +1,10 @@
+Spring Boot Version: ${spring-boot.version}
+Spring Application Name: ${spring.application.name}
+ _
+ | |
+ ___ _ __ ______ ___ _ _ ___| |_ ___ _ __ ___
+ / _ \| '_ \______/ __| | | / __| __/ _ \ '_ ` _ \
+| (_) | |_) | \__ \ |_| \__ \ || __/ | | | | |
+ \___/| .__/ |___/\__, |___/\__\___|_| |_| |_|
+ | | __/ |
+ |_| |___/
diff --git a/op-modules/op-scada/src/main/resources/bootstrap.yml b/op-modules/op-scada/src/main/resources/bootstrap.yml
new file mode 100644
index 00000000..7083f55f
--- /dev/null
+++ b/op-modules/op-scada/src/main/resources/bootstrap.yml
@@ -0,0 +1,31 @@
+# Tomcat
+server:
+ port: 9211
+
+# Spring
+spring:
+ application:
+ # 应用名称
+ name: op-scada
+ profiles:
+ # 环境配置
+ active: dev
+ cloud:
+ nacos:
+ discovery:
+ namespace: lanju-op
+ group: zxl
+ # 服务注册地址
+ server-addr: 140.249.53.142:8848
+ config:
+ namespace: lanju-op
+ group: zxl
+ #命名空间
+ #group: local
+ # 配置中心地址
+ server-addr: 140.249.53.142:8848
+ # 配置文件格式
+ file-extension: yml
+ # 共享配置
+ shared-configs:
+ - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
diff --git a/op-modules/op-scada/src/main/resources/logback.xml b/op-modules/op-scada/src/main/resources/logback.xml
new file mode 100644
index 00000000..1b5726ff
--- /dev/null
+++ b/op-modules/op-scada/src/main/resources/logback.xml
@@ -0,0 +1,74 @@
+
+
+
+
+
+
+
+
+
+
+ ${log.pattern}
+
+
+
+
+
+ ${log.path}/info.log
+
+
+
+ ${log.path}/info.%d{yyyy-MM-dd}.log
+
+ 60
+
+
+ ${log.pattern}
+
+
+
+ INFO
+
+ ACCEPT
+
+ DENY
+
+
+
+
+ ${log.path}/error.log
+
+
+
+ ${log.path}/error.%d{yyyy-MM-dd}.log
+
+ 60
+
+
+ ${log.pattern}
+
+
+
+ ERROR
+
+ ACCEPT
+
+ DENY
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/op-modules/op-security/op-modules-security.iml b/op-modules/op-security/op-modules-security.iml
new file mode 100644
index 00000000..87189627
--- /dev/null
+++ b/op-modules/op-security/op-modules-security.iml
@@ -0,0 +1,224 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/op-modules/op-security/pom.xml b/op-modules/op-security/pom.xml
new file mode 100644
index 00000000..b6df5a7c
--- /dev/null
+++ b/op-modules/op-security/pom.xml
@@ -0,0 +1,105 @@
+
+
+
+ com.op
+ op-modules
+ 0.0.1
+
+ 4.0.0
+
+ op-modules-security
+
+
+ op-modules-security系统模块
+
+
+
+
+
+
+ com.alibaba.cloud
+ spring-cloud-starter-alibaba-nacos-discovery
+
+
+
+
+ com.alibaba.cloud
+ spring-cloud-starter-alibaba-nacos-config
+
+
+
+
+ com.alibaba.cloud
+ spring-cloud-starter-alibaba-sentinel
+
+
+
+
+ org.springframework.boot
+ spring-boot-starter-actuator
+
+
+
+
+ io.springfox
+ springfox-swagger-ui
+ ${swagger.fox.version}
+
+
+
+
+ mysql
+ mysql-connector-java
+
+
+
+ com.microsoft.sqlserver
+ mssql-jdbc
+ 6.1.0.jre8
+
+
+
+ com.op
+ op-common-datasource
+
+
+
+
+ com.op
+ op-common-datascope
+
+
+
+
+ com.op
+ op-common-log
+
+
+
+
+ com.op
+ op-common-swagger
+
+
+
+
+
+ ${project.artifactId}
+
+
+ org.springframework.boot
+ spring-boot-maven-plugin
+
+
+
+ repackage
+
+
+
+
+
+
+
+
diff --git a/op-modules/op-security/src/main/java/com/op/security/SecurityApplication.java b/op-modules/op-security/src/main/java/com/op/security/SecurityApplication.java
new file mode 100644
index 00000000..c72eedb4
--- /dev/null
+++ b/op-modules/op-security/src/main/java/com/op/security/SecurityApplication.java
@@ -0,0 +1,30 @@
+package com.op.security;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import com.op.common.security.annotation.EnableCustomConfig;
+import com.op.common.security.annotation.EnableRyFeignClients;
+import com.op.common.swagger.annotation.EnableCustomSwagger2;
+
+/**
+ * 系统模块
+ *
+ * @author OP
+ */
+@EnableCustomConfig
+@EnableCustomSwagger2
+@EnableRyFeignClients
+@SpringBootApplication
+public class SecurityApplication {
+ public static void main(String[] args) {
+ SpringApplication.run(SecurityApplication.class, args);
+ System.err.println("安防服务启动成功\n"
+ + " | | \r\n"
+ + " ___ _ __ ______ ___ _ _ ___| |_ ___ _ __ ___ \r\n"
+ + " / _ \\| '_ \\______/ __| | | / __| __/ _ \\ '_ ` _ \\ \r\n"
+ + "| (_) | |_) | \\__ \\ |_| \\__ \\ || __/ | | | | |\r\n"
+ + " \\___/| .__/ |___/\\__, |___/\\__\\___|_| |_| |_|\r\n"
+ + " | | __/ | \r\n"
+ + " |_| |___/ \r\n");
+ }
+}
diff --git a/op-modules/op-security/src/main/resources/banner.txt b/op-modules/op-security/src/main/resources/banner.txt
new file mode 100644
index 00000000..e8a75ab1
--- /dev/null
+++ b/op-modules/op-security/src/main/resources/banner.txt
@@ -0,0 +1,10 @@
+Spring Boot Version: ${spring-boot.version}
+Spring Application Name: ${spring.application.name}
+ _
+ | |
+ ___ _ __ ______ ___ _ _ ___| |_ ___ _ __ ___
+ / _ \| '_ \______/ __| | | / __| __/ _ \ '_ ` _ \
+| (_) | |_) | \__ \ |_| \__ \ || __/ | | | | |
+ \___/| .__/ |___/\__, |___/\__\___|_| |_| |_|
+ | | __/ |
+ |_| |___/
diff --git a/op-modules/op-security/src/main/resources/bootstrap.yml b/op-modules/op-security/src/main/resources/bootstrap.yml
new file mode 100644
index 00000000..88ceff7d
--- /dev/null
+++ b/op-modules/op-security/src/main/resources/bootstrap.yml
@@ -0,0 +1,31 @@
+# Tomcat
+server:
+ port: 9212
+
+# Spring
+spring:
+ application:
+ # 应用名称
+ name: op-security
+ profiles:
+ # 环境配置
+ active: dev
+ cloud:
+ nacos:
+ discovery:
+ namespace: lanju-op
+ group: zxl
+ # 服务注册地址
+ server-addr: 140.249.53.142:8848
+ config:
+ namespace: lanju-op
+ group: zxl
+ #命名空间
+ #group: local
+ # 配置中心地址
+ server-addr: 140.249.53.142:8848
+ # 配置文件格式
+ file-extension: yml
+ # 共享配置
+ shared-configs:
+ - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
diff --git a/op-modules/op-security/src/main/resources/logback.xml b/op-modules/op-security/src/main/resources/logback.xml
new file mode 100644
index 00000000..1b5726ff
--- /dev/null
+++ b/op-modules/op-security/src/main/resources/logback.xml
@@ -0,0 +1,74 @@
+
+
+
+
+
+
+
+
+
+
+ ${log.pattern}
+
+
+
+
+
+ ${log.path}/info.log
+
+
+
+ ${log.path}/info.%d{yyyy-MM-dd}.log
+
+ 60
+
+
+ ${log.pattern}
+
+
+
+ INFO
+
+ ACCEPT
+
+ DENY
+
+
+
+
+ ${log.path}/error.log
+
+
+
+ ${log.path}/error.%d{yyyy-MM-dd}.log
+
+ 60
+
+
+ ${log.pattern}
+
+
+
+ ERROR
+
+ ACCEPT
+
+ DENY
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/op-modules/op-system/op-modules-system.iml b/op-modules/op-system/op-modules-system.iml
index 1aa5993b..8e3437a7 100644
--- a/op-modules/op-system/op-modules-system.iml
+++ b/op-modules/op-system/op-modules-system.iml
@@ -10,6 +10,7 @@
+
diff --git a/op-modules/op-system/src/main/resources/bootstrap.yml b/op-modules/op-system/src/main/resources/bootstrap.yml
index 58c6eeba..fe34e4c4 100644
--- a/op-modules/op-system/src/main/resources/bootstrap.yml
+++ b/op-modules/op-system/src/main/resources/bootstrap.yml
@@ -14,12 +14,12 @@ spring:
nacos:
discovery:
namespace: lanju-op
- group: ywl
+ group: zxl
# 服务注册地址
server-addr: 140.249.53.142:8848
config:
namespace: lanju-op
- group: ywl
+ group: zxl
#命名空间
#group: local
# 配置中心地址
diff --git a/op-modules/op-technology/op-modules-technology.iml b/op-modules/op-technology/op-modules-technology.iml
new file mode 100644
index 00000000..87189627
--- /dev/null
+++ b/op-modules/op-technology/op-modules-technology.iml
@@ -0,0 +1,224 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/op-modules/op-technology/pom.xml b/op-modules/op-technology/pom.xml
new file mode 100644
index 00000000..71b616ed
--- /dev/null
+++ b/op-modules/op-technology/pom.xml
@@ -0,0 +1,105 @@
+
+
+
+ com.op
+ op-modules
+ 0.0.1
+
+ 4.0.0
+
+ op-modules-technology
+
+
+ op-modules-technology系统模块
+
+
+
+
+
+
+ com.alibaba.cloud
+ spring-cloud-starter-alibaba-nacos-discovery
+
+
+
+
+ com.alibaba.cloud
+ spring-cloud-starter-alibaba-nacos-config
+
+
+
+
+ com.alibaba.cloud
+ spring-cloud-starter-alibaba-sentinel
+
+
+
+
+ org.springframework.boot
+ spring-boot-starter-actuator
+
+
+
+
+ io.springfox
+ springfox-swagger-ui
+ ${swagger.fox.version}
+
+
+
+
+ mysql
+ mysql-connector-java
+
+
+
+ com.microsoft.sqlserver
+ mssql-jdbc
+ 6.1.0.jre8
+
+
+
+ com.op
+ op-common-datasource
+
+
+
+
+ com.op
+ op-common-datascope
+
+
+
+
+ com.op
+ op-common-log
+
+
+
+
+ com.op
+ op-common-swagger
+
+
+
+
+
+ ${project.artifactId}
+
+
+ org.springframework.boot
+ spring-boot-maven-plugin
+
+
+
+ repackage
+
+
+
+
+
+
+
+
diff --git a/op-modules/op-technology/src/main/java/com/op/technology/TechnologyApplication.java b/op-modules/op-technology/src/main/java/com/op/technology/TechnologyApplication.java
new file mode 100644
index 00000000..91c3162e
--- /dev/null
+++ b/op-modules/op-technology/src/main/java/com/op/technology/TechnologyApplication.java
@@ -0,0 +1,30 @@
+package com.op.technology;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import com.op.common.security.annotation.EnableCustomConfig;
+import com.op.common.security.annotation.EnableRyFeignClients;
+import com.op.common.swagger.annotation.EnableCustomSwagger2;
+
+/**
+ * 生产工艺模块
+ *
+ * @author OP
+ */
+@EnableCustomConfig
+@EnableCustomSwagger2
+@EnableRyFeignClients
+@SpringBootApplication
+public class TechnologyApplication {
+ public static void main(String[] args) {
+ SpringApplication.run(TechnologyApplication.class, args);
+ System.err.println("生产工艺服务启动成功\n"
+ + " | | \r\n"
+ + " ___ _ __ ______ ___ _ _ ___| |_ ___ _ __ ___ \r\n"
+ + " / _ \\| '_ \\______/ __| | | / __| __/ _ \\ '_ ` _ \\ \r\n"
+ + "| (_) | |_) | \\__ \\ |_| \\__ \\ || __/ | | | | |\r\n"
+ + " \\___/| .__/ |___/\\__, |___/\\__\\___|_| |_| |_|\r\n"
+ + " | | __/ | \r\n"
+ + " |_| |___/ \r\n");
+ }
+}
diff --git a/op-modules/op-technology/src/main/resources/banner.txt b/op-modules/op-technology/src/main/resources/banner.txt
new file mode 100644
index 00000000..e8a75ab1
--- /dev/null
+++ b/op-modules/op-technology/src/main/resources/banner.txt
@@ -0,0 +1,10 @@
+Spring Boot Version: ${spring-boot.version}
+Spring Application Name: ${spring.application.name}
+ _
+ | |
+ ___ _ __ ______ ___ _ _ ___| |_ ___ _ __ ___
+ / _ \| '_ \______/ __| | | / __| __/ _ \ '_ ` _ \
+| (_) | |_) | \__ \ |_| \__ \ || __/ | | | | |
+ \___/| .__/ |___/\__, |___/\__\___|_| |_| |_|
+ | | __/ |
+ |_| |___/
diff --git a/op-modules/op-technology/src/main/resources/bootstrap.yml b/op-modules/op-technology/src/main/resources/bootstrap.yml
new file mode 100644
index 00000000..e4200998
--- /dev/null
+++ b/op-modules/op-technology/src/main/resources/bootstrap.yml
@@ -0,0 +1,31 @@
+# Tomcat
+server:
+ port: 9207
+
+# Spring
+spring:
+ application:
+ # 应用名称
+ name: op-technology
+ profiles:
+ # 环境配置
+ active: dev
+ cloud:
+ nacos:
+ discovery:
+ namespace: lanju-op
+ group: zxl
+ # 服务注册地址
+ server-addr: 140.249.53.142:8848
+ config:
+ namespace: lanju-op
+ group: zxl
+ #命名空间
+ #group: local
+ # 配置中心地址
+ server-addr: 140.249.53.142:8848
+ # 配置文件格式
+ file-extension: yml
+ # 共享配置
+ shared-configs:
+ - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
diff --git a/op-modules/op-technology/src/main/resources/logback.xml b/op-modules/op-technology/src/main/resources/logback.xml
new file mode 100644
index 00000000..1b5726ff
--- /dev/null
+++ b/op-modules/op-technology/src/main/resources/logback.xml
@@ -0,0 +1,74 @@
+
+
+
+
+
+
+
+
+
+
+ ${log.pattern}
+
+
+
+
+
+ ${log.path}/info.log
+
+
+
+ ${log.path}/info.%d{yyyy-MM-dd}.log
+
+ 60
+
+
+ ${log.pattern}
+
+
+
+ INFO
+
+ ACCEPT
+
+ DENY
+
+
+
+
+ ${log.path}/error.log
+
+
+
+ ${log.path}/error.%d{yyyy-MM-dd}.log
+
+ 60
+
+
+ ${log.pattern}
+
+
+
+ ERROR
+
+ ACCEPT
+
+ DENY
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/op-modules/op-mes/src/main/java/com/op/mes/controller/SysUserController.java b/op-modules/op-wms/src/main/java/com/op/wms/controller/SysUserController.java
similarity index 89%
rename from op-modules/op-mes/src/main/java/com/op/mes/controller/SysUserController.java
rename to op-modules/op-wms/src/main/java/com/op/wms/controller/SysUserController.java
index 7c218745..6389a944 100644
--- a/op-modules/op-mes/src/main/java/com/op/mes/controller/SysUserController.java
+++ b/op-modules/op-wms/src/main/java/com/op/wms/controller/SysUserController.java
@@ -2,17 +2,22 @@ package com.op.mes.controller;
import java.io.IOException;
import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
import javax.servlet.http.HttpServletResponse;
-
-import com.op.mes.service.ISysUserService;
+import org.apache.commons.lang3.ArrayUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+import com.op.common.core.domain.R;
import com.op.common.core.utils.StringUtils;
import com.op.common.core.utils.poi.ExcelUtil;
import com.op.common.core.web.controller.BaseController;
@@ -20,9 +25,14 @@ import com.op.common.core.web.domain.AjaxResult;
import com.op.common.core.web.page.TableDataInfo;
import com.op.common.log.annotation.Log;
import com.op.common.log.enums.BusinessType;
+import com.op.common.security.annotation.InnerAuth;
import com.op.common.security.annotation.RequiresPermissions;
import com.op.common.security.utils.SecurityUtils;
+import com.op.system.api.domain.SysDept;
+import com.op.system.api.domain.SysRole;
import com.op.system.api.domain.SysUser;
+import com.op.system.api.model.LoginUser;
+import com.op.mes.service.ISysUserService;
/**
* 用户信息
diff --git a/op-modules/op-wms/src/main/java/com/op/wms/domain/SysUserRole.java b/op-modules/op-wms/src/main/java/com/op/wms/domain/SysUserRole.java
new file mode 100644
index 00000000..9d6e6a35
--- /dev/null
+++ b/op-modules/op-wms/src/main/java/com/op/wms/domain/SysUserRole.java
@@ -0,0 +1,39 @@
+package com.op.mes.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 用户和角色关联 sys_user_role
+ *
+ * @author OP
+ */
+public class SysUserRole {
+ /** 用户ID */
+ private Long userId;
+
+ /** 角色ID */
+ private Long roleId;
+
+ public Long getUserId() {
+ return userId;
+ }
+
+ public void setUserId(Long userId) {
+ this.userId = userId;
+ }
+
+ public Long getRoleId() {
+ return roleId;
+ }
+
+ public void setRoleId(Long roleId) {
+ this.roleId = roleId;
+ }
+
+ @Override
+ public String toString() {
+ return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE).append("userId", getUserId())
+ .append("roleId", getRoleId()).toString();
+ }
+}
diff --git a/op-modules/op-wms/src/main/java/com/op/wms/mapper/SysUserMapper.java b/op-modules/op-wms/src/main/java/com/op/wms/mapper/SysUserMapper.java
new file mode 100644
index 00000000..6998e34c
--- /dev/null
+++ b/op-modules/op-wms/src/main/java/com/op/wms/mapper/SysUserMapper.java
@@ -0,0 +1,126 @@
+package com.op.mes.mapper;
+
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+import com.op.system.api.domain.SysUser;
+
+/**
+ * 用户表 数据层
+ *
+ * @author OP
+ */
+public interface SysUserMapper {
+ /**
+ * 根据条件分页查询用户列表
+ *
+ * @param sysUser 用户信息
+ * @return 用户信息集合信息
+ */
+ public List selectUserList(SysUser sysUser);
+
+ /**
+ * 根据条件分页查询已配用户角色列表
+ *
+ * @param user 用户信息
+ * @return 用户信息集合信息
+ */
+ public List selectAllocatedList(SysUser user);
+
+ /**
+ * 根据条件分页查询未分配用户角色列表
+ *
+ * @param user 用户信息
+ * @return 用户信息集合信息
+ */
+ public List selectUnallocatedList(SysUser user);
+
+ /**
+ * 通过用户名查询用户
+ *
+ * @param userName 用户名
+ * @return 用户对象信息
+ */
+ public SysUser selectUserByUserName(String userName);
+
+ /**
+ * 通过用户ID查询用户
+ *
+ * @param userId 用户ID
+ * @return 用户对象信息
+ */
+ public SysUser selectUserById(Long userId);
+
+ /**
+ * 新增用户信息
+ *
+ * @param user 用户信息
+ * @return 结果
+ */
+ public int insertUser(SysUser user);
+
+ /**
+ * 修改用户信息
+ *
+ * @param user 用户信息
+ * @return 结果
+ */
+ public int updateUser(SysUser user);
+
+ /**
+ * 修改用户头像
+ *
+ * @param userName 用户名
+ * @param avatar 头像地址
+ * @return 结果
+ */
+ public int updateUserAvatar(@Param("userName") String userName, @Param("avatar") String avatar);
+
+ /**
+ * 重置用户密码
+ *
+ * @param userName 用户名
+ * @param password 密码
+ * @return 结果
+ */
+ public int resetUserPwd(@Param("userName") String userName, @Param("password") String password);
+
+ /**
+ * 通过用户ID删除用户
+ *
+ * @param userId 用户ID
+ * @return 结果
+ */
+ public int deleteUserById(Long userId);
+
+ /**
+ * 批量删除用户信息
+ *
+ * @param userIds 需要删除的用户ID
+ * @return 结果
+ */
+ public int deleteUserByIds(Long[] userIds);
+
+ /**
+ * 校验用户名称是否唯一
+ *
+ * @param userName 用户名称
+ * @return 结果
+ */
+ public SysUser checkUserNameUnique(String userName);
+
+ /**
+ * 校验手机号码是否唯一
+ *
+ * @param phonenumber 手机号码
+ * @return 结果
+ */
+ public SysUser checkPhoneUnique(String phonenumber);
+
+ /**
+ * 校验email是否唯一
+ *
+ * @param email 用户邮箱
+ * @return 结果
+ */
+ public SysUser checkEmailUnique(String email);
+}
diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/ISysUserService.java b/op-modules/op-wms/src/main/java/com/op/wms/service/ISysUserService.java
similarity index 100%
rename from op-modules/op-mes/src/main/java/com/op/mes/service/ISysUserService.java
rename to op-modules/op-wms/src/main/java/com/op/wms/service/ISysUserService.java
diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/SysUserServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/SysUserServiceImpl.java
similarity index 96%
rename from op-modules/op-mes/src/main/java/com/op/mes/service/impl/SysUserServiceImpl.java
rename to op-modules/op-wms/src/main/java/com/op/wms/service/impl/SysUserServiceImpl.java
index 8f83a25d..e06bfd21 100644
--- a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/SysUserServiceImpl.java
+++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/SysUserServiceImpl.java
@@ -1,6 +1,8 @@
package com.op.mes.service.impl;
+import java.util.ArrayList;
import java.util.List;
+import java.util.stream.Collectors;
import javax.validation.Validator;
import com.op.mes.service.ISysUserService;
@@ -9,12 +11,15 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
import com.op.common.core.constant.UserConstants;
import com.op.common.core.exception.ServiceException;
import com.op.common.core.utils.SpringUtils;
import com.op.common.core.utils.StringUtils;
+import com.op.common.core.utils.bean.BeanValidators;
import com.op.common.datascope.annotation.DataScope;
import com.op.common.security.utils.SecurityUtils;
+import com.op.system.api.domain.SysRole;
import com.op.system.api.domain.SysUser;
import com.op.mes.mapper.SysUserMapper;
diff --git a/op-modules/op-wms/src/main/resources/bootstrap.yml b/op-modules/op-wms/src/main/resources/bootstrap.yml
index 6cb3e830..01b12e10 100644
--- a/op-modules/op-wms/src/main/resources/bootstrap.yml
+++ b/op-modules/op-wms/src/main/resources/bootstrap.yml
@@ -14,12 +14,12 @@ spring:
nacos:
discovery:
namespace: lanju-op
- group: ywl
+ group: zxl
# 服务注册地址
server-addr: 140.249.53.142:8848
config:
namespace: lanju-op
- group: ywl
+ group: zxl
#命名空间
#group: local
# 配置中心地址
diff --git a/op-modules/pom.xml b/op-modules/pom.xml
index 39c2789c..11d40a18 100644
--- a/op-modules/pom.xml
+++ b/op-modules/pom.xml
@@ -16,6 +16,13 @@
op-mes
op-wms
op-sap
+ op-technology
+ op-plan
+ op-device
+ op-energy
+ op-quality
+ op-scada
+ op-security
op-modules