diff --git a/bonus-auth/src/main/resources/bootstrap.yml b/bonus-auth/src/main/resources/bootstrap.yml index 20b9326..9092bd7 100644 --- a/bonus-auth/src/main/resources/bootstrap.yml +++ b/bonus-auth/src/main/resources/bootstrap.yml @@ -14,12 +14,12 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 192.168.0.14:8848 - namespace: 9404b13b-4b90-4759-98c7-f5d7a670ffd8 + server-addr: 192.168.0.56:8848 + namespace: 693e01a9-1dc4-4858-b1ae-439da3d35f66 config: # 配置中心地址 - server-addr: 192.168.0.14:8848 - namespace: 9404b13b-4b90-4759-98c7-f5d7a670ffd8 + server-addr: 192.168.0.56:8848 + namespace: 693e01a9-1dc4-4858-b1ae-439da3d35f66 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/bonus-gateway/src/main/resources/bootstrap.yml b/bonus-gateway/src/main/resources/bootstrap.yml index 0e3b8d9..da177bc 100644 --- a/bonus-gateway/src/main/resources/bootstrap.yml +++ b/bonus-gateway/src/main/resources/bootstrap.yml @@ -15,12 +15,12 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 192.168.0.14:8848 - namespace: 9404b13b-4b90-4759-98c7-f5d7a670ffd8 + server-addr: 192.168.0.56:8848 + namespace: 693e01a9-1dc4-4858-b1ae-439da3d35f66 config: # 配置中心地址 - server-addr: 192.168.0.14:8848 - namespace: 9404b13b-4b90-4759-98c7-f5d7a670ffd8 + server-addr: 192.168.0.56:8848 + namespace: 693e01a9-1dc4-4858-b1ae-439da3d35f66 # 配置文件格式 file-extension: yml # 共享配置 @@ -31,23 +31,24 @@ spring: eager: true transport: # 控制台地址 - dashboard: 192.168.0.14:18858 + dashboard: 192.168.0.56:8848 # nacos配置持久化 datasource: ds1: nacos: - server-addr: 192.168.0.14:8848 - namespace: 9404b13b-4b90-4759-98c7-f5d7a670ffd8 + server-addr: 192.168.0.56:8848 + namespace: 693e01a9-1dc4-4858-b1ae-439da3d35f66 dataId: sentinel-bonus-gateway groupId: DEFAULT_GROUP data-type: json rule-type: gw-flow -##系统 自动 加解密开关 -#system: -# encryptEnabled: false -# decryptEnabled: false +#系统 自动 加解密开关 +system: + encryptEnabled: false + decryptEnabled: false + #加密组件 jasypt: encryptor: diff --git a/bonus-modules/bonus-base/pom.xml b/bonus-modules/bonus-base/pom.xml new file mode 100644 index 0000000..19a3785 --- /dev/null +++ b/bonus-modules/bonus-base/pom.xml @@ -0,0 +1,99 @@ + + + 4.0.0 + + com.bonus + bonus-modules + 24.7.1-SNAPSHOT + + + bonus-base + + + bonus-modules-base基础模块 + + + + 8 + 8 + UTF-8 + + + + + + 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 + + + + + com.github.tobato + fastdfs-client + + + + + io.minio + minio + ${minio.version} + + + + + com.bonus + bonus-api-system + + + + + com.bonus + bonus-common-swagger + + + + + org.projectlombok + lombok + provided + + + + + ${project.artifactId} + + + org.springframework.boot + spring-boot-maven-plugin + + + + repackage + + + + + + + + \ No newline at end of file diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/BonusBaseApplication.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/BonusBaseApplication.java new file mode 100644 index 0000000..dc11068 --- /dev/null +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/BonusBaseApplication.java @@ -0,0 +1,32 @@ +package com.bonus.base; + +import com.bonus.common.swagger.annotation.EnableCustomSwagger2; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; + +/** + * @author : 阮世耀 + * @version : 1.0 + * @PackagePath: com.bonus + * @CreateTime: 2024-08-09 09:11 + * @Description: Base基础模块启动类 + */ + +@EnableCustomSwagger2 +@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class }) +public class BonusBaseApplication { + public static void main(String[] args) { + SpringApplication.run(BonusBaseApplication.class, args); + System.out.println("(♥◠‿◠)ﾉﾞ bonus-base基础模块启动成功 ლ(´ڡ`ლ)ﾞ \n" + + " .-------. ____ __ \n" + + " | _ _ \\ \\ \\ / / \n" + + " | ( ' ) | \\ _. / ' \n" + + " |(_ o _) / _( )_ .' \n" + + " | (_,_).' __ ___(_ o _)' \n" + + " | |\\ \\ | || |(_,_)' \n" + + " | | \\ `' /| `-' / \n" + + " | | \\ / \\ / \n" + + " ''-' `'-' `-..-' "); + } +} \ No newline at end of file diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/BmProjectController.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/BmProjectController.java new file mode 100644 index 0000000..f9fa427 --- /dev/null +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/BmProjectController.java @@ -0,0 +1,33 @@ +package com.bonus.base.controller; +import com.bonus.base.domain.BmProject; +import com.bonus.base.service.BmProjectService; +import org.springframework.web.bind.annotation.*; + +import org.springframework.beans.factory.annotation.Autowired; + +/** +* 工程项目管理(bm_project)表控制层 +* +* @author xxxxx +*/ +@RestController +@RequestMapping("/bm_project") +public class BmProjectController { +/** +* 服务对象 +*/ + @Autowired + private BmProjectService bmProjectService; + + /** + * 通过主键查询单条数据 + * + * @param id 主键 + * @return 单条数据 + */ + @GetMapping("selectOne") + public BmProject selectOne(Integer id) { + return bmProjectService.selectByPrimaryKey(id); + } + +} diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/domain/BmProject.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/domain/BmProject.java new file mode 100644 index 0000000..c2b7f55 --- /dev/null +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/domain/BmProject.java @@ -0,0 +1,128 @@ +package com.bonus.base.domain; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + *@PackagePath: com.bonus.base + *@author : 阮世耀 + *@CreateTime: 2024-08-09 10:13 + *@Description: 工程实体类 + *@version : 1.0 +*/ +@ApiModel(description="工程项目管理") +@Data +public class BmProject { + + @ApiModelProperty(value="主键") + private Integer id; + + /** + * 项目类型。 1：线路工程；2:变电工程；3:业务工程；4:其他工程 + */ + @ApiModelProperty(value="项目类型。 1：线路工程；2:变电工程；3:业务工程；4:其他工程") + private Integer projectType; + + @ApiModelProperty(value="") + private String name; + + @ApiModelProperty(value="") + private String num; + + @ApiModelProperty(value="") + private String manager; + + @ApiModelProperty(value="") + private String nature; + + @ApiModelProperty(value="") + private String telphone; + + @ApiModelProperty(value="") + private String phone; + + @ApiModelProperty(value="") + private String fax; + + @ApiModelProperty(value="") + private String address; + + @ApiModelProperty(value="") + private String remarks; + + @ApiModelProperty(value="") + private String materialClerk; + + @ApiModelProperty(value="") + private String clerkPhone; + + /** + * 电压等级，如1 为10kv，2为 35kv， 11为1100kv + */ + @ApiModelProperty(value="电压等级，如1 为10kv，2为 35kv， 11为1100kv") + private Integer voltageClass; + + @ApiModelProperty(value="") + private Integer companyId; + + @ApiModelProperty(value="") + private String isBalanceEnd; + + @ApiModelProperty(value="") + private String time; + + @ApiModelProperty(value="") + private String isActive; + + /** + * 经度 + */ + @ApiModelProperty(value="经度") + private String lon; + + /** + * 维度 + */ + @ApiModelProperty(value="维度") + private String lat; + + /** + * 组织分公司id + */ + @ApiModelProperty(value="组织分公司id") + private String company; + + /** + * 实施单位 + */ + @ApiModelProperty(value="实施单位") + private String impUnit; + + /** + * 项目部 + */ + @ApiModelProperty(value="项目部") + private String deptName; + + /** + * i8工程id + */ + @ApiModelProperty(value="i8工程id") + private String proId; + + /** + * 项目部id + */ + @ApiModelProperty(value="项目部id") + private Integer deptId; + + @ApiModelProperty(value="") + private String cvo; + + @ApiModelProperty(value="") + private String stats; + + @ApiModelProperty(value="") + private String htzt; +} \ No newline at end of file diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/mapper/BmProjectMapper.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/mapper/BmProjectMapper.java new file mode 100644 index 0000000..7e16a5d --- /dev/null +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/mapper/BmProjectMapper.java @@ -0,0 +1,60 @@ +package com.bonus.base.mapper; + +import com.bonus.base.domain.BmProject; +import org.apache.ibatis.annotations.Mapper; + +/** + *@PackagePath: com.bonus.base + *@author : 阮世耀 + *@CreateTime: 2024-08-09 10:13 + *@Description: 描述 + *@version : 1.0 +*/ +@Mapper +public interface BmProjectMapper { + /** + * delete by primary key + * @param id primaryKey + * @return deleteCount + */ + int deleteByPrimaryKey(Integer id); + + /** + * insert record to table + * @param record the record + * @return insert count + */ + int insert(BmProject record); + + int insertOrUpdate(BmProject record); + + int insertOrUpdateSelective(BmProject record); + + /** + * insert record to table selective + * @param record the record + * @return insert count + */ + int insertSelective(BmProject record); + + /** + * select by primary key + * @param id primary key + * @return object by primary key + */ + BmProject selectByPrimaryKey(Integer id); + + /** + * update record selective + * @param record the updated record + * @return update count + */ + int updateByPrimaryKeySelective(BmProject record); + + /** + * update record + * @param record the updated record + * @return update count + */ + int updateByPrimaryKey(BmProject record); +} \ No newline at end of file diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/BmProjectService.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/BmProjectService.java new file mode 100644 index 0000000..0e8afd2 --- /dev/null +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/BmProjectService.java @@ -0,0 +1,55 @@ +package com.bonus.base.service; + +import com.bonus.base.mapper.BmProjectMapper; +import org.springframework.stereotype.Service; + +import org.springframework.beans.factory.annotation.Autowired; + +import com.bonus.base.domain.BmProject; + +/** + *@PackagePath: com.bonus.base + *@author : 阮世耀 + *@CreateTime: 2024-08-09 10:13 + *@Description: 描述 + *@version : 1.0 +*/ +@Service +public class BmProjectService{ + + @Autowired + private BmProjectMapper bmProjectMapper; + + public int deleteByPrimaryKey(Integer id) { + return bmProjectMapper.deleteByPrimaryKey(id); + } + + public int insert(BmProject record) { + return bmProjectMapper.insert(record); + } + + public int insertOrUpdate(BmProject record) { + return bmProjectMapper.insertOrUpdate(record); + } + + public int insertOrUpdateSelective(BmProject record) { + return bmProjectMapper.insertOrUpdateSelective(record); + } + + public int insertSelective(BmProject record) { + return bmProjectMapper.insertSelective(record); + } + + public BmProject selectByPrimaryKey(Integer id) { + return bmProjectMapper.selectByPrimaryKey(id); + } + + public int updateByPrimaryKeySelective(BmProject record) { + return bmProjectMapper.updateByPrimaryKeySelective(record); + } + + public int updateByPrimaryKey(BmProject record) { + return bmProjectMapper.updateByPrimaryKey(record); + } + +} diff --git a/bonus-modules/bonus-base/src/main/resources/banner.txt b/bonus-modules/bonus-base/src/main/resources/banner.txt new file mode 100644 index 0000000..bf6f561 --- /dev/null +++ b/bonus-modules/bonus-base/src/main/resources/banner.txt @@ -0,0 +1,9 @@ +Spring Boot Version: ${spring-boot.version} +Spring Application Name: ${spring.application.name} + _ + | | + | |__ ___ _ __ _ _ ___ + | '_ \ / _ \ | '_ \ | | | | / __| + | |_) | | (_) | | | | | | |_| | \__ \ + |_.__/ \___/ |_| |_| \__,_| |___/ + diff --git a/bonus-modules/bonus-base/src/main/resources/bootstrap.yml b/bonus-modules/bonus-base/src/main/resources/bootstrap.yml new file mode 100644 index 0000000..9783640 --- /dev/null +++ b/bonus-modules/bonus-base/src/main/resources/bootstrap.yml @@ -0,0 +1,31 @@ +# Tomcat +server: + port: 18088 + +# Spring +spring: + servlet: + multipart: + max-file-size: 5GB + max-request-size: 5GB + application: + # 应用名称 + name: bonus-base + profiles: + # 环境配置 + active: dev + cloud: + nacos: + discovery: + # 服务注册地址 + server-addr: 192.168.0.56:8848 + namespace: 9cde1ce1-98bc-4b9c-9213-f1fbf8a5b3cc + config: + # 配置中心地址 + server-addr: 192.168.0.56:8848 + namespace: 9cde1ce1-98bc-4b9c-9213-f1fbf8a5b3cc + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} diff --git a/bonus-modules/bonus-base/src/main/resources/logback.xml b/bonus-modules/bonus-base/src/main/resources/logback.xml new file mode 100644 index 0000000..d14828d --- /dev/null +++ b/bonus-modules/bonus-base/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/bonus-modules/bonus-base/src/main/resources/mapper/BmProjectMapper.xml b/bonus-modules/bonus-base/src/main/resources/mapper/BmProjectMapper.xml new file mode 100644 index 0000000..f380e4e --- /dev/null +++ b/bonus-modules/bonus-base/src/main/resources/mapper/BmProjectMapper.xml @@ -0,0 +1,736 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, project_type, `name`, num, manager, nature, telphone, phone, fax, address, remarks, + material_clerk, clerk_phone, `voltage class`, company_id, is_balance_end, `time`, + is_active, lon, lat, company, imp_unit, dept_name, pro_id, dept_id, cvo, stats, htzt + + + + + + + delete from bm_project + where id = #{id,jdbcType=INTEGER} + + + + + insert into bm_project (project_type, `name`, num, + manager, nature, telphone, + phone, fax, address, + remarks, material_clerk, clerk_phone, + `voltage class`, company_id, is_balance_end, + `time`, is_active, lon, + lat, company, imp_unit, + dept_name, pro_id, dept_id, + cvo, stats, htzt) + values (#{projectType,jdbcType=INTEGER}, #{name,jdbcType=VARCHAR}, #{num,jdbcType=VARCHAR}, + #{manager,jdbcType=VARCHAR}, #{nature,jdbcType=VARCHAR}, #{telphone,jdbcType=VARCHAR}, + #{phone,jdbcType=VARCHAR}, #{fax,jdbcType=VARCHAR}, #{address,jdbcType=VARCHAR}, + #{remarks,jdbcType=VARCHAR}, #{materialClerk,jdbcType=VARCHAR}, #{clerkPhone,jdbcType=VARCHAR}, + #{voltageClass,jdbcType=INTEGER}, #{companyId,jdbcType=INTEGER}, #{isBalanceEnd,jdbcType=CHAR}, + #{time,jdbcType=VARCHAR}, #{isActive,jdbcType=VARCHAR}, #{lon,jdbcType=VARCHAR}, + #{lat,jdbcType=VARCHAR}, #{company,jdbcType=VARCHAR}, #{impUnit,jdbcType=VARCHAR}, + #{deptName,jdbcType=VARCHAR}, #{proId,jdbcType=VARCHAR}, #{deptId,jdbcType=INTEGER}, + #{cvo,jdbcType=VARCHAR}, #{stats,jdbcType=VARCHAR}, #{htzt,jdbcType=VARCHAR}) + + + + + insert into bm_project + + + project_type, + + + `name`, + + + num, + + + manager, + + + nature, + + + telphone, + + + phone, + + + fax, + + + address, + + + remarks, + + + material_clerk, + + + clerk_phone, + + + `voltage class`, + + + company_id, + + + is_balance_end, + + + `time`, + + + is_active, + + + lon, + + + lat, + + + company, + + + imp_unit, + + + dept_name, + + + pro_id, + + + dept_id, + + + cvo, + + + stats, + + + htzt, + + + + + #{projectType,jdbcType=INTEGER}, + + + #{name,jdbcType=VARCHAR}, + + + #{num,jdbcType=VARCHAR}, + + + #{manager,jdbcType=VARCHAR}, + + + #{nature,jdbcType=VARCHAR}, + + + #{telphone,jdbcType=VARCHAR}, + + + #{phone,jdbcType=VARCHAR}, + + + #{fax,jdbcType=VARCHAR}, + + + #{address,jdbcType=VARCHAR}, + + + #{remarks,jdbcType=VARCHAR}, + + + #{materialClerk,jdbcType=VARCHAR}, + + + #{clerkPhone,jdbcType=VARCHAR}, + + + #{voltageClass,jdbcType=INTEGER}, + + + #{companyId,jdbcType=INTEGER}, + + + #{isBalanceEnd,jdbcType=CHAR}, + + + #{time,jdbcType=VARCHAR}, + + + #{isActive,jdbcType=VARCHAR}, + + + #{lon,jdbcType=VARCHAR}, + + + #{lat,jdbcType=VARCHAR}, + + + #{company,jdbcType=VARCHAR}, + + + #{impUnit,jdbcType=VARCHAR}, + + + #{deptName,jdbcType=VARCHAR}, + + + #{proId,jdbcType=VARCHAR}, + + + #{deptId,jdbcType=INTEGER}, + + + #{cvo,jdbcType=VARCHAR}, + + + #{stats,jdbcType=VARCHAR}, + + + #{htzt,jdbcType=VARCHAR}, + + + + + + update bm_project + + + project_type = #{projectType,jdbcType=INTEGER}, + + + `name` = #{name,jdbcType=VARCHAR}, + + + num = #{num,jdbcType=VARCHAR}, + + + manager = #{manager,jdbcType=VARCHAR}, + + + nature = #{nature,jdbcType=VARCHAR}, + + + telphone = #{telphone,jdbcType=VARCHAR}, + + + phone = #{phone,jdbcType=VARCHAR}, + + + fax = #{fax,jdbcType=VARCHAR}, + + + address = #{address,jdbcType=VARCHAR}, + + + remarks = #{remarks,jdbcType=VARCHAR}, + + + material_clerk = #{materialClerk,jdbcType=VARCHAR}, + + + clerk_phone = #{clerkPhone,jdbcType=VARCHAR}, + + + `voltage class` = #{voltageClass,jdbcType=INTEGER}, + + + company_id = #{companyId,jdbcType=INTEGER}, + + + is_balance_end = #{isBalanceEnd,jdbcType=CHAR}, + + + `time` = #{time,jdbcType=VARCHAR}, + + + is_active = #{isActive,jdbcType=VARCHAR}, + + + lon = #{lon,jdbcType=VARCHAR}, + + + lat = #{lat,jdbcType=VARCHAR}, + + + company = #{company,jdbcType=VARCHAR}, + + + imp_unit = #{impUnit,jdbcType=VARCHAR}, + + + dept_name = #{deptName,jdbcType=VARCHAR}, + + + pro_id = #{proId,jdbcType=VARCHAR}, + + + dept_id = #{deptId,jdbcType=INTEGER}, + + + cvo = #{cvo,jdbcType=VARCHAR}, + + + stats = #{stats,jdbcType=VARCHAR}, + + + htzt = #{htzt,jdbcType=VARCHAR}, + + + where id = #{id,jdbcType=INTEGER} + + + + update bm_project + set project_type = #{projectType,jdbcType=INTEGER}, + `name` = #{name,jdbcType=VARCHAR}, + num = #{num,jdbcType=VARCHAR}, + manager = #{manager,jdbcType=VARCHAR}, + nature = #{nature,jdbcType=VARCHAR}, + telphone = #{telphone,jdbcType=VARCHAR}, + phone = #{phone,jdbcType=VARCHAR}, + fax = #{fax,jdbcType=VARCHAR}, + address = #{address,jdbcType=VARCHAR}, + remarks = #{remarks,jdbcType=VARCHAR}, + material_clerk = #{materialClerk,jdbcType=VARCHAR}, + clerk_phone = #{clerkPhone,jdbcType=VARCHAR}, + `voltage class` = #{voltageClass,jdbcType=INTEGER}, + company_id = #{companyId,jdbcType=INTEGER}, + is_balance_end = #{isBalanceEnd,jdbcType=CHAR}, + `time` = #{time,jdbcType=VARCHAR}, + is_active = #{isActive,jdbcType=VARCHAR}, + lon = #{lon,jdbcType=VARCHAR}, + lat = #{lat,jdbcType=VARCHAR}, + company = #{company,jdbcType=VARCHAR}, + imp_unit = #{impUnit,jdbcType=VARCHAR}, + dept_name = #{deptName,jdbcType=VARCHAR}, + pro_id = #{proId,jdbcType=VARCHAR}, + dept_id = #{deptId,jdbcType=INTEGER}, + cvo = #{cvo,jdbcType=VARCHAR}, + stats = #{stats,jdbcType=VARCHAR}, + htzt = #{htzt,jdbcType=VARCHAR} + where id = #{id,jdbcType=INTEGER} + + + + insert into bm_project + + + id, + + project_type, + `name`, + num, + manager, + nature, + telphone, + phone, + fax, + address, + remarks, + material_clerk, + clerk_phone, + `voltage class`, + company_id, + is_balance_end, + `time`, + is_active, + lon, + lat, + company, + imp_unit, + dept_name, + pro_id, + dept_id, + cvo, + stats, + htzt, + + values + + + #{id,jdbcType=INTEGER}, + + #{projectType,jdbcType=INTEGER}, + #{name,jdbcType=VARCHAR}, + #{num,jdbcType=VARCHAR}, + #{manager,jdbcType=VARCHAR}, + #{nature,jdbcType=VARCHAR}, + #{telphone,jdbcType=VARCHAR}, + #{phone,jdbcType=VARCHAR}, + #{fax,jdbcType=VARCHAR}, + #{address,jdbcType=VARCHAR}, + #{remarks,jdbcType=VARCHAR}, + #{materialClerk,jdbcType=VARCHAR}, + #{clerkPhone,jdbcType=VARCHAR}, + #{voltageClass,jdbcType=INTEGER}, + #{companyId,jdbcType=INTEGER}, + #{isBalanceEnd,jdbcType=CHAR}, + #{time,jdbcType=VARCHAR}, + #{isActive,jdbcType=VARCHAR}, + #{lon,jdbcType=VARCHAR}, + #{lat,jdbcType=VARCHAR}, + #{company,jdbcType=VARCHAR}, + #{impUnit,jdbcType=VARCHAR}, + #{deptName,jdbcType=VARCHAR}, + #{proId,jdbcType=VARCHAR}, + #{deptId,jdbcType=INTEGER}, + #{cvo,jdbcType=VARCHAR}, + #{stats,jdbcType=VARCHAR}, + #{htzt,jdbcType=VARCHAR}, + + on duplicate key update + + + id = #{id,jdbcType=INTEGER}, + + project_type = #{projectType,jdbcType=INTEGER}, + `name` = #{name,jdbcType=VARCHAR}, + num = #{num,jdbcType=VARCHAR}, + manager = #{manager,jdbcType=VARCHAR}, + nature = #{nature,jdbcType=VARCHAR}, + telphone = #{telphone,jdbcType=VARCHAR}, + phone = #{phone,jdbcType=VARCHAR}, + fax = #{fax,jdbcType=VARCHAR}, + address = #{address,jdbcType=VARCHAR}, + remarks = #{remarks,jdbcType=VARCHAR}, + material_clerk = #{materialClerk,jdbcType=VARCHAR}, + clerk_phone = #{clerkPhone,jdbcType=VARCHAR}, + `voltage class` = #{voltageClass,jdbcType=INTEGER}, + company_id = #{companyId,jdbcType=INTEGER}, + is_balance_end = #{isBalanceEnd,jdbcType=CHAR}, + `time` = #{time,jdbcType=VARCHAR}, + is_active = #{isActive,jdbcType=VARCHAR}, + lon = #{lon,jdbcType=VARCHAR}, + lat = #{lat,jdbcType=VARCHAR}, + company = #{company,jdbcType=VARCHAR}, + imp_unit = #{impUnit,jdbcType=VARCHAR}, + dept_name = #{deptName,jdbcType=VARCHAR}, + pro_id = #{proId,jdbcType=VARCHAR}, + dept_id = #{deptId,jdbcType=INTEGER}, + cvo = #{cvo,jdbcType=VARCHAR}, + stats = #{stats,jdbcType=VARCHAR}, + htzt = #{htzt,jdbcType=VARCHAR}, + + + + + insert into bm_project + + + id, + + + project_type, + + + `name`, + + + num, + + + manager, + + + nature, + + + telphone, + + + phone, + + + fax, + + + address, + + + remarks, + + + material_clerk, + + + clerk_phone, + + + `voltage class`, + + + company_id, + + + is_balance_end, + + + `time`, + + + is_active, + + + lon, + + + lat, + + + company, + + + imp_unit, + + + dept_name, + + + pro_id, + + + dept_id, + + + cvo, + + + stats, + + + htzt, + + + values + + + #{id,jdbcType=INTEGER}, + + + #{projectType,jdbcType=INTEGER}, + + + #{name,jdbcType=VARCHAR}, + + + #{num,jdbcType=VARCHAR}, + + + #{manager,jdbcType=VARCHAR}, + + + #{nature,jdbcType=VARCHAR}, + + + #{telphone,jdbcType=VARCHAR}, + + + #{phone,jdbcType=VARCHAR}, + + + #{fax,jdbcType=VARCHAR}, + + + #{address,jdbcType=VARCHAR}, + + + #{remarks,jdbcType=VARCHAR}, + + + #{materialClerk,jdbcType=VARCHAR}, + + + #{clerkPhone,jdbcType=VARCHAR}, + + + #{voltageClass,jdbcType=INTEGER}, + + + #{companyId,jdbcType=INTEGER}, + + + #{isBalanceEnd,jdbcType=CHAR}, + + + #{time,jdbcType=VARCHAR}, + + + #{isActive,jdbcType=VARCHAR}, + + + #{lon,jdbcType=VARCHAR}, + + + #{lat,jdbcType=VARCHAR}, + + + #{company,jdbcType=VARCHAR}, + + + #{impUnit,jdbcType=VARCHAR}, + + + #{deptName,jdbcType=VARCHAR}, + + + #{proId,jdbcType=VARCHAR}, + + + #{deptId,jdbcType=INTEGER}, + + + #{cvo,jdbcType=VARCHAR}, + + + #{stats,jdbcType=VARCHAR}, + + + #{htzt,jdbcType=VARCHAR}, + + + on duplicate key update + + + id = #{id,jdbcType=INTEGER}, + + + project_type = #{projectType,jdbcType=INTEGER}, + + + `name` = #{name,jdbcType=VARCHAR}, + + + num = #{num,jdbcType=VARCHAR}, + + + manager = #{manager,jdbcType=VARCHAR}, + + + nature = #{nature,jdbcType=VARCHAR}, + + + telphone = #{telphone,jdbcType=VARCHAR}, + + + phone = #{phone,jdbcType=VARCHAR}, + + + fax = #{fax,jdbcType=VARCHAR}, + + + address = #{address,jdbcType=VARCHAR}, + + + remarks = #{remarks,jdbcType=VARCHAR}, + + + material_clerk = #{materialClerk,jdbcType=VARCHAR}, + + + clerk_phone = #{clerkPhone,jdbcType=VARCHAR}, + + + `voltage class` = #{voltageClass,jdbcType=INTEGER}, + + + company_id = #{companyId,jdbcType=INTEGER}, + + + is_balance_end = #{isBalanceEnd,jdbcType=CHAR}, + + + `time` = #{time,jdbcType=VARCHAR}, + + + is_active = #{isActive,jdbcType=VARCHAR}, + + + lon = #{lon,jdbcType=VARCHAR}, + + + lat = #{lat,jdbcType=VARCHAR}, + + + company = #{company,jdbcType=VARCHAR}, + + + imp_unit = #{impUnit,jdbcType=VARCHAR}, + + + dept_name = #{deptName,jdbcType=VARCHAR}, + + + pro_id = #{proId,jdbcType=VARCHAR}, + + + dept_id = #{deptId,jdbcType=INTEGER}, + + + cvo = #{cvo,jdbcType=VARCHAR}, + + + stats = #{stats,jdbcType=VARCHAR}, + + + htzt = #{htzt,jdbcType=VARCHAR}, + + + + \ No newline at end of file diff --git a/bonus-modules/bonus-gen/src/main/resources/bootstrap.yml b/bonus-modules/bonus-gen/src/main/resources/bootstrap.yml index e796a65..85dbddc 100644 --- a/bonus-modules/bonus-gen/src/main/resources/bootstrap.yml +++ b/bonus-modules/bonus-gen/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 192.168.0.56:8848 - namespace: 9cde1ce1-98bc-4b9c-9213-f1fbf8a5b3cc + namespace: 693e01a9-1dc4-4858-b1ae-439da3d35f66 config: # 配置中心地址 server-addr: 192.168.0.56:8848 - namespace: 9cde1ce1-98bc-4b9c-9213-f1fbf8a5b3cc + namespace: 693e01a9-1dc4-4858-b1ae-439da3d35f66 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/bonus-modules/bonus-system/src/main/resources/bootstrap.yml b/bonus-modules/bonus-system/src/main/resources/bootstrap.yml index 1c61dcd..9d5b63e 100644 --- a/bonus-modules/bonus-system/src/main/resources/bootstrap.yml +++ b/bonus-modules/bonus-system/src/main/resources/bootstrap.yml @@ -14,12 +14,12 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 192.168.0.14:8848 - namespace: 9404b13b-4b90-4759-98c7-f5d7a670ffd8 + server-addr: 192.168.0.56:8848 + namespace: 693e01a9-1dc4-4858-b1ae-439da3d35f66 config: # 配置中心地址 - server-addr: 192.168.0.14:8848 - namespace: 9404b13b-4b90-4759-98c7-f5d7a670ffd8 + server-addr: 192.168.0.56:8848 + namespace: 693e01a9-1dc4-4858-b1ae-439da3d35f66 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/bonus-modules/pom.xml b/bonus-modules/pom.xml index 6a09a37..f777a48 100644 --- a/bonus-modules/pom.xml +++ b/bonus-modules/pom.xml @@ -16,6 +16,7 @@ bonus-oss bonus-obs bonus-mongodb + bonus-base bonus-modules