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

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
yiming
2 parents b208a3dc d5d3abcf
Showing 2 changed files with 28 additions and 1 deletions
src/main/java/com/bsth/data/jddzx/JDInterface.java
src/main/java/com/bsth/filter/BaseFilter.java
@@ -103,6 +103,7 @@ public class JDInterface {
             //人员投入
             int jhrytl=culateService.culateJhry(schList,"");
             int sjrytl=culateService.culateSjry(schList,"");
+<<<<<<< HEAD
             BigDecimal rytlbfb=BigDecimal.valueOf(100);
             if(jhrytl>0){
                 rytlbfb=BigDecimal.valueOf((double)sjrytl/jhrytl*100);
@@ -112,6 +113,13 @@ public class JDInterface {
             rytl.put("sjrytl",sjrytl);
             rytl.put("rytl",rytlbfb.setScale(2,BigDecimal.ROUND_HALF_UP));
             data.put("rytl",rytl);
+=======
+            BigDecimal rytl=BigDecimal.valueOf(100);
+            if(jhrytl>0){
+                rytl=BigDecimal.valueOf((double)sjrytl/jhrytl*100);
+            }
+            data.put("rytl",rytl.setScale(2,BigDecimal.ROUND_HALF_UP));
+>>>>>>> origin/jdsfx
             //车辆投入
             Map<String,Object> cltl=new HashMap<>();
@@ -121,8 +129,11 @@ public class JDInterface {
             if(jh_z>0){
                 cltl_z=BigDecimal.valueOf((double)sj_z/jh_z*100);
             }
+<<<<<<< HEAD
             cltl.put("jh_z",jh_z);
             cltl.put("sj_z",sj_z);
+=======
+>>>>>>> origin/jdsfx
             cltl.put("cltl_z",cltl_z.setScale(2,BigDecimal.ROUND_HALF_UP));
             int jh_w=culateService.culateJhcl(schList,"wgf");
@@ -131,8 +142,11 @@ public class JDInterface {
             if(jh_w>0){
                 cltl_w=BigDecimal.valueOf((double)sj_w/jh_w*100);
             }
+<<<<<<< HEAD
             cltl.put("jh_w",jh_w);
             cltl.put("sj_w",sj_w);
+=======
+>>>>>>> origin/jdsfx
             cltl.put("cltl_w",cltl_w.setScale(2,BigDecimal.ROUND_HALF_UP));
             int jh_q=culateService.culateJhcl(schList,"");
@@ -141,8 +155,11 @@ public class JDInterface {
             if(jh_q>0){
                 cltl_q=BigDecimal.valueOf((double)sj_q/jh_q*100);
             }
+<<<<<<< HEAD
             cltl.put("jh_q",jh_q);
             cltl.put("sj_q",sj_q);
+=======
+>>>>>>> origin/jdsfx
             cltl.put("cltl_q",cltl_q.setScale(2,BigDecimal.ROUND_HALF_UP));
             data.put("cltl",cltl);
@@ -155,8 +172,11 @@ public class JDInterface {
             if(jhbctl_z>0){
                 bctl_z=BigDecimal.valueOf((double)sjbctl_z/jhbctl_z*100);
             }
+<<<<<<< HEAD
             bctl.put("jhbctl_z",jhbctl_z);
             bctl.put("sjbctl_z",sjbctl_z);
+=======
+>>>>>>> origin/jdsfx
             bctl.put("bctl_z",bctl_z.setScale(2,BigDecimal.ROUND_HALF_UP));
             int jhbctl_w=culateService.culateJhbc(schList,"wgf");
@@ -165,8 +185,11 @@ public class JDInterface {
             if(jhbctl_w>0){
                 bctl_w=BigDecimal.valueOf((double)sjbctl_w/jhbctl_w*100);
             }
+<<<<<<< HEAD
             bctl.put("jhbctl_w",jhbctl_w);
             bctl.put("sjbctl_w",sjbctl_w);
+=======
+>>>>>>> origin/jdsfx
             bctl.put("bctl_w",bctl_w.setScale(2,BigDecimal.ROUND_HALF_UP));
             int jhbctl_q=culateService.culateJhbc(schList,"");
@@ -175,8 +198,11 @@ public class JDInterface {
             if(jhbctl_q>0){
                 bctl_q=BigDecimal.valueOf((double)sjbctl_q/jhbctl_q*100);
             }
+<<<<<<< HEAD
             bctl.put("jhbctl_q",jhbctl_q);
             bctl.put("sjbctl_q",sjbctl_q);
+=======
+>>>>>>> origin/jdsfx
             bctl.put("bctl_q",bctl_q.setScale(2,BigDecimal.ROUND_HALF_UP));
             data.put("bctl",bctl);
@@ -20,7 +20,8 @@ public abstract class BaseFilter implements Filter {
 			Constants.ASSETS_URL, Constants.FAVICON_URL, Constants.LOGIN, Constants.LOGIN_FAILURE,
 			Constants.UPSTREAM_URL, Constants.XD_CHILD_PAGES, Constants.XD_REAL_GPS, Constants.UP_RFID_URL,
 			Constants.STATION_AND_SECTION_COUNT, Constants.ACTUATOR_MANAGEMENT_HEALTH, Constants.VEHICLE_DATA_SYNC_URL,
-			Constants.FILE_AUTH,Constants.OUT_URL,Constants.NOTICE_URL,Constants.DIFYINTER_URL,Constants.PROFILE,Constants.JDDZX_URL};
+			Constants.FILE_AUTH,Constants.OUT_URL,Constants.NOTICE_URL,Constants.DIFYINTER_URL,Constants.PROFILE,
+			Constants.JDDZX_URL};
 	@Override
 	public void destroy() {