five-groups
/
five-groups-couplet
4
0
Fork 0
Code Issues Pull Requests 2 Packages Projects Releases Wiki Activity

3/28Dxd提交2

server_five_liuyunhu
dongxiaodong 2024-03-29 15:24:39 +08:00
parent e59a8b3300
commit 203e7b6561
20 changed files with 70 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
couplet-auth/src/main/resources/bootstrap.yml
View File

@ -15,11 +15,11 @@ spring:
discovery:
# 服务注册地址
server-addr: 121.89.211.230:8848
namespace: 172469
namespace: a439ce3f-2c42-4b4c-9c4d-c8db49933c15
config:
# 配置中心地址
server-addr: 121.89.211.230:8848
namespace: 172469
namespace: a439ce3f-2c42-4b4c-9c4d-c8db49933c15
# 配置文件格式
file-extension: yml
# 共享配置

4
couplet-gateway/src/main/resources/bootstrap.yml
View File

@ -15,11 +15,11 @@ spring:
discovery:
# 服务注册地址
server-addr: 121.89.211.230:8848
namespace: 172469
namespace: a439ce3f-2c42-4b4c-9c4d-c8db49933c15
config:
# 配置中心地址
server-addr: 121.89.211.230:8848
namespace: 172469
namespace: a439ce3f-2c42-4b4c-9c4d-c8db49933c15
# 配置文件格式
file-extension: yml
# 共享配置

4
couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/resources/bootstrap.yml
View File

@ -15,11 +15,11 @@ spring:
discovery:
# 服务注册地址
server-addr: 121.89.211.230:8848
namespace: 172469
namespace: a439ce3f-2c42-4b4c-9c4d-c8db49933c15
config:
# 配置中心地址
server-addr: 121.89.211.230:8848
namespace: 172469
namespace: a439ce3f-2c42-4b4c-9c4d-c8db49933c15
# 配置文件格式
file-extension: yml
# 共享配置

4
couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/resources/bootstrap.yml
View File

@ -15,11 +15,11 @@ spring:
discovery:
# 服务注册地址
server-addr: 121.89.211.230:8848
namespace: 172469
namespace: a439ce3f-2c42-4b4c-9c4d-c8db49933c15
config:
# 配置中心地址
server-addr: 121.89.211.230:8848
namespace: 172469
namespace: a439ce3f-2c42-4b4c-9c4d-c8db49933c15
# 配置文件格式
file-extension: yml
# 共享配置

4
couplet-modules/couplet-file/src/main/resources/bootstrap.yml
View File

@ -15,11 +15,11 @@ spring:
discovery:
# 服务注册地址
server-addr: 121.89.211.230:8848
namespace: 172469
namespace: a439ce3f-2c42-4b4c-9c4d-c8db49933c15
config:
# 配置中心地址
server-addr: 121.89.211.230:8848
namespace: 172469
namespace: a439ce3f-2c42-4b4c-9c4d-c8db49933c15
# 配置文件格式
file-extension: yml
# 共享配置

4
couplet-modules/couplet-gen/src/main/resources/bootstrap.yml
View File

@ -15,11 +15,11 @@ spring:
discovery:
# 服务注册地址
server-addr: 121.89.211.230:8848
namespace: 172469
namespace: a439ce3f-2c42-4b4c-9c4d-c8db49933c15
config:
# 配置中心地址
server-addr: 121.89.211.230:8848
namespace: 172469
namespace: a439ce3f-2c42-4b4c-9c4d-c8db49933c159
# 配置文件格式
file-extension: yml
# 共享配置

4
couplet-modules/couplet-job/src/main/resources/bootstrap.yml
View File

@ -15,11 +15,11 @@ spring:
discovery:
# 服务注册地址
server-addr: 121.89.211.230:8848
namespace: 172469
namespace: a439ce3f-2c42-4b4c-9c4d-c8db49933c15
config:
# 配置中心地址
server-addr: 121.89.211.230:8848
namespace: 172469
namespace: a439ce3f-2c42-4b4c-9c4d-c8db49933c15
# 配置文件格式
file-extension: yml
# 共享配置

4
couplet-modules/couplet-modules-mqtt/src/main/resources/bootstrap.yml
View File

