diff --git a/lib/javax.ejb.jar b/lib/javax.ejb.jar deleted file mode 100644 index 4ebf5ecd4c9ab83540ef206f6c5a1906db008098..0000000000000000000000000000000000000000 Binary files a/lib/javax.ejb.jar and /dev/null differ diff --git a/lib/javax.jms.jar b/lib/javax.jms.jar deleted file mode 100644 index d31451ada1ad9a4471d9bae383df647c9b4b5235..0000000000000000000000000000000000000000 Binary files a/lib/javax.jms.jar and /dev/null differ diff --git a/lib/javax.persistence.jar b/lib/javax.persistence.jar deleted file mode 100644 index 21d80e0ed3b5e20aa787087247a006398cda7679..0000000000000000000000000000000000000000 Binary files a/lib/javax.persistence.jar and /dev/null differ diff --git a/lib/javax.resource.jar b/lib/javax.resource.jar deleted file mode 100644 index 696a2345878907025784d2e6e49c6e6b41d1cfac..0000000000000000000000000000000000000000 Binary files a/lib/javax.resource.jar and /dev/null differ diff --git a/lib/javax.servlet.jsp.jar b/lib/javax.servlet.jsp.jar deleted file mode 100644 index 9c0631cea0fd56031db19fc3edbb4db4bfbb923a..0000000000000000000000000000000000000000 Binary files a/lib/javax.servlet.jsp.jar and /dev/null differ diff --git a/lib/javax.servlet.jsp.jstl.jar b/lib/javax.servlet.jsp.jstl.jar deleted file mode 100644 index 7be17cc742fde5e957696dd98f6d0cf6520ed294..0000000000000000000000000000000000000000 Binary files a/lib/javax.servlet.jsp.jstl.jar and /dev/null differ diff --git a/lib/javax.transaction.jar b/lib/javax.transaction.jar deleted file mode 100644 index 729c6952389cd4769d5d840b3d1a7941b3c0f63e..0000000000000000000000000000000000000000 Binary files a/lib/javax.transaction.jar and /dev/null differ diff --git a/pom.xml b/pom.xml index 708cc428ddadafd002c665301b6da46958b1ae08..0697489f80a8e18744261469e04e13c318b0f9e8 100644 --- a/pom.xml +++ b/pom.xml @@ -46,12 +46,12 @@ tk.mybatis mapper 4.0.0 - - - persistence-api - javax.persistence - - + + + + + + tk.mybatis diff --git a/src/main/java/com/hncy/datatrans/server/pzhdata/controller/EnterpriseBaseInfoController.java b/src/main/java/com/hncy/datatrans/server/pzhdata/controller/EnterpriseBaseInfoController.java index 894ac054b00621a694728b48c8944e55fe264b0b..2f24b64a77b2c8762a2dc4f3dcf78ef555afee19 100644 --- a/src/main/java/com/hncy/datatrans/server/pzhdata/controller/EnterpriseBaseInfoController.java +++ b/src/main/java/com/hncy/datatrans/server/pzhdata/controller/EnterpriseBaseInfoController.java @@ -1,6 +1,6 @@ package com.hncy.datatrans.server.pzhdata.controller; -import com.hncy.datatrans.server.pzhdata.entity.EnterpriseBaseInfo; +import com.hncy.datatrans.server.pzhdata.entity.hnbase.OrgNonPublic; import com.hncy.datatrans.server.pzhdata.service.EnterpriseBaseInfoService; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -28,10 +28,12 @@ public class EnterpriseBaseInfoController { * @Param * @return */ - @ApiOperation(value = "查询所有企业基本信息", response = EnterpriseBaseInfo.class) + @ApiOperation(value = "查询所有企业基本信息", response = OrgNonPublic.class) @RequestMapping(value = "/getAll", method = RequestMethod.POST, produces = "application/json;charset=UTF-8") - public List getAllEnterpriseBaseInfo(){ - //查询所有企业基本信息 - return enterpriseBaseInfoService.getAllEnterpriseBaseInfo(); + public List getAllEnterpriseBaseInfo(){ + //查询中转数据库中所有企业基本信息 + List enterpriseInfos = enterpriseBaseInfoService.getAllEnterpriseBaseInfo(); + + return enterpriseInfos; } } diff --git a/src/main/java/com/hncy/datatrans/server/pzhdata/entity/EnterpriseBaseInfo.java b/src/main/java/com/hncy/datatrans/server/pzhdata/entity/EnterpriseBaseInfo.java index e319d2ea6e6f9347c28a42953e878cfcd0332b79..420f005d41aaefc6bc18fa7b369aa5cd0aa722a7 100644 --- a/src/main/java/com/hncy/datatrans/server/pzhdata/entity/EnterpriseBaseInfo.java +++ b/src/main/java/com/hncy/datatrans/server/pzhdata/entity/EnterpriseBaseInfo.java @@ -21,7 +21,8 @@ import java.util.Date; */ @Table(name = "scjdglj_e_baseinfo") @Data -@AllArgsConstructor@NoArgsConstructor +@AllArgsConstructor +@NoArgsConstructor public class EnterpriseBaseInfo { //主键id @Id//根据主键删除时需要使用 diff --git a/src/main/java/com/hncy/datatrans/server/pzhdata/entity/hnbase/OrgNonPublic.java b/src/main/java/com/hncy/datatrans/server/pzhdata/entity/hnbase/OrgNonPublic.java new file mode 100644 index 0000000000000000000000000000000000000000..49cfcc64839c828996a36026e15ff30130c83172 --- /dev/null +++ b/src/main/java/com/hncy/datatrans/server/pzhdata/entity/hnbase/OrgNonPublic.java @@ -0,0 +1,154 @@ +package com.hncy.datatrans.server.pzhdata.entity.hnbase; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; + +/** + * @Author Ivan + * @Description base库中的非公经济组织信息 + * @Date 2020/7/28 10:51 + */ +@Data +public class OrgNonPublic { + + @ApiModelProperty(value = "非公有制经济组织表标识") + private String id; + + @ApiModelProperty(value = "统一社会信用代码") + private String creditCode; + + @ApiModelProperty(value = "企业名称") + private String orgName; + + @ApiModelProperty(value = "企业地址") + private String address; + + @ApiModelProperty(value = "企业员工数") + private Integer personCount; + + @ApiModelProperty(value = "法定代表人姓名") + private String frName; + + @ApiModelProperty(value = "批准日期") + @DateTimeFormat(pattern = "yyy-MM-dd") + @JsonFormat(pattern = "yyy-MM-dd") + private Date pzDate; + + @ApiModelProperty(value = "状态") + private Integer status; + + @ApiModelProperty(value = "法定代表人证件代码") + private String fzrCardType; + + @ApiModelProperty(value = "法定代表人证件号码") + private String fzrCardNo; + + @ApiModelProperty(value = "法定代表人姓名") + private String fzrName; + + @ApiModelProperty(value = "法定代表人联系方式") + private String fzrTel; + + @ApiModelProperty(value = "办公地址") + private String officeAddress; + + @ApiModelProperty(value = "治保负责人姓名") + private String zbfzrName; + + @ApiModelProperty(value = "治保负责人联系方式") + private String zbfzrTel; + + @ApiModelProperty(value = "是否危化企业") + private Integer isWh; + + @ApiModelProperty(value = "安全隐患类型") + private String aqyhType; + + @ApiModelProperty(value = "关注程度") + private String gzcd; + + @ApiModelProperty(value = "是否具备建立中共党组织条件") + private Integer isJbjlZgdzz; + + @ApiModelProperty(value = "是否有中共党组织") + private Integer isZgdzz; + + @ApiModelProperty(value = "中共党员数量") + private Integer zgdyCount; + + @ApiModelProperty(value = "是否有工会") + private Integer isGh; + + @ApiModelProperty(value = "工会会员数量") + private Integer ghhyCount; + + @ApiModelProperty(value = "是否有共青团组织") + private Integer isGqtzz; + + @ApiModelProperty(value = "共青团团员数量") + private Integer gqttyCount; + + @ApiModelProperty(value = "是否有妇联组织") + private Integer isFlzz; + + @ApiModelProperty(value = "妇女数量") + private Integer fvCount; + + @ApiModelProperty(value = "资金来源") + private String zjSource; + + @ApiModelProperty(value = "是否有境外背景") + private Integer isJwbj; + + @ApiModelProperty(value = "经度") + private String xpoints; + + @ApiModelProperty(value = "纬度") + private String ypoints; + + @ApiModelProperty(value = "删除状态 1:删除 0:未删除") + private Integer deleted; + + @ApiModelProperty(value = "创建时间") + private Date createDate; + + @ApiModelProperty(value = "修改时间") + private Date updateDate; + + @ApiModelProperty(value = "创建者") + private String createBy; + + @ApiModelProperty(value = "修改者") + private String updateBy; + + @ApiModelProperty(value = "主要职责") + private String respon; + + @ApiModelProperty(value = "简介") + private String description; + + @ApiModelProperty(value = "备注") + private String remark; + + @ApiModelProperty(value = "所在辖区") + private String areaId; + + @ApiModelProperty(value = "辖区名称") + private String areaName; + + @ApiModelProperty(value = "楼栋代码") + private String buildCode; + + @ApiModelProperty(value = "单元代码") + private String unitCode; + + @ApiModelProperty(value = "房间代码") + private String roomCode; + + @ApiModelProperty(value = "企业类型") + private String orgType; +} diff --git a/src/main/java/com/hncy/datatrans/server/pzhdata/entity/hnbase/OrgShorg.java b/src/main/java/com/hncy/datatrans/server/pzhdata/entity/hnbase/OrgShorg.java new file mode 100644 index 0000000000000000000000000000000000000000..0aa2d54bdabf3905bd8b66741040916506f99cba --- /dev/null +++ b/src/main/java/com/hncy/datatrans/server/pzhdata/entity/hnbase/OrgShorg.java @@ -0,0 +1,154 @@ +package com.hncy.datatrans.server.pzhdata.entity.hnbase; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; + +/** + * @Author Ivan + * @Description base库中的社会组织信息 + * @Date 2020/7/28 9:46 + */ +@Data +public class OrgShorg { + + @ApiModelProperty(value = "社会组织管理表标识") + private String id; + + @ApiModelProperty(value = "统一社会信用代码") + private String creditCode; + + @ApiModelProperty(value = "登记证号") + private String registedNo; + + @ApiModelProperty(value = "社会组织名称") + private String shorgName; + + @ApiModelProperty(value = "登记管理机关代码") + private String gljgCode; + + @ApiModelProperty(value = "法定代表人姓名") + private String frName; + + @ApiModelProperty(value = "住所") + private String frAddress; + + @ApiModelProperty(value = "批准日期") + @DateTimeFormat(pattern = "yyy-MM-dd") + @JsonFormat(pattern = "yyy-MM-dd") + private Date pzDate; + + @ApiModelProperty(value = "社会组织类型") + private String shorgType; + + @ApiModelProperty(value = "状态") + private Integer status; + + @ApiModelProperty(value = "负责人证件代码") + private String fzrCardType; + + @ApiModelProperty(value = "负责人证件号码") + private String fzrCardNo; + + @ApiModelProperty(value = "负责人姓名") + private String fzrName; + + @ApiModelProperty(value = "负责人联系方式") + private String fzrTel; + + @ApiModelProperty(value = "办公地址") + private String officeAddress; + + @ApiModelProperty(value = "治保负责人姓名") + private String zbfzrName; + + @ApiModelProperty(value = "治保负责人联系方式") + private String zbfzrTel; + + @ApiModelProperty(value = "关注程度 3:高 2:中 1:低") + private String gzcd; + + @ApiModelProperty(value = "是否具备建立中共党组织条件") + private Integer isJbjlZgdzz; + + @ApiModelProperty(value = "是否有中共党组织") + private Integer isZgdzz; + + @ApiModelProperty(value = "中共党员数量") + private Integer zgdyCount; + + @ApiModelProperty(value = "是否有工会") + private Integer isGh; + + @ApiModelProperty(value = "工会会员数量") + private Integer ghhyCount; + + @ApiModelProperty(value = "是否有共青团组织") + private Integer isGqtzz; + + @ApiModelProperty(value = "共青团团员数量") + private Integer gqttyCount; + + @ApiModelProperty(value = "是否有妇联组织") + private Integer isFlzz; + + @ApiModelProperty(value = "妇女数量") + private Integer fvCount; + + @ApiModelProperty(value = "资金来源") + private String zjSource; + + @ApiModelProperty(value = "是否有境外背景") + private Integer isJwbj; + + @ApiModelProperty(value = "经度") + private String xpoints; + + @ApiModelProperty(value = "纬度") + private String ypoints; + + @ApiModelProperty(value = "删除状态 0:未删除 1:删除") + private Integer deleted; + + @ApiModelProperty(value = "创建时间") + private Date createDate; + + @ApiModelProperty(value = "修改时间") + private Date updateDate; + + @ApiModelProperty(value = "创建人") + private String createBy; + + @ApiModelProperty(value = "修改者") + private String updateBy; + + @ApiModelProperty(value = "职责") + private String respon; + + @ApiModelProperty(value = "简介") + private String description; + + @ApiModelProperty(value = "备注") + private String remark; + + @ApiModelProperty(value = "所在辖区") + private String areaId; + + @ApiModelProperty(value = "辖区名称") + private String areaName; + + @ApiModelProperty(value = "楼栋代码") + private String buildCode; + + @ApiModelProperty(value = "单元代码") + private String unitCode; + + @ApiModelProperty(value = "房间代码") + private String roomCode; + + @ApiModelProperty(value = "企业员工数") + private Integer personCount; +} diff --git a/src/main/java/com/hncy/datatrans/server/pzhdata/mapper/EnterpriseBaseInfoMapper.java b/src/main/java/com/hncy/datatrans/server/pzhdata/mapper/EnterpriseBaseInfoMapper.java index 27d31bd6e16e9485d10d009185d0e5689d5d6f62..9d6ed09f2c6b249d960f633d3100a648e4e91016 100644 --- a/src/main/java/com/hncy/datatrans/server/pzhdata/mapper/EnterpriseBaseInfoMapper.java +++ b/src/main/java/com/hncy/datatrans/server/pzhdata/mapper/EnterpriseBaseInfoMapper.java @@ -1,8 +1,11 @@ package com.hncy.datatrans.server.pzhdata.mapper; import com.hncy.datatrans.server.pzhdata.entity.EnterpriseBaseInfo; +import com.hncy.datatrans.server.pzhdata.entity.hnbase.OrgNonPublic; import tk.mybatis.mapper.common.Mapper; +import java.util.List; + /** * @Author Ivan * @Description 企业基本信息mapper @@ -11,4 +14,12 @@ import tk.mybatis.mapper.common.Mapper; * @return */ public interface EnterpriseBaseInfoMapper extends Mapper { + /** + * @Author Ivan + * @Description 查询所有企业基本信息 + * @Date 2020/7/27 16:01 + * @Param + * @return + */ + List getAllEnterpriseBaseInfo(); } \ No newline at end of file diff --git a/src/main/java/com/hncy/datatrans/server/pzhdata/service/EnterpriseBaseInfoService.java b/src/main/java/com/hncy/datatrans/server/pzhdata/service/EnterpriseBaseInfoService.java index 7e3fc6746d1ca46a5849d95d7fd23fb44c918440..d1cbbccb20c4f8846c7ea01ede5c0b92f7de47b4 100644 --- a/src/main/java/com/hncy/datatrans/server/pzhdata/service/EnterpriseBaseInfoService.java +++ b/src/main/java/com/hncy/datatrans/server/pzhdata/service/EnterpriseBaseInfoService.java @@ -1,6 +1,6 @@ package com.hncy.datatrans.server.pzhdata.service; -import com.hncy.datatrans.server.pzhdata.entity.EnterpriseBaseInfo; +import com.hncy.datatrans.server.pzhdata.entity.hnbase.OrgNonPublic; import java.util.List; @@ -18,5 +18,5 @@ public interface EnterpriseBaseInfoService { * @Param * @return */ - List getAllEnterpriseBaseInfo(); + List getAllEnterpriseBaseInfo(); } diff --git a/src/main/java/com/hncy/datatrans/server/pzhdata/service/impl/EnterpriseBaseInfoServiceImpl.java b/src/main/java/com/hncy/datatrans/server/pzhdata/service/impl/EnterpriseBaseInfoServiceImpl.java index 3fb0ed498726d094cce3b4391054c27c8aa017a9..96f784c113e5f2540ad24720805660ab4809b21c 100644 --- a/src/main/java/com/hncy/datatrans/server/pzhdata/service/impl/EnterpriseBaseInfoServiceImpl.java +++ b/src/main/java/com/hncy/datatrans/server/pzhdata/service/impl/EnterpriseBaseInfoServiceImpl.java @@ -1,6 +1,6 @@ package com.hncy.datatrans.server.pzhdata.service.impl; -import com.hncy.datatrans.server.pzhdata.entity.EnterpriseBaseInfo; +import com.hncy.datatrans.server.pzhdata.entity.hnbase.OrgNonPublic; import com.hncy.datatrans.server.pzhdata.mapper.EnterpriseBaseInfoMapper; import com.hncy.datatrans.server.pzhdata.service.EnterpriseBaseInfoService; import org.springframework.beans.factory.annotation.Autowired; @@ -26,7 +26,7 @@ public class EnterpriseBaseInfoServiceImpl implements EnterpriseBaseInfoService * @return */ @Override - public List getAllEnterpriseBaseInfo() { - return enterpriseBaseInfoMapper.selectAll(); + public List getAllEnterpriseBaseInfo() { + return enterpriseBaseInfoMapper.getAllEnterpriseBaseInfo(); } } diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 8aa13def4fee8180840c605a71a4e2036c81078f..e3c4b0b607ffdff5882fe64c353a0add629af7f3 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -17,10 +17,10 @@ eureka: register-with-eureka: true #是否将自己注册到注册中心,集群必须设置为true配合ribbon fetch-registry: true #是否从服务端抓取已有的注册信息 service-url: - defaultZone: http://localhost:7001/eureka # 单机版 + defaultZone: http://192.137.1.118:7001/eureka # 单机版 # defaultZone: http://eureka7001.com:7001/eureka,http://eureka7002.com:7002/eureka # 集群版 instance: - instance-id: payment8001 #对外显示的名称,隐藏主机名 + instance-id: pzhdata-yxf #对外显示的名称,隐藏主机名 prefer-ip-address: true #显示ip,方便查看 # lease-renewal-interval-in-seconds: 1 #客户端向服务端发送的心跳包时间,默认30秒 # lease-expiration-duration-in-seconds: 2 #服务端收到最后一次心跳包等待上限,默认90秒,超时剔除服务 diff --git a/src/main/resources/mapper/EnterpriseBaseInfoMapper.xml b/src/main/resources/mapper/EnterpriseBaseInfoMapper.xml index 07989e460f2538d27de77069f4cec12f08f3737d..bd2c3f7224470fc7473a5bbb468d84cf6b560086 100644 --- a/src/main/resources/mapper/EnterpriseBaseInfoMapper.xml +++ b/src/main/resources/mapper/EnterpriseBaseInfoMapper.xml @@ -1,6 +1,6 @@ - + @@ -38,4 +38,55 @@ + + + \ No newline at end of file