040fbf90 by 夏齐

首次提交

1 parent 4e277aa8
...@@ -140,7 +140,7 @@ public class EciHttpUtil { ...@@ -140,7 +140,7 @@ public class EciHttpUtil {
140 * @param documentId 合同文档ID 140 * @param documentId 合同文档ID
141 * @return 141 * @return
142 */ 142 */
143 public String download(String documentId,String bh) { 143 public String download(String documentId,String bh,String htlx,String areacode) {
144 String url = hostUrl + "/document/download" + "?documentId=" + documentId; 144 String url = hostUrl + "/document/download" + "?documentId=" + documentId;
145 InputStream in = null; 145 InputStream in = null;
146 String absolutePath = ""; 146 String absolutePath = "";
...@@ -170,7 +170,7 @@ public class EciHttpUtil { ...@@ -170,7 +170,7 @@ public class EciHttpUtil {
170 in =conn.getInputStream(); 170 in =conn.getInputStream();
171 SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy"); 171 SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy");
172 String dateDir = simpleDateFormat.format(new Date()); 172 String dateDir = simpleDateFormat.format(new Date());
173 File savePath = new File("D:\\ECI\\" + dateDir+bh); 173 File savePath = new File("E:\\ECI\\"+areacode+"\\"+ htlx+dateDir+bh);
174 if (!savePath.exists()) { 174 if (!savePath.exists()) {
175 savePath.mkdirs(); 175 savePath.mkdirs();
176 } 176 }
......
...@@ -12,7 +12,7 @@ public class QysTask { ...@@ -12,7 +12,7 @@ public class QysTask {
12 @Autowired 12 @Autowired
13 private EciService eciService; 13 private EciService eciService;
14 14
15 @Scheduled(cron="0 0/5 * * * ?") 15 @Scheduled(cron="0 0/1 * * * ?")
16 public void accessCreateContract() { 16 public void accessCreateContract() {
17 System.out.println("===========创建合同定时任务进来了========="); 17 System.out.println("===========创建合同定时任务进来了=========");
18 eciService.accessCreateContract(); 18 eciService.accessCreateContract();
......
...@@ -16,14 +16,14 @@ public class ZhjTask { ...@@ -16,14 +16,14 @@ public class ZhjTask {
16 private ZhjDatasSynService zhjDatasSynService; 16 private ZhjDatasSynService zhjDatasSynService;
17 17
18 18
19 //@Scheduled(cron="0 0 21 * * ? ") 19 @Scheduled(cron="0 0 21 * * ? ")
20 public void execute() { 20 public void execute() {
21 System.out.println("===========每天晚上九点定时任务进来了========="); 21 System.out.println("===========每天晚上九点定时任务进来了=========");
22 zhjDatasSynService.send_bdcYwInfo(); 22 zhjDatasSynService.send_bdcYwInfo();
23 System.out.println("===========每天晚上九点定时任务走了========="); 23 System.out.println("===========每天晚上九点定时任务走了=========");
24 } 24 }
25 25
26 //@Scheduled(cron="0 0 21 ? * 2") 26 @Scheduled(cron="0 0 20 15 * ? ")
27 public void executeQyInfo() { 27 public void executeQyInfo() {
28 System.out.println("===========每天晚上九点定时任务进来了========="); 28 System.out.println("===========每天晚上九点定时任务进来了=========");
29 zhjDatasSynService.synQyInfo(); 29 zhjDatasSynService.synQyInfo();
......
...@@ -59,6 +59,8 @@ public interface RegBusBdcqzsdjxxMapper extends BaseMapper<RegBusBdcqzsdjxxDo> { ...@@ -59,6 +59,8 @@ public interface RegBusBdcqzsdjxxMapper extends BaseMapper<RegBusBdcqzsdjxxDo> {
59 59
60 public void updateBdcqzsjbxxInfo(String id); 60 public void updateBdcqzsjbxxInfo(String id);
61 61
62 public void updateBdcqzsjbxxInfoByYwh(String ywh);
63
62 public Map getQlrInfoByYwh(String ywh); 64 public Map getQlrInfoByYwh(String ywh);
63 65
64 public String getQlrInfoByYwhAndqlr(@Param("ywh") String ywh, @Param("qlrmc") String qlrmc); 66 public String getQlrInfoByYwhAndqlr(@Param("ywh") String ywh, @Param("qlrmc") String qlrmc);
......
...@@ -20,6 +20,7 @@ spring: ...@@ -20,6 +20,7 @@ spring:
20 primary: master 20 primary: master
21 datasource: 21 datasource:
22 master: 22 master:
23 #url: jdbc:oracle:thin:@172.16.56.4:1521:ODM
23 url: jdbc:oracle:thin:@172.16.56.21:1521:orcl 24 url: jdbc:oracle:thin:@172.16.56.21:1521:orcl
24 driver-class-name: oracle.jdbc.driver.OracleDriver 25 driver-class-name: oracle.jdbc.driver.OracleDriver
25 username: regs 26 username: regs
...@@ -54,11 +55,12 @@ mybatis-plus: ...@@ -54,11 +55,12 @@ mybatis-plus:
54 call-setters-on-nulls: true 55 call-setters-on-nulls: true
55 log-impl: org.apache.ibatis.logging.stdout.StdOutImpl 56 log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
56 app: 57 app:
57 hostUrl: http://172.16.56.41:9182 58 hostUrl: http://172.16.56.60:9182
58 bdcdjzmlc: 2890537670326468622 59 bdcdjzmlc: 2905681381004489569
59 bdcqzslc: 2890537800123400234 60 bdcqzslc: 2905684509636506505
60 AppToken: OAduCx5qJD 61 AppToken: lv2M681jcM
61 AppSecret: DifsZNwDnamuRh9jS0gSOTJFvmmKtT 62 AppSecret: mZWAKA2p7vvnTZMNuUKRHaCL3LTgHA
63 areacode: 610702
62 64
63 65
64 management: 66 management:
......
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
38 <select id="getElecLicenseInfo" resultType="com.pashanhoo.qys.entity.ElecLicenseInfoDo"> 38 <select id="getElecLicenseInfo" resultType="com.pashanhoo.qys.entity.ElecLicenseInfoDo">
39 select * 39 select *
40 from ELEC_LICENSE_INFO 40 from ELEC_LICENSE_INFO
41 where ywh = #{ywh} and zsbs=#{zsbs} and zsbh=#{zsbh} and zjh=#{zjh} 41 where ywh = #{ywh} and zsbs=#{zsbs} and zsbh=#{zsbh} and zjh=#{zjh}
42 </select> 42 </select>
43 43
44 44
......
...@@ -4,6 +4,9 @@ ...@@ -4,6 +4,9 @@
4 <update id="updateBdcqzsjbxxInfo"> 4 <update id="updateBdcqzsjbxxInfo">
5 update reg_bus_bdcqzsdjxx set ISCJDZZZ='1' where ID=#{id} 5 update reg_bus_bdcqzsdjxx set ISCJDZZZ='1' where ID=#{id}
6 </update> 6 </update>
7 <update id="updateBdcqzsjbxxInfoByYwh">
8 update reg_bus_bdcqzsdjxx set ISCJDZZZ='1' where ywh=#{ywh}
9 </update>
7 10
8 <select id="getZsdjInfoList" resultType="com.pashanhoo.zhj.entity.RegBusBdcqzsdjxxDo" parameterType="com.pashanhoo.zhj.entity.SynZhjInfoDo"> 11 <select id="getZsdjInfoList" resultType="com.pashanhoo.zhj.entity.RegBusBdcqzsdjxxDo" parameterType="com.pashanhoo.zhj.entity.SynZhjInfoDo">
9 select * from reg_bus_bdcqzsdjxx where 12 select * from reg_bus_bdcqzsdjxx where
...@@ -94,66 +97,67 @@ ...@@ -94,66 +97,67 @@
94 from dual 97 from dual
95 </select> 98 </select>
96 <select id="getBdcqzsjbxxInfo" resultType="java.util.Map"> 99 <select id="getBdcqzsjbxxInfo" resultType="java.util.Map">
97 select c.id, 100 select * from (
98 c.ywh, 101 select c.id,
99 c.bdcdyh, 102 c.ywh,
100 c.bdcqzh, 103 c.bdcdyh,
101 c.create_date, 104 c.bdcqzh,
102 c.qlrmc, 105 c.create_date,
103 c.gyqk, 106 c.qlrmc,
104 c.zl, 107 c.gyqk,
105 (select label from sys_dict c where type ='reg_bus_qllx' and value= c.qllx and del_flag='0') qllx, 108 c.zl,
106 c.djlx, 109 (select label from sys_dict c where type ='reg_bus_qllx' and value= c.qllx and del_flag='0') qllx,
107 c.qlxz, 110 c.djlx,
108 c.qt, 111 c.qlxz,
109 c.yt, 112 c.qt,
110 c.mj, 113 c.yt,
111 c.syqx, 114 c.mj,
112 c.qlqtzk, 115 c.syqx,
113 c.fj, 116 c.qlqtzk,
114 c.rights, 117 c.fj,
115 REPLACE(c.dbsj,'-','') as djsj, 118 c.rights,
116 to_char(to_date(c.dbsj, 'yyyy-mm-dd'),'YYYY') as y, 119 REPLACE(c.dbsj,'-','') as djsj,
117 to_char(to_date(c.dbsj, 'yyyy-mm-dd'),'MM') as m, 120 to_char(to_date(c.dbsj, 'yyyy-mm-dd'),'YYYY') as y,
118 to_char(to_date(c.dbsj, 'yyyy-mm-dd'),'dd') as d, 121 to_char(to_date(c.dbsj, 'yyyy-mm-dd'),'MM') as m,
119 c.bdcqzbh as bh 122 to_char(to_date(c.dbsj, 'yyyy-mm-dd'),'dd') as d,
120 from reg_bus_bdcqzsdjxx c 123 c.bdcqzbh as bh,row_number() over (partition by ywh,bdcqzbh order by ywh desc) rn
121 where c.del_flag = '0' 124 from reg_bus_bdcqzsdjxx c
122 and c.isxydzzz = '1' 125 where c.del_flag = '0'
123 and c.iscjdzzz = '0' 126 and c.isxydzzz = '1'
124 and dbsj is not null 127 and c.iscjdzzz = '0'
128 and dbsj is not null ) where rn=1
125 </select> 129 </select>
126 130
127 <select id="getBdcqzsjbxxInfoByYwh" resultType="java.util.Map"> 131 <select id="getBdcqzsjbxxInfoByYwh" resultType="java.util.Map">
128 select c.id, 132 select c.id,
129 c.ywh, 133 c.ywh,
130 c.bdcdyh, 134 c.bdcdyh,
131 c.bdcqzh, 135 c.bdcqzh,
132 c.create_date, 136 c.create_date,
133 c.qlrmc, 137 c.qlrmc,
134 c.gyqk, 138 c.gyqk,
135 c.zl, 139 c.zl,
136 (select label from sys_dict c where type ='reg_bus_qllx' and value= c.qllx and del_flag='0') qllx, 140 (select label from sys_dict c where type ='reg_bus_qllx' and value= c.qllx and del_flag='0') qllx,
137 c.djlx, 141 c.djlx,
138 c.qlxz, 142 c.qlxz,
139 c.qt, 143 c.qt,
140 c.yt, 144 c.yt,
141 c.mj, 145 c.mj,
142 c.syqx, 146 c.syqx,
143 c.qlqtzk, 147 c.qlqtzk,
144 c.fj, 148 c.fj,
145 c.rights, 149 c.rights,
146 REPLACE(c.dbsj,'-','') as djsj, 150 REPLACE(c.dbsj,'-','') as djsj,
147 to_char(to_date(c.dbsj, 'yyyy-mm-dd'),'YYYY') as y, 151 to_char(to_date(c.dbsj, 'yyyy-mm-dd'),'YYYY') as y,
148 to_char(to_date(c.dbsj, 'yyyy-mm-dd'),'MM') as m, 152 to_char(to_date(c.dbsj, 'yyyy-mm-dd'),'MM') as m,
149 to_char(to_date(c.dbsj, 'yyyy-mm-dd'),'dd') as d, 153 to_char(to_date(c.dbsj, 'yyyy-mm-dd'),'dd') as d,
150 c.bdcqzbh as bh 154 c.bdcqzbh as bh
151 from reg_bus_bdcqzsdjxx c 155 from reg_bus_bdcqzsdjxx c
152 where c.del_flag = '0' 156 where c.del_flag = '0'
153 and c.isxydzzz = '1' 157 and c.isxydzzz = '1'
154 and c.iscjdzzz = '0' 158 and c.iscjdzzz = '0'
155 and c.ywh=#{ywh} 159 and c.ywh =#{ywh}
156 and dbsj is not null 160 and c.dbsj is not null
157 </select> 161 </select>
158 <select id="getQlrInfoByYwh" resultType="java.util.Map"> 162 <select id="getQlrInfoByYwh" resultType="java.util.Map">
159 select wm_concat(qlrmc) as qlrmc,wm_concat(zjh) as zjh from reg_bus_qlr c where ywh =#{ywh} and del_flag='0' and qszt='1' order by sxh 163 select wm_concat(qlrmc) as qlrmc,wm_concat(zjh) as zjh from reg_bus_qlr c where ywh =#{ywh} and del_flag='0' and qszt='1' order by sxh
......