src/main/java/com/fzzy/api/Constant.java
@@ -203,6 +203,7 @@ public static String API_CODE_1405 = "1405"; //财务报表接口 public static String API_CODE_1114 = "1114"; public static String API_CODE_1114_1501 = "1501"; public static String API_CODE_1114_1502 = "1502"; public static String API_CODE_1114_1503 = "1503"; src/main/java/com/fzzy/api/data/PushProtocol.java
@@ -19,7 +19,8 @@ HB_FZZY_JG_2022("HB_FZZY_JG_2022", "风正致远监管2022版本"), SB_SHJdJW_2023("SB_SHJdJW_2023", "上海嘉定纪委监管平台2023版"), SB_SH_2023("SB_SH_2023", "上海市平台2023版"), SB_NX_2023("SB_NX_2023", "宁夏省平台2023版"); SB_NX_2023("SB_NX_2023", "宁夏省平台2023版"), SB_SX_2023("SB_SX_2023", "陕西省平台2023版"); private String code; src/main/java/com/fzzy/api/service/ApiTriggerService.java
@@ -10,7 +10,6 @@ import com.fzzy.api.utils.RedisConst; import com.fzzy.api.utils.RedisUtil; import com.fzzy.api.view.repository.ApiTriggerRep; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -191,6 +190,7 @@ list.add(new ApiTrigger(PushProtocol.SB_SHJdJW_2023.getCode(), PushProtocol.SB_SHJdJW_2023.getName())); list.add(new ApiTrigger(PushProtocol.SB_SH_2023.getCode(), PushProtocol.SB_SH_2023.getName())); list.add(new ApiTrigger(PushProtocol.SB_NX_2023.getCode(), PushProtocol.SB_NX_2023.getName())); list.add(new ApiTrigger(PushProtocol.SB_SX_2023.getCode(), PushProtocol.SB_SX_2023.getName())); return list; }
@@ -25,7 +25,7 @@ @Slf4j @Component(OrderCommonManager.BEAN_ID) public class OrderCommonManager implements ApplicationContextAware { public static final String BEAN_ID = "order.orderManager"; public static final String BEAN_ID = "order.orderCommonManager"; private static Map<String, OrderCommonService> serviceMap;
@@ -10,7 +10,7 @@ * @date 2023/08/17 */ @Data public class OrderCommonResp<T> implements Serializable { public class OrderCommonResp implements Serializable { /** * */ src/main/java/com/fzzy/push/impl/ComPushService11.java
@@ -100,7 +100,7 @@ if (responseDto.getSuccess() == 0) { if (Constant.CZBZ_I.equals(data.getCzbz())) { api1102Rep.updateStatus(data.getDwdm(), Constant.CZBZ_U); api1102Rep.updateStatus(data.getKqdm(), Constant.CZBZ_U); } } } src/main/java/com/fzzy/push/nx2023/NX2023ApiRemoteService.java
@@ -1,6 +1,7 @@ package com.fzzy.push.nx2023; import com.alibaba.fastjson.JSON; import com.fzzy.api.Constant; import com.fzzy.api.data.ApiParam; import com.fzzy.api.data.PushProtocol; import com.fzzy.api.dto.ResponseDto; @@ -16,6 +17,7 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.time.DateFormatUtils; import org.apache.commons.lang.time.DateUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -82,10 +84,10 @@ apiLog.setId(ContextUtil.getUUID()); //若为财务1501、1502、1503接口，则接口编码填写1114 if (NX2023Constant.NX_2023_API_CODE_1114_1501.equals(param.getInteId()) || NX2023Constant.NX_2023_API_CODE_1114_1502.equals(param.getInteId()) || NX2023Constant.NX_2023_API_CODE_1114_1503.equals(param.getInteId())) { inteId = NX2023Constant.NX_2023_API_CODE_1114; if (Constant.API_CODE_1114_1501.equals(param.getInteId()) || Constant.API_CODE_1114_1502.equals(param.getInteId()) || Constant.API_CODE_1114_1503.equals(param.getInteId())) { inteId = Constant.API_CODE_1114; } apiLog.setInteId(inteId); @@ -118,10 +120,9 @@ reqData.setUid(conf.getUserName()); //指令id String key = RedisConst.buildKey(RedisConst.KYE_ORDER, conf.getKqdm()); String orderId = reqData.getId(); OrderCommonData orderCommonData = (OrderCommonData) redisUtil.get(key); if (null != orderCommonData && StringUtils.isNotEmpty(orderCommonData.getOrderid())) { orderId = orderCommonData.getOrderid(); String orderId = (String) redisUtil.get(key); if (StringUtils.isEmpty(orderId)) { orderId = reqData.getId(); } reqData.setOrderid(orderId); @@ -417,7 +418,7 @@ try { Field zhgxsj = object.getClass().getDeclaredField("zhgxsj"); zhgxsj.setAccessible(true); zhgxsj.set(object, new Date()); zhgxsj.set(object, DateUtils.addSeconds(new Date(), -10)); } catch (Exception e) { e.printStackTrace(); } @@ -450,7 +451,7 @@ nxFinanceDto.setBbsj(DateFormatUtils.format(api1503.getBbsj(), "yyyyMMdd")); nxFinanceDto.setBbm("03"); nxFinanceDto.setCzbz(api1503.getCzbz()); nxFinanceDto.setZhgxsj(DateFormatUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss")); nxFinanceDto.setZhgxsj(DateFormatUtils.format(DateUtils.addSeconds(new Date(), -10), "yyyy-MM-dd HH:mm:ss")); paddingData(nxFinanceDto, list, "0", "项目//t", "本期金额//t", "本年累计//t"); paddingData(nxFinanceDto, list, "1", "一、营业收入", api1503.getYyzsrbqye() + "", api1503.getYyzsrbnlj() + ""); @@ -501,7 +502,7 @@ nxFinanceDto.setBbsj(DateFormatUtils.format(api1502.getBbsj(), "yyyyMMdd")); nxFinanceDto.setBbm("02"); nxFinanceDto.setCzbz(api1502.getCzbz()); nxFinanceDto.setZhgxsj(DateFormatUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss")); nxFinanceDto.setZhgxsj(DateFormatUtils.format(DateUtils.addSeconds(new Date(), -10), "yyyy-MM-dd HH:mm:ss")); paddingData(nxFinanceDto, list, "0", "项目//t", "本月数//t", "本年累计数//t"); paddingData(nxFinanceDto, list, "1", "一、经营活动产生的现金流量：", api1502.getJyhdxjllbys() + "", api1502.getJyhdxjllbnljs() + ""); @@ -554,7 +555,7 @@ nxFinanceDto.setBbsj(DateFormatUtils.format(api1501.getBbsj(), "yyyyMMdd")); nxFinanceDto.setBbm("01"); nxFinanceDto.setCzbz(api1501.getCzbz()); nxFinanceDto.setZhgxsj(DateFormatUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss")); nxFinanceDto.setZhgxsj(DateFormatUtils.format(DateUtils.addSeconds(new Date(), -10), "yyyy-MM-dd HH:mm:ss")); paddingData(nxFinanceDto, list, "0", "资产//t", "期末余额//t", "年初余额//t"); paddingData(nxFinanceDto, list, "1", "流动资产：", api1501.getLdzchjqmye() + "", api1501.getLdzchjncye() + ""); src/main/java/com/fzzy/push/nx2023/NX2023OrderServiceImpl.java
@@ -64,7 +64,7 @@ //指令存入缓存，时效24小时 String key = RedisConst.buildKey(RedisConst.KYE_ORDER, conf.getKqdm()); redisUtil.set(key, req, 59 * 60 * 24); redisUtil.set(key, req.getOrderid(), 59 * 60 * 24); ApiParam param = new ApiParam(); param.setPushProtocol(conf.getPushProtocol()); src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
@@ -1,6 +1,7 @@ package com.fzzy.push.sh2023; import com.alibaba.fastjson.JSON; import com.fzzy.api.Constant; import com.fzzy.api.data.ApiParam; import com.fzzy.api.data.PushProtocol; import com.fzzy.api.dto.ResponseDto; @@ -92,10 +93,10 @@ apiLog.setId(ContextUtil.getUUID()); //若为财务1501、1502、1503接口，则接口编码填写1114 if (SH2023Constant.SH_2023_API_CODE_1114_1501.equals(param.getInteId()) || SH2023Constant.SH_2023_API_CODE_1114_1502.equals(param.getInteId()) || SH2023Constant.SH_2023_API_CODE_1114_1503.equals(param.getInteId())) { inteId = SH2023Constant.SH_2023_API_CODE_1114; if (Constant.API_CODE_1114_1501.equals(param.getInteId()) || Constant.API_CODE_1114_1502.equals(param.getInteId()) || Constant.API_CODE_1114_1503.equals(param.getInteId())) { inteId = Constant.API_CODE_1114; } apiLog.setInteId(inteId); @@ -123,8 +124,8 @@ //获取指令id String key = RedisConst.buildKey(RedisConst.KYE_ORDER, conf.getKqdm()); OrderCommonData orderCommonData = (OrderCommonData) redisUtil.get(key); if (null == orderCommonData || StringUtils.isEmpty(orderCommonData.getOrderid())) { String orderId = (String) redisUtil.get(key); if (StringUtils.isEmpty(orderId)) { log.error("指令id失效=" + jsonData); ResponseDto responseDto = new ResponseDto(99, "指令id失效"); apiLog.setStatus(99); @@ -139,7 +140,7 @@ //获取身份ID，即行政区划码 reqData.setUid(conf.getUserName()); //指令id reqData.setOrderid(orderCommonData.getOrderid()); reqData.setOrderid(orderId); //身份签名，使用自有RSA私钥进行加密(地区行政区划代码_当天日期) reqData.setAccess_token(ShRSAUtils.sign(reqData.getUid() + "_" + DateFormatUtils.format(new Date(), "yyyy-MM-dd"), conf.getPassword())); src/main/java/com/fzzy/push/sh2023/SH2023HttpClientUtil.java
@@ -27,7 +27,7 @@ */ @SuppressWarnings("resource") public static SH2023RespDto postPushData(String url, String reqData , ApiConfs apiConfs) throws Exception { log.info("---------接口请求地址：" +url+ "----------参数：" + reqData +"---------"); log.debug("---------接口请求地址：" +url+ "----------参数：" + reqData +"---------"); BufferedReader in = null; URL urls = new URL(url); HttpURLConnection connection = null; @@ -64,12 +64,11 @@ } } catch (Exception e) { System.out.println("发生异常"); log.error(e.getMessage(),e); rs = null; return new SH2023RespDto(99,e.getMessage()); } log.info("---------接口返回：" + rs +"---------"); log.debug("---------接口返回：" + rs +"---------"); responseDto = JSON.parseObject(rs,SH2023RespDto.class); if(responseDto == null ) return new SH2023RespDto(99,"接口请求发生未知错误"); return responseDto; src/main/java/com/fzzy/push/sh2023/SH2023OrderServiceImpl.java
@@ -64,7 +64,7 @@ //指令存入缓存，时效24小时 String key = RedisConst.buildKey(RedisConst.KYE_ORDER, conf.getKqdm()); redisUtil.set(key, req, 59 * 60 * 24); redisUtil.set(key, req.getOrderid(), 59 * 60 * 24); ApiParam param = new ApiParam(); param.setPushProtocol(conf.getPushProtocol()); src/main/java/com/fzzy/push/sh2023/dto/SH2023RespDto.java
@@ -9,7 +9,7 @@ * @date 2023/08/17 */ @Data public class SH2023RespDto<T> implements Serializable { public class SH2023RespDto implements Serializable { /** * */