@ -15,11 +15,11 @@ spring:
discovery:
# 服务注册地址
server-addr: 121.89.211.230:8848
namespace: 172469
namespace: a439ce3f-2c42-4b4c-9c4d-c8db49933c15
config:
# 配置中心地址
server-addr: 121.89.211.230:8848
namespace: 172469
namespace: a439ce3f-2c42-4b4c-9c4d-c8db49933c15
# 配置文件格式
file-extension: yml
# 共享配置

4
couplet-modules/couplet-modules-vehicle/src/main/resources/bootstrap.yml
View File

@ -15,11 +15,11 @@ spring:
discovery:
# 服务注册地址
server-addr: 121.89.211.230:8848
namespace: 172469
namespace: a439ce3f-2c42-4b4c-9c4d-c8db49933c15
config:
# 配置中心地址
server-addr: 121.89.211.230:8848
namespace: 172469
namespace: a439ce3f-2c42-4b4c-9c4d-c8db49933c15
# 配置文件格式
file-extension: yml
# 共享配置

4
couplet-modules/couplet-system/src/main/resources/bootstrap.yml
View File

@ -15,11 +15,11 @@ spring:
discovery:
# 服务注册地址
server-addr: 121.89.211.230:8848
namespace: 172469
namespace: a439ce3f-2c42-4b4c-9c4d-c8db49933c15
config:
# 配置中心地址
server-addr: 121.89.211.230:8848
namespace: 172469
namespace: a439ce3f-2c42-4b4c-9c4d-c8db49933c15
# 配置文件格式
file-extension: yml
# 共享配置

10
couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/controller/SysTroubleController.java
View File

@ -6,13 +6,13 @@ 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.trouble.domain.coupletTroubleCode;
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;
/**
@ -42,8 +42,8 @@ public class SysTroubleController extends BaseController {
*/
@Log(title = "新增故障码数据", businessType = BusinessType.INSERT)
@PostMapping("insertTrouble")
public Result<?> insert(@Validated @RequestBody TroubleAddReq troubleAddReq) {
return toAjax(troubleService.addTrouble(troubleAddReq));
public Result<?> insert(@Validated @RequestBody coupletTroubleCode troubleAddReq) {
return toAjax(troubleService.save(troubleAddReq));
}
/**
@ -51,8 +51,8 @@ public class SysTroubleController extends BaseController {
*/
@Log(title = "修改故障码数据",businessType = BusinessType.UPDATE)
@PostMapping("updateTrouble")
public Result<?> edit(@Validated @RequestBody TroubleUpdReq troubleUpdReq) {
return toAjax(troubleService.updateTrouble(troubleUpdReq));
public Result<?> edit(@Validated @RequestBody coupletTroubleCode troubleUpdReq) {
return toAjax(troubleService.updateById(troubleUpdReq));
}
/**

2
couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/domain/TroubleGrade.java → couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/domain/coupletTroubleGrade.java
View File

@ -9,7 +9,7 @@ import lombok.Data;
* @description
*/
@Data
public class TroubleGrade {
public class coupletTroubleGrade {
private Integer gradeId;
private String gradeName;
}

2
couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/domain/TroubleType.java → couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/domain/coupletTroubleType.java
View File

@ -9,7 +9,7 @@ import lombok.Data;
* @description
*/
@Data
public class TroubleType {
public class coupletTroubleType {
private Integer typeId;
private String typeName;
}

3
couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/domain/req/TroubleUpdReq.java
View File

@ -1,5 +1,7 @@
package com.couplet.trouble.domain.req;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.couplet.common.core.annotation.Excel;
import lombok.*;
import lombok.experimental.SuperBuilder;
@ -19,6 +21,7 @@ public class TroubleUpdReq {
* 主键id
*/
@Excel(name = "故障码主键", cellType = Excel.ColumnType.NUMERIC)
@TableId(value = "trouble_id",type = IdType.AUTO)
private Integer troubleId;
/**

4
couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/mapper/SysTroubleMapper.java
View File

@ -18,7 +18,7 @@ import java.util.List;
public interface SysTroubleMapper extends BaseMapper<coupletTroubleCode> {
List<coupletTroubleCode> selectTroubleList(coupletTroubleCode trouble);
int addTrouble(TroubleAddReq troubleAddReq);
// int addTrouble(TroubleAddReq troubleAddReq);
int updateTrouble(TroubleUpdReq troubleUpdReq);
// int updateTrouble(TroubleUpdReq troubleUpdReq);
}

4
couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/service/SysTroubleService.java
View File

@ -16,7 +16,7 @@ import java.util.List;
public interface SysTroubleService extends IService<coupletTroubleCode> {
List<coupletTroubleCode> selectTroubleList(coupletTroubleCode trouble);
int addTrouble (TroubleAddReq troubleAddReq);
// int addTrouble (TroubleAddReq troubleAddReq);
int updateTrouble(TroubleUpdReq troubleUpdReq);
// int updateTrouble(TroubleUpdReq troubleUpdReq);
}

30
couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/service/impl/SysTroubleServiceImpl.java
View File

@ -35,23 +35,23 @@ public class SysTroubleServiceImpl extends ServiceImpl<SysTroubleMapper, couplet
/**
* 新增故障码数据
* @param troubleAddReq
// * @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);
}
// @Override
// public int addTrouble(TroubleAddReq troubleAddReq) {
// return sysTroubleMapper.addTrouble(troubleAddReq);
// }
//
// /**
// * 修改故障码数据
// * @param troubleUpdReq
// * @return
// */
// @Override
// public int updateTrouble(TroubleUpdReq troubleUpdReq) {
// return sysTroubleMapper.updateTrouble(troubleUpdReq);
// }
}

7
couplet-modules/couplet-trouble/src/main/resources/bootstrap.yml
View File

@ -15,11 +15,11 @@ spring:
discovery:
# 服务注册地址
server-addr: 121.89.211.230:8848
namespace: 172469
namespace: a439ce3f-2c42-4b4c-9c4d-c8db49933c15
config:
# 配置中心地址
server-addr: 121.89.211.230:8848
namespace: 172469
namespace: a439ce3f-2c42-4b4c-9c4d-c8db49933c15
# 配置文件格式
file-extension: yml
# 共享配置
@ -30,3 +30,6 @@ spring:
logging:
level:
com.couplet.trouble.mapper: DEBUG
mybatis-plus:
configuration:
map-underscore-to-camel-case: true

32
couplet-modules/couplet-trouble/src/main/resources/mapper/trouble/SysTroubleMapper.xml
View File

@ -12,10 +12,6 @@
<result property="troubleTag" column="trouble_tag"/>
<result property="troubleTypeId" column="trouble_typeId"/>
<result property="troubleValue" column="trouble_value"/>
<result property="createBy" column="create_by"/>
<result property="createTime" column="create_time"/>
<result property="updateBy" column="update_by"/>
<result property="updateTime" column="update_time"/>
</resultMap>
<sql id="selectTroubleVo">
@ -23,20 +19,20 @@
LEFT JOIN couplet_trouble_grade g on t.trouble_grade_id = g.grade_id
LEFT JOIN couplet_trouble_type y on t.trouble_type_id= y.type_id
</sql>
<insert id="addTrouble">
insert into couplet_trouble_code (trouble_code,trouble_position,trouble_value,trouble_tag,trouble_type_id,trouble_grade_id)
values (#{troubleCode},#{troublePosition},#{troubleValue},#{troubleTag},#{troubleTypeId},#{troubleGradeId})
</insert>
<update id="updateTrouble">
update couplet_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}
</update>
<!-- <insert id="addTrouble">-->
<!-- insert into couplet_trouble_code (trouble_code,trouble_position,trouble_value,trouble_tag,trouble_type_id,trouble_grade_id)-->
<!-- values (#{troubleCode},#{troublePosition},#{troubleValue},#{troubleTag},#{troubleTypeId},#{troubleGradeId})-->
<!-- </insert>-->
<!-- <update id="updateTrouble">-->
<!-- update couplet_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}-->
<!-- </update>-->
<!-- <update id="updateTrouble" parameterType="com.couplet.trouble.domain.req.TroubleUpdReq">-->
<!-- update dxd_trouble_code-->
<!-- <set>-->

4
couplet-visual/couplet-monitor/src/main/resources/bootstrap.yml
View File

@ -15,11 +15,11 @@ spring:
discovery:
# 服务注册地址
server-addr: 121.89.211.230:8848
namespace: 172469
namespace: a439ce3f-2c42-4b4c-9c4d-c8db49933c15
config:
# 配置中心地址
server-addr: 121.89.211.230:8848
namespace: 172469
namespace: a439ce3f-2c42-4b4c-9c4d-c8db49933c15
# 配置文件格式
file-extension: yml
# 共享配置