diff --git a/src/main/java/com/lp/cache/ProCache.java b/src/main/java/com/lp/cache/ProCache.java index f359942..628ca9e 100644 --- a/src/main/java/com/lp/cache/ProCache.java +++ b/src/main/java/com/lp/cache/ProCache.java @@ -100,7 +100,7 @@ public class ProCache extends ResultMapUtils { ProConfig.EZUIZ_APPKEY = map.get("ezuiz.app.key"); ProConfig.EZUIZ_APPSECRET = map.get("ezuiz.app.secret"); - + //配置加载完成后初始化token EzuizService.refreshToken(); } diff --git a/src/main/java/com/lp/cfg/ProConfig.java b/src/main/java/com/lp/cfg/ProConfig.java index fccd984..b290ffe 100644 --- a/src/main/java/com/lp/cfg/ProConfig.java +++ b/src/main/java/com/lp/cfg/ProConfig.java @@ -41,13 +41,14 @@ public class ProConfig { public static String EZUIZ_APPKEY = ""; public static String EZUIZ_APPSECRET = ""; - + public static String BD_MAP_AK = ""; + public final static String PAGE_SIZE = PropertiesUtil.getProperty("page.size"); public final static String DEV_MODE = PropertiesUtil.getProperty("dev.mode"); public final static String BD_API_GEOCODER = PropertiesUtil.getProperty("bd.api.geocoder"); - + // public final static String SENSOR_ICON_SELF_FLAG = PropertiesUtil.getProperty("sensor.icon.self.flag") ; public static class Mail{ diff --git a/src/main/java/com/lp/controller/FileInfoController.java b/src/main/java/com/lp/controller/FileInfoController.java index c31743c..c5f1301 100644 --- a/src/main/java/com/lp/controller/FileInfoController.java +++ b/src/main/java/com/lp/controller/FileInfoController.java @@ -175,8 +175,10 @@ public class FileInfoController extends BaseController { // 转存文件 file.transferTo(new File(filePath)); // 返回所有值 + LogUtil4j.debugLogger.debug("save file: ({})", filePath); putData(resultMap, relativeFilePath+"/"+newFileName) ; - } catch (Exception e) { + } catch (Exception e) { + LogUtil.errorLog(e); e.printStackTrace(); } } diff --git a/src/main/java/com/lp/controller/SysConfigInfoController.java b/src/main/java/com/lp/controller/SysConfigInfoController.java index 462bbc5..e206f2e 100644 --- a/src/main/java/com/lp/controller/SysConfigInfoController.java +++ b/src/main/java/com/lp/controller/SysConfigInfoController.java @@ -1,26 +1,20 @@ package com.lp.controller; -import java.util.Map; - -import javax.servlet.http.HttpServletResponse; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestHeader; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.servlet.ModelAndView; - import com.lp.bo.SysConfigInfoBO; import com.lp.cache.ProCache; import com.lp.common.Code; import com.lp.common.Constants; import com.lp.common.RequestURL; +import com.lp.util.LogUtil4j; import com.lp.util.ObjectUtil; import com.lp.util.ResultMapUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; + +import javax.servlet.http.HttpServletResponse; +import java.util.Map; @Controller @@ -66,6 +60,7 @@ public class SysConfigInfoController extends BaseController { Map resultMap = getResultMap(); try { resultMap = service.selectOne("SysConfigInfo.selectOne", new SysConfigInfoBO(id)); + LogUtil4j.debugLogger.debug("SysConfigInfo.selectOne with ({}), ret: ({})", id, resultMap); } catch (Exception e) { exception(e, resultMap, id); } @@ -82,6 +77,7 @@ public class SysConfigInfoController extends BaseController { SysConfigInfoBO info = new SysConfigInfoBO(); info.setName(key); resultMap = service.selectOne("SysConfigInfo.selectOneByCondition", info); + LogUtil4j.debugLogger.debug("SysConfigInfo.selectOneByCondition with ({}), ret: ({})", key, resultMap); } catch (Exception e) { exception(e, resultMap, key); } diff --git a/src/main/java/com/lp/controller/UserController.java b/src/main/java/com/lp/controller/UserController.java index 637becc..3686933 100644 --- a/src/main/java/com/lp/controller/UserController.java +++ b/src/main/java/com/lp/controller/UserController.java @@ -390,7 +390,7 @@ public class UserController extends BaseController { } catch (Exception e) { super.exception(e, resultMap); } - LogUtil4j.debugLogger.debug("login response with name: ({})---{}", user.getName(), resultMap); + LogUtil4j.debugLogger.debug("login response with name: ({}-{})---{}{}", user.getName(), user.getUser_key(), user.getType(), resultMap); return getModelAndView(resp, resultMap); } diff --git a/src/main/java/com/lp/controller/iot/IotNodeInfoController.java b/src/main/java/com/lp/controller/iot/IotNodeInfoController.java index 0d9a3ae..b5bba29 100644 --- a/src/main/java/com/lp/controller/iot/IotNodeInfoController.java +++ b/src/main/java/com/lp/controller/iot/IotNodeInfoController.java @@ -56,9 +56,9 @@ public class IotNodeInfoController extends BaseController { Map resultMap = getResultMap(); try { UserInfoBO user = getUserInfoByUserKey(userKey); -// if(user.getType() != Code.UserType.SUPER ){ + if(user.getType() != Code.UserType.SUPER + 0 ){ obj.setUser_id(user.getId()); -// } + } resultMap = service.selectPageList("IotNodeInfo.selectPage",getPageBean(paged,pageSize), obj); } catch (Exception e) { exception(e,resultMap, obj); @@ -80,7 +80,9 @@ public class IotNodeInfoController extends BaseController { Map resultMap = getResultMap(); try { UserInfoBO user = getUserInfoByUserKey(userKey); - obj.setUser_id(user.getId()); + if(user.getType() != Code.UserType.SUPER + 0 ){ + obj.setUser_id(user.getId()); + } resultMap = service.selectList("IotNodeInfo.selectStatisticNodeInfo", obj) ; } catch (Exception e) { exception(e,resultMap, obj); @@ -347,10 +349,13 @@ public class IotNodeInfoController extends BaseController { @RequestHeader(value = ResultMapUtils.USER_KEY, required = true) String userKey , @RequestBody IotNodeInfoBO obj) { Map resultMap = getResultMap(); + LogUtil4j.debugLogger.debug("request with userKey: ({})", userKey); try { UserInfoBO user = getUserInfoByUserKey(userKey); - obj.setUser_id(user.getId()); - resultMap = service.selectList("IotNodeInfo.selectNodeSensorList", obj); + if(user.getType() != Code.UserType.SUPER + 0){ + obj.setUser_id(user.getId()); + } + resultMap = service.selectList("IotNodeInfo.selectNodeSensorList", obj); } catch (Exception e) { exception(e,resultMap, obj); @@ -371,7 +376,9 @@ public class IotNodeInfoController extends BaseController { try { UserInfoBO user = getUserInfoByUserKey(userKey); - obj.setUser_id(user.getId()); + if(user.getType() != Code.UserType.SUPER + 0){ + obj.setUser_id(user.getId()); + } LogUtil4j.debugLogger.debug("selectNodeSensorListPages is called with {}", obj); resultMap = service.selectPageList("IotNodeInfo.selectNodeSensorList",getPageBean(paged,pageSize), obj); } catch (Exception e) { diff --git a/src/main/java/com/lp/controller/iot/IotSceneInfoController.java b/src/main/java/com/lp/controller/iot/IotSceneInfoController.java index 637376a..e988e8f 100644 --- a/src/main/java/com/lp/controller/iot/IotSceneInfoController.java +++ b/src/main/java/com/lp/controller/iot/IotSceneInfoController.java @@ -48,9 +48,9 @@ public class IotSceneInfoController extends BaseController { Map resultMap = getResultMap(); try { UserInfoBO user = getUserInfoByUserKey(userKey); -// if(user.getType() != Code.UserType.SUPER ){ + if(user.getType() != Code.UserType.SUPER + 0 ){ obj.setUser_id(user.getId()); -// } + } resultMap = service.selectPageList("IotSceneInfo.select",getPageBean(paged,pageSize), obj); } catch (Exception e) { exception(e,resultMap, obj); diff --git a/src/main/java/com/lp/controller/iot/IotSensorInfoController.java b/src/main/java/com/lp/controller/iot/IotSensorInfoController.java index 375284b..09ec570 100644 --- a/src/main/java/com/lp/controller/iot/IotSensorInfoController.java +++ b/src/main/java/com/lp/controller/iot/IotSensorInfoController.java @@ -434,8 +434,10 @@ public class IotSensorInfoController extends BaseController { Map resultMap = getResultMap(); try { UserInfoBO user = getUserInfoByUserKey(userKey); - obj.setUser_id(user.getId()); - resultMap = service.selectList("IotSensorInfo.selectLonLatSensorInfo", obj); + if(user.getType() != Code.UserType.SUPER + 0){ + obj.setUser_id(user.getId()); + } + resultMap = service.selectList("IotSensorInfo.selectLonLatSensorInfo", obj); } catch (Exception e) { exception(e,resultMap, obj); } diff --git a/src/main/java/com/lp/controller/iot/IotVisualDisplayInfoController.java b/src/main/java/com/lp/controller/iot/IotVisualDisplayInfoController.java index 3d652de..27ab604 100644 --- a/src/main/java/com/lp/controller/iot/IotVisualDisplayInfoController.java +++ b/src/main/java/com/lp/controller/iot/IotVisualDisplayInfoController.java @@ -5,6 +5,7 @@ import com.lp.bo.UserInfoBO; import com.lp.common.Code; import com.lp.common.Constants; import com.lp.common.ErrorCodeEnum; +import com.lp.common.UrlIotVisual; import com.lp.controller.BaseController; import com.lp.util.CommonUtil; import com.lp.util.ObjectUtil; @@ -25,7 +26,7 @@ import java.util.*; */ @Controller public class IotVisualDisplayInfoController extends BaseController { - @RequestMapping(method = {org.springframework.web.bind.annotation.RequestMethod.POST}, value = {"/page/visual/display"}) + @RequestMapping(method = {org.springframework.web.bind.annotation.RequestMethod.POST}, value = {UrlIotVisual.IotVisualDisplayInfo.IOT_VISUAL_DISPLAY_INFO_PAGE}) public ModelAndView selectPage(HttpServletResponse response, @RequestHeader(value = "USER-KEY", required = true) String userKey, @RequestBody IotVisualDisplayInfoBO obj, @RequestParam(required = false) Integer pageSize, @RequestParam Integer paged) { Map resultMap = getResultMap(); try { @@ -36,7 +37,7 @@ public class IotVisualDisplayInfoController extends BaseController { return getModelAndView(response, resultMap); } - @RequestMapping(method = {org.springframework.web.bind.annotation.RequestMethod.POST}, value = {"/visual/display/sub/all"}) + @RequestMapping(method = {org.springframework.web.bind.annotation.RequestMethod.POST}, value = {UrlIotVisual.IotVisualDisplayInfo.IOT_VISUAL_SUB_ALL}) public ModelAndView selectList(HttpServletResponse response, @RequestHeader(value = "USER-KEY", required = true) String userKey, @RequestBody IotVisualDisplayInfoBO obj) { Map resultMap = getResultMap(); try { @@ -59,7 +60,7 @@ public class IotVisualDisplayInfoController extends BaseController { return getModelAndView(response, resultMap); } - @RequestMapping(method = {org.springframework.web.bind.annotation.RequestMethod.POST}, value = {"/visual/display"}) + @RequestMapping(method = {org.springframework.web.bind.annotation.RequestMethod.POST}, value = {UrlIotVisual.IotVisualDisplayInfo.IOT_VISUAL_DISPLAY_INFO}) public ModelAndView save(HttpServletResponse response, @RequestHeader(value = "USER-KEY", required = true) String userKey, @RequestBody IotVisualDisplayInfoBO obj) { Map resultMap = getResultMap(); try { @@ -103,7 +104,7 @@ public class IotVisualDisplayInfoController extends BaseController { return getModelAndView(response, resultMap); } - @RequestMapping(method = {org.springframework.web.bind.annotation.RequestMethod.GET}, value = {"/visual/display"}) + @RequestMapping(method = {org.springframework.web.bind.annotation.RequestMethod.GET}, value = {UrlIotVisual.IotVisualDisplayInfo.IOT_VISUAL_DISPLAY_INFO}) public ModelAndView selectOne(HttpServletResponse response, @RequestParam(required = false) Integer id, @RequestParam(required = false) String keycode) { Map resultMap = getResultMap(); try { @@ -146,7 +147,7 @@ public class IotVisualDisplayInfoController extends BaseController { return null; } - @RequestMapping(method = {org.springframework.web.bind.annotation.RequestMethod.POST}, value = {"/visual/login"}) + @RequestMapping(method = {org.springframework.web.bind.annotation.RequestMethod.POST}, value = {UrlIotVisual.IotVisualDisplayInfo.IOT_VISUAL_LOGIN}) public ModelAndView visualLogin(HttpServletResponse response, @RequestBody IotVisualDisplayInfoBO obj) { Map resultMap = getResultMap(); try { @@ -169,7 +170,7 @@ public class IotVisualDisplayInfoController extends BaseController { return getModelAndView(response, resultMap); } - @RequestMapping(method = {org.springframework.web.bind.annotation.RequestMethod.PUT}, value = {"/visual/display"}) + @RequestMapping(method = {org.springframework.web.bind.annotation.RequestMethod.PUT}, value = {UrlIotVisual.IotVisualDisplayInfo.IOT_VISUAL_DISPLAY_INFO}) public ModelAndView update(HttpServletResponse response, @RequestHeader(value = "USER-KEY", required = true) String userKey, @RequestBody IotVisualDisplayInfoBO obj) { Map resultMap = getResultMap(); try { @@ -197,7 +198,7 @@ public class IotVisualDisplayInfoController extends BaseController { return getModelAndView(response, resultMap); } - @RequestMapping(method = {org.springframework.web.bind.annotation.RequestMethod.DELETE}, value = {"/visual/display"}) + @RequestMapping(method = {org.springframework.web.bind.annotation.RequestMethod.DELETE}, value = {UrlIotVisual.IotVisualDisplayInfo.IOT_VISUAL_DISPLAY_INFO}) public ModelAndView delete(HttpServletResponse response, @RequestParam Integer id) { Map resultMap = getResultMap(); try { @@ -215,7 +216,7 @@ public class IotVisualDisplayInfoController extends BaseController { return getModelAndView(response, resultMap); } - @RequestMapping(method = {org.springframework.web.bind.annotation.RequestMethod.POST}, value = {"/scene/visual"}) + @RequestMapping(method = {org.springframework.web.bind.annotation.RequestMethod.POST}, value = {UrlIotVisual.IotVisualDisplayInfo.IOT_VISUAL_DISPLAY_SCENE}) public ModelAndView selectScene(HttpServletResponse response, @RequestHeader(value = "USER-KEY", required = true) String userKey, @RequestBody IotVisualDisplayInfoBO obj) { Map resultMap = getResultMap(); try { diff --git a/src/main/java/com/lp/controller/iot/IotVisualMoudleInfoController.java b/src/main/java/com/lp/controller/iot/IotVisualMoudleInfoController.java index 0bc12dd..8c8ccbc 100644 --- a/src/main/java/com/lp/controller/iot/IotVisualMoudleInfoController.java +++ b/src/main/java/com/lp/controller/iot/IotVisualMoudleInfoController.java @@ -4,6 +4,7 @@ import com.lp.bo.IotVisualMoudleInfoBO; import com.lp.bo.UserInfoBO; import com.lp.common.Code; import com.lp.common.Constants; +import com.lp.common.UrlIotVisual; import com.lp.controller.BaseController; import com.lp.util.ObjectUtil; import org.springframework.stereotype.Controller; @@ -24,7 +25,7 @@ import java.util.Map; @Controller public class IotVisualMoudleInfoController extends BaseController { - @RequestMapping(method={org.springframework.web.bind.annotation.RequestMethod.POST}, value={"/page/moudle/visual"}) + @RequestMapping(method={org.springframework.web.bind.annotation.RequestMethod.POST}, value={UrlIotVisual.IotVisualMoudleInfo.IOT_VISUAL_MOUDLE_INFO_PAGE}) public ModelAndView selectPage(HttpServletResponse response, @RequestHeader(value="USER-KEY", required=true) String userKey, @RequestBody IotVisualMoudleInfoBO obj, @RequestParam(required=false) Integer pageSize, @RequestParam Integer paged) { Map resultMap = getResultMap(); @@ -40,7 +41,7 @@ public class IotVisualMoudleInfoController extends BaseController return getModelAndView(response, resultMap); } - @RequestMapping(method={org.springframework.web.bind.annotation.RequestMethod.POST}, value={"/moudle/visual"}) + @RequestMapping(method={org.springframework.web.bind.annotation.RequestMethod.POST}, value={UrlIotVisual.IotVisualMoudleInfo.IOT_VISUAL_MOUDLE_INFO}) public ModelAndView save(HttpServletResponse response, @RequestHeader(value="USER-KEY", required=true) String userKey, @RequestBody IotVisualMoudleInfoBO obj) { Map resultMap = getResultMap(); @@ -55,7 +56,7 @@ public class IotVisualMoudleInfoController extends BaseController return getModelAndView(response, resultMap); } - @RequestMapping(method={org.springframework.web.bind.annotation.RequestMethod.GET}, value={"/moudle/visual"}) + @RequestMapping(method={org.springframework.web.bind.annotation.RequestMethod.GET}, value={UrlIotVisual.IotVisualMoudleInfo.IOT_VISUAL_MOUDLE_INFO}) public ModelAndView selectOne(HttpServletResponse response, @RequestParam Integer id) { Map resultMap = getResultMap(); @@ -67,7 +68,7 @@ public class IotVisualMoudleInfoController extends BaseController return getModelAndView(response, resultMap); } - @RequestMapping(method={org.springframework.web.bind.annotation.RequestMethod.PUT}, value={"/moudle/visual"}) + @RequestMapping(method={org.springframework.web.bind.annotation.RequestMethod.PUT}, value={UrlIotVisual.IotVisualMoudleInfo.IOT_VISUAL_MOUDLE_INFO}) public ModelAndView update(HttpServletResponse response, @RequestBody IotVisualMoudleInfoBO obj) { Map resultMap = getResultMap(); @@ -79,7 +80,7 @@ public class IotVisualMoudleInfoController extends BaseController return getModelAndView(response, resultMap); } - @RequestMapping(method={org.springframework.web.bind.annotation.RequestMethod.DELETE}, value={"/moudle/visual"}) + @RequestMapping(method={org.springframework.web.bind.annotation.RequestMethod.DELETE}, value={UrlIotVisual.IotVisualMoudleInfo.IOT_VISUAL_MOUDLE_INFO}) public ModelAndView delete(HttpServletResponse response, @RequestParam Integer id) { Map resultMap = getResultMap(); diff --git a/src/main/java/com/lp/controller/iot/IotWebViewController.java b/src/main/java/com/lp/controller/iot/IotWebViewController.java index 2d9eb53..1eae80e 100644 --- a/src/main/java/com/lp/controller/iot/IotWebViewController.java +++ b/src/main/java/com/lp/controller/iot/IotWebViewController.java @@ -1,11 +1,17 @@ package com.lp.controller.iot; -import java.util.List; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - +import com.lp.bo.IotSceneInfoBO; +import com.lp.bo.IotSensorInfoBO; +import com.lp.bo.IotVideoInfoBO; +import com.lp.bo.UserInfoBO; +import com.lp.cache.CacheName; +import com.lp.cache.ProCacheUtil; +import com.lp.common.Code; +import com.lp.common.CodeIot; +import com.lp.controller.BaseController; +import com.lp.service.IotOtherInfoService; +import com.lp.util.CommonUtil; +import com.lp.util.ObjectUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.PathVariable; @@ -14,21 +20,9 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.servlet.ModelAndView; -import com.lp.bo.IotSceneInfoBO; -import com.lp.bo.IotSensorInfoBO; -import com.lp.bo.IotVideoInfoBO; -import com.lp.bo.UserInfoBO; -import com.lp.bo.VideoFileInfoBO; -import com.lp.cache.CacheName; -import com.lp.cache.ProCacheUtil; -import com.lp.common.Code; -import com.lp.common.CodeIot; -import com.lp.common.Constants; -import com.lp.controller.BaseController; -import com.lp.service.IotOtherInfoService; -import com.lp.util.CommonUtil; -import com.lp.util.ObjectUtil; -import com.lp.util.PageBean; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.Map; @Controller @@ -150,7 +144,9 @@ public class IotWebViewController extends BaseController { } UserInfoBO user = getUserInfoBySession(req); IotSceneInfoBO obj = new IotSceneInfoBO(); - obj.setUser_id(user.getId()); + if(user.getType() != Code.UserType.SUPER) { + obj.setUser_id(user.getId()); + } resultData = service.selectPageList("IotSceneInfo.select",getPageBean(1,200), obj); }catch (Exception e) { exception(e, resultData); @@ -170,7 +166,9 @@ public class IotWebViewController extends BaseController { try{ UserInfoBO user = getUserInfoBySession(req); IotSceneInfoBO obj = new IotSceneInfoBO(); - obj.setUser_id(user.getId()); + if(user.getType() != Code.UserType.SUPER) { + obj.setUser_id(user.getId()); + } resultData = service.selectPageList("IotSceneInfo.select",getPageBean(1,200), obj); }catch (Exception e) { exception(e, resultData); @@ -241,7 +239,9 @@ public class IotWebViewController extends BaseController { try{ UserInfoBO user = getUserInfoBySession(req); IotSceneInfoBO obj = new IotSceneInfoBO(); - obj.setUser_id(user.getId()); + if(user.getType() != Code.UserType.SUPER) { + obj.setUser_id(user.getId()); + } resultData = service.selectPageList("IotSceneInfo.select",getPageBean(1,200), obj); }catch (Exception e) { exception(e, resultData); @@ -261,7 +261,9 @@ public class IotWebViewController extends BaseController { try{ UserInfoBO user = getUserInfoBySession(req); IotSceneInfoBO obj = new IotSceneInfoBO(); - obj.setUser_id(user.getId()); + if(user.getType() != Code.UserType.SUPER) { + obj.setUser_id(user.getId()); + } resultData = service.selectPageList("IotSceneInfo.select",getPageBean(1,200), obj); }catch (Exception e) { exception(e, resultData); @@ -281,7 +283,9 @@ public class IotWebViewController extends BaseController { try{ UserInfoBO user = getUserInfoBySession(req); IotSceneInfoBO obj = new IotSceneInfoBO(); - obj.setUser_id(user.getId()); + if(user.getType() != Code.UserType.SUPER) { + obj.setUser_id(user.getId()); + } resultData = service.selectPageList("IotSceneInfo.select",getPageBean(1,200), obj); }catch (Exception e) { exception(e, resultData); @@ -301,7 +305,9 @@ public class IotWebViewController extends BaseController { try{ UserInfoBO user = getUserInfoBySession(req); IotSceneInfoBO obj = new IotSceneInfoBO(); - obj.setUser_id(user.getId()); + if(user.getType() != Code.UserType.SUPER) { + obj.setUser_id(user.getId()); + } resultData = service.selectPageList("IotSceneInfo.select",getPageBean(1,200), obj); }catch (Exception e) { exception(e, resultData); @@ -321,7 +327,9 @@ public class IotWebViewController extends BaseController { try{ UserInfoBO user = getUserInfoBySession(req); IotSceneInfoBO obj = new IotSceneInfoBO(); - obj.setUser_id(user.getId()); + if(user.getType() != Code.UserType.SUPER) { + obj.setUser_id(user.getId()); + } resultData = service.selectPageList("IotSceneInfo.select",getPageBean(1,200), obj); }catch (Exception e) { exception(e, resultData); @@ -341,7 +349,9 @@ public class IotWebViewController extends BaseController { try{ UserInfoBO user = getUserInfoBySession(req); IotSceneInfoBO obj = new IotSceneInfoBO(); - obj.setUser_id(user.getId()); + if(user.getType() != Code.UserType.SUPER) { + obj.setUser_id(user.getId()); + } resultData = service.selectPageList("IotSceneInfo.select",getPageBean(1,200), obj); }catch (Exception e) { exception(e, resultData); @@ -365,7 +375,9 @@ public class IotWebViewController extends BaseController { } UserInfoBO user = getUserInfoBySession(req); IotSceneInfoBO obj = new IotSceneInfoBO(); - obj.setUser_id(user.getId()); + if(user.getType() != Code.UserType.SUPER) { + obj.setUser_id(user.getId()); + } resultData = service.selectPageList("IotSceneInfo.select",getPageBean(1,200), obj); }catch (Exception e) { exception(e, resultData); @@ -389,7 +401,9 @@ public class IotWebViewController extends BaseController { } UserInfoBO user = getUserInfoBySession(req); IotSceneInfoBO obj = new IotSceneInfoBO(); - obj.setUser_id(user.getId()); + if(user.getType() != Code.UserType.SUPER) { + obj.setUser_id(user.getId()); + } resultData = service.selectPageList("IotSceneInfo.select",getPageBean(1,200), obj); }catch (Exception e) { exception(e, resultData); @@ -413,7 +427,9 @@ public class IotWebViewController extends BaseController { } UserInfoBO user = getUserInfoBySession(req); IotSceneInfoBO obj = new IotSceneInfoBO(); - obj.setUser_id(user.getId()); + if(user.getType() != Code.UserType.SUPER) { + obj.setUser_id(user.getId()); + } resultData = service.selectPageList("IotSceneInfo.select",getPageBean(1,200), obj); }catch (Exception e) { exception(e, resultData); @@ -468,7 +484,9 @@ public class IotWebViewController extends BaseController { try{ UserInfoBO user = getUserInfoBySession(req); IotVideoInfoBO obj = new IotVideoInfoBO(); - obj.setUser_id(user.getId()); + if(user.getType() != Code.UserType.SUPER) { + obj.setUser_id(user.getId()); + } obj.setScene_id(sid); resultData = service.selectPageList("IotVideoInfo.selectPage",getPageBean(1,200), obj); req.setAttribute("videoId", id); diff --git a/src/main/java/com/lp/service/impl/IotOtherInfoServiceImpl.java b/src/main/java/com/lp/service/impl/IotOtherInfoServiceImpl.java index ad922db..94cb928 100644 --- a/src/main/java/com/lp/service/impl/IotOtherInfoServiceImpl.java +++ b/src/main/java/com/lp/service/impl/IotOtherInfoServiceImpl.java @@ -1,22 +1,16 @@ package com.lp.service.impl; +import com.lp.bo.*; +import com.lp.common.Code; +import com.lp.common.CodeIot; +import com.lp.service.IotOtherInfoService; +import com.lp.util.ObjectUtil; +import org.springframework.stereotype.Service; + import java.util.Date; import java.util.List; import java.util.Map; -import org.springframework.stereotype.Service; - -import com.lp.bo.CommonInfoBO; -import com.lp.bo.IotAlarmInfoBO; -import com.lp.bo.IotNodeInfoBO; -import com.lp.bo.IotSceneInfoBO; -import com.lp.bo.IotSensorInfoBO; -import com.lp.bo.IotTriggerInfoBO; -import com.lp.bo.UserInfoBO; -import com.lp.common.CodeIot; -import com.lp.service.IotOtherInfoService; -import com.lp.util.ObjectUtil; - @Service public class IotOtherInfoServiceImpl extends BaseServiceImpl implements IotOtherInfoService { @@ -26,7 +20,9 @@ public class IotOtherInfoServiceImpl extends BaseServiceImpl implements IotOther try{ // 场景数据 IotSceneInfoBO obj = new IotSceneInfoBO(); - obj.setUser_id( user.getId() ); + if(user.getType() != Code.UserType.SUPER) { + obj.setUser_id( user.getId() ); + } Integer num = dao.selectCount("IotSceneInfo.selectCount", obj); if(ObjectUtil.isEmpty(num)){ num = 0; diff --git a/src/main/java/com/lp/util/LogUtil4j.java b/src/main/java/com/lp/util/LogUtil4j.java new file mode 100644 index 0000000..0733fe9 --- /dev/null +++ b/src/main/java/com/lp/util/LogUtil4j.java @@ -0,0 +1,233 @@ +package com.lp.util; + + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.codehaus.jackson.JsonGenerationException; +import org.codehaus.jackson.map.JsonMappingException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.io.IOException; +import java.lang.management.ManagementFactory; +import java.lang.management.RuntimeMXBean; +import java.util.List; + + +public class LogUtil4j { + +// public static Log otherLogger = LogFactory.getLog("other"); + public static Logger otherLogger = LoggerFactory.getLogger("other"); + public static Logger debugLogger = LoggerFactory.getLogger("debug"); + private final static Log LOGGER = LogFactory.getLog(LogUtil4j.class); + + private static RuntimeMXBean runtimeMXBean=ManagementFactory.getRuntimeMXBean(); + + public static void errorLog(Exception e){ + e.printStackTrace(); + errorLog(e.getLocalizedMessage()); + } + + //日志记录错误信息 + public static void errorLog(String errorMessage){ + StringBuffer sb=new StringBuffer(); + sb.append("pid:"); + sb.append(getPid()); + sb.append(","); + sb.append(getClassName()); + sb.append("."); + sb.append(getMethodName()); + sb.append("("); + sb.append(getClassNameWithoutPackageName()); + sb.append(".java:"); + sb.append(getLineNumber()); + sb.append("),"); + sb.append("error:"); + sb.append(errorMessage); + LOGGER.error(sb.toString()); + } + //日志记录错误信息 + public static void errorLog(Object[] parametersName,Object[]parametersValue,String errorMessage){ + StringBuffer sb=new StringBuffer(); + sb.append("pid:"); + sb.append(getPid()); + sb.append(","); + sb.append(getClassName()); + sb.append("."); + sb.append(getMethodName()); + sb.append("("); + sb.append(getClassNameWithoutPackageName()); + sb.append(".java:"); + sb.append(getLineNumber()); + sb.append("),"); + sb.append("parameters:["); + sb.append(getPatameters(parametersName,parametersValue).toString()); + sb.append("],error:"); + sb.append(errorMessage); + LOGGER.error(sb.toString()); + } + + //日志记录信息 + public static void infoLog(String msg){ + StringBuffer sb=new StringBuffer(); + sb.append("pid:"); + sb.append(getPid()); + sb.append(","); + sb.append(getClassName()); + sb.append("."); + sb.append(getMethodName()); + sb.append("("); + sb.append(getClassNameWithoutPackageName()); + sb.append(".java:"); + sb.append(getLineNumber()); + sb.append("),"); + sb.append("info:"); + sb.append(msg); + LOGGER.info(sb.toString()); + } + //日志记录信息 + public static void infoLog(Object[] parametersName,Object[]parametersValue,String msg){ + StringBuffer sb=new StringBuffer(); + sb.append("pid:"); + sb.append(getPid()); + sb.append(","); + sb.append(getClassName()); + sb.append("."); + sb.append(getMethodName()); + sb.append("("); + sb.append(getClassNameWithoutPackageName()); + sb.append(".java:"); + sb.append(getLineNumber()); + sb.append("),"); + sb.append("parameters:["); + sb.append(getPatameters(parametersName,parametersValue).toString()); + sb.append("],info:"); + sb.append(msg); + LOGGER.info(sb.toString()); + } + + + public static void debugLog(String msg, Object... var) { + StringBuffer sb=new StringBuffer(); + sb.append(getClassName()); + sb.append("."); + sb.append(getMethodName()); + sb.append("("); + sb.append(getClassNameWithoutPackageName()); + sb.append(".java:"); + sb.append(getLineNumber()); + sb.append("), debug msg: "); + debugLogger.debug(sb + msg, var); + } + + public static void debugerrorLog(String msg, Object var, Throwable var1) { + StringBuffer sb=new StringBuffer(); + sb.append(getClassName()); + sb.append("."); + sb.append(getMethodName()); + sb.append("("); + sb.append(getClassNameWithoutPackageName()); + sb.append(".java:"); + sb.append(getLineNumber()); + sb.append("), error msg: "); + debugLogger.debug(sb + msg, var, var1); + } + + //获取当前进程号 + private static String getPid(){ + return runtimeMXBean.getName().split("@")[0]; + } + //获取当前运行类的类名(带包名称) + private static String getClassName(){ + return Thread.currentThread().getStackTrace()[3].getClassName(); + } + //获取当前运行类的的方法名 + private static String getMethodName(){ + return Thread.currentThread().getStackTrace()[3].getMethodName(); + } + //获取类实现的接口集合 + @SuppressWarnings("unused") + private static Class[] getInterfaces(){ + Class[] interfaces=getCurrentClass().getInterfaces(); + return interfaces; + } + //获取当前运行类的class 对象 + private static Class getCurrentClass(){ + Class currentClass=null; + try { + //通过类名称加载一个类来获取到当前类实例 + currentClass=Class.forName(Thread.currentThread().getStackTrace()[3].getClassName()); + } catch (ClassNotFoundException e) { + e.printStackTrace(); + } + return currentClass; + + } + //获取当前运行类的行号 + private static int getLineNumber(){ + return Thread.currentThread().getStackTrace()[3].getLineNumber(); + } + //获取当前运行类的类名(不含包名称) + private static String getClassNameWithoutPackageName(){ + String []str=Thread.currentThread().getStackTrace()[3].getClassName().split("\\."); + return str[str.length-1]; + } + + //根据不同的参数类型，获取到相应的参数名，参数值 + private static StringBuffer getPatameters(Object[] parametersName,Object[]parametersValue){ + StringBuffer sb=new StringBuffer(); + for(int i=0;i1e-10&&(i.width+=a/s,i.height+=a/s,i.x-=a/s/2,i.y-=a/s/2)}return i}return t},contain:function(t,e){var r=this.transformCoordToLocal(t,e),n=this.getBoundingRect(),i=this.style;if(t=r[0],e=r[1],n.contain(t,e)){var a=this.path.data;if(i.hasStroke()){var o=i.lineWidth,l=i.strokeNoScale?this.getLineScale():1;if(l>1e-10&&(i.hasFill()||(o=Math.max(o,this.strokeContainThreshold)),s.containStroke(a,o/l,t,e)))return!0}if(i.hasFill())return s.contain(a,t,e)}return!1},dirty:function(t){null==t&&(t=!0),t&&(this.__dirtyPath=t,this._rect=null),this.__dirty=!0,this.__zr&&this.__zr.refresh(),this.__clipTarget&&this.__clipTarget.dirty()},animateShape:function(t){return this.animate("shape",t)},attrKV:function(t,e){"shape"===t?(this.setShape(e),this.__dirtyPath=!0,this._rect=null):i.prototype.attrKV.call(this,t,e)},setShape:function(t,e){var r=this.shape;if(r){if(a.isObject(t))for(var n in t)t.hasOwnProperty(n)&&(r[n]=t[n]);else r[t]=e;this.dirty(!0)}return this},getLineScale:function(){var t=this.transform;return t&&u(t[0]-1)>1e-10&&u(t[3]-1)>1e-10?Math.sqrt(u(t[0]*t[3]-t[2]*t[1])):1}},n.extend=function(t){var e=function(e){n.call(this,e),t.style&&this.style.extendFrom(t.style,!1);var r=t.shape;if(r){this.shape=this.shape||{};var i=this.shape;for(var a in r)!i.hasOwnProperty(a)&&r.hasOwnProperty(a)&&(i[a]=r[a])}t.init&&t.init.call(this,e)};a.inherits(e,n);for(var r in t)"style"!==r&&"shape"!==r&&(e.prototype[r]=t[r]);return e},a.inherits(n,i);var f=n;t.exports=f},function(t,e){function r(t,e){var r=new S(2);return null==t&&(t=0),null==e&&(e=0),r[0]=t,r[1]=e,r}function n(t,e){return t[0]=e[0],t[1]=e[1],t}function i(t){var e=new S(2);return e[0]=t[0],e[1]=t[1],e}function a(t,e,r){return t[0]=e,t[1]=r,t}function o(t,e,r){return t[0]=e[0]+r[0],t[1]=e[1]+r[1],t}function s(t,e,r,n){return t[0]=e[0]+r[0]*n,t[1]=e[1]+r[1]*n,t}function l(t,e,r){return t[0]=e[0]-r[0],t[1]=e[1]-r[1],t}function h(t){return Math.sqrt(u(t))}function u(t){return t[0]*t[0]+t[1]*t[1]}function c(t,e,r){return t[0]=e[0]*r[0],t[1]=e[1]*r[1],t}function f(t,e,r){return t[0]=e[0]/r[0],t[1]=e[1]/r[1],t}function d(t,e){return t[0]*e[0]+t[1]*e[1]}function p(t,e,r){return t[0]=e[0]*r,t[1]=e[1]*r,t}function v(t,e){var r=h(e);return 0===r?(t[0]=0,t[1]=0):(t[0]=e[0]/r,t[1]=e[1]/r),t}function g(t,e){return Math.sqrt((t[0]-e[0])*(t[0]-e[0])+(t[1]-e[1])*(t[1]-e[1]))}function m(t,e){return(t[0]-e[0])*(t[0]-e[0])+(t[1]-e[1])*(t[1]-e[1])}function x(t,e){return t[0]=-e[0],t[1]=-e[1],t}function y(t,e,r,n){return t[0]=e[0]+n*(r[0]-e[0]),t[1]=e[1]+n*(r[1]-e[1]),t}function _(t,e,r){var n=e[0],i=e[1];return t[0]=r[0]*n+r[2]*i+r[4],t[1]=r[1]*n+r[3]*i+r[5],t}function w(t,e,r){return t[0]=Math.min(e[0],r[0]),t[1]=Math.min(e[1],r[1]),t}function b(t,e,r){return t[0]=Math.max(e[0],r[0]),t[1]=Math.max(e[1],r[1]),t}var S="undefined"==typeof Float32Array?Array:Float32Array,T=h,M=u,P=g,k=m;e.create=r,e.copy=n,e.clone=i,e.set=a,e.add=o,e.scaleAndAdd=s,e.sub=l,e.len=h,e.length=T,e.lenSquare=u,e.lengthSquare=M,e.mul=c,e.div=f,e.dot=d,e.scale=p,e.normalize=v,e.distance=g,e.dist=P,e.distanceSquare=m,e.distSquare=k,e.negate=x,e.lerp=y,e.applyTransform=_,e.min=w,e.max=b},function(t,e,r){function n(t,e,r,n){r<0&&(t+=r,r=-r),n<0&&(e+=n,n=-n),this.x=t,this.y=e,this.width=r,this.height=n}var i=r(3),a=r(10),o=i.applyTransform,s=Math.min,l=Math.max;n.prototype={constructor:n,union:function(t){var e=s(t.x,this.x),r=s(t.y,this.y);this.width=l(t.x+t.width,this.x+this.width)-e,this.height=l(t.y+t.height,this.y+this.height)-r,this.x=e,this.y=r},applyTransform:function(){var t=[],e=[],r=[],n=[];return function(i){if(i){t[0]=r[0]=this.x,t[1]=n[1]=this.y,e[0]=n[0]=this.x+this.width,e[1]=r[1]=this.y+this.height,o(t,t,i),o(e,e,i),o(r,r,i),o(n,n,i),this.x=s(t[0],e[0],r[0],n[0]),this.y=s(t[1],e[1],r[1],n[1]);var a=l(t[0],e[0],r[0],n[0]),h=l(t[1],e[1],r[1],n[1]);this.width=a-this.x,this.height=h-this.y}}}(),calculateTransform:function(t){var e=this,r=t.width/e.width,n=t.height/e.height,i=a.create();return a.translate(i,i,[-e.x,-e.y]),a.scale(i,i,[r,n]),a.translate(i,i,[t.x,t.y]),i},intersect:function(t){if(!t)return!1;t instanceof n||(t=n.create(t));var e=this,r=e.x,i=e.x+e.width,a=e.y,o=e.y+e.height,s=t.x,l=t.x+t.width,h=t.y,u=t.y+t.height;return!(i=r.x&&t<=r.x+r.width&&e>=r.y&&e<=r.y+r.height},clone:function(){return new n(this.x,this.y,this.width,this.height)},copy:function(t){this.x=t.x,this.y=t.y,this.width=t.width,this.height=t.height},plain:function(){return{x:this.x,y:this.y,width:this.width,height:this.height}}},n.create=function(t){return new n(t.x,t.y,t.width,t.height)};var h=n;t.exports=h},function(t,e,r){function n(t){return t>-b&&tb||t<-b}function a(t,e,r,n,i){var a=1-i;return a*a*(a*t+3*i*e)+i*i*(i*n+3*a*r)}function o(t,e,r,n,i){var a=1-i;return 3*(((e-t)*a+2*(r-e)*i)*a+(n-r)*i*i)}function s(t,e,r,i,a,o){var s=i+3*(e-r)-t,l=3*(r-2*e+t),h=3*(e-t),u=t-a,c=l*l-3*s*h,f=l*h-9*s*u,d=h*h-3*l*u,p=0;if(n(c)&&n(f))if(n(l))o[0]=0;else{var v=-h/l;v>=0&&v<=1&&(o[p++]=v)}else{var g=f*f-4*c*d;if(n(g)){var m=f/c,v=-l/s+m,x=-m/2;v>=0&&v<=1&&(o[p++]=v),x>=0&&x<=1&&(o[p++]=x)}else if(g>0){var y=w(g),b=c*l+1.5*s*(-f+y),S=c*l+1.5*s*(-f-y);b=b<0?-_(-b,M):_(b,M),S=S<0?-_(-S,M):_(S,M);var v=(-l-(b+S))/(3*s);v>=0&&v<=1&&(o[p++]=v)}else{var P=(2*c*l-3*s*f)/(2*w(c*c*c)),k=Math.acos(P)/3,C=w(c),A=Math.cos(k),v=(-l-2*C*A)/(3*s),x=(-l+C*(A+T*Math.sin(k)))/(3*s),I=(-l+C*(A-T*Math.sin(k)))/(3*s);v>=0&&v<=1&&(o[p++]=v),x>=0&&x<=1&&(o[p++]=x),I>=0&&I<=1&&(o[p++]=I)}}return p}function l(t,e,r,a,o){var s=6*r-12*e+6*t,l=9*e+3*a-3*t-9*r,h=3*e-3*t,u=0;if(n(l)){if(i(s)){var c=-h/s;c>=0&&c<=1&&(o[u++]=c)}}else{var f=s*s-4*l*h;if(n(f))o[0]=-s/(2*l);else if(f>0){var d=w(f),c=(-s+d)/(2*l),p=(-s-d)/(2*l);c>=0&&c<=1&&(o[u++]=c),p>=0&&p<=1&&(o[u++]=p)}}return u}function h(t,e,r,n,i,a){var o=(e-t)*i+t,s=(r-e)*i+e,l=(n-r)*i+r,h=(s-o)*i+o,u=(l-s)*i+s,c=(u-h)*i+h;a[0]=t,a[1]=o,a[2]=h,a[3]=c,a[4]=c,a[5]=u,a[6]=l,a[7]=n}function u(t,e,r,n,i,o,s,l,h,u,c){var f,d,p,v,g,m=.005,x=1/0;P[0]=h,P[1]=u;for(var _=0;_<1;_+=.05)k[0]=a(t,r,i,s,_),k[1]=a(e,n,o,l,_),v=y(P,k),v=0&&v=0&&c<=1&&(o[u++]=c)}}else{var f=l*l-4*s*h;if(n(f)){var c=-l/(2*s);c>=0&&c<=1&&(o[u++]=c)}else if(f>0){var d=w(f),c=(-l+d)/(2*s),p=(-l-d)/(2*s);c>=0&&c<=1&&(o[u++]=c),p>=0&&p<=1&&(o[u++]=p)}}return u}function p(t,e,r){var n=t+r-2*e;return 0===n?.5:(t-e)/n}function v(t,e,r,n,i){var a=(e-t)*n+t,o=(r-e)*n+e,s=(o-a)*n+a;i[0]=t,i[1]=a,i[2]=s,i[3]=s,i[4]=o,i[5]=r}function g(t,e,r,n,i,a,o,s,l){var h,u=.005,f=1/0;P[0]=o,P[1]=s;for(var d=0;d<1;d+=.05){k[0]=c(t,r,i,d),k[1]=c(e,n,a,d);var p=y(P,k);p=0&&pC&&(k=0,P={}),k++,P[r]=i,i}function i(t,e,r,n,i,s,l){return s?o(t,e,r,n,i,s,l):a(t,e,r,n,i,l)}function a(t,e,r,i,a,o){var h=v(t,e,a,o),u=n(t,e);a&&(u+=a[1]+a[3]);var c=h.outerHeight,f=s(0,u,r),d=l(0,c,i),p=new y(f,d,u,c);return p.lineHeight=h.lineHeight,p}function o(t,e,r,n,i,a,o){var h=g(t,{rich:a,truncate:o,font:e,textAlign:r,textPadding:i}),u=h.outerWidth,c=h.outerHeight,f=s(0,u,r),d=l(0,c,n);return new y(f,d,u,c)}function s(t,e,r){return"right"===r?t-=e:"center"===r&&(t-=e/2),t}function l(t,e,r){return"middle"===r?t-=e/2:"bottom"===r&&(t-=e),t}function h(t,e,r){var n=e.x,i=e.y,a=e.height,o=e.width,s=a/2,l="left",h="top";switch(t){case"left":n-=r,i+=s,l="right",h="middle";break;case"right":n+=r+o,i+=s,h="middle";break;case"top":n+=o/2,i-=r,l="center",h="bottom";break;case"bottom":n+=o/2,i+=a+r,l="center";break;case"inside":n+=o/2,i+=s,l="center",h="middle";break;case"insideLeft":n+=r,i+=s,h="middle";break;case"insideRight":n+=o-r,i+=s,l="right",h="middle";break;case"insideTop":n+=o/2,i+=r,l="center";break;case"insideBottom":n+=o/2,i+=a-r,l="center",h="bottom";break;case"insideTopLeft":n+=r,i+=r;break;case"insideTopRight":n+=o-r,i+=r,l="right";break;case"insideBottomLeft":n+=r,i+=a-r,h="bottom";break;case"insideBottomRight":n+=o-r,i+=a-r,l="right",h="bottom"}return{x:n,y:i,textAlign:l,textVerticalAlign:h}}function u(t,e,r,n,i){if(!e)return"";var a=(t+"").split("\n");i=c(e,r,n,i);for(var o=0,s=a.length;o=o;l++)s-=o;var h=n(r);return h>s&&(r="",h=0),s=t-h,i.ellipsis=r,i.ellipsisWidth=h,i.contentWidth=s,i.containerWidth=t,i}function f(t,e){var r=e.containerWidth,i=e.font,a=e.contentWidth;if(!r)return"";var o=n(t,i);if(o<=r)return t;for(var s=0;;s++){if(o<=a||s>=e.maxIterations){t+=e.ellipsis;break}var l=0===s?d(t,a,e.ascCharWidth,e.cnCharWidth):o>0?Math.floor(t.length*a/o):0;t=t.substr(0,l),o=n(t,i)}return""===t&&(t=e.placeholder),t}function d(t,e,r,n){for(var i=0,a=0,o=t.length;al)t="",a=[];else if(null!=h)for(var u=c(h-(r?r[1]+r[3]:0),e,n.ellipsis,{minChar:n.minChar,placeholder:n.placeholder}),d=0,v=a.length;da&&m(r,t.substring(a,o)),m(r,i[2],i[1]),a=A.lastIndex}ag)return{lines:[],width:0,height:0};P.textWidth=n(P.text,I);var D=k.textWidth,L=null==D||"auto"===D;if("string"==typeof D&&"%"===D.charAt(D.length-1))P.percentWidth=D,c.push(P),D=0;else{if(L){D=P.textWidth;var B=k.textBackgroundColor,F=B&&B.image;F&&(F=_.findExistImage(F),_.isImageReady(F)&&(D=Math.max(D,F.width*O/F.height)))}var R=C?C[1]+C[3]:0;D+=R;var z=null!=v?v-b:null;null!=z&&zthis._ux||y(e-this._yi)>this._uy||this._len<5;return this.addData(h.L,t,e),this._ctx&&r&&(this._needsDash()?this._dashedLineTo(t,e):this._ctx.lineTo(t,e)),r&&(this._xi=t,this._yi=e),this},bezierCurveTo:function(t,e,r,n,i,a){return this.addData(h.C,t,e,r,n,i,a),this._ctx&&(this._needsDash()?this._dashedBezierTo(t,e,r,n,i,a):this._ctx.bezierCurveTo(t,e,r,n,i,a)),this._xi=i,this._yi=a,this},quadraticCurveTo:function(t,e,r,n){return this.addData(h.Q,t,e,r,n),this._ctx&&(this._needsDash()?this._dashedQuadraticTo(t,e,r,n):this._ctx.quadraticCurveTo(t,e,r,n)),this._xi=r,this._yi=n,this},arc:function(t,e,r,n,i,a){return this.addData(h.A,t,e,r,r,n,i-n,0,a?0:1),this._ctx&&this._ctx.arc(t,e,r,n,i,a),this._xi=g(i)*r+t,this._yi=m(i)*r+t,this},arcTo:function(t,e,r,n,i){return this._ctx&&this._ctx.arcTo(t,e,r,n,i),this},rect:function(t,e,r,n){return this._ctx&&this._ctx.rect(t,e,r,n),this.addData(h.R,t,e,r,n),this},closePath:function(){this.addData(h.Z);var t=this._ctx,e=this._x0,r=this._y0;return t&&(this._needsDash()&&this._dashedLineTo(e,r),t.closePath()),this._xi=e,this._yi=r,this},fill:function(t){t&&t.fill(),this.toStatic()},stroke:function(t){t&&t.stroke(),this.toStatic()},setLineDash:function(t){if(t instanceof Array){this._lineDash=t,this._dashIdx=0;for(var e=0,r=0;re.length&&(this._expandData(),e=this.data);for(var r=0;r0&&d<=t||u<0&&d>=t||0==u&&(c>0&&g<=e||c<0&&g>=e);)n=this._dashIdx,r=o[n],d+=u*r,g+=c*r,this._dashIdx=(n+1)%m,u>0&&dl||c>0&&gh||s[n%2?"moveTo":"lineTo"](u>=0?p(d,t):v(d,t),c>=0?p(g,e):v(g,e));u=d-t,c=g-e,this._dashOffset=-x(u*u+c*c)},_dashedBezierTo:function(t,e,r,i,a,o){var s,l,h,u,c,f=this._dashSum,d=this._dashOffset,p=this._lineDash,v=this._ctx,g=this._xi,m=this._yi,y=n.cubicAt,_=0,w=this._dashIdx,b=p.length,S=0;for(d<0&&(d=f+d),d%=f,s=0;s<1;s+=.1)l=y(g,t,r,a,s+.1)-y(g,t,r,a,s),h=y(m,e,i,o,s+.1)-y(m,e,i,o,s),_+=x(l*l+h*h);for(;wd));w++);for(s=(S-d)/_;s<=1;)u=y(g,t,r,a,s),c=y(m,e,i,o,s),w%2?v.moveTo(u,c):v.lineTo(u,c),s+=p[w]/_,w=(w+1)%b;w%2!==0&&v.lineTo(a,o),l=a-u,h=o-c,this._dashOffset=-x(l*l+h*h)},_dashedQuadraticTo:function(t,e,r,n){var i=r,a=n;r=(r+2*t)/3,n=(n+2*e)/3,t=(this._xi+2*t)/3,e=(this._yi+2*e)/3,this._dashedBezierTo(t,e,r,n,i,a)},toStatic:function(){var t=this.data;t instanceof Array&&(t.length=this._len,_&&(this.data=new Float32Array(t)))},getBoundingRect:function(){u[0]=u[1]=f[0]=f[1]=Number.MAX_VALUE,c[0]=c[1]=d[0]=d[1]=-Number.MAX_VALUE;for(var t=this.data,e=0,r=0,n=0,s=0,l=0;ll||y(o-i)>u||f===c-1)&&(t.lineTo(a,o),n=a,i=o);break;case h.C:t.bezierCurveTo(s[f++],s[f++],s[f++],s[f++],s[f++],s[f++]),n=s[f-2],i=s[f-1];break;case h.Q:t.quadraticCurveTo(s[f++],s[f++],s[f++],s[f++]),n=s[f-2],i=s[f-1];break;case h.A:var p=s[f++],v=s[f++],x=s[f++],_=s[f++],w=s[f++],b=s[f++],S=s[f++],T=s[f++],M=x>_?x:_,P=x>_?1:x/_,k=x>_?_/x:1,C=Math.abs(x-_)>.001,A=w+b;C?(t.translate(p,v),t.rotate(S),t.scale(P,k),t.arc(0,0,M,w,A,1-T),t.scale(1/P,1/k),t.rotate(-S),t.translate(-p,-v)):t.arc(p,v,M,w,A,1-T),1==f&&(e=g(w)*x+p,r=m(w)*_+v),n=g(A)*x+p,i=m(A)*_+v;break;case h.R:e=n=s[f],r=i=s[f+1],t.rect(s[f++],s[f++],s[f++],s[f++]);break;case h.Z:t.closePath(),n=e,i=r}}}},w.CMD=h;var b=w;t.exports=b},function(e,r){e.exports=t},function(t,e,r){function n(t){for(var e=0;e=0||n&&i.indexOf(n,s)<0)){var l=e.getShallow(s);null!=l&&(a[t[o][0]]=l)}}return a}}var i=r(1);t.exports=n},function(t,e){function r(){var t=new u(6);return n(t),t}function n(t){return t[0]=1,t[1]=0,t[2]=0,t[3]=1,t[4]=0,t[5]=0,t}function i(t,e){return t[0]=e[0],t[1]=e[1],t[2]=e[2],t[3]=e[3],t[4]=e[4],t[5]=e[5],t}function a(t,e,r){var n=e[0]*r[0]+e[2]*r[1],i=e[1]*r[0]+e[3]*r[1],a=e[0]*r[2]+e[2]*r[3],o=e[1]*r[2]+e[3]*r[3],s=e[0]*r[4]+e[2]*r[5]+e[4],l=e[1]*r[4]+e[3]*r[5]+e[5];return t[0]=n,t[1]=i,t[2]=a,t[3]=o,t[4]=s,t[5]=l,t}function o(t,e,r){return t[0]=e[0],t[1]=e[1],t[2]=e[2],t[3]=e[3],t[4]=e[4]+r[0],t[5]=e[5]+r[1],t}function s(t,e,r){var n=e[0],i=e[2],a=e[4],o=e[1],s=e[3],l=e[5],h=Math.sin(r),u=Math.cos(r);return t[0]=n*u+o*h,t[1]=-n*h+o*u,t[2]=i*u+s*h,t[3]=-i*h+u*s,t[4]=u*a+h*l,t[5]=u*l-h*a,t}function l(t,e,r){var n=r[0],i=r[1];return t[0]=e[0]*n,t[1]=e[1]*i,t[2]=e[2]*n,t[3]=e[3]*i,t[4]=e[4]*n,t[5]=e[5]*i,t}function h(t,e){var r=e[0],n=e[2],i=e[4],a=e[1],o=e[3],s=e[5],l=r*o-a*n;return l?(l=1/l,t[0]=o*l,t[1]=-a*l,t[2]=-n*l,t[3]=r*l,t[4]=(n*s-o*i)*l,t[5]=(a*i-r*s)*l,t):null}var u="undefined"==typeof Float32Array?Array:Float32Array;e.create=r,e.identity=n,e.copy=i,e.mul=a,e.translate=o,e.rotate=s,e.scale=l,e.invert=h},function(t,e,r){function n(t){t=t||{},o.call(this,t);for(var e in t)t.hasOwnProperty(e)&&"style"!==e&&(this[e]=t[e]);this.style=new a(t.style,this),this._rect=null,this.__clipPaths=[]}var i=r(1),a=r(59),o=r(15),s=r(64);n.prototype={constructor:n,type:"displayable",__dirty:!0,invisible:!1,z:0,z2:0,zlevel:0,draggable:!1,dragging:!1,silent:!1,culling:!1,cursor:"pointer",rectHover:!1,progressive:-1,beforeBrush:function(t){},afterBrush:function(t){},brush:function(t,e){},getBoundingRect:function(){},contain:function(t,e){return this.rectContain(t,e)},traverse:function(t,e){t.call(e,this)},rectContain:function(t,e){var r=this.transformCoordToLocal(t,e),n=this.getBoundingRect();return n.contain(r[0],r[1])},dirty:function(){this.__dirty=!0,this._rect=null,this.__zr&&this.__zr.refresh()},animateStyle:function(t){return this.animate("style",t)},attrKV:function(t,e){"style"!==t?o.prototype.attrKV.call(this,t,e):this.style.set(e)},setStyle:function(t,e){return this.style.set(t,e),this.dirty(!1),this},useStyle:function(t){return this.style=new a(t,this),this.dirty(!1),this}},i.inherits(n,o),i.mixin(n,s);var l=n;t.exports=l},function(t,e,r){function n(t){if("string"==typeof t){var e=l.get(t);return e&&e.image}return t}function i(t,e,r,n,i){if(t){if("string"==typeof t){if(e&&e.__zrImageSrc===t||!r)return e;var s=l.get(t),h={hostEl:r,cb:n,cbPayload:i};return s?(e=s.image,!o(e)&&s.pending.push(h)):(!e&&(e=new Image),e.onload=a,l.put(t,e.__cachedImgObj={image:e,pending:[h]}),e.src=e.__zrImageSrc=t),e}return t}return e}function a(){var t=this.__cachedImgObj;this.onload=this.__cachedImgObj=null;for(var e=0;e=0)&&(n={textFill:null,textStroke:t.textStroke,textStrokeWidth:t.textStrokeWidth},t.textFill="#fff",null==t.textStroke&&(t.textStroke=r.autoColor,null==t.textStrokeWidth&&(t.textStrokeWidth=2))),n}function L(t){var e=t.insideRollback;e&&(t.textFill=e.textFill,t.textStroke=e.textStroke,t.textStrokeWidth=e.textStrokeWidth)}function B(t,e){var r=e||e.getModel("textStyle");return[t.fontStyle||r&&r.getShallow("fontStyle")||"",t.fontWeight||r&&r.getShallow("fontWeight")||"",(t.fontSize||r&&r.getShallow("fontSize")||12)+"px",t.fontFamily||r&&r.getShallow("fontFamily")||"sans-serif"].join(" ")}function F(t,e,r,n,i,a){"function"==typeof i&&(a=i,i=null);var o=n&&n.isAnimationEnabled();if(o){var s=t?"Update":"",l=n.getShallow("animationDuration"+s),h=n.getShallow("animationEasing"+s),u=n.getShallow("animationDelay"+s);"function"==typeof u&&(u=u(i,n.getAnimationDelayParams?n.getAnimationDelayParams(e,i):null)),"function"==typeof l&&(l=l(i)),l>0?e.animateTo(r,l,u||0,h,a,!!a):(e.stopAnimation(),e.attr(r),a&&a())}else e.stopAnimation(),e.attr(r),a&&a()}function R(t,e,r,n,i){F(!0,t,e,r,n,i)}function z(t,e,r,n,i){F(!1,t,e,r,n,i)}function W(t,e){for(var r=U.identity([]);t&&t!==e;)U.mul(r,t.getLocalTransform(),r),t=t.parent;return r}function q(t,e,r){return e&&!G.isArrayLike(e)&&(e=Q.getLocalTransform(e)),r&&(e=U.invert([],e)),$.applyTransform([],t,e)}function E(t,e,r){var n=0===e[4]||0===e[5]||0===e[0]?1:Math.abs(2*e[4]/e[0]),i=0===e[4]||0===e[5]||0===e[2]?1:Math.abs(2*e[4]/e[2]),a=["left"===t?-n:"right"===t?n:0,"top"===t?-i:"bottom"===t?i:0];return a=q(a,e,r),Math.abs(a[0])>Math.abs(a[1])?a[0]>0?"right":"left":a[1]>0?"bottom":"top"}function N(t,e,r,n){function i(t){var e={};return t.traverse(function(t){!t.isGroup&&t.anid&&(e[t.anid]=t)}),e}function a(t){var e={position:$.clone(t.position),rotation:t.rotation};return t.shape&&(e.shape=G.extend({},t.shape)),e}if(t&&e){var o=i(t);e.traverse(function(t){if(!t.isGroup&&t.anid){var e=o[t.anid];if(e){var n=a(t);t.attr(a(e)),R(t,n,r,t.dataIndex)}}})}}function j(t,e){return G.map(t,function(t){var r=t[0];r=vt(r,e.x),r=gt(r,e.x+e.width);var n=t[1];return n=vt(n,e.y),n=gt(n,e.y+e.height),[r,n]})}function H(t,e){var r=vt(t.x,e.x),n=gt(t.x+t.width,e.x+e.width),i=vt(t.y,e.y),a=gt(t.y+t.height,e.y+e.height);if(n>=r&&a>=i)return{x:r,y:i,width:n-r,height:a-i}}function V(t,e,r){e=G.extend({rectHover:!0},e);var n=e.style={strokeNoScale:!0};if(r=r||{x:-1,y:-1,width:2,height:2},t)return 0===t.indexOf("image://")?(n.image=t.slice(8),G.defaults(n,r),new K(e)):a(t.replace("path://",""),e,r,"center")}var G=r(1),X=r(76),Y=r(25),U=r(10),$=r(3),Z=r(2),Q=r(24),K=r(55);e.Image=K;var J=r(50);e.Group=J;var tt=r(60);e.Text=tt;var et=r(67);e.Circle=et;var rt=r(73);e.Sector=rt;var nt=r(72);e.Ring=nt;var it=r(69);e.Polygon=it;var at=r(70);e.Polyline=at;var ot=r(71);e.Rect=ot;var st=r(68);e.Line=st;var lt=r(66);e.BezierCurve=lt;var ht=r(65);e.Arc=ht;var ut=r(54);e.CompoundPath=ut;var ct=r(56);e.LinearGradient=ct;var ft=r(58);e.RadialGradient=ft;var dt=r(4);e.BoundingRect=dt;var pt=Math.round,vt=Math.max,gt=Math.min,mt={},xt=X.mergePath;e.extendShape=n,e.extendPath=i,e.makePath=a,e.makeImage=o,e.mergePath=xt,e.resizePath=l,e.subPixelOptimizeLine=h,e.subPixelOptimizeRect=u,e.subPixelOptimize=c,e.setHoverStyle=T,e.setLabelStyle=M,e.setTextStyle=P,e.setText=k,e.getFont=B,e.updateProps=R,e.initProps=z,e.getTransform=W,e.applyTransform=q,e.transformDirection=E,e.groupTransition=N,e.clipPointsByRect=j,e.clipRectByRect=H,e.createIcon=V},function(t,e,r){function n(t){return t.replace(/^\s+/,"").replace(/\s+$/,"")}function i(t,e,r,n){var i=e[1]-e[0],a=r[1]-r[0];if(0===i)return 0===a?r[0]:(r[0]+r[1])/2;if(n)if(i>0){if(t<=e[0])return r[0];if(t>=e[1])return r[1]}else{if(t>=e[0])return r[0];if(t<=e[1])return r[1]}else{if(t===e[0])return r[0];if(t===e[1])return r[1]}return(t-e[0])/i*a+r[0]}function a(t,e){switch(t){case"center":case"middle":t="50%";break;case"left":case"top":t="0%";break;case"right":case"bottom":t="100%"}return"string"==typeof t?n(t).match(/%$/)?parseFloat(t)/100*e:parseFloat(t):null==t?NaN:+t}function o(t,e,r){return null==e&&(e=10),e=Math.min(Math.max(0,e),20),t=(+t).toFixed(e),r?t:+t}function s(t){return t.sort(function(t,e){return t-e}),t}function l(t){if(t=+t,isNaN(t))return 0;for(var e=1,r=0;Math.round(t*e)/e!==t;)e*=10,r++;return r}function h(t){var e=t.toString(),r=e.indexOf("e");if(r>0){var n=+e.slice(r+1);return n<0?-n:0}var i=e.indexOf(".");return i<0?0:e.length-1-i}function u(t,e){var r=Math.log,n=Math.LN10,i=Math.floor(r(t[1]-t[0])/n),a=Math.round(r(Math.abs(e[1]-e[0]))/n),o=Math.min(Math.max(-i+a,0),20);return isFinite(o)?o:20}function c(t,e,r){if(!t[e])return 0;var n=_.reduce(t,function(t,e){return t+(isNaN(e)?0:e)},0);if(0===n)return 0;for(var i=Math.pow(10,r),a=_.map(t,function(t){return(isNaN(t)?0:t)/n*i*100}),o=100*i,s=_.map(a,function(t){return Math.floor(t)}),l=_.reduce(s,function(t,e){return t+e},0),h=_.map(a,function(t,e){return t-s[e]});lu&&(u=h[f],c=f);++s[c],h[c]=0,++l}return s[e]/i}function f(t){var e=2*Math.PI;return(t%e+e)%e}function d(t){return t>-w&&t=-20?+t.toFixed(n<0?-n:0):t}function x(t){function e(t,r,n){return t.interval[n]=0}var _=r(1),w=1e-4,b=9007199254740991,S=/^(?:(\d{4})(?:[-\/](\d{1,2})(?:[-\/](\d{1,2})(?:[T ](\d{1,2})(?::(\d\d)(?::(\d\d)(?:[.,](\d+))?)?)?(Z|[\+\-]\d\d:?\d\d)?)?)?)?)?$/;e.linearMap=i,e.parsePercent=a,e.round=o,e.asc=s,e.getPrecision=l,e.getPrecisionSafe=h,e.getPixelPrecision=u,e.getPercentWithPrecision=c,e.MAX_SAFE_INTEGER=b,e.remRadian=f,e.isRadianAroundZero=d,e.parseDate=p,e.quantity=v,e.nice=m,e.reformIntervals=x,e.isNumeric=y},function(t,e,r){var n=r(52),i=r(75),a=r(24),o=r(74),s=r(1),l=function(t){a.call(this,t),i.call(this,t),o.call(this,t),this.id=t.id||n()};l.prototype={type:"element",name:"",__zr:null,ignore:!1,clipPath:null,drift:function(t,e){switch(this.draggable){case"horizontal":e=0;break;case"vertical":t=0}var r=this.transform;r||(r=this.transform=[1,0,0,1,0,0]),r[4]+=t,r[5]+=e,this.decomposeTransform(),this.dirty(!1)},beforeUpdate:function(){},afterUpdate:function(){},update:function(){this.updateTransform()},traverse:function(t,e){},attrKV:function(t,e){if("position"===t||"scale"===t||"origin"===t){if(e){var r=this[t];r||(r=this[t]=[]),r[0]=e[0],r[1]=e[1]}}else this[t]=e},hide:function(){this.ignore=!0,this.__zr&&this.__zr.refresh()},show:function(){this.ignore=!1,this.__zr&&this.__zr.refresh()},attr:function(t,e){if("string"==typeof t)this.attrKV(t,e);else if(s.isObject(t))for(var r in t)t.hasOwnProperty(r)&&this.attrKV(r,t[r]);return this.dirty(!1),this},setClipPath:function(t){var e=this.__zr;e&&t.addSelfToZr(e),this.clipPath&&this.clipPath!==t&&this.removeClipPath(),this.clipPath=t,t.__zr=e,t.__clipTarget=this,this.dirty(!1)},removeClipPath:function(){var t=this.clipPath;t&&(t.__zr&&t.removeSelfFromZr(t.__zr),t.__zr=null,t.__clipTarget=null,this.clipPath=null,this.dirty(!1))},addSelfToZr:function(t){this.__zr=t;var e=this.animators;if(e)for(var r=0;r=this._maxSize&&o>0){var l=r.head;r.remove(l),delete n[l.key],a=l.value,this._lastRemovedEntry=l}s?s.value=e:s=new i(e),s.key=t,r.insertEntry(s),n[t]=s}return a},o.get=function(t){var e=this._map[t],r=this._list;if(null!=e)return e!==r.tail&&(r.remove(e),r.insertEntry(e)),e.value},o.clear=function(){this._list.clear(),this._map={}};var s=a;t.exports=s},function(t,e){function r(t){var e={},r={},n=t.match(/Firefox\/([\d.]+)/),i=t.match(/MSIE\s([\d.]+)/)||t.match(/Trident\/.+?rv:(([\d.]+))/),a=t.match(/Edge\/([\d.]+)/),o=/micromessenger/i.test(t);return n&&(r.firefox=!0,r.version=n[1]),i&&(r.ie=!0,r.version=i[1]),a&&(r.edge=!0,r.version=a[1]),o&&(r.weChat=!0),{browser:r,os:e,node:!1,canvasSupported:!!document.createElement("canvas").getContext,svgSupported:"undefined"!=typeof SVGRect,touchEventsSupported:"ontouchstart"in window&&!r.ie&&!r.edge,pointerEventsSupported:"onpointerdown"in window&&(r.edge||r.ie&&r.version>=11)}}var n={};n="undefined"==typeof navigator?{browser:{},os:{},node:!0,canvasSupported:!0,svgSupported:!0}:r(navigator.userAgent);var i=n;t.exports=i},function(t,e){var r=function(t){this.colorStops=t||[]};r.prototype={constructor:r,addColorStop:function(t,e){this.colorStops.push({offset:t,color:e})}};var n=r;t.exports=n},function(t,e,r){function n(t,e,r){var n=e.points,o=e.smooth;if(n&&n.length>=2){if(o&&"spline"!==o){var s=a(n,o,r,e.smoothConstraint);t.moveTo(n[0][0],n[0][1]);for(var l=n.length,h=0;h<(r?l:l-1);h++){var u=s[2*h],c=s[2*h+1],f=n[(h+1)%l];t.bezierCurveTo(u[0],u[1],c[0],c[1],f[0],f[1])}}else{"spline"===o&&(n=i(n,r)),t.moveTo(n[0][0],n[0][1]);for(var h=1,d=n.length;hl&&(c=r+n,r*=l/c,n*=l/c),i+a>l&&(c=i+a,i*=l/c,a*=l/c),n+i>h&&(c=n+i,n*=h/c,i*=h/c),r+a>h&&(c=r+a,r*=h/c,a*=h/c),t.moveTo(o+r,s),t.lineTo(o+l-n,s),0!==n&&t.quadraticCurveTo(o+l,s,o+l,s+n),t.lineTo(o+l,s+h-i),0!==i&&t.quadraticCurveTo(o+l,s+h,o+l-i,s+h),t.lineTo(o+a,s+h),0!==a&&t.quadraticCurveTo(o,s+h,o,s+h-a),t.lineTo(o,s+r),0!==r&&t.quadraticCurveTo(o,s,o+r,s)}e.buildPath=r},function(t,e,r){function n(t){return i(t),T(t.rich,i),t}function i(t){if(t){t.font=C.makeFont(t);var e=t.textAlign;"middle"===e&&(e="center"),t.textAlign=null==e||O[e]?e:"left";var r=t.textVerticalAlign||t.textBaseline;"center"===r&&(r="middle"),t.textVerticalAlign=null==r||D[r]?r:"top";var n=t.textPadding;n&&(t.textPadding=M(t.textPadding))}}function a(t,e,r,n,i){n.rich?s(t,e,r,n,i):o(t,e,r,n,i)}function o(t,e,r,n,i){var a=v(e,"font",n.font||C.DEFAULT_FONT),o=n.textPadding,s=t.__textCotentBlock;s&&!t.__dirty||(s=t.__textCotentBlock=C.parsePlainText(r,a,o,n.truncate));var l=s.outerHeight,u=s.lines,d=s.lineHeight,x=p(l,n,i),_=x.baseX,w=x.baseY,b=x.textAlign,S=x.textVerticalAlign;h(e,n,i,_,w);var T=C.adjustTextY(w,l,S),M=_,P=T,k=c(n);if(k||o){var A=C.getWidth(r,a),I=A;o&&(I+=o[1]+o[3]);var O=C.adjustTextX(_,I,b);k&&f(t,e,n,O,T,I,l),o&&(M=y(_,b,o),P+=o[0])}v(e,"textAlign",b||"left"),v(e,"textBaseline","middle"),v(e,"shadowBlur",n.textShadowBlur||0),v(e,"shadowColor",n.textShadowColor||"transparent"),v(e,"shadowOffsetX",n.textShadowOffsetX||0),v(e,"shadowOffsetY",n.textShadowOffsetY||0),P+=d/2;var D=n.textStrokeWidth,L=g(n.textStroke,D),B=m(n.textFill);L&&(v(e,"lineWidth",D),v(e,"strokeStyle",L)),B&&v(e,"fillStyle",B);for(var F=0;F=0&&(M=k[F],"right"===M.textAlign);)u(t,e,M,n,I,b,B,"right"),O-=M.width,B-=M.width,F--;for(L+=(a-(L-w)-(S-B)-O)/2;D<=F;)M=k[D],u(t,e,M,n,I,b,L+M.width/2,"center"),L+=M.width,D++;b+=I}}function h(t,e,r,n,i){if(r&&e.textRotation){var a=e.textOrigin;"center"===a?(n=r.width/2+r.x,i=r.height/2+r.y):a&&(n=a[0]+r.x,i=a[1]+r.y),t.translate(n,i),t.rotate(-e.textRotation),t.translate(-n,-i)}}function u(t,e,r,n,i,a,o,s){var l=n.rich[r.styleName]||{},h=r.textVerticalAlign,u=a+i/2;"top"===h?u=a+r.height/2:"bottom"===h&&(u=a+i-r.height/2),!r.isLineHolder&&c(l)&&f(t,e,l,"right"===s?o-r.width:"center"===s?o-r.width/2:o,u-r.height/2,r.width,r.height);var d=r.textPadding;d&&(o=y(o,s,d),u-=r.height/2-d[2]-r.textHeight/2),v(e,"shadowBlur",S(l.textShadowBlur,n.textShadowBlur,0)),v(e,"shadowColor",l.textShadowColor||n.textShadowColor||"transparent"),v(e,"shadowOffsetX",S(l.textShadowOffsetX,n.textShadowOffsetX,0)),v(e,"shadowOffsetY",S(l.textShadowOffsetY,n.textShadowOffsetY,0)),v(e,"textAlign",s),v(e,"textBaseline","middle"),v(e,"font",r.font||C.DEFAULT_FONT);var p=g(l.textStroke||n.textStroke,_),x=m(l.textFill||n.textFill),_=b(l.textStrokeWidth,n.textStrokeWidth);p&&(v(e,"lineWidth",_),v(e,"strokeStyle",p),e.strokeText(r.text,o,u)),x&&(v(e,"fillStyle",x),e.fillText(r.text,o,u))}function c(t){return t.textBackgroundColor||t.textBorderWidth&&t.textBorderColor}function f(t,e,r,n,i,a,o){var s=r.textBackgroundColor,l=r.textBorderWidth,h=r.textBorderColor,u=P(s);if(v(e,"shadowBlur",r.textBoxShadowBlur||0),v(e,"shadowColor",r.textBoxShadowColor||"transparent"),v(e,"shadowOffsetX",r.textBoxShadowOffsetX||0),v(e,"shadowOffsetY",r.textBoxShadowOffsetY||0),u||l&&h){e.beginPath();var c=r.textBorderRadius;c?A.buildPath(e,{x:n,y:i,width:a,height:o,r:c}):e.rect(n,i,a,o),e.closePath()}if(u)v(e,"fillStyle",s),e.fill();else if(k(s)){var f=s.image;f=I.createOrUpdateImage(f,null,t,d,s),f&&I.isImageReady(f)&&e.drawImage(f,n,i,a,o)}l&&h&&(v(e,"lineWidth",l),v(e,"strokeStyle",h),e.stroke())}function d(t,e){e.image=t}function p(t,e,r){var n=e.x||0,i=e.y||0,a=e.textAlign,o=e.textVerticalAlign;if(r){var s=e.textPosition;if(s instanceof Array)n=r.x+x(s[0],r.width),i=r.y+x(s[1],r.height);else{var l=C.adjustTextPositionOnRect(s,r,e.textDistance);n=l.x,i=l.y,a=a||l.textAlign,o=o||l.textVerticalAlign}var h=e.textOffset;h&&(n+=h[0],i+=h[1])}return{baseX:n,baseY:i,textAlign:a,textVerticalAlign:o}}function v(t,e,r){return t[e]=r,t[e]}function g(t,e){return null==t||e<=0||"transparent"===t||"none"===t?null:t.image||t.colorStops?"#000":t}function m(t){return null==t||"none"===t?null:t.image||t.colorStops?"#000":t}function x(t,e){return"string"==typeof t?t.lastIndexOf("%")>=0?parseFloat(t)/100*e:parseFloat(t):t}function y(t,e,r){return"right"===e?t-r[1]:"center"===e?t+r[3]/2-r[1]/2:t+r[3]}function _(t,e){return null!=t&&(t||e.textBackgroundColor||e.textBorderWidth&&e.textBorderColor||e.textPadding)}var w=r(1),b=w.retrieve2,S=w.retrieve3,T=w.each,M=w.normalizeCssArray,P=w.isString,k=w.isObject,C=r(6),A=r(22),I=r(12),O={left:1,right:1,center:1},D={top:1,bottom:1,middle:1};e.normalizeTextStyle=n,e.renderText=a,e.getStroke=g,e.getFill=m,e.needDrawText=_},function(t,e,r){function n(t){return t>s||t<-s}var i=r(10),a=r(3),o=i.identity,s=5e-5,l=function(t){t=t||{},t.position||(this.position=[0,0]),null==t.rotation&&(this.rotation=0),t.scale||(this.scale=[1,1]),this.origin=this.origin||null},h=l.prototype;h.transform=null,h.needLocalTransform=function(){return n(this.rotation)||n(this.position[0])||n(this.position[1])||n(this.scale[0]-1)||n(this.scale[1]-1)},h.updateTransform=function(){var t=this.parent,e=t&&t.transform,r=this.needLocalTransform(),n=this.transform;return r||e?(n=n||i.create(),r?this.getLocalTransform(n):o(n),e&&(r?i.mul(n,t.transform,n):i.copy(n,t.transform)),this.transform=n,this.invTransform=this.invTransform||i.create(),void i.invert(this.invTransform,n)):void(n&&o(n))},h.getLocalTransform=function(t){return l.getLocalTransform(this,t)},h.setTransform=function(t){var e=this.transform,r=t.dpr||1;e?t.setTransform(r*e[0],r*e[1],r*e[2],r*e[3],r*e[4],r*e[5]):t.setTransform(r,0,0,r,0,0)},h.restoreTransform=function(t){var e=t.dpr||1;t.setTransform(e,0,0,e,0,0)};var u=[];h.decomposeTransform=function(){if(this.transform){var t=this.parent,e=this.transform;t&&t.transform&&(i.mul(u,t.invTransform,e),e=u);var r=e[0]*e[0]+e[1]*e[1],a=e[2]*e[2]+e[3]*e[3],o=this.position,s=this.scale;n(r-1)&&(r=Math.sqrt(r)),n(a-1)&&(a=Math.sqrt(a)),e[0]<0&&(r=-r),e[3]<0&&(a=-a),o[0]=e[4],o[1]=e[5],s[0]=r,s[1]=a,this.rotation=Math.atan2(-e[1]/a,e[0]/r)}},h.getGlobalScale=function(){var t=this.transform;if(!t)return[1,1];var e=Math.sqrt(t[0]*t[0]+t[1]*t[1]),r=Math.sqrt(t[2]*t[2]+t[3]*t[3]);return t[0]<0&&(e=-e),t[3]<0&&(r=-r),[e,r]},h.transformCoordToLocal=function(t,e){var r=[t,e],n=this.invTransform;return n&&a.applyTransform(r,r,n),r},h.transformCoordToGlobal=function(t,e){var r=[t,e],n=this.transform;return n&&a.applyTransform(r,r,n),r},l.getLocalTransform=function(t,e){e=e||[],o(e);var r=t.origin,n=t.scale||[1,1],a=t.rotation||0,s=t.position||[0,0];return r&&(e[4]-=r[0],e[5]-=r[1]),i.scale(e,e,n),a&&i.rotate(e,e,a),r&&(e[4]+=r[0],e[5]+=r[1]),e[4]+=s[0],e[5]+=s[1],e};var c=l;t.exports=c},function(t,e,r){function n(t){return t=Math.round(t),t<0?0:t>255?255:t}function i(t){return t=Math.round(t),t<0?0:t>360?360:t}function a(t){return t<0?0:t>1?1:t}function o(t){return n(t.length&&"%"===t.charAt(t.length-1)?parseFloat(t)/100*255:parseInt(t,10))}function s(t){return a(t.length&&"%"===t.charAt(t.length-1)?parseFloat(t)/100:parseFloat(t))}function l(t,e,r){return r<0?r+=1:r>1&&(r-=1),6*r<1?t+(e-t)*r*6:2*r<1?e:3*r<2?t+(e-t)*(2/3-r)*6:t}function h(t,e,r){return t+(e-t)*r}function u(t,e,r,n,i){return t[0]=e,t[1]=r,t[2]=n,t[3]=i,t}function c(t,e){return t[0]=e[0],t[1]=e[1],t[2]=e[2],t[3]=e[3],t}function f(t,e){P&&c(P,e),P=M.put(t,P||e.slice())}function d(t,e){if(t){e=e||[];var r=M.get(t);if(r)return c(e,r);t+="";var n=t.replace(/ /g,"").toLowerCase();if(n in T)return c(e,T[n]),f(t,e),e;if("#"!==n.charAt(0)){var i=n.indexOf("("),a=n.indexOf(")");if(i!==-1&&a+1===n.length){var l=n.substr(0,i),h=n.substr(i+1,a-(i+1)).split(","),d=1;switch(l){case"rgba":if(4!==h.length)return void u(e,0,0,0,1);d=s(h.pop());case"rgb":return 3!==h.length?void u(e,0,0,0,1):(u(e,o(h[0]),o(h[1]),o(h[2]),d),f(t,e),e);case"hsla":return 4!==h.length?void u(e,0,0,0,1):(h[3]=s(h[3]),p(h,e),f(t,e),e);case"hsl":return 3!==h.length?void u(e,0,0,0,1):(p(h,e),f(t,e),e);default:return}}u(e,0,0,0,1)}else{if(4===n.length){var v=parseInt(n.substr(1),16);return v>=0&&v<=4095?(u(e,(3840&v)>>4|(3840&v)>>8,240&v|(240&v)>>4,15&v|(15&v)<<4,1),f(t,e),e):void u(e,0,0,0,1)}if(7===n.length){var v=parseInt(n.substr(1),16);return v>=0&&v<=16777215?(u(e,(16711680&v)>>16,(65280&v)>>8,255&v,1),f(t,e),e):void u(e,0,0,0,1)}}}}function p(t,e){var r=(parseFloat(t[0])%360+360)%360/360,i=s(t[1]),a=s(t[2]),o=a<=.5?a*(i+1):a+i-a*i,h=2*a-o;return e=e||[],u(e,n(255*l(h,o,r+1/3)),n(255*l(h,o,r)),n(255*l(h,o,r-1/3)),1),4===t.length&&(e[3]=t[3]),e}function v(t){if(t){var e,r,n=t[0]/255,i=t[1]/255,a=t[2]/255,o=Math.min(n,i,a),s=Math.max(n,i,a),l=s-o,h=(s+o)/2;if(0===l)e=0,r=0;else{r=h<.5?l/(s+o):l/(2-s-o);var u=((s-n)/6+l/2)/l,c=((s-i)/6+l/2)/l,f=((s-a)/6+l/2)/l;n===s?e=f-c:i===s?e=1/3+u-f:a===s&&(e=2/3+c-u),e<0&&(e+=1),e>1&&(e-=1)}var d=[360*e,r,h];return null!=t[3]&&d.push(t[3]),d}}function g(t,e){var r=d(t);if(r){for(var n=0;n<3;n++)e<0?r[n]=r[n]*(1-e)|0:r[n]=(255-r[n])*e+r[n]|0;return b(r,4===r.length?"rgba":"rgb")}}function m(t){var e=d(t);if(e)return((1<<24)+(e[0]<<16)+(e[1]<<8)+ +e[2]).toString(16).slice(1)}function x(t,e,r){if(e&&e.length&&t>=0&&t<=1){r=r||[];var i=t*(e.length-1),o=Math.floor(i),s=Math.ceil(i),l=e[o],u=e[s],c=i-o;return r[0]=n(h(l[0],u[0],c)),r[1]=n(h(l[1],u[1],c)),r[2]=n(h(l[2],u[2],c)),r[3]=a(h(l[3],u[3],c)),r}}function y(t,e,r){if(e&&e.length&&t>=0&&t<=1){var i=t*(e.length-1),o=Math.floor(i),s=Math.ceil(i),l=d(e[o]),u=d(e[s]),c=i-o,f=b([n(h(l[0],u[0],c)),n(h(l[1],u[1],c)),n(h(l[2],u[2],c)),a(h(l[3],u[3],c))],"rgba");return r?{color:f,leftIndex:o,rightIndex:s,value:i}:f}}function _(t,e,r,n){if(t=d(t))return t=v(t),null!=e&&(t[0]=i(e)),null!=r&&(t[1]=s(r)),null!=n&&(t[2]=s(n)),b(p(t),"rgba")}function w(t,e){if(t=d(t),t&&null!=e)return t[3]=a(e),b(t,"rgba")}function b(t,e){if(t&&t.length){var r=t[0]+","+t[1]+","+t[2];return"rgba"!==e&&"hsva"!==e&&"hsla"!==e||(r+=","+t[3]),e+"("+r+")"}}var S=r(18),T={transparent:[0,0,0,0],aliceblue:[240,248,255,1],antiquewhite:[250,235,215,1],aqua:[0,255,255,1],aquamarine:[127,255,212,1],azure:[240,255,255,1],beige:[245,245,220,1],bisque:[255,228,196,1],black:[0,0,0,1],blanchedalmond:[255,235,205,1],blue:[0,0,255,1],blueviolet:[138,43,226,1],brown:[165,42,42,1],burlywood:[222,184,135,1],cadetblue:[95,158,160,1],chartreuse:[127,255,0,1],chocolate:[210,105,30,1],coral:[255,127,80,1],cornflowerblue:[100,149,237,1],cornsilk:[255,248,220,1],crimson:[220,20,60,1],cyan:[0,255,255,1],darkblue:[0,0,139,1],darkcyan:[0,139,139,1],darkgoldenrod:[184,134,11,1],darkgray:[169,169,169,1],darkgreen:[0,100,0,1],darkgrey:[169,169,169,1],darkkhaki:[189,183,107,1],darkmagenta:[139,0,139,1],darkolivegreen:[85,107,47,1],darkorange:[255,140,0,1],darkorchid:[153,50,204,1],darkred:[139,0,0,1],darksalmon:[233,150,122,1],darkseagreen:[143,188,143,1],darkslateblue:[72,61,139,1],darkslategray:[47,79,79,1],darkslategrey:[47,79,79,1],darkturquoise:[0,206,209,1],darkviolet:[148,0,211,1],deeppink:[255,20,147,1],deepskyblue:[0,191,255,1],dimgray:[105,105,105,1],dimgrey:[105,105,105,1],dodgerblue:[30,144,255,1],firebrick:[178,34,34,1],floralwhite:[255,250,240,1],forestgreen:[34,139,34,1],fuchsia:[255,0,255,1],gainsboro:[220,220,220,1],ghostwhite:[248,248,255,1],gold:[255,215,0,1],goldenrod:[218,165,32,1],gray:[128,128,128,1],green:[0,128,0,1],greenyellow:[173,255,47,1],grey:[128,128,128,1],honeydew:[240,255,240,1],hotpink:[255,105,180,1],indianred:[205,92,92,1],indigo:[75,0,130,1],ivory:[255,255,240,1],khaki:[240,230,140,1],lavender:[230,230,250,1],lavenderblush:[255,240,245,1],lawngreen:[124,252,0,1],lemonchiffon:[255,250,205,1],lightblue:[173,216,230,1],lightcoral:[240,128,128,1],lightcyan:[224,255,255,1],lightgoldenrodyellow:[250,250,210,1],lightgray:[211,211,211,1],lightgreen:[144,238,144,1],lightgrey:[211,211,211,1],lightpink:[255,182,193,1],lightsalmon:[255,160,122,1],lightseagreen:[32,178,170,1],lightskyblue:[135,206,250,1],lightslategray:[119,136,153,1],lightslategrey:[119,136,153,1],lightsteelblue:[176,196,222,1],lightyellow:[255,255,224,1],lime:[0,255,0,1],limegreen:[50,205,50,1],linen:[250,240,230,1],magenta:[255,0,255,1],maroon:[128,0,0,1],mediumaquamarine:[102,205,170,1],mediumblue:[0,0,205,1],mediumorchid:[186,85,211,1],mediumpurple:[147,112,219,1],mediumseagreen:[60,179,113,1],mediumslateblue:[123,104,238,1],mediumspringgreen:[0,250,154,1],mediumturquoise:[72,209,204,1],mediumvioletred:[199,21,133,1],midnightblue:[25,25,112,1],mintcream:[245,255,250,1],mistyrose:[255,228,225,1],moccasin:[255,228,181,1],navajowhite:[255,222,173,1],navy:[0,0,128,1],oldlace:[253,245,230,1],olive:[128,128,0,1],olivedrab:[107,142,35,1],orange:[255,165,0,1],orangered:[255,69,0,1],orchid:[218,112,214,1],palegoldenrod:[238,232,170,1],palegreen:[152,251,152,1],paleturquoise:[175,238,238,1],palevioletred:[219,112,147,1],papayawhip:[255,239,213,1],peachpuff:[255,218,185,1],peru:[205,133,63,1],pink:[255,192,203,1],plum:[221,160,221,1],powderblue:[176,224,230,1],purple:[128,0,128,1],red:[255,0,0,1],rosybrown:[188,143,143,1],royalblue:[65,105,225,1],saddlebrown:[139,69,19,1],salmon:[250,128,114,1],sandybrown:[244,164,96,1],seagreen:[46,139,87,1],seashell:[255,245,238,1],sienna:[160,82,45,1],silver:[192,192,192,1],skyblue:[135,206,235,1],slateblue:[106,90,205,1],slategray:[112,128,144,1],slategrey:[112,128,144,1],snow:[255,250,250,1],springgreen:[0,255,127,1],steelblue:[70,130,180,1],tan:[210,180,140,1],teal:[0,128,128,1],thistle:[216,191,216,1],tomato:[255,99,71,1],turquoise:[64,224,208,1],violet:[238,130,238,1],wheat:[245,222,179,1],white:[255,255,255,1],whitesmoke:[245,245,245,1],yellow:[255,255,0,1],yellowgreen:[154,205,50,1]},M=new S(20),P=null,k=x,C=y;e.parse=d,e.lift=g,e.toHex=m,e.fastLerp=x,e.fastMapToColor=k,e.lerp=y,e.mapToColor=C,e.modifyHSL=_,e.modifyAlpha=w,e.stringify=b},function(t,e,r){var n=r(8);r(28),r(29),n.registerVisual(n.util.curry(r(40),"liquidFill"))},function(t,e,r){function n(t,e,r,n){return 0===e?[[t+.5*r/Math.PI/2,n/2],[t+.5*r/Math.PI,n],[t+r/4,n]]:1===e?[[t+.5*r/Math.PI/2*(Math.PI-2),n],[t+.5*r/Math.PI/2*(Math.PI-1),n/2],[t+r/4,0]]:2===e?[[t+.5*r/Math.PI/2,-n/2],[t+.5*r/Math.PI,-n],[t+r/4,-n]]:[[t+.5*r/Math.PI/2*(Math.PI-2),-n],[t+.5*r/Math.PI/2*(Math.PI-1),-n/2],[t+r/4,0]]}var i=r(8);t.exports=i.graphic.extendShape({type:"ec-liquid-fill",shape:{waveLength:0,radius:0,cx:0,cy:0,waterLevel:0,amplitude:0,phase:0,inverse:!1},style:{fill:"#0f0"},buildPath:function(t,e){for(var r=Math.max(2*Math.ceil(2*e.radius/e.waveLength*4),8);e.phase<2*-Math.PI;)e.phase+=2*Math.PI;for(;e.phase>0;)e.phase-=2*Math.PI;var i=e.phase/Math.PI/2*e.waveLength,a=e.cx-e.radius+i-2*e.radius;t.moveTo(a,e.waterLevel);for(var o=0,s=0;ss?(s*=2*t/o,o=2*t):(o*=2*t/s,s=2*t);var l=e?0:k-o/2,h=e?0:C-s/2;return r=n.graphic.makePath(I.slice(7),{},new n.graphic.BoundingRect(l,h,o,s)),e&&(r.position=[-o/2,-s/2]),r}if(A){var u=e?-t[0]:k-t[0],c=e?-t[1]:C-t[1];return a.createSymbol("rect",u,c,2*t[0],2*t[1])}var u=e?-t:k-t,c=e?-t:C-t;return"pin"===I?c+=t:"arrow"===I&&(c-=t),a.createSymbol(I,u,c,2*t,2*t)}return new n.graphic.Circle({shape:{ +cx:e?0:k,cy:e?0:C,r:t}})}function l(){var e=i(T);return e.style.fill=null,e.setStyle(t.getModel("outline.itemStyle").getItemStyle()),e}function h(){var e=i(m);e.setStyle(t.getModel("backgroundStyle").getItemStyle()),e.style.fill=null,e.z2=5;var r=i(m);r.setStyle(t.getModel("backgroundStyle").getItemStyle()),r.style.stroke=null;var a=new n.graphic.Group;return a.add(e),a.add(r),a}function u(t,e,r){var a=A?m[0]:m,l=A?m[1]:m,h=p.getItemModel(t),u=h.getModel("itemStyle"),c=h.get("phase"),f=o(h.get("amplitude"),2*l),d=o(h.get("waveLength"),2*a),v=p.get("value",t),g=l-v*l*2;c=r?r.shape.phase:"auto"===c?t*Math.PI/4:c;var x=u.getModel("normal").getItemStyle();x.fill=p.getItemVisual(t,"color");var y=2*a,_=new s({shape:{waveLength:d,radius:a,cx:y,cy:0,waterLevel:g,amplitude:f,phase:c,inverse:e},style:x,position:[k,C]});_.shape._waterLevel=g;var w=u.getModel("emphasis").getItemStyle();w.lineWidth=0,n.graphic.setHoverStyle(_,w);var b=i(m,!0);return b.setStyle({fill:"white"}),_.setClipPath(b),_}function c(t,e,r){var n=p.getItemModel(t),i=n.get("period"),a=n.get("direction"),o=p.get("value",t),s=n.get("phase");s=r?r.shape.phase:"auto"===s?t*Math.PI/4:s;var l=function(e){var r=p.count();return 0===r?e:e*(.2+(r-t)/r*.8)},h=0;h="auto"===i?l(5e3):"function"==typeof i?i(o,t):i;var u=0;"right"===a||null==a?u=Math.PI:"left"===a?u=-Math.PI:"none"===a?u=0:console.error("Illegal direction value for liquid fill."),"none"!==a&&n.get("waveAnimation")&&e.animate("shape",!0).when(0,{phase:s}).when(h/2,{phase:u+s}).when(h,{phase:2*u+s}).during(function(){B&&B.dirty(!0)}).start()}function f(e){function r(){var e=t.getFormattedLabel(0,"normal"),r=100*p.get("value",0),n=p.getName(0)||t.name;return isNaN(r)||(n=r.toFixed(0)+"%"),null==e?n:e}var a=v.getModel("label.normal"),o=a.getModel("textStyle"),s={z2:10,shape:{x:D,y:L,width:2*(A?m[0]:m),height:2*(A?m[1]:m)},style:{fill:"transparent",text:r(),textAlign:o.get("align"),textVerticalAlign:o.get("baseline")},silent:!0},l=new n.graphic.Rect(s),h=a.get("color")||o.get("color");n.graphic.setText(l.style,a,h);var u=new n.graphic.Rect(s),c=o.get("insideColor")||a.get("insideColor");n.graphic.setText(u.style,a,c),u.style.textFill=c;var f=new n.graphic.Group;f.add(l),f.add(u);var d=i(m,!0);return B=new n.graphic.CompoundPath({shape:{paths:e},position:[k,C]}),B.setClipPath(d),u.setClipPath(B),f}var d=this.group;d.removeAll();var p=t.getData(),v=p.getItemModel(0),g=v.get("center"),m=v.get("radius"),x=r.getWidth(),y=r.getHeight(),_=Math.min(x,y),w=0,b=0,S=t.get("outline.show");S&&(w=t.get("outline.borderDistance"),b=o(t.get("outline.itemStyle.borderWidth"),_));var T,M,P,k=o(g[0],x),C=o(g[1],y),A=!1,I=t.get("shape");if("container"===I?(A=!0,T=[x/2,y/2],M=[T[0]-b/2,T[1]-b/2],P=[o(w,x),o(w,y)],m=[M[0]-P[0],M[1]-P[1]]):(T=o(m,_)/2,M=T-b/2,P=o(w,_),m=M-P),S){var O=l();O.style.lineWidth=b,d.add(l())}var D=A?0:k-m,L=A?0:C-m,B=null;d.add(h());var F=this._data,R=[];p.diff(F).add(function(e){var r=u(e,!1),i=r.shape.waterLevel;r.shape.waterLevel=A?m[1]:m,n.graphic.initProps(r,{shape:{waterLevel:i}},t),r.z2=2,c(e,r,null),d.add(r),p.setItemGraphicEl(e,r),R.push(r)}).update(function(e,r){var i=F.getItemGraphicEl(r),a=u(e,!1,i),o=Object.assign({},a.shape),s=Object.assign({},a.style);s.host=null,n.graphic.updateProps(i,{shape:o,style:s},t),i.position=a.position,i.setClipPath(a.clipPath),c(e,i,i),d.add(i),p.setItemGraphicEl(e,i),R.push(i)}).remove(function(t){var e=F.getItemGraphicEl(t);d.remove(e)}).execute(),d.add(f(R)),this._data=p},dispose:function(){}})},function(t,e,r){function n(t,e,r){function n(t,e,r){c[e]?t.otherDims[e]=r:(t.coordDim=e,t.coordDimIndex=r,g.set(e,!0))}function o(t,e,r){if(r||null!=e.get(t)){for(var n=0;null!=e.get(t+n);)n++;t+=n}return e.set(t,!0),t}e=e||[],r=r||{},t=(t||[]).slice();var d=(r.dimsDef||[]).slice(),p=a.createHashMap(r.encodeDef),v=a.createHashMap(),g=a.createHashMap(),m=[],x=r.dimCount;if(null==x){var y=i(e[0]);x=Math.max(a.isArray(y)&&y.length||1,t.length,d.length),l(t,function(t){var e=t.dimsDef;e&&(x=Math.max(x,e.length))})}for(var _=0;_1?"."+t[1]:""))}function i(t,e){return t=(t||"").toLowerCase().replace(/-(.)/g,function(t,e){return e.toUpperCase()}),e&&t&&(t=t.charAt(0).toUpperCase()+t.slice(1)),t}function a(t){return String(t).replace(/&/g,"&").replace(//g,">").replace(/"/g,""").replace(/'/g,"'")}function o(t,e,r){c.isArray(e)||(e=[e]);var n=e.length;if(!n)return"";for(var i=e[0].$vars||[],o=0;o':""}function h(t,e,r){"week"!==t&&"month"!==t&&"quarter"!==t&&"half-year"!==t&&"year"!==t||(t="MM-dd\nyyyy");var n=d.parseDate(e),i=r?"UTC":"",a=n["get"+i+"FullYear"](),o=n["get"+i+"Month"]()+1,s=n["get"+i+"Date"](),l=n["get"+i+"Hours"](),h=n["get"+i+"Minutes"](),u=n["get"+i+"Seconds"]();return t=t.replace("MM",m(o)).replace("M",o).replace("yyyy",a).replace("yy",a%100).replace("dd",m(s)).replace("d",s).replace("hh",m(l)).replace("h",l).replace("mm",m(h)).replace("m",h).replace("ss",m(u)).replace("s",u)}function u(t){return t?t.charAt(0).toUpperCase()+t.substr(1):t}var c=r(1),f=r(6),d=r(14),p=c.normalizeCssArray,v=["a","b","c","d","e","f","g"],g=function(t,e){return"{"+t+(null==e?"":e)+"}"},m=function(t){return t<10?"0"+t:t},x=f.truncateText,y=f.getBoundingRect;e.addCommas=n,e.toCamelCase=i,e.normalizeCssArray=p,e.encodeHTML=a,e.formatTpl=o,e.formatTplSimple=s,e.getTooltipMarker=l,e.formatTime=h,e.capitalFirst=u,e.truncateText=x,e.getTextRect=y},function(t,e,r){function n(t){return t instanceof Array?t:null==t?[]:[t]}function i(t,e){if(t)for(var r=t.emphasis=t.emphasis||{},n=t.normal=t.normal||{},i=0,a=e.length;i=r.length&&r.push({option:t})}}),r}function u(t){var e=y.createHashMap();S(t,function(t,r){var n=t.exist;n&&e.set(n.id,t)}),S(t,function(t,r){var n=t.option;y.assert(!n||null==n.id||!e.get(n.id)||e.get(n.id)===t,"id duplicates: "+(n&&n.id)),n&&null!=n.id&&e.set(n.id,t),!t.keyInfo&&(t.keyInfo={})}),S(t,function(t,r){var n=t.exist,i=t.option,a=t.keyInfo;if(T(i)){if(a.name=null!=i.name?i.name+"":n?n.name:"\0-",n)a.id=n.id;else if(null!=i.id)a.id=i.id+"";else{var o=0;do a.id="\0"+a.name+"\0"+o++;while(e.get(a.id))}e.set(a.id,t)}})}function c(t){return T(t)&&t.id&&0===(t.id+"").indexOf("\0_ec_\0")}function f(t,e){function r(t,e,r){for(var i=0,a=t.length;i.5?e:t}function s(t,e,r,n,i){var o=t.length;if(1==i)for(var s=0;si;if(a)t.length=i;else for(var o=n;o=0&&!(C[r]<=e);r--);r=Math.min(r,w-2)}else{for(r=j;re);r++);r=Math.min(r-1,w-2)}j=r,H=e;var n=C[r+1]-C[r];if(0!==n)if(z=(e-C[r])/n,_)if(q=A[r],W=A[0===r?r:r-1],E=A[r>w-2?w-1:r+1],N=A[r>w-3?w-1:r+2],T)u(W,q,E,N,z,z*z,z*z*z,v(t,i),k);else{var l;if(M)l=u(W,q,E,N,z,z*z,z*z*z,V,1),l=d(V);else{if(P)return o(q,E,z);l=c(W,q,E,N,z,z*z,z*z*z)}x(t,i,l)}else if(T)s(A[r],A[r+1],z,v(t,i),k);else{var l;if(M)s(A[r],A[r+1],z,V,1),l=d(V);else{if(P)return o(A[r],A[r+1],z);l=a(A[r],A[r+1],z)}x(t,i,l)}},X=new g({target:t._target,life:b,loop:t._loop,delay:t._delay,onframe:G,ondestroy:r});return e&&"spline"!==e&&(X.easing=e),X}}}var g=r(42),m=r(25),x=r(1),y=x.isArrayLike,_=Array.prototype.slice,w=function(t,e,r,a){this._tracks={},this._target=t,this._loop=e||!1,this._getter=r||n,this._setter=a||i,this._clipCount=0,this._delay=0,this._doneList=[],this._onframeList=[],this._clipList=[]};w.prototype={when:function(t,e){var r=this._tracks;for(var n in e)if(e.hasOwnProperty(n)){if(!r[n]){r[n]=[];var i=this._getter(this._target,n);if(null==i)continue;0!==t&&r[n].push({time:0,value:f(i)})}r[n].push({time:t,value:e[n]})}return this},during:function(t){return this._onframeList.push(t),this},pause:function(){for(var t=0;tr||f+ci&&(i+=o);var p=Math.atan2(u,h);return p<0&&(p+=o),p>=n&&p<=i||p+o>=n&&p+o<=i}var i=r(17),a=i.normalizeRadian,o=2*Math.PI;e.containStroke=n},function(t,e,r){function n(t,e,r,n,a,o,s,l,h,u,c){if(0===h)return!1;var f=h;if(c>e+f&&c>n+f&&c>o+f&&c>l+f||ct+f&&u>r+f&&u>a+f&&u>s+f||ue+s&&o>n+s||ot+s&&a>r+s||ae&&u>n&&u>o&&u>l||u1&&i(),f=x.cubicAt(e,n,o,l,T[0]),v>1&&(d=x.cubicAt(e,n,o,l,T[1]))),p+=2==v?me&&s>n&&s>a||s=0&&h<=1){for(var u=0,c=x.quadraticAt(e,n,a,h),f=0;fr||s<-r)return 0;var l=Math.sqrt(r*r-s*s);S[0]=-l,S[1]=l;var h=Math.abs(n-i);if(h<1e-4)return 0;if(h%w<1e-4){n=0,i=w;var u=a?1:-1;return o>=S[0]+t&&o<=S[1]+t?u:0}if(a){var l=n;n=m(i),i=m(l)}else n=m(n),i=m(i);n>i&&(i+=w);for(var c=0,f=0;f<2;f++){var d=S[f];if(d+t>o){var p=Math.atan2(s,d),u=a?1:-1;p<0&&(p=w+p),(p>=n&&p<=i||p+w>=n&&p+w<=i)&&(p>Math.PI/2&&p<1.5*Math.PI&&(u=-u),c+=u)}}return c}function l(t,e,r,i,l){for(var h=0,u=0,c=0,g=0,m=0,x=0;x1&&(r||(h+=y(u,c,g,m,i,l))),1==x&&(u=t[x],c=t[x+1],g=u,m=c),w){case _.M:g=t[x++],m=t[x++],u=g,c=m;break;case _.L:if(r){if(f.containStroke(u,c,t[x],t[x+1],e,i,l))return!0}else h+=y(u,c,t[x],t[x+1],i,l)||0;u=t[x++],c=t[x++];break;case _.C:if(r){if(d.containStroke(u,c,t[x++],t[x++],t[x++],t[x++],t[x],t[x+1],e,i,l))return!0}else h+=a(u,c,t[x++],t[x++],t[x++],t[x++],t[x],t[x+1],i,l)||0;u=t[x++],c=t[x++];break;case _.Q:if(r){if(p.containStroke(u,c,t[x++],t[x++],t[x],t[x+1],e,i,l))return!0}else h+=o(u,c,t[x++],t[x++],t[x],t[x+1],i,l)||0;u=t[x++],c=t[x++];break;case _.A:var b=t[x++],S=t[x++],T=t[x++],M=t[x++],P=t[x++],k=t[x++],C=(t[x++],1-t[x++]),A=Math.cos(P)*T+b,I=Math.sin(P)*M+S;x>1?h+=y(u,c,A,I,i,l):(g=A,m=I);var O=(i-b)*M/T+b;if(r){if(v.containStroke(b,S,M,P,P+k,C,e,O,l))return!0}else h+=s(b,S,M,P,P+k,C,O,l);u=Math.cos(P+k)*T+b,c=Math.sin(P+k)*M+S; +break;case _.R:g=u=t[x++],m=c=t[x++];var D=t[x++],L=t[x++],A=g+D,I=m+L;if(r){if(f.containStroke(g,m,A,m,e,i,l)||f.containStroke(A,m,A,I,e,i,l)||f.containStroke(A,I,g,I,e,i,l)||f.containStroke(g,I,g,m,e,i,l))return!0}else h+=y(A,m,A,I,i,l),h+=y(g,I,g,m,i,l);break;case _.Z:if(r){if(f.containStroke(u,c,g,m,e,i,l))return!0}else h+=y(u,c,g,m,i,l);u=g,c=m}}return r||n(c,m)||(h+=y(u,c,g,m,i,l)||0),0!==h}function h(t,e,r){return l(t,0,!1,e,r)}function u(t,e,r,n){return l(t,e,!0,r,n)}var c=r(7),f=r(46),d=r(45),p=r(48),v=r(44),g=r(17),m=g.normalizeRadian,x=r(5),y=r(49),_=c.CMD,w=2*Math.PI,b=1e-4,S=[-1,-1,-1],T=[-1,-1];e.contain=h,e.containStroke=u},function(t,e,r){function n(t,e,r,n,i,o,s,l,h){if(0===s)return!1;var u=s;if(h>e+u&&h>n+u&&h>o+u||ht+u&&l>r+u&&l>i+u||le&&a>n||ai?o:0}t.exports=r},function(t,e,r){var n=r(1),i=r(15),a=r(4),o=function(t){t=t||{},i.call(this,t);for(var e in t)t.hasOwnProperty(e)&&(this[e]=t[e]);this._children=[],this.__storage=null,this.__dirty=!0};o.prototype={constructor:o,isGroup:!0,type:"group",silent:!1,children:function(){return this._children.slice()},childAt:function(t){return this._children[t]},childOfName:function(t){for(var e=this._children,r=0;r=0&&(r.splice(n,0,t),this._doAdd(t))}return this},_doAdd:function(t){t.parent&&t.parent.remove(t),t.parent=this;var e=this.__storage,r=this.__zr;e&&e!==t.__storage&&(e.addToStorage(t),t instanceof o&&t.addChildrenToStorage(e)),r&&r.refresh()},remove:function(t){var e=this.__zr,r=this.__storage,i=this._children,a=n.indexOf(i,t);return a<0?this:(i.splice(a,1),t.parent=null,r&&(r.delFromStorage(t),t instanceof o&&t.delChildrenFromStorage(r)),e&&e.refresh(),this)},removeAll:function(){var t,e,r=this._children,n=this.__storage;for(e=0;e1e-4)return s[0]=t-r,s[1]=e-n,h[0]=t+r,void(h[1]=e+n);if(v[0]=d(i)*r+t,v[1]=f(i)*n+e,g[0]=d(a)*r+t,g[1]=f(a)*n+e,u(s,v,g),c(h,v,g),i%=p,i<0&&(i+=p),a%=p,a<0&&(a+=p),i>a&&!o?a+=p:ii&&(m[0]=d(_)*r+t,m[1]=f(_)*n+e,u(s,m,s),c(h,m,h))}var l=r(3),h=r(5),u=Math.min,c=Math.max,f=Math.sin,d=Math.cos,p=2*Math.PI,v=l.create(),g=l.create(),m=l.create(),x=[],y=[];e.fromPoints=n,e.fromLine=i,e.fromCubic=a,e.fromQuadratic=o,e.fromArc=s},function(t,e){function r(){return n++}var n=2311;t.exports=r},function(t,e,r){var n=r(16),i=n.debugMode,a=function(){};1===i?a=function(){for(var t in arguments)throw new Error(arguments[t])}:i>1&&(a=function(){for(var t in arguments)console.log(arguments[t])});var o=a;t.exports=o},function(t,e,r){var n=r(2),i=n.extend({type:"compound",shape:{paths:null},_updatePathDirty:function(){for(var t=this.__dirtyPath,e=this.shape.paths,r=0;r0},extendFrom:function(t,e){if(t)for(var r in t)!t.hasOwnProperty(r)||e!==!0&&(e===!1?this.hasOwnProperty(r):null==t[r])||(this[r]=t[r])},set:function(t,e){"string"==typeof t?this[t]=e:this.extendFrom(t,!0)},clone:function(){var t=new this.constructor;return t.extendFrom(this,!0),t},getGradient:function(t,e,i){for(var a="radial"===e.type?n:r,o=a(t,e,i),s=e.colorStops,l=0;l=11?function(){var e,r=this.__clipPaths,n=this.style;if(r)for(var i=0;ir-2?r-1:d+1],c=t[d>r-3?r-1:d+2]);var g=p*p,m=p*g;i.push([n(h[0],v[0],u[0],c[0],p,g,m),n(h[1],v[1],u[1],c[1],p,g,m)])}return i}var a=r(3),o=a.distance;t.exports=i},function(t,e,r){var n=r(23),i=r(4),a=new i,o=function(){};o.prototype={constructor:o,drawRectText:function(t,e){var r=this.style;e=r.textRect||e,this.__dirty&&n.normalizeTextStyle(r,!0);var i=r.text;if(null!=i&&(i+=""),n.needDrawText(i,r)){t.save();var o=this.transform;r.transformText?this.setTransform(t):o&&(a.copy(e),a.applyTransform(o),e=a),n.renderText(this,t,i,r,e),t.restore()}}};var s=o;t.exports=s},function(t,e,r){var n=r(2),i=n.extend({type:"arc",shape:{cx:0,cy:0,r:0,startAngle:0,endAngle:2*Math.PI,clockwise:!0},style:{stroke:"#000",fill:null},buildPath:function(t,e){var r=e.cx,n=e.cy,i=Math.max(e.r,0),a=e.startAngle,o=e.endAngle,s=e.clockwise,l=Math.cos(a),h=Math.sin(a);t.moveTo(l*i+r,h*i+n),t.arc(r,n,i,a,o,!s)}});t.exports=i},function(t,e,r){function n(t,e,r){var n=t.cpx2,i=t.cpy2;return null===n||null===i?[(r?f:u)(t.x1,t.cpx1,t.cpx2,t.x2,e),(r?f:u)(t.y1,t.cpy1,t.cpy2,t.y2,e)]:[(r?c:h)(t.x1,t.cpx1,t.x2,e),(r?c:h)(t.y1,t.cpy1,t.y2,e)]}var i=r(2),a=r(3),o=r(5),s=o.quadraticSubdivide,l=o.cubicSubdivide,h=o.quadraticAt,u=o.cubicAt,c=o.quadraticDerivativeAt,f=o.cubicDerivativeAt,d=[],p=i.extend({type:"bezier-curve",shape:{x1:0,y1:0,x2:0,y2:0,cpx1:0,cpy1:0,percent:1},style:{stroke:"#000",fill:null},buildPath:function(t,e){var r=e.x1,n=e.y1,i=e.x2,a=e.y2,o=e.cpx1,h=e.cpy1,u=e.cpx2,c=e.cpy2,f=e.percent;0!==f&&(t.moveTo(r,n),null==u||null==c?(f<1&&(s(r,o,i,f,d),o=d[1],i=d[2],s(n,h,a,f,d),h=d[1],a=d[2]),t.quadraticCurveTo(o,h,i,a)):(f<1&&(l(r,o,u,i,f,d),o=d[1],u=d[2],i=d[3],l(n,h,c,a,f,d),h=d[1],c=d[2],a=d[3]),t.bezierCurveTo(o,h,u,c,i,a)))},pointAt:function(t){return n(this.shape,t,!1)},tangentAt:function(t){var e=n(this.shape,t,!0);return a.normalize(e,e)}});t.exports=p},function(t,e,r){var n=r(2),i=n.extend({type:"circle",shape:{cx:0,cy:0,r:0},buildPath:function(t,e,r){r&&t.moveTo(e.cx+e.r,e.cy),t.arc(e.cx,e.cy,e.r,0,2*Math.PI,!0)}});t.exports=i},function(t,e,r){var n=r(2),i=n.extend({type:"line",shape:{x1:0,y1:0,x2:0,y2:0,percent:1},style:{stroke:"#000",fill:null},buildPath:function(t,e){var r=e.x1,n=e.y1,i=e.x2,a=e.y2,o=e.percent;0!==o&&(t.moveTo(r,n),o<1&&(i=r*(1-o)+i*o,a=n*(1-o)+a*o),t.lineTo(i,a))},pointAt:function(t){var e=this.shape;return[e.x1*(1-t)+e.x2*t,e.y1*(1-t)+e.y2*t]}});t.exports=i},function(t,e,r){var n=r(2),i=r(21),a=n.extend({type:"polygon",shape:{points:null,smooth:!1,smoothConstraint:null},buildPath:function(t,e){i.buildPath(t,e,!0)}});t.exports=a},function(t,e,r){var n=r(2),i=r(21),a=n.extend({type:"polyline",shape:{points:null,smooth:!1,smoothConstraint:null},style:{stroke:"#000",fill:null},buildPath:function(t,e){i.buildPath(t,e,!1)}});t.exports=a},function(t,e,r){var n=r(2),i=r(22),a=n.extend({type:"rect",shape:{r:0,x:0,y:0,width:0,height:0},buildPath:function(t,e){var r=e.x,n=e.y,a=e.width,o=e.height;e.r?i.buildPath(t,e):t.rect(r,n,a,o),t.closePath()}});t.exports=a},function(t,e,r){var n=r(2),i=n.extend({type:"ring",shape:{cx:0,cy:0,r:0,r0:0},buildPath:function(t,e){var r=e.cx,n=e.cy,i=2*Math.PI;t.moveTo(r+e.r,n),t.arc(r,n,e.r,0,i,!1),t.moveTo(r+e.r0,n),t.arc(r,n,e.r0,0,i,!0)}});t.exports=i},function(t,e,r){var n=r(2),i=r(61),a=n.extend({type:"sector",shape:{cx:0,cy:0,r0:0,r:0,startAngle:0,endAngle:2*Math.PI,clockwise:!0},brush:i(n.prototype.brush),buildPath:function(t,e){var r=e.cx,n=e.cy,i=Math.max(e.r0||0,0),a=Math.max(e.r,0),o=e.startAngle,s=e.endAngle,l=e.clockwise,h=Math.cos(o),u=Math.sin(o);t.moveTo(h*i+r,u*i+n),t.lineTo(h*a+r,u*a+n),t.arc(r,n,a,o,s,!l),t.lineTo(Math.cos(s)*i+r,Math.sin(s)*i+n),0!==i&&t.arc(r,n,i,s,o,l),t.closePath()}});t.exports=a},function(t,e,r){var n=r(41),i=r(53),a=r(1),o=a.isString,s=a.isFunction,l=a.isObject,h=a.isArrayLike,u=a.indexOf,c=function(){this.animators=[]};c.prototype={constructor:c,animate:function(t,e){var r,a=!1,o=this,s=this.__zr;if(t){var l=t.split("."),h=o;a="shape"===l[0];for(var c=0,f=l.length;c0&&this.animate(t,!1).when(null==n?500:n,a).delay(i||0),this}};var f=c;t.exports=f},function(t,e){var r=Array.prototype.slice,n=function(){this._$handlers={}};n.prototype={constructor:n,one:function(t,e,r){var n=this._$handlers;if(!e||!t)return this;n[t]||(n[t]=[]);for(var i=0;i3&&(e=r.call(e,1));for(var i=this._$handlers[t],a=i.length,o=0;o4&&(e=r.call(e,1,e.length-1));for(var i=e[e.length-1],a=this._$handlers[t],o=a.length,s=0;s1&&(o*=d(_),s*=d(_));var w=(i===a?-1:1)*d((o*o*(s*s)-o*o*(m*m)-s*s*(f*f))/(o*o*(m*m)+s*s*(f*f)))||0,b=w*o*m/s,S=w*-s*f/o,T=(t+r)/2+v(c)*b-p(c)*S,M=(e+n)/2+p(c)*b+v(c)*S,P=y([1,0],[(f-b)/o,(m-S)/s]),k=[(f-b)/o,(m-S)/s],C=[(-1*f-b)/o,(-1*m-S)/s],A=y(k,C);x(k,C)<=-1&&(A=g),x(k,C)>=1&&(A=0),0===a&&A>0&&(A-=2*g),1===a&&A<0&&(A+=2*g),u.addData(h,T,M,o,s,P,A,c,a)}function i(t){if(!t)return[];var e,r=t.replace(/-/g," -").replace(/ /g," ").replace(/ /g,",").replace(/,,/g,",");for(e=0;e0&&""===g[0]&&g.shift();for(var m=0;m - + @@ -13,7 +12,7 @@ - + - + @@ -1300,6 +1300,7 @@ function (e) { if(isOK(e)){ that.imgObjList = e.data.data ; + console.log('handleChange imgObjList %o', that.imgObjList); setTimeout(function(){ cfg.activeMenuNode($(".upload_img_ele")); }, 500); @@ -1761,6 +1762,7 @@ commonAjax('GET', baseurl+'/service/dictionary/130' , "" ,function (res) { if(isOK(res)){ that.visualPartList = res.data ; + console.log('initVisualPart %o', that.visualPartList); } }) ; }, @@ -1769,6 +1771,7 @@ commonAjax('POST', baseurl+'/service/visual/display/sub/all' , data ,function (res) { if(isOK(res)){ that.visualList = res.data ; + console.log('initVisualListInfo %o', that.visualList); } }) ; }, diff --git a/src/main/webapp/page/visual/show.html b/src/main/webapp/page/visual/show.html index fe77fa1..849e0ab 100644 --- a/src/main/webapp/page/visual/show.html +++ b/src/main/webapp/page/visual/show.html @@ -17,7 +17,7 @@ - + @@ -189,11 +189,11 @@ connectTimeout: 4000, // 超时时间 // 认证信息 clientId: 'brower_' + parseInt(Math.random()/31.1*10000000000), - username: mqttUserName , - password: mqttPassword , + username: 'yinzy' , + password: 'yzy123456' , } - // client = mqtt.connect('ws://'+document.domain+':8083/mqtt', options) ; - client = mqtt.connect(mqttUrl, options) ; + client = mqtt.connect('wss://'+document.domain+'/mqtt', options) ; + // client = mqtt.connect(mqttUrl, options) ; client.on('reconnect', function(error) { console.log("reconnect"); }) diff --git a/src/test/resources/aaa.http b/src/test/resources/aaa.http index 87313bc..f086b28 100644 --- a/src/test/resources/aaa.http +++ b/src/test/resources/aaa.http @@ -2,3 +2,26 @@ GET http://iotadmin.segsvip.com/service/weixin/mp/msg?signature=582562ac83d3f558 Accept: application/json ### +GET {host1}/service/gen/dictionary +Accept: application/json +USER-KEY: 9229178248074d40b2168b27d77d9dff +#Authorization: 9229178248074d40b2168b27d77d9dff +Content-Type: application/json + + +### +GET {{host}}/service/gen/dictionary +Accept: application/json +Content-Type: application/json +USER-KEY: 426aad8a150a4d85a8fa7221085edca3 + + + + +### +GET {{host}}/service/sys/confog/info +Accept: */* +Content-Type: application/x-www-form-urlencoded +USER-KEY: {{userkey}} + +id=2 \ No newline at end of file