提交大屏监控 人大金仓适配及免登录问题

amos-boot-system-jxiop/amos-boot-module-jxiop-bigscreen-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/MonitorFanIdxController.java

@@ -490,7 +490,7 @@ public class MonitorFanIdxController extends BaseController {
         SimpleDateFormat myFmt2 = new SimpleDateFormat("yyyy");
         String monthy = myFmt2.format(new Date());
         QueryWrapper<StationPlan> wrapper = new QueryWrapper<>();
-        wrapper.select("sum(value) as value ,monthly");
+        wrapper.select("sum(value) as `value` ,monthly");
         wrapper.eq("year", monthy);
         wrapper.eq("station_basic_id", stationBasic.getSequenceNbr());
         wrapper.groupBy("monthly");

amos-boot-system-jxiop/amos-boot-module-jxiop-bigscreen-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/OAuthResource.java

@@ -3,7 +3,6 @@ package com.yeejoin.amos.boot.module.jxiop.biz.controller;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.IdPasswordAuthModel;
-import com.yeejoin.amos.feign.privilege.util.DesUtil;
 import io.swagger.annotations.Api;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -42,7 +41,7 @@ public class OAuthResource {
     public static final String SECRETKEY = "qaz";
     private final static String AUTHORIZE = "http://%s/authorize?redirect_uri=%s";
     private final static String AUTOLOGIN = "http://%s/autologin?token=%s&userId=%s&redirectURI=%s";
-    private final static String BIGSCREEN = "/vizagfun/jepc?appId=jepc1&top=monitor&bottom=ovarall";
+    private final static String BIGSCREEN = "/vizagfun/jepc?appId=jepc1&token=%s&top=monitor&bottom=ovarall";
     @Value("${appKey:AMOS_ADMIN}")
     private String APP_KEY;
     @Value("${product:AMOS-WEB-ADMIN}")
@@ -77,7 +76,7 @@ public class OAuthResource {
         }
         String userId = (String) feignClientResult.getResult().get("userId");
         String amosToken = (String) feignClientResult.getResult().get("token");
-        redirectUrl = String.format(AUTOLOGIN, host, amosToken, userId, getRedirectURI(BIGSCREEN));
+        redirectUrl = String.format(AUTOLOGIN, host, amosToken, userId, getRedirectURI(String.format(BIGSCREEN,amosToken)));
         log.info("重定向访问地址：{}", redirectUrl);
         response.sendRedirect(redirectUrl);
     }

amos-boot-system-jxiop/amos-boot-module-jxiop-bigscreen-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/LargeScreenImpl.java

@@ -857,7 +857,7 @@ public class LargeScreenImpl {
 		// 计划完成量
 		Map<String, Double> mapwc = new HashMap<>();
 		QueryWrapper<StationPlan> wrapper = new QueryWrapper<>();
-		wrapper.select(" monthly ,sum(value) value ");
+		wrapper.select(" monthly ,sum(value) `value` ");
 		wrapper.eq("year", monthy);
 		wrapper.groupBy("monthly");
 		List<Map<String, Object>> list1 = StationPlanMapper.selectMaps(wrapper);
@@ -943,7 +943,7 @@ public class LargeScreenImpl {
 		// 计划完成量
 		Map<String, Double> mapwc = new HashMap<>();
 		QueryWrapper<StationPlan> wrapper = new QueryWrapper<>();
-		wrapper.select(" monthly ,sum(value) value ");
+		wrapper.select(" monthly ,sum(value) `value` ");
 		wrapper.eq("year", monthy);
 		wrapper.in("station_basic_id", idsStationId);
 		wrapper.groupBy("monthly");