| src/main/java/com/fzzy/api/view/pr/Api1101PR.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/fzzy/api/view/pr/Api1108PR.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/fzzy/api/view/repository/Api1101Rep.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1302.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1302.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/resources/application-dev.yml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/resources/application-pro.yml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/resources/application.yml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/fzzy/api/view/pr/Api1101PR.java
@@ -138,7 +138,7 @@ ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_11, Constant.API_CODE_1101); Api1101 d; for (ApiParent data : items) { for (Api1101 data : items) { d = new Api1101(); BeanUtils.copyProperties(data, d); param.setBizId(data.getBizId()); @@ -147,7 +147,7 @@ result += responseDto.toString(); if (responseDto.getSuccess() == 0) { if (Constant.CZBZ_I.equals(d.getCzbz())) { api1101Rep.updateStatus(data.getKqdm(), Constant.CZBZ_U); api1101Rep.updateStatus(data.getDwdm(), Constant.CZBZ_U); } } } src/main/java/com/fzzy/api/view/pr/Api1108PR.java
@@ -139,7 +139,7 @@ result += responseDto.toString(); if (responseDto.getSuccess() == 0) { if (Constant.CZBZ_I.equals(d.getCzbz())) { api1108Rep.updateStatus(data.getKqdm(), Constant.CZBZ_U); api1108Rep.updateStatus(data.getId(), Constant.CZBZ_U); } } } @@ -166,7 +166,7 @@ for (Api1108 data : items) { if (Constant.CZBZ_I.equals(data.getCzbz())) { //更新状态 api1108Rep.updateStatus(data.getKqdm(), Constant.CZBZ_U); api1108Rep.updateStatus(data.getId(), Constant.CZBZ_U); } } } src/main/java/com/fzzy/api/view/repository/Api1101Rep.java
@@ -16,21 +16,21 @@ /** * 根据表单主键更新操作标志状态 * * @param id 主键ID * @param dwdm 主键ID * @param czbz 操作标志 * @return */ @Transactional @Modifying @Query("update Api1101 set czbz=:czbz where dwdm=:id ") int updateStatus(@Param("id") String id, @Param("czbz") String czbz); @Query("update Api1101 set czbz =:czbz where dwdm =:dwdm ") int updateStatus(@Param("dwdm") String dwdm, @Param("czbz") String czbz); /** * 单位信息 * @param kqdm * @return */ @Query("from Api1101 where kqdm=:kqdm ") @Query("from Api1101 where kqdm =:kqdm ") List<Api1101> findPushData(@Param("kqdm") String kqdm); /** @@ -38,6 +38,6 @@ * @param kqdm * @return */ @Query("from Api1101 where kqdm=:kqdm and zhgxsj >=:start and zhgxsj <:end order by zhgxsj ") @Query("from Api1101 where kqdm =:kqdm and zhgxsj >=:start and zhgxsj <:end order by zhgxsj ") List<Api1101> getDataByTime(@Param("kqdm") String kqdm, @Param("start") Date start, @Param("end") Date end); } src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1302.java
@@ -23,7 +23,7 @@ /** * 温湿度检测数据同步 * * @author chen * @author czt * @date 2022-09-07 14:41 */ @Slf4j @@ -103,6 +103,14 @@ api1302.setLspjw(fz35Grain.getTempAve() == null ? 0.00: fz35Grain.getTempAve()); api1302.setLszdw(fz35Grain.getTempMin() == null ? 0.00: fz35Grain.getTempMin()); //判断粮食最低温、平均温、最高温是否符合逻辑 if(api1302.getLszdw() >= api1302.getLspjw()){ continue; } if(api1302.getLspjw() >= api1302.getLszgw()){ continue; } //温度集合 if (StringUtils.isEmpty(fz35Grain.getCableCir())) { api1302.setLswdzjh(getTempPointList1(fz35Grain.getPoints(), fz35Grain.getCable())); src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1302.java
@@ -24,7 +24,7 @@ /** * 温湿度检测数据同步 * * @author chen * @author czt * @date 2022-09-07 14:41 */ @Slf4j @@ -103,6 +103,14 @@ api1302.setLspjw(fz40Grain.getTempAve() == null ? 0.00 : fz40Grain.getTempAve()); api1302.setLszdw(fz40Grain.getTempMin() == null ? 0.00 : fz40Grain.getTempMin()); //判断粮食最低温、平均温、最高温是否符合逻辑 if(api1302.getLszdw() >= api1302.getLspjw()){ continue; } if(api1302.getLspjw() >= api1302.getLszgw()){ continue; } //温度集合 if (StringUtils.isEmpty(fz40Grain.getCableCir())) { api1302.setLswdzjh(getTempPointList1(fz40Grain.getPoints(), fz40Grain.getCable())); src/main/resources/application-dev.yml
@@ -5,15 +5,16 @@ datasource: #主数据源 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_5311?useUnicode=true&useSSL=false&characterEncoding=utf-8 # 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_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 #潮阳库 # url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_002?useUnicode=true&useSSL=false&characterEncoding=utf-8 #潮阳分库-濠江区租赁库 # url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_1?useUnicode=true&useSSL=false&characterEncoding=utf-8 #潮阳-港口新仓 # url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_2?useUnicode=true&useSSL=false&characterEncoding=utf-8 #潮阳-关埠老仓 # url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_3?useUnicode=true&useSSL=false&characterEncoding=utf-8 #潮阳-直属仓库 # url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_4?useUnicode=true&useSSL=false&characterEncoding=utf-8 #潮阳-西胪-新仓粮库 # url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_4_2?useUnicode=true&useSSL=false&characterEncoding=utf-8 #潮阳-西胪-新凤粮库 # url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_4_2?useUnicode=true&useSSL=false&characterEncoding=utf-8 #潮阳-西胪-东凤粮库 # url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_5?useUnicode=true&useSSL=false&characterEncoding=utf-8 #潮阳-金灶一所粮库 # url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_6?useUnicode=true&useSSL=false&characterEncoding=utf-8 #潮阳-金灶二所粮库 # url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_7?useUnicode=true&useSSL=false&characterEncoding=utf-8 #潮阳-粮油转运站 @@ -22,7 +23,8 @@ # url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_10?useUnicode=true&useSSL=false&characterEncoding=utf-8 #潮阳-和平粮所 # url: jdbc:mysql://127.0.0.1:3306/igds_api_5320?useUnicode=true&useSSL=false&characterEncoding=utf-8 #广东台山 # url: jdbc:mysql://127.0.0.1:3306/igds_api_5321?useUnicode=true&useSSL=false&characterEncoding=utf-8 #广东韶关 # url: jdbc:mysql://127.0.0.1:3306/igds_api_5326?useUnicode=true&useSSL=false&characterEncoding=utf-8 #惠州惠新 # url: jdbc:mysql://127.0.0.1:3306/igds_api_5322?useUnicode=true&useSSL=false&characterEncoding=utf-8 #广东徐闻 url: jdbc:mysql://127.0.0.1:3306/igds_api_5326?useUnicode=true&useSSL=false&characterEncoding=utf-8 #惠州惠新 # url: jdbc:mysql://127.0.0.1:3306/igds_api_5327?useUnicode=true&useSSL=false&characterEncoding=utf-8 #武汉黄陂军粮 username: root password: Abc123.. @@ -30,12 +32,13 @@ #次数据源 secondary: # url: jdbc:mysql://127.0.0.1:3306/igds_3.5_5016?useUnicode=true&useSSL=false&characterEncoding=utf-8 #大湾区 url: jdbc:mysql://127.0.0.1:3306/igds_3.5_5303?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_3.5_5303?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_3.5_5317?useUnicode=true&useSSL=false&characterEncoding=utf-8 #潮阳 # url: jdbc:mysql://127.0.0.1:3306/igds_3.5_5320?useUnicode=true&useSSL=false&characterEncoding=utf-8 # url: jdbc:mysql://127.0.0.1:3306/igds_3.5_5321?useUnicode=true&useSSL=false&characterEncoding=utf-8 # url: jdbc:mysql://127.0.0.1:3306/igds_4.0_5326?useUnicode=true&useSSL=false&characterEncoding=utf-8 #惠州惠新 # url: jdbc:mysql://127.0.0.1:3306/igds_4.0_5322?useUnicode=true&useSSL=false&characterEncoding=utf-8 #广东徐闻 url: jdbc:mysql://127.0.0.1:3306/igds_4.0_5326?useUnicode=true&useSSL=false&characterEncoding=utf-8 #惠州惠新 # url: jdbc:mysql://127.0.0.1:3306/igds_4.0_5327?useUnicode=true&useSSL=false&characterEncoding=utf-8 #武汉黄陂军粮 username: root password: Abc123.. src/main/resources/application-pro.yml
@@ -1,4 +1,4 @@ ########################## 上海嘉定 ########################## ########################## 广东惠州惠阳 ########################## server: port: 8090 jetty: @@ -9,16 +9,16 @@ datasource: #主数据源 primary: url: jdbc:mysql://127.0.0.1:3306/igds_api?useUnicode=true&characterEncoding=utf-8&useSSL=false driver-class-name: com.mysql.jdbc.Driver url: jdbc:mysql://127.0.0.1:3306/igds_api?useUnicode=true&characterEncoding=utf-8 username: root password: root password: Abc123.. driver-class-name: com.mysql.jdbc.Driver #次数据源 secondary: url: jdbc:mysql://127.0.0.1:3306/igds_master?useUnicode=true&characterEncoding=utf-8&useSSL=false driver-class-name: com.mysql.jdbc.Driver url: jdbc:mysql://127.0.0.1:3306/igds_master?useUnicode=true&characterEncoding=utf-8 username: root password: root password: Abc123.. driver-class-name: com.mysql.jdbc.Driver jpa: #主jpa配置 primary: @@ -51,11 +51,7 @@ timeout: 6000 igds: default: companyId: 5303 companyId: 5326 file-path: D:/IGDS-API/FILE/ img-path: D:/IGDS/FILE/ # 省平台RSA密钥对信息 #公钥：MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCsoiS5Q5CKAT9w5EbZXCxJO/5J2iV3i2HrTW/YcGs2EGeQsQc97EWPdFE1SPXGH5p9TO8nCFRJScj4WeeKUVcuRpzR7czQQ+c6kf6cR9LLQrAiGEMQSk13j/5UsJho23IQDGKWoH18f5aPdX8tJn/o4aR6mMxUY9jdaSKEBck1TQIDAQAB # 区级平台RSA密钥对信息 #公钥：MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCRsamMiP5Op2JJtp3+IIJADFYhL256ZW0KsOkMHruJ3hVwgvoimPHKuUWRI/CS365v4BwUzzfBRdbECMFsLA1e1FHPPA0uSsAIuSVwRzHXG4drX7ZCDa9GFZ+qyIFAU25j2e2PC9olvKbGLBfZ8cL1FLXGxSVyDCX4t/UMZdDULwIDAQAB #私钥：MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAJGxqYyI/k6nYkm2nf4ggkAMViEvbnplbQqw6Qweu4neFXCC+iKY8cq5RZEj8JLfrm/gHBTPN8FF1sQIwWwsDV7UUc88DS5KwAi5JXBHMdcbh2tftkINr0YVn6rIgUBTbmPZ7Y8L2iW8psYsF9nxwvUUtcbFJXIMJfi39Qxl0NQvAgMBAAECgYBKWLHfoCy9sFbMrN7UxnwQ+PqetpiW5tkNApf58ljbErQ4FO5V51xDieXBGejy2igmuOM7jz6xZtUgdiNV8uji/RtiNRqsBekVBPMeYAnPwA4GQ0HNwyHJ3ebJNQqT9bwrk8QpRUuCnrx/U1l7P1QNR5o52H1HpEKPlS0ga0fuQQJBAMdiSFYKt8/PwsYclvU/GqXrPy4cxMBhtE/ZssH9KourxnJcyfRz7EPgfSZykxlGHn8j/r8C2XxtAIYW6mRckqECQQC7EIZCZ3eV8abSIB33oKmw2jZlPQrHXMt8DWz8FYbNIA/9bvk9e9O42iQwMUtHfOMcNMWbcvKR/J+83bcE08TPAkA1ErdYl+/H1HDvVUrlq0+HnPArcSL6ZsedfcB0nNRHa4kehg6IEJdylf4aTuNTFfQmOcmkxLhpw4YhK1ZnMrEhAkEAuiMLNXA3MmCumk+TAiBAOdYoYjyHSTEw2VOSqpPQ+rN4tbmDEIbyefG2KK4kNhIy+pIYP0H11QYG/KuxvX/rSQJBALs0TqUgcGOp9+IkOq4jCXiVkP5/r7JWinQ4d6bYhJ4wspQYloYFCHljKKXtst1m8I3PC+vJY8R6va/3xtQKT8U= img-path: D:/IGDS/FILE/ src/main/resources/application.yml
@@ -1,7 +1,7 @@ ########################## Server ########################## spring: profiles: active: dev active: pro application: name: igds-api main:
