Skip to content

谢明辉 / fanxing3

Go to a project
Commit 2d0dca77 by xmh
Options

合并code服务到ops服务里

1 parent adb48378
Inline Side-by-side
Showing 19 changed files with 77 additions and 414 deletions
fanxing-code/pom.xml deleted 100644 → 0
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.viontech</groupId>
<artifactId>fanxing3</artifactId>
<version>3.0.0-SNAPSHOT</version>
</parent>
<artifactId>fanxing-code</artifactId>
<version>${project.parent.version}</version>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<dependency>
<groupId>com.viontech</groupId>
<artifactId>fanxing-commons</artifactId>
<version>${parent.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-consul-discovery</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-consul-config</artifactId>
</dependency>
</dependencies>
<build>
<finalName>fanxing-code</finalName>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<excludes>
<exclude>application.yml</exclude>
</excludes>
</configuration>
</plugin>
</plugins>
<resources>
<resource>
<directory>src/main/java</directory>
<includes>
<include>**/*.xml</include>
</includes>
</resource>
</resources>
</build>
</project>
\ No newline at end of file \ No newline at end of file
fanxing-code/src/main/java/com/viontech/fanxing/code/CodeApp.java deleted 100644 → 0
package com.viontech.fanxing.code;
import lombok.extern.slf4j.Slf4j;
import org.mybatis.spring.annotation.MapperScan;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
import org.springframework.cloud.openfeign.EnableFeignClients;
import org.springframework.scheduling.annotation.EnableScheduling;
/**
* .
*
* @author 谢明辉
* @date 2021/7/8
*/
@EnableDiscoveryClient
@EnableScheduling
@SpringBootApplication(scanBasePackages = "com.viontech.fanxing")
@EnableFeignClients
@MapperScan(basePackages = "com.viontech.fanxing.code.mapper")
@Slf4j
public class CodeApp {
public static void main(String[] args) {
try {
SpringApplication.run(CodeApp.class, args);
} catch (Exception e) {
log.error("Code app start error", e);
}
}
}
fanxing-code/src/main/resources/application.yml deleted 100644 → 0
spring:
cloud:
loadbalancer:
ribbon:
enabled: false
consul:
# 服务发现配置
discovery:
# 启用服务发现
enabled: true
# 启用服务注册
register: true
# 服务停止时取消注册
deregister: true
# 表示注册时使用IP而不是hostname
prefer-ip-address: true
# 执行监控检查的频率
health-check-interval: 10s
# 设置健康检查失败多长时间后，取消注册
health-check-critical-timeout: 30s
# 健康检查的路径
health-check-path: /actuator/info
# 服务注册标识，格式为：应用名称:服务器IP:端口
instance-id: ${spring.application.name}:${spring.cloud.consul.discovery.ip-address}:${server.port}
ip-address: 192.168.9.146
datasource:
driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://192.168.9.233:3306/fanxing3
username: root
password: 123456
redis:
host: 192.168.9.233
port: 6379
password: 3c61f2e4c4d1877ef9d01319c3a0fccaeabb1518
database: 15
jackson:
date-format: yyyy-MM-dd HH:mm:ss
time-zone: GMT+8
default-property-inclusion: non_null
logging:
config: classpath:logback-${spring.profiles.active}.xml
mybatis:
type-aliases-package: com.viontech.fanxing.commons.model
mapper-locations: classpath:com/viontech/fanxing/code/mapping/*.xml
pagehelper:
helper-dialect: mysql
reasonable: true
supportMethodsArguments: true
params: count=countByExample
vion:
redisson:
path: F:\myIDEAworkspace\jt\fanxing3\fanxing-commons\src\main\resources\redisson.yml
fanxing-code/src/main/resources/bootstrap.yml deleted 100644 → 0
server:
port: 30006
spring:
profiles:
active:
${PROFILE}
application:
name: fanxing-code
cloud:
consul:
host: 192.168.9.233
port: 8500
discovery:
service-name: ${spring.application.name}
# config 在 consul > key/value 中命名规则: prefix/default-context,profiles.active/data-key
config:
enabled: true
format: YAML
prefix: fanxing
default-context: ${spring.application.name}
data-key: config
watch:
enabled: true
delay: 10000
wait-time: 30
fanxing-code/src/main/resources/logback-dev.xml deleted 100644 → 0
<?xml version="1.0" encoding="UTF-8"?>
<configuration scan="true" scanPeriod="10 seconds">
<contextName>logback</contextName>
<property name="log.path" value="logs"/>
<property name="pattern" value="[%d{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] [%thread] %logger{50} - %msg%n"/>
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
<level>info</level>
</filter>
<encoder>
<Pattern>${pattern}</Pattern>
</encoder>
</appender>
<root level="debug">
<appender-ref ref="CONSOLE"/>
</root>
</configuration>
\ No newline at end of file \ No newline at end of file
fanxing-code/src/main/resources/logback-pro.xml deleted 100644 → 0
<?xml version="1.0" encoding="UTF-8"?>
<!-- 日志级别从低到高分为TRACE < DEBUG < INFO < WARN < ERROR < FATAL，如果设置为WARN，则低于WARN的信息都不会输出 -->
<!-- scan:当此属性设置为true时，配置文件如果发生改变，将会被重新加载，默认值为true -->
<!-- scanPeriod:设置监测配置文件是否有修改的时间间隔，如果没有给出时间单位，默认单位是毫秒。当scan为true时，此属性生效。默认的时间间隔为1分钟。 -->
<!-- debug:当此属性设置为true时，将打印出logback内部日志信息，实时查看logback运行状态。默认值为false。 -->
<configuration scan="true" scanPeriod="10 seconds">
<!--<include resource="org/springframework/boot/logging/logback/base.xml" />-->
<contextName>logback</contextName>
<!-- name的值是变量的名称，value的值时变量定义的值。通过定义的值会被插入到logger上下文中。定义变量后，可以使“${}”来使用变量。 -->
<property name="log.path" value="logs"/>
<property name="pattern" value="[%d{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] [%thread] %logger{50} - %msg%n"/>
<!--输出到控制台-->
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
<!--此日志appender是为开发使用，只配置最底级别，控制台输出的日志级别是大于或等于此级别的日志信息-->
<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
<level>info</level>
</filter>
<encoder>
<Pattern>${pattern}</Pattern>
<!-- 设置字符集 -->
</encoder>
</appender>
<!--输出到文件-->
<!-- 时间滚动输出 level为 DEBUG 日志 -->
<appender name="DEBUG_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
<!-- 正在记录的日志文件的路径及文件名 -->
<file>${log.path}/log_debug.log</file>
<!--日志文件输出格式-->
<encoder>
<Pattern>${pattern}</Pattern>
<charset>UTF-8</charset> <!-- 设置字符集 -->
</encoder>
<!-- 日志记录器的滚动策略，按日期，按大小记录 -->
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<!-- 日志归档 -->
<fileNamePattern>${log.path}/debug/log-debug-%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
<timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
<maxFileSize>100MB</maxFileSize>
</timeBasedFileNamingAndTriggeringPolicy>
<!--日志文件保留天数-->
<maxHistory>15</maxHistory>
</rollingPolicy>
<!-- 此日志文件只记录debug级别的 -->
<filter class="ch.qos.logback.classic.filter.LevelFilter">
<level>debug</level>
<onMatch>ACCEPT</onMatch>
<onMismatch>DENY</onMismatch>
</filter>
</appender>
<!-- 时间滚动输出 level为 INFO 日志 -->
<appender name="INFO_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
<!-- 正在记录的日志文件的路径及文件名 -->
<file>${log.path}/log_info.log</file>
<!--日志文件输出格式-->
<encoder>
<Pattern>${pattern}</Pattern>
<charset>UTF-8</charset>
</encoder>
<!-- 日志记录器的滚动策略，按日期，按大小记录 -->
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<!-- 每天日志归档路径以及格式 -->
<fileNamePattern>${log.path}/info/log-info-%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
<timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
<maxFileSize>100MB</maxFileSize>
</timeBasedFileNamingAndTriggeringPolicy>
<!--日志文件保留天数-->
<maxHistory>15</maxHistory>
</rollingPolicy>
<!-- 此日志文件只记录info级别的 -->
<filter class="ch.qos.logback.classic.filter.LevelFilter">
<level>info</level>
<onMatch>ACCEPT</onMatch>
<onMismatch>NEUTRAL</onMismatch>
</filter>
<filter class="ch.qos.logback.classic.filter.LevelFilter">
<level>warn</level>
<onMatch>ACCEPT</onMatch>
<onMismatch>DENY</onMismatch>
</filter>
</appender>
<!-- 时间滚动输出 level为 WARN 日志 -->
<appender name="WARN_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
<!-- 正在记录的日志文件的路径及文件名 -->
<file>${log.path}/log_warn.log</file>
<!--日志文件输出格式-->
<encoder>
<Pattern>${pattern}</Pattern>
<charset>UTF-8</charset> <!-- 此处设置字符集 -->
</encoder>
<!-- 日志记录器的滚动策略，按日期，按大小记录 -->
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<fileNamePattern>${log.path}/warn/log-warn-%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
<timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
<maxFileSize>100MB</maxFileSize>
</timeBasedFileNamingAndTriggeringPolicy>
<!--日志文件保留天数-->
<maxHistory>5</maxHistory>
</rollingPolicy>
<!-- 此日志文件只记录warn级别的 -->
<filter class="ch.qos.logback.classic.filter.LevelFilter">
<level>warn</level>
<onMatch>ACCEPT</onMatch>
<onMismatch>DENY</onMismatch>
</filter>
</appender>
<!-- 时间滚动输出 level为 ERROR 日志 -->
<appender name="ERROR_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
<!-- 正在记录的日志文件的路径及文件名 -->
<file>${log.path}/log_error.log</file>
<!--日志文件输出格式-->
<encoder>
<Pattern>${pattern}</Pattern>
<charset>UTF-8</charset> <!-- 此处设置字符集 -->
</encoder>
<!-- 日志记录器的滚动策略，按日期，按大小记录 -->
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<fileNamePattern>${log.path}/error/log-error-%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
<timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
<maxFileSize>100MB</maxFileSize>
</timeBasedFileNamingAndTriggeringPolicy>
<!--日志文件保留天数-->
<maxHistory>15</maxHistory>
</rollingPolicy>
<!-- 此日志文件只记录ERROR级别的 -->
<filter class="ch.qos.logback.classic.filter.LevelFilter">
<level>ERROR</level>
<onMatch>ACCEPT</onMatch>
<onMismatch>DENY</onMismatch>
</filter>
</appender>
<logger name="com.viontech" level="debug">
<appender-ref ref="DEBUG_FILE"/>
</logger>
<root level="info">
<appender-ref ref="CONSOLE"/>
<appender-ref ref="INFO_FILE"/>
<appender-ref ref="WARN_FILE"/>
<appender-ref ref="ERROR_FILE"/>
</root>
</configuration>
\ No newline at end of file \ No newline at end of file
fanxing-code/src/main/java/com/viontech/fanxing/code/controller/base/DictCateBaseController.java → fanxing-ops/src/main/java/com/viontech/fanxing/ops/controller/base/DictCateBaseController.java
package com.viontech.fanxing.code.controller.base; package com.viontech.fanxing.ops.controller.base;
import com.viontech.fanxing.commons.base.BaseController; import com.viontech.fanxing.commons.base.BaseController;
import com.viontech.fanxing.commons.base.BaseExample; import com.viontech.fanxing.commons.base.BaseExample;
import com.viontech.fanxing.commons.base.BaseService; import com.viontech.fanxing.commons.base.BaseService;
import com.viontech.fanxing.commons.model.DictCate; import com.viontech.fanxing.commons.model.DictCate;
import com.viontech.fanxing.commons.model.DictCateExample; import com.viontech.fanxing.commons.model.DictCateExample;
import com.viontech.fanxing.code.service.adapter.DictCateService;
import com.viontech.fanxing.commons.vo.DictCateVo; import com.viontech.fanxing.commons.vo.DictCateVo;
import com.viontech.fanxing.ops.service.adapter.DictCateService;
import javax.annotation.Resource; import javax.annotation.Resource;
public abstract class DictCateBaseController extends BaseController<DictCate, DictCateVo> { public abstract class DictCateBaseController extends BaseController<DictCate, DictCateVo> {
......
fanxing-code/src/main/java/com/viontech/fanxing/code/controller/base/DictCodeBaseController.java → fanxing-ops/src/main/java/com/viontech/fanxing/ops/controller/base/DictCodeBaseController.java
package com.viontech.fanxing.code.controller.base; package com.viontech.fanxing.ops.controller.base;
import com.viontech.fanxing.commons.model.DictCode;
import com.viontech.fanxing.commons.model.DictCodeExample;
import com.viontech.fanxing.code.service.adapter.DictCodeService;
import com.viontech.fanxing.commons.vo.DictCodeVo;
import com.viontech.fanxing.commons.base.BaseController; import com.viontech.fanxing.commons.base.BaseController;
import com.viontech.fanxing.commons.base.BaseExample; import com.viontech.fanxing.commons.base.BaseExample;
import com.viontech.fanxing.commons.base.BaseService; import com.viontech.fanxing.commons.base.BaseService;
import com.viontech.fanxing.commons.model.DictCode;
import com.viontech.fanxing.commons.model.DictCodeExample;
import com.viontech.fanxing.commons.vo.DictCodeVo;
import com.viontech.fanxing.ops.service.adapter.DictCodeService;
import javax.annotation.Resource; import javax.annotation.Resource;
public abstract class DictCodeBaseController extends BaseController<DictCode, DictCodeVo> { public abstract class DictCodeBaseController extends BaseController<DictCode, DictCodeVo> {
...@@ -17,115 +18,115 @@ public abstract class DictCodeBaseController extends BaseController<DictCode, Di ...@@ -17,115 +18,115 @@ public abstract class DictCodeBaseController extends BaseController<DictCode, Di
protected BaseExample getExample(DictCodeVo dictCodeVo, int type) { protected BaseExample getExample(DictCodeVo dictCodeVo, int type) {
DictCodeExample dictCodeExample = new DictCodeExample(); DictCodeExample dictCodeExample = new DictCodeExample();
DictCodeExample.Criteria criteria = dictCodeExample.createCriteria(); DictCodeExample.Criteria criteria = dictCodeExample.createCriteria();
if(dictCodeVo.getId() != null) { if (dictCodeVo.getId() != null) {
criteria.andIdEqualTo(dictCodeVo.getId()); criteria.andIdEqualTo(dictCodeVo.getId());
} }
if(dictCodeVo.getId_arr() != null) { if (dictCodeVo.getId_arr() != null) {
criteria.andIdIn(dictCodeVo.getId_arr()); criteria.andIdIn(dictCodeVo.getId_arr());
} }
if(dictCodeVo.getId_gt() != null) { if (dictCodeVo.getId_gt() != null) {
criteria.andIdGreaterThan(dictCodeVo.getId_gt()); criteria.andIdGreaterThan(dictCodeVo.getId_gt());
} }
if(dictCodeVo.getId_lt() != null) { if (dictCodeVo.getId_lt() != null) {
criteria.andIdLessThan(dictCodeVo.getId_lt()); criteria.andIdLessThan(dictCodeVo.getId_lt());
} }
if(dictCodeVo.getId_gte() != null) { if (dictCodeVo.getId_gte() != null) {
criteria.andIdGreaterThanOrEqualTo(dictCodeVo.getId_gte()); criteria.andIdGreaterThanOrEqualTo(dictCodeVo.getId_gte());
} }
if(dictCodeVo.getId_lte() != null) { if (dictCodeVo.getId_lte() != null) {
criteria.andIdLessThanOrEqualTo(dictCodeVo.getId_lte()); criteria.andIdLessThanOrEqualTo(dictCodeVo.getId_lte());
} }
if(dictCodeVo.getUnid() != null) { if (dictCodeVo.getUnid() != null) {
criteria.andUnidEqualTo(dictCodeVo.getUnid()); criteria.andUnidEqualTo(dictCodeVo.getUnid());
} }
if(dictCodeVo.getUnid_arr() != null) { if (dictCodeVo.getUnid_arr() != null) {
criteria.andUnidIn(dictCodeVo.getUnid_arr()); criteria.andUnidIn(dictCodeVo.getUnid_arr());
} }
if(dictCodeVo.getUnid_like() != null) { if (dictCodeVo.getUnid_like() != null) {
criteria.andUnidLike(dictCodeVo.getUnid_like()); criteria.andUnidLike(dictCodeVo.getUnid_like());
} }
if(dictCodeVo.getCateId() != null) { if (dictCodeVo.getCateId() != null) {
criteria.andCateIdEqualTo(dictCodeVo.getCateId()); criteria.andCateIdEqualTo(dictCodeVo.getCateId());
} }
if(dictCodeVo.getCateId_arr() != null) { if (dictCodeVo.getCateId_arr() != null) {
criteria.andCateIdIn(dictCodeVo.getCateId_arr()); criteria.andCateIdIn(dictCodeVo.getCateId_arr());
} }
if(dictCodeVo.getCateId_gt() != null) { if (dictCodeVo.getCateId_gt() != null) {
criteria.andCateIdGreaterThan(dictCodeVo.getCateId_gt()); criteria.andCateIdGreaterThan(dictCodeVo.getCateId_gt());
} }
if(dictCodeVo.getCateId_lt() != null) { if (dictCodeVo.getCateId_lt() != null) {
criteria.andCateIdLessThan(dictCodeVo.getCateId_lt()); criteria.andCateIdLessThan(dictCodeVo.getCateId_lt());
} }
if(dictCodeVo.getCateId_gte() != null) { if (dictCodeVo.getCateId_gte() != null) {
criteria.andCateIdGreaterThanOrEqualTo(dictCodeVo.getCateId_gte()); criteria.andCateIdGreaterThanOrEqualTo(dictCodeVo.getCateId_gte());
} }
if(dictCodeVo.getCateId_lte() != null) { if (dictCodeVo.getCateId_lte() != null) {
criteria.andCateIdLessThanOrEqualTo(dictCodeVo.getCateId_lte()); criteria.andCateIdLessThanOrEqualTo(dictCodeVo.getCateId_lte());
} }
if(dictCodeVo.getParentId() != null) { if (dictCodeVo.getParentId() != null) {
criteria.andParentIdEqualTo(dictCodeVo.getParentId()); criteria.andParentIdEqualTo(dictCodeVo.getParentId());
} }
if(dictCodeVo.getParentId_null() != null) { if (dictCodeVo.getParentId_null() != null) {
if(dictCodeVo.getParentId_null().booleanValue()) { if (dictCodeVo.getParentId_null().booleanValue()) {
criteria.andParentIdIsNull(); criteria.andParentIdIsNull();
} else { } else {
criteria.andParentIdIsNotNull(); criteria.andParentIdIsNotNull();
} }
} }
if(dictCodeVo.getParentId_arr() != null) { if (dictCodeVo.getParentId_arr() != null) {
criteria.andParentIdIn(dictCodeVo.getParentId_arr()); criteria.andParentIdIn(dictCodeVo.getParentId_arr());
} }
if(dictCodeVo.getParentId_gt() != null) { if (dictCodeVo.getParentId_gt() != null) {
criteria.andParentIdGreaterThan(dictCodeVo.getParentId_gt()); criteria.andParentIdGreaterThan(dictCodeVo.getParentId_gt());
} }
if(dictCodeVo.getParentId_lt() != null) { if (dictCodeVo.getParentId_lt() != null) {
criteria.andParentIdLessThan(dictCodeVo.getParentId_lt()); criteria.andParentIdLessThan(dictCodeVo.getParentId_lt());
} }
if(dictCodeVo.getParentId_gte() != null) { if (dictCodeVo.getParentId_gte() != null) {
criteria.andParentIdGreaterThanOrEqualTo(dictCodeVo.getParentId_gte()); criteria.andParentIdGreaterThanOrEqualTo(dictCodeVo.getParentId_gte());
} }
if(dictCodeVo.getParentId_lte() != null) { if (dictCodeVo.getParentId_lte() != null) {
criteria.andParentIdLessThanOrEqualTo(dictCodeVo.getParentId_lte()); criteria.andParentIdLessThanOrEqualTo(dictCodeVo.getParentId_lte());
} }
if(dictCodeVo.getCode() != null) { if (dictCodeVo.getCode() != null) {
criteria.andCodeEqualTo(dictCodeVo.getCode()); criteria.andCodeEqualTo(dictCodeVo.getCode());
} }
if(dictCodeVo.getCode_null() != null) { if (dictCodeVo.getCode_null() != null) {
if(dictCodeVo.getCode_null().booleanValue()) { if (dictCodeVo.getCode_null().booleanValue()) {
criteria.andCodeIsNull(); criteria.andCodeIsNull();
} else { } else {
criteria.andCodeIsNotNull(); criteria.andCodeIsNotNull();
} }
} }
if(dictCodeVo.getCode_arr() != null) { if (dictCodeVo.getCode_arr() != null) {
criteria.andCodeIn(dictCodeVo.getCode_arr()); criteria.andCodeIn(dictCodeVo.getCode_arr());
} }
if(dictCodeVo.getCode_like() != null) { if (dictCodeVo.getCode_like() != null) {
criteria.andCodeLike(dictCodeVo.getCode_like()); criteria.andCodeLike(dictCodeVo.getCode_like());
} }
if(dictCodeVo.getName() != null) { if (dictCodeVo.getName() != null) {
criteria.andNameEqualTo(dictCodeVo.getName()); criteria.andNameEqualTo(dictCodeVo.getName());
} }
if(dictCodeVo.getName_arr() != null) { if (dictCodeVo.getName_arr() != null) {
criteria.andNameIn(dictCodeVo.getName_arr()); criteria.andNameIn(dictCodeVo.getName_arr());
} }
if(dictCodeVo.getName_like() != null) { if (dictCodeVo.getName_like() != null) {
criteria.andNameLike(dictCodeVo.getName_like()); criteria.andNameLike(dictCodeVo.getName_like());
} }
if(dictCodeVo.getNote() != null) { if (dictCodeVo.getNote() != null) {
criteria.andNoteEqualTo(dictCodeVo.getNote()); criteria.andNoteEqualTo(dictCodeVo.getNote());
} }
if(dictCodeVo.getNote_null() != null) { if (dictCodeVo.getNote_null() != null) {
if(dictCodeVo.getNote_null().booleanValue()) { if (dictCodeVo.getNote_null().booleanValue()) {
criteria.andNoteIsNull(); criteria.andNoteIsNull();
} else { } else {
criteria.andNoteIsNotNull(); criteria.andNoteIsNotNull();
} }
} }
if(dictCodeVo.getNote_arr() != null) { if (dictCodeVo.getNote_arr() != null) {
criteria.andNoteIn(dictCodeVo.getNote_arr()); criteria.andNoteIn(dictCodeVo.getNote_arr());
} }
if(dictCodeVo.getNote_like() != null) { if (dictCodeVo.getNote_like() != null) {
criteria.andNoteLike(dictCodeVo.getNote_like()); criteria.andNoteLike(dictCodeVo.getNote_like());
} }
return dictCodeExample; return dictCodeExample;
......
fanxing-code/src/main/java/com/viontech/fanxing/code/controller/web/DictCateController.java → fanxing-ops/src/main/java/com/viontech/fanxing/ops/controller/web/DictCateController.java
package com.viontech.fanxing.code.controller.web; package com.viontech.fanxing.ops.controller.web;
import com.viontech.fanxing.ops.controller.base.DictCateBaseController;
import com.viontech.fanxing.commons.base.BaseExample; import com.viontech.fanxing.commons.base.BaseExample;
import com.viontech.fanxing.commons.model.DictCateExample; import com.viontech.fanxing.commons.model.DictCateExample;
import com.viontech.fanxing.commons.vo.DictCateVo; import com.viontech.fanxing.commons.vo.DictCateVo;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import com.viontech.fanxing.code.controller.base.DictCateBaseController;
@Controller @Controller
@RequestMapping("/dictCates") @RequestMapping("/dictCates")
......
fanxing-code/src/main/java/com/viontech/fanxing/code/controller/web/DictCodeController.java → fanxing-ops/src/main/java/com/viontech/fanxing/ops/controller/web/DictCodeController.java
package com.viontech.fanxing.code.controller.web; package com.viontech.fanxing.ops.controller.web;
import com.viontech.fanxing.ops.controller.base.DictCodeBaseController;
import com.viontech.fanxing.commons.base.BaseExample; import com.viontech.fanxing.commons.base.BaseExample;
import com.viontech.fanxing.code.controller.base.DictCodeBaseController;
import com.viontech.fanxing.commons.model.DictCode; import com.viontech.fanxing.commons.model.DictCode;
import com.viontech.fanxing.commons.model.DictCodeExample; import com.viontech.fanxing.commons.model.DictCodeExample;
import com.viontech.fanxing.commons.vo.DictCodeVo; import com.viontech.fanxing.commons.vo.DictCodeVo;
......
fanxing-code/src/main/java/com/viontech/fanxing/code/mapper/DictCateMapper.java → fanxing-ops/src/main/java/com/viontech/fanxing/ops/mapper/DictCateMapper.java
package com.viontech.fanxing.code.mapper; package com.viontech.fanxing.ops.mapper;
import com.viontech.fanxing.commons.base.BaseMapper; import com.viontech.fanxing.commons.base.BaseMapper;
import com.viontech.fanxing.commons.model.DictCate; import com.viontech.fanxing.commons.model.DictCate;
import com.viontech.fanxing.commons.model.DictCateExample; import com.viontech.fanxing.commons.model.DictCateExample;
import java.util.List;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import java.util.List;
public interface DictCateMapper extends BaseMapper { public interface DictCateMapper extends BaseMapper {
int countByExample(DictCateExample example); int countByExample(DictCateExample example);
......
fanxing-code/src/main/java/com/viontech/fanxing/code/mapper/DictCodeMapper.java → fanxing-ops/src/main/java/com/viontech/fanxing/ops/mapper/DictCodeMapper.java
package com.viontech.fanxing.code.mapper; package com.viontech.fanxing.ops.mapper;
import com.viontech.fanxing.commons.base.BaseMapper; import com.viontech.fanxing.commons.base.BaseMapper;
import com.viontech.fanxing.commons.model.DictCode; import com.viontech.fanxing.commons.model.DictCode;
import com.viontech.fanxing.commons.model.DictCodeExample; import com.viontech.fanxing.commons.model.DictCodeExample;
import java.util.List;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import java.util.List;
public interface DictCodeMapper extends BaseMapper { public interface DictCodeMapper extends BaseMapper {
int countByExample(DictCodeExample example); int countByExample(DictCodeExample example);
......
fanxing-code/src/main/java/com/viontech/fanxing/code/mapping/DictCateMapper.xml → fanxing-ops/src/main/java/com/viontech/fanxing/ops/mapping/DictCateMapper.xml
<?xml version="1.0" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.viontech.fanxing.code.mapper.DictCateMapper" > <mapper namespace="com.viontech.fanxing.ops.mapper.DictCateMapper" >
<resultMap id="BaseResultMapRoot" type="com.viontech.fanxing.commons.model.DictCate" > <resultMap id="BaseResultMapRoot" type="com.viontech.fanxing.commons.model.DictCate" >
<id column="dictCate_id" property="id" /> <id column="dictCate_id" property="id" />
<result column="dictCate_unid" property="unid" /> <result column="dictCate_unid" property="unid" />
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
</sql> </sql>
<sql id="Base_Column_List" > <sql id="Base_Column_List" >
<if test="!(_parameter.getClass().getSimpleName() == 'DictCateExample')" > <if test="!(_parameter.getClass().getSimpleName() == 'DictCateExample')" >
<include refid="com.viontech.fanxing.code.mapper.DictCateMapper.Base_Column_List_Root" /> <include refid="com.viontech.fanxing.ops.mapper.DictCateMapper.Base_Column_List_Root" />
</if> </if>
<if test="_parameter.getClass().getSimpleName() == 'DictCateExample'" > <if test="_parameter.getClass().getSimpleName() == 'DictCateExample'" >
<foreach collection="columnContainerSet" item="columns" separator="," > <foreach collection="columnContainerSet" item="columns" separator="," >
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
${columns.columnContainerStr} ${columns.columnContainerStr}
</if> </if>
<if test="!columns.valid" > <if test="!columns.valid" >
<include refid="com.viontech.fanxing.code.mapper.DictCateMapper.Base_Column_List_Root" /> <include refid="com.viontech.fanxing.ops.mapper.DictCateMapper.Base_Column_List_Root" />
</if> </if>
</when> </when>
</choose> </choose>
......
fanxing-code/src/main/java/com/viontech/fanxing/code/mapping/DictCodeMapper.xml → fanxing-ops/src/main/java/com/viontech/fanxing/ops/mapping/DictCodeMapper.xml
<?xml version="1.0" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.viontech.fanxing.code.mapper.DictCodeMapper" > <mapper namespace="com.viontech.fanxing.ops.mapper.DictCodeMapper" >
<resultMap id="BaseResultMapRoot" type="com.viontech.fanxing.commons.model.DictCode" > <resultMap id="BaseResultMapRoot" type="com.viontech.fanxing.commons.model.DictCode" >
<id column="dictCode_id" property="id" /> <id column="dictCode_id" property="id" />
<result column="dictCode_unid" property="unid" /> <result column="dictCode_unid" property="unid" />
...@@ -76,7 +76,7 @@ ...@@ -76,7 +76,7 @@
</sql> </sql>
<sql id="Base_Column_List" > <sql id="Base_Column_List" >
<if test="!(_parameter.getClass().getSimpleName() == 'DictCodeExample')" > <if test="!(_parameter.getClass().getSimpleName() == 'DictCodeExample')" >
<include refid="com.viontech.fanxing.code.mapper.DictCodeMapper.Base_Column_List_Root" /> <include refid="com.viontech.fanxing.ops.mapper.DictCodeMapper.Base_Column_List_Root" />
</if> </if>
<if test="_parameter.getClass().getSimpleName() == 'DictCodeExample'" > <if test="_parameter.getClass().getSimpleName() == 'DictCodeExample'" >
<foreach collection="columnContainerSet" item="columns" separator="," > <foreach collection="columnContainerSet" item="columns" separator="," >
...@@ -86,7 +86,7 @@ ...@@ -86,7 +86,7 @@
${columns.columnContainerStr} ${columns.columnContainerStr}
</if> </if>
<if test="!columns.valid" > <if test="!columns.valid" >
<include refid="com.viontech.fanxing.code.mapper.DictCodeMapper.Base_Column_List_Root" /> <include refid="com.viontech.fanxing.ops.mapper.DictCodeMapper.Base_Column_List_Root" />
</if> </if>
</when> </when>
</choose> </choose>
......
fanxing-code/src/main/java/com/viontech/fanxing/code/service/adapter/DictCateService.java → fanxing-ops/src/main/java/com/viontech/fanxing/ops/service/adapter/DictCateService.java
package com.viontech.fanxing.code.service.adapter; package com.viontech.fanxing.ops.service.adapter;
import com.viontech.fanxing.commons.model.DictCate;
import com.viontech.fanxing.commons.base.BaseService; import com.viontech.fanxing.commons.base.BaseService;
import com.viontech.fanxing.commons.model.DictCate;
public interface DictCateService extends BaseService<DictCate> { public interface DictCateService extends BaseService<DictCate> {
} }
\ No newline at end of file \ No newline at end of file
fanxing-code/src/main/java/com/viontech/fanxing/code/service/adapter/DictCodeService.java → fanxing-ops/src/main/java/com/viontech/fanxing/ops/service/adapter/DictCodeService.java
package com.viontech.fanxing.code.service.adapter; package com.viontech.fanxing.ops.service.adapter;
import com.viontech.fanxing.commons.model.DictCode;
import com.viontech.fanxing.commons.base.BaseService; import com.viontech.fanxing.commons.base.BaseService;
import com.viontech.fanxing.commons.model.DictCode;
public interface DictCodeService extends BaseService<DictCode> { public interface DictCodeService extends BaseService<DictCode> {
} }
\ No newline at end of file \ No newline at end of file
fanxing-code/src/main/java/com/viontech/fanxing/code/service/impl/DictCateServiceImpl.java → fanxing-ops/src/main/java/com/viontech/fanxing/ops/service/impl/DictCateServiceImpl.java
package com.viontech.fanxing.code.service.impl; package com.viontech.fanxing.ops.service.impl;
import com.viontech.fanxing.code.mapper.DictCateMapper; import com.viontech.fanxing.ops.mapper.DictCateMapper;
import com.viontech.fanxing.commons.model.DictCate; import com.viontech.fanxing.ops.service.adapter.DictCateService;
import com.viontech.fanxing.code.service.adapter.DictCateService;
import com.viontech.fanxing.commons.base.BaseMapper; import com.viontech.fanxing.commons.base.BaseMapper;
import com.viontech.fanxing.commons.base.BaseServiceImpl; import com.viontech.fanxing.commons.base.BaseServiceImpl;
import javax.annotation.Resource; import com.viontech.fanxing.commons.model.DictCate;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@Service @Service
public class DictCateServiceImpl extends BaseServiceImpl<DictCate> implements DictCateService { public class DictCateServiceImpl extends BaseServiceImpl<DictCate> implements DictCateService {
@Resource @Resource
......
fanxing-code/src/main/java/com/viontech/fanxing/code/service/impl/DictCodeServiceImpl.java → fanxing-ops/src/main/java/com/viontech/fanxing/ops/service/impl/DictCodeServiceImpl.java
package com.viontech.fanxing.code.service.impl; package com.viontech.fanxing.ops.service.impl;
import com.viontech.fanxing.code.mapper.DictCodeMapper;
import com.viontech.fanxing.commons.model.DictCode;
import com.viontech.fanxing.code.service.adapter.DictCodeService;
import com.viontech.fanxing.commons.base.BaseMapper; import com.viontech.fanxing.commons.base.BaseMapper;
import com.viontech.fanxing.commons.base.BaseServiceImpl; import com.viontech.fanxing.commons.base.BaseServiceImpl;
import javax.annotation.Resource; import com.viontech.fanxing.commons.model.DictCode;
import com.viontech.fanxing.ops.mapper.DictCodeMapper;
import com.viontech.fanxing.ops.service.adapter.DictCodeService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@Service @Service
public class DictCodeServiceImpl extends BaseServiceImpl<DictCode> implements DictCodeService { public class DictCodeServiceImpl extends BaseServiceImpl<DictCode> implements DictCodeService {
@Resource @Resource
......
pom.xml
...@@ -21,7 +21,6 @@ ...@@ -21,7 +21,6 @@
<module>fanxing-forward</module> <module>fanxing-forward</module>
<module>fanxing-ops</module> <module>fanxing-ops</module>
<module>fanxing-query</module> <module>fanxing-query</module>
<module>fanxing-code</module>
</modules> </modules>
<dependencyManagement> <dependencyManagement>
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!