Skip to content

A
amos-boot-biz
Commit 95171e99 authored by 李成龙's avatar 李成龙
Browse files
Options

修改依赖和引用

parent fd3d1ab7
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 251 additions and 414 deletions
amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/bo/DepartmentBo.java
View file @ 95171e99
......@@ -9,8 +9,9 @@ import java.util.List;
**/
public class DepartmentBo {
private String departmentName;
private String departmentCode;
private String level;
private Integer deptOrgCode;
private String deptOrgCode;
private String orgCode;
private String departmentDesc;
private Long companySeq;
......@@ -25,16 +26,23 @@ public class DepartmentBo {
public void setDepartmentName(String departmentName) {
this.departmentName = departmentName;
}
public String getDepartmentCode() {
return departmentCode;
}
public Integer getDeptOrgCode() {
return deptOrgCode;
}
public void setDepartmentCode(String departmentCode) {
this.departmentCode = departmentCode;
}
public String getDeptOrgCode() {
return deptOrgCode;
}
public void setDeptOrgCode(Integer deptOrgCode) {
this.deptOrgCode = deptOrgCode;
}
public void setDeptOrgCode(String deptOrgCode) {
this.deptOrgCode = deptOrgCode;
}
public String getOrgCode() {
public String getOrgCode() {
return orgCode;
}
......
amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/bo/ReginParams.java
View file @ 95171e99
......@@ -19,6 +19,8 @@ public class ReginParams implements Serializable {
private DepartmentBo department;
//用户基本信息
private AgencyUserModel userModel;
@Deprecated
private String token;
public CompanyBo getCompany() {
return company;
......@@ -51,6 +53,12 @@ public class ReginParams implements Serializable {
public void setUserModel(AgencyUserModel userModel) {
this.userModel = userModel;
}
@Deprecated
public String getToken() {
return token;
}
@Deprecated
public void setToken(String token) {
this.token = token;
}
}
amos-boot-jcs-system/pom.xml deleted 100644 → 0
View file @ fd3d1ab7
<?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>
<artifactId>amos-biz-boot</artifactId>
<groupId>com.amosframework.boot</groupId>
<version>1.0.0</version>
</parent>
<artifactId>amos-boot-jcs-system</artifactId>
<dependencies>
<dependency>
<groupId>com.amosframework.boot</groupId>
<artifactId>amos-boot-module-jcs-biz</artifactId>
<version>${amos-biz-boot.version}</version>
</dependency>
<dependency>
<groupId>com.amosframework.boot</groupId>
<artifactId>amos-boot-module-command-biz</artifactId>
<version>${amos-biz-boot.version}</version>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</project>
amos-boot-module/amos-boot-module-api/amos-boot-module-command-api/pom.xml
View file @ 95171e99
<?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>
<artifactId>amos-boot-module-api</artifactId>
<groupId>com.amosframework.boot</groupId>
<version>1.0.0</version>
</parent>
<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>
<artifactId>amos-boot-module-api</artifactId>
<groupId>com.amosframework.boot</groupId>
<version>1.0.0</version>
</parent>
<artifactId>amos-boot-module-command-api</artifactId>
<artifactId>amos-boot-module-command-api</artifactId>
<dependencies>
</dependencies>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-mongodb</artifactId>
</dependency>
</dependencies>
</project>
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/DutyPersonShift.java
View file @ 95171e99
package com.yeejoin.amos.boot.module.common.api.entity;
import java.util.Date;
import java.util.Objects;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import lombok.Data;
import lombok.experimental.Accessors;
import java.util.Date;
import java.util.Objects;
/**
* 值班人员日期关联关系表
*
......
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/FireExperts.java
View file @ 95171e99
......@@ -21,7 +21,12 @@ import java.util.Date;
@ApiModel(value = "FireExperts对象", description = "")
public class FireExperts extends BaseEntity {
@ApiModelProperty(value = "姓名")
/**
*
*/
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "姓名")
private String name;
@ApiModelProperty(value = "证件类型")
......
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/MaintenanceCompany.java
View file @ 95171e99
......@@ -3,10 +3,10 @@ package com.yeejoin.amos.boot.module.common.api.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import java.util.Date;
/**
* 维保单位
......
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/OrgUsr.java
View file @ 95171e99
package com.yeejoin.amos.boot.module.common.api.entity;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
......
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/WaterResource.java
View file @ 95171e99
......@@ -2,8 +2,9 @@ package com.yeejoin.amos.boot.module.common.api.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import io.swagger.annotations.ApiModelProperty;
import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
......@@ -142,18 +143,9 @@ public class WaterResource extends BaseEntity {
@TableField("administrative_code")
private String administrativeCode;
/**
* 更新人员
*/
@TableField("rec_user_name")
private String recUserName;
/**
* 组织机构代码
*/
@TableField("org_code")
private String orgCode;
/**
* 是否启用
*/
@TableField("is_delete")
private Boolean isDelete;
}
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/WaterResourceCrane.java
View file @ 95171e99
......@@ -2,7 +2,8 @@ package com.yeejoin.amos.boot.module.common.api.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
......@@ -86,14 +87,4 @@ public class WaterResourceCrane extends BaseEntity {
*/
@TableField("water_supply_name")
private String waterSupplyName;
/**
* 更新人员
*/
@TableField("rec_user_name")
private String recUserName;
/**
* 是否启用
*/
@TableField("is_delete")
private Boolean isDelete;
}
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/WaterResourceHydrant.java
View file @ 95171e99
......@@ -2,7 +2,8 @@ package com.yeejoin.amos.boot.module.common.api.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
......@@ -111,14 +112,4 @@ public class WaterResourceHydrant extends BaseEntity {
*/
@TableField("water_supply_name")
private String waterSupplyName;
/**
* 更新人员
*/
@TableField("rec_user_name")
private String recUserName;
/**
* 是否启用
*/
@TableField("is_delete")
private Boolean isDelete;
}
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/WaterResourceIot.java
View file @ 95171e99
......@@ -2,7 +2,8 @@ package com.yeejoin.amos.boot.module.common.api.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
......@@ -51,14 +52,4 @@ public class WaterResourceIot extends BaseEntity {
*/
@TableField("iot_pipe_pressure")
private String iotPipePressure;
/**
* 更新人员
*/
@TableField("rec_user_name")
private String recUserName;
/**
* 是否启用
*/
@TableField("is_delete")
private Boolean isDelete;
}
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/WaterResourceNatural.java
View file @ 95171e99
......@@ -2,7 +2,8 @@ package com.yeejoin.amos.boot.module.common.api.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
......@@ -81,14 +82,4 @@ public class WaterResourceNatural extends BaseEntity {
*/
@TableField("dry_period_span")
private String dryPeriodSpan;
/**
* 更新人员
*/
@TableField("rec_user_name")
private String recUserName;
/**
* 是否启用
*/
@TableField("is_delete")
private Boolean isDelete;
}
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/WaterResourcePool.java
View file @ 95171e99
......@@ -2,7 +2,8 @@ package com.yeejoin.amos.boot.module.common.api.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
......@@ -86,14 +87,4 @@ public class WaterResourcePool extends BaseEntity {
*/
@TableField("water_supply_name")
private String waterSupplyName;
/**
* 更新人员
*/
@TableField("rec_user_name")
private String recUserName;
/**
* 是否启用
*/
@TableField("is_delete")
private Boolean isDelete;
}
amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/pom.xml
View file @ 95171e99
......@@ -21,6 +21,10 @@
<artifactId>amos-boot-module-common-api</artifactId>
<version>${amos-biz-boot.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-elasticsearch</artifactId>
</dependency>
</dependencies>
</project>
amos-boot-module/amos-boot-module-api/pom.xml
View file @ 95171e99
......@@ -20,5 +20,7 @@
<!-- <module>amos-boot-module-demo-api</module>-->
<module>amos-boot-module-common-api</module>
<module>amos-boot-module-command-api</module>
<module>amos-boot-module-patrol-api</module>
<module>amos-boot-module-fas-api</module>
</modules>
</project>
\ No newline at end of file
amos-boot-module/amos-boot-module-biz/amos-boot-module-command-biz/pom.xml
View file @ 95171e99
<?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>
<artifactId>amos-boot-module-biz</artifactId>
<groupId>com.amosframework.boot</groupId>
<version>1.0.0</version>
</parent>
<artifactId>amos-boot-module-command-biz</artifactId>
<dependencies>
<dependency>
<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>
<artifactId>amos-boot-module-biz</artifactId>
<groupId>com.amosframework.boot</groupId>
<version>1.0.0</version>
</parent>
<artifactId>amos-boot-module-command-biz</artifactId>
<dependencies>
<dependency>
<groupId>com.amosframework.boot</groupId>
<artifactId>amos-boot-module-command-api</artifactId>
<version>${amos-biz-boot.version}</version>
</dependency>
<dependency>
<dependency>
<groupId>com.amosframework.boot</groupId>
<artifactId>amos-boot-module-common-api</artifactId>
<version>${amos-biz-boot.version}</version>
</dependency>
<dependency>
<groupId>com.amosframework.boot</groupId>
<artifactId>amos-boot-module-jcs-api</artifactId>
<version>1.0.0</version>
<scope>compile</scope>
</dependency>
</dependencies>
<dependency>
<groupId>com.amosframework.boot</groupId>
<artifactId>amos-boot-module-jcs-api</artifactId>
<version>1.0.0</version>
<scope>compile</scope>
</dependency>
</dependencies>
</project>
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/pom.xml
View file @ 95171e99
......@@ -19,7 +19,7 @@
<groupId>com.amosframework.boot</groupId>
<artifactId>amos-boot-module-common-biz</artifactId>
<version>${amos-biz-boot.version}</version>
</dependency>
</dependency> <!-- ES-->
</dependencies>
</project>
amos-boot-module/amos-boot-module-biz/pom.xml
View file @ 95171e99
......@@ -19,5 +19,8 @@
<!--<module>amos-boot-module-demo-biz</module>-->
<module>amos-boot-module-common-biz</module>
<module>amos-boot-module-command-biz</module>
<module>amos-boot-module-knowledgebase-biz</module>
<module>amos-boot-module-patrol-biz</module>
<module>amos-boot-module-fas-biz</module>
</modules>
</project>
\ No newline at end of file
amos-boot-module/pom.xml
View file @ 95171e99
......@@ -12,16 +12,17 @@
<dependencies>
<!-- ES-->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-elasticsearch</artifactId>
</dependency>
<!-- amos rule-->
<dependency>
<groupId>com.yeejoin</groupId>
<artifactId>amos-component-rule</artifactId>
<version>1.4.7</version>
<exclusions>
<exclusion>
<groupId>org.typroject</groupId>
<artifactId>tyboot-core-auth</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
......
pom.xml
View file @ 95171e99
<?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">
......@@ -29,6 +28,7 @@
<maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
<tyboot-version>1.1.20Ty-SNAPSHOT</tyboot-version>
<amos.version>1.6.0</amos.version>
<itext.version>7.1.1</itext.version>
</properties>
<dependencies>
......@@ -37,6 +37,26 @@
<artifactId>spring-cloud-starter-netflix-eureka-server</artifactId>
</dependency>
<dependency>
<groupId>com.netflix.hystrix</groupId>
<artifactId>hystrix-javanica</artifactId>
<version>1.5.18</version>
<scope>compile</scope>
<exclusions>
<exclusion>
<artifactId>jsr305</artifactId>
<groupId>com.google.code.findbugs</groupId>
</exclusion>
<exclusion>
<artifactId>annotations</artifactId>
<groupId>com.google.code.findbugs</groupId>
</exclusion>
<exclusion>
<artifactId>aspectjrt</artifactId>
<groupId>org.aspectj</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
<version>1.2.67</version>
......@@ -47,37 +67,38 @@
<artifactId>mybatis-plus-boot-starter</artifactId>
<version>3.2.0</version>
</dependency>
<!-- <dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-boot-starter</artifactId>
<version>3.1.2</version>
</dependency> -->
<!--增加MongoDB-->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-mongodb</artifactId>
<groupId>org.mybatis.spring.boot</groupId>
<artifactId>mybatis-spring-boot-starter</artifactId>
<version>2.1.0</version>
</dependency>
<!--
<dependency> <groupId>com.baomidou</groupId> <artifactId>mybatis-plus-boot-starter</artifactId>
<version>3.1.2</version> </dependency> -->
<!--����MongoDB -->
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>easyexcel</artifactId>
<version>2.0.5</version>
<exclusions>
<exclusion>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- 添加commons-lang依赖包 -->
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>easyexcel</artifactId>
<version>2.0.5</version>
<exclusions>
<exclusion>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- ���commons-lang������ -->
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>2.4</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
<version>1.18</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
......@@ -88,7 +109,6 @@
<artifactId>mybatis-plus-generator</artifactId>
<version>3.2.0</version>
</dependency>
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity-engine-core</artifactId>
......@@ -103,6 +123,30 @@
<artifactId>spring-boot-starter-websocket</artifactId>
</dependency>
<dependency>
<groupId>cn.jpush.api</groupId>
<artifactId>jpush-client</artifactId>
<version>3.3.10</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-jexl</artifactId>
<version>2.1.1</version>
</dependency>
<!-- MQTT依赖 -->
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-stream</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-mqtt</artifactId>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.typroject</groupId>
<artifactId>tyboot-core-restful</artifactId>
<version>${tyboot-version}</version>
......@@ -119,9 +163,12 @@
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger2</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-undertow</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.typroject</groupId>
<artifactId>tyboot-core-auth</artifactId>
......@@ -133,7 +180,11 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
<version>2.10.4</version>
</dependency>
<dependency>
<groupId>org.typroject</groupId>
<artifactId>tyboot-core-rdbms</artifactId>
......@@ -143,6 +194,10 @@
<groupId>org.typroject</groupId>
<artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-boot-starter</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
......@@ -204,10 +259,13 @@
</repositories>
<modules>
<module>amos-boot-tzs-system</module>
<module>amos-boot-jcs-system</module>
<module>amos-boot-system-tzs</module>
<module>amos-boot-system-jcs</module>
<module>amos-boot-biz-common</module>
<module>amos-boot-module</module>
<!-- <module>amos-boot-demo-system</module> -->
<module>amos-boot-system-knowledgebase</module>
<module>amos-boot-system-fas</module>
<module>amos-boot-system-patrol</module>
</modules>
</project>
</project>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment