潘钊 / bsth_control · Commits

Commit ba9b2765b7a3caabd2e6b70d33dba4a89eda5885

Authored by yiming
2 parents b208a3dc d5d3abcf
build: skipped

Merge remote-tracking branch 'origin/jdsfx' into jdsfx 

# Conflicts:
#	src/main/java/com/bsth/data/jddzx/JDInterface.java
#	src/main/java/com/bsth/filter/BaseFilter.java
Inline Side-by-side
Showing 2 changed files with 28 additions and 1 deletions
src/main/java/com/bsth/data/jddzx/JDInterface.java
  View file @ba9b276
... ... @@ -103,6 +103,7 @@ public class JDInterface {
103 103 //人员投入
104 104 int jhrytl=culateService.culateJhry(schList,"");
105 105 int sjrytl=culateService.culateSjry(schList,"");
  106 +<<<<<<< HEAD
106 107 BigDecimal rytlbfb=BigDecimal.valueOf(100);
107 108 if(jhrytl>0){
108 109 rytlbfb=BigDecimal.valueOf((double)sjrytl/jhrytl*100);
... ... @@ -112,6 +113,13 @@ public class JDInterface {
112 113 rytl.put("sjrytl",sjrytl);
113 114 rytl.put("rytl",rytlbfb.setScale(2,BigDecimal.ROUND_HALF_UP));
114 115 data.put("rytl",rytl);
  116 +=======
  117 + BigDecimal rytl=BigDecimal.valueOf(100);
  118 + if(jhrytl>0){
  119 + rytl=BigDecimal.valueOf((double)sjrytl/jhrytl*100);
  120 + }
  121 + data.put("rytl",rytl.setScale(2,BigDecimal.ROUND_HALF_UP));
  122 +>>>>>>> origin/jdsfx
115 123  
116 124 //车辆投入
117 125 Map<String,Object> cltl=new HashMap<>();
... ... @@ -121,8 +129,11 @@ public class JDInterface {
121 129 if(jh_z>0){
122 130 cltl_z=BigDecimal.valueOf((double)sj_z/jh_z*100);
123 131 }
  132 +<<<<<<< HEAD
124 133 cltl.put("jh_z",jh_z);
125 134 cltl.put("sj_z",sj_z);
  135 +=======
  136 +>>>>>>> origin/jdsfx
126 137 cltl.put("cltl_z",cltl_z.setScale(2,BigDecimal.ROUND_HALF_UP));
127 138  
128 139 int jh_w=culateService.culateJhcl(schList,"wgf");
... ... @@ -131,8 +142,11 @@ public class JDInterface {
131 142 if(jh_w>0){
132 143 cltl_w=BigDecimal.valueOf((double)sj_w/jh_w*100);
133 144 }
  145 +<<<<<<< HEAD
134 146 cltl.put("jh_w",jh_w);
135 147 cltl.put("sj_w",sj_w);
  148 +=======
  149 +>>>>>>> origin/jdsfx
136 150 cltl.put("cltl_w",cltl_w.setScale(2,BigDecimal.ROUND_HALF_UP));
137 151  
138 152 int jh_q=culateService.culateJhcl(schList,"");
... ... @@ -141,8 +155,11 @@ public class JDInterface {
141 155 if(jh_q>0){
142 156 cltl_q=BigDecimal.valueOf((double)sj_q/jh_q*100);
143 157 }
  158 +<<<<<<< HEAD
144 159 cltl.put("jh_q",jh_q);
145 160 cltl.put("sj_q",sj_q);
  161 +=======
  162 +>>>>>>> origin/jdsfx
146 163 cltl.put("cltl_q",cltl_q.setScale(2,BigDecimal.ROUND_HALF_UP));
147 164  
148 165 data.put("cltl",cltl);
... ... @@ -155,8 +172,11 @@ public class JDInterface {
155 172 if(jhbctl_z>0){
156 173 bctl_z=BigDecimal.valueOf((double)sjbctl_z/jhbctl_z*100);
157 174 }
  175 +<<<<<<< HEAD
158 176 bctl.put("jhbctl_z",jhbctl_z);
159 177 bctl.put("sjbctl_z",sjbctl_z);
  178 +=======
  179 +>>>>>>> origin/jdsfx
160 180 bctl.put("bctl_z",bctl_z.setScale(2,BigDecimal.ROUND_HALF_UP));
161 181  
162 182 int jhbctl_w=culateService.culateJhbc(schList,"wgf");
... ... @@ -165,8 +185,11 @@ public class JDInterface {
165 185 if(jhbctl_w>0){
166 186 bctl_w=BigDecimal.valueOf((double)sjbctl_w/jhbctl_w*100);
167 187 }
  188 +<<<<<<< HEAD
168 189 bctl.put("jhbctl_w",jhbctl_w);
169 190 bctl.put("sjbctl_w",sjbctl_w);
  191 +=======
  192 +>>>>>>> origin/jdsfx
170 193 bctl.put("bctl_w",bctl_w.setScale(2,BigDecimal.ROUND_HALF_UP));
171 194  
172 195 int jhbctl_q=culateService.culateJhbc(schList,"");
... ... @@ -175,8 +198,11 @@ public class JDInterface {
175 198 if(jhbctl_q>0){
176 199 bctl_q=BigDecimal.valueOf((double)sjbctl_q/jhbctl_q*100);
177 200 }
  201 +<<<<<<< HEAD
178 202 bctl.put("jhbctl_q",jhbctl_q);
179 203 bctl.put("sjbctl_q",sjbctl_q);
  204 +=======
  205 +>>>>>>> origin/jdsfx
180 206 bctl.put("bctl_q",bctl_q.setScale(2,BigDecimal.ROUND_HALF_UP));
181 207  
182 208 data.put("bctl",bctl);
... ...
src/main/java/com/bsth/filter/BaseFilter.java
  View file @ba9b276
... ... @@ -20,7 +20,8 @@ public abstract class BaseFilter implements Filter {
20 20 Constants.ASSETS_URL, Constants.FAVICON_URL, Constants.LOGIN, Constants.LOGIN_FAILURE,
21 21 Constants.UPSTREAM_URL, Constants.XD_CHILD_PAGES, Constants.XD_REAL_GPS, Constants.UP_RFID_URL,
22 22 Constants.STATION_AND_SECTION_COUNT, Constants.ACTUATOR_MANAGEMENT_HEALTH, Constants.VEHICLE_DATA_SYNC_URL,
23   - Constants.FILE_AUTH,Constants.OUT_URL,Constants.NOTICE_URL,Constants.DIFYINTER_URL,Constants.PROFILE,Constants.JDDZX_URL};
  23 + Constants.FILE_AUTH,Constants.OUT_URL,Constants.NOTICE_URL,Constants.DIFYINTER_URL,Constants.PROFILE,
  24 + Constants.JDDZX_URL};
24 25  
25 26 @Override
26 27 public void destroy() {
... ...