diff --git a/ABAP_AS_WITH_POOL.jcoDestination b/ABAP_AS_WITH_POOL.jcoDestination deleted file mode 100644 index 74ee2038..00000000 --- a/ABAP_AS_WITH_POOL.jcoDestination +++ /dev/null @@ -1,11 +0,0 @@ -#for test only! -#Fri Feb 02 11:11:00 CST 2024 -jco.destination.pool_capacity=true -jco.client.lang=zh -jco.client.ashost=192.168.0.130 -jco.client.saprouter= -jco.client.user=MES -jco.client.sysnr=0 -jco.destination.peak_limit=20 -jco.client.passwd=123456 -jco.client.client=800 diff --git a/dev_jco_rfc.trc b/dev_jco_rfc.trc index b255ea6a..55598a5d 100644 --- a/dev_jco_rfc.trc +++ b/dev_jco_rfc.trc @@ -73,6 +73,185 @@ Caused by: java.lang.NullPointerException ... 63 more +**** Error file opened at 20240111 164451 China Standard Time Rel 3.0.8 (2011-11-28) [721.913] +Error: >Thu Jan 11 16:44:51,560< >RfcGetException rc (7) message: ## 800 ######## +Thu Jan 11 16:44:55,319< >RfcGetException rc (7) message: ## 800 ######## +Thu Jan 11 16:49:04,522< >RfcGetException rc (7) message: ## 800 ######## +Thu Jan 11 16:49:08,215< >RfcGetException rc (7) message: ## 800 ######## +Thu Jan 11 16:50:08,396< >RfcGetException rc (7) message: ## 800 ######## +Thu Jan 11 16:50:12,521< >RfcGetException rc (7) message: ## 800 ######## +Thu Jan 11 16:52:25,915< >RfcGetException rc (7) message: ## 800 ######## +Thu Jan 11 16:52:29,518< >RfcGetException rc (7) message: ## 800 ######## +Thu Jan 11 16:54:16,079< >RfcGetException rc (7) message: ## 800 ######## +Thu Jan 11 16:54:19,679< >RfcGetException rc (7) message: ## 800 ######## +Thu Jan 11 16:54:22,525< >RfcGetException rc (7) message: ## 800 ######## +Thu Jan 11 16:54:26,108< >RfcGetException rc (7) message: ## 800 ######## +Thu Jan 11 16:55:32,052< >RfcGetException rc (7) message: ## 800 ######## +Thu Jan 11 16:55:35,705< >RfcGetException rc (7) message: ## 800 ######## +Thu Jan 11 16:56:23,406< >RfcGetException rc (7) message: ## 800 ######## +Thu Jan 11 16:56:27,066< >RfcGetException rc (7) message: ## 800 ######## +Thu Jan 11 16:59:45,369< >RfcGetException rc (7) message: ## 800 ######## +Thu Jan 11 16:59:49,619< >RfcGetException rc (7) message: ## 800 ######## +Thu Jan 11 17:00:18,266< >RfcGetException rc (7) message: ## 800 ######## +Thu Jan 11 17:00:28,280< >RfcGetException rc (7) message: ## 800 ######## +Thu Jan 11 17:05:06,677< >RfcGetException rc (7) message: ## 800 ######## +Thu Jan 11 17:07:27,288< >RfcGetException rc (7) message: ## 800 ######## +Thu Jan 11 17:09:50,015< >RfcGetException rc (7) message: ## 800 ######## +Thu Jan 11 17:11:35,473< >RfcGetException rc (7) message: ## 800 ######## +Thu Jan 11 17:11:53,389< >RfcGetException rc (7) message: ## 800 ######## +Thu Jan 11 17:13:32,715< >RfcGetException rc (7) message: ## 800 ######## +Thu Jan 11 17:13:53,701< >RfcGetException rc (7) message: ## 800 ######## +Thu Jan 11 17:14:44,332< >RfcGetException rc (7) message: ## 800 ######## +Thu Jan 11 17:15:58,852< >RfcGetException rc (7) message: ## 800 ######## +Thu Jan 11 17:18:02,274< >RfcGetException rc (7) message: ## 800 ######## +Thu Jan 11 17:18:50,315< >RfcGetException rc (7) message: ## 800 ######## +Thu Jan 11 17:20:44,293< >RfcGetException rc (7) message: ## 800 ######## +Thu Jan 11 17:25:11,895< >RfcGetException rc (7) message: ## 800 ######## +Thu Jan 11 17:34:46,104< >RfcGetException rc (7) message: ## 800 ######## +Thu Jan 11 17:35:39,742< >RfcGetException rc (7) message: ## 800 ######## +Thu Jan 11 17:36:24,165< >RfcGetException rc (7) message: ## 800 ######## +Thu Jan 11 17:38:10,872< >RfcGetException rc (7) message: ## 800 ######## +Thu Jan 11 17:41:09,642< >RfcGetException rc (7) message: ## 800 ######## +Thu Jan 11 17:41:59,356< >RfcGetException rc (7) message: ## 800 ######## +Thu Jan 11 17:42:51,751< >RfcGetException rc (7) message: ## 800 ######## +Thu Jan 11 17:45:34,021< >RfcGetException rc (7) message: ## 800 ######## +Thu Jan 11 17:46:14,888< >RfcGetException rc (7) message: ## 800 ######## +Thu Jan 11 17:47:26,853< >RfcGetException rc (7) message: ## 800 ######## +Thu Jan 11 17:50:17,775< >RfcGetException rc (7) message: ## 800 ######## +Thu Jan 11 17:53:12,231< >RfcGetException rc (7) message: ## 800 ######## +Thu Jan 11 17:54:03,321< >RfcGetException rc (7) message: ## 800 ######## +Thu Jan 11 17:56:27,055< >RfcGetException rc (7) message: ## 800 ######## +Thu Jan 11 17:57:53,784< >RfcGetException rc (7) message: ## 800 ######## +Thu Jan 11 17:58:20,978< >RfcGetException rc (7) message: ## 800 ######## +Thu Jan 11 17:59:33,781< >RfcGetException rc (7) message: ## 800 ######## +Thu Jan 11 18:00:54,567< >RfcGetException rc (7) message: ## 800 ######## +Thu Jan 11 18:01:36,649< >RfcGetException rc (7) message: ## 800 ######## +Thu Jan 11 18:01:48,844< >RfcGetException rc (7) message: ## 800 ######## +Thu Jan 11 18:02:31,503< >RfcGetException rc (7) message: ## 800 ######## +Thu Jan 11 18:03:26,898< >RfcGetException rc (7) message: ## 800 ######## +Thu Jan 11 18:04:24,525< >RfcGetException rc (7) message: ## 800 ######## +Thu Jan 11 18:05:48,654< >RfcGetException rc (7) message: ## 800 ######## +Thu Jan 11 18:07:20,674< >RfcGetException rc (7) message: ## 800 ######## +Thu Jan 11 18:08:23,214< >RfcGetException rc (7) message: ## 800 ######## +Thu Dec 14 15:15:38,905< >RfcGetException rc (7) message: Invalid value in OPTION field of value table for IN itab operator. operator. Thu Jan 25 18:04:22,996< >RfcGetException rc (7) message: ## 600 ######## Wed Feb 28 09:51:23,384< >RfcGetException rc (7) message: ## 800 ######## +Wed Feb 28 09:55:24,676< >RfcGetException rc (7) message: ## 800 ######## +Wed Feb 28 09:56:02,286< >RfcGetException rc (7) message: ## 800 ######## +Mon Mar 11 16:16:17,464< >RfcGetException rc (3) message: CPIC-CALL: CMRCV on convId: 17090475 + +ERROR connection to partner '192.168.0.54:3300' broken +TIME Mon Mar 11 16:16:17 2024 +RELEASE 721 +COMPONENT NI (network interface) +VERSION 40 +RC -6 +MODULE nixxi.cpp +LINE 4851 +DETAIL NiIRead: P=192.168.0.54:3300; L=2.0.0.1:62053 +SYSTEM CALL recv +COUNTER 3 + +Mon Mar 11 16:16:17,467< RfcException: [QAS|erpqos] + message: CPIC-CALL: CMRCV on convId: 17090475 + +ERROR connection to partner '192.168.0.54:3300' broken +TIME Mon Mar 11 16:16:17 2024 +RELEASE 721 +COMPONENT NI (network interface) +VERSION 40 +RC -6 +MODULE nixxi.cpp +LINE 4851 +DETAIL NiIRead: P=192.168.0.54:3300; L=2.0.0.1:62053 +SYSTEM CALL recv +COUNTER 3 + + Return code: RFC_SYS_EXCEPTION(3) + error group: 102 + key: RFC_ERROR_COMMUNICATION +Exception raised by QAS|erpqos + diff --git a/op-auth/src/main/resources/bootstrap.yml b/op-auth/src/main/resources/bootstrap.yml index e4d18841..e0d5ba62 100644 --- a/op-auth/src/main/resources/bootstrap.yml +++ b/op-auth/src/main/resources/bootstrap.yml @@ -17,16 +17,16 @@ spring: # 服务注册地址 #--spring.cloud.nacos.discovery.namespace=chj --spring.cloud.nacos.config.namespace=chj # namespace: lanju-op-test - namespace: lanju-op-test - group: test + namespace: lanju-op + group: zxl # 服务注册地址 - server-addr: 192.168.202.20:8848 + server-addr: 175.27.215.92:8848 config: #命名空间 - namespace: lanju-op-test - group: test + namespace: lanju-op + group: zxl # 服务注册地址 - server-addr: 192.168.202.20:8848 + server-addr: 175.27.215.92:8848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/op-gateway/src/main/resources/bootstrap.yml b/op-gateway/src/main/resources/bootstrap.yml index 912fc831..587efe91 100644 --- a/op-gateway/src/main/resources/bootstrap.yml +++ b/op-gateway/src/main/resources/bootstrap.yml @@ -15,16 +15,16 @@ spring: discovery: # username: nacos # password: sfnacos2023 - namespace: lanju-op-test - group: test + namespace: lanju-op + group: zxl # 服务注册地址 - server-addr: 192.168.202.20:8848 + server-addr: 175.27.215.92:8848 config: #命名空间 - namespace: lanju-op-test - group: test + namespace: lanju-op + group: zxl # 服务注册地址 - server-addr: 192.168.202.20:8848 + server-addr: 175.27.215.92:8848 # 配置文件格式 file-extension: yml # 共享配置 @@ -40,7 +40,7 @@ spring: datasource: ds1: nacos: - server-addr: 140.249.53.142:8848 + server-addr: 175.27.215.92:8848 dataId: sentinel-op-gateway groupId: DEFAULT_GROUP data-type: json diff --git a/op-modules/op-device/src/main/resources/bootstrap.yml b/op-modules/op-device/src/main/resources/bootstrap.yml index b3bf9ac1..2d1a795e 100644 --- a/op-modules/op-device/src/main/resources/bootstrap.yml +++ b/op-modules/op-device/src/main/resources/bootstrap.yml @@ -13,15 +13,17 @@ spring: cloud: nacos: discovery: - namespace: lanju-op-test - group: test + namespace: lanju-op + group: zxl # 服务注册地址 - server-addr: 192.168.202.20:8848 + # server-addr: 192.168.202.20:8848 + server-addr: 175.27.215.92:8848 config: - namespace: lanju-op-test - group: test + namespace: lanju-op + group: zxl # 服务注册地址 - server-addr: 192.168.202.20:8848 + # server-addr: 192.168.202.20:8848 + server-addr: 175.27.215.92:8848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/op-modules/op-file/src/main/resources/bootstrap.yml b/op-modules/op-file/src/main/resources/bootstrap.yml index f1c1d493..033cb8ca 100644 --- a/op-modules/op-file/src/main/resources/bootstrap.yml +++ b/op-modules/op-file/src/main/resources/bootstrap.yml @@ -12,17 +12,17 @@ spring: cloud: nacos: discovery: + namespace: lanju-op + group: zxl # 服务注册地址 - namespace: lanju-op-test - group: test - # 服务注册地址 - server-addr: 192.168.202.20:8848 + # server-addr: 192.168.202.20:8848 + server-addr: 175.27.215.92:8848 config: - # 配置中心地址 - namespace: lanju-op-test - group: test + namespace: lanju-op + group: zxl # 服务注册地址 - server-addr: 192.168.202.20:8848 + # server-addr: 192.168.202.20:8848 + server-addr: 175.27.215.92:8848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/op-modules/op-gen/src/main/resources/bootstrap.yml b/op-modules/op-gen/src/main/resources/bootstrap.yml index 4f69cfc2..75c3c997 100644 --- a/op-modules/op-gen/src/main/resources/bootstrap.yml +++ b/op-modules/op-gen/src/main/resources/bootstrap.yml @@ -13,17 +13,16 @@ spring: cloud: nacos: discovery: - namespace: lanju-op-test - group: test + namespace: lanju-op + group: zxl # 服务注册地址 - server-addr: 192.168.202.20:8848 + server-addr: 175.27.215.92:8848 config: #命名空间 - namespace: lanju-op-test - group: test + namespace: lanju-op + group: zxl # 服务注册地址 - # server-addr: 192.168.202.20:8848 - server-addr: 192.168.202.20:8848 + server-addr: 175.27.215.92:8848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/op-modules/op-job/src/main/resources/bootstrap.yml b/op-modules/op-job/src/main/resources/bootstrap.yml index 9e64e0ff..449112aa 100644 --- a/op-modules/op-job/src/main/resources/bootstrap.yml +++ b/op-modules/op-job/src/main/resources/bootstrap.yml @@ -13,15 +13,17 @@ spring: cloud: nacos: discovery: - namespace: lanju-op-test - group: test + namespace: lanju-op + group: zxl # 服务注册地址 - server-addr: 192.168.202.20:8848 + # server-addr: 192.168.202.20:8848 + server-addr: 175.27.215.92:8848 config: - namespace: lanju-op-test - group: test + namespace: lanju-op + group: zxl # 服务注册地址 - server-addr: 192.168.202.20:8848 + # server-addr: 192.168.202.20:8848 + server-addr: 175.27.215.92:8848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/op-modules/op-mes/src/main/resources/bootstrap.yml b/op-modules/op-mes/src/main/resources/bootstrap.yml index 1a148b14..63c4ede5 100644 --- a/op-modules/op-mes/src/main/resources/bootstrap.yml +++ b/op-modules/op-mes/src/main/resources/bootstrap.yml @@ -13,16 +13,16 @@ spring: cloud: nacos: discovery: - namespace: lanju-op-test - group: test + namespace: lanju-op + group: zxl # 服务注册地址 # server-addr: 192.168.202.20:8848 - server-addr: 192.168.202.20:8848 + server-addr: 175.27.215.92:8848 config: - namespace: lanju-op-test - group: test + namespace: lanju-op + group: zxl # 服务注册地址 - server-addr: 192.168.202.20:8848 + server-addr: 175.27.215.92:8848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/op-modules/op-open/src/main/resources/bootstrap.yml b/op-modules/op-open/src/main/resources/bootstrap.yml index b9dd2cae..29d71df0 100644 --- a/op-modules/op-open/src/main/resources/bootstrap.yml +++ b/op-modules/op-open/src/main/resources/bootstrap.yml @@ -13,17 +13,15 @@ spring: cloud: nacos: discovery: - namespace: lanju-op-test - group: test + namespace: lanju-op + group: zxl # 服务注册地址 - server-addr: 192.168.202.20:8848 + server-addr: 175.27.215.92:8848 config: - namespace: lanju-op-test - group: test - #命名空间 - #group: local - # 配置中心地址 - server-addr: 192.168.202.20:8848 + namespace: lanju-op + group: zxl + # 服务注册地址 + server-addr: 175.27.215.92:8848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/op-modules/op-plan/src/main/resources/bootstrap.yml b/op-modules/op-plan/src/main/resources/bootstrap.yml index 89a3d22c..39d689e4 100644 --- a/op-modules/op-plan/src/main/resources/bootstrap.yml +++ b/op-modules/op-plan/src/main/resources/bootstrap.yml @@ -13,15 +13,15 @@ spring: cloud: nacos: discovery: - namespace: lanju-op-test - group: test + namespace: lanju-op + group: zxl # 服务注册地址 - server-addr: 192.168.202.20:8848 + server-addr: 175.27.215.92:8848 config: - namespace: lanju-op-test - group: test + namespace: lanju-op + group: zxl # 服务注册地址 - server-addr: 192.168.202.20:8848 + server-addr: 175.27.215.92:8848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcDefectTypeClassController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcDefectTypeClassController.java new file mode 100644 index 00000000..90f4db30 --- /dev/null +++ b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcDefectTypeClassController.java @@ -0,0 +1,107 @@ +package com.op.quality.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.op.common.core.utils.poi.ExcelUtil; +import com.op.quality.domain.QcDefectTypeClass; +import com.op.quality.service.IQcDefectTypeClassService; +import com.op.system.api.domain.SysDictData; +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.common.core.web.controller.BaseController; +import com.op.common.core.web.domain.AjaxResult; +import com.op.common.core.web.page.TableDataInfo; + +/** + * 故障类型-缺陷描述分类Controller + * + * @author Open Platform + * @date 2024-08-20 + */ +@RestController +@RequestMapping("/defectClass") +public class QcDefectTypeClassController extends BaseController { + @Autowired + private IQcDefectTypeClassService qcDefectTypeClassService; + +/** + * 查询故障类型-缺陷描述分类列表 + */ +@RequiresPermissions("system:class:list") +@GetMapping("/list") + public TableDataInfo list(QcDefectTypeClass qcDefectTypeClass) { + startPage(); + List list = qcDefectTypeClassService.selectQcDefectTypeClassList(qcDefectTypeClass); + return getDataTable(list); + } + + /** + * 导出故障类型-缺陷描述分类列表 + */ + @RequiresPermissions("system:class:export") + @Log(title = "故障类型-缺陷描述分类", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, QcDefectTypeClass qcDefectTypeClass) { + List list = qcDefectTypeClassService.selectQcDefectTypeClassList(qcDefectTypeClass); + ExcelUtil util = new ExcelUtil(QcDefectTypeClass. class); + util.exportExcel(response, list, "故障类型-缺陷描述分类数据"); + } + + /** + * 获取故障类型-缺陷描述分类详细信息 + */ + @RequiresPermissions("system:class:query") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") String id) { + return success(qcDefectTypeClassService.selectQcDefectTypeClassById(id)); + } + + /** + * 新增故障类型-缺陷描述分类 + */ + @RequiresPermissions("system:class:add") + @Log(title = "故障类型-缺陷描述分类", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody QcDefectTypeClass qcDefectTypeClass) { + return toAjax(qcDefectTypeClassService.insertQcDefectTypeClass(qcDefectTypeClass)); + } + + /** + * 修改故障类型-缺陷描述分类 + */ + @RequiresPermissions("system:class:edit") + @Log(title = "故障类型-缺陷描述分类", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody QcDefectTypeClass qcDefectTypeClass) { + return toAjax(qcDefectTypeClassService.updateQcDefectTypeClass(qcDefectTypeClass)); + } + + /** + * 删除故障类型-缺陷描述分类 + */ + @RequiresPermissions("system:class:remove") + @Log(title = "故障类型-缺陷描述分类", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable String[] ids) { + return toAjax(qcDefectTypeClassService.deleteQcDefectTypeClassByIds(ids)); + } + + @GetMapping("/getClassInfoList") + @DS("#header.poolName") + public AjaxResult getClassInfoList(QcDefectTypeClass qcDefectTypeClass) { + List list = qcDefectTypeClassService.getClassInfoList(qcDefectTypeClass); + return success(list); + } +} diff --git a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcDefectTypeClass.java b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcDefectTypeClass.java new file mode 100644 index 00000000..4d782302 --- /dev/null +++ b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcDefectTypeClass.java @@ -0,0 +1,143 @@ +package com.op.quality.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; + +/** + * 故障类型-缺陷描述分类对象 qc_defect_type_class + * + * @author Open Platform + * @date 2024-08-20 + */ +public class QcDefectTypeClass extends BaseEntity { +private static final long serialVersionUID=1L; + + /** 主键 */ + private String id; + + /** 不良类型id */ + @Excel(name = "不良类型id") + private String defectId; + + /** 不良类型编码 */ + @Excel(name = "不良类型编码") + private String defectCode; + + /** 缺陷名称 */ + @Excel(name = "缺陷名称") + private String className; + + /** 工厂编码 */ + @Excel(name = "工厂编码") + private String factoryCode; + + /** 备用字段1 */ + @Excel(name = "备用字段1") + private String attr1; + + /** 备用字段2 */ + @Excel(name = "备用字段2") + private String attr2; + + /** 备用字段3 */ + @Excel(name = "备用字段3") + private String attr3; + + /** 删除标志 */ + private String delFlag; + private String sort; + + public String getSort() { + return sort; + } + + public void setSort(String sort) { + this.sort = sort; + } + + public void setId(String id){ + this.id = id; + } + + public String getId(){ + return id; + } + public void setDefectId(String defectId){ + this.defectId = defectId; + } + + public String getDefectId(){ + return defectId; + } + public void setDefectCode(String defectCode){ + this.defectCode = defectCode; + } + + public String getDefectCode(){ + return defectCode; + } + public void setClassName(String className){ + this.className = className; + } + + public String getClassName(){ + return className; + } + public void setFactoryCode(String factoryCode){ + this.factoryCode = factoryCode; + } + + public String getFactoryCode(){ + return factoryCode; + } + 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 setDelFlag(String delFlag){ + this.delFlag = delFlag; + } + + public String getDelFlag(){ + return delFlag; + } + +@Override +public String toString(){ + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id",getId()) + .append("defectId",getDefectId()) + .append("defectCode",getDefectCode()) + .append("className",getClassName()) + .append("remark",getRemark()) + .append("factoryCode",getFactoryCode()) + .append("attr1",getAttr1()) + .append("attr2",getAttr2()) + .append("attr3",getAttr3()) + .append("delFlag",getDelFlag()) + .append("createBy",getCreateBy()) + .append("createTime",getCreateTime()) + .append("updateBy",getUpdateBy()) + .append("updateTime",getUpdateTime()) + .toString(); + } + } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcDefectTypeClassMapper.java b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcDefectTypeClassMapper.java new file mode 100644 index 00000000..cf850f31 --- /dev/null +++ b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcDefectTypeClassMapper.java @@ -0,0 +1,64 @@ +package com.op.quality.mapper; + +import com.op.quality.domain.QcDefectTypeClass; + +import java.util.List; + + +/** + * 故障类型-缺陷描述分类Mapper接口 + * + * @author Open Platform + * @date 2024-08-20 + */ +public interface QcDefectTypeClassMapper { + /** + * 查询故障类型-缺陷描述分类 + * + * @param id 故障类型-缺陷描述分类主键 + * @return 故障类型-缺陷描述分类 + */ + public QcDefectTypeClass selectQcDefectTypeClassById(String id); + + /** + * 查询故障类型-缺陷描述分类列表 + * + * @param qcDefectTypeClass 故障类型-缺陷描述分类 + * @return 故障类型-缺陷描述分类集合 + */ + public List selectQcDefectTypeClassList(QcDefectTypeClass qcDefectTypeClass); + + /** + * 新增故障类型-缺陷描述分类 + * + * @param qcDefectTypeClass 故障类型-缺陷描述分类 + * @return 结果 + */ + public int insertQcDefectTypeClass(QcDefectTypeClass qcDefectTypeClass); + + /** + * 修改故障类型-缺陷描述分类 + * + * @param qcDefectTypeClass 故障类型-缺陷描述分类 + * @return 结果 + */ + public int updateQcDefectTypeClass(QcDefectTypeClass qcDefectTypeClass); + + /** + * 删除故障类型-缺陷描述分类 + * + * @param id 故障类型-缺陷描述分类主键 + * @return 结果 + */ + public int deleteQcDefectTypeClassById(String id); + + /** + * 批量删除故障类型-缺陷描述分类 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteQcDefectTypeClassByIds(String[] ids); + + List getClassInfoList(QcDefectTypeClass qcDefectTypeClass); +} diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/IQcDefectTypeClassService.java b/op-modules/op-quality/src/main/java/com/op/quality/service/IQcDefectTypeClassService.java new file mode 100644 index 00000000..2705f3fb --- /dev/null +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/IQcDefectTypeClassService.java @@ -0,0 +1,65 @@ +package com.op.quality.service; + +import com.op.quality.domain.QcDefectTypeClass; + +import java.util.List; + + + +/** + * 故障类型-缺陷描述分类Service接口 + * + * @author Open Platform + * @date 2024-08-20 + */ +public interface IQcDefectTypeClassService { + /** + * 查询故障类型-缺陷描述分类 + * + * @param id 故障类型-缺陷描述分类主键 + * @return 故障类型-缺陷描述分类 + */ + public QcDefectTypeClass selectQcDefectTypeClassById(String id); + + /** + * 查询故障类型-缺陷描述分类列表 + * + * @param qcDefectTypeClass 故障类型-缺陷描述分类 + * @return 故障类型-缺陷描述分类集合 + */ + public List selectQcDefectTypeClassList(QcDefectTypeClass qcDefectTypeClass); + + /** + * 新增故障类型-缺陷描述分类 + * + * @param qcDefectTypeClass 故障类型-缺陷描述分类 + * @return 结果 + */ + public int insertQcDefectTypeClass(QcDefectTypeClass qcDefectTypeClass); + + /** + * 修改故障类型-缺陷描述分类 + * + * @param qcDefectTypeClass 故障类型-缺陷描述分类 + * @return 结果 + */ + public int updateQcDefectTypeClass(QcDefectTypeClass qcDefectTypeClass); + + /** + * 批量删除故障类型-缺陷描述分类 + * + * @param ids 需要删除的故障类型-缺陷描述分类主键集合 + * @return 结果 + */ + public int deleteQcDefectTypeClassByIds(String[] ids); + + /** + * 删除故障类型-缺陷描述分类信息 + * + * @param id 故障类型-缺陷描述分类主键 + * @return 结果 + */ + public int deleteQcDefectTypeClassById(String id); + + List getClassInfoList(QcDefectTypeClass qcDefectTypeClass); +} diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcDefectTypeClassServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcDefectTypeClassServiceImpl.java new file mode 100644 index 00000000..49bf3e06 --- /dev/null +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcDefectTypeClassServiceImpl.java @@ -0,0 +1,111 @@ +package com.op.quality.service.impl; + +import java.security.Security; +import java.util.List; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.op.common.core.utils.DateUtils; +import com.op.common.core.utils.uuid.IdUtils; +import com.op.common.security.utils.SecurityUtils; +import com.op.quality.domain.QcDefectTypeClass; +import com.op.quality.mapper.QcDefectTypeClassMapper; +import com.op.quality.service.IQcDefectTypeClassService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + + +/** + * 故障类型-缺陷描述分类Service业务层处理 + * + * @author Open Platform + * @date 2024-08-20 + */ +@Service +public class QcDefectTypeClassServiceImpl implements IQcDefectTypeClassService { + @Autowired + private QcDefectTypeClassMapper qcDefectTypeClassMapper; + + /** + * 查询故障类型-缺陷描述分类 + * + * @param id 故障类型-缺陷描述分类主键 + * @return 故障类型-缺陷描述分类 + */ + @Override + @DS("#header.poolName") + public QcDefectTypeClass selectQcDefectTypeClassById(String id) { + return qcDefectTypeClassMapper.selectQcDefectTypeClassById(id); + } + + /** + * 查询故障类型-缺陷描述分类列表 + * + * @param qcDefectTypeClass 故障类型-缺陷描述分类 + * @return 故障类型-缺陷描述分类 + */ + @Override + @DS("#header.poolName") + public List selectQcDefectTypeClassList(QcDefectTypeClass qcDefectTypeClass) { + return qcDefectTypeClassMapper.selectQcDefectTypeClassList(qcDefectTypeClass); + } + + /** + * 新增故障类型-缺陷描述分类 + * + * @param qcDefectTypeClass 故障类型-缺陷描述分类 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int insertQcDefectTypeClass(QcDefectTypeClass qcDefectTypeClass) { + qcDefectTypeClass.setCreateTime(DateUtils.getNowDate()); + qcDefectTypeClass.setId(IdUtils.fastSimpleUUID()); + qcDefectTypeClass.setCreateBy(SecurityUtils.getUsername()); + return qcDefectTypeClassMapper.insertQcDefectTypeClass(qcDefectTypeClass); + } + + /** + * 修改故障类型-缺陷描述分类 + * + * @param qcDefectTypeClass 故障类型-缺陷描述分类 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int updateQcDefectTypeClass(QcDefectTypeClass qcDefectTypeClass) { + qcDefectTypeClass.setUpdateTime(DateUtils.getNowDate()); + qcDefectTypeClass.setUpdateBy(SecurityUtils.getUsername()); + return qcDefectTypeClassMapper.updateQcDefectTypeClass(qcDefectTypeClass); + } + + /** + * 批量删除故障类型-缺陷描述分类 + * + * @param ids 需要删除的故障类型-缺陷描述分类主键 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int deleteQcDefectTypeClassByIds(String[] ids) { + return qcDefectTypeClassMapper.deleteQcDefectTypeClassByIds(ids); + } + + /** + * 删除故障类型-缺陷描述分类信息 + * + * @param id 故障类型-缺陷描述分类主键 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int deleteQcDefectTypeClassById(String id) { + return qcDefectTypeClassMapper.deleteQcDefectTypeClassById(id); + } + + @Override + public List getClassInfoList(QcDefectTypeClass qcDefectTypeClass) { + return qcDefectTypeClassMapper.getClassInfoList(qcDefectTypeClass); + } + + +} diff --git a/op-modules/op-quality/src/main/resources/bootstrap.yml b/op-modules/op-quality/src/main/resources/bootstrap.yml index 27544deb..b7338532 100644 --- a/op-modules/op-quality/src/main/resources/bootstrap.yml +++ b/op-modules/op-quality/src/main/resources/bootstrap.yml @@ -14,14 +14,14 @@ spring: nacos: discovery: namespace: lanju-op - group: chj + group: zxl # 服务注册地址 - server-addr: 192.168.202.20:8848 + server-addr: 175.27.215.92:8848 config: namespace: lanju-op - group: chj + group: zxl # 服务注册地址 - server-addr: 192.168.202.20:8848 + server-addr: 175.27.215.92:8848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcDefectTypeClassMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcDefectTypeClassMapper.xml new file mode 100644 index 00000000..720767d8 --- /dev/null +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcDefectTypeClassMapper.xml @@ -0,0 +1,194 @@ + + + + + + + + + + + + + + + + + + + + + + + + select id, defect_id, defect_code, class_name, remark, factory_code, attr1, + attr2, attr3, del_flag, create_by, create_time, update_by, update_time ,sort + from qc_defect_type_class + + + + + + + + + insert into qc_defect_type_class + + id, + + defect_id, + + defect_code, + + class_name, + + remark, + + factory_code, + + attr1, + + attr2, + + attr3, + + del_flag, + + create_by, + + create_time, + + update_by, + + update_time, + + sort, + + + #{id}, + + #{defectId}, + + #{defectCode}, + + #{className}, + + #{remark}, + + #{factoryCode}, + + #{attr1}, + + #{attr2}, + + #{attr3}, + + #{delFlag}, + + #{createBy}, + + #{createTime}, + + #{updateBy}, + + #{updateTime}, + #{sort}, + + + + + update qc_defect_type_class + + defect_id = + #{defectId}, + + defect_code = + #{defectCode}, + + class_name = + #{className}, + + remark = + #{remark}, + + factory_code = + #{factoryCode}, + + attr1 = + #{attr1}, + + attr2 = + #{attr2}, + + attr3 = + #{attr3}, + + del_flag = + #{delFlag}, + + create_by = + #{createBy}, + + create_time = + #{createTime}, + + update_by = + #{updateBy}, + + update_time = + #{updateTime}, + + sort = #{sort}, + + where id = #{id} + + + + delete from qc_defect_type_class where id = #{id} + + + + delete from qc_defect_type_class where id in + + #{id} + + + diff --git a/op-modules/op-sap/src/main/resources/bootstrap.yml b/op-modules/op-sap/src/main/resources/bootstrap.yml index ce8e98df..bd77cc0c 100644 --- a/op-modules/op-sap/src/main/resources/bootstrap.yml +++ b/op-modules/op-sap/src/main/resources/bootstrap.yml @@ -13,15 +13,15 @@ spring: cloud: nacos: discovery: - namespace: lanju-op-test - group: test + namespace: lanju-op + group: zxl # 服务注册地址 - server-addr: 192.168.202.20:8848 + server-addr: 175.27.215.92:8848 config: - namespace: lanju-op-test - group: test + namespace: lanju-op + group: zxl # 服务注册地址 - server-addr: 192.168.202.20:8848 + server-addr: 175.27.215.92:8848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/op-modules/op-system/src/main/resources/bootstrap.yml b/op-modules/op-system/src/main/resources/bootstrap.yml index 4763c75d..f219da31 100644 --- a/op-modules/op-system/src/main/resources/bootstrap.yml +++ b/op-modules/op-system/src/main/resources/bootstrap.yml @@ -14,17 +14,17 @@ spring: nacos: discovery: # namespace: lanju-op-test - namespace: lanju-op-test - group: test + namespace: lanju-op + group: zxl # 服务注册地址 # server-addr: 192.168.202.20:8848 - server-addr: 192.168.202.20:8848 + server-addr: 175.27.215.92:8848 config: - namespace: lanju-op-test - group: test + namespace: lanju-op + group: zxl # 服务注册地址 # server-addr: 192.168.202.20:8848 - server-addr: 192.168.202.20:8848 + server-addr: 175.27.215.92:8848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/op-modules/op-technology/src/main/resources/bootstrap.yml b/op-modules/op-technology/src/main/resources/bootstrap.yml index 62798ef1..8359972d 100644 --- a/op-modules/op-technology/src/main/resources/bootstrap.yml +++ b/op-modules/op-technology/src/main/resources/bootstrap.yml @@ -13,15 +13,15 @@ spring: cloud: nacos: discovery: - namespace: lanju-op-test - group: test + namespace: lanju-op + group: zxl # 服务注册地址 - server-addr: 192.168.202.20:8848 + server-addr: 175.27.215.92:8848 config: - namespace: lanju-op-test - group: test + namespace: lanju-op + group: zxl # 服务注册地址 - server-addr: 192.168.202.20:8848 + server-addr: 175.27.215.92:8848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/op-modules/op-wms/src/main/resources/bootstrap.yml b/op-modules/op-wms/src/main/resources/bootstrap.yml index b6437913..2aa5669a 100644 --- a/op-modules/op-wms/src/main/resources/bootstrap.yml +++ b/op-modules/op-wms/src/main/resources/bootstrap.yml @@ -13,15 +13,15 @@ spring: cloud: nacos: discovery: - namespace: lanju-op-test - group: test + namespace: lanju-op + group: zxl # 服务注册地址 - server-addr: 192.168.202.20:8848 + server-addr: 175.27.215.92:8848 config: - namespace: lanju-op-test - group: test + namespace: lanju-op + group: zxl # 服务注册地址 - server-addr: 192.168.202.20:8848 + server-addr: 175.27.215.92:8848 # 配置文件格式 file-extension: yml # 共享配置