From 3be43f8fb63900785a298339e748784ee9b919a4 Mon Sep 17 00:00:00 2001 From: dongxiaodong <13970843+dxdwork@user.noreply.gitee.com> Date: Wed, 27 Mar 2024 22:43:38 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E6=9C=AC=E4=B8=9A=E5=8A=A1=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- couplet-auth/src/main/resources/bootstrap.yml | 2 + .../src/main/resources/bootstrap.yml | 2 + .../src/main/resources/bootstrap.yml | 2 + .../src/main/resources/bootstrap.yml | 2 + .../service/impl/SysConfigServiceImpl.java | 3 +- .../src/main/resources/bootstrap.yml | 2 + couplet-modules/couplet-trouble/pom.xml | 29 +++++ .../trouble/CoupletTroubleApplication.java | 18 +++ .../controller/SysTroubleController.java | 68 ++++++++++++ .../com/couplet/trouble/domain/Trouble.java | 105 ++++++++++++++++++ .../couplet/trouble/domain/TroubleGrade.java | 15 +++ .../couplet/trouble/domain/TroubleType.java | 15 +++ .../trouble/domain/req/TroubleAddReq.java | 52 +++++++++ .../trouble/domain/req/TroubleUpdReq.java | 60 ++++++++++ .../trouble/mapper/SysTroubleMapper.java | 24 ++++ .../trouble/service/SysTroubleService.java | 24 ++++ .../service/impl/SysTroubleServiceImpl.java | 57 ++++++++++ .../src/main/resources/bootstrap.yml | 30 +++++ .../mapper/trouble/SysTroubleMapper.xml | 92 +++++++++++++++ couplet-modules/pom.xml | 1 + .../src/main/resources/bootstrap.yml | 2 + pom.xml | 6 + 22 files changed, 609 insertions(+), 2 deletions(-) create mode 100644 couplet-modules/couplet-trouble/pom.xml create mode 100644 couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/CoupletTroubleApplication.java create mode 100644 couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/controller/SysTroubleController.java create mode 100644 couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/domain/Trouble.java create mode 100644 couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/domain/TroubleGrade.java create mode 100644 couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/domain/TroubleType.java create mode 100644 couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/domain/req/TroubleAddReq.java create mode 100644 couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/domain/req/TroubleUpdReq.java create mode 100644 couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/mapper/SysTroubleMapper.java create mode 100644 couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/service/SysTroubleService.java create mode 100644 couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/service/impl/SysTroubleServiceImpl.java create mode 100644 couplet-modules/couplet-trouble/src/main/resources/bootstrap.yml create mode 100644 couplet-modules/couplet-trouble/src/main/resources/mapper/trouble/SysTroubleMapper.xml diff --git a/couplet-auth/src/main/resources/bootstrap.yml b/couplet-auth/src/main/resources/bootstrap.yml index 2942ec3..870a494 100644 --- a/couplet-auth/src/main/resources/bootstrap.yml +++ b/couplet-auth/src/main/resources/bootstrap.yml @@ -15,6 +15,7 @@ spring: discovery: # 服务注册地址 server-addr: 121.89.211.230:8848 + namespace: a439ce3f-2c42-4b4c-9c4d-c8db49933c15 config: # 配置中心地址 server-addr: 121.89.211.230:8848 @@ -23,3 +24,4 @@ spring: # 共享配置 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + namespace: a439ce3f-2c42-4b4c-9c4d-c8db49933c15 diff --git a/couplet-modules/couplet-file/src/main/resources/bootstrap.yml b/couplet-modules/couplet-file/src/main/resources/bootstrap.yml index fa968e9..1b923b2 100644 --- a/couplet-modules/couplet-file/src/main/resources/bootstrap.yml +++ b/couplet-modules/couplet-file/src/main/resources/bootstrap.yml @@ -15,6 +15,7 @@ spring: discovery: # 服务注册地址 server-addr: 121.89.211.230:8848 + namespace: a439ce3f-2c42-4b4c-9c4d-c8db49933c15 config: # 配置中心地址 server-addr: 121.89.211.230:8848 @@ -23,3 +24,4 @@ spring: # 共享配置 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + namespace: a439ce3f-2c42-4b4c-9c4d-c8db49933c15 diff --git a/couplet-modules/couplet-gen/src/main/resources/bootstrap.yml b/couplet-modules/couplet-gen/src/main/resources/bootstrap.yml index df7344c..8829025 100644 --- a/couplet-modules/couplet-gen/src/main/resources/bootstrap.yml +++ b/couplet-modules/couplet-gen/src/main/resources/bootstrap.yml @@ -15,6 +15,7 @@ spring: discovery: # 服务注册地址 server-addr: 121.89.211.230:8848 + namespace: a439ce3f-2c42-4b4c-9c4d-c8db49933c15 config: # 配置中心地址 server-addr: 121.89.211.230:8848 @@ -23,3 +24,4 @@ spring: # 共享配置 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + namespace: a439ce3f-2c42-4b4c-9c4d-c8db49933c15 diff --git a/couplet-modules/couplet-job/src/main/resources/bootstrap.yml b/couplet-modules/couplet-job/src/main/resources/bootstrap.yml index 49763a2..866823e 100644 --- a/couplet-modules/couplet-job/src/main/resources/bootstrap.yml +++ b/couplet-modules/couplet-job/src/main/resources/bootstrap.yml @@ -15,6 +15,7 @@ spring: discovery: # 服务注册地址 server-addr: 121.89.211.230:8848 + namespace: a439ce3f-2c42-4b4c-9c4d-c8db49933c15 config: # 配置中心地址 server-addr: 121.89.211.230:8848 @@ -23,3 +24,4 @@ spring: # 共享配置 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + namespace: a439ce3f-2c42-4b4c-9c4d-c8db49933c15 diff --git a/couplet-modules/couplet-system/src/main/java/com/couplet/system/service/impl/SysConfigServiceImpl.java b/couplet-modules/couplet-system/src/main/java/com/couplet/system/service/impl/SysConfigServiceImpl.java index d3c3493..d86edf5 100644 --- a/couplet-modules/couplet-system/src/main/java/com/couplet/system/service/impl/SysConfigServiceImpl.java +++ b/couplet-modules/couplet-system/src/main/java/com/couplet/system/service/impl/SysConfigServiceImpl.java @@ -23,8 +23,7 @@ import java.util.Objects; * @Date 2023-11-13 上午 10:06 */ @Service -public class SysConfigServiceImpl extends ServiceImpl - implements SysConfigService { +public class SysConfigServiceImpl extends ServiceImpl implements SysConfigService { @Autowired private RedisService redisService; diff --git a/couplet-modules/couplet-system/src/main/resources/bootstrap.yml b/couplet-modules/couplet-system/src/main/resources/bootstrap.yml index 16f0206..5ddc18b 100644 --- a/couplet-modules/couplet-system/src/main/resources/bootstrap.yml +++ b/couplet-modules/couplet-system/src/main/resources/bootstrap.yml @@ -15,6 +15,7 @@ spring: discovery: # 服务注册地址 server-addr: 121.89.211.230:8848 + namespace: a439ce3f-2c42-4b4c-9c4d-c8db49933c15 config: # 配置中心地址 server-addr: 121.89.211.230:8848 @@ -23,6 +24,7 @@ spring: # 共享配置 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + namespace: a439ce3f-2c42-4b4c-9c4d-c8db49933c15 logging: level: com.couplet.system.mapper: DEBUG diff --git a/couplet-modules/couplet-trouble/pom.xml b/couplet-modules/couplet-trouble/pom.xml new file mode 100644 index 0000000..48700fc --- /dev/null +++ b/couplet-modules/couplet-trouble/pom.xml @@ -0,0 +1,29 @@ + + + 4.0.0 + + com.couplet + couplet-modules + 3.6.3 + + + couplet-trouble + + + 17 + 17 + UTF-8 + + + + + + com.couplet + couplet-modules-system + + + + + diff --git a/couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/CoupletTroubleApplication.java b/couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/CoupletTroubleApplication.java new file mode 100644 index 0000000..c0882ce --- /dev/null +++ b/couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/CoupletTroubleApplication.java @@ -0,0 +1,18 @@ +package com.couplet.trouble; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.openfeign.EnableFeignClients; + +/** + * @author DongXiaoDong + * @version 1.0 + * @date 2024/3/26 21:42 + * @description + */ +@SpringBootApplication(scanBasePackages = "com.couplet.**") +public class CoupletTroubleApplication { + public static void main(String[] args) { + SpringApplication.run(CoupletTroubleApplication.class); + } +} diff --git a/couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/controller/SysTroubleController.java b/couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/controller/SysTroubleController.java new file mode 100644 index 0000000..3c5d21f --- /dev/null +++ b/couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/controller/SysTroubleController.java @@ -0,0 +1,68 @@ +package com.couplet.trouble.controller; + +import com.couplet.common.core.domain.Result; +import com.couplet.common.core.web.controller.BaseController; +import com.couplet.common.core.web.page.TableDataInfo; +import com.couplet.common.log.annotation.Log; +import com.couplet.common.log.enums.BusinessType; +import com.couplet.common.security.annotation.RequiresPermissions; +import com.couplet.common.security.utils.SecurityUtils; +import com.couplet.trouble.domain.Trouble; +import com.couplet.trouble.domain.req.TroubleAddReq; +import com.couplet.trouble.domain.req.TroubleUpdReq; +import com.couplet.trouble.service.SysTroubleService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * @author DongXiaoDong + * @version 1.0 + * @date 2024/3/26 22:36 + * @description + */ +@RestController +public class SysTroubleController extends BaseController { + @Autowired + private SysTroubleService troubleService; + + /** + * 故障管理列表 + */ + @GetMapping("/troubleList") + public Result> list(@RequestBody Trouble trouble) { + startPage(); + List list = troubleService.selectTroubleList(trouble); + return getDataTable(list); + } + + /** + * 新增故障码数据 + */ + @Log(title = "新增故障码数据", businessType = BusinessType.INSERT) + @PostMapping("insertTrouble") + public Result insert(@Validated @RequestBody TroubleAddReq troubleAddReq) { + return toAjax(troubleService.addTrouble(troubleAddReq)); + } + + /** + * 修改保存故障码数据 + */ + @Log(title = "修改故障码数据",businessType = BusinessType.UPDATE) + @PostMapping("updateTrouble") + public Result edit(@Validated @RequestBody TroubleUpdReq troubleUpdReq) { + return toAjax(troubleService.updateTrouble(troubleUpdReq)); + } + + /** + * 删除故障码数据 + */ + @Log(title = "删除故障码",businessType = BusinessType.DELETE) + @GetMapping("/removeId/{troubleId}") + public Result remove(@PathVariable Long troubleId) { + troubleService.removeById(troubleId); + return success(); + } +} diff --git a/couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/domain/Trouble.java b/couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/domain/Trouble.java new file mode 100644 index 0000000..34f71f8 --- /dev/null +++ b/couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/domain/Trouble.java @@ -0,0 +1,105 @@ +package com.couplet.trouble.domain; + +import com.couplet.common.core.annotation.Excel; +import com.couplet.common.core.web.domain.BaseEntity; +import lombok.*; +import lombok.experimental.SuperBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +/** + * @author DongXiaoDong + * @version 1.0 + * @date 2024/3/26 21:49 + * @description + */ +@Getter +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class Trouble extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @Excel(name = "故障码主键", cellType = Excel.ColumnType.NUMERIC) + private Integer troubleId; + + /** + * 故障码 + */ + @Excel(name = "故障码") + private String troubleCode; + + /** + * 故障位 + */ + @Excel(name = "故障位") + private String troublePosition; + + /** + * 故障值 + */ + @Excel(name = "故障值") + private String troubleValue; + + /** + * 故障标签 + */ + @Excel(name = "故障标签") + private String troubleTag; + + /** + * 故障类型Id + */ + private Integer troubleTypeId; + + /** + * 故障等级Id + */ + private Integer troubleGradeId; + + public void setTroubleId (Integer troubleId) { + this.troubleId = troubleId; + } + + public void setTroubleCode (String troubleCode) { + this.troubleCode = troubleCode; + } + + public void setTroublePosition (String troublePosition) { + this.troublePosition = troublePosition; + } + + public void setTroubleValue (String troubleValue) { + this.troubleValue = troubleValue; + } + + public void setTroubleTag (String troubleTag) { + this.troubleTag = troubleTag; + } + + public void setTroubleTypeId (Integer troubleTypeId) { + this.troubleTypeId = troubleTypeId; + } + + public void setTroubleGradeId (Integer troubleGradeId) { + this.troubleGradeId = troubleGradeId; + } + + @Override + public String toString() { + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) + .append("troubleId", getTroubleId()) + .append("troubleCode", getTroubleCode()) + .append("troublePosition", getTroublePosition()) + .append("troubleValue", getTroubleValue()) + .append("troubleTag", getTroubleTag()) + .append("troubleTypeId", getTroubleTypeId()) + .append("troubleGradeId", getTroubleGradeId()) + .toString(); + } +} diff --git a/couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/domain/TroubleGrade.java b/couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/domain/TroubleGrade.java new file mode 100644 index 0000000..6bc822e --- /dev/null +++ b/couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/domain/TroubleGrade.java @@ -0,0 +1,15 @@ +package com.couplet.trouble.domain; + +import lombok.Data; + +/** + * @author DongXiaoDong + * @version 1.0 + * @date 2024/3/26 21:49 + * @description + */ +@Data +public class TroubleGrade { + private Integer gradeId; + private String gradeName; +} diff --git a/couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/domain/TroubleType.java b/couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/domain/TroubleType.java new file mode 100644 index 0000000..deb51ab --- /dev/null +++ b/couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/domain/TroubleType.java @@ -0,0 +1,15 @@ +package com.couplet.trouble.domain; + +import lombok.Data; + +/** + * @author DongXiaoDong + * @version 1.0 + * @date 2024/3/26 21:50 + * @description + */ +@Data +public class TroubleType { + private Integer typeId; + private String typeName; +} diff --git a/couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/domain/req/TroubleAddReq.java b/couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/domain/req/TroubleAddReq.java new file mode 100644 index 0000000..76a509c --- /dev/null +++ b/couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/domain/req/TroubleAddReq.java @@ -0,0 +1,52 @@ +package com.couplet.trouble.domain.req; + +import com.couplet.common.core.annotation.Excel; +import com.couplet.common.core.web.domain.BaseEntity; +import lombok.*; +import lombok.experimental.SuperBuilder; + +/** + * @author DongXiaoDong + * @version 1.0 + * @date 2024/3/26 22:32 + * @description + */ +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +public class TroubleAddReq { + /** + * 故障码 + */ + @Excel(name = "故障码") + private String troubleCode; + + /** + * 故障位 + */ + @Excel(name = "故障位") + private String troublePosition; + + /** + * 故障值 + */ + @Excel(name = "故障值") + private String troubleValue; + + /** + * 故障标签 + */ + @Excel(name = "故障标签") + private String troubleTag; + + /** + * 故障类型Id + */ + private Integer troubleTypeId; + + /** + * 故障等级Id + */ + private Integer troubleGradeId; +} diff --git a/couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/domain/req/TroubleUpdReq.java b/couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/domain/req/TroubleUpdReq.java new file mode 100644 index 0000000..28bfb3f --- /dev/null +++ b/couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/domain/req/TroubleUpdReq.java @@ -0,0 +1,60 @@ +package com.couplet.trouble.domain.req; + +import com.couplet.common.core.annotation.Excel; +import com.couplet.common.core.web.domain.BaseEntity; +import com.couplet.common.system.domain.SysUser; +import com.couplet.trouble.domain.Trouble; +import lombok.*; +import lombok.experimental.SuperBuilder; + +/** + * @author DongXiaoDong + * @version 1.0 + * @date 2024/3/26 22:32 + * @description + */ +@Data +@SuperBuilder +@AllArgsConstructor +@NoArgsConstructor +public class TroubleUpdReq { + /** + * 主键id + */ + @Excel(name = "故障码主键", cellType = Excel.ColumnType.NUMERIC) + private Integer troubleId; + + /** + * 故障码 + */ + @Excel(name = "故障码") + private String troubleCode; + + /** + * 故障位 + */ + @Excel(name = "故障位") + private String troublePosition; + + /** + * 故障值 + */ + @Excel(name = "故障值") + private String troubleValue; + + /** + * 故障标签 + */ + @Excel(name = "故障标签") + private String troubleTag; + + /** + * 故障类型Id + */ + private Integer troubleTypeId; + + /** + * 故障等级Id + */ + private Integer troubleGradeId; +} diff --git a/couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/mapper/SysTroubleMapper.java b/couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/mapper/SysTroubleMapper.java new file mode 100644 index 0000000..d756f68 --- /dev/null +++ b/couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/mapper/SysTroubleMapper.java @@ -0,0 +1,24 @@ +package com.couplet.trouble.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.couplet.trouble.domain.Trouble; +import com.couplet.trouble.domain.req.TroubleAddReq; +import com.couplet.trouble.domain.req.TroubleUpdReq; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +/** + * @author DongXiaoDong + * @version 1.0 + * @date 2024/3/26 22:37 + * @description + */ +@Mapper +public interface SysTroubleMapper extends BaseMapper { + List selectTroubleList(Trouble trouble); + + int addTrouble(TroubleAddReq troubleAddReq); + + int updateTrouble(TroubleUpdReq troubleUpdReq); +} diff --git a/couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/service/SysTroubleService.java b/couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/service/SysTroubleService.java new file mode 100644 index 0000000..aa92d02 --- /dev/null +++ b/couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/service/SysTroubleService.java @@ -0,0 +1,24 @@ +package com.couplet.trouble.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.couplet.trouble.domain.Trouble; +import com.couplet.trouble.domain.req.TroubleAddReq; +import com.couplet.trouble.domain.req.TroubleUpdReq; + +import java.util.List; + +/** + * @author DongXiaoDong + * @version 1.0 + * @date 2024/3/26 22:38 + * @description + */ +public interface SysTroubleService extends IService { + List selectTroubleList(Trouble trouble); + + int addTrouble (TroubleAddReq troubleAddReq); + + int updateTrouble(TroubleUpdReq troubleUpdReq); + + +} diff --git a/couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/service/impl/SysTroubleServiceImpl.java b/couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/service/impl/SysTroubleServiceImpl.java new file mode 100644 index 0000000..96113e5 --- /dev/null +++ b/couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/service/impl/SysTroubleServiceImpl.java @@ -0,0 +1,57 @@ +package com.couplet.trouble.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.couplet.trouble.domain.Trouble; +import com.couplet.trouble.domain.req.TroubleAddReq; +import com.couplet.trouble.domain.req.TroubleUpdReq; +import com.couplet.trouble.mapper.SysTroubleMapper; +import com.couplet.trouble.service.SysTroubleService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @author DongXiaoDong + * @version 1.0 + * @date 2024/3/26 22:38 + * @description + */ +@Service +public class SysTroubleServiceImpl extends ServiceImpl implements SysTroubleService{ + + @Autowired + private SysTroubleMapper sysTroubleMapper; + + /** + * 查询故障码列表 + * @param trouble + * @return + */ + @Override + public List selectTroubleList(Trouble trouble) { + return sysTroubleMapper.selectTroubleList(trouble); + } + + /** + * 新增故障码数据 + * @param troubleAddReq + * @return + */ + @Override + public int addTrouble(TroubleAddReq troubleAddReq) { + return sysTroubleMapper.addTrouble(troubleAddReq); + } + + /** + * 修改故障码数据 + * @param troubleUpdReq + * @return + */ + @Override + public int updateTrouble(TroubleUpdReq troubleUpdReq) { + return sysTroubleMapper.updateTrouble(troubleUpdReq); + } + + +} diff --git a/couplet-modules/couplet-trouble/src/main/resources/bootstrap.yml b/couplet-modules/couplet-trouble/src/main/resources/bootstrap.yml new file mode 100644 index 0000000..c73ca5b --- /dev/null +++ b/couplet-modules/couplet-trouble/src/main/resources/bootstrap.yml @@ -0,0 +1,30 @@ +# Tomcat +server: + port: 9222 + +# Spring +spring: + application: + # 应用名称 + name: couplet-trouble + profiles: + # 环境配置 + active: dev + cloud: + nacos: + discovery: + # 服务注册地址 + server-addr: 121.89.211.230:8848 + namespace: a439ce3f-2c42-4b4c-9c4d-c8db49933c15 + config: + # 配置中心地址 + server-addr: 121.89.211.230:8848 + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + namespace: a439ce3f-2c42-4b4c-9c4d-c8db49933c15 +logging: + level: + com.couplet.trouble.mapper: DEBUG diff --git a/couplet-modules/couplet-trouble/src/main/resources/mapper/trouble/SysTroubleMapper.xml b/couplet-modules/couplet-trouble/src/main/resources/mapper/trouble/SysTroubleMapper.xml new file mode 100644 index 0000000..ab040e5 --- /dev/null +++ b/couplet-modules/couplet-trouble/src/main/resources/mapper/trouble/SysTroubleMapper.xml @@ -0,0 +1,92 @@ + + + + + + + + + + + + + + + + + + + + select t.*,g.grade_name,y.type_name from dxd_trouble_code t + LEFT JOIN dxd_trouble_grade g on t.trouble_grade_id = g.grade_id + LEFT JOIN dxd_trouble_type y on t.trouble_type_id= y.type_id + + + insert into dxd_trouble_code (trouble_code,trouble_position,trouble_value,trouble_tag,trouble_type_id,trouble_grade_id) + values (#{troubleCode},#{troublePosition},#{troubleValue},#{troubleTag},#{troubleTypeId},#{troubleGradeId}) + + + update dxd_trouble_code set + trouble_code = #{troubleCode}, + trouble_position = #{troublePosition}, + trouble_value = #{troubleValue}, + trouble_tag = #{troubleTag}, + trouble_type_id = #{troubleTypeId}, + trouble_grade_id = #{troubleGradeId} + where trouble_id = #{troubleId} + + + + + + + + + + + + + + + + + + delete + from dxd_trouble_code + where dict_code = #{dictCode} + + + + + + + + + + + + + + + + + + + + + + + diff --git a/couplet-modules/pom.xml b/couplet-modules/pom.xml index 5d1cb7d..8372348 100644 --- a/couplet-modules/pom.xml +++ b/couplet-modules/pom.xml @@ -13,6 +13,7 @@ couplet-gen couplet-job couplet-file + couplet-trouble couplet-modules diff --git a/couplet-visual/couplet-monitor/src/main/resources/bootstrap.yml b/couplet-visual/couplet-monitor/src/main/resources/bootstrap.yml index ff11d05..98a7702 100644 --- a/couplet-visual/couplet-monitor/src/main/resources/bootstrap.yml +++ b/couplet-visual/couplet-monitor/src/main/resources/bootstrap.yml @@ -15,6 +15,7 @@ spring: discovery: # 服务注册地址 server-addr: 121.89.211.230:8848 + namespace: a439ce3f-2c42-4b4c-9c4d-c8db49933c15 config: # 配置中心地址 server-addr: 121.89.211.230:8848 @@ -23,3 +24,4 @@ spring: # 共享配置 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + namespace: a439ce3f-2c42-4b4c-9c4d-c8db49933c15 diff --git a/pom.xml b/pom.xml index 61b166e..196caab 100644 --- a/pom.xml +++ b/pom.xml @@ -206,6 +206,12 @@ ${couplet.version} + + com.couplet + couplet-modules-system + ${couplet.version} + +