Browse Source

电度大屏日报月报

hfxc226 2 years ago
parent
commit
f906ae3995

+ 1 - 1
platform-rest/src/main/java/com/platform/rest/controller/wechat/WechatController.java

@@ -45,7 +45,7 @@ public class WechatController {
 
 
     // 微信回调url
     // 微信回调url
     //private static String WECHAT_REDIRECT_URL = Global.getValue("wechat_url") + "/wechat/oauth.htm";
     //private static String WECHAT_REDIRECT_URL = Global.getValue("wechat_url") + "/wechat/oauth.htm";
-    // dev环境配置测试演示的pc地址,需要在微信公众号里面认证过的api地址
+    // dev环境配置测试演示的pc地址,需要在微信公众号里面认证过的api地址,并将实际后台api的地址ip配置到供公众号的白名单中
     private static String WECHAT_REDIRECT_URL = "http://sb.pc.litian2017.com/api/wechat/oauth";
     private static String WECHAT_REDIRECT_URL = "http://sb.pc.litian2017.com/api/wechat/oauth";
     private final SysUserService sysUserService;
     private final SysUserService sysUserService;
 
 

+ 5 - 4
platform-service/src/main/java/com/platform/service/big/impl/BigScreenSbInfoServiceImpl.java

@@ -88,6 +88,7 @@ import tk.mybatis.mapper.weekend.Weekend;
 import tk.mybatis.mapper.weekend.WeekendCriteria;
 import tk.mybatis.mapper.weekend.WeekendCriteria;
 
 
 import java.math.BigDecimal;
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.time.LocalDate;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalDateTime;
 import java.util.*;
 import java.util.*;
@@ -225,8 +226,8 @@ public class BigScreenSbInfoServiceImpl extends BaseServiceImpl<SbInfoMapper, Sb
                             }
                             }
                         }
                         }
                     }
                     }
-                    dictJsonObject.put("positive", positiveTotal);
+                    dictJsonObject.put("positive", positiveTotal.divide(BigDecimal.valueOf(100),2, RoundingMode.HALF_UP).doubleValue());
-                    dictJsonObject.put("negative", negativeTotal);
+                    dictJsonObject.put("negative", negativeTotal.divide(BigDecimal.valueOf(100),2, RoundingMode.HALF_UP).doubleValue());
                     lineArray.add(dictJsonObject);
                     lineArray.add(dictJsonObject);
                 }
                 }
                 jsonObject.put("lines", lineArray);
                 jsonObject.put("lines", lineArray);
@@ -258,8 +259,8 @@ public class BigScreenSbInfoServiceImpl extends BaseServiceImpl<SbInfoMapper, Sb
                             }
                             }
                         }
                         }
                     }
                     }
-                    dictJsonObject.put("positive", positiveTotal);
+                    dictJsonObject.put("positive", positiveTotal.divide(BigDecimal.valueOf(100),2, RoundingMode.HALF_UP).doubleValue());
-                    dictJsonObject.put("negative", negativeTotal);
+                    dictJsonObject.put("negative", negativeTotal.divide(BigDecimal.valueOf(100),2, RoundingMode.HALF_UP).doubleValue());
                     lineArray.add(dictJsonObject);
                     lineArray.add(dictJsonObject);
                 }
                 }
                 jsonObject.put("lines", lineArray);
                 jsonObject.put("lines", lineArray);