diff --git a/pom.xml b/pom.xml index bd67593..19930fb 100644 --- a/pom.xml +++ b/pom.xml @@ -82,6 +82,11 @@ 19.18.0.0 runtime + + cn.easyproject + orai18n + 12.1.0.2.0 + org.projectlombok lombok diff --git a/src/main/java/com/glxp/mipsdl/controller/TestController.java b/src/main/java/com/glxp/mipsdl/controller/TestController.java new file mode 100644 index 0000000..7d0c8cb --- /dev/null +++ b/src/main/java/com/glxp/mipsdl/controller/TestController.java @@ -0,0 +1,51 @@ +package com.glxp.mipsdl.controller; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.glxp.mipsdl.client.ClientProcessor; +import com.glxp.mipsdl.dao.basic.BasicBussinessTypeDao; +import com.glxp.mipsdl.entity.basic.BasicBussinessTypeEntity; +import com.glxp.mipsdl.entity.njxyy.BasicCorpEntity; +import com.glxp.mipsdl.req.base.UdiwmsQueryUdiInvProductsRequest; +import com.glxp.mipsdl.res.BaseResponse; +import com.glxp.mipsdl.thirddao.njxyy.TestDataMapper; +import com.glxp.mipsdl.util.ResultVOUtils; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import java.util.List; + +@Slf4j +@RestController +public class TestController { + + @Resource + TestDataMapper testDataMapper; + @Resource + BasicBussinessTypeDao bussinessTypeDao; + + + @GetMapping("/test/nj") + public BaseResponse filterInv() { + for (int i = 0; i < 100000; i++) { + List data = testDataMapper.selectList(new QueryWrapper().last("limit 10")); + log.info(i+""); + } + return ResultVOUtils.success(); + } + + @GetMapping("/test/ct") + public BaseResponse filterCt() { + for (int i = 0; i < 100000; i++) { + List data = bussinessTypeDao.selectList(new QueryWrapper()); + log.info(i+""); + } + return ResultVOUtils.success(); + } + + +} diff --git a/src/main/java/com/glxp/mipsdl/entity/njxyy/BasicCorpEntity.java b/src/main/java/com/glxp/mipsdl/entity/njxyy/BasicCorpEntity.java new file mode 100644 index 0000000..f83be23 --- /dev/null +++ b/src/main/java/com/glxp/mipsdl/entity/njxyy/BasicCorpEntity.java @@ -0,0 +1,146 @@ +package com.glxp.mipsdl.entity.njxyy; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.util.Date; + +/** + * 往来单位字典表 + */ +@Data +@TableName(value = "basic_corp") +public class BasicCorpEntity { + + @TableId(value = "id", type = IdType.INPUT) + private Long id; + + /** + * 往来单位编码 + */ + @TableField(value = "erpId") + private String erpId; + + /** + * 往来单位名称 + */ + @TableField(value = "`name`") + private String name; + + /** + * 往来单位简称 + */ + @TableField(value = "spell") + private String spell; + + /** + * 地址 + */ + @TableField(value = "addr") + private String addr; + + /** + * 状态 + */ + @TableField(value = "`status`") + private Integer status; + + /** + * 类型 + */ + @TableField(value = "`type`") + private String type; + + /** + * 联系人 + */ + @TableField(value = "contact") + private String contact; + + /** + * 联系电话 + */ + @TableField(value = "mobile") + private String mobile; + + @TableField(value = "creditNo") + private String creditNo; + + /** + * 第三方平台ID（备用） + */ + @TableField(value = "thirdId") + private String thirdId; + + @TableField(value = "thirdId1") + private String thirdId1; + + @TableField(value = "thirdId2") + private String thirdId2; + + @TableField(value = "thirdId3") + private String thirdId3; + + @TableField(value = "thirdId4") + private String thirdId4; + + @TableField(value = "thirdName") + private String thirdName; + + @TableField(value = "thirdName1") + private String thirdName1; + + @TableField(value = "thirdName2") + private String thirdName2; + + @TableField(value = "thirdName3") + private String thirdName3; + + @TableField(value = "thirdName4") + private String thirdName4; + + /** + * 往来单位类型：1.客户，2：供应商，3：内部科室,4.特殊往来;5.生产厂家 + */ + @TableField(value = "corpType") + private Integer corpType; + + /** + * 客户单据：1.患者，2.客户 + */ + @TableField(value = "outType") + private Integer outType; + + /** + * 创建人 + */ + @TableField(value = "`createUser`") + private String createUser; + + /** + * 创建时间 + */ + @TableField(value = "createTime") + private Date createTime; + + /** + * 更新人 + */ + @TableField(value = "updateUser") + private String updateUser; + + /** + * 更新时间 + */ + @TableField(value = "updateTime") + private Date updateTime; + + /** + * 备注 + */ + @TableField(value = "remark") + private String remark; +} diff --git a/src/main/java/com/glxp/mipsdl/thirddao/njxyy/TestDataMapper.java b/src/main/java/com/glxp/mipsdl/thirddao/njxyy/TestDataMapper.java new file mode 100644 index 0000000..d8f51d4 --- /dev/null +++ b/src/main/java/com/glxp/mipsdl/thirddao/njxyy/TestDataMapper.java @@ -0,0 +1,14 @@ +package com.glxp.mipsdl.thirddao.njxyy; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.glxp.mipsdl.entity.njxyy.BasicCorpEntity; +import org.apache.ibatis.annotations.Mapper; + + +@Mapper +@DS("njsql") +public interface TestDataMapper extends BaseMapper { + + +} diff --git a/src/main/java/com/glxp/mipsdl/thirddao/njxyy/ThrSickerMapper.java b/src/main/java/com/glxp/mipsdl/thirddao/njxyy/ThrSickerMapper.java index 9ef810e..662b3f9 100644 --- a/src/main/java/com/glxp/mipsdl/thirddao/njxyy/ThrSickerMapper.java +++ b/src/main/java/com/glxp/mipsdl/thirddao/njxyy/ThrSickerMapper.java @@ -9,4 +9,6 @@ import org.apache.ibatis.annotations.Mapper; @Mapper @DS("njsql") public interface ThrSickerMapper extends BaseMapper { + + } diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 393b5d3..0ab0928 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -9,10 +9,6 @@ spring: username: root password: 123456 driver-class-name: com.p6spy.engine.spy.P6SpyDriver - hikari: - connection-timeout: 60000 - maximum-pool-size: 60 - minimum-idle: 10 njsql: # jdbc-url: jdbc:oracle:thin:@192.168.10.8:1521/njxyy # username: SD_UDIJK @@ -22,9 +18,16 @@ spring: username: root password: 123456 driver-class-name: com.p6spy.engine.spy.P6SpyDriver -# thirdSql: -# url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_pt?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true -# username: root -# password: 123456 -# driver-class-name: com.p6spy.engine.spy.P6SpyDriver - + # thirdSql: + # url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_pt?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true + # username: root + # password: 123456 + # driver-class-name: com.p6spy.engine.spy.P6SpyDriver + hikari: + connection-timeout: 60000 + maximum-pool-size: 60 + minimum-idle: 10 + hikari: + connection-timeout: 60000 + maximum-pool-size: 60 + minimum-idle: 10 diff --git a/src/main/resources/application-pro.yml b/src/main/resources/application-pro.yml index 6171271..2184357 100644 --- a/src/main/resources/application-pro.yml +++ b/src/main/resources/application-pro.yml @@ -7,15 +7,19 @@ spring: master: url: jdbc:mysql://127.0.0.1:3306/udi_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true username: root - password: GLxp@6066 + password: Glxp@6066 driver-class-name: com.mysql.cj.jdbc.Driver - hikari: - connection-timeout: 60000 - maximum-pool-size: 60 - minimum-idle: 10 njsql: - jdbc-url: jdbc:oracle:thin:@192.168.10.8:1521/njxyy + url: jdbc:oracle:thin:@192.168.10.8:1521/njxyy username: SD_UDIJK password: SD_UDIJK - driver-class-name: oracle.jdbc.driver.OracleDrive + driver-class-name: oracle.jdbc.driver.OracleDriver + hikari: + connection-timeout: 60000 + maximum-pool-size: 60 + minimum-idle: 10 + hikari: + connection-timeout: 60000 + maximum-pool-size: 60 + minimum-idle: 10 UDIWMS_IP: http://127.0.0.1:9991 diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 56d884d..4057e0b 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,6 +1,6 @@ spring: profiles: - active: dev + active: pro servlet: multipart: max-file-size: 100MB