src/main/java/com/fzzy/api/view/Api9109.view.xml
@@ -78,20 +78,12 @@ <Property name="label">操作标志</Property> </PropertyDef> <PropertyDef name="zhgxsj"> <Property name="dataType">Date</Property> <Property name="dataType">DateTime</Property> <Property name="label">最后更新时间</Property> </PropertyDef> <PropertyDef name="bizId"> <Property/> <Property name="label">业务id</Property> </PropertyDef> <PropertyDef name="kqdm"> <Property/> <Property name="label">库区代码</Property> </PropertyDef> <PropertyDef name="syncTime"> <Property name="dataType">Date</Property> <Property name="label">同步时间</Property> <Property name="label">配置ID</Property> </PropertyDef> </DataType> <DataType name="dtGBArea"> @@ -442,16 +434,6 @@ <AutoFormElement> <Property name="name">bizId</Property> <Property name="property">bizId</Property> <Editor/> </AutoFormElement> <AutoFormElement> <Property name="name">kqdm</Property> <Property name="property">kqdm</Property> <Editor/> </AutoFormElement> <AutoFormElement> <Property name="name">syncTime</Property> <Property name="property">syncTime</Property> <Editor/> </AutoFormElement> </AutoForm> src/main/java/com/fzzy/api/view/Api9110.view.xml
@@ -58,7 +58,7 @@ <Property name="label">操作标志</Property> </PropertyDef> <PropertyDef name="zhgxsj"> <Property name="dataType">Date</Property> <Property name="dataType">DateTime</Property> <Property name="label">最后更新时间</Property> </PropertyDef> <PropertyDef name="bjw"> @@ -67,11 +67,7 @@ </PropertyDef> <PropertyDef name="bizId"> <Property/> <Property name="label">业务id</Property> </PropertyDef> <PropertyDef name="syncTime"> <Property name="dataType">Date</Property> <Property name="label">同步时间</Property> <Property name="label">配置id</Property> </PropertyDef> </DataType> <DataType name="dtGBArea"> @@ -366,11 +362,6 @@ <AutoFormElement> <Property name="name">bizId</Property> <Property name="property">bizId</Property> <Editor/> </AutoFormElement> <AutoFormElement> <Property name="name">syncTime</Property> <Property name="property">syncTime</Property> <Editor/> </AutoFormElement> </AutoForm> src/main/java/com/fzzy/api/view/Api9111.view.xml
@@ -30,7 +30,7 @@ <Property name="label">操作标志</Property> </PropertyDef> <PropertyDef name="zhgxsj"> <Property name="dataType">Date</Property> <Property name="dataType">DateTime</Property> <Property name="label">最后更新时间</Property> </PropertyDef> <PropertyDef name="bjw"> @@ -39,11 +39,7 @@ </PropertyDef> <PropertyDef name="bizId"> <Property/> <Property name="label">业务id</Property> </PropertyDef> <PropertyDef name="syncTime"> <Property name="dataType">Date</Property> <Property name="label">同步时间</Property> <Property name="label">配置id</Property> </PropertyDef> </DataType> </Model> @@ -186,9 +182,6 @@ <DataColumn name="bizId"> <Property name="property">bizId</Property> </DataColumn> <DataColumn name="syncTime"> <Property name="property">syncTime</Property> </DataColumn> </DataGrid> <Dialog id="dialogMain"> <Property name="width">1000</Property> @@ -271,11 +264,6 @@ <AutoFormElement> <Property name="name">bizId</Property> <Property name="property">bizId</Property> <Editor/> </AutoFormElement> <AutoFormElement> <Property name="name">syncTime</Property> <Property name="property">syncTime</Property> <Editor/> </AutoFormElement> </AutoForm> src/main/java/com/fzzy/api/view/Api9112.view.xml
@@ -34,7 +34,7 @@ <Property name="label">操作标志</Property> </PropertyDef> <PropertyDef name="zhgxsj"> <Property name="dataType">Date</Property> <Property name="dataType">DateTime</Property> <Property name="label">最后更新时间</Property> </PropertyDef> <PropertyDef name="bjw"> @@ -43,15 +43,7 @@ </PropertyDef> <PropertyDef name="bizId"> <Property/> <Property name="label">业务id</Property> </PropertyDef> <PropertyDef name="kqdm"> <Property/> <Property name="label">库区代码</Property> </PropertyDef> <PropertyDef name="syncTime"> <Property name="dataType">Date</Property> <Property name="label">同步时间</Property> <Property name="label">配置id</Property> </PropertyDef> </DataType> </Model> @@ -195,12 +187,6 @@ </DataColumn> <DataColumn name="bizId"> <Property name="property">bizId</Property> </DataColumn> <DataColumn name="kqdm"> <Property name="property">kqdm</Property> </DataColumn> <DataColumn name="syncTime"> <Property name="property">syncTime</Property> </DataColumn> </DataGrid> <Dialog id="dialogMain"> src/main/java/com/fzzy/api/view/Api9113.view.xml
@@ -26,7 +26,7 @@ <Property name="label">操作标志</Property> </PropertyDef> <PropertyDef name="zhgxsj"> <Property name="dataType">Date</Property> <Property name="dataType">DateTime</Property> <Property name="label">最后更新时间</Property> </PropertyDef> <PropertyDef name="bjw"> @@ -35,15 +35,7 @@ </PropertyDef> <PropertyDef name="bizId"> <Property/> <Property name="label">业务id</Property> </PropertyDef> <PropertyDef name="kqdm"> <Property/> <Property name="label">库区代码</Property> </PropertyDef> <PropertyDef name="syncTime"> <Property name="dataType">Date</Property> <Property name="label">同步时间</Property> <Property name="label">配置id</Property> </PropertyDef> </DataType> </Model> @@ -175,9 +167,6 @@ </DataColumn> <DataColumn name="zhgxsj"> <Property name="property">zhgxsj</Property> </DataColumn> <DataColumn name="syncTime"> <Property name="property">syncTime</Property> </DataColumn> </DataGrid> <Dialog id="dialogMain"> src/main/java/com/fzzy/api/view/Api9114.view.xml
@@ -226,7 +226,7 @@ <Property name="label">操作标志</Property> </PropertyDef> <PropertyDef name="zhgxsj"> <Property name="dataType">Date</Property> <Property name="dataType">DateTime</Property> <Property name="label">更新时间</Property> </PropertyDef> <PropertyDef name="bjw"> src/main/java/com/fzzy/api/view/Api9115.view.xml
@@ -66,7 +66,7 @@ <Property name="label">操作标志</Property> </PropertyDef> <PropertyDef name="zhgxsj"> <Property name="dataType">Date</Property> <Property name="dataType">DateTime</Property> <Property name="label">更新时间</Property> </PropertyDef> <PropertyDef name="bjw"> src/main/java/com/fzzy/api/view/Api9116.view.xml
@@ -94,7 +94,7 @@ <Property name="label">操作标志</Property> </PropertyDef> <PropertyDef name="zhgxsj"> <Property name="dataType">Date</Property> <Property name="dataType">DateTime</Property> <Property name="label">更新时间</Property> </PropertyDef> <PropertyDef name="bjw"> src/main/java/com/fzzy/api/view/pr/Api9109PR.java
@@ -102,7 +102,7 @@ public String pushData(List<Api9109> items) { //获取配置 String kqdm = items.get(0).getKqdm(); String kqdm = items.get(0).getBizId(); ApiConfs apiConf = apiCommonService.getConf(kqdm); if (null == apiConf) { src/main/java/com/fzzy/api/view/pr/Api9110PR.java
@@ -101,7 +101,7 @@ public String pushData(List<Api9110> items) { //获取配置 String kqdm = items.get(0).getKqdm(); String kqdm = items.get(0).getBizId(); ApiConfs apiConf = apiCommonService.getConf(kqdm); if (null == apiConf) { src/main/java/com/fzzy/api/view/pr/Api9111PR.java
@@ -101,7 +101,7 @@ public String pushData(List<Api9111> items) { //获取配置 String kqdm = items.get(0).getKqdm(); String kqdm = items.get(0).getBizId(); ApiConfs apiConf = apiCommonService.getConf(kqdm); if (null == apiConf) { src/main/java/com/fzzy/api/view/pr/Api9112PR.java
@@ -101,7 +101,7 @@ public String pushData(List<Api9112> items) { //获取配置 String kqdm = items.get(0).getKqdm(); String kqdm = items.get(0).getBizId(); ApiConfs apiConf = apiCommonService.getConf(kqdm); if (null == apiConf) { src/main/java/com/fzzy/api/view/pr/Api9113PR.java
@@ -101,7 +101,7 @@ public String pushData(List<Api9113> items) { //获取配置 String kqdm = items.get(0).getKqdm(); String kqdm = items.get(0).getBizId(); ApiConfs apiConf = apiCommonService.getConf(kqdm); if (null == apiConf) { src/main/java/com/fzzy/api/view/pr/Api9114PR.java
@@ -167,7 +167,7 @@ public String pushData(List<Api9114> items) { //获取配置 String kqdm = items.get(0).getKqdm(); String kqdm = items.get(0).getBizId(); ApiConfs apiConf = apiCommonService.getConf(kqdm); if (null == apiConf) { src/main/java/com/fzzy/api/view/pr/Api9115PR.java
@@ -170,7 +170,7 @@ public String pushData(List<Api9115> items) { //获取配置 String kqdm = items.get(0).getKqdm(); String kqdm = items.get(0).getBizId(); ApiConfs apiConf = apiCommonService.getConf(kqdm); if (null == apiConf) { src/main/java/com/fzzy/api/view/pr/Api9116PR.java
@@ -8,7 +8,6 @@ import com.fzzy.api.data.ApiParam; import com.fzzy.api.dto.ResponseDto; import com.fzzy.api.entity.Api9116; import com.fzzy.api.entity.Api9116; import com.fzzy.api.entity.ApiConfs; import com.fzzy.api.service.ApiCommonService; import com.fzzy.api.service.ApiPushManager; @@ -169,7 +168,7 @@ public String pushData(List<Api9116> items) { //获取配置 String kqdm = items.get(0).getKqdm(); String kqdm = items.get(0).getBizId(); ApiConfs apiConf = apiCommonService.getConf(kqdm); if (null == apiConf) { src/main/java/com/fzzy/api/view/repository/Api9109Rep.java
@@ -35,11 +35,11 @@ /** * 单位信息 * @param kqdm * @param bizId * @return */ @Query("from Api9109 where kqdm =:kqdm and zhgxsj >=:start and zhgxsj <:end order by zhgxsj ") List<Api9109> getDataByTime(@Param("kqdm") String kqdm, @Param("start") Date start, @Param("end") Date end); @Query("from Api9109 where bizId =:bizId and zhgxsj >=:start and zhgxsj <:end order by zhgxsj ") List<Api9109> getDataByTime(@Param("bizId") String bizId, @Param("start") Date start, @Param("end") Date end); /** * 单位信息 src/main/java/com/fzzy/api/view/repository/Api9110Rep.java
@@ -35,11 +35,11 @@ /** * 单位信息 * @param kqdm * @param bizId * @return */ @Query("from Api9110 where kqdm =:kqdm and zhgxsj >=:start and zhgxsj <:end order by zhgxsj ") List<Api9110> getDataByTime(@Param("kqdm") String kqdm, @Param("start") Date start, @Param("end") Date end); @Query("from Api9110 where bizId =:bizId and zhgxsj >=:start and zhgxsj <:end order by zhgxsj ") List<Api9110> getDataByTime(@Param("bizId") String bizId, @Param("start") Date start, @Param("end") Date end); /** * 单位信息 src/main/java/com/fzzy/api/view/repository/Api9111Rep.java
@@ -35,11 +35,11 @@ /** * 根据仓房代码查询 * @param kqdm * @param bizId * @return */ @Query("from Api9111 where kqdm =:kqdm and zhgxsj >=:start and zhgxsj <:end order by zhgxsj ") List<Api9111> getDataByTime(@Param("kqdm") String kqdm, @Param("start") Date start, @Param("end") Date end); @Query("from Api9111 where bizId =:bizId and zhgxsj >=:start and zhgxsj <:end order by zhgxsj ") List<Api9111> getDataByTime(@Param("bizId") String bizId, @Param("start") Date start, @Param("end") Date end); /** * 根据仓房代码查询 src/main/java/com/fzzy/api/view/repository/Api9112Rep.java
@@ -35,11 +35,11 @@ /** * 单位信息 * @param kqdm * @param bizId * @return */ @Query("from Api9112 where kqdm =:kqdm and zhgxsj >=:start and zhgxsj <:end order by zhgxsj ") List<Api9112> getDataByTime(@Param("kqdm") String kqdm, @Param("start") Date start, @Param("end") Date end); @Query("from Api9112 where bizId =:bizId and zhgxsj >=:start and zhgxsj <:end order by zhgxsj ") List<Api9112> getDataByTime(@Param("bizId") String bizId, @Param("start") Date start, @Param("end") Date end); /** * 单位信息 src/main/java/com/fzzy/api/view/repository/Api9113Rep.java
@@ -35,11 +35,11 @@ /** * 单位信息 * @param kqdm * @param bizId * @return */ @Query("from Api9113 where kqdm =:kqdm and zhgxsj >=:start and zhgxsj <:end order by zhgxsj ") List<Api9113> getDataByTime(@Param("kqdm") String kqdm, @Param("start") Date start, @Param("end") Date end); @Query("from Api9113 where bizId =:bizId and zhgxsj >=:start and zhgxsj <:end order by zhgxsj ") List<Api9113> getDataByTime(@Param("bizId") String bizId, @Param("start") Date start, @Param("end") Date end); @Query("from Api9113 where hwdm =:hwdm ") src/main/java/com/fzzy/api/view/repository/Api9114Rep.java
@@ -40,11 +40,11 @@ /** * 单位信息 * @param kqdm * @param bizId * @return */ @Query("from Api9114 where kqdm =:kqdm and zhgxsj >=:start and zhgxsj <:end order by zhgxsj ") List<Api9114> getDataByTime(@Param("kqdm") String kqdm, @Param("start") Date start, @Param("end") Date end); @Query("from Api9114 where bizId =:bizId and zhgxsj >=:start and zhgxsj <:end order by zhgxsj ") List<Api9114> getDataByTime(@Param("bizId") String bizId, @Param("start") Date start, @Param("end") Date end); @Query("from Api9114 where rkywdh =:rkywdh ") Api9114 findData(@Param("rkywdh") String rkywdh); src/main/java/com/fzzy/api/view/repository/Api9115Rep.java
@@ -31,10 +31,10 @@ /** * 单位信息 * @param kqdm * @param bizId * @return */ @Query("from Api9115 where kqdm =:kqdm and zhgxsj >=:start and zhgxsj <:end order by zhgxsj ") List<Api9115> getDataByTime(@Param("kqdm") String kqdm, @Param("start") Date start, @Param("end") Date end); @Query("from Api9115 where bizId =:bizId and zhgxsj >=:start and zhgxsj <:end order by zhgxsj ") List<Api9115> getDataByTime(@Param("bizId") String bizId, @Param("start") Date start, @Param("end") Date end); } src/main/java/com/fzzy/api/view/repository/Api9116Rep.java
@@ -37,11 +37,11 @@ /** * 单位信息 * @param kqdm * @param bizId * @return */ @Query("from Api9116 where kqdm =:kqdm and zhgxsj >=:start and zhgxsj <:end order by zhgxsj ") List<Api9116> getDataByTime(@Param("kqdm") String kqdm, @Param("start") Date start, @Param("end") Date end); @Query("from Api9116 where bizId =:bizId and zhgxsj >=:start and zhgxsj <:end order by zhgxsj ") List<Api9116> getDataByTime(@Param("bizId") String bizId, @Param("start") Date start, @Param("end") Date end); /** * 单位信息 src/main/java/com/fzzy/inte/sh2023/service/SHDNService.java
@@ -60,7 +60,7 @@ return; } for (Api9109 apiData : list) { apiData.setKqdm(apiConfs.getKqdm()); apiData.setBizId(apiConfs.getKqdm()); apiData.setZhgxsj(new Date()); api9109Rep.save(apiData); } @@ -78,6 +78,7 @@ return; } for (Api9110 apiData : list) { apiData.setBizId(apiConfs.getKqdm()); apiData.setZhgxsj(new Date()); api9110Rep.save(apiData); } @@ -95,6 +96,7 @@ return; } for (Api9111 apiData : list) { apiData.setBizId(apiConfs.getKqdm()); apiData.setZhgxsj(new Date()); api9111Rep.save(apiData); } @@ -112,7 +114,7 @@ return; } for (Api9112 apiData : list) { apiData.setKqdm(apiConfs.getKqdm()); apiData.setBizId(apiConfs.getKqdm()); apiData.setZhgxsj(new Date()); api9112Rep.save(apiData); } @@ -130,7 +132,7 @@ return; } for (Api9113 apiData : list) { apiData.setKqdm(apiConfs.getKqdm()); apiData.setBizId(apiConfs.getKqdm()); apiData.setZhgxsj(new Date()); api9113Rep.save(apiData); } @@ -148,7 +150,7 @@ return; } for (Api9114 apiData : list) { apiData.setKqdm(apiConfs.getKqdm()); apiData.setBizId(apiConfs.getKqdm()); apiData.setZhgxsj(new Date()); api9114Rep.save(apiData); } @@ -166,7 +168,7 @@ return; } for (Api9115 apiData : list) { apiData.setKqdm(apiConfs.getKqdm()); apiData.setBizId(apiConfs.getKqdm()); apiData.setZhgxsj(new Date()); api9115Rep.save(apiData); } @@ -184,7 +186,7 @@ return; } for (Api9116 apiData : list) { apiData.setKqdm(apiConfs.getKqdm()); apiData.setBizId(apiConfs.getKqdm()); apiData.setZhgxsj(new Date()); api9116Rep.save(apiData); } src/main/resources/application-dev.yml
@@ -6,7 +6,7 @@ #主数据源 primary: # url: jdbc:mysql://127.0.0.1:3306/igds_api_5016?useUnicode=true&useSSL=false&characterEncoding=utf-8 #大湾区 url: jdbc:mysql://127.0.0.1:3306/igds_api_5303?useUnicode=true&useSSL=false&characterEncoding=utf-8 #上海嘉定 # url: jdbc:mysql://127.0.0.1:3306/igds_api_5303?useUnicode=true&useSSL=false&characterEncoding=utf-8 #上海嘉定 # url: jdbc:mysql://127.0.0.1:3306/igds_api_5306?useUnicode=true&useSSL=false&characterEncoding=utf-8 #宁夏石嘴山 # url: jdbc:mysql://127.0.0.1:3306/igds_api_5311?useUnicode=true&useSSL=false&characterEncoding=utf-8 #广澳 # url: jdbc:mysql://127.0.0.1:3306/igds_api_5317?useUnicode=true&useSSL=false&characterEncoding=utf-8 #潮阳库 @@ -32,14 +32,15 @@ # url: jdbc:mysql://127.0.0.1:3306/igds_api_5348?useUnicode=true&useSSL=false&characterEncoding=utf-8 #广东汕头潮南 # url: jdbc:mysql://127.0.0.1:3306/igds_api_5349_sx?useUnicode=true&useSSL=false&characterEncoding=utf-8 #陕西柞水县 # url: jdbc:mysql://127.0.0.1:3306/igds_api_5352?useUnicode=true&useSSL=false&characterEncoding=utf-8 #广东增城冷链-天润增城库 # url: jdbc:mysql://127.0.0.1:3306/igds_api_5354?useUnicode=true&useSSL=false&characterEncoding=utf-8 #广东增城冷链-天润增城库 # url: jdbc:mysql://127.0.0.1:3306/igds_api_5354?useUnicode=true&useSSL=false&characterEncoding=utf-8 #广东东部粮油 url: jdbc:mysql://127.0.0.1:3306/igds_api_5362?useUnicode=true&useSSL=false&characterEncoding=utf-8 #广东海丰 username: root password: Abc123.. driver-class-name: com.mysql.jdbc.Driver #次数据源 secondary: # url: jdbc:mysql://127.0.0.1:3306/igds_4.0_5016?useUnicode=true&useSSL=false&characterEncoding=utf-8 #大湾区 url: jdbc:mysql://127.0.0.1:3306/igds_4.0_5303?useUnicode=true&useSSL=false&characterEncoding=utf-8 #上海嘉定 # url: jdbc:mysql://127.0.0.1:3306/igds_4.0_5303?useUnicode=true&useSSL=false&characterEncoding=utf-8 #上海嘉定 # url: jdbc:mysql://127.0.0.1:3306/igds_4.0_5306?useUnicode=true&useSSL=false&characterEncoding=utf-8 #宁夏石嘴山 # url: jdbc:mysql://127.0.0.1:3306/igds_3.5_5311?useUnicode=true&useSSL=false&characterEncoding=utf-8 #广澳 # url: jdbc:mysql://127.0.0.1:3306/igds_4.0_5317?useUnicode=true&useSSL=false&characterEncoding=utf-8 #潮阳库 @@ -52,6 +53,7 @@ # url: jdbc:mysql://127.0.0.1:3306/igds_4.0_5349?useUnicode=true&useSSL=false&characterEncoding=utf-8 #陕西柞水县 # url: jdbc:mysql://127.0.0.1:3306/igds_4.0_5352?useUnicode=true&useSSL=false&characterEncoding=utf-8 #广东增城冷链-天润增城库 # url: jdbc:mysql://127.0.0.1:3306/igds_4.0_5354?useUnicode=true&useSSL=false&characterEncoding=utf-8 #广东增城-东部粮油中心库 url: jdbc:mysql://127.0.0.1:3306/igds_4.0_5362?useUnicode=true&useSSL=false&characterEncoding=utf-8 #广东海丰 username: root password: Abc123.. driver-class-name: com.mysql.jdbc.Driver src/main/resources/application-pro.yml
@@ -1,4 +1,4 @@ ########################## 广东海丰县 C-盘 pro ########################## ########################## 上海嘉定 -C盘 pro ########################## server: port: 8090 jetty: @@ -9,13 +9,13 @@ datasource: #主数据源 primary: url: jdbc:mysql://127.0.0.1:3306/igds_api?useUnicode=true&characterEncoding=utf-8&useSSL=false url: jdbc:mysql://192.168.200.3:3306/igds_api?useUnicode=true&characterEncoding=utf-8&useSSL=false driver-class-name: com.mysql.jdbc.Driver username: root password: Abc123.. #次数据源 secondary: url: jdbc:mysql://127.0.0.1:3306/igds_master?useUnicode=true&characterEncoding=utf-8&useSSL=false url: jdbc:mysql://192.168.200.3:3306/igds_master?useUnicode=true&characterEncoding=utf-8&useSSL=false driver-class-name: com.mysql.jdbc.Driver username: root password: Abc123.. @@ -39,7 +39,7 @@ # Redis相关配置 redis: database: 1 host: 127.0.0.1 host: 192.168.200.3 port: 6379 password: Abc123.. # 连接池最大连接数(使用负值表示没有限制) @@ -51,7 +51,7 @@ timeout: 6000 igds: default: companyId: 5362 companyId: 5303 file-path: C:/IGDS-API/FILE/ img-path: C:/IGDS/FILE/ # 省平台RSA密钥对信息