diff --git a/lib/DmJdbcDriver18.jar b/lib/DmJdbcDriver18.jar deleted file mode 100644 index d7f65d8..0000000 Binary files a/lib/DmJdbcDriver18.jar and /dev/null differ diff --git a/pom.xml b/pom.xml index fca02ec..e53098f 100644 --- a/pom.xml +++ b/pom.xml @@ -11,9 +11,9 @@ com.whdc - rule-service + fxkh-txl-service 1.0 - 清洗规则api + 防汛抗旱通讯录api 8 @@ -22,19 +22,28 @@ target/release - - ali-maven - http://maven.aliyun.com/nexus/content/groups/public + osgeo + OSGeo Release Repository + https://repo.osgeo.org/repository/release/ + + false + true + + + osgeo-snapshot + OSGeo Snapshot Repository + https://repo.osgeo.org/repository/snapshot/ true - always - fail + + false + @@ -137,12 +146,12 @@ com.dameng DmJdbcDriver18 - 8.1.2.114 + 8.1.2.192 diff --git a/sql/dm_start.sql b/sql/dm_start.sql index 7a7dfa9..89c89fe 100644 --- a/sql/dm_start.sql +++ b/sql/dm_start.sql @@ -1,46 +1,148 @@ -CREATE TABLE "SHZH_IOT"."E_RULE" +CREATE TABLE "FXKH_TXL"."ADDRESS_BOOK" ( - "ID" INT IDENTITY(1, 1) NOT NULL, - "NAME" VARCHAR(50), - "ITEM" VARCHAR(50), - "MIN" VARCHAR(50), - "MAX" VARCHAR(50), - "DIFF_MAX" VARCHAR(50), - "DURATION" INTEGER, - "CREATETIME" DATETIME(0), - "DEL" VARCHAR(2) DEFAULT 1, - "LEADING_TIME" INTEGER, - "LAG_TIME" INTEGER); + "ID" INTEGER IDENTITY(1, 1) NOT NULL, + "NAME" VARCHAR(10) NOT NULL, + "PHONE" VARCHAR(11), + "TEL" VARCHAR(50), + "FAXES" VARCHAR(50), + "ORGANIZATION" VARCHAR(50), + "POSITION" VARCHAR(50), + "COMMENTS" VARCHAR(200), + "URL" VARCHAR(200), + "SORT" INTEGER DEFAULT 0, + "V" INTEGER DEFAULT 0, + "ROLE" CHAR(1) DEFAULT 0, + NOT CLUSTER PRIMARY KEY("ID")) STORAGE(ON "MAIN", CLUSTERBTR) ; -COMMENT ON TABLE "SHZH_IOT"."E_RULE" IS '规则表'; -COMMENT ON COLUMN "SHZH_IOT"."E_RULE"."ID" IS '主键id'; -COMMENT ON COLUMN "SHZH_IOT"."E_RULE"."NAME" IS '规则名称'; -COMMENT ON COLUMN "SHZH_IOT"."E_RULE"."ITEM" IS '测站类型'; -COMMENT ON COLUMN "SHZH_IOT"."E_RULE"."MIN" IS '最小值'; -COMMENT ON COLUMN "SHZH_IOT"."E_RULE"."MAX" IS '最小值'; -COMMENT ON COLUMN "SHZH_IOT"."E_RULE"."DIFF_MAX" IS '两条数据之间的最大差值'; -COMMENT ON COLUMN "SHZH_IOT"."E_RULE"."DURATION" IS '时间段, 单位 s'; -COMMENT ON COLUMN "SHZH_IOT"."E_RULE"."CREATETIME" IS '创建时间'; -COMMENT ON COLUMN "SHZH_IOT"."E_RULE"."DEL" IS '1: 未删除 0: 删除'; -COMMENT ON COLUMN "SHZH_IOT"."E_RULE"."LEADING_TIME" IS '接收超出时间,单位: s ,指接收时间超前范围'; -COMMENT ON COLUMN "SHZH_IOT"."E_RULE"."LAG_TIME" IS '接收滞后时间,单位: s ,指接收时间滞后范围'; +COMMENT ON TABLE "FXKH_TXL"."ADDRESS_BOOK" IS '通讯录'; +COMMENT ON COLUMN "FXKH_TXL"."ADDRESS_BOOK"."COMMENTS" IS '备注'; +COMMENT ON COLUMN "FXKH_TXL"."ADDRESS_BOOK"."FAXES" IS '传真'; +COMMENT ON COLUMN "FXKH_TXL"."ADDRESS_BOOK"."NAME" IS '姓名'; +COMMENT ON COLUMN "FXKH_TXL"."ADDRESS_BOOK"."ORGANIZATION" IS '组织'; +COMMENT ON COLUMN "FXKH_TXL"."ADDRESS_BOOK"."PHONE" IS '手机号'; +COMMENT ON COLUMN "FXKH_TXL"."ADDRESS_BOOK"."POSITION" IS '职务'; +COMMENT ON COLUMN "FXKH_TXL"."ADDRESS_BOOK"."ROLE" IS '0:普通管理员,1:政区管理员,99:系统管理员'; +COMMENT ON COLUMN "FXKH_TXL"."ADDRESS_BOOK"."SORT" IS '序号'; +COMMENT ON COLUMN "FXKH_TXL"."ADDRESS_BOOK"."TEL" IS '电话'; +COMMENT ON COLUMN "FXKH_TXL"."ADDRESS_BOOK"."URL" IS '图片路径'; +COMMENT ON COLUMN "FXKH_TXL"."ADDRESS_BOOK"."V" IS '版本'; -CREATE TABLE "SHZH_IOT"."E_STATION_RULES" +CREATE TABLE "FXKH_TXL"."ADINFO" ( - "ID" INT IDENTITY(1, 1) NOT NULL, - "STCD" VARCHAR(50), - "RULE_ID" INTEGER, - "SORT" INTEGER, - "CREATETIME" DATETIME(0), - "DEL" INT DEFAULT 0) ; + "ADCD" CHAR(15) NOT NULL, + "ADNM" VARCHAR(32) NOT NULL, + NOT CLUSTER PRIMARY KEY("ADCD")) STORAGE(ON "MAIN", CLUSTERBTR) ; -COMMENT ON TABLE "SHZH_IOT"."E_STATION_RULES" IS '测站关联规则表'; -COMMENT ON COLUMN "SHZH_IOT"."E_STATION_RULES"."ID" IS '主键id'; -COMMENT ON COLUMN "SHZH_IOT"."E_STATION_RULES"."STCD" IS '测站编码'; -COMMENT ON COLUMN "SHZH_IOT"."E_STATION_RULES"."RULE_ID" IS '规则id'; -COMMENT ON COLUMN "SHZH_IOT"."E_STATION_RULES"."SORT" IS '顺序'; -COMMENT ON COLUMN "SHZH_IOT"."E_STATION_RULES"."CREATETIME" IS '创建时间'; -COMMENT ON COLUMN "SHZH_IOT"."E_STATION_RULES"."DEL" IS '1: 未删除 0: 删除'; +COMMENT ON TABLE "FXKH_TXL"."ADINFO" IS '行政区划基础信息'; +COMMENT ON COLUMN "FXKH_TXL"."ADINFO"."ADCD" IS '政区编码'; +COMMENT ON COLUMN "FXKH_TXL"."ADINFO"."ADNM" IS '政区名称'; + + +CREATE TABLE "FXKH_TXL"."UNIT_DICT" +( + "ID" INTEGER IDENTITY(1, 1) NOT NULL, + "NAME" VARCHAR(50) NOT NULL, + "SORT" INTEGER DEFAULT 0 NOT NULL, + "TYPE" CHAR(1) NOT NULL, + NOT CLUSTER PRIMARY KEY("ID")) STORAGE(ON "MAIN", CLUSTERBTR) ; + +COMMENT ON TABLE "FXKH_TXL"."UNIT_DICT" IS '单位字典表'; +COMMENT ON COLUMN "FXKH_TXL"."UNIT_DICT"."NAME" IS '名称'; +COMMENT ON COLUMN "FXKH_TXL"."UNIT_DICT"."SORT" IS '序号'; +COMMENT ON COLUMN "FXKH_TXL"."UNIT_DICT"."TYPE" IS '1:联络名单, 2: 湖泊及涉湖泵站,3:重要提防,4:大型水库大坝'; + + +CREATE TABLE "FXKH_TXL"."FC" +( + "ID" INTEGER IDENTITY(1, 1) NOT NULL, + "USER_ID" INTEGER NOT NULL, + "AB_ID" INTEGER NOT NULL, + "SORT" INTEGER DEFAULT 0, + "TYPE" CHAR(1), + NOT CLUSTER PRIMARY KEY("ID")) STORAGE(ON "MAIN", CLUSTERBTR) ; + +COMMENT ON TABLE "FXKH_TXL"."FC" IS '常用联系人'; +COMMENT ON COLUMN "FXKH_TXL"."FC"."AB_ID" IS '通讯录编号'; +COMMENT ON COLUMN "FXKH_TXL"."FC"."SORT" IS '序号'; +COMMENT ON COLUMN "FXKH_TXL"."FC"."TYPE" IS '0:常用联系人,1:置顶联系人'; +COMMENT ON COLUMN "FXKH_TXL"."FC"."USER_ID" IS '用户编号'; + + +CREATE TABLE "FXKH_TXL"."LOGIN_INFO" +( + "ID" INTEGER IDENTITY(1, 1) NOT NULL, + "IP" VARCHAR(50), + "CREATE_ID" VARCHAR(50), + "CREATE_TIME" DATETIME(0), + "TYPE" CHAR(1) NOT NULL, + NOT CLUSTER PRIMARY KEY("ID")) STORAGE(ON "MAIN", CLUSTERBTR) ; + +COMMENT ON TABLE "FXKH_TXL"."LOGIN_INFO" IS '登录日志'; +COMMENT ON COLUMN "FXKH_TXL"."LOGIN_INFO"."CREATE_ID" IS '新增人id'; +COMMENT ON COLUMN "FXKH_TXL"."LOGIN_INFO"."CREATE_TIME" IS '新增时间'; +COMMENT ON COLUMN "FXKH_TXL"."LOGIN_INFO"."TYPE" IS '0:密码登录 1:验证码登录'; + + +CREATE TABLE "FXKH_TXL"."ORGANIZATION" +( + "ID" INTEGER IDENTITY(1, 1) NOT NULL, + "OBJ_ID" VARCHAR(50) NOT NULL, + "NAME" VARCHAR(50) NOT NULL, + "SORT" INTEGER DEFAULT 0, + "ADCD" CHAR(15) NOT NULL, + NOT CLUSTER PRIMARY KEY("ID")) STORAGE(ON "MAIN", CLUSTERBTR) ; + +COMMENT ON TABLE "FXKH_TXL"."ORGANIZATION" IS '组织表'; +COMMENT ON COLUMN "FXKH_TXL"."ORGANIZATION"."ADCD" IS '政区编码'; +COMMENT ON COLUMN "FXKH_TXL"."ORGANIZATION"."NAME" IS '名称'; +COMMENT ON COLUMN "FXKH_TXL"."ORGANIZATION"."OBJ_ID" IS '编号'; +COMMENT ON COLUMN "FXKH_TXL"."ORGANIZATION"."SORT" IS '序号'; + + +CREATE TABLE "FXKH_TXL"."USER" +( + "ID" INTEGER IDENTITY(1, 1) NOT NULL, + "PASSWORD" VARCHAR(50) NOT NULL, + "SALT" VARCHAR(50), + "AB_ID" INTEGER, + NOT CLUSTER PRIMARY KEY("ID")) STORAGE(ON "MAIN", CLUSTERBTR) ; + +COMMENT ON TABLE "FXKH_TXL"."USER" IS '用户表'; +COMMENT ON COLUMN "FXKH_TXL"."USER"."AB_ID" IS '通讯录id'; +COMMENT ON COLUMN "FXKH_TXL"."USER"."PASSWORD" IS '密码'; +COMMENT ON COLUMN "FXKH_TXL"."USER"."SALT" IS '盐值'; + + +CREATE TABLE "FXKH_TXL"."VERSIONS" +( + "ID" INTEGER IDENTITY(1, 1) NOT NULL, + "JSON" VARCHAR(2000), + "AB_ID" INTEGER, + "VERSION" INTEGER DEFAULT 0, + "CREATE_ID" VARCHAR(50), + "CREATE_TIME" DATETIME(0), + "TYPE" CHAR(1) DEFAULT 0, + NOT CLUSTER PRIMARY KEY("ID")) STORAGE(ON "MAIN", CLUSTERBTR) ; + +COMMENT ON TABLE "FXKH_TXL"."VERSIONS" IS '通讯录日志'; +COMMENT ON COLUMN "FXKH_TXL"."VERSIONS"."AB_ID" IS '通讯录编号'; +COMMENT ON COLUMN "FXKH_TXL"."VERSIONS"."CREATE_ID" IS '新增人id'; +COMMENT ON COLUMN "FXKH_TXL"."VERSIONS"."CREATE_TIME" IS '新增时间'; +COMMENT ON COLUMN "FXKH_TXL"."VERSIONS"."JSON" IS '数据'; +COMMENT ON COLUMN "FXKH_TXL"."VERSIONS"."TYPE" IS '0:添加用户,1:修改用户,2:修改权限,3:删除用户'; +COMMENT ON COLUMN "FXKH_TXL"."VERSIONS"."VERSION" IS '版本号'; + + +CREATE TABLE "FXKH_TXL"."AB_UD_R" +( + "AD_ID" INTEGER, + "DICT_ID" INTEGER, + "SORT" INTEGER) STORAGE(ON "MAIN", CLUSTERBTR) ; + +COMMENT ON TABLE "FXKH_TXL"."AB_UD_R" IS '用户单位字典关联表'; +COMMENT ON COLUMN "FXKH_TXL"."AB_UD_R"."AD_ID" IS '联系人id'; +COMMENT ON COLUMN "FXKH_TXL"."AB_UD_R"."DICT_ID" IS '字典id'; +COMMENT ON COLUMN "FXKH_TXL"."AB_UD_R"."SORT" IS '序号'; diff --git a/src/main/java/com/whdc/mapper/AbUdRMapper.java b/src/main/java/com/whdc/mapper/AbUdRMapper.java new file mode 100644 index 0000000..f2073bb --- /dev/null +++ b/src/main/java/com/whdc/mapper/AbUdRMapper.java @@ -0,0 +1,10 @@ +package com.whdc.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.whdc.model.entity.AbUdR; + +public interface AbUdRMapper extends BaseMapper { + int insert(AbUdR record); + + int insertSelective(AbUdR record); +} \ No newline at end of file diff --git a/src/main/java/com/whdc/mapper/AddressBookMapper.java b/src/main/java/com/whdc/mapper/AddressBookMapper.java new file mode 100644 index 0000000..620bf59 --- /dev/null +++ b/src/main/java/com/whdc/mapper/AddressBookMapper.java @@ -0,0 +1,18 @@ +package com.whdc.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.whdc.model.entity.AddressBook; + +public interface AddressBookMapper extends BaseMapper { + int deleteByPrimaryKey(Integer id); + + int insert(AddressBook record); + + int insertSelective(AddressBook record); + + AddressBook selectByPrimaryKey(Integer id); + + int updateByPrimaryKeySelective(AddressBook record); + + int updateByPrimaryKey(AddressBook record); +} \ No newline at end of file diff --git a/src/main/java/com/whdc/mapper/AdinfoMapper.java b/src/main/java/com/whdc/mapper/AdinfoMapper.java new file mode 100644 index 0000000..ada9613 --- /dev/null +++ b/src/main/java/com/whdc/mapper/AdinfoMapper.java @@ -0,0 +1,18 @@ +package com.whdc.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.whdc.model.entity.Adinfo; + +public interface AdinfoMapper extends BaseMapper { + int deleteByPrimaryKey(String adcd); + + int insert(Adinfo record); + + int insertSelective(Adinfo record); + + Adinfo selectByPrimaryKey(String adcd); + + int updateByPrimaryKeySelective(Adinfo record); + + int updateByPrimaryKey(Adinfo record); +} \ No newline at end of file diff --git a/src/main/java/com/whdc/mapper/ERuleMapper.java b/src/main/java/com/whdc/mapper/ERuleMapper.java deleted file mode 100644 index 4b8d969..0000000 --- a/src/main/java/com/whdc/mapper/ERuleMapper.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.whdc.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.whdc.model.dto.FindRuleDto; -import com.whdc.model.entity.ERule; -import org.apache.ibatis.annotations.Param; - -/** - *

- * Mapper 接口 - *

- * - * @author xusan - * @since 2023-03-19 - */ -public interface ERuleMapper extends BaseMapper { - - /** - * 分页查询 - * - * @param page - * @param findDto - * @return - */ - IPage page(@Param("page") IPage page, @Param("findDto") FindRuleDto findDto); - -} diff --git a/src/main/java/com/whdc/mapper/EStationRulesMapper.java b/src/main/java/com/whdc/mapper/EStationRulesMapper.java deleted file mode 100644 index 6e93e18..0000000 --- a/src/main/java/com/whdc/mapper/EStationRulesMapper.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.whdc.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.whdc.model.dto.FindStationDto; -import com.whdc.model.entity.EStationRules; -import com.whdc.model.vo.EStationRulesVo; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - *

- * Mapper 接口 - *

- * - * @author xusan - * @since 2023-03-19 - */ -public interface EStationRulesMapper extends BaseMapper { - - - IPage page(@Param("page") IPage page, @Param("findDto") FindStationDto findDto); - - List find(@Param("findDto") FindStationDto findDto); - - -} diff --git a/src/main/java/com/whdc/mapper/FcMapper.java b/src/main/java/com/whdc/mapper/FcMapper.java new file mode 100644 index 0000000..3b3e65e --- /dev/null +++ b/src/main/java/com/whdc/mapper/FcMapper.java @@ -0,0 +1,18 @@ +package com.whdc.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.whdc.model.entity.Fc; + +public interface FcMapper extends BaseMapper { + int deleteByPrimaryKey(Integer id); + + int insert(Fc record); + + int insertSelective(Fc record); + + Fc selectByPrimaryKey(Integer id); + + int updateByPrimaryKeySelective(Fc record); + + int updateByPrimaryKey(Fc record); +} \ No newline at end of file diff --git a/src/main/java/com/whdc/mapper/LoginInfoMapper.java b/src/main/java/com/whdc/mapper/LoginInfoMapper.java new file mode 100644 index 0000000..0cb26d5 --- /dev/null +++ b/src/main/java/com/whdc/mapper/LoginInfoMapper.java @@ -0,0 +1,18 @@ +package com.whdc.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.whdc.model.entity.LoginInfo; + +public interface LoginInfoMapper extends BaseMapper { + int deleteByPrimaryKey(Integer id); + + int insert(LoginInfo record); + + int insertSelective(LoginInfo record); + + LoginInfo selectByPrimaryKey(Integer id); + + int updateByPrimaryKeySelective(LoginInfo record); + + int updateByPrimaryKey(LoginInfo record); +} \ No newline at end of file diff --git a/src/main/java/com/whdc/mapper/OrganizationMapper.java b/src/main/java/com/whdc/mapper/OrganizationMapper.java new file mode 100644 index 0000000..207ffef --- /dev/null +++ b/src/main/java/com/whdc/mapper/OrganizationMapper.java @@ -0,0 +1,18 @@ +package com.whdc.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.whdc.model.entity.Organization; + +public interface OrganizationMapper extends BaseMapper { + int deleteByPrimaryKey(Integer id); + + int insert(Organization record); + + int insertSelective(Organization record); + + Organization selectByPrimaryKey(Integer id); + + int updateByPrimaryKeySelective(Organization record); + + int updateByPrimaryKey(Organization record); +} \ No newline at end of file diff --git a/src/main/java/com/whdc/mapper/UnitDictMapper.java b/src/main/java/com/whdc/mapper/UnitDictMapper.java new file mode 100644 index 0000000..6b8f8ec --- /dev/null +++ b/src/main/java/com/whdc/mapper/UnitDictMapper.java @@ -0,0 +1,19 @@ +package com.whdc.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.whdc.model.entity.Organization; +import com.whdc.model.entity.UnitDict; + +public interface UnitDictMapper extends BaseMapper { + int deleteByPrimaryKey(Integer id); + + int insert(UnitDict record); + + int insertSelective(UnitDict record); + + UnitDict selectByPrimaryKey(Integer id); + + int updateByPrimaryKeySelective(UnitDict record); + + int updateByPrimaryKey(UnitDict record); +} \ No newline at end of file diff --git a/src/main/java/com/whdc/mapper/UserMapper.java b/src/main/java/com/whdc/mapper/UserMapper.java new file mode 100644 index 0000000..394a724 --- /dev/null +++ b/src/main/java/com/whdc/mapper/UserMapper.java @@ -0,0 +1,19 @@ +package com.whdc.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.whdc.model.entity.UnitDict; +import com.whdc.model.entity.User; + +public interface UserMapper extends BaseMapper { + int deleteByPrimaryKey(Integer id); + + int insert(User record); + + int insertSelective(User record); + + User selectByPrimaryKey(Integer id); + + int updateByPrimaryKeySelective(User record); + + int updateByPrimaryKey(User record); +} \ No newline at end of file diff --git a/src/main/java/com/whdc/mapper/VersionsMapper.java b/src/main/java/com/whdc/mapper/VersionsMapper.java new file mode 100644 index 0000000..0496be3 --- /dev/null +++ b/src/main/java/com/whdc/mapper/VersionsMapper.java @@ -0,0 +1,18 @@ +package com.whdc.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.whdc.model.entity.Versions; + +public interface VersionsMapper extends BaseMapper { + int deleteByPrimaryKey(Integer id); + + int insert(Versions record); + + int insertSelective(Versions record); + + Versions selectByPrimaryKey(Integer id); + + int updateByPrimaryKeySelective(Versions record); + + int updateByPrimaryKey(Versions record); +} \ No newline at end of file diff --git a/src/main/java/com/whdc/model/entity/AbUdR.java b/src/main/java/com/whdc/model/entity/AbUdR.java new file mode 100644 index 0000000..1f0ec7e --- /dev/null +++ b/src/main/java/com/whdc/model/entity/AbUdR.java @@ -0,0 +1,13 @@ +package com.whdc.model.entity; + +import java.math.BigDecimal; +import java.util.Date; + +public class AbUdR { + private Integer adId; + + private Integer dictId; + + private Integer sort; + +} \ No newline at end of file diff --git a/src/main/java/com/whdc/model/entity/AddressBook.java b/src/main/java/com/whdc/model/entity/AddressBook.java new file mode 100644 index 0000000..c2b524e --- /dev/null +++ b/src/main/java/com/whdc/model/entity/AddressBook.java @@ -0,0 +1,28 @@ +package com.whdc.model.entity; + +public class AddressBook { + private Integer id; + + private String name; + + private String phone; + + private String tel; + + private String faxes; + + private String organization; + + private String position; + + private String comments; + + private String url; + + private Integer sort; + + private Integer v; + + private String role; + +} \ No newline at end of file diff --git a/src/main/java/com/whdc/model/entity/Adinfo.java b/src/main/java/com/whdc/model/entity/Adinfo.java new file mode 100644 index 0000000..6b1028a --- /dev/null +++ b/src/main/java/com/whdc/model/entity/Adinfo.java @@ -0,0 +1,26 @@ +package com.whdc.model.entity; + +import java.math.BigDecimal; + +public class Adinfo { + private String adcd; + + private String adnm; + + private BigDecimal lgtd; + + private BigDecimal lttd; + + private Integer ptcount; + + private Integer hhtcount; + + private Integer htcount; + + private BigDecimal land; + + private BigDecimal pland; + + private Integer ctype; + +} \ No newline at end of file diff --git a/src/main/java/com/whdc/model/entity/ERule.java b/src/main/java/com/whdc/model/entity/ERule.java index 943a307..e61ef27 100644 --- a/src/main/java/com/whdc/model/entity/ERule.java +++ b/src/main/java/com/whdc/model/entity/ERule.java @@ -15,6 +15,7 @@ import org.apache.commons.lang3.StringUtils; import javax.validation.constraints.Max; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; +import java.io.Serializable; import java.math.BigDecimal; import java.util.Date; import java.util.Locale; @@ -23,19 +24,16 @@ import static com.whdc.model.MyConstant.DEL; import static com.whdc.model.MyConstant.REC; /** - *

- * - *

- * * @author xusan * @date 2023-03-19 */ @Data -@ApiModel(description = "正常范围规则表") @Accessors(chain = true) +@ApiModel(description = "正常范围规则表") @TableName("SHZH_IOT.E_RULE") -public class ERule extends Model { +public class ERule extends Model implements Serializable { private static final long serialVersionUID = 1L; + /** * 主键自增 */ diff --git a/src/main/java/com/whdc/model/entity/EStationRules.java b/src/main/java/com/whdc/model/entity/EStationRules.java deleted file mode 100644 index 3e3f908..0000000 --- a/src/main/java/com/whdc/model/entity/EStationRules.java +++ /dev/null @@ -1,107 +0,0 @@ -package com.whdc.model.entity; - -import com.baomidou.mybatisplus.annotation.*; -import com.baomidou.mybatisplus.extension.activerecord.Model; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.whdc.model.group.Insert; -import com.whdc.model.group.Update; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import io.swagger.annotations.ApiParam; -import lombok.Data; -import lombok.experimental.Accessors; - -import javax.validation.constraints.Max; -import javax.validation.constraints.NotNull; -import java.util.Date; - -import static com.whdc.model.MyConstant.DEL; -import static com.whdc.model.MyConstant.REC; - -/** - *

- * - *

- * - * @author xusan - * @date 2023-03-19 - */ -@Data -@ApiModel(description = "测站关联规则表") -@Accessors(chain = true) -@TableName("SHZH_IOT.E_STATION_RULES") -public class EStationRules extends Model { - private static final long serialVersionUID = 1L; - /** - * 主键id - */ - @ApiParam(value = "主键id", required = true) - @ApiModelProperty(value = "主键id", required = true, dataType = "Integer") - @TableId(value = "ID", type = IdType.AUTO) - @NotNull(message = "主键id不能为空",groups = {Update.class}) - private Integer id; - - /** - * 测站编码 - */ - @ApiParam(value = "测站编码", required = true) - @ApiModelProperty(value = "测站编码", required = false, dataType = "String", example = "") - @TableField(value = "STCD") - @NotNull(message = "测站编码不能为空",groups = {Insert.class}) - @Max(50) - private String stcd; - - /** - * 测站编码 - */ - @ApiParam(value = "区域编码", required = false) - @ApiModelProperty(value = "区域编码", required = false, dataType = "String", example = "") - @TableField(value = "COUNTYCODE", updateStrategy = FieldStrategy.IGNORED) - private String countycode; - - /** - * 测站编码 - */ - @ApiParam(value = "来源", required = true) - @ApiModelProperty(value = "来源", required = false, dataType = "String", example = "") - @TableField(value = "SOURCE") - @NotNull(message = "来源不能为空",groups = {Insert.class,Update.class}) - private String source; - - /** - * 规则id - */ - @ApiParam(value = "规则id", required = true) - @ApiModelProperty(value = "规则id", required = false, dataType = "Integer", example = "") - @TableField(value = "RULE_ID", updateStrategy = FieldStrategy.IGNORED) - @NotNull(message = "规则不能为空",groups = {Insert.class}) - private Integer ruleId; - - /** - * 顺序 - */ - @ApiParam(value = "顺序", required = true ) - @ApiModelProperty(value = "顺序, required = false ", dataType = "Integer") - @TableField(value = "SORT", updateStrategy = FieldStrategy.NOT_EMPTY) - private Integer sort; - - /** - * 创建时间 - */ - @ApiParam(value = "创建时间", required = false) - @ApiModelProperty(value = "创建时间", required = false, dataType = "Date", example = "") - @TableField(value = "CREATETIME", updateStrategy = FieldStrategy.NOT_EMPTY) - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private Date createtime; - - /** - * 0:未删除 1 删除 - */ - @ApiParam(value = "1: 未删除 0: 删除", required = false) - @ApiModelProperty(value = "1: 未删除 0: 删除", required = false, dataType = "String", example = "") - @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) - @TableLogic(value = REC,delval = DEL) - @Max(2) - private String del; - -} diff --git a/src/main/java/com/whdc/model/entity/Fc.java b/src/main/java/com/whdc/model/entity/Fc.java new file mode 100644 index 0000000..54a0688 --- /dev/null +++ b/src/main/java/com/whdc/model/entity/Fc.java @@ -0,0 +1,14 @@ +package com.whdc.model.entity; + +public class Fc { + private Integer id; + + private Integer userId; + + private Integer abId; + + private Integer sort; + + private String type; + +} \ No newline at end of file diff --git a/src/main/java/com/whdc/model/entity/LoginInfo.java b/src/main/java/com/whdc/model/entity/LoginInfo.java new file mode 100644 index 0000000..59e81eb --- /dev/null +++ b/src/main/java/com/whdc/model/entity/LoginInfo.java @@ -0,0 +1,16 @@ +package com.whdc.model.entity; + +import java.util.Date; + +public class LoginInfo { + private Integer id; + + private String ip; + + private String createId; + + private Date createTime; + + private String type; + +} \ No newline at end of file diff --git a/src/main/java/com/whdc/model/entity/Organization.java b/src/main/java/com/whdc/model/entity/Organization.java new file mode 100644 index 0000000..fbcbdc1 --- /dev/null +++ b/src/main/java/com/whdc/model/entity/Organization.java @@ -0,0 +1,14 @@ +package com.whdc.model.entity; + +public class Organization { + private Integer id; + + private String objId; + + private String name; + + private Integer sort; + + private String adcd; + +} \ No newline at end of file diff --git a/src/main/java/com/whdc/model/entity/UnitDict.java b/src/main/java/com/whdc/model/entity/UnitDict.java new file mode 100644 index 0000000..2fe083e --- /dev/null +++ b/src/main/java/com/whdc/model/entity/UnitDict.java @@ -0,0 +1,12 @@ +package com.whdc.model.entity; + +public class UnitDict { + private Integer id; + + private String name; + + private Integer sort; + + private String type; + +} \ No newline at end of file diff --git a/src/main/java/com/whdc/model/entity/User.java b/src/main/java/com/whdc/model/entity/User.java new file mode 100644 index 0000000..6a0e549 --- /dev/null +++ b/src/main/java/com/whdc/model/entity/User.java @@ -0,0 +1,12 @@ +package com.whdc.model.entity; + +public class User { + private Integer id; + + private String password; + + private String salt; + + private Integer abId; + +} \ No newline at end of file diff --git a/src/main/java/com/whdc/model/entity/Versions.java b/src/main/java/com/whdc/model/entity/Versions.java new file mode 100644 index 0000000..a95fd3b --- /dev/null +++ b/src/main/java/com/whdc/model/entity/Versions.java @@ -0,0 +1,20 @@ +package com.whdc.model.entity; + +import java.util.Date; + +public class Versions { + private Integer id; + + private String json; + + private Integer abId; + + private Integer version; + + private String createId; + + private Date createTime; + + private String type; + +} \ No newline at end of file diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index d77e740..ae45208 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,14 +1,14 @@ server: - port: 18005 + port: 20020 spring: #数据库配置 datasource: type: com.alibaba.druid.pool.DruidDataSource driver-class-name: dm.jdbc.driver.DmDriver - url: jdbc:dm://127.0.0.1:5236?schema=SYSDBA + url: jdbc:dm://10.0.41.113:5236?schema=FXKH_TXL username: SYSDBA - password: 199999999 + password: SYSDBA001 # url: jdbc:dm://10.42.6.247:5236?schema=SHZH # username: SHZH # password: Shzh_890 @@ -41,26 +41,10 @@ spring: password: # password: Whdc_890 - # 数据清洗专用redis - redisRules: - database: 6 -# host: 10.42.6.75 - host: 127.0.0.1 - port: 6379 -# password: Whdc_890 - password: - timeout: 60000 - lettuce: - pool: - max-active: 50 - max-idle: 50 - min-idle: 1 - max-wait: 50000 - servlet: multipart: - max-file-size: 100MB - max-request-size: 100MB + max-file-size: 1100MB + max-request-size: 1100MB knife4j: enable: true