interface-building-pictures/src/main/java/cn/com/tenlion/buildingpictures/service/picturestemplate/IPicturesTemplateService.java

@@ -23,8 +23,6 @@ import java.util.Map;
  **/
 public interface IPicturesTemplateService {
 
-    Integer count(Map<String, Object> params) throws Exception;
-
     /**
      * 新增图片套版的模板管理
      *

interface-config-content/src/main/java/cn/com/tenlion/configcontent/service/contentmeta/IContentMetaDataService.java

@@ -2,6 +2,9 @@ package cn.com.tenlion.configcontent.service.contentmeta;
 
 
 import cn.com.tenlion.configcontent.pojo.dtos.contentmeta.ContentDTO;
+import cn.com.tenlion.configcontent.pojo.vos.contentmeta.ContentVO;
+import sun.misc.Contended;
+
 import java.util.List;
 
 /**
@@ -11,21 +14,36 @@ import java.util.List;
  * @Date: 2021-08-02 10:39:38
  * @Version: 3.0
  **/
-public interface IContentMetaDataService {
+public interface IContentMetaService {
 
     /**
      * 获取元数据
-     * @param businessIdList 业务ID集
+     * @param businessIdList
-     * @return 返回内容的数量统计
+     * @return
      */
    List<ContentDTO> getMetaData(List<String> businessIdList);
 
     /**
-     * 获取元数据 (包含是否已点赞/是否已收藏)
+     * 查询
-     * @param userId 登录人ID
+     * @param businessId
-     * @param businessIdList 业务ID集
+     * @return
-     * @return 返回内容的数量统计
      */
-    List<ContentDTO> getMetaData(String userId, List<String> businessIdList);
+    ContentDTO get(String businessId);
+
+    /**
+     * 数量加
+     * @param businessId
+     * @param metaName
+     * @return
+     */
+    void add(String businessId, String metaName);
+
+    /**
+     * 数量减
+     * @param businessId
+     * @param metaName
+     * @return
+     */
+    void sub(String businessId, String metaName);
 
 }

interface-data-house/pom.xml

@@ -11,11 +11,5 @@
 
     <artifactId>interface-data-house</artifactId>
 
-    <dependencies>
+
-        <dependency>
-            <artifactId>pojo-data-house</artifactId>
-            <groupId>cn.com.tenlion</groupId>
-            <version>1.0-SNAPSHOT</version>
-        </dependency>
-    </dependencies>
 </project>

module-bigdata/pom.xml

@@ -40,6 +40,7 @@
             <version>5.3.3</version>
             <scope>compile</scope>
         </dependency>
+
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpcore</artifactId>
@@ -50,16 +51,5 @@
             <artifactId>httpclient</artifactId>
             <version>4.5.6</version>
         </dependency>
-        <dependency>
-            <groupId>net.coobird</groupId>
-            <artifactId>thumbnailator</artifactId>
-            <version>0.4.8</version>
-        </dependency>
-        <dependency>
-            <groupId>cn.com.tenlion</groupId>
-            <artifactId>module-data-house</artifactId>
-            <version>1.0-SNAPSHOT</version>
-            <scope>compile</scope>
-        </dependency>
     </dependencies>
 </project>

module-bigdata/src/main/java/cn/com/tenlion/bigdata/controller/api/bigdataconfig/BigdataConfigController.java

@@ -59,23 +59,13 @@ public class BigdataConfigController extends DefaultBaseController {
         @ApiImplicitParam(name = "bigdataConfigId", value = "ID", paramType = "path")
     })
     @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
-    @PutMapping("update")
+    @PutMapping("update/{bigdataConfigId}")
     @CheckRequestBodyAnnotation
-    public SuccessResult update(@RequestBody BigdataConfigVO bigdataConfigVO) {
+    public SuccessResult update(@PathVariable("bigdataConfigId") String bigdataConfigId, @RequestBody BigdataConfigVO bigdataConfigVO) {
-        bigdataConfigService.updateData(bigdataConfigVO);
+        bigdataConfigService.update(bigdataConfigId, bigdataConfigVO);
         return new SuccessResult();
     }
 
-    @ApiOperation(value = "详情", notes = "详情接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "bigdataConfigId", value = "ID", paramType = "path")
-    })
-    @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
-    @GetMapping("getdata/{businessId}/{businessName}")
-    public BigdataConfigDTO getData(@PathVariable("businessId") String businessId, @PathVariable("businessName") String businessName) {
-        return bigdataConfigService.getData(businessId, businessName);
-    }
-
     @ApiOperation(value = "详情", notes = "详情接口")
     @ApiImplicitParams({
         @ApiImplicitParam(name = "bigdataConfigId", value = "ID", paramType = "path")

module-bigdata/src/main/java/cn/com/tenlion/bigdata/controller/api/bigdatamoduletype/BigdataModuleTypeController.java

@@ -1,6 +1,5 @@
 package cn.com.tenlion.bigdata.controller.api.bigdatamoduletype;
 
-import cn.com.tenlion.bigdata.pojo.dtos.bigdatamoduletype.BigdataModuleTypePageDTO;
 import ink.wgink.annotation.CheckRequestBodyAnnotation;
 import ink.wgink.common.base.DefaultBaseController;
 import ink.wgink.interfaces.consts.ISystemConstant;
@@ -85,15 +84,6 @@ public class BigdataModuleTypeController extends DefaultBaseController {
         return bigdataModuleTypeService.list(params);
     }
 
-
-    @ApiOperation(value = "列表", notes = "列表接口")
-    @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
-    @GetMapping("listmodule")
-    public List<BigdataModuleTypePageDTO> listModule() {
-        Map<String, Object> params = requestParams();
-        return bigdataModuleTypeService.listModule(params);
-    }
-
     @ApiOperation(value = "分页列表", notes = "分页列表接口")
     @ApiImplicitParams({
         @ApiImplicitParam(name = "page", value = "当前页码", paramType = "query", dataType = "int", defaultValue = "1"),

module-bigdata/src/main/java/cn/com/tenlion/bigdata/controller/api/bigdatatemplatearealink/BigdataTemplateAreaLinkController.java

@@ -1,8 +1,5 @@
 package cn.com.tenlion.bigdata.controller.api.bigdatatemplatearealink;
 
-import cn.com.tenlion.bigdata.pojo.dtos.bigdatatemplatearea.BigdataTemplateAreaDTO;
-import cn.com.tenlion.bigdata.pojo.dtos.bigdatatemplatearealink.BigdataTemplateAreaLinkListDTO;
-import cn.com.tenlion.bigdata.pojo.vos.bigdatatemplatearealink.BigdataTemplateAreaLinkListVO;
 import ink.wgink.annotation.CheckRequestBodyAnnotation;
 import ink.wgink.common.base.DefaultBaseController;
 import ink.wgink.interfaces.consts.ISystemConstant;
@@ -41,58 +38,50 @@ public class BigdataTemplateAreaLinkController extends DefaultBaseController {
     @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
     @PostMapping("save")
     @CheckRequestBodyAnnotation
-    public SuccessResult save(@RequestBody BigdataTemplateAreaLinkListVO listVO) {
+    public SuccessResult save(@RequestBody BigdataTemplateAreaLinkVO bigdataTemplateAreaLinkVO) {
-        bigdataTemplateAreaLinkService.saveData(listVO);
+        bigdataTemplateAreaLinkService.save(bigdataTemplateAreaLinkVO);
         return new SuccessResult();
     }
-//
-//    @ApiOperation(value = "删除", notes = "删除接口")
-//    @ApiImplicitParams({
-//        @ApiImplicitParam(name = "ids", value = "ID列表，用下划线分隔", paramType = "path", example = "1_2_3")
-//    })
-//    @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
-//    @DeleteMapping("remove/{ids}")
-//    public SuccessResult remove(@PathVariable("ids") String ids) {
-//        bigdataTemplateAreaLinkService.remove(Arrays.asList(ids.split("\\_")));
-//        return new SuccessResult();
-//    }
-//
-//    @ApiOperation(value = "修改", notes = "修改接口")
-//    @ApiImplicitParams({
-//        @ApiImplicitParam(name = "bigdataTemplateAreaLinkId", value = "ID", paramType = "path")
-//    })
-//    @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
-//    @PutMapping("update/{bigdataTemplateAreaLinkId}")
-//    @CheckRequestBodyAnnotation
-//    public SuccessResult update(@PathVariable("bigdataTemplateAreaLinkId") String bigdataTemplateAreaLinkId, @RequestBody BigdataTemplateAreaLinkVO bigdataTemplateAreaLinkVO) {
-//        bigdataTemplateAreaLinkService.update(bigdataTemplateAreaLinkId, bigdataTemplateAreaLinkVO);
-//        return new SuccessResult();
-//    }
-//
-//    @ApiOperation(value = "详情", notes = "详情接口")
-//    @ApiImplicitParams({
-//        @ApiImplicitParam(name = "bigdataTemplateAreaLinkId", value = "ID", paramType = "path")
-//    })
-//    @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
-//    @GetMapping("get/{bigdataTemplateAreaLinkId}")
-//        public BigdataTemplateAreaLinkDTO get(@PathVariable("bigdataTemplateAreaLinkId") String bigdataTemplateAreaLinkId) {
-//        return bigdataTemplateAreaLinkService.get(bigdataTemplateAreaLinkId);
-//    }
 
-    @ApiOperation(value = "区域映射连线", notes = "区域映射连线")
+    @ApiOperation(value = "删除", notes = "删除接口")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "ids", value = "ID列表，用下划线分隔", paramType = "path", example = "1_2_3")
+    })
     @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
-    @GetMapping("line/{linkSrcAreaId}")
+    @DeleteMapping("remove/{ids}")
-    public BigdataTemplateAreaLinkListDTO line(@PathVariable("linkSrcAreaId") String linkSrcAreaId) {
+    public SuccessResult remove(@PathVariable("ids") String ids) {
-        Map<String, Object> params = requestParams();
+        bigdataTemplateAreaLinkService.remove(Arrays.asList(ids.split("\\_")));
-        return bigdataTemplateAreaLinkService.listArea(linkSrcAreaId, params);
+        return new SuccessResult();
     }
 
-    @ApiOperation(value = "区域映射列表", notes = "列表接口")
+    @ApiOperation(value = "修改", notes = "修改接口")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "bigdataTemplateAreaLinkId", value = "ID", paramType = "path")
+    })
     @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
-    @GetMapping("listarea/{linkSrcAreaId}")
+    @PutMapping("update/{bigdataTemplateAreaLinkId}")
-    public BigdataTemplateAreaLinkListDTO listArea(@PathVariable("linkSrcAreaId") String linkSrcAreaId) {
+    @CheckRequestBodyAnnotation
+    public SuccessResult update(@PathVariable("bigdataTemplateAreaLinkId") String bigdataTemplateAreaLinkId, @RequestBody BigdataTemplateAreaLinkVO bigdataTemplateAreaLinkVO) {
+        bigdataTemplateAreaLinkService.update(bigdataTemplateAreaLinkId, bigdataTemplateAreaLinkVO);
+        return new SuccessResult();
+    }
+
+    @ApiOperation(value = "详情", notes = "详情接口")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "bigdataTemplateAreaLinkId", value = "ID", paramType = "path")
+    })
+    @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
+    @GetMapping("get/{bigdataTemplateAreaLinkId}")
+        public BigdataTemplateAreaLinkDTO get(@PathVariable("bigdataTemplateAreaLinkId") String bigdataTemplateAreaLinkId) {
+        return bigdataTemplateAreaLinkService.get(bigdataTemplateAreaLinkId);
+    }
+
+    @ApiOperation(value = "列表", notes = "列表接口")
+    @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
+    @GetMapping("list")
+    public List<BigdataTemplateAreaLinkDTO> list() {
         Map<String, Object> params = requestParams();
-        return bigdataTemplateAreaLinkService.listArea(linkSrcAreaId, params);
+        return bigdataTemplateAreaLinkService.list(params);
     }
 
     @ApiOperation(value = "分页列表", notes = "分页列表接口")

module-bigdata/src/main/java/cn/com/tenlion/bigdata/controller/api/bigdatatemplatearealinkmapping/BigdataTemplateAreaLinkMappingController.java

@@ -1,6 +1,5 @@
 package cn.com.tenlion.bigdata.controller.api.bigdatatemplatearealinkmapping;
 
-import cn.com.tenlion.bigdata.pojo.dtos.bigdatatemplatearealinkmapping.BigdataLinkMappingDTO;
 import ink.wgink.annotation.CheckRequestBodyAnnotation;
 import ink.wgink.common.base.DefaultBaseController;
 import ink.wgink.interfaces.consts.ISystemConstant;
@@ -35,77 +34,78 @@ public class BigdataTemplateAreaLinkMappingController extends DefaultBaseControl
     @Autowired
     private IBigdataTemplateAreaLinkMappingService bigdataTemplateAreaLinkMappingService;
 
-//    @ApiOperation(value = "新增", notes = "新增接口")
+    @ApiOperation(value = "新增", notes = "新增接口")
-//    @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
+    @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
-//    @PostMapping("save")
+    @PostMapping("save")
-//    @CheckRequestBodyAnnotation
+    @CheckRequestBodyAnnotation
-//    public SuccessResult save(@RequestBody BigdataTemplateAreaLinkMappingVO bigdataTemplateAreaLinkMappingVO) {
+    public SuccessResult save(@RequestBody BigdataTemplateAreaLinkMappingVO bigdataTemplateAreaLinkMappingVO) {
-//        bigdataTemplateAreaLinkMappingService.save(bigdataTemplateAreaLinkMappingVO);
+        bigdataTemplateAreaLinkMappingService.save(bigdataTemplateAreaLinkMappingVO);
-//        return new SuccessResult();
+        return new SuccessResult();
-//    }
+    }
-//
+
-//    @ApiOperation(value = "删除", notes = "删除接口")
+    @ApiOperation(value = "删除", notes = "删除接口")
-//    @ApiImplicitParams({
+    @ApiImplicitParams({
-//        @ApiImplicitParam(name = "ids", value = "ID列表，用下划线分隔", paramType = "path", example = "1_2_3")
+        @ApiImplicitParam(name = "ids", value = "ID列表，用下划线分隔", paramType = "path", example = "1_2_3")
-//    })
+    })
-//    @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
+    @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
-//    @DeleteMapping("remove/{ids}")
+    @DeleteMapping("remove/{ids}")
-//    public SuccessResult remove(@PathVariable("ids") String ids) {
+    public SuccessResult remove(@PathVariable("ids") String ids) {
-//        bigdataTemplateAreaLinkMappingService.remove(Arrays.asList(ids.split("\\_")));
+        bigdataTemplateAreaLinkMappingService.remove(Arrays.asList(ids.split("\\_")));
-//        return new SuccessResult();
+        return new SuccessResult();
-//    }
+    }
-//
+
-//    @ApiOperation(value = "修改", notes = "修改接口")
+    @ApiOperation(value = "修改", notes = "修改接口")
-//    @ApiImplicitParams({
+    @ApiImplicitParams({
-//        @ApiImplicitParam(name = "bigdataTemplateAreaLinkMappingId", value = "ID", paramType = "path")
+        @ApiImplicitParam(name = "bigdataTemplateAreaLinkMappingId", value = "ID", paramType = "path")
-//    })
+    })
-//    @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
+    @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
-//    @PutMapping("update/{bigdataTemplateAreaLinkMappingId}")
+    @PutMapping("update/{bigdataTemplateAreaLinkMappingId}")
-//    @CheckRequestBodyAnnotation
+    @CheckRequestBodyAnnotation
-//    public SuccessResult update(@PathVariable("bigdataTemplateAreaLinkMappingId") String bigdataTemplateAreaLinkMappingId, @RequestBody BigdataTemplateAreaLinkMappingVO bigdataTemplateAreaLinkMappingVO) {
+    public SuccessResult update(@PathVariable("bigdataTemplateAreaLinkMappingId") String bigdataTemplateAreaLinkMappingId, @RequestBody BigdataTemplateAreaLinkMappingVO bigdataTemplateAreaLinkMappingVO) {
-//        bigdataTemplateAreaLinkMappingService.update(bigdataTemplateAreaLinkMappingId, bigdataTemplateAreaLinkMappingVO);
+        bigdataTemplateAreaLinkMappingService.update(bigdataTemplateAreaLinkMappingId, bigdataTemplateAreaLinkMappingVO);
-//        return new SuccessResult();
+        return new SuccessResult();
-//    }
+    }
-//
+
-//    @ApiOperation(value = "详情", notes = "详情接口")
+    @ApiOperation(value = "详情", notes = "详情接口")
-//    @ApiImplicitParams({
+    @ApiImplicitParams({
-//        @ApiImplicitParam(name = "bigdataTemplateAreaLinkMappingId", value = "ID", paramType = "path")
+        @ApiImplicitParam(name = "bigdataTemplateAreaLinkMappingId", value = "ID", paramType = "path")
-//    })
+    })
-//    @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
+    @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
-//    @GetMapping("get/{bigdataTemplateAreaLinkMappingId}")
+    @GetMapping("get/{bigdataTemplateAreaLinkMappingId}")
-//        public BigdataTemplateAreaLinkMappingDTO get(@PathVariable("bigdataTemplateAreaLinkMappingId") String bigdataTemplateAreaLinkMappingId) {
+        public BigdataTemplateAreaLinkMappingDTO get(@PathVariable("bigdataTemplateAreaLinkMappingId") String bigdataTemplateAreaLinkMappingId) {
-//        return bigdataTemplateAreaLinkMappingService.get(bigdataTemplateAreaLinkMappingId);
+        return bigdataTemplateAreaLinkMappingService.get(bigdataTemplateAreaLinkMappingId);
-//    }
+    }
-//
+
     @ApiOperation(value = "列表", notes = "列表接口")
     @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
-    @GetMapping("mapping/{linkSrcAreaId}/{linkTargetAreaId}")
+    @GetMapping("list")
-    public BigdataLinkMappingDTO mapping(@PathVariable("linkSrcAreaId") String linkSrcAreaId, @PathVariable("linkTargetAreaId") String linkTargetAreaId) {
+    public List<BigdataTemplateAreaLinkMappingDTO> list() {
-        return bigdataTemplateAreaLinkMappingService.listMapping(linkSrcAreaId, linkTargetAreaId);
+        Map<String, Object> params = requestParams();
+        return bigdataTemplateAreaLinkMappingService.list(params);
+    }
+
+    @ApiOperation(value = "分页列表", notes = "分页列表接口")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "page", value = "当前页码", paramType = "query", dataType = "int", defaultValue = "1"),
+        @ApiImplicitParam(name = "rows", value = "显示数量", paramType = "query", dataType = "int", defaultValue = "20"),
+        @ApiImplicitParam(name = "keywords", value = "关键字", paramType = "query", dataType = "String"),
+        @ApiImplicitParam(name = "startTime", value = "开始时间", paramType = "query", dataType = "String"),
+        @ApiImplicitParam(name = "endTime", value = "结束时间", paramType = "query", dataType = "String")
+    })
+    @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
+    @GetMapping("listpage")
+    public SuccessResultList<List<BigdataTemplateAreaLinkMappingDTO>> listPage(ListPage page) {
+        Map<String, Object> params = requestParams();
+        page.setParams(params);
+        return bigdataTemplateAreaLinkMappingService.listPage(page);
+    }
+
+    @ApiOperation(value = "统计", notes = "统计接口")
+    @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
+    @GetMapping("count")
+    SuccessResultData<Integer> count() {
+        Map<String, Object> params = requestParams();
+        return new SuccessResultData<>(bigdataTemplateAreaLinkMappingService.count(params));
     }
-//
-//    @ApiOperation(value = "分页列表", notes = "分页列表接口")
-//    @ApiImplicitParams({
-//        @ApiImplicitParam(name = "page", value = "当前页码", paramType = "query", dataType = "int", defaultValue = "1"),
-//        @ApiImplicitParam(name = "rows", value = "显示数量", paramType = "query", dataType = "int", defaultValue = "20"),
-//        @ApiImplicitParam(name = "keywords", value = "关键字", paramType = "query", dataType = "String"),
-//        @ApiImplicitParam(name = "startTime", value = "开始时间", paramType = "query", dataType = "String"),
-//        @ApiImplicitParam(name = "endTime", value = "结束时间", paramType = "query", dataType = "String")
-//    })
-//    @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
-//    @GetMapping("listpage")
-//    public SuccessResultList<List<BigdataTemplateAreaLinkMappingDTO>> listPage(ListPage page) {
-//        Map<String, Object> params = requestParams();
-//        page.setParams(params);
-//        return bigdataTemplateAreaLinkMappingService.listPage(page);
-//    }
-//
-//    @ApiOperation(value = "统计", notes = "统计接口")
-//    @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
-//    @GetMapping("count")
-//    SuccessResultData<Integer> count() {
-//        Map<String, Object> params = requestParams();
-//        return new SuccessResultData<>(bigdataTemplateAreaLinkMappingService.count(params));
-//    }
 
 }

module-bigdata/src/main/java/cn/com/tenlion/bigdata/controller/apis/bigdatatemplate/BigdataTemplateController.java

@@ -43,12 +43,12 @@ public class BigdataTemplateController extends DefaultBaseController {
 
     @ApiOperation(value = "复制模板", notes = "复制模板")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "id", value = "id", paramType = "path", example = "")
+            @ApiImplicitParam(name = "id", value = "id", paramType = "String", example = "")
     })
     @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
-    @PutMapping("copybigdatatemplate/{id}/{bigdataTemplateTitle}")
+    @PutMapping("copybigdatatemplate/{id}/{bigdataTemplateCode}/{bigdataTemplateTitle}")
-    public SuccessResult copyBigdataTemplate(@PathVariable("id") String id, @PathVariable("bigdataTemplateTitle") String bigdataTemplateTitle) throws Exception {
+    public SuccessResult copyBigdataTemplate(@PathVariable("id") String id, @PathVariable("bigdataTemplateCode") String bigdataTemplateCode, @PathVariable("bigdataTemplateTitle") String bigdataTemplateTitle) throws Exception {
-        return bigdataTemplateService.copyBigdataTemplate(id, bigdataTemplateTitle);
+        return bigdataTemplateService.copyBigdataTemplate(id, bigdataTemplateCode, bigdataTemplateTitle);
     }
 
 

module-bigdata/src/main/java/cn/com/tenlion/bigdata/controller/route/bigdataconfig/BigdataConfigRouteController.java

@@ -39,19 +39,4 @@ public class BigdataConfigRouteController extends DefaultBaseController {
         return new ModelAndView("bigdataconfig/list");
     }
 
-    @GetMapping("createobj")
-    public ModelAndView createobj() {
-        return new ModelAndView("bigdataconfig/createobj");
-    }
-
-    @GetMapping("createlinkobj")
-    public ModelAndView createlinkobj() {
-        return new ModelAndView("bigdataconfig/createlinkobj");
-    }
-
-    @GetMapping("updateobj")
-    public ModelAndView updateobj() {
-        return new ModelAndView("bigdataconfig/updateobj");
-    }
-
 }

module-bigdata/src/main/java/cn/com/tenlion/bigdata/controller/route/bigdatamodule/BigdataModuleRouteController.java

@@ -74,10 +74,4 @@ public class BigdataModuleRouteController extends DefaultBaseController {
         return mv;
     }
 
-    @GetMapping("createobj")
-    public ModelAndView createObj(@RequestParam("bigdataModuleId") String bigdataModuleId) {
-        ModelAndView mv = new ModelAndView("bigdatamodule/createobj");
-        mv.addObject("bigdataModuleId", bigdataModuleId);
-        return mv;
-    }
 }

module-bigdata/src/main/java/cn/com/tenlion/bigdata/controller/route/bigdatatemplate/BigdataTemplateRouteController.java

@@ -5,7 +5,6 @@ import ink.wgink.common.base.DefaultBaseController;
 import ink.wgink.common.component.SecurityComponent;
 import ink.wgink.interfaces.consts.ISystemConstant;
 import io.swagger.annotations.Api;
-import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -13,11 +12,6 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.servlet.ModelAndView;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
 /**
  * @ClassName: BigdataTemplateRouteController
  * @Description: 大数据展示模板页面
@@ -64,24 +58,6 @@ public class BigdataTemplateRouteController extends DefaultBaseController {
     @GetMapping("savebigdatatemplatearea")
     public ModelAndView saveBigdataTemplateArea(@RequestParam("bigdataTemplateId") String bigdataTemplateId) {
         ModelAndView mv = new ModelAndView("bigdatatemplate/save-bigdatatemplatearea");
-        List<Map<String, Object>> list = new ArrayList();
-
-        Map<String, Object> moduleType1 = new HashMap<String, Object>();
-        moduleType1.put("name", "饼状图");
-
-        List<Map<String, Object>> list1 = new ArrayList();
-        Map<String, Object> module = new HashMap<String, Object>();
-        module.put("moduleName", "饼图");
-        module.put("moduleCode", "C0002");
-        module.put("moduleId", "123456");
-        module.put("moduleSrc", "1");
-        list1.add(module);
-
-        moduleType1.put("moduleList", list1);
-
-        list.add(moduleType1);
-
-        mv.addObject("moduleTypeList", list);
         mv.addObject("bigdataTemplateId", bigdataTemplateId);
         return mv;
     }

module-bigdata/src/main/java/cn/com/tenlion/bigdata/dao/bigdataconfigtree/IBigdataConfigTreeDao.java

@@ -30,6 +30,14 @@ public interface IBigdataConfigTreeDao {
      */
     void save(Map<String, Object> params) throws SaveException;
 
+    /**
+     * 删除
+     *
+     * @param params
+     * @throws RemoveException
+     */
+    void remove(Map<String, Object> params) throws RemoveException;
+
     /**
      * 删除（物理）
      *
@@ -38,6 +46,41 @@ public interface IBigdataConfigTreeDao {
      */
     void delete(Map<String, Object> params) throws RemoveException;
 
+    /**
+     * 修改
+     *
+     * @param params
+     * @throws UpdateException
+     */
+    void update(Map<String, Object> params) throws UpdateException;
+
+    /**
+     * 详情
+     *
+     * @param params
+     * @return
+     * @throws SearchException
+     */
+    BigdataConfigTreeDTO get(Map<String, Object> params) throws SearchException;
+
+    /**
+     * 详情
+     *
+     * @param params
+     * @return
+     * @throws SearchException
+     */
+    BigdataConfigTreeBO getBO(Map<String, Object> params) throws SearchException;
+
+    /**
+     * 详情
+     *
+     * @param params
+     * @return
+     * @throws SearchException
+     */
+    BigdataConfigTreePO getPO(Map<String, Object> params) throws SearchException;
+
     /**
      * 列表
      *
@@ -47,4 +90,31 @@ public interface IBigdataConfigTreeDao {
      */
     List<BigdataConfigTreeDTO> list(Map<String, Object> params) throws SearchException;
 
+    /**
+     * 列表
+     *
+     * @param params
+     * @return
+     * @throws SearchException
+     */
+    List<BigdataConfigTreeBO> listBO(Map<String, Object> params) throws SearchException;
+
+    /**
+     * 列表
+     *
+     * @param params
+     * @return
+     * @throws SearchException
+     */
+    List<BigdataConfigTreePO> listPO(Map<String, Object> params) throws SearchException;
+
+    /**
+     * 统计
+     *
+     * @param params
+     * @return
+     * @throws SearchException
+     */
+    Integer count(Map<String, Object> params) throws SearchException;
+
 }

module-bigdata/src/main/java/cn/com/tenlion/bigdata/dao/bigdatamodule/IBigdataModuleDao.java

@@ -83,12 +83,4 @@ public interface IBigdataModuleDao {
     BigdataModuleDTO getBigdataModuleByCode(String bigdataModuleCode) throws SearchException;
 
     void updateBigdataModuleSwitch(Map<String, Object> params) throws UpdateException;
-
-    void updateBigdataModuleModuleJson(Map<String, Object> params);
-
-    void updateBigdataModuleServerJson(Map<String, Object> params);
-
-    Integer count(Map<String, Object> params);
-
-    void updateBigdataModuleLinkJson(Map<String, Object> params);
 }

module-bigdata/src/main/java/cn/com/tenlion/bigdata/dao/bigdatatemplate/IBigdataTemplateDao.java

@@ -87,6 +87,4 @@ public interface IBigdataTemplateDao {
     List<Map<String, Object>> querySqlAll(String sql) throws SearchException;
 
     void updateBigdataTemplateContent(Map<String, Object> params) throws UpdateException;
-
-    Integer count(Map<String, Object> params);
 }

module-bigdata/src/main/java/cn/com/tenlion/bigdata/dao/bigdatatemplatearea/IBigdataTemplateAreaDao.java

@@ -85,12 +85,4 @@ public interface IBigdataTemplateAreaDao {
     void updateBigdataTemplateAreaPointModuleData(Map<String, Object> params) throws UpdateException;
 
     List<BigdataTemplateAreaDTO> getBigdataTemplateIdGroupByBigdataModuleId(Map<String, Object> params) throws SearchException;
-
-    void updateBigdataModuleModuleJson(Map<String, Object> params);
-
-    void updateBigdataModuleServerJson(Map<String, Object> params);
-
-    void updateBigdataModuleLinkJson(Map<String, Object> params);
-
-    Integer count(Map<String, Object> params);
 }

module-bigdata/src/main/java/cn/com/tenlion/bigdata/dao/bigdatatemplatearealink/IBigdataTemplateAreaLinkDao.java

@@ -117,5 +117,4 @@ public interface IBigdataTemplateAreaLinkDao {
      */
     Integer count(Map<String, Object> params) throws SearchException;
 
-    void deleteBySrcId(Map<String, Object> params);
 }

module-bigdata/src/main/java/cn/com/tenlion/bigdata/service/bigdataconfig/IBigdataConfigService.java

@@ -185,21 +185,4 @@ public interface IBigdataConfigService {
      */
     Integer count(Map<String, Object> params);
 
-    /**
-     * 获取数据
-     * @param businessId
-     * @param businessName
-     * @return
-     */
-    BigdataConfigDTO getData(String businessId, String businessName);
-
-    /**
-     * 更新或保存数据
-     * @param bigdataConfigVO
-     */
-    void updateData(BigdataConfigVO bigdataConfigVO);
-
-    void copyData(String bigdataConfigId, String newBusinessId, String newBusinessName);
-
-    void saveInitData(String businessId, String businessName, Map<String, Object> param, String json);
 }

module-bigdata/src/main/java/cn/com/tenlion/bigdata/service/bigdataconfig/impl/BigdataConfigServiceImpl.java

@@ -1,11 +1,5 @@
 package cn.com.tenlion.bigdata.service.bigdataconfig.impl;
 
-import cn.com.tenlion.bigdata.pojo.dtos.bigdataconfigtree.BigdataConfigTreeDTO;
-import cn.com.tenlion.bigdata.pojo.vos.bigdataconfigtree.BigdataConfigTreeVO;
-import cn.com.tenlion.bigdata.service.bigdataconfigtree.IBigdataConfigTreeService;
-import cn.com.tenlion.bigdata.service.bigdataconfigtree.impl.BigdataConfigTreeServiceImpl;
-import cn.com.tenlion.bigdata.service.bigdatamodule.IBigdataModuleService;
-import cn.com.tenlion.bigdata.service.bigdatatemplatearea.IBigdataTemplateAreaService;
 import ink.wgink.common.base.DefaultBaseService;
 import ink.wgink.pojo.ListPage;
 import ink.wgink.pojo.result.SuccessResult;
@@ -39,15 +33,6 @@ public class BigdataConfigServiceImpl extends DefaultBaseService implements IBig
     @Autowired
     private IBigdataConfigDao bigdataConfigDao;
 
-    @Autowired
-    private IBigdataConfigTreeService iBigdataConfigTreeService;
-
-    @Autowired
-    private IBigdataModuleService iBigdataModuleService;
-
-    @Autowired
-    private IBigdataTemplateAreaService iBigdataTemplateAreaService;
-
     @Override
     public void save(BigdataConfigVO bigdataConfigVO) {
         saveReturnId(bigdataConfigVO);
@@ -183,178 +168,4 @@ public class BigdataConfigServiceImpl extends DefaultBaseService implements IBig
         return count == null ? 0 : count;
     }
 
-    @Override
-    public BigdataConfigDTO getData(String businessId, String businessName) {
-        Map<String, Object> params = super.getHashMap(2);
-        params.put("businessId", businessId);
-        params.put("businessName", businessName);
-        BigdataConfigDTO data =  get(params);
-        if(data != null) {
-            List<BigdataConfigTreeDTO> list = iBigdataConfigTreeService.list(data.getBigdataConfigId());
-            data.setTreeList(list);
-        }
-        return data;
-    }
-
-    @Override
-    public void copyData(String bigdataConfigId, String newBusinessId, String newBusinessName) {
-        BigdataConfigDTO data = get(bigdataConfigId);
-        String newBigdataConfigId = UUIDUtil.get32UUID();
-        Map<String, Object> params = HashMapUtil.beanToMap(data);
-        params.put("bigdataConfigId", newBigdataConfigId);
-        params.put("businessId", newBusinessId);
-        params.put("businessName", newBusinessName);
-        setSaveInfo(params);
-        bigdataConfigDao.save(params);
-        // 旧的树形全部删除
-        iBigdataConfigTreeService.delete(newBigdataConfigId);
-        // 新的树形放入
-        iBigdataConfigTreeService.copyData(data.getBigdataConfigId(), newBigdataConfigId);
-    }
-
-    @Override
-    public void updateData(BigdataConfigVO bigdataConfigVO) {
-        BigdataConfigDTO data = getData(bigdataConfigVO.getBusinessId(), bigdataConfigVO.getBusinessName());
-        String bigdataConfigId = UUIDUtil.get32UUID();
-        if(data != null) {
-            Map<String, Object> params = HashMapUtil.beanToMap(bigdataConfigVO);
-            params.put("bigdataConfigId", bigdataConfigId = data.getBigdataConfigId());
-            setUpdateInfo(params);
-            bigdataConfigDao.update(params);
-        }else {
-            Map<String, Object> params = HashMapUtil.beanToMap(bigdataConfigVO);
-            params.put("bigdataConfigId", bigdataConfigId);
-            setSaveInfo(params);
-            bigdataConfigDao.save(params);
-        }
-        // 旧的树形全部删除
-        iBigdataConfigTreeService.delete(bigdataConfigId);
-        // 新的树形放入
-        List<BigdataConfigTreeVO> list = bigdataConfigVO.getTreeList();
-        for(BigdataConfigTreeVO vo : list) {
-            vo.setConfigId(bigdataConfigId);
-            iBigdataConfigTreeService.saveReturnId(vo);
-        }
-        if(bigdataConfigVO.getBusinessName().equals("moduleData")) {
-            iBigdataModuleService.updateBigdataModuleModuleJson(bigdataConfigVO.getBusinessId(), bigdataConfigVO.getBigdataConfigJson());
-        }
-        if(bigdataConfigVO.getBusinessName().equals("serverData")) {
-            iBigdataModuleService.updateBigdataModuleServerJson(bigdataConfigVO.getBusinessId(), bigdataConfigVO.getBigdataConfigJson());
-        }
-        if(bigdataConfigVO.getBusinessName().equals("linkData")) {
-            iBigdataModuleService.updateBigdataModuleLinkJson(bigdataConfigVO.getBusinessId(), bigdataConfigVO.getBigdataConfigJson());
-        }
-        if(bigdataConfigVO.getBusinessName().equals("moduleAreaData")) {
-            iBigdataTemplateAreaService.updateBigdataModuleModuleJson(bigdataConfigVO.getBusinessId(), bigdataConfigVO.getBigdataConfigJson());
-        }
-        if(bigdataConfigVO.getBusinessName().equals("serverAreaData")) {
-            iBigdataTemplateAreaService.updateBigdataModuleServerJson(bigdataConfigVO.getBusinessId(), bigdataConfigVO.getBigdataConfigJson());
-        }
-        if(bigdataConfigVO.getBusinessName().equals("linkAreaData")) {
-            iBigdataTemplateAreaService.updateBigdataModuleLinkJson(bigdataConfigVO.getBusinessId(), bigdataConfigVO.getBigdataConfigJson());
-        }
-
-    }
-
-    @Override
-    public void saveInitData(String businessId, String businessName, Map<String, Object> param, String json) {
-        // 初始化
-        if(businessName.equals("linkData")) {
-            BigdataConfigTreeVO linkData = new BigdataConfigTreeVO();
-            linkData.setIcon("assets/images/object.png");
-            linkData.setType("object");
-            linkData.setName("linkData");
-            linkData.setpId("0");
-            linkData.setId(UUIDUtil.get32UUID());
-            linkData.setIsParent(true);
-
-            BigdataConfigVO bigdataConfigVO = new BigdataConfigVO();
-            bigdataConfigVO.setBigdataConfigJson(json);
-            bigdataConfigVO.setBusinessId(businessId);
-            bigdataConfigVO.setBusinessName(businessName);
-            List<BigdataConfigTreeVO> treeList = new ArrayList<BigdataConfigTreeVO>();
-            treeList.add(linkData);
-            bigdataConfigVO.setTreeList(treeList);
-            updateData(bigdataConfigVO);
-        }else
-        // 初始化
-        if(businessName.equals("serverData")) {
-            BigdataConfigTreeVO linkData = new BigdataConfigTreeVO();
-            linkData.setIcon("assets/images/object.png");
-            linkData.setType("object");
-            linkData.setName("serverData");
-            linkData.setpId("0");
-            linkData.setId(UUIDUtil.get32UUID());
-            linkData.setIsParent(true);
-
-            BigdataConfigVO bigdataConfigVO = new BigdataConfigVO();
-            bigdataConfigVO.setBigdataConfigJson(json);
-            bigdataConfigVO.setBusinessId(businessId);
-            bigdataConfigVO.setBusinessName(businessName);
-            List<BigdataConfigTreeVO> treeList = new ArrayList<BigdataConfigTreeVO>();
-            treeList.add(linkData);
-            bigdataConfigVO.setTreeList(treeList);
-            updateData(bigdataConfigVO);
-        }else
-        // 初始化
-        if(businessName.equals("moduleData")) {
-            BigdataConfigVO bigdataConfigVO = new BigdataConfigVO();
-            bigdataConfigVO.setBigdataConfigJson(json);
-            bigdataConfigVO.setBusinessId(businessId);
-            bigdataConfigVO.setBusinessName(businessName);
-            List<BigdataConfigTreeVO> treeList = new ArrayList<BigdataConfigTreeVO>();
-
-            BigdataConfigTreeVO moduleData = new BigdataConfigTreeVO();
-            moduleData.setIcon("assets/images/object.png");
-            moduleData.setType("object");
-            moduleData.setName("moduleData");
-            moduleData.setpId("0");
-            moduleData.setId(UUIDUtil.get32UUID());
-            moduleData.setIsParent(true);
-
-            BigdataConfigTreeVO idData = new BigdataConfigTreeVO();
-            idData.setIcon("assets/images/string.png");
-            idData.setType("string");
-            idData.setName("id[模块编码]");
-            idData.setValue(param.get("id").toString());
-            idData.setpId(moduleData.getId());
-            idData.setId(UUIDUtil.get32UUID());
-            idData.setIsParent(false);
-
-            BigdataConfigTreeVO titleData = new BigdataConfigTreeVO();
-            titleData.setIcon("assets/images/string.png");
-            titleData.setType("string");
-            titleData.setName("title[模块标题]");
-            titleData.setValue(param.get("title").toString());
-            titleData.setpId(moduleData.getId());
-            titleData.setId(UUIDUtil.get32UUID());
-            titleData.setIsParent(false);
-
-            BigdataConfigTreeVO dataData = new BigdataConfigTreeVO();
-            dataData.setIcon("assets/images/object.png");
-            dataData.setType("object");
-            dataData.setName("data[配置数据]");
-            dataData.setpId(moduleData.getId());
-            dataData.setId(UUIDUtil.get32UUID());
-            dataData.setIsParent(true);
-
-            BigdataConfigTreeVO loopData = new BigdataConfigTreeVO();
-            loopData.setIcon("assets/images/boolean.png");
-            loopData.setType("boolean");
-            loopData.setName("loop[轮播开关]");
-            loopData.setValue("false");
-            loopData.setpId(dataData.getId());
-            loopData.setId(UUIDUtil.get32UUID());
-            loopData.setIsParent(false);
-
-            treeList.add(moduleData);
-            treeList.add(idData);
-            treeList.add(titleData);
-            treeList.add(dataData);
-            treeList.add(loopData);
-            bigdataConfigVO.setTreeList(treeList);
-            updateData(bigdataConfigVO);
-        }
-    }
-
 }

module-bigdata/src/main/java/cn/com/tenlion/bigdata/service/bigdataconfigtree/IBigdataConfigTreeService.java

@@ -19,6 +19,23 @@ import java.util.Map;
  **/
 public interface IBigdataConfigTreeService {
 
+    /**
+     * 新增
+     *
+     * @param bigdataConfigTreeVO
+     * @return
+     */
+    void save(BigdataConfigTreeVO bigdataConfigTreeVO);
+
+    /**
+     * 新增
+     *
+     * @param token
+     * @param bigdataConfigTreeVO
+     * @return
+     */
+    void save(String token, BigdataConfigTreeVO bigdataConfigTreeVO);
+
     /**
      * 新增
      *
@@ -30,22 +47,142 @@ public interface IBigdataConfigTreeService {
     /**
      * 新增
      *
-     * @param bigdataConfigTreeDTO
+     * @param token
+     * @param bigdataConfigTreeVO
      * @return bigdataConfigTreeId
      */
-    String saveReturnId(BigdataConfigTreeDTO bigdataConfigTreeDTO);
+    String saveReturnId(String token, BigdataConfigTreeVO bigdataConfigTreeVO);
+
+    /**
+     * 删除
+     *
+     * @param ids id列表
+     * @return
+     */
+    void remove(List<String> ids);
+
+
+    /**
+     * 删除
+     *
+     * @param token
+     * @param ids id列表
+     * @return
+     */
+    void remove(String token, List<String> ids);
 
     /**
      * 删除（物理删除）
+     *
+     * @param ids id列表
      */
-    void delete(String configId);
+    void delete(List<String> ids);
+
+    /**
+     * 修改
+     *
+     * @param bigdataConfigTreeId
+     * @param bigdataConfigTreeVO
+     * @return
+     */
+    void update(String bigdataConfigTreeId, BigdataConfigTreeVO bigdataConfigTreeVO);
+
+    /**
+     * 修改
+     *
+     * @param token
+     * @param bigdataConfigTreeId
+     * @param bigdataConfigTreeVO
+     * @return
+     */
+    void update(String token, String bigdataConfigTreeId, BigdataConfigTreeVO bigdataConfigTreeVO);
+
+    /**
+     * 详情
+     *
+     * @param params 参数Map
+     * @return
+     */
+    BigdataConfigTreeDTO get(Map<String, Object> params);
+
+    /**
+     * 详情
+     *
+     * @param bigdataConfigTreeId
+     * @return
+     */
+    BigdataConfigTreeDTO get(String bigdataConfigTreeId);
+
+    /**
+     * 详情
+     *
+     * @param params 参数Map
+     * @return
+     */
+    BigdataConfigTreeBO getBO(Map<String, Object> params);
+
+    /**
+     * 详情
+     *
+     * @param bigdataConfigTreeId
+     * @return
+     */
+    BigdataConfigTreeBO getBO(String bigdataConfigTreeId);
+
+    /**
+     * 详情
+     *
+     * @param params 参数Map
+     * @return
+     */
+    BigdataConfigTreePO getPO(Map<String, Object> params);
+
+    /**
+     * 详情
+     *
+     * @param bigdataConfigTreeId
+     * @return
+     */
+    BigdataConfigTreePO getPO(String bigdataConfigTreeId);
 
     /**
      * 列表
      *
+     * @param params
      * @return
      */
-    List<BigdataConfigTreeDTO> list(String configId);
+    List<BigdataConfigTreeDTO> list(Map<String, Object> params);
+
+    /**
+     * 列表
+     *
+     * @param params
+     * @return
+     */
+    List<BigdataConfigTreeBO> listBO(Map<String, Object> params);
+
+    /**
+     * 列表
+     *
+     * @param params
+     * @return
+     */
+    List<BigdataConfigTreePO> listPO(Map<String, Object> params);
+
+    /**
+     * 分页列表
+     *
+     * @param page
+     * @return
+     */
+    SuccessResultList<List<BigdataConfigTreeDTO>> listPage(ListPage page);
+
+    /**
+     * 统计
+     *
+     * @param params
+     * @return
+     */
+    Integer count(Map<String, Object> params);
 
-    void copyData(String configId, String newConfigId);
 }

module-bigdata/src/main/java/cn/com/tenlion/bigdata/service/bigdataconfigtree/impl/BigdataConfigTreeServiceImpl.java

@@ -18,7 +18,6 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.time.LocalDateTime;
 import java.util.*;
 
 /**
@@ -34,83 +33,139 @@ public class BigdataConfigTreeServiceImpl extends DefaultBaseService implements
     @Autowired
     private IBigdataConfigTreeDao bigdataConfigTreeDao;
 
-    public static String  getNowTime(){
+    @Override
-        LocalDateTime localDateTime=LocalDateTime.now();
+    public void save(BigdataConfigTreeVO bigdataConfigTreeVO) {
-        return localDateTime.getYear()+"-"+localDateTime.getMonthValue()+"-"+localDateTime.getDayOfMonth()+
+        saveReturnId(bigdataConfigTreeVO);
-                " "+localDateTime.getHour()+":"+localDateTime.getMinute()+":"+localDateTime.getSecond()+"."+
+    }
-                localDateTime.getNano()/1000;
+
+    @Override
+    public void save(String token, BigdataConfigTreeVO bigdataConfigTreeVO) {
+        saveReturnId(token, bigdataConfigTreeVO);
     }
 
     @Override
     public String saveReturnId(BigdataConfigTreeVO bigdataConfigTreeVO) {
+        return saveReturnId(null, bigdataConfigTreeVO);
+    }
+
+    @Override
+    public String saveReturnId(String token, BigdataConfigTreeVO bigdataConfigTreeVO) {
         String bigdataConfigTreeId = UUIDUtil.getUUID();
         Map<String, Object> params = HashMapUtil.beanToMap(bigdataConfigTreeVO);
-        params.put("createTime", getNowTime());
+        params.put("bigdataConfigTreeId", bigdataConfigTreeId);
+        if (StringUtils.isBlank(token)) {
+            setSaveInfo(params);
+        } else {
+            setAppSaveInfo(token, params);
+        }
         bigdataConfigTreeDao.save(params);
         return bigdataConfigTreeId;
     }
 
     @Override
-    public String saveReturnId(BigdataConfigTreeDTO bigdataConfigTreeDTO) {
+    public void remove(List<String> ids) {
-        String bigdataConfigTreeId = UUIDUtil.getUUID();
+        remove(null, ids);
-        Map<String, Object> params = HashMapUtil.beanToMap(bigdataConfigTreeDTO);
-        params.put("createTime", getNowTime());
-        bigdataConfigTreeDao.save(params);
-        return bigdataConfigTreeId;
     }
 
     @Override
-    public void delete(String configId) {
+    public void remove(String token, List<String> ids) {
         Map<String, Object> params = getHashMap(2);
-        params.put("configId", configId);
+        params.put("bigdataConfigTreeIds", ids);
+        if (StringUtils.isBlank(token)) {
+            setUpdateInfo(params);
+        } else {
+            setAppUpdateInfo(token, params);
+        }
+        bigdataConfigTreeDao.remove(params);
+    }
+
+    @Override
+    public void delete(List<String> ids) {
+        Map<String, Object> params = getHashMap(2);
+        params.put("bigdataConfigTreeIds", ids);
         bigdataConfigTreeDao.delete(params);
     }
 
     @Override
-    public List<BigdataConfigTreeDTO> list(String configId) {
+    public void update(String bigdataConfigTreeId, BigdataConfigTreeVO bigdataConfigTreeVO) {
-        Map<String, Object> params = getHashMap(2);
+        update(null, bigdataConfigTreeId, bigdataConfigTreeVO);
-        params.put("configId", configId);
-        List<BigdataConfigTreeDTO> list = bigdataConfigTreeDao.list(params);
-        for (BigdataConfigTreeDTO treeDTO : list) {
-            if(treeDTO.getType().equals("integer")) {
-                treeDTO.setValue(Integer.valueOf(treeDTO.getValue().toString()));
-            }
-            if(treeDTO.getType().equals("double")) {
-                treeDTO.setValue(Double.valueOf(treeDTO.getValue().toString()));
-            }
-            if(treeDTO.getType().equals("boolean")) {
-                treeDTO.setValue(Boolean.valueOf(treeDTO.getValue().toString()));
-            }
-        }
-        return list;
     }
 
     @Override
-    public void copyData(String configId, String newConfigId) {
+    public void update(String token, String bigdataConfigTreeId, BigdataConfigTreeVO bigdataConfigTreeVO) {
-        List<BigdataConfigTreeDTO> list = list(configId);
+        Map<String, Object> params = HashMapUtil.beanToMap(bigdataConfigTreeVO);
-        Map<String,String> map = new HashMap<String,String>();
+        params.put("bigdataConfigTreeId", bigdataConfigTreeId);
-        for (BigdataConfigTreeDTO treeDTO : list) {
+        if (StringUtils.isBlank(token)) {
-            // 记录新的id和旧的pId
+            setUpdateInfo(params);
-            map.put(treeDTO.getId(), UUIDUtil.get32UUID());
+        } else {
-            // 放入新的configId;
+            setAppUpdateInfo(token, params);
-            treeDTO.setConfigId(newConfigId);
-        }
-        // 封装新的id和pId进去
-        for (BigdataConfigTreeDTO treeDTO : list) {
-            if(!treeDTO.getpId().equals("0")) {
-                String newId = map.get(treeDTO.getId());
-                String newPId = map.get(treeDTO.getpId());
-                // 封装新的id和pId
-                treeDTO.setId(newId);
-                treeDTO.setpId(newPId);
-            }else{
-                String newId = map.get(treeDTO.getId());
-                // 封装新的id和pId
-                treeDTO.setId(newId);
-            }
-            // 保存
-            saveReturnId(treeDTO);
         }
+        bigdataConfigTreeDao.update(params);
+    }
+
+    @Override
+    public BigdataConfigTreeDTO get(Map<String, Object> params) {
+        return bigdataConfigTreeDao.get(params);
+    }
+
+    @Override
+    public BigdataConfigTreeDTO get(String bigdataConfigTreeId) {
+        Map<String, Object> params = super.getHashMap(2);
+        params.put("bigdataConfigTreeId", bigdataConfigTreeId);
+        return get(params);
+    }
+
+    @Override
+    public BigdataConfigTreeBO getBO(Map<String, Object> params) {
+        return bigdataConfigTreeDao.getBO(params);
+    }
+
+    @Override
+    public BigdataConfigTreeBO getBO(String bigdataConfigTreeId) {
+        Map<String, Object> params = super.getHashMap(2);
+        params.put("bigdataConfigTreeId", bigdataConfigTreeId);
+        return getBO(params);
+    }
+
+    @Override
+    public BigdataConfigTreePO getPO(Map<String, Object> params) {
+        return bigdataConfigTreeDao.getPO(params);
+    }
+
+    @Override
+    public BigdataConfigTreePO getPO(String bigdataConfigTreeId) {
+        Map<String, Object> params = super.getHashMap(2);
+        params.put("bigdataConfigTreeId", bigdataConfigTreeId);
+        return getPO(params);
+    }
+
+    @Override
+    public List<BigdataConfigTreeDTO> list(Map<String, Object> params) {
+        return bigdataConfigTreeDao.list(params);
+    }
+
+    @Override
+    public List<BigdataConfigTreeBO> listBO(Map<String, Object> params) {
+        return bigdataConfigTreeDao.listBO(params);
+    }
+
+    @Override
+    public List<BigdataConfigTreePO> listPO(Map<String, Object> params) {
+        return bigdataConfigTreeDao.listPO(params);
+    }
+
+    @Override
+    public SuccessResultList<List<BigdataConfigTreeDTO>> listPage(ListPage page) {
+        PageHelper.startPage(page.getPage(), page.getRows());
+        List<BigdataConfigTreeDTO> bigdataConfigTreeDTOs = list(page.getParams());
+        PageInfo<BigdataConfigTreeDTO> pageInfo = new PageInfo<>(bigdataConfigTreeDTOs);
+        return new SuccessResultList<>(bigdataConfigTreeDTOs, pageInfo.getPageNum(), pageInfo.getTotal());
+    }
+
+    @Override
+    public Integer count(Map<String, Object> params) {
+        Integer count = bigdataConfigTreeDao.count(params);
+        return count == null ? 0 : count;
     }
 
 }

module-bigdata/src/main/java/cn/com/tenlion/bigdata/service/bigdatamodule/IBigdataModuleService.java

@@ -143,8 +143,6 @@ public interface IBigdataModuleService {
      */
     Integer countNumberBigdataModule(Map<String, Object> params) throws SearchException;
 
-    Integer count(Map<String, Object> params) throws SearchException;
-
     /**
      * 大数据展示模块统计
      *
@@ -159,12 +157,4 @@ public interface IBigdataModuleService {
     SuccessResult updateBigdataModuleSwitch(String bigdataModuleId, Boolean bigdataModuleSwitch) throws Exception;
 
     SuccessResult buiderBigdataTemplateAll(String bigdataModuleId) throws Exception;
-
-    void updateBigdataModuleServerJson(String businessId, String bigdataConfigJson);
-
-    void updateBigdataModuleModuleJson(String businessId, String bigdataConfigJson);
-
-    BigdataModuleDTO get(String moduleId);
-
-    void updateBigdataModuleLinkJson(String businessId, String bigdataConfigJson);
 }

module-bigdata/src/main/java/cn/com/tenlion/bigdata/service/bigdatamodule/impl/BigdataModuleServiceImpl.java

@@ -2,21 +2,14 @@ package cn.com.tenlion.bigdata.service.bigdatamodule.impl;
 
 import cn.com.tenlion.bigdata.dao.bigdatamodule.IBigdataModuleDao;
 import cn.com.tenlion.bigdata.dao.bigdatatemplatearea.IBigdataTemplateAreaDao;
-import cn.com.tenlion.bigdata.pojo.dtos.bigdataconfig.BigdataConfigDTO;
 import cn.com.tenlion.bigdata.pojo.dtos.bigdatamodule.BigdataModuleDTO;
-import cn.com.tenlion.bigdata.pojo.dtos.bigdatamoduletype.BigdataModuleTypeDTO;
 import cn.com.tenlion.bigdata.pojo.dtos.bigdatatemplatearea.BigdataTemplateAreaDTO;
 import cn.com.tenlion.bigdata.pojo.vos.bigdatamodule.BigdataModuleVO;
-import cn.com.tenlion.bigdata.service.bigdataconfig.IBigdataConfigService;
 import cn.com.tenlion.bigdata.service.bigdatamodule.IBigdataModuleService;
-import cn.com.tenlion.bigdata.service.bigdatamoduletype.IBigdataModuleTypeService;
 import cn.com.tenlion.bigdata.service.bigdatatemplate.IBigdataTemplateService;
-import cn.com.tenlion.bigdata.util.ImageUtils;
-import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.google.common.util.concurrent.AbstractService;
-import com.google.gson.JsonObject;
 import ink.wgink.common.base.DefaultBaseService;
 import ink.wgink.exceptions.RemoveException;
 import ink.wgink.exceptions.SaveException;
@@ -32,7 +25,7 @@ import ink.wgink.util.map.HashMapUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import springfox.documentation.spring.web.json.Json;
+
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
@@ -56,11 +49,6 @@ public class BigdataModuleServiceImpl extends DefaultBaseService implements IBig
     @Autowired
     private IBigdataTemplateService bigdataTemplateService;
 
-    @Autowired
-    private IBigdataConfigService iBigdataConfigService;
-
-    @Autowired
-    private IBigdataModuleTypeService iBigdataModuleTypeService;
 
     @Override
     public SuccessResult saveBigdataModule(BigdataModuleVO bigdataModuleVO) throws Exception {
@@ -105,50 +93,60 @@ public class BigdataModuleServiceImpl extends DefaultBaseService implements IBig
      */
     private String saveBigdataModuleInfoReturnId(String token, BigdataModuleVO bigdataModuleVO) throws Exception {
         String bigdataModuleId = UUIDUtil.getUUID();
-        // 判断图片是否上传, 如果上传则压缩
+        /**
-        if (!StringUtils.isEmpty(bigdataModuleVO.getBigdataModulePhoto())) {
+         * 判断编码是否已经存在
-            try{
+         */
-                String base64 = ImageUtils.ThumbnailsFile(bigdataModuleVO.getBigdataModulePhoto());
+        BigdataModuleDTO dto = bigdataModuleDao.getBigdataModuleByCode(bigdataModuleVO.getBigdataModuleCode());
-                bigdataModuleVO.setBigdataModulePhoto(base64);
+        if(dto != null) {
-            }catch(Exception e) {
+            throw new SaveException("该编码已经存在");
-                throw new SaveException("预览图转换异常");
-            }
         }
-        Map<String, Object> query = new HashMap<String, Object>();
+        bigdataModuleVO.setBigdataModuleModuleJson("{id:'" + bigdataModuleVO.getBigdataModuleCode() + "',data:{fontColor:'#fff',loop:true},list:[],title:'" + bigdataModuleVO.getBigdataModuleName() + "',params:{}}");
-        Integer count = count(query) + 1;
+        bigdataModuleVO.setBigdataModuleServerJson("{data:{},list:[],msg:'加载成功',state:'200'}");
-        BigdataModuleTypeDTO typeDTO = iBigdataModuleTypeService.get(bigdataModuleVO.getBigdataModuleType());
-        // 编码
-        bigdataModuleVO.setBigdataModuleCode("M" + (count < 10 ? "000" + count :  count < 100 ? "00" + count :  count < 1000 ? "0" + count : count+"") );
-        Map<String, Object> param = new HashMap<String, Object>();
-        param.put("id", bigdataModuleVO.getBigdataModuleCode());
-        param.put("title", bigdataModuleVO.getBigdataModuleName());
-        bigdataModuleVO.setBigdataModuleModuleJson("{\"data\":{\"loop\":false},\"title\":\"" + bigdataModuleVO.getBigdataModuleName() + "\",\"id\":\"" + bigdataModuleVO.getBigdataModuleCode() + "\"}");
-        bigdataModuleVO.setBigdataModuleServerJson("{}");
-        bigdataModuleVO.setBigdataModuleLinkJson("{}");
-        //bigdataModuleVO.setBigdataModuleModuleJson("{id:'" + bigdataModuleVO.getBigdataModuleCode() + "',data:{fontColor:'#fff',loop:true},list:[],title:'" + bigdataModuleVO.getBigdataModuleName() + "',params:{}}");
-        //bigdataModuleVO.setBigdataModuleServerJson("{data:{},list:[],msg:'加载成功',state:'200'}");
         bigdataModuleVO.setBigdataModuleContent("\n<style type=\"text/css\">\n\t." + bigdataModuleVO.getBigdataModuleCode()+ "{\n\n\t}\n</style>\n<script type=\"text/javascript\">\n\t/**\n" +
-                "\t* 模块类型 * " + typeDTO.getModuleTypeName() + "\n" +
+                "\t* 将模块的代码封装到此函数中供模板组装调用. \n" +
+                "\t* moduleData * 模块数据 {id , data , list , title , params}\n" +
+                "\t* serverData * 渲染数据  {data , list , msg , state}\n" +
                 "\t* 模块编号 * " + bigdataModuleVO.getBigdataModuleCode() + "\n" +
                 "\t* 模块名称 * " + bigdataModuleVO.getBigdataModuleName()+ "\n" +
                 "\t* 创建日期 * " + DateUtil.getTime() + "\n" +
                 "\t* 使用说明 * 这里阐述该模块的使用说明\n" +
+                "\t* # 调用注意 : moduleData.data对象参数为fontColor(字体颜色)与loop(数据轮播)\n" +
+                "\t* # 调用注意 : moduleData.list集合为对象, 参数为\n" +
+                "\t* # 调用注意 : serverData.data对象参数为\n" +
+                "\t* # 调用注意 : serverData.list集合为对象, 参数为\n" +
                 "\t*/\n" +
                 "\tfunction "+ bigdataModuleVO.getBigdataModuleCode() +"(moduleData, serverData) {\n" +
-                "\t\tconsole.log('" + bigdataModuleVO.getBigdataModuleName() + "【' + moduleData.id + '" + typeDTO.getModuleTypeName() + "】初始化...');\n" +
+                "\t\t// 被联动触发\n" +
-                "\t\t// echarts清除旧的循环任务\n" +
+                "\t\tif(moduleData.params.sponsor) {\n" +
+                "\t\t\tconsole.log(moduleData.params.sponsor + \"模块触发了当前模块的联动函数\");\n" +
+                "\t\t\tconsole.log(moduleData.params);\n" +
+                "\t\t}\n" +
+                "\t\tconsole.log(moduleData.id + '初始化...');\n" +
+                "\t\t// 清除旧的循环任务\n" +
                 "\t\techarts.dispose(document.getElementById(moduleData.id));\n" +
                 "\t\tvar elem = echarts.init(document.getElementById(moduleData.id));\n" +
-                "\t\t// echarts配置对象\n" +
                 "\t\tvar option = {\n\n\t\t};\n" +
                 "\t\telem.setOption(option);\n" +
                 "\t\t\n" +
-                "\t\t// echarts的ToolTip轮播\n" +
+                "\t\t// ToolTip轮播\n" +
                 "\t\tif(moduleData.data.loop == true) {\n" +
                 "\t\t\ttools.loopShowTooltip(elem, option, {loopSeries: true});\n" +
                 "\t\t}\n" +
                 "\t\t\n" +
+                "\t\t// 发起联动更新\n" +
+                "\t\t// globalData[moduleData.id].linkAllAction('要联动的值');\n" +
                 "\t}\n</script>");
+        bigdataModuleVO.setBigdataModuleRemark("配置参数格式说明\n" +
+                "id:模块编码  ||  " +
+                "data:配置参数对象{fontColor(字体颜色),loop(轮播显示)}  ||  " +
+                "list:配置参数集合  ||  " +
+                "title:展示标题  ||  " +
+                "params::联动传入对象{sponsor(发起模块),(动态参数 mapLink、dateLink、selectLink)}\n"+
+                "渲染参数格式说明\n" +
+                "msg:响应说明  ||  " +
+                "state:响应状态200、400  ||  " +
+                "data:展示参数对象  ||  " +
+                "list:展示数据集合");
         Map<String, Object> params = HashMapUtil.beanToMap(bigdataModuleVO);
         params.put("bigdataModuleId", bigdataModuleId);
         if (StringUtils.isBlank(token)) {
@@ -157,9 +155,6 @@ public class BigdataModuleServiceImpl extends DefaultBaseService implements IBig
             setAppSaveInfo(token, params);
         }
         bigdataModuleDao.saveBigdataModule(params);
-        iBigdataConfigService.saveInitData(bigdataModuleId, "moduleData", param, bigdataModuleVO.getBigdataModuleModuleJson());
-        iBigdataConfigService.saveInitData(bigdataModuleId, "serverData", param, bigdataModuleVO.getBigdataModuleServerJson());
-        iBigdataConfigService.saveInitData(bigdataModuleId, "linkData", param, bigdataModuleVO.getBigdataModuleLinkJson());
         return bigdataModuleId;
     }
 
@@ -219,15 +214,6 @@ public class BigdataModuleServiceImpl extends DefaultBaseService implements IBig
      * @param bigdataModuleVO
      */
     private void updateBigdataModuleInfo(String token, String bigdataModuleId, BigdataModuleVO bigdataModuleVO) throws Exception {
-        // 判断图片是否上传, 如果上传则压缩
-        if (!StringUtils.isEmpty(bigdataModuleVO.getBigdataModulePhoto())) {
-            try{
-                String base64 = ImageUtils.ThumbnailsFile(bigdataModuleVO.getBigdataModulePhoto());
-                bigdataModuleVO.setBigdataModulePhoto(base64);
-            }catch(Exception e) {
-                throw new SaveException("预览图转换异常");
-            }
-        }
         Map<String, Object> params = HashMapUtil.beanToMap(bigdataModuleVO);
         params.put("bigdataModuleId", bigdataModuleId);
         if (StringUtils.isBlank(token)) {
@@ -265,12 +251,6 @@ public class BigdataModuleServiceImpl extends DefaultBaseService implements IBig
         return count == null ? 0 : count;
     }
 
-    @Override
-    public Integer count(Map<String, Object> params) throws SearchException {
-        Integer count = bigdataModuleDao.count(params);
-        return count == null ? 0 : count;
-    }
-
     @Override
     public SuccessResultData<Integer> countBigdataModule(Map<String, Object> params) throws SearchException {
         return new SuccessResultData<>(countNumberBigdataModule(params));
@@ -310,38 +290,4 @@ public class BigdataModuleServiceImpl extends DefaultBaseService implements IBig
         return new SuccessResult();
     }
 
-    @Override
-    public void updateBigdataModuleServerJson(String businessId, String bigdataConfigJson) {
-        Map<String, Object> params = HashMapUtil.beanToMap(3);
-        params.put("bigdataModuleId", businessId);
-        params.put("bigdataModuleServerJson", bigdataConfigJson);
-        bigdataModuleDao.updateBigdataModuleServerJson(params);
-    }
-
-    @Override
-    public void updateBigdataModuleModuleJson(String businessId, String bigdataConfigJson) {
-        Map<String, Object> params = HashMapUtil.beanToMap(3);
-        params.put("bigdataModuleId", businessId);
-        params.put("bigdataModuleModuleJson", bigdataConfigJson);
-        bigdataModuleDao.updateBigdataModuleModuleJson(params);
-    }
-
-    @Override
-    public BigdataModuleDTO get(String moduleId) {
-        BigdataModuleDTO data = getBigdataModuleById(moduleId);
-        BigdataConfigDTO moduleDataDTO = iBigdataConfigService.getData(data.getBigdataModuleId(), "moduleData");
-        BigdataConfigDTO serverDataDTO = iBigdataConfigService.getData(data.getBigdataModuleId(), "serverData");
-        data.setModuleData(moduleDataDTO);
-        data.setServerData(serverDataDTO);
-        return data;
-    }
-
-    @Override
-    public void updateBigdataModuleLinkJson(String businessId, String bigdataConfigJson) {
-        Map<String, Object> params = HashMapUtil.beanToMap(3);
-        params.put("bigdataModuleId", businessId);
-        params.put("bigdataModuleLinkJson", bigdataConfigJson);
-        bigdataModuleDao.updateBigdataModuleLinkJson(params);
-    }
-
 }

module-bigdata/src/main/java/cn/com/tenlion/bigdata/service/bigdatamoduletype/IBigdataModuleTypeService.java

@@ -1,6 +1,5 @@
 package cn.com.tenlion.bigdata.service.bigdatamoduletype;
 
-import cn.com.tenlion.bigdata.pojo.dtos.bigdatamoduletype.BigdataModuleTypePageDTO;
 import ink.wgink.pojo.ListPage;
 import ink.wgink.pojo.result.SuccessResultList;
 import cn.com.tenlion.bigdata.pojo.dtos.bigdatamoduletype.BigdataModuleTypeDTO;
@@ -186,5 +185,4 @@ public interface IBigdataModuleTypeService {
      */
     Integer count(Map<String, Object> params);
 
-    List<BigdataModuleTypePageDTO> listModule(Map<String, Object> params);
 }

module-bigdata/src/main/java/cn/com/tenlion/bigdata/service/bigdatamoduletype/impl/BigdataModuleTypeServiceImpl.java

@@ -1,9 +1,5 @@
 package cn.com.tenlion.bigdata.service.bigdatamoduletype.impl;
 
-import cn.com.tenlion.bigdata.pojo.dtos.bigdatamodule.BigdataModuleDTO;
-import cn.com.tenlion.bigdata.pojo.dtos.bigdatamoduletype.BigdataModulePageDTO;
-import cn.com.tenlion.bigdata.pojo.dtos.bigdatamoduletype.BigdataModuleTypePageDTO;
-import cn.com.tenlion.bigdata.service.bigdatamodule.IBigdataModuleService;
 import ink.wgink.common.base.DefaultBaseService;
 import ink.wgink.pojo.ListPage;
 import ink.wgink.pojo.result.SuccessResult;
@@ -37,9 +33,6 @@ public class BigdataModuleTypeServiceImpl extends DefaultBaseService implements
     @Autowired
     private IBigdataModuleTypeDao bigdataModuleTypeDao;
 
-    @Autowired
-    private IBigdataModuleService iBigdataModuleService;
-
     @Override
     public void save(BigdataModuleTypeVO bigdataModuleTypeVO) {
         saveReturnId(bigdataModuleTypeVO);
@@ -59,9 +52,6 @@ public class BigdataModuleTypeServiceImpl extends DefaultBaseService implements
     public String saveReturnId(String token, BigdataModuleTypeVO bigdataModuleTypeVO) {
         String bigdataModuleTypeId = UUIDUtil.getUUID();
         Map<String, Object> params = HashMapUtil.beanToMap(bigdataModuleTypeVO);
-        Integer count = count(params) + 1;
-        // 编码
-        params.put("moduleTypeCode", "T" + (count < 10 ? "000" + count :  count < 100 ? "00" + count :  count < 1000 ? "0" + count : count+"") );
         params.put("bigdataModuleTypeId", bigdataModuleTypeId);
         if (StringUtils.isBlank(token)) {
             setSaveInfo(params);
@@ -178,29 +168,4 @@ public class BigdataModuleTypeServiceImpl extends DefaultBaseService implements
         return count == null ? 0 : count;
     }
 
-    @Override
-    public List<BigdataModuleTypePageDTO> listModule(Map<String, Object> params) {
-        List<BigdataModuleTypePageDTO> resultList = new ArrayList<BigdataModuleTypePageDTO>();
-        List<BigdataModuleTypeDTO> list = list(params);
-        for(BigdataModuleTypeDTO typeDTO : list) {
-            BigdataModuleTypePageDTO typePageDTO = new BigdataModuleTypePageDTO();
-            typePageDTO.setId(typeDTO.getBigdataModuleTypeId());
-            typePageDTO.setName(typeDTO.getModuleTypeName());
-            params.put("bigdataModuleType", typeDTO.getBigdataModuleTypeId());
-            List<BigdataModulePageDTO> resultModuleList = new ArrayList<BigdataModulePageDTO>();
-            List<BigdataModuleDTO> moduleDTOList = iBigdataModuleService.listBigdataModule(params);
-            for(BigdataModuleDTO moduleDTO : moduleDTOList) {
-                BigdataModulePageDTO modulePageDTO = new BigdataModulePageDTO();
-                modulePageDTO.setCode(moduleDTO.getBigdataModuleCode());
-                modulePageDTO.setId(moduleDTO.getBigdataModuleId());
-                modulePageDTO.setName(moduleDTO.getBigdataModuleName());
-                modulePageDTO.setSrc(moduleDTO.getBigdataModulePhoto());
-                resultModuleList.add(modulePageDTO);
-            }
-            typePageDTO.setModuleList(resultModuleList);
-            resultList.add(typePageDTO);
-        }
-        return resultList;
-    }
-
 }

module-bigdata/src/main/java/cn/com/tenlion/bigdata/service/bigdatatemplate/IBigdataTemplateService.java

@@ -23,8 +23,6 @@ import java.util.Map;
  **/
 public interface IBigdataTemplateService {
 
-   Integer count(Map<String, Object> params);
-
     /**
      * 新增大数据展示的模板管理
      *
@@ -168,5 +166,5 @@ public interface IBigdataTemplateService {
 
     SuccessResult updateBigdataTemplateContent(String bigdataTemplateId, BigdataTemplateContentVO bigdataTemplateContentVO) throws Exception;
 
-    SuccessResult copyBigdataTemplate(String id, String bigdataTemplateTitle) throws Exception;
+    SuccessResult copyBigdataTemplate(String id, String bigdataTemplateCode, String bigdataTemplateTitle) throws Exception;
 }

module-bigdata/src/main/java/cn/com/tenlion/bigdata/service/bigdatatemplate/impl/BigdataTemplateServiceImpl.java

@@ -6,16 +6,11 @@ import cn.com.tenlion.bigdata.pojo.dtos.bigdatatemplate.BigdataTemplateDTO;
 import cn.com.tenlion.bigdata.pojo.dtos.bigdatatemplate.BigdataTemplateFileDTO;
 import cn.com.tenlion.bigdata.pojo.dtos.bigdatatemplatearea.BigdataTemplateAreaDTO;
 import cn.com.tenlion.bigdata.pojo.dtos.bigdatatemplatearea.BigdataTemplateAreaFileDTO;
-import cn.com.tenlion.bigdata.pojo.dtos.bigdatatemplatearealink.BigdataTemplateAreaLinkDTO;
 import cn.com.tenlion.bigdata.pojo.vos.bigdatatemplate.BigdataTemplateContentVO;
 import cn.com.tenlion.bigdata.pojo.vos.bigdatatemplate.BigdataTemplateVO;
 import cn.com.tenlion.bigdata.service.bigdatatemplate.IBigdataTemplateService;
 import cn.com.tenlion.bigdata.service.bigdatatemplatearea.IBigdataTemplateAreaService;
-import cn.com.tenlion.bigdata.service.bigdatatemplatearealink.IBigdataTemplateAreaLinkService;
 import cn.com.tenlion.bigdata.util.BigDataResult;
-import cn.com.tenlion.bigdata.util.ImageUtils;
-import cn.com.tenlion.datahouse.pojo.dtos.datacensusproject.DatacensusProjectDTO;
-import cn.com.tenlion.datahouse.service.datacensusproject.IDatacensusProjectService;
 import cn.com.tenlion.freemarker.pojo.vos.templaterecord.TemplateRecordVO;
 import cn.com.tenlion.freemarker.service.templaterecord.ITemplateRecordService;
 import cn.com.tenlion.freemarker.util.TemplateBuilderUtil;
@@ -28,17 +23,14 @@ import ink.wgink.exceptions.RemoveException;
 import ink.wgink.exceptions.SaveException;
 import ink.wgink.exceptions.SearchException;
 import ink.wgink.exceptions.UpdateException;
-import ink.wgink.exceptions.base.SystemException;
 import ink.wgink.module.dictionary.service.IDataService;
 import ink.wgink.module.dictionary.service.impl.DataServiceImpl;
-import ink.wgink.module.file.pojo.vos.FileVO;
 import ink.wgink.module.file.service.IFileService;
 import ink.wgink.pojo.ListPage;
 import ink.wgink.pojo.pos.FilePO;
 import ink.wgink.pojo.result.SuccessResult;
 import ink.wgink.pojo.result.SuccessResultData;
 import ink.wgink.pojo.result.SuccessResultList;
-import ink.wgink.properties.FileProperties;
 import ink.wgink.util.UUIDUtil;
 import ink.wgink.util.date.DateUtil;
 import ink.wgink.util.map.HashMapUtil;
@@ -46,12 +38,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import javax.imageio.ImageIO;
-import java.awt.*;
-import java.awt.image.BufferedImage;
-import java.io.File;
 import java.util.*;
-import java.util.List;
 
 /**
  * @ClassName: BigdataTemplateServiceImpl
@@ -81,79 +68,6 @@ public class BigdataTemplateServiceImpl extends DefaultBaseService implements IB
     @Autowired
     private ITemplateRecordService iTemplateRecordService;
 
-    @Autowired
-    private IDatacensusProjectService iDatacensusProjectService;
-
-    @Autowired
-    private IBigdataTemplateAreaLinkService iBigdataTemplateAreaLinkService;
-
-    @Autowired
-    private FileProperties fileProperties;
-
-    public String saveBuiderBackImage(Double bigdataTemplateHeight, Double bigdataTemplateWidth, String bigdataTemplateBackgroundColor) {
-        String newColor = bigdataTemplateBackgroundColor.substring(4, bigdataTemplateBackgroundColor.length() -1);
-        String[] colorArr = newColor.split(",");
-        int[] colorIntArr = new int[4];
-        for (int i = 0; i < colorArr.length; i++) {
-            colorIntArr[i] = Integer.valueOf(colorArr[i].trim());
-        }
-        BufferedImage image = new BufferedImage(bigdataTemplateWidth.intValue(),bigdataTemplateHeight.intValue(), BufferedImage.TYPE_INT_RGB);
-        Graphics graphics = image.getGraphics();
-        Color color = new Color(colorIntArr[0], colorIntArr[1], colorIntArr[2], 255);
-        graphics.setColor(color);
-        graphics.fillRect(0, 0, bigdataTemplateWidth.intValue(), bigdataTemplateHeight.intValue());
-        graphics.dispose();
-
-        String fileName = UUIDUtil.get32UUID() + ".png";
-        String baseUploadPath = fileProperties.getUploadPath();
-        if (StringUtils.isBlank(baseUploadPath)) {
-            throw new SystemException("上传路径未配置");
-        }
-        StringBuilder filePath = new StringBuilder();
-        if (!baseUploadPath.endsWith(File.separator)) {
-            filePath.append(baseUploadPath).append(File.separator);
-        } else {
-            filePath.append(baseUploadPath);
-        }
-        filePath.append("images");
-        String days = DateUtil.getDays();
-        filePath.append(File.separator).append(days).append(File.separator);
-        File file = new File(filePath.toString());
-        if(!file.exists()) {
-            file.mkdirs();
-        }
-        String pathUrl = "images/" + days + "/" + fileName;
-        filePath.append(fileName);
-        createImage(filePath.toString() , image);
-        FileVO fileVO = new FileVO();
-        fileVO.setFileName(fileName);
-        fileVO.setFileType("png");
-        fileVO.setFileUrl(pathUrl);
-        File localFile = new File(filePath.toString());
-        fileVO.setFileSize(localFile.length());
-        fileVO.setFilePath(filePath.toString());
-        String fileId = iFileService.saveFileByUserId("1", fileVO);
-        return fileId;
-    }
-
-    /**
-     * 将image对象存储到本地
-     * @Title : createImage
-     * @功能描述 : TODO
-     * @设定文件 : @param fileLocation 本地路径
-     * @设定文件 : @param image 图片对象
-     * @返回类型 : void
-     * @throws :
-     */
-    private static void createImage(String fileLocation, BufferedImage image) {
-        try {
-            String formatName = fileLocation.substring(fileLocation.lastIndexOf(".") + 1);
-            ImageIO.write(image, formatName , new File(fileLocation));
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
     @Override
     public SuccessResult saveBigdataTemplate(BigdataTemplateVO bigdataTemplateVO) throws Exception {
         saveBigdataTemplateInfo(null, bigdataTemplateVO);
@@ -197,25 +111,13 @@ public class BigdataTemplateServiceImpl extends DefaultBaseService implements IB
      */
     private String saveBigdataTemplateInfoReturnId(String token, BigdataTemplateVO bigdataTemplateVO) throws Exception {
         String bigdataTemplateId = UUIDUtil.getUUID();
-        if (StringUtils.isEmpty(bigdataTemplateVO.getBigdataTemplateBackgroundImage())) {
-            if (!StringUtils.isEmpty(bigdataTemplateVO.getBigdataTemplateBackgroundColor())) {
-                // 通过颜色生成背景图片
-                String fileId = saveBuiderBackImage(bigdataTemplateVO.getBigdataTemplateHeight(), bigdataTemplateVO.getBigdataTemplateWidth(), bigdataTemplateVO.getBigdataTemplateBackgroundColor());
-                bigdataTemplateVO.setBigdataTemplateBackgroundImage(fileId);
-            }else{
-                throw new SaveException("背景图或背景颜色至少选择一个");
-            }
-        }
         /**
          * 判断编码是否已经存在
          */
-//        BigdataTemplateDTO dto = bigdataTemplateDao.getBigdataTemplateByCode(bigdataTemplateVO.getBigdataTemplateCode());
+        BigdataTemplateDTO dto = bigdataTemplateDao.getBigdataTemplateByCode(bigdataTemplateVO.getBigdataTemplateCode());
-//        if(dto != null) {
+        if(dto != null) {
-//            throw new SaveException("该编码已经存在");
+            throw new SaveException("该编码已经存在");
-//        }
+        }
-        Map<String, Object> query = new HashMap<String, Object>();
-        Integer count = count(query) + 1;
-        bigdataTemplateVO.setBigdataTemplateCode("P" + (count < 10 ? "000" + count :  count < 100 ? "00" + count :  count < 1000 ? "0" + count : count+"") );
         bigdataTemplateVO.setBigdataTemplateContent("<style type=\"text/css\">\n" +
                 "\t/* \n" +
                 "\t* 边框样式Start\n" +
@@ -363,12 +265,6 @@ public class BigdataTemplateServiceImpl extends DefaultBaseService implements IB
         return bigdataTemplateId;
     }
 
-    @Override
-    public Integer count(Map<String, Object> params) throws SearchException {
-        Integer count = bigdataTemplateDao.count(params);
-        return count == null ? 0 : count;
-    }
-
     @Override
     public SuccessResult removeBigdataTemplate(String ids) throws RemoveException {
         removeBigdataTemplateInfo(null, ids);
@@ -425,15 +321,6 @@ public class BigdataTemplateServiceImpl extends DefaultBaseService implements IB
      * @param bigdataTemplateVO
      */
     private void updateBigdataTemplateInfo(String token, String bigdataTemplateId, BigdataTemplateVO bigdataTemplateVO) throws Exception {
-        if (StringUtils.isEmpty(bigdataTemplateVO.getBigdataTemplateBackgroundImage())) {
-            if (!StringUtils.isEmpty(bigdataTemplateVO.getBigdataTemplateBackgroundColor())) {
-                // 通过颜色生成背景图片
-                String fileId = saveBuiderBackImage(bigdataTemplateVO.getBigdataTemplateHeight(), bigdataTemplateVO.getBigdataTemplateWidth(), bigdataTemplateVO.getBigdataTemplateBackgroundColor());
-                bigdataTemplateVO.setBigdataTemplateBackgroundImage(fileId);
-            }else{
-                throw new SaveException("背景图或背景颜色至少选择一个");
-            }
-        }
         Map<String, Object> params = HashMapUtil.beanToMap(bigdataTemplateVO);
         params.put("bigdataTemplateId", bigdataTemplateId);
         if (StringUtils.isBlank(token)) {
@@ -493,9 +380,6 @@ public class BigdataTemplateServiceImpl extends DefaultBaseService implements IB
         // 封装自定义上传的js和css文件
         for (BigdataTemplateAreaDTO area : areaList) {
             areaFunctionMap.put(area.getBigdataModuleId(), area.getBigdataModuleContent());
-            // 查找联动配置
-            List<BigdataTemplateAreaLinkDTO> linkList = iBigdataTemplateAreaLinkService.listBySrcId(area.getBigdataTemplateAreaId());
-            area.setLinkList(linkList);
             // 查找模块附件
             String[] fileList = area.getTemplateAreaFile().split(",");
             List<BigdataTemplateAreaFileDTO> templateAreaFileDTOList = new ArrayList<BigdataTemplateAreaFileDTO>();
@@ -544,15 +428,10 @@ public class BigdataTemplateServiceImpl extends DefaultBaseService implements IB
         dto.setFileList(templateFileDTOList);
         dto.setAreaList(areaList);
         Map<String, Object> templateDataMap = HashMapUtil.beanToMap(dto);
-        // 查找项目的P_KEY与P_PASS
-        DatacensusProjectDTO projectDTO = iDatacensusProjectService.get(dto.getBigdataTemplateProject());
-        templateDataMap.put("P_KEY", projectDTO.getProjectKey());
-        templateDataMap.put("P_PASS", projectDTO.getProjectPassword());
         templateDataMap.put("areaFunctionMap", areaFunctionMap);
         TemplateCreateData createData = new TemplateCreateData();
-        // DATA0001编码的模板配置文件是大数据的模板配置文件
+        // C0001编码的模板配置文件是大数据的模板配置文件
-        createData.setTemplateCode("DATA0001");
+        createData.setTemplateCode("C0001");
-        createData.setPublishStatus(dto.getBigdataTemplatePublishStatus().equals("1") ? true : false);
         createData.setBusinessId(dto.getBigdataTemplateId());
         createData.setBusinessContent(dto.getBigdataTemplateTitle());
         createData.setTemplateDataMap(templateDataMap);
@@ -647,7 +526,11 @@ public class BigdataTemplateServiceImpl extends DefaultBaseService implements IB
     }
 
     @Override
-    public SuccessResult copyBigdataTemplate(String id, String bigdataTemplateTitle) throws Exception {
+    public SuccessResult copyBigdataTemplate(String id, String bigdataTemplateCode, String bigdataTemplateTitle) throws Exception {
+        BigdataTemplateDTO dto = bigdataTemplateDao.getBigdataTemplateByCode(bigdataTemplateCode);
+        if(dto != null) {
+            throw new SaveException("该编码已经存在");
+        }
         // 查出模板
         String bigdataTemplateId = UUIDUtil.getUUID();
         // 查出区域
@@ -662,146 +545,67 @@ public class BigdataTemplateServiceImpl extends DefaultBaseService implements IB
             setSaveInfo(params);
             bigdataTemplateAreaDao.saveBigdataTemplateArea(params);
         }
-        Map<String, Object> query = new HashMap<String, Object>();
+        contentDto.setBigdataTemplateCode(bigdataTemplateCode);
-        Integer count = count(query) + 1;
-        contentDto.setBigdataTemplateCode("P" + (count < 10 ? "000" + count :  count < 100 ? "00" + count :  count < 1000 ? "0" + count : count+"") );
         contentDto.setBigdataTemplateTitle(bigdataTemplateTitle);
         contentDto.setBigdataTemplateId(bigdataTemplateId);
         contentDto.setBigdataTemplateContent("<style type=\"text/css\">\n" +
-        "\t/* \n" +
+        "\t/** \n" +
         "\t* 边框样式Start\n" +
-        "\t*/\n" +
+        "\t* 不对文字区域(W0001)进行边框修饰 \n" +
-        "\t." + contentDto.getBigdataTemplateCode()+ "{\n" +
+        "\t." + contentDto.getBigdataTemplateCode() + " :not(.W0001){\n" +
         "\t\tposition: relative;\n" +
         "\t\tborder: 1px solid #0bc4e9;\n" +
         "\t\tbackground: rgba(0,72,115,0.28);\n" +
         "\t}\n" +
-        "\t." + contentDto.getBigdataTemplateCode()+ ":hover{\n" +
+        "\t." + contentDto.getBigdataTemplateCode() + " :not(.W0001) :before{\n" +
-        "\t\tbox-shadow:\n" +
+        "\t\tcontent: '';\n" +
-        "\t\t-5px 0px 2px rgba(255,255,255,0.1),   \n" +
+        "\t\tposition: absolute;\n" +
-        "\t\t0px -5px 2px rgba(255,255,255,0.1),  \n" +
+        "\t\twidth: 80%;\n" +
-        "\t\t5px 0px 2px rgba(255,255,255,0.1),  \n" +
+        "\t\theight: 100%;\n" +
-        "\t\t0px 5px 2px rgba(255,255,255,0.1);\n" +
+        "\t\tbottom: -1px;\n" +
-        "\t\tbackground: rgba(255,255,255,0.1);\n" +
+        "\t\ttop:-1px;\n" +
+        "\t\tleft:10%;\n" +
+        "\t\tborder-bottom: 1px solid #007297;\n" +
+        "\t\tborder-top: 1px solid #007297;\n" +
+        "\t\ttransition: all 0.5s;\n" +
+        "\t}\n" +
+        "\t." + contentDto.getBigdataTemplateCode() + " :not(.W0001) :after{\n" +
+        "\t\tcontent: '';\n" +
+        "\t\tposition: absolute;\n" +
+        "\t\twidth: 100%;\n" +
+        "\t\theight: 80%;\n" +
+        "\t\tleft: -1px;\n" +
+        "\t\tright:-1px;\n" +
+        "\t\ttop:10%;\n" +
+        "\t\tborder-left: 1px solid  #007297;\n" +
+        "\t\tborder-right: 1px solid  #007297;\n" +
+        "\t\ttransition: all 0.5s;\n" +
+        "\t}\n" +
+        "\t." + contentDto.getBigdataTemplateCode() + " :not(.W0001) :hover::before{\n" +
+        "\t\twidth: 0%;\n" +
+        "\t\t}\n" +
+        "\t." + contentDto.getBigdataTemplateCode() + " :not(.W0001) :hover::after{\n" +
+        "\t\theight: 0%;\n" +
+        "\t}\n" +
+        "\t." + contentDto.getBigdataTemplateCode() + " :not(.W0001) :hover{\n" +
+        "\t\tbox-shadow:\n" +
+        "\t\t-5px 0px 2px rgba(255,255,255,0.1), \n" +
+        "\t\t0px -5px 2px rgba(255,255,255,0.1), \n" +
+        "\t\t5px 0px 2px rgba(255,255,255,0.1),  \n" +
+        "\t\t0px 5px 2px rgba(255,255,255,0.1);  \n" +
+        "\t\tbackground: rgba(255,255,255,0.1);  \n" +
         "\t}\n" +
-        "\t/** \n" +
         "\t* 边框样式End\n" +
         "\t*/\n" +
+        "\t.W0001{\n" +
+        "\t\tborder: 0px;\n" +
+        "\t\tborder-left: 0px;\n" +
+        "\t\tborder-right: 0px;\n" +
         "</style>\n" +
         "<script type=\"text/javascript\">\n" +
-        "$(window).load(function(){\n" +
+        "\t/**\n" +
-        "\t// 背景粒子特效,如果不需要请注释掉\n" +
+        "\t * 此处可以自定义一些函数对页面元素进行操作\n" +
-        "\tinitParticlesJs();\n" +
+        "\t */ \n" +
-        "});\n" +
-        "\n" +
-        "var initParticlesJs = function() {\n" +
-        "\tparticlesJS('container',\n" +
-        "\t{\n" +
-        "\t\t\"particles\": {\n" +
-        "\t\t\t\"number\": {\n" +
-        "\t\t\t\t\"value\": 160,//数量\n" +
-        "\t\t\t\t\"density\": {\n" +
-        "\t\t\t\t\t\"enable\": true, //启用粒子的稀密程度\n" +
-        "\t\t\t\t\t\"value_area\": 800 //区域散布密度大小\n" +
-        "\t\t\t\t}\n" +
-        "\t\t\t},\n" +
-        "\t\t\t\"color\": {\n" +
-        "\t\t\t\t\"value\": \"#362cff\" //原子的颜色\n" +
-        "\t\t\t},\n" +
-        "\t\t\t\"shape\": {\n" +
-        "\t\t\t\t\"type\": \"circle\", //原子的形状 \"circle\" ,\"edge\" ,\"triangle\" ,\"polygon\" ,\"star\" ,\"image\" ,[\"circle\", \"triangle\", \"image\"]\n" +
-        "\t\t\t\t\"stroke\": {\n" +
-        "\t\t\t\t\t\"width\": 0, //原子的宽度\n" +
-        "\t\t\t\t\t\"color\": \"#362cff\" //原子颜色\n" +
-        "\t\t\t\t},\n" +
-        "\t\t\t\t\"polygon\": {\n" +
-        "\t\t\t\t\t\"nb_sides\": 5 // 原子的多边形边数\n" +
-        "\t\t\t\t}\n" +
-        "\t\t\t},\n" +
-        "\t\t\t\"opacity\": {\n" +
-        "\t\t\t\t\"value\": 1, //不透明度\n" +
-        "\t\t\t\t\"random\": true, //随机不透明度\n" +
-        "\t\t\t\t\"anim\": {\n" +
-        "\t\t\t\t\t\"enable\": true, //渐变动画\n" +
-        "\t\t\t\t\t\"speed\": 1, // 渐变动画速度\n" +
-        "\t\t\t\t\t\"opacity_min\": 0, //渐变动画不透明度\n" +
-        "\t\t\t\t\t\"sync\": true\n" +
-        "\t\t\t\t}\n" +
-        "\t\t\t},\n" +
-        "\t\t\t\"size\": {\n" +
-        "\t\t\t\t\"value\": 3, //原子大小\n" +
-        "\t\t\t\t\"random\": true, // 原子大小随机\n" +
-        "\t\t\t\t\"anim\": {\n" +
-        "\t\t\t\t\t\"enable\": false, // 原子渐变\n" +
-        "\t\t\t\t\t\"speed\": 4, //原子渐变速度\n" +
-        "\t\t\t\t\t\"size_min\": 0.3,\n" +
-        "\t\t\t\t\t\"sync\": false\n" +
-        "\t\t\t\t}\n" +
-        "\t\t\t},\n" +
-        "\t\t\t\"line_linked\": {\n" +
-        "\t\t\t\t\"enable\": true, //连接线  -- 网状\n" +
-        "\t\t\t\t\"distance\": 150, //连接线距离\n" +
-        "\t\t\t\t\"color\": \"#ffffff\", //连接线颜色\n" +
-        "\t\t\t\t\"opacity\": 0.4, //连接线不透明度\n" +
-        "\t\t\t\t\"width\": 1 //连接线的宽度\n" +
-        "\t\t\t},\n" +
-        "\t\t\t\"move\": {\n" +
-        "\t\t\t\t\"enable\": true, //原子移动\n" +
-        "\t\t\t\t\"speed\": 8, //原子移动速度\n" +
-        "\t\t\t\t\"direction\": \"none\", //原子移动方向   \"none\" ,\"top\" ,\"top-right\" ,\"right\" ,\"bottom-right\" ,\"bottom\" ,\"bottom-left\" ,\"left\" ,\"top-left\"\n" +
-        "\t\t\t\t\"random\": true, //移动随机方向\n" +
-        "\t\t\t\t\"straight\": false, //直接移动\n" +
-        "\t\t\t\t\"out_mode\": \"out\", //是否移动出画布\n" +
-        "\t\t\t\t\"bounce\": false, //是否跳动移动\n" +
-        "\t\t\t\t\"attract\": {\n" +
-        "\t\t\t\t\t\"enable\": true, // 原子之间吸引\n" +
-        "\t\t\t\t\t\"rotateX\": 600, //原子之间吸引X水平距离\n" +
-        "\t\t\t\t\t\"rotateY\": 600  //原子之间吸引Y水平距离\n" +
-        "\t\t\t\t}\n" +
-        "\t\t\t}\n" +
-        "\t\t},\n" +
-        "\t\t\"interactivity\": {\n" +
-        "\t\t\t\"detect_on\": \"canvas\", //原子之间互动检测 \"canvas\", \"window\"\n" +
-        "\t\t\t\"events\": {\n" +
-        "\t\t\t\t\"onhover\": {\n" +
-        "\t\t\t\t\t\"enable\": true, //悬停\n" +
-        "\t\t\t\t\t\"mode\": \"bubble\" //悬停模式      \"grab\"抓取临近的,\"bubble\"泡沫球效果,\"repulse\"击退效果,[\"grab\", \"bubble\"]\n" +
-        "\t\t\t\t},\n" +
-        "\t\t\t\t\"onclick\": {\n" +
-        "\t\t\t\t\t\"enable\": false,  //点击效果\n" +
-        "\t\t\t\t\t\"mode\": \"repulse\"  //点击效果模式   \"push\" ,\"remove\" ,\"bubble\" ,\"repulse\" ,[\"push\", \"repulse\"]\n" +
-        "\t\t\t\t},\n" +
-        "\t\t\t\t\t\"resize\": true // 互动事件调整\n" +
-        "\t\t\t\t},\n" +
-        "\t\t\t\t\"modes\": {\n" +
-        "\t\t\t\t\t\"grab\": {\n" +
-        "\t\t\t\t\t\t\"distance\": 100, //原子互动抓取距离\n" +
-        "\t\t\t\t\t\t\"line_linked\": {\n" +
-        "\t\t\t\t\t\t\"opacity\": 0.8  //原子互动抓取距离连线不透明度\n" +
-        "\t\t\t\t\t}\n" +
-        "\t\t\t\t},\n" +
-        "\t\t\t\t\"bubble\": {\n" +
-        "\t\t\t\t\t\"distance\": 250, //原子抓取泡沫效果之间的距离\n" +
-        "\t\t\t\t\t\"size\": 4, // 原子抓取泡沫效果之间的大小\n" +
-        "\t\t\t\t\t\"duration\": 2, //原子抓取泡沫效果之间的持续事件\n" +
-        "\t\t\t\t\t\"opacity\": 1, //原子抓取泡沫效果透明度\n" +
-        "\t\t\t\t\t\"speed\": 3\n" +
-        "\t\t\t\t},\n" +
-        "\t\t\t\t\"repulse\": {\n" +
-        "\t\t\t\t\t\"distance\": 400, //击退效果距离\n" +
-        "\t\t\t\t\t\"duration\": 0.4 //击退效果持续事件\n" +
-        "\t\t\t\t},\n" +
-        "\t\t\t\t\"push\": {\n" +
-        "\t\t\t\t\t\"particles_nb\": 4 //粒子推出的数量\n" +
-        "\t\t\t\t},\n" +
-        "\t\t\t\t\"remove\": {\n" +
-        "\t\t\t\t\t\"particles_nb\": 2\n" +
-        "\t\t\t\t}\n" +
-        "\t\t\t}\n" +
-        "\t\t},\n" +
-        "\t\t\"retina_detect\": true\n" +
-        "\t});\n" +
-        "}\n" +
         "</script>");
         Map<String, Object> save = HashMapUtil.beanToMap(contentDto);
         setSaveInfo(save);

module-bigdata/src/main/java/cn/com/tenlion/bigdata/service/bigdatatemplatearea/IBigdataTemplateAreaService.java

@@ -135,8 +135,6 @@ public interface IBigdataTemplateAreaService {
      */
     SuccessResultList<List<BigdataTemplateAreaDTO>> listPageBigdataTemplateArea(ListPage page) throws SearchException;
 
-    Integer count(String bigdataTemplateId, String bigdataModuleId) throws SearchException;
-
     /**
      * 大数据展示模板的区域设置统计
      *
@@ -162,10 +160,4 @@ public interface IBigdataTemplateAreaService {
     SuccessResult copyBigdataTemplateAreaPoint(String bigdataTemplateAreaId) throws Exception;
 
     SuccessResult updateBigdataTemplateAreaPointModuleData(String bigdataTemplateAreaId, String templateAreaModuleData) throws Exception;
-
-    void updateBigdataModuleModuleJson(String businessId, String bigdataConfigJson);
-
-    void updateBigdataModuleServerJson(String businessId, String bigdataConfigJson);
-
-    void updateBigdataModuleLinkJson(String businessId, String bigdataConfigJson);
 }

module-bigdata/src/main/java/cn/com/tenlion/bigdata/service/bigdatatemplatearea/impl/BigdataTemplateAreaServiceImpl.java

@@ -1,25 +1,10 @@
 package cn.com.tenlion.bigdata.service.bigdatatemplatearea.impl;
 
 import cn.com.tenlion.bigdata.dao.bigdatatemplatearea.IBigdataTemplateAreaDao;
-import cn.com.tenlion.bigdata.pojo.dtos.bigdataconfig.BigdataConfigDTO;
-import cn.com.tenlion.bigdata.pojo.dtos.bigdataconfigtree.BigdataConfigTreeDTO;
-import cn.com.tenlion.bigdata.pojo.dtos.bigdatamodule.BigdataModuleDTO;
-import cn.com.tenlion.bigdata.pojo.dtos.bigdatatemplate.BigdataTemplateDTO;
 import cn.com.tenlion.bigdata.pojo.dtos.bigdatatemplatearea.BigdataTemplateAreaDTO;
-import cn.com.tenlion.bigdata.pojo.dtos.bigdatatemplateareaparams.BigdataTemplateAreaParamsDTO;
-import cn.com.tenlion.bigdata.pojo.vos.bigdataconfig.BigdataConfigVO;
 import cn.com.tenlion.bigdata.pojo.vos.bigdatatemplatearea.BigdataTemplateAreaPiointVO;
 import cn.com.tenlion.bigdata.pojo.vos.bigdatatemplatearea.BigdataTemplateAreaVO;
-import cn.com.tenlion.bigdata.pojo.vos.bigdatatemplateareaparams.BigdataTemplateAreaParamsVO;
-import cn.com.tenlion.bigdata.service.bigdataconfig.IBigdataConfigService;
-import cn.com.tenlion.bigdata.service.bigdatamodule.IBigdataModuleService;
-import cn.com.tenlion.bigdata.service.bigdatatemplate.IBigdataTemplateService;
 import cn.com.tenlion.bigdata.service.bigdatatemplatearea.IBigdataTemplateAreaService;
-import cn.com.tenlion.bigdata.service.bigdatatemplateareaparams.IBigdataTemplateAreaParamsService;
-import cn.com.tenlion.datahouse.pojo.dtos.datacensus.DatacensusDTO;
-import cn.com.tenlion.datahouse.pojo.dtos.datacensusapi.DatacensusApiDTO;
-import cn.com.tenlion.datahouse.service.datacensus.IDatacensusService;
-import cn.com.tenlion.datahouse.service.datacensusapi.IDatacensusApiService;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.google.common.util.concurrent.AbstractService;
@@ -34,13 +19,13 @@ import ink.wgink.pojo.result.SuccessResultData;
 import ink.wgink.pojo.result.SuccessResultList;
 import ink.wgink.util.UUIDUtil;
 import ink.wgink.util.map.HashMapUtil;
-import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.StringUtils;
-import org.omg.CORBA.DATA_CONVERSION;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-
+import java.util.Arrays;
-import java.util.*;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @ClassName: BigdataTemplateAreaServiceImpl
@@ -55,24 +40,6 @@ public class BigdataTemplateAreaServiceImpl extends DefaultBaseService implement
     @Autowired
     private IBigdataTemplateAreaDao bigdataTemplateAreaDao;
 
-    @Autowired
-    private IBigdataModuleService iBigdataModuleService;
-
-    @Autowired
-    private IBigdataConfigService iBigdataConfigService;
-
-    @Autowired
-    private IBigdataTemplateService iBigdataTemplateService;
-
-    @Autowired
-    private IDatacensusService iDatacensusService;
-
-    @Autowired
-    private IDatacensusApiService iDatacensusApiService;
-
-    @Autowired
-    private IBigdataTemplateAreaParamsService iBigdataTemplateAreaParamsService;
-
     @Override
     public SuccessResult saveBigdataTemplateArea(BigdataTemplateAreaVO bigdataTemplateAreaVO) throws Exception {
         saveBigdataTemplateAreaInfo(null, bigdataTemplateAreaVO);
@@ -106,12 +73,6 @@ public class BigdataTemplateAreaServiceImpl extends DefaultBaseService implement
         saveBigdataTemplateAreaInfoReturnId(token, bigdataTemplateAreaVO);
     }
 
-    Random rand = new Random();
-    public String getRandomColor() {
-        String[] colorArray = {"", "orange", "red", "blue", "green", "purple", "yellow"};
-        return colorArray[rand.nextInt(6 - 1 + 1) + 1];
-    }
-
     /**
      * 新增大数据展示模板的区域设置
      *
@@ -121,31 +82,8 @@ public class BigdataTemplateAreaServiceImpl extends DefaultBaseService implement
      * @throws Exception
      */
     private String saveBigdataTemplateAreaInfoReturnId(String token, BigdataTemplateAreaVO bigdataTemplateAreaVO) throws Exception {
-        // 查出此模块在页面是第几个
-        int count = count(bigdataTemplateAreaVO.getBigdataTemplateId(), bigdataTemplateAreaVO.getBigdataModuleId());
-        bigdataTemplateAreaVO.setBigdataTemplateAreaSort( (count + 1) + "");
         String bigdataTemplateAreaId = UUIDUtil.getUUID();
-        /**
+
-         * 随机创建一个颜色
-         */
-        bigdataTemplateAreaVO.setTemplateAreaColor(getRandomColor());
-        /**
-         * 查出模块初始的moduleData 和 serverData
-         */
-        bigdataTemplateAreaVO.setTemplateAreaJump("0");// 默认不跳转
-        bigdataTemplateAreaVO.setTemplateAreaSource("2");// 默认自定义数据
-        String moduleId = bigdataTemplateAreaVO.getBigdataModuleId();
-        BigdataModuleDTO moduleDTO = iBigdataModuleService.get(moduleId);
-        BigdataConfigDTO serverData = moduleDTO.getServerData();
-        BigdataConfigDTO moduleData = moduleDTO.getModuleData();
-        List<BigdataConfigTreeDTO> moduleTreeList = moduleData.getTreeList();
-        bigdataTemplateAreaVO.setTemplateAreaModuleData(moduleData.getBigdataConfigJson()); // 记录模块配置
-        // 复制.保存模块配置Json树
-        iBigdataConfigService.copyData(moduleData.getBigdataConfigId(), bigdataTemplateAreaId, "moduleAreaData");
-        // 默认渲染
-        bigdataTemplateAreaVO.setTemplateAreaServerData(serverData.getBigdataConfigJson());
-        // 复制.保存模块渲染Json树
-        iBigdataConfigService.copyData(serverData.getBigdataConfigId(), bigdataTemplateAreaId, "serverAreaData");
         bigdataTemplateAreaVO.setTemplateAreaLeft(10.0);
         bigdataTemplateAreaVO.setTemplateAreaDown(0.0);
         bigdataTemplateAreaVO.setTemplateAreaRight(0.0);
@@ -153,6 +91,7 @@ public class BigdataTemplateAreaServiceImpl extends DefaultBaseService implement
         bigdataTemplateAreaVO.setTemplateAreaHeight(300.0);
         bigdataTemplateAreaVO.setTemplateAreaWidth(300.0);
         bigdataTemplateAreaVO.setTemplateAreaServerData(bigdataTemplateAreaVO.getTemplateAreaServerData().trim());
+
         Map<String, Object> params = HashMapUtil.beanToMap(bigdataTemplateAreaVO);
         params.put("bigdataTemplateAreaId", bigdataTemplateAreaId);
         if (StringUtils.isBlank(token)) {
@@ -235,11 +174,6 @@ public class BigdataTemplateAreaServiceImpl extends DefaultBaseService implement
      * @param bigdataTemplateAreaVO
      */
     private void updateBigdataTemplateAreaInfo(String token, String bigdataTemplateAreaId, BigdataTemplateAreaVO bigdataTemplateAreaVO) throws Exception {
-        if (bigdataTemplateAreaVO.getTemplateAreaSource().equals("2")) {
-            BigdataConfigDTO bigdataConfigDTO = iBigdataConfigService.getData(bigdataTemplateAreaId, "serverAreaData");
-            // 渲染
-            bigdataTemplateAreaVO.setTemplateAreaServerData(bigdataConfigDTO.getBigdataConfigJson());
-        }
         Map<String, Object> params = HashMapUtil.beanToMap(bigdataTemplateAreaVO);
         bigdataTemplateAreaVO.setTemplateAreaServerData(bigdataTemplateAreaVO.getTemplateAreaServerData().trim());
         params.put("bigdataTemplateAreaId", bigdataTemplateAreaId);
@@ -264,48 +198,18 @@ public class BigdataTemplateAreaServiceImpl extends DefaultBaseService implement
             }
         }
         bigdataTemplateAreaDao.updateBigdataTemplateArea(params);
-        // 保存参数
-        iBigdataTemplateAreaParamsService.saveAndUpdate(bigdataTemplateAreaId, "templateArea", bigdataTemplateAreaVO.getQueryParams());
     }
 
     @Override
     public BigdataTemplateAreaDTO getBigdataTemplateAreaById(String bigdataTemplateAreaId) throws SearchException {
         Map<String, Object> params = super.getHashMap(1);
         params.put("bigdataTemplateAreaId", bigdataTemplateAreaId);
-        BigdataTemplateAreaDTO data = bigdataTemplateAreaDao.getBigdataTemplateArea(params);
+        return bigdataTemplateAreaDao.getBigdataTemplateArea(params);
-        BigdataTemplateDTO templateDTO = iBigdataTemplateService.getBigdataTemplateById(data.getBigdataTemplateId());
-        data.setBigdataTemplateProjectId(templateDTO.getBigdataTemplateProject());
-        if (data.getTemplateAreaSource().equals("3") && !StringUtils.isEmpty(data.getTemplateAreaServerData())) {
-            DatacensusDTO datacensusDTO = iDatacensusService.getByCode(data.getTemplateAreaServerData());
-            if(datacensusDTO != null) {
-                data.setDatacensusName(datacensusDTO.getDatacensusName());
-            }
-        }
-        if (data.getTemplateAreaSource().equals("1") && !StringUtils.isEmpty(data.getTemplateAreaServerData())) {
-            DatacensusApiDTO datacensusApiDTO = iDatacensusApiService.getByCode(data.getTemplateAreaServerData());
-            if(datacensusApiDTO != null) {
-                data.setDatacensusApiName(datacensusApiDTO.getDatacensusApiName());
-            }
-        }
-        List<BigdataTemplateAreaParamsDTO> paramsList = iBigdataTemplateAreaParamsService.listAll(bigdataTemplateAreaId, null);
-        data.setQueryParams(paramsList);
-        return data;
     }
 
     @Override
     public List<BigdataTemplateAreaDTO> listBigdataTemplateArea(Map<String, Object> params) throws SearchException {
-        List<BigdataTemplateAreaDTO> list = bigdataTemplateAreaDao.listBigdataTemplateArea(params);
+        return bigdataTemplateAreaDao.listBigdataTemplateArea(params);
-        for(BigdataTemplateAreaDTO data : list) {
-            if (data.getTemplateAreaSource().equals("3") && !StringUtils.isEmpty(data.getTemplateAreaServerData())) {
-                DatacensusDTO datacensusDTO = iDatacensusService.getByCode(data.getTemplateAreaServerData());
-                if(datacensusDTO != null) {
-                    data.setDatacensusName(datacensusDTO.getDatacensusName());
-                }
-            }
-            List<BigdataTemplateAreaParamsDTO> paramsList = iBigdataTemplateAreaParamsService.listAll(data.getBigdataTemplateAreaId(), null);
-            data.setQueryParams(paramsList);
-        }
-        return list;
     }
 
     @Override
@@ -322,15 +226,6 @@ public class BigdataTemplateAreaServiceImpl extends DefaultBaseService implement
         return count == null ? 0 : count;
     }
 
-    @Override
-    public Integer count(String bigdataTemplateId, String bigdataModuleId) throws SearchException {
-        Map<String, Object> params = super.getHashMap(1);
-        params.put("bigdataTemplateId", bigdataTemplateId);
-        params.put("bigdataModuleId", bigdataModuleId);
-        Integer count = bigdataTemplateAreaDao.count(params);
-        return count == null ? 0 : count;
-    }
-
     @Override
     public SuccessResultData<Integer> countBigdataTemplateArea(Map<String, Object> params) throws SearchException {
         return new SuccessResultData<>(countNumberBigdataTemplateArea(params));
@@ -340,12 +235,7 @@ public class BigdataTemplateAreaServiceImpl extends DefaultBaseService implement
     public List<BigdataTemplateAreaDTO> getBigdataTemplateAreaByBigdataTemplateId(String bigdataTemplateId) throws SearchException {
         Map<String, Object> params = super.getHashMap(1);
         params.put("bigdataTemplateId", bigdataTemplateId);
-        List<BigdataTemplateAreaDTO> list = bigdataTemplateAreaDao.getBigdataTemplateAreaByBigdataTemplateId(params);
+        return bigdataTemplateAreaDao.getBigdataTemplateAreaByBigdataTemplateId(params);
-        for(BigdataTemplateAreaDTO data : list) {
-            List<BigdataTemplateAreaParamsDTO> paramsList = iBigdataTemplateAreaParamsService.listAll(data.getBigdataTemplateAreaId(), null);
-            data.setQueryParams(paramsList);
-        }
-        return list;
     }
 
     @Override
@@ -375,47 +265,12 @@ public class BigdataTemplateAreaServiceImpl extends DefaultBaseService implement
         dto.setTemplateAreaDown(0.0);
         dto.setTemplateAreaRight(0.0);
         dto.setTemplateAreaTop(10.0);
+        dto.setTemplateAreaHeight(300.0);
+        dto.setTemplateAreaWidth(300.0);
         dto.setBigdataTemplateAreaId(newBigdataTemplateAreaId);
-        // 查出此模块在页面是第几个
-        int count = count(dto.getBigdataTemplateId(), dto.getBigdataModuleId());
-        dto.setBigdataTemplateAreaSort( (count + 1) + "");
-        /**
-         * 查出模块初始的moduleData 和 serverData
-         */
-        String moduleId = dto.getBigdataModuleId();
-        BigdataModuleDTO moduleDTO = iBigdataModuleService.get(moduleId);
-        BigdataConfigDTO serverData = moduleDTO.getServerData();
-        BigdataConfigDTO moduleData = moduleDTO.getModuleData();
-        List<BigdataConfigTreeDTO> moduleTreeList = moduleData.getTreeList();
-        dto.setTemplateAreaModuleData(moduleData.getBigdataConfigJson()); // 记录模块配置
-        // 复制.保存模块配置Json树
-        iBigdataConfigService.copyData(moduleData.getBigdataConfigId(), newBigdataTemplateAreaId, "moduleAreaData");
-        // 默认渲染
-        if (dto.getTemplateAreaSource().equals("2")) {
-            dto.setTemplateAreaServerData(serverData.getBigdataConfigJson());
-            // 复制.保存模块渲染Json树
-            iBigdataConfigService.copyData(serverData.getBigdataConfigId(), newBigdataTemplateAreaId, "serverAreaData");
-        }
-        /**
-         * 查出参数的复制
-         */
-        List<BigdataTemplateAreaParamsDTO>  queryList = dto.getQueryParams();
-        List<BigdataTemplateAreaParamsVO> queryParams = new ArrayList<BigdataTemplateAreaParamsVO>();
-        for(BigdataTemplateAreaParamsDTO query : queryList) {
-            BigdataTemplateAreaParamsVO paramsVO = new BigdataTemplateAreaParamsVO();
-            paramsVO.setAreaId(newBigdataTemplateAreaId);
-            paramsVO.setParamsType(query.getParamsType());
-            paramsVO.setParamsKey(query.getParamsKey());
-            paramsVO.setParamsText(query.getParamsText());
-            paramsVO.setParamsValue(query.getParamsValue());
-            queryParams.add(paramsVO);
-        }
-        // 保存参数
-        iBigdataTemplateAreaParamsService.saveAndUpdate(newBigdataTemplateAreaId, "templateArea", queryParams);
         Map<String, Object> params = HashMapUtil.beanToMap(dto);
         setSaveInfo(params);
         bigdataTemplateAreaDao.saveBigdataTemplateArea(params);
-
         return new SuccessResult();
     }
 
@@ -433,31 +288,4 @@ public class BigdataTemplateAreaServiceImpl extends DefaultBaseService implement
         return new SuccessResult();
     }
 
-    @Override
-    public void updateBigdataModuleModuleJson(String businessId, String bigdataConfigJson) {
-        Map<String, Object> params = new HashMap();
-        params.put("bigdataTemplateAreaId", businessId);
-        params.put("templateAreaModuleData", bigdataConfigJson);
-        setUpdateInfo(params);
-        bigdataTemplateAreaDao.updateBigdataModuleModuleJson(params);
-    }
-
-    @Override
-    public void updateBigdataModuleServerJson(String businessId, String bigdataConfigJson) {
-        Map<String, Object> params = new HashMap();
-        params.put("bigdataTemplateAreaId", businessId);
-        params.put("templateAreaServerData", bigdataConfigJson);
-        setUpdateInfo(params);
-        bigdataTemplateAreaDao.updateBigdataModuleServerJson(params);
-    }
-
-    @Override
-    public void updateBigdataModuleLinkJson(String businessId, String bigdataConfigJson) {
-        Map<String, Object> params = new HashMap();
-        params.put("bigdataTemplateAreaId", businessId);
-        params.put("templateAreaLinkData", bigdataConfigJson);
-        setUpdateInfo(params);
-        bigdataTemplateAreaDao.updateBigdataModuleLinkJson(params);
-    }
-
 }

module-bigdata/src/main/java/cn/com/tenlion/bigdata/service/bigdatatemplatearealink/IBigdataTemplateAreaLinkService.java

@@ -1,8 +1,5 @@
 package cn.com.tenlion.bigdata.service.bigdatatemplatearealink;
 
-import cn.com.tenlion.bigdata.pojo.dtos.bigdatatemplatearea.BigdataTemplateAreaDTO;
-import cn.com.tenlion.bigdata.pojo.dtos.bigdatatemplatearealink.BigdataTemplateAreaLinkListDTO;
-import cn.com.tenlion.bigdata.pojo.vos.bigdatatemplatearealink.BigdataTemplateAreaLinkListVO;
 import ink.wgink.pojo.ListPage;
 import ink.wgink.pojo.result.SuccessResultList;
 import cn.com.tenlion.bigdata.pojo.dtos.bigdatatemplatearealink.BigdataTemplateAreaLinkDTO;
@@ -116,14 +113,6 @@ public interface IBigdataTemplateAreaLinkService {
      */
     BigdataTemplateAreaLinkDTO get(String bigdataTemplateAreaLinkId);
 
-    /**
-     * 详情
-     * @param linkSrcAreaId
-     * @param linkTargetAreaId
-     * @return
-     */
-    BigdataTemplateAreaLinkDTO get(String linkSrcAreaId, String linkTargetAreaId);
-
     /**
      * 详情
      *
@@ -188,14 +177,6 @@ public interface IBigdataTemplateAreaLinkService {
      */
     SuccessResultList<List<BigdataTemplateAreaLinkDTO>> listPage(ListPage page);
 
-    /**
-     * 获取联动映射
-     * @param linkSrcAreaId
-     * @param linkTargetAreaId
-     * @return
-     */
-    BigdataTemplateAreaLinkDTO getBySrcAndTargetId(String linkSrcAreaId, String linkTargetAreaId);
-
     /**
      * 统计
      *
@@ -204,26 +185,4 @@ public interface IBigdataTemplateAreaLinkService {
      */
     Integer count(Map<String, Object> params);
 
-    /**
-     * 所有支持联动的区域列表(配置了参数的都是可以联动的)
-     * @param linkSrcAreaId
-     * @param params
-     * @return
-     */
-    BigdataTemplateAreaLinkListDTO listArea(String linkSrcAreaId, Map<String, Object> params);
-
-    /**
-     * 查找区域的联动映射
-     * @param linkSrcAreaId
-     * @return
-     */
-    List<BigdataTemplateAreaLinkDTO> listBySrcId(String linkSrcAreaId);
-
-    /**
-     * 映射保存
-     * @param listVO
-     */
-    void saveData(BigdataTemplateAreaLinkListVO listVO);
-
-    void deleteBySrcId(String srcAreaId);
 }

module-bigdata/src/main/java/cn/com/tenlion/bigdata/service/bigdatatemplatearealink/impl/BigdataTemplateAreaLinkServiceImpl.java

@@ -1,13 +1,5 @@
 package cn.com.tenlion.bigdata.service.bigdatatemplatearealink.impl;
 
-import cn.com.tenlion.bigdata.pojo.dtos.bigdatatemplatearea.BigdataTemplateAreaDTO;
-import cn.com.tenlion.bigdata.pojo.dtos.bigdatatemplatearealink.BigdataTemplateAreaLinkListDTO;
-import cn.com.tenlion.bigdata.pojo.dtos.bigdatatemplatearealinkmapping.BigdataTemplateAreaLinkMappingDTO;
-import cn.com.tenlion.bigdata.pojo.vos.bigdatatemplatearealink.BigdataTemplateAreaLinkListVO;
-import cn.com.tenlion.bigdata.pojo.vos.bigdatatemplatearealinkmapping.BigdataTemplateAreaLinkMappingVO;
-import cn.com.tenlion.bigdata.service.bigdatatemplatearea.IBigdataTemplateAreaService;
-import cn.com.tenlion.bigdata.service.bigdatatemplatearealinkmapping.IBigdataTemplateAreaLinkMappingService;
-import cn.com.tenlion.bigdata.service.bigdatatemplateareaparams.IBigdataTemplateAreaParamsService;
 import ink.wgink.common.base.DefaultBaseService;
 import ink.wgink.pojo.ListPage;
 import ink.wgink.pojo.result.SuccessResult;
@@ -41,15 +33,6 @@ public class BigdataTemplateAreaLinkServiceImpl extends DefaultBaseService imple
     @Autowired
     private IBigdataTemplateAreaLinkDao bigdataTemplateAreaLinkDao;
 
-    @Autowired
-    private IBigdataTemplateAreaParamsService iBigdataTemplateAreaParamsService;
-
-    @Autowired
-    private IBigdataTemplateAreaLinkMappingService iBigdataTemplateAreaLinkMappingService;
-
-    @Autowired
-    private IBigdataTemplateAreaService iBigdataTemplateAreaService;
-
     @Override
     public void save(BigdataTemplateAreaLinkVO bigdataTemplateAreaLinkVO) {
         saveReturnId(bigdataTemplateAreaLinkVO);
@@ -68,13 +51,6 @@ public class BigdataTemplateAreaLinkServiceImpl extends DefaultBaseService imple
     @Override
     public String saveReturnId(String token, BigdataTemplateAreaLinkVO bigdataTemplateAreaLinkVO) {
         String bigdataTemplateAreaLinkId = UUIDUtil.getUUID();
-        /**
-         *  查询是否已经存在, 存在直接返回ID即可
-         */
-        BigdataTemplateAreaLinkDTO dto = getBySrcAndTargetId(bigdataTemplateAreaLinkVO.getLinkSrcAreaId(), bigdataTemplateAreaLinkVO.getLinkTargetAreaId());
-        if(dto != null) {
-            return dto.getBigdataTemplateAreaLinkId();
-        }
         Map<String, Object> params = HashMapUtil.beanToMap(bigdataTemplateAreaLinkVO);
         params.put("bigdataTemplateAreaLinkId", bigdataTemplateAreaLinkId);
         if (StringUtils.isBlank(token)) {
@@ -86,14 +62,6 @@ public class BigdataTemplateAreaLinkServiceImpl extends DefaultBaseService imple
         return bigdataTemplateAreaLinkId;
     }
 
-    @Override
-    public BigdataTemplateAreaLinkDTO getBySrcAndTargetId(String linkSrcAreaId, String linkTargetAreaId) {
-        Map<String, Object> params = getHashMap(2);
-        params.put("linkSrcAreaId", linkSrcAreaId);
-        params.put("linkTargetAreaId", linkTargetAreaId);
-        return bigdataTemplateAreaLinkDao.get(params);
-    }
-
     @Override
     public void remove(List<String> ids) {
         remove(null, ids);
@@ -147,14 +115,6 @@ public class BigdataTemplateAreaLinkServiceImpl extends DefaultBaseService imple
         return get(params);
     }
 
-    @Override
-    public BigdataTemplateAreaLinkDTO get(String linkSrcAreaId, String linkTargetAreaId) {
-        Map<String, Object> params = super.getHashMap(2);
-        params.put("linkSrcAreaId", linkSrcAreaId);
-        params.put("linkTargetAreaId", linkTargetAreaId);
-        return get(params);
-    }
-
     @Override
     public BigdataTemplateAreaLinkBO getBO(Map<String, Object> params) {
         return bigdataTemplateAreaLinkDao.getBO(params);
@@ -208,75 +168,4 @@ public class BigdataTemplateAreaLinkServiceImpl extends DefaultBaseService imple
         return count == null ? 0 : count;
     }
 
-    @Override
-    public BigdataTemplateAreaLinkListDTO listArea(String linkSrcAreaId, Map<String, Object> params) {
-        BigdataTemplateAreaDTO areaDTO = iBigdataTemplateAreaService.getBigdataTemplateAreaById(linkSrcAreaId);
-        List<BigdataTemplateAreaDTO> list = iBigdataTemplateAreaService.getBigdataTemplateAreaByBigdataTemplateId(areaDTO.getBigdataTemplateId());
-        ArrayList<String> areaIdList = new ArrayList<String>();
-        for (BigdataTemplateAreaDTO dto : list) {
-            if (!dto.getBigdataTemplateAreaId().equals(linkSrcAreaId)) {
-                areaIdList.add(dto.getBigdataTemplateAreaId());
-            }
-        }
-        // 查出支持联动的区域
-        Map<String, Object> query = super.getHashMap(2);
-        query.put("areaIdList", areaIdList);
-        Set<String> areaList = iBigdataTemplateAreaParamsService.listByAreaIdList(query);
-        List<BigdataTemplateAreaDTO> array = new ArrayList<BigdataTemplateAreaDTO>();
-        if (areaList.size() > 0 ) {
-            // 查询区域列表
-            query.clear();
-            List<String> queryList = new ArrayList<String>(areaList);
-            query.put("bigdataTemplateAreaIds", queryList);
-            array = iBigdataTemplateAreaService.listBigdataTemplateArea(query);
-        }
-        BigdataTemplateAreaLinkListDTO listDTO = new BigdataTemplateAreaLinkListDTO();
-        listDTO.setTargetAreaList(array);
-        // 查询已经连线的区域进行回显
-        List<BigdataTemplateAreaLinkDTO> linkList = listBySrcId(linkSrcAreaId);
-        listDTO.setLinkList(linkList);
-        return listDTO;
-    }
-
-    @Override
-    public List<BigdataTemplateAreaLinkDTO> listBySrcId(String linkSrcAreaId) {
-        Map<String, Object> params = super.getHashMap(2);
-        params.put("linkSrcAreaId", linkSrcAreaId);
-        List<BigdataTemplateAreaLinkDTO> list = list(params);
-        for (BigdataTemplateAreaLinkDTO linkDTO : list) {
-            // 封装对应的参数
-            List<BigdataTemplateAreaLinkMappingDTO> linkMapping = iBigdataTemplateAreaLinkMappingService.listByLinkId(linkDTO.getBigdataTemplateAreaLinkId());
-            linkDTO.setLinkMapping(linkMapping);
-        }
-        return list;
-    }
-
-    @Override
-    public void saveData(BigdataTemplateAreaLinkListVO listVO) {
-        // 删除旧的配置
-        deleteBySrcId(listVO.getLinkSrcAreaId());
-        List<BigdataTemplateAreaLinkVO> linkList = listVO.getLinkList();
-        for(BigdataTemplateAreaLinkVO link : linkList) {
-            // 保存区域联动映射
-            String srcAreaId = link.getLinkSrcAreaId();
-            String targetAreaId = link.getLinkTargetAreaId();
-            String linkId = saveReturnId(link);
-            // 删除旧的字段映射关系
-            iBigdataTemplateAreaLinkMappingService.deleteByLinkId(linkId);
-            // 保存新的字段映射关系
-            List<BigdataTemplateAreaLinkMappingVO> linkMappingList = link.getLinkMapping();
-            for(BigdataTemplateAreaLinkMappingVO linkMappingVO : linkMappingList) {
-                linkMappingVO.setBigdataTemplateAreaLinkId(linkId);
-                iBigdataTemplateAreaLinkMappingService.save(linkMappingVO);
-            }
-        }
-    }
-
-    @Override
-    public void deleteBySrcId(String linkSrcAreaId) {
-        Map<String, Object> params = super.getHashMap(2);
-        params.put("linkSrcAreaId", linkSrcAreaId);
-        bigdataTemplateAreaLinkDao.deleteBySrcId(params);
-    }
-
 }

module-bigdata/src/main/java/cn/com/tenlion/bigdata/service/bigdatatemplatearealinkmapping/IBigdataTemplateAreaLinkMappingService.java

@@ -1,6 +1,5 @@
 package cn.com.tenlion.bigdata.service.bigdatatemplatearealinkmapping;
 
-import cn.com.tenlion.bigdata.pojo.dtos.bigdatatemplatearealinkmapping.BigdataLinkMappingDTO;
 import ink.wgink.pojo.ListPage;
 import ink.wgink.pojo.result.SuccessResultList;
 import cn.com.tenlion.bigdata.pojo.dtos.bigdatatemplatearealinkmapping.BigdataTemplateAreaLinkMappingDTO;
@@ -186,24 +185,4 @@ public interface IBigdataTemplateAreaLinkMappingService {
      */
     Integer count(Map<String, Object> params);
 
-    /**
-     * 获取字段对应关系
-     * @param linkSrcAreaId
-     * @param linkTargetAreaId
-     * @return
-     */
-    BigdataLinkMappingDTO listMapping(String linkSrcAreaId, String linkTargetAreaId);
-
-    /**
-     * 删除字段映射
-     * @param linkId
-     */
-    void deleteByLinkId(String linkId);
-
-    /**
-     * 查找区域联动的配置参数
-     * @param bigdataTemplateAreaLinkId
-     * @return
-     */
-    List<BigdataTemplateAreaLinkMappingDTO> listByLinkId(String bigdataTemplateAreaLinkId);
 }

module-bigdata/src/main/java/cn/com/tenlion/bigdata/service/bigdatatemplatearealinkmapping/impl/BigdataTemplateAreaLinkMappingServiceImpl.java

@@ -1,22 +1,5 @@
 package cn.com.tenlion.bigdata.service.bigdatatemplatearealinkmapping.impl;
 
-import cn.com.tenlion.bigdata.dao.bigdatatemplatearealink.IBigdataTemplateAreaLinkDao;
-import cn.com.tenlion.bigdata.pojo.dtos.bigdataconfig.BigdataConfigDTO;
-import cn.com.tenlion.bigdata.pojo.dtos.bigdataconfigtree.BigdataConfigTreeDTO;
-import cn.com.tenlion.bigdata.pojo.dtos.bigdatamodule.BigdataModuleDTO;
-import cn.com.tenlion.bigdata.pojo.dtos.bigdatatemplatearea.BigdataTemplateAreaDTO;
-import cn.com.tenlion.bigdata.pojo.dtos.bigdatatemplatearealink.BigdataTemplateAreaLinkDTO;
-import cn.com.tenlion.bigdata.pojo.dtos.bigdatatemplatearealinkmapping.BigdataLinkMappingDTO;
-import cn.com.tenlion.bigdata.pojo.dtos.bigdatatemplatearealinkmapping.BigdataLinkMappingSrcDTO;
-import cn.com.tenlion.bigdata.pojo.dtos.bigdatatemplatearealinkmapping.BigdataLinkMappingTargetDTO;
-import cn.com.tenlion.bigdata.pojo.dtos.bigdatatemplateareaparams.BigdataTemplateAreaParamsDTO;
-import cn.com.tenlion.bigdata.service.bigdataconfig.IBigdataConfigService;
-import cn.com.tenlion.bigdata.service.bigdataconfigtree.IBigdataConfigTreeService;
-import cn.com.tenlion.bigdata.service.bigdatamodule.IBigdataModuleService;
-import cn.com.tenlion.bigdata.service.bigdatatemplatearea.IBigdataTemplateAreaService;
-import cn.com.tenlion.bigdata.service.bigdatatemplatearealink.IBigdataTemplateAreaLinkService;
-import cn.com.tenlion.bigdata.service.bigdatatemplateareaparams.IBigdataTemplateAreaParamsService;
-import com.alibaba.fastjson.JSONObject;
 import ink.wgink.common.base.DefaultBaseService;
 import ink.wgink.pojo.ListPage;
 import ink.wgink.pojo.result.SuccessResult;
@@ -36,8 +19,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.*;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 /**
  * @ClassName: BigdataTemplateAreaLinkMappingServiceImpl
@@ -52,103 +33,6 @@ public class BigdataTemplateAreaLinkMappingServiceImpl extends DefaultBaseServic
     @Autowired
     private IBigdataTemplateAreaLinkMappingDao bigdataTemplateAreaLinkMappingDao;
 
-    @Autowired
-    private IBigdataTemplateAreaService iBigdataTemplateAreaService;
-
-    @Autowired
-    private IBigdataTemplateAreaParamsService iBigdataTemplateAreaParamsService;
-
-    @Autowired
-    private IBigdataConfigService iBigdataConfigService;
-
-    @Autowired
-    private IBigdataConfigTreeService iBigdataConfigTreeService;
-
-    @Autowired
-    private IBigdataModuleService iBigdataModuleService;
-
-    @Autowired
-    private IBigdataTemplateAreaLinkService iBigdataTemplateAreaLinkService;
-
-//    private static final Pattern NUM_PATTERN = Pattern.compile("/\\[[^\\)]*\\]/g");
-//
-//    public static String parseString(String text) {
-//        Matcher matcher = NUM_PATTERN.matcher(text);
-//        StringBuilder sb = new StringBuilder();
-//        while (matcher.find()) {
-//            return matcher.group();
-//        }
-//        return "";
-//    }
-
-    @Override
-    public BigdataLinkMappingDTO listMapping(String linkSrcAreaId, String linkTargetAreaId) {
-        /**
-         * 1. 查出触发下模块的linkData.
-         * 2. 查出被触发模块区域的请求参数
-         * 3. 查出他们现在已有的对应关系
-         * 4. 进行数据封装返回
-         */
-        BigdataLinkMappingDTO resultDTO = new BigdataLinkMappingDTO();
-        BigdataTemplateAreaDTO srcAreaDTO = iBigdataTemplateAreaService.getBigdataTemplateAreaById(linkSrcAreaId);
-        BigdataModuleDTO moduleDTO = iBigdataModuleService.getBigdataModuleById(srcAreaDTO.getBigdataModuleId());
-        BigdataConfigDTO configDTO = iBigdataConfigService.getData(moduleDTO.getBigdataModuleId(), "linkData");
-        List<BigdataConfigTreeDTO> treeList = configDTO.getTreeList();
-        // 所有声明的联动参数
-        Map<String, String> mappingMap = new LinkedHashMap<String, String>();
-        Map<String, String> linkList = new LinkedHashMap<String, String>();
-        Map<String, String> paramsList = new LinkedHashMap<String, String>();
-        // 封装所有的联动字段名
-        for(BigdataConfigTreeDTO treeDTO : treeList) {
-            if(!"0".equals(treeDTO.getpId()) && !treeDTO.getIsParent()) {
-                String key = treeDTO.getName().replaceAll("\\[.*?\\]", "");
-                linkList.put(key, treeDTO.getName());
-                mappingMap.put(key, "");
-            }
-        }
-        // 查出被联动区域的查询参数
-        List<BigdataTemplateAreaParamsDTO> targetAreaParams = iBigdataTemplateAreaParamsService.listAll(linkTargetAreaId, "templateArea");
-        for(BigdataTemplateAreaParamsDTO paramsDTO :targetAreaParams) {
-            paramsList.put(paramsDTO.getParamsKey(), paramsDTO.getParamsText());
-        }
-        // 查出他们的对应关系
-        BigdataTemplateAreaLinkDTO linkDTO = iBigdataTemplateAreaLinkService.get(linkSrcAreaId, linkTargetAreaId);
-        if (linkDTO != null) {
-            Map<String, Object> params = getHashMap(2);
-            params.put("bigdataTemplateAreaLinkId", linkDTO.getBigdataTemplateAreaLinkId());
-            List<BigdataTemplateAreaLinkMappingDTO> linkMappingList = list(params);
-            for(BigdataTemplateAreaLinkMappingDTO dto : linkMappingList) {
-                if(mappingMap.get(dto.getLinkSrcMappingKey()) != null) {
-                    mappingMap.put(dto.getLinkSrcMappingKey(), dto.getLinkTargetMappingKey());
-                }
-            }
-        }
-        BigdataLinkMappingSrcDTO srcDTO = new BigdataLinkMappingSrcDTO();
-        srcDTO.setAreaId(linkSrcAreaId);
-        srcDTO.setLinkList(linkList);
-        BigdataLinkMappingTargetDTO targetDTO = new BigdataLinkMappingTargetDTO();
-        targetDTO.setAreaId(linkTargetAreaId);
-        targetDTO.setParamsList(paramsList);
-        resultDTO.setSrcDTO(srcDTO);
-        resultDTO.setTargetDTO(targetDTO);
-        resultDTO.setLinkMapping(mappingMap);
-        return resultDTO;
-    }
-
-    @Override
-    public void deleteByLinkId(String linkId) {
-        Map<String, Object> params = getHashMap(2);
-        params.put("bigdataTemplateAreaLinkId", linkId);
-        bigdataTemplateAreaLinkMappingDao.delete(params);
-    }
-
-    @Override
-    public List<BigdataTemplateAreaLinkMappingDTO> listByLinkId(String bigdataTemplateAreaLinkId) {
-        Map<String, Object> params = getHashMap(2);
-        params.put("bigdataTemplateAreaLinkId", bigdataTemplateAreaLinkId);
-        return list(params);
-    }
-
     @Override
     public void save(BigdataTemplateAreaLinkMappingVO bigdataTemplateAreaLinkMappingVO) {
         saveReturnId(bigdataTemplateAreaLinkMappingVO);

module-bigdata/src/main/java/cn/com/tenlion/bigdata/service/bigdatatemplateareaparams/IBigdataTemplateAreaParamsService.java

@@ -9,7 +9,6 @@ import cn.com.tenlion.bigdata.pojo.pos.bigdatatemplateareaparams.BigdataTemplate
 
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
 /**
  * @ClassName: IBigdataTemplateAreaParamsService
@@ -20,12 +19,6 @@ import java.util.Set;
  **/
 public interface IBigdataTemplateAreaParamsService {
 
-    /**
-     * 新增或修改
-     * @return
-     */
-    void saveAndUpdate(String areaId, String paramsType, List<BigdataTemplateAreaParamsVO> list);
-
     /**
      * 新增
      *
@@ -85,13 +78,6 @@ public interface IBigdataTemplateAreaParamsService {
      */
     void delete(List<String> ids);
 
-    /**
-     * 列表
-     * @param areaId 区域ID
-     * @return
-     */
-    void deleteAll(String areaId);
-
     /**
      * 修改
      *
@@ -167,14 +153,6 @@ public interface IBigdataTemplateAreaParamsService {
      */
     List<BigdataTemplateAreaParamsDTO> list(Map<String, Object> params);
 
-    /**
-     * 列表
-     * @param areaId 区域ID
-     * @param paramsType 参数类型
-     * @return
-     */
-    List<BigdataTemplateAreaParamsDTO> listAll(String areaId, String paramsType);
-
     /**
      * 列表
      *
@@ -207,5 +185,4 @@ public interface IBigdataTemplateAreaParamsService {
      */
     Integer count(Map<String, Object> params);
 
-    Set<String> listByAreaIdList(Map<String, Object> query);
 }

module-bigdata/src/main/java/cn/com/tenlion/bigdata/service/bigdatatemplateareaparams/impl/BigdataTemplateAreaParamsServiceImpl.java

@@ -33,25 +33,6 @@ public class BigdataTemplateAreaParamsServiceImpl extends DefaultBaseService imp
     @Autowired
     private IBigdataTemplateAreaParamsDao bigdataTemplateAreaParamsDao;
 
-    @Override
-    public void saveAndUpdate(String areaId, String paramsType, List<BigdataTemplateAreaParamsVO> list) {
-        // 删除区域旧的所有参数配置
-        deleteAll(areaId);
-        for (BigdataTemplateAreaParamsVO vo : list) {
-            vo.setParamsType(paramsType);
-            vo.setAreaId(areaId);
-            save(vo);
-        }
-    }
-
-    @Override
-    public List<BigdataTemplateAreaParamsDTO> listAll(String areaId, String paramsType) {
-        Map<String, Object> params = super.getHashMap(2);
-        params.put("areaId", areaId);
-        params.put("paramsType", paramsType);
-        return bigdataTemplateAreaParamsDao.list(params);
-    }
-
     @Override
     public void save(BigdataTemplateAreaParamsVO bigdataTemplateAreaParamsVO) {
         saveReturnId(bigdataTemplateAreaParamsVO);
@@ -71,7 +52,7 @@ public class BigdataTemplateAreaParamsServiceImpl extends DefaultBaseService imp
     public String saveReturnId(String token, BigdataTemplateAreaParamsVO bigdataTemplateAreaParamsVO) {
         String bigdataTemplateAreaParamsId = UUIDUtil.getUUID();
         Map<String, Object> params = HashMapUtil.beanToMap(bigdataTemplateAreaParamsVO);
-        params.put("paramsId", bigdataTemplateAreaParamsId);
+        params.put("bigdataTemplateAreaParamsId", bigdataTemplateAreaParamsId);
         if (StringUtils.isBlank(token)) {
             setSaveInfo(params);
         } else {
@@ -105,13 +86,6 @@ public class BigdataTemplateAreaParamsServiceImpl extends DefaultBaseService imp
         bigdataTemplateAreaParamsDao.delete(params);
     }
 
-    @Override
-    public void deleteAll(String areaId) {
-        Map<String, Object> params = getHashMap(2);
-        params.put("areaId", areaId);
-        bigdataTemplateAreaParamsDao.delete(params);
-    }
-
     @Override
     public void update(String bigdataTemplateAreaParamsId, BigdataTemplateAreaParamsVO bigdataTemplateAreaParamsVO) {
         update(null, bigdataTemplateAreaParamsId, bigdataTemplateAreaParamsVO);
@@ -194,14 +168,4 @@ public class BigdataTemplateAreaParamsServiceImpl extends DefaultBaseService imp
         return count == null ? 0 : count;
     }
 
-    @Override
-    public Set<String> listByAreaIdList(Map<String, Object> query) {
-        List<BigdataTemplateAreaParamsDTO> list = list(query);
-        Set<String> array = new LinkedHashSet<String>();
-        for(BigdataTemplateAreaParamsDTO dto : list) {
-            array.add(dto.getAreaId());
-        }
-        return array;
-    }
-
 }

module-bigdata/src/main/java/cn/com/tenlion/bigdata/util/ImageUtils.java

@@ -1,38 +1,65 @@
-package cn.com.tenlion.bigdata.util;
+package cn.com.tenlion.policefood.utils;
 
-import ink.wgink.exceptions.base.SystemException;
+import com.github.pagehelper.util.StringUtil;
-import ink.wgink.module.file.pojo.vos.FileVO;
+import ink.wgink.exceptions.SaveException;
 import ink.wgink.properties.FileProperties;
 import ink.wgink.util.UUIDUtil;
 import ink.wgink.util.date.DateUtil;
 import net.coobird.thumbnailator.Thumbnails;
-import org.apache.commons.codec.binary.Base64;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
 import sun.misc.BASE64Decoder;
-import sun.misc.BASE64Encoder;
 import javax.imageio.ImageIO;
-import java.awt.*;
 import java.awt.image.BufferedImage;
 import java.io.*;
+import org.apache.commons.codec.binary.*;
 
-/**
+@Component
- * 图片工具类
- * 2022年5月24日10:45:36 崔宝铖
- */
 public class ImageUtils {
 
     @Autowired
     private FileProperties fileProperties;
 
-    /**
+    public String ThumbnailsFile(File sourceFile) throws Exception {
-     * 将base64图片压缩后返回
+        if (sourceFile == null) {
-     * @param base64
+            throw new SaveException("图片不能为空");
-     * @return
+        }
-     * @throws Exception
+        String fileName = UUIDUtil.get32UUID() + ".jpg";
-     */
+        String baseUploadPath = fileProperties.getUploadPath();
-    public static String ThumbnailsFile(String base64) throws Exception {
+        if (StringUtil.isEmpty(baseUploadPath)) {
-        BASE64Decoder decoder = new BASE64Decoder();
+            throw new SaveException("上传路径未配置");
+        }
+        StringBuilder filePath = new StringBuilder();
+        if (!baseUploadPath.endsWith(File.separator)) {
+            filePath.append(baseUploadPath).append(File.separator);
+        } else {
+            filePath.append(baseUploadPath);
+        }
+        filePath.append("images");
+        String days = DateUtil.getDays();
+        filePath.append(File.separator).append(days).append(File.separator);
+        File file = new File(filePath.toString());
+        if (!file.exists()) {
+            file.mkdirs();
+        }
+        String fileFilePath = filePath.toString() + fileName;
+        try {
+            Thumbnails.of(new File[]{sourceFile}).scale(0.5).outputQuality(0.2).toFile(fileFilePath);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        // 将文件转base64
+        String base64 = fileToBase64(new File(fileFilePath));
+        return base64;
+    }
+
+    public String ThumbnailsFile(BufferedImage buffer) throws Exception {
+        String Base64 = saveBufferImageToFile(buffer, 0.2);
+        return Base64;
+    }
+
+    public String ThumbnailsFile(String base64) throws Exception {
+        BASE64Decoder decoder = new sun.misc.BASE64Decoder();
         byte[] bytes = decoder.decodeBuffer(base64.replaceAll("data:image/png;base64,", ""));
         ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
         BufferedImage buffer = ImageIO.read(bais);
@@ -40,42 +67,48 @@ public class ImageUtils {
         return Base64;
     }
 
-    /**
+    private String saveBufferImageToFile(BufferedImage bufferedImage, Double picturesThumbnails) {
-     * 图片压缩
+        if (bufferedImage == null) {
-     * @param bufferedImage
+            throw new SaveException("图片不能为空");
-     * @param picturesThumbnails
+        }
-     * @return
+        String fileName = UUIDUtil.get32UUID() + ".jpg";
-     */
+        String baseUploadPath = fileProperties.getUploadPath();
-    private static String saveBufferImageToFile(BufferedImage bufferedImage, Double picturesThumbnails) {
+        if (StringUtil.isEmpty(baseUploadPath)) {
-        BufferedImage image = null;
+            throw new SaveException("上传路径未配置");
+        }
+        StringBuilder filePath = new StringBuilder();
+        if (!baseUploadPath.endsWith(File.separator)) {
+            filePath.append(baseUploadPath).append(File.separator);
+        } else {
+            filePath.append(baseUploadPath);
+        }
+        filePath.append("images");
+        String days = DateUtil.getDays();
+        filePath.append(File.separator).append(days).append(File.separator);
+        File file = new File(filePath.toString());
+        if (!file.exists()) {
+            file.mkdirs();
+        }
+        String fileFilePath = filePath.toString() + fileName;
+        createImage(fileFilePath, bufferedImage);
         try {
-            image = Thumbnails.of(new BufferedImage[]{bufferedImage}).scale(0.5).outputQuality(picturesThumbnails).asBufferedImage();
+            Thumbnails.of(new BufferedImage[]{bufferedImage}).scale(0.5).outputQuality(picturesThumbnails).toFile(fileFilePath);
+
         } catch (IOException e) {
             e.printStackTrace();
         }
         // 将文件转base64
-        String base64 = imageToBase64(image);
+        String base64 = fileToBase64(new File(fileFilePath));
         return base64;
     }
 
-    /**
+    private static void createImage(String fileLocation, BufferedImage image) {
-     * 文件BufferedImage类型转BASE64
-     *
-     * @param bufferedImage
-     * @return
-     */
-    private static String imageToBase64(BufferedImage bufferedImage) {
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();//io流
         try {
-            ImageIO.write(bufferedImage, "png", baos);//写入流中
+            String formatName = fileLocation.substring(fileLocation.lastIndexOf(".") + 1);
-        } catch (IOException e) {
+            ImageIO.write(image, formatName , new File(fileLocation));
+        } catch (Exception e) {
             e.printStackTrace();
         }
-        byte[] bytes = baos.toByteArray();//转换成字节
-        BASE64Encoder encoder = new BASE64Encoder();
-        String png_base64 = encoder.encodeBuffer(bytes).trim();//转换成base64串
-        png_base64 = png_base64.replaceAll("\n", "").replaceAll("\r", "");//删除 \r\n
-        return "data:image/png;base64," + png_base64;
     }
 
     /**
@@ -84,7 +117,7 @@ public class ImageUtils {
      * @param file
      * @return
      */
-    private static String fileToBase64(File file) {
+    public static String fileToBase64(File file) {
         return "data:image/png;base64," + Base64.encodeBase64String(fileToByte(file));
     }
 
@@ -108,6 +141,4 @@ public class ImageUtils {
         return fileBytes;
     }
 
-
-
 }

module-bigdata/src/main/resources/mybatis/mapper/bigdataconfig/bigdata-config-mapper.xml

@@ -122,16 +122,8 @@
         WHERE
             t1.is_delete = 0
             <if test="bigdataConfigId != null and bigdataConfigId != ''">
-                AND
+        AND
-                t1.bigdata_config_id = #{bigdataConfigId}
+            t1.bigdata_config_id = #{bigdataConfigId}
-                </if>
-            <if test="businessId != null and businessId != ''">
-                AND
-                t1.business_id = #{businessId}
-            </if>
-            <if test="businessName != null and businessName != ''">
-                AND
-                t1.business_name = #{businessName}
             </if>
     </select>
 

module-bigdata/src/main/resources/mybatis/mapper/bigdataconfigtree/bigdata-config-tree-mapper.xml

@@ -3,52 +3,117 @@
 <mapper namespace="cn.com.tenlion.bigdata.dao.bigdataconfigtree.IBigdataConfigTreeDao">
 
     <resultMap id="bigdataConfigTreeDTO" type="cn.com.tenlion.bigdata.pojo.dtos.bigdataconfigtree.BigdataConfigTreeDTO">
-        <result column="pId" property="pId"/>
+        <result column="pId" property="pid"/>
         <result column="name" property="name"/>
-        <result column="isParent" property="isParent"/>
+        <result column="isParent" property="isparent"/>
         <result column="value" property="value"/>
         <result column="icon" property="icon"/>
         <result column="type" property="type"/>
-        <result column="configId" property="configId"/>
+        <result column="configId" property="configid"/>
+    </resultMap>
+
+    <resultMap id="bigdataConfigTreeBO" type="cn.com.tenlion.bigdata.pojo.bos.bigdataconfigtree.BigdataConfigTreeBO">
+        <result column="pId" property="pid"/>
+        <result column="name" property="name"/>
+        <result column="isParent" property="isparent"/>
+        <result column="value" property="value"/>
+        <result column="icon" property="icon"/>
+        <result column="type" property="type"/>
+        <result column="configId" property="configid"/>
+    </resultMap>
+
+    <resultMap id="bigdataConfigTreePO" type="cn.com.tenlion.bigdata.pojo.pos.bigdataconfigtree.BigdataConfigTreePO">
+        <result column="pId" property="pid"/>
+        <result column="name" property="name"/>
+        <result column="isParent" property="isparent"/>
+        <result column="value" property="value"/>
+        <result column="icon" property="icon"/>
+        <result column="type" property="type"/>
+        <result column="configId" property="configid"/>
     </resultMap>
 
     <!-- 新增 -->
     <insert id="save" parameterType="map">
         INSERT INTO m_bigdata_config_tree(
-            id,
             pId,
             name,
             isParent,
             value,
             icon,
             type,
-            configId,
+            configId
-            createTime
         ) VALUES(
-            #{id},
+            #{pid},
-            #{pId},
             #{name},
-            #{isParent},
+            #{isparent},
             #{value},
             #{icon},
             #{type},
-            #{configId},
+            #{configid}
-            #{createTime}
         )
     </insert>
 
+
     <!-- 删除（物理） -->
     <update id="delete" parameterType="map">
         DELETE FROM
             m_bigdata_config_tree
         WHERE
-            configId = #{configId}
+            <!-- 添加条件 -->
     </update>
 
-    <!-- 列表 -->
+    <!-- 修改 -->
-    <select id="list" parameterType="map" resultMap="bigdataConfigTreeDTO">
+    <update id="update" parameterType="map">
+        UPDATE
+            m_bigdata_config_tree
+        SET
+        <if test="pid != null and pid != ''">
+            pId = #{pid},
+        </if>
+        <if test="name != null and name != ''">
+            name = #{name},
+        </if>
+        <if test="isparent != null and isparent != ''">
+            isParent = #{isparent},
+        </if>
+        <if test="value != null and value != ''">
+            value = #{value},
+        </if>
+        <if test="icon != null and icon != ''">
+            icon = #{icon},
+        </if>
+        <if test="type != null and type != ''">
+            type = #{type},
+        </if>
+        <if test="configid != null and configid != ''">
+            configId = #{configid},
+        </if>
+            <!-- 填充条件 -->
+        WHERE
+            <!-- 添加条件 -->
+    </update>
+
+    <!-- 详情 -->
+    <select id="get" parameterType="map" resultMap="bigdataConfigTreeDTO">
+        SELECT
+            t1.pId,
+            t1.name,
+            t1.isParent,
+            t1.value,
+            t1.icon,
+            t1.type,
+            t1.configId,
+            1
+        FROM
+            m_bigdata_config_tree t1
+        WHERE
+            1 = 1
+            <!-- 添加条件 -->
+    </select>
+
+    <!-- 详情 -->
+    <select id="getBO" parameterType="map" resultMap="bigdataConfigTreeBO">
         SELECT
-            t1.id,
             t1.pId,
             t1.name,
             t1.isParent,
@@ -59,9 +124,102 @@
         FROM
             m_bigdata_config_tree t1
         WHERE
-            configId = #{configId}
+            1 = 1
-        ORDER BY
+            <!-- 添加条件 -->
-            createTime
+    </select>
+
+    <!-- 详情 -->
+    <select id="getPO" parameterType="map" resultMap="bigdataConfigTreePO">
+        SELECT
+            t1.pId,
+            t1.name,
+            t1.isParent,
+            t1.value,
+            t1.icon,
+            t1.type,
+            t1.configId
+        FROM
+            m_bigdata_config_tree t1
+        WHERE
+            1 = 1
+            <!-- 添加条件 -->
+    </select>
+
+    <!-- 列表 -->
+    <select id="list" parameterType="map" resultMap="bigdataConfigTreeDTO">
+        SELECT
+            t1.pId,
+            t1.name,
+            t1.isParent,
+            t1.value,
+            t1.icon,
+            t1.type,
+            t1.configId,
+            1
+        FROM
+            m_bigdata_config_tree t1
+        WHERE
+            1 = 1
+        <if test="keywords != null and keywords != ''">
+        AND (
+            <!-- 这里添加其他条件 -->
+            t1.id LIKE CONCAT('%', #{keywords}, '%')
+        )
+        </if>
+    </select>
+
+    <!-- 列表 -->
+    <select id="listBO" parameterType="map" resultMap="bigdataConfigTreeBO">
+        SELECT
+            t1.pId,
+            t1.name,
+            t1.isParent,
+            t1.value,
+            t1.icon,
+            t1.type,
+            t1.configId
+        FROM
+            m_bigdata_config_tree t1
+        WHERE
+            1 = 1
+        <if test="keywords != null and keywords != ''">
+        AND (
+            <!-- 这里添加其他条件 -->
+            t1.id LIKE CONCAT('%', #{keywords}, '%')
+        )
+        </if>
+    </select>
+
+    <!-- 列表 -->
+    <select id="listPO" parameterType="map" resultMap="bigdataConfigTreePO">
+        SELECT
+            t1.pId,
+            t1.name,
+            t1.isParent,
+            t1.value,
+            t1.icon,
+            t1.type,
+            t1.configId
+        FROM
+            m_bigdata_config_tree t1
+        WHERE
+            1 = 1
+        <if test="keywords != null and keywords != ''">
+        AND (
+            <!-- 这里添加其他条件 -->
+            t1.id LIKE CONCAT('%', #{keywords}, '%')
+        )
+        </if>
+    </select>
+
+    <!-- 统计  -->
+    <select id="count" parameterType="map" resultType="Integer">
+        SELECT
+            COUNT(*)
+        FROM
+            m_bigdata_config_tree t1
+        WHERE
+            1 = 1
     </select>
 
 </mapper>

module-bigdata/src/main/resources/mybatis/mapper/bigdatamodule/bigdatamodule-mapper.xml

@@ -16,37 +16,8 @@
         <result column="bigdata_module_module_json" property="bigdataModuleModuleJson"/>
         <result column="bigdata_module_server_json" property="bigdataModuleServerJson"/>
         <result column="bigdata_module_link" property="bigdataModuleLink"/>
-        <result column="bigdata_module_link_json" property="bigdataModuleLinkJson"/>
     </resultMap>
 
-    <update id="updateBigdataModuleLinkJson" parameterType="map">
-        UPDATE
-            m_bigdata_module
-        SET
-            bigdata_module_link_json = #{bigdataModuleLinkJson}
-        WHERE
-            bigdata_module_id = #{bigdataModuleId}  AND is_delete = 0
-    </update>
-
-
-    <update id="updateBigdataModuleModuleJson" parameterType="map">
-        UPDATE
-            m_bigdata_module
-        SET
-            bigdata_module_module_json = #{bigdataModuleModuleJson}
-        WHERE
-            bigdata_module_id = #{bigdataModuleId}  AND is_delete = 0
-    </update>
-
-    <update id="updateBigdataModuleServerJson" parameterType="map">
-        UPDATE
-            m_bigdata_module
-        SET
-            bigdata_module_server_json = #{bigdataModuleServerJson}
-        WHERE
-            bigdata_module_id = #{bigdataModuleId}  AND is_delete = 0
-    </update>
-
     <update id="updateBigdataModuleSwitch" parameterType="map">
         UPDATE
             m_bigdata_module
@@ -70,15 +41,14 @@
             t1.bigdata_module_id,
             t1.bigdata_module_module_json,
             t1.bigdata_module_server_json,
-            t1.bigdata_module_link_json,
             t1.bigdata_module_link,
-            dt1.module_type_name bigdata_module_type_data_name
+            dt1.data_name bigdata_module_type_data_name
         FROM
             m_bigdata_module t1
         LEFT JOIN
-            m_bigdata_module_type dt1
+            data_data dt1
         ON
-            dt1.bigdata_module_type_id = t1.bigdata_module_type
+            dt1.data_id = t1.bigdata_module_type
         AND
             dt1.is_delete = 0
         WHERE
@@ -109,7 +79,6 @@
             bigdata_module_remark,
             bigdata_module_module_json,
             bigdata_module_server_json,
-            bigdata_module_link_json,
             bigdata_module_link,
             creator,
             gmt_create,
@@ -127,7 +96,6 @@
             #{bigdataModuleRemark},
             #{bigdataModuleModuleJson},
             #{bigdataModuleServerJson},
-            #{bigdataModuleLinkJson},
             #{bigdataModuleLink},
             #{creator},
             #{gmtCreate},
@@ -180,12 +148,12 @@
         <if test="bigdataModuleRemark != null and bigdataModuleRemark != ''">
             bigdata_module_remark = #{bigdataModuleRemark},
         </if>
-<!--        <if test="bigdataModuleModuleJson != null and bigdataModuleModuleJson != ''">-->
+        <if test="bigdataModuleModuleJson != null and bigdataModuleModuleJson != ''">
-<!--            bigdata_module_module_json = #{bigdataModuleModuleJson},-->
+            bigdata_module_module_json = #{bigdataModuleModuleJson},
-<!--        </if>-->
+        </if>
-<!--        <if test="bigdataModuleServerJson != null and bigdataModuleServerJson != ''">-->
+        <if test="bigdataModuleServerJson != null and bigdataModuleServerJson != ''">
-<!--            bigdata_module_server_json = #{bigdataModuleServerJson},-->
+            bigdata_module_server_json = #{bigdataModuleServerJson},
-<!--        </if>-->
+        </if>
         <if test="bigdataModuleLink != null and bigdataModuleLink != ''">
             bigdata_module_link = #{bigdataModuleLink},
         </if>
@@ -208,15 +176,14 @@
             t1.bigdata_module_id,
             t1.bigdata_module_module_json,
             t1.bigdata_module_server_json,
-            t1.bigdata_module_link_json,
             t1.bigdata_module_link,
-            dt1.module_type_name bigdata_module_type_data_name
+            dt1.data_name bigdata_module_type_data_name
         FROM
             m_bigdata_module t1
         LEFT JOIN
-            m_bigdata_module_type dt1
+            data_data dt1
         ON
-            dt1.bigdata_module_type_id = t1.bigdata_module_type
+            dt1.data_id = t1.bigdata_module_type
         AND
             dt1.is_delete = 0
         WHERE
@@ -241,15 +208,14 @@
             t1.bigdata_module_id,
             t1.bigdata_module_module_json,
             t1.bigdata_module_server_json,
-            t1.bigdata_module_link_json,
             t1.bigdata_module_link,
-            dt1.module_type_name bigdata_module_type_data_name
+            dt1.data_name bigdata_module_type_data_name
         FROM
             m_bigdata_module t1
         LEFT JOIN
-            m_bigdata_module_type dt1
+            data_data dt1
         ON
-            dt1.bigdata_module_type_id = t1.bigdata_module_type
+            dt1.data_id = t1.bigdata_module_type
         AND
             dt1.is_delete = 0
         WHERE
@@ -299,12 +265,4 @@
             t1.is_delete = 0
     </select>
 
-    <!-- 大数据展示模块统计  -->
-    <select id="count" parameterType="map" resultType="Integer">
-        SELECT
-            COUNT(*)
-        FROM
-            m_bigdata_module t1
-    </select>
-
 </mapper>

module-bigdata/src/main/resources/mybatis/mapper/bigdatamoduletype/bigdata-module-type-mapper.xml

@@ -94,6 +94,9 @@
         UPDATE
             m_bigdata_module_type
         SET
+        <if test="moduleTypeCode != null and moduleTypeCode != ''">
+            module_type_code = #{moduleTypeCode},
+        </if>
         <if test="moduleTypeName != null and moduleTypeName != ''">
             module_type_name = #{moduleTypeName},
         </if>
@@ -179,7 +182,8 @@
             t1.gmt_create,
             t1.modifier,
             t1.gmt_modified,
-            t1.is_delete
+            t1.is_delete,
+            1
         FROM
             m_bigdata_module_type t1
         WHERE
@@ -187,9 +191,7 @@
         <if test="keywords != null and keywords != ''">
         AND (
             <!-- 这里添加其他条件 -->
-            t1.module_type_name LIKE CONCAT('%', #{keywords}, '%')
+            t1.id LIKE CONCAT('%', #{keywords}, '%')
-            OR
-            t1.module_type_code LIKE CONCAT('%', #{keywords}, '%')
         )
         </if>
         <if test="startTime != null and startTime != ''">
@@ -207,7 +209,6 @@
                 #{bigdataModuleTypeIds[${index}]}
             </foreach>
         </if>
-        ORDER BY t1.gmt_create DESC
     </select>
 
     <!-- 列表 -->

module-bigdata/src/main/resources/mybatis/mapper/bigdatatemplate/bigdatatemplate-mapper.xml

@@ -17,16 +17,8 @@
         <result column="bigdata_template_back" property="bigdataTemplateBack"/>
         <result column="bigdata_template_size" property="bigdataTemplateSize"/>
         <result column="bigdata_template_project" property="bigdataTemplateProject"/>
-        <result column="bigdata_template_description" property="bigdataTemplateDescription"/>
     </resultMap>
 
-    <select id="count" parameterType="map" resultType="Integer">
-        SELECT
-            COUNT(*)
-        FROM
-            m_bigdata_template t1
-    </select>
-
     <update id="updateBigdataTemplateContent" parameterType="map">
         UPDATE
             m_bigdata_template
@@ -76,8 +68,7 @@
             t1.bigdata_template_file,
             t1.bigdata_template_back,
             t1.bigdata_template_size,
-            t1.bigdata_template_project,
+            t1.bigdata_template_project
-            t1.bigdata_template_description
         FROM
             m_bigdata_template t1
         WHERE
@@ -101,7 +92,6 @@
             bigdata_template_back,
             bigdata_template_size,
             bigdata_template_project,
-            bigdata_template_description,
             creator,
             gmt_create,
             modifier,
@@ -122,7 +112,6 @@
             #{bigdataTemplateBack},
             #{bigdataTemplateSize},
             #{bigdataTemplateProject},
-            #{bigdataTemplateDescription},
             #{creator},
             #{gmtCreate},
             #{modifier},
@@ -185,9 +174,6 @@
         </if>
         <if test="bigdataTemplateProject != null and bigdataTemplateProject != ''">
             bigdata_template_project = #{bigdataTemplateProject},
-        </if>
-        <if test="bigdataTemplateDescription != null and bigdataTemplateDescription != ''">
-            bigdata_template_description = #{bigdataTemplateDescription},
         </if>
             bigdata_template_file = #{bigdataTemplateFile},
             modifier = #{modifier},
@@ -212,8 +198,7 @@
             t1.bigdata_template_file,
             t1.bigdata_template_back,
             t1.bigdata_template_size,
-            t1.bigdata_template_project,
+            t1.bigdata_template_project
-            t1.bigdata_template_description
         FROM
             m_bigdata_template t1
         WHERE
@@ -241,8 +226,7 @@
             t1.bigdata_template_file,
             t1.bigdata_template_back,
             t1.bigdata_template_size,
-            t1.bigdata_template_project,
+            t1.bigdata_template_project
-            t1.bigdata_template_description
         FROM
             m_bigdata_template t1
         WHERE

module-bigdata/src/main/resources/mybatis/mapper/bigdatatemplatearea/bigdatatemplatearea-mapper.xml

@@ -4,7 +4,6 @@
 
     <resultMap id="bigdataTemplateAreaDTO" type="cn.com.tenlion.bigdata.pojo.dtos.bigdatatemplatearea.BigdataTemplateAreaDTO">
         <id column="bigdata_template_area_id" property="bigdataTemplateAreaId"/>
-        <id column="bigdata_template_area_sort" property="bigdataTemplateAreaSort"/>
         <result column="bigdata_template_id" property="bigdataTemplateId"/>
         <result column="bigdata_module_id" property="bigdataModuleId"/>
         <result column="template_area_jump" property="templateAreaJump"/>
@@ -35,35 +34,11 @@
         <result column="bigdata_module_module_json" property="bigdataModuleModuleJson"/>
         <result column="bigdata_module_server_json" property="bigdataModuleServerJson"/>
         <result column="bigdata_module_link" property="bigdataModuleLink"/>
-        <result column="bigdata_module_link_json" property="bigdataModuleLinkJson"/>
         <result column="template_area_server_link" property="templateAreaServerLink"/>
         <result column="bigdata_module_remark" property="bigdataModuleRemark"/>
         <result column="bigdata_template_code" property="bigdataTemplateCode"/>
     </resultMap>
 
-    <update id="updateBigdataModuleModuleJson" parameterType="map">
-        UPDATE
-            m_bigdata_template_area
-        SET
-            template_area_module_data = #{templateAreaModuleData},
-            modifier = #{modifier},
-            gmt_modified = #{gmtModified}
-        WHERE
-            bigdata_template_area_id = #{bigdataTemplateAreaId}
-    </update>
-
-    <update id="updateBigdataModuleServerJson" parameterType="map">
-        UPDATE
-            m_bigdata_template_area
-        SET
-            template_area_server_data = #{templateAreaServerData},
-            template_area_source = '2',
-            modifier = #{modifier},
-            gmt_modified = #{gmtModified}
-        WHERE
-            bigdata_template_area_id = #{bigdataTemplateAreaId}
-    </update>
-
     <!-- 修改展览模板区域配置 -->
     <update id="updateBigdataTemplateAreaPointModuleData" parameterType="map">
         UPDATE
@@ -97,7 +72,6 @@
     <select id="getBigdataTemplateAreaByBigdataTemplateId" parameterType="map" resultMap="bigdataTemplateAreaDTO">
         SELECT
             t1.bigdata_template_area_id,
-            t1.bigdata_template_area_sort,
             t1.bigdata_template_id,
             t1.bigdata_module_id,
             t1.template_area_jump,
@@ -121,7 +95,6 @@
             t2.bigdata_module_type,
             t2.bigdata_module_photo,
             t2.bigdata_module_content,
-            t2.bigdata_module_link_json,
             t2.bigdata_module_link,
             t1.template_area_file,
             t1.template_area_jump_url,
@@ -145,7 +118,6 @@
     <insert id="saveBigdataTemplateArea" parameterType="map">
         INSERT INTO m_bigdata_template_area(
             bigdata_template_area_id,
-            bigdata_template_area_sort,
             bigdata_template_id,
             bigdata_module_id,
             template_area_jump,
@@ -174,7 +146,6 @@
             is_delete
         ) VALUES(
             #{bigdataTemplateAreaId},
-            #{bigdataTemplateAreaSort},
             #{bigdataTemplateId},
             #{bigdataModuleId},
             #{templateAreaJump},
@@ -235,6 +206,9 @@
         UPDATE
             m_bigdata_template_area
         SET
+        <if test="bigdataModuleId != null and bigdataModuleId != ''">
+            bigdata_module_id = #{bigdataModuleId},
+        </if>
         <if test="templateAreaColor != null and templateAreaColor != ''">
             template_area_color = #{templateAreaColor},
         </if>
@@ -270,7 +244,6 @@
     <select id="getBigdataTemplateIdGroupByBigdataModuleId" parameterType="map" resultMap="bigdataTemplateAreaDTO">
         SELECT
         t1.bigdata_template_id,
-        t1.bigdata_template_area_sort,
         t1.bigdata_module_id,
         t1.template_area_jump,
         t1.template_area_jump_mode,
@@ -320,9 +293,6 @@
     <select id="getBigdataTemplateArea" parameterType="map" resultMap="bigdataTemplateAreaDTO">
         SELECT
             t1.bigdata_template_id,
-            t1.bigdata_template_area_sort,
-            t1.template_area_height,
-            t1.template_area_width,
             t1.bigdata_module_id,
             t1.template_area_jump,
             t1.template_area_jump_mode,
@@ -373,8 +343,6 @@
     <!-- 大数据展示模板的区域设置列表 -->
     <select id="listBigdataTemplateArea" parameterType="map" resultMap="bigdataTemplateAreaDTO">
         SELECT
-            t1.bigdata_template_area_id,
-            t1.bigdata_template_area_sort,
             t1.bigdata_template_id,
             t1.bigdata_module_id,
             t1.template_area_jump,
@@ -386,29 +354,13 @@
             t1.template_area_color,
             t1.template_area_remark,
             t1.template_area_status,
+            t1.bigdata_template_area_id,
             t1.template_area_frequency,
-            t1.template_area_left,
-            t1.template_area_top,
-            t1.template_area_down,
-            t1.template_area_right,
-            t1.template_area_height,
-            t1.template_area_width,
-            t2.bigdata_module_name,
-            t2.bigdata_module_code,
-            t2.bigdata_module_type,
-            t2.bigdata_module_photo,
-            t2.bigdata_module_content,
-            t2.bigdata_module_link_json,
-            t2.bigdata_module_link,
             t1.template_area_file,
             t1.template_area_jump_url,
             t1.template_area_server_link
         FROM
             m_bigdata_template_area t1
-        LEFT JOIN
-            m_bigdata_module t2
-        ON
-            t1.bigdata_module_id = t2.bigdata_module_id
         WHERE
             t1.is_delete = 0
         <if test="keywords != null and keywords != ''">
@@ -446,13 +398,4 @@
             t1.is_delete = 0
     </select>
 
-    <select id="count" parameterType="map" resultType="Integer">
-        SELECT
-            COUNT(*)
-        FROM
-            m_bigdata_template_area t1
-        WHERE
-            t1.bigdata_template_id = #{bigdataTemplateId} AND t1.bigdata_module_id = #{bigdataModuleId}
-    </select>
-
 </mapper>

module-bigdata/src/main/resources/mybatis/mapper/bigdatatemplatearealink/bigdata-template-area-link-mapper.xml

@@ -5,10 +5,13 @@
     <resultMap id="bigdataTemplateAreaLinkDTO" type="cn.com.tenlion.bigdata.pojo.dtos.bigdatatemplatearealink.BigdataTemplateAreaLinkDTO">
         <result column="bigdata_template_area_link_id" property="bigdataTemplateAreaLinkId"/>
         <result column="link_src_area_id" property="linkSrcAreaId"/>
-        <result column="linkTargetAreaSort" property="linkTargetAreaSort"/>
-        <result column="linkTargetModuleCode" property="linkTargetModuleCode"/>
         <result column="link_target_area_id" property="linkTargetAreaId"/>
         <result column="link_remark" property="linkRemark"/>
+        <result column="creator" property="creator"/>
+        <result column="gmt_create" property="gmtCreate"/>
+        <result column="modifier" property="modifier"/>
+        <result column="gmt_modified" property="gmtModified"/>
+        <result column="is_delete" property="isDelete"/>
     </resultMap>
 
     <resultMap id="bigdataTemplateAreaLinkBO" type="cn.com.tenlion.bigdata.pojo.bos.bigdatatemplatearealink.BigdataTemplateAreaLinkBO">
@@ -16,6 +19,11 @@
         <result column="link_src_area_id" property="linkSrcAreaId"/>
         <result column="link_target_area_id" property="linkTargetAreaId"/>
         <result column="link_remark" property="linkRemark"/>
+        <result column="creator" property="creator"/>
+        <result column="gmt_create" property="gmtCreate"/>
+        <result column="modifier" property="modifier"/>
+        <result column="gmt_modified" property="gmtModified"/>
+        <result column="is_delete" property="isDelete"/>
     </resultMap>
 
     <resultMap id="bigdataTemplateAreaLinkPO" type="cn.com.tenlion.bigdata.pojo.pos.bigdatatemplatearealink.BigdataTemplateAreaLinkPO">
@@ -23,6 +31,11 @@
         <result column="link_src_area_id" property="linkSrcAreaId"/>
         <result column="link_target_area_id" property="linkTargetAreaId"/>
         <result column="link_remark" property="linkRemark"/>
+        <result column="creator" property="creator"/>
+        <result column="gmt_create" property="gmtCreate"/>
+        <result column="modifier" property="modifier"/>
+        <result column="gmt_modified" property="gmtModified"/>
+        <result column="is_delete" property="isDelete"/>
     </resultMap>
 
     <!-- 新增 -->
@@ -76,14 +89,6 @@
         </foreach>
     </update>
 
-    <!-- 删除（物理） -->
-    <update id="deleteBySrcId" parameterType="map">
-        DELETE FROM
-            m_bigdata_template_area_link
-        WHERE
-            link_src_area_id = #{linkSrcAreaId}
-    </update>
-
     <!-- 修改 -->
     <update id="update" parameterType="map">
         UPDATE
@@ -108,36 +113,18 @@
     <!-- 详情 -->
     <select id="get" parameterType="map" resultMap="bigdataTemplateAreaLinkDTO">
         SELECT
-            t1.bigdata_template_area_link_id,
             t1.link_src_area_id,
             t1.link_target_area_id,
             t1.link_remark,
-            t2.bigdata_template_area_sort AS linkTargetAreaSort,
+            t1.bigdata_template_area_link_id
-            t3.bigdata_module_code AS linkTargetModuleCode
         FROM
             m_bigdata_template_area_link t1
-        LEFT JOIN
-            m_bigdata_template_area t2
-        ON
-            t1.link_target_area_id = t2.bigdata_template_area_id
-        LEFT JOIN
-            m_bigdata_module t3
-        ON
-            t2.bigdata_module_id = t3.bigdata_module_id
         WHERE
-            t1.is_delete = 0 AND t2.is_delete = 0 AND t3.is_delete = 0
+            t1.is_delete = 0
-        <if test="bigdataTemplateAreaLinkId != null and bigdataTemplateAreaLinkId != ''">
+            <if test="bigdataTemplateAreaLinkId != null and bigdataTemplateAreaLinkId != ''">
-            AND
+        AND
-                t1.bigdata_template_area_link_id = #{bigdataTemplateAreaLinkId}
+            t1.bigdata_template_area_link_id = #{bigdataTemplateAreaLinkId}
-        </if>
+            </if>
-        <if test="linkSrcAreaId != null and linkSrcAreaId != ''">
-            AND
-            t1.link_src_area_id = #{linkSrcAreaId}
-        </if>
-        <if test="linkTargetAreaId != null and linkTargetAreaId != ''">
-            AND
-            t1.link_target_area_id = #{linkTargetAreaId}
-        </if>
     </select>
 
     <!-- 详情 -->
@@ -196,24 +183,32 @@
             t1.modifier,
             t1.gmt_modified,
             t1.is_delete,
-            t2.bigdata_template_area_sort AS linkTargetAreaSort,
+            1
-            t3.bigdata_module_code AS linkTargetModuleCode
         FROM
             m_bigdata_template_area_link t1
-        LEFT JOIN
-            m_bigdata_template_area t2
-        ON
-            t1.link_target_area_id = t2.bigdata_template_area_id
-        LEFT JOIN
-            m_bigdata_module t3
-        ON
-            t2.bigdata_module_id = t3.bigdata_module_id
         WHERE
-            t1.is_delete = 0 AND t2.is_delete = 0 AND t3.is_delete = 0
+            t1.is_delete = 0
-        <if test="linkSrcAreaId != null and linkSrcAreaId != ''">
+        <if test="keywords != null and keywords != ''">
-            AND t1.link_src_area_id = #{linkSrcAreaId}
+        AND (
+            <!-- 这里添加其他条件 -->
+            t1.id LIKE CONCAT('%', #{keywords}, '%')
+        )
+        </if>
+        <if test="startTime != null and startTime != ''">
+        AND
+            LEFT(t1.gmt_create, 10) <![CDATA[ >= ]]> #{startTime}
+        </if>
+        <if test="endTime != null and endTime != ''">
+            AND
+            LEFT(t1.gmt_create, 10) <![CDATA[ <= ]]> #{endTime}
+        </if>
+        <if test="bigdataTemplateAreaLinkIds != null and bigdataTemplateAreaLinkIds.size > 0">
+        AND
+            t1.bigdata_template_area_link_id IN
+            <foreach collection="bigdataTemplateAreaLinkIds" index="index" open="(" separator="," close=")">
+                #{bigdataTemplateAreaLinkIds[${index}]}
+            </foreach>
         </if>
-        ORDER BY t1.id
     </select>
 
     <!-- 列表 -->

module-bigdata/src/main/resources/mybatis/mapper/bigdatatemplatearealinkmapping/bigdata-template-area-link-mapping-mapper.xml

@@ -38,12 +38,16 @@
         )
     </insert>
 
+
     <!-- 删除（物理） -->
     <update id="delete" parameterType="map">
         DELETE FROM
             m_bigdata_template_area_link_mapping
         WHERE
-            bigdata_template_area_link_id = #{bigdataTemplateAreaLinkId}
+            bigdata_template_area_link_mapping_id IN
+        <foreach collection="bigdataTemplateAreaLinkMappingIds" index="index" open="(" separator="," close=")">
+            #{bigdataTemplateAreaLinkMappingIds[${index}]}
+        </foreach>
     </update>
 
     <!-- 修改 -->
@@ -122,13 +126,25 @@
             t1.bigdata_template_area_link_mapping_id,
             t1.bigdata_template_area_link_id,
             t1.link_src_mapping_key,
-            t1.link_target_mapping_key
+            t1.link_target_mapping_key,
+            1
         FROM
             m_bigdata_template_area_link_mapping t1
         WHERE
-            t1.bigdata_template_area_link_id = #{bigdataTemplateAreaLinkId}
+            1 = 1
-        ORDER BY
+        <if test="keywords != null and keywords != ''">
-            t1.id
+        AND (
+            <!-- 这里添加其他条件 -->
+            t1.id LIKE CONCAT('%', #{keywords}, '%')
+        )
+        </if>
+        <if test="bigdataTemplateAreaLinkMappingIds != null and bigdataTemplateAreaLinkMappingIds.size > 0">
+        AND
+            t1.bigdata_template_area_link_mapping_id IN
+            <foreach collection="bigdataTemplateAreaLinkMappingIds" index="index" open="(" separator="," close=")">
+                #{bigdataTemplateAreaLinkMappingIds[${index}]}
+            </foreach>
+        </if>
     </select>
 
     <!-- 列表 -->

module-bigdata/src/main/resources/mybatis/mapper/bigdatatemplateareaparams/bigdata-template-area-params-mapper.xml

@@ -6,7 +6,7 @@
         <result column="params_id" property="paramsId"/>
         <result column="params_key" property="paramsKey"/>
         <result column="params_value" property="paramsValue"/>
-        <result column="params_text" property="paramsText"/>
+        <result column="params_remark" property="paramsRemark"/>
         <result column="params_type" property="paramsType"/>
         <result column="area_id" property="areaId"/>
     </resultMap>
@@ -15,7 +15,7 @@
         <result column="params_id" property="paramsId"/>
         <result column="params_key" property="paramsKey"/>
         <result column="params_value" property="paramsValue"/>
-        <result column="params_text" property="paramsText"/>
+        <result column="params_remark" property="paramsRemark"/>
         <result column="params_type" property="paramsType"/>
         <result column="area_id" property="areaId"/>
     </resultMap>
@@ -24,7 +24,7 @@
         <result column="params_id" property="paramsId"/>
         <result column="params_key" property="paramsKey"/>
         <result column="params_value" property="paramsValue"/>
-        <result column="params_text" property="paramsText"/>
+        <result column="params_remark" property="paramsRemark"/>
         <result column="params_type" property="paramsType"/>
         <result column="area_id" property="areaId"/>
     </resultMap>
@@ -35,25 +35,26 @@
             params_id,
             params_key,
             params_value,
-            params_text,
+            params_remark,
             params_type,
             area_id
         ) VALUES(
             #{paramsId},
             #{paramsKey},
             #{paramsValue},
-            #{paramsText},
+            #{paramsRemark},
             #{paramsType},
             #{areaId}
         )
     </insert>
 
+
     <!-- 删除（物理） -->
     <update id="delete" parameterType="map">
         DELETE FROM
             m_bigdata_template_area_params
         WHERE
-            area_id = #{areaId}
+            <!-- 添加条件 -->
     </update>
 
     <!-- 修改 -->
@@ -61,14 +62,17 @@
         UPDATE
             m_bigdata_template_area_params
         SET
+        <if test="paramsId != null and paramsId != ''">
+            params_id = #{paramsId},
+        </if>
         <if test="paramsKey != null and paramsKey != ''">
             params_key = #{paramsKey},
         </if>
         <if test="paramsValue != null and paramsValue != ''">
             params_value = #{paramsValue},
         </if>
-        <if test="paramsText != null and paramsText != ''">
+        <if test="paramsRemark != null and paramsRemark != ''">
-            params_text = #{paramsText},
+            params_remark = #{paramsRemark},
         </if>
         <if test="paramsType != null and paramsType != ''">
             params_type = #{paramsType},
@@ -76,9 +80,9 @@
         <if test="areaId != null and areaId != ''">
             area_id = #{areaId},
         </if>
-            params_id = #{paramsId}
+            <!-- 填充条件 -->
         WHERE
-            params_id = #{paramsId}
+            <!-- 添加条件 -->
     </update>
 
     <!-- 详情 -->
@@ -87,13 +91,15 @@
             t1.params_id,
             t1.params_key,
             t1.params_value,
-            t1.params_text,
+            t1.params_remark,
             t1.params_type,
             t1.area_id,
+            1
         FROM
             m_bigdata_template_area_params t1
         WHERE
-            params_id = #{paramsId}
+            1 = 1
+            <!-- 添加条件 -->
     </select>
 
     <!-- 详情 -->
@@ -102,13 +108,14 @@
             t1.params_id,
             t1.params_key,
             t1.params_value,
-            t1.params_text,
+            t1.params_remark,
             t1.params_type,
             t1.area_id
         FROM
             m_bigdata_template_area_params t1
         WHERE
-            params_id = #{paramsId}
+            1 = 1
+            <!-- 添加条件 -->
     </select>
 
     <!-- 详情 -->
@@ -117,13 +124,14 @@
             t1.params_id,
             t1.params_key,
             t1.params_value,
-            t1.params_text,
+            t1.params_remark,
             t1.params_type,
             t1.area_id
         FROM
             m_bigdata_template_area_params t1
         WHERE
-            t1.params_id = #{paramsId}
+            1 = 1
+            <!-- 添加条件 -->
     </select>
 
     <!-- 列表 -->
@@ -132,26 +140,20 @@
             t1.params_id,
             t1.params_key,
             t1.params_value,
-            t1.params_text,
+            t1.params_remark,
             t1.params_type,
-            t1.area_id
+            t1.area_id,
+            1
         FROM
             m_bigdata_template_area_params t1
         WHERE
             1 = 1
-        <if test="areaId != null and areaId != ''">
+        <if test="keywords != null and keywords != ''">
-            AND t1.area_id  = #{areaId}
+        AND (
+            <!-- 这里添加其他条件 -->
+            t1.id LIKE CONCAT('%', #{keywords}, '%')
+        )
         </if>
-        <if test="paramsType != null and paramsType != ''">
-            AND t1.params_type  = #{paramsType}
-        </if>
-        <if test="areaIdList != null and areaIdList.size > 0">
-            AND t1.area_id IN
-            <foreach collection="areaIdList" index="index" open="(" separator="," close=")">
-                #{areaIdList[${index}]}
-            </foreach>
-        </if>
-        ORDER BY t1.id ASC
     </select>
 
     <!-- 列表 -->
@@ -160,7 +162,7 @@
             t1.params_id,
             t1.params_key,
             t1.params_value,
-            t1.params_text,
+            t1.params_remark,
             t1.params_type,
             t1.area_id
         FROM
@@ -181,7 +183,7 @@
             t1.params_id,
             t1.params_key,
             t1.params_value,
-            t1.params_text,
+            t1.params_remark,
             t1.params_type,
             t1.area_id
         FROM

module-bigdata/src/main/resources/static/assets/bigdata/js/safety/ckplayer/source/com/adobe/crypto/MD5.as

@@ -33,7 +33,7 @@ OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOURCE CODE, EVEN IF
 ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-package static.assets.bigdata.js.safety.ckplayer.source.com.adobe.crypto static.assets.bigdata.js.safety.ckplayer.source.com.adobe.crypto static.bigdata.js.safety.ckplayer.source.com.adobe.crypto static.assets.js.vendor.safety.ckplayer.source.com.adobe.crypto {
+package static.assets.bigdata.js.safety.ckplayer.source.com.adobe.crypto static.bigdata.js.safety.ckplayer.source.com.adobe.crypto static.assets.js.vendor.safety.ckplayer.source.com.adobe.crypto {
 	
 	import com.adobe.utils.IntUtil;
 	

module-bigdata/src/main/resources/static/assets/bigdata/js/safety/ckplayer/source/com/adobe/crypto/SHA1.as

@@ -33,7 +33,7 @@ OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOURCE CODE, EVEN IF
 ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-package static.assets.bigdata.js.safety.ckplayer.source.com.adobe.crypto static.assets.bigdata.js.safety.ckplayer.source.com.adobe.crypto static.bigdata.js.safety.ckplayer.source.com.adobe.crypto static.assets.js.vendor.safety.ckplayer.source.com.adobe.crypto
+package static.assets.bigdata.js.safety.ckplayer.source.com.adobe.crypto static.bigdata.js.safety.ckplayer.source.com.adobe.crypto static.assets.js.vendor.safety.ckplayer.source.com.adobe.crypto
 {
 	import com.adobe.utils.IntUtil;
 	import flash.utils.ByteArray;

module-bigdata/src/main/resources/static/assets/bigdata/js/safety/ckplayer/source/com/adobe/crypto/SHA224.as

@@ -33,7 +33,7 @@ OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOURCE CODE, EVEN IF
 ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-package static.assets.bigdata.js.safety.ckplayer.source.com.adobe.crypto static.assets.bigdata.js.safety.ckplayer.source.com.adobe.crypto static.bigdata.js.safety.ckplayer.source.com.adobe.crypto static.assets.js.vendor.safety.ckplayer.source.com.adobe.crypto
+package static.assets.bigdata.js.safety.ckplayer.source.com.adobe.crypto static.bigdata.js.safety.ckplayer.source.com.adobe.crypto static.assets.js.vendor.safety.ckplayer.source.com.adobe.crypto
 {
 	import com.adobe.utils.IntUtil;
 	import flash.utils.ByteArray;

module-bigdata/src/main/resources/static/assets/bigdata/js/safety/ckplayer/source/com/adobe/crypto/SHA256.as

@@ -33,7 +33,7 @@ OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOURCE CODE, EVEN IF
 ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-package static.assets.bigdata.js.safety.ckplayer.source.com.adobe.crypto static.assets.bigdata.js.safety.ckplayer.source.com.adobe.crypto static.bigdata.js.safety.ckplayer.source.com.adobe.crypto static.assets.js.vendor.safety.ckplayer.source.com.adobe.crypto
+package static.assets.bigdata.js.safety.ckplayer.source.com.adobe.crypto static.bigdata.js.safety.ckplayer.source.com.adobe.crypto static.assets.js.vendor.safety.ckplayer.source.com.adobe.crypto
 {
 	import com.adobe.utils.IntUtil;
 	import flash.utils.ByteArray;

module-bigdata/src/main/resources/static/assets/bigdata/js/safety/ckplayer/source/com/adobe/crypto/WSSEUsernameToken.as

@@ -33,7 +33,7 @@ OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOURCE CODE, EVEN IF
 ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-package static.assets.bigdata.js.safety.ckplayer.source.com.adobe.crypto static.assets.bigdata.js.safety.ckplayer.source.com.adobe.crypto static.bigdata.js.safety.ckplayer.source.com.adobe.crypto static.assets.js.vendor.safety.ckplayer.source.com.adobe.crypto
+package static.assets.bigdata.js.safety.ckplayer.source.com.adobe.crypto static.bigdata.js.safety.ckplayer.source.com.adobe.crypto static.assets.js.vendor.safety.ckplayer.source.com.adobe.crypto
 {
 	import mx.formatters.DateFormatter;
 	import mx.utils.Base64Encoder;

module-bigdata/src/main/resources/static/assets/bigdata/js/safety/ckplayer/source/com/adobe/errors/IllegalStateError.as

@@ -33,7 +33,7 @@
 	ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-package static.assets.bigdata.js.safety.ckplayer.source.com.adobe.errors static.assets.bigdata.js.safety.ckplayer.source.com.adobe.errors static.bigdata.js.safety.ckplayer.source.com.adobe.errors static.assets.js.vendor.safety.ckplayer.source.com.adobe.errors
+package static.assets.bigdata.js.safety.ckplayer.source.com.adobe.errors static.bigdata.js.safety.ckplayer.source.com.adobe.errors static.assets.js.vendor.safety.ckplayer.source.com.adobe.errors
 {
 	/**
 	* This class represents an Error that is thrown when a method is called when

module-bigdata/src/main/resources/static/assets/bigdata/js/safety/ckplayer/source/com/adobe/images/BitString.as

@@ -32,7 +32,7 @@
 	OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOURCE CODE, EVEN IF
 	ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-package static.assets.bigdata.js.safety.ckplayer.source.com.adobe.images static.assets.bigdata.js.safety.ckplayer.source.com.adobe.images static.bigdata.js.safety.ckplayer.source.com.adobe.images static.assets.js.vendor.safety.ckplayer.source.com.adobe.images
+package static.assets.bigdata.js.safety.ckplayer.source.com.adobe.images static.bigdata.js.safety.ckplayer.source.com.adobe.images static.assets.js.vendor.safety.ckplayer.source.com.adobe.images
 {
 	public class BitString
 	{

module-bigdata/src/main/resources/static/assets/bigdata/js/safety/ckplayer/source/com/adobe/images/JPGEncoder.as

@@ -32,7 +32,7 @@
 	OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOURCE CODE, EVEN IF
 	ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-package static.assets.bigdata.js.safety.ckplayer.source.com.adobe.images static.assets.bigdata.js.safety.ckplayer.source.com.adobe.images static.bigdata.js.safety.ckplayer.source.com.adobe.images static.assets.js.vendor.safety.ckplayer.source.com.adobe.images
+package static.assets.bigdata.js.safety.ckplayer.source.com.adobe.images static.bigdata.js.safety.ckplayer.source.com.adobe.images static.assets.js.vendor.safety.ckplayer.source.com.adobe.images
 {
 	import flash.geom.*;
 	import flash.display.*;

module-bigdata/src/main/resources/static/assets/bigdata/js/safety/ckplayer/source/com/adobe/images/PNGEncoder.as

@@ -32,7 +32,7 @@
 	OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOURCE CODE, EVEN IF
 	ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-package static.assets.bigdata.js.safety.ckplayer.source.com.adobe.images static.assets.bigdata.js.safety.ckplayer.source.com.adobe.images static.bigdata.js.safety.ckplayer.source.com.adobe.images static.assets.js.vendor.safety.ckplayer.source.com.adobe.images
+package static.assets.bigdata.js.safety.ckplayer.source.com.adobe.images static.bigdata.js.safety.ckplayer.source.com.adobe.images static.assets.js.vendor.safety.ckplayer.source.com.adobe.images
 {
 	import flash.geom.*;
 	import flash.display.Bitmap;

module-bigdata/src/main/resources/static/assets/bigdata/js/safety/ckplayer/source/com/adobe/net/DynamicURLLoader.as

@@ -33,7 +33,7 @@
 	ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-package static.assets.bigdata.js.safety.ckplayer.source.com.adobe.net static.assets.bigdata.js.safety.ckplayer.source.com.adobe.net static.bigdata.js.safety.ckplayer.source.com.adobe.net static.assets.js.vendor.safety.ckplayer.source.com.adobe.net
+package static.assets.bigdata.js.safety.ckplayer.source.com.adobe.net static.bigdata.js.safety.ckplayer.source.com.adobe.net static.assets.js.vendor.safety.ckplayer.source.com.adobe.net
 {
 	import flash.net.URLLoader;
 

module-bigdata/src/main/resources/static/assets/bigdata/js/safety/ckplayer/source/com/adobe/net/IURIResolver.as

@@ -33,7 +33,7 @@
 	ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-package static.assets.bigdata.js.safety.ckplayer.source.com.adobe.net static.assets.bigdata.js.safety.ckplayer.source.com.adobe.net static.bigdata.js.safety.ckplayer.source.com.adobe.net static.assets.js.vendor.safety.ckplayer.source.com.adobe.net
+package static.assets.bigdata.js.safety.ckplayer.source.com.adobe.net static.bigdata.js.safety.ckplayer.source.com.adobe.net static.assets.js.vendor.safety.ckplayer.source.com.adobe.net
 {
 	/**
 	 * The URI class cannot know about DNS aliases, virtual hosts, or

module-bigdata/src/main/resources/static/assets/bigdata/js/safety/ckplayer/source/com/adobe/net/URI.as

@@ -33,7 +33,7 @@ OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOURCE CODE, EVEN IF
 ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-package static.assets.bigdata.js.safety.ckplayer.source.com.adobe.net static.assets.bigdata.js.safety.ckplayer.source.com.adobe.net static.bigdata.js.safety.ckplayer.source.com.adobe.net static.assets.js.vendor.safety.ckplayer.source.com.adobe.net
+package static.assets.bigdata.js.safety.ckplayer.source.com.adobe.net static.bigdata.js.safety.ckplayer.source.com.adobe.net static.assets.js.vendor.safety.ckplayer.source.com.adobe.net
 {
 	import flash.utils.ByteArray;
 	

module-bigdata/src/main/resources/static/assets/bigdata/js/safety/ckplayer/source/com/adobe/net/URIEncodingBitmap.as

@@ -33,7 +33,7 @@
 	ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-package static.assets.bigdata.js.safety.ckplayer.source.com.adobe.net static.assets.bigdata.js.safety.ckplayer.source.com.adobe.net static.bigdata.js.safety.ckplayer.source.com.adobe.net static.assets.js.vendor.safety.ckplayer.source.com.adobe.net
+package static.assets.bigdata.js.safety.ckplayer.source.com.adobe.net static.bigdata.js.safety.ckplayer.source.com.adobe.net static.assets.js.vendor.safety.ckplayer.source.com.adobe.net
 {
 	import flash.utils.ByteArray;
 	

module-bigdata/src/main/resources/static/assets/bigdata/js/safety/ckplayer/source/com/adobe/net/proxies/RFC2817Socket.as

@@ -32,7 +32,7 @@
 	OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOURCE CODE, EVEN IF
 	ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-package static.assets.bigdata.js.safety.ckplayer.source.com.adobe.net.proxies static.assets.bigdata.js.safety.ckplayer.source.com.adobe.net.proxies static.bigdata.js.safety.ckplayer.source.com.adobe.net.proxies static.assets.js.vendor.safety.ckplayer.source.com.adobe.net.proxies
+package static.assets.bigdata.js.safety.ckplayer.source.com.adobe.net.proxies static.bigdata.js.safety.ckplayer.source.com.adobe.net.proxies static.assets.js.vendor.safety.ckplayer.source.com.adobe.net.proxies
 {
 	import flash.events.Event;
 	import flash.events.IOErrorEvent;

module-bigdata/src/main/resources/static/assets/bigdata/js/safety/ckplayer/source/com/adobe/serialization/json/JSON.as

@@ -33,7 +33,7 @@ OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOURCE CODE, EVEN IF
 ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-package static.assets.bigdata.js.safety.ckplayer.source.com.adobe.serialization.json static.assets.bigdata.js.safety.ckplayer.source.com.adobe.serialization.json static.bigdata.js.safety.ckplayer.source.com.adobe.serialization.json static.assets.js.vendor.safety.ckplayer.source.com.adobe.serialization.json {
+package static.assets.bigdata.js.safety.ckplayer.source.com.adobe.serialization.json static.bigdata.js.safety.ckplayer.source.com.adobe.serialization.json static.assets.js.vendor.safety.ckplayer.source.com.adobe.serialization.json {
 
 	/**
 	 * This class provides encoding and decoding of the JSON format.

module-bigdata/src/main/resources/static/assets/bigdata/js/safety/ckplayer/source/com/adobe/serialization/json/JSONToken.as

@@ -33,7 +33,7 @@ OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOURCE CODE, EVEN IF
 ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-package static.assets.bigdata.js.safety.ckplayer.source.com.adobe.serialization.json static.assets.bigdata.js.safety.ckplayer.source.com.adobe.serialization.json static.bigdata.js.safety.ckplayer.source.com.adobe.serialization.json static.assets.js.vendor.safety.ckplayer.source.com.adobe.serialization.json {
+package static.assets.bigdata.js.safety.ckplayer.source.com.adobe.serialization.json static.bigdata.js.safety.ckplayer.source.com.adobe.serialization.json static.assets.js.vendor.safety.ckplayer.source.com.adobe.serialization.json {
 
 	public class JSONToken {
 	

module-bigdata/src/main/resources/static/assets/bigdata/js/safety/ckplayer/source/com/adobe/utils/ArrayUtil.as

@@ -33,7 +33,7 @@
 	ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-package static.assets.bigdata.js.safety.ckplayer.source.com.adobe.utils static.assets.bigdata.js.safety.ckplayer.source.com.adobe.utils static.bigdata.js.safety.ckplayer.source.com.adobe.utils static.assets.js.vendor.safety.ckplayer.source.com.adobe.utils
+package static.assets.bigdata.js.safety.ckplayer.source.com.adobe.utils static.bigdata.js.safety.ckplayer.source.com.adobe.utils static.assets.js.vendor.safety.ckplayer.source.com.adobe.utils
 {
 	
 	/**

module-bigdata/src/main/resources/static/assets/bigdata/js/safety/ckplayer/source/com/adobe/utils/DateUtil.as

@@ -33,7 +33,7 @@
 	ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-package static.assets.bigdata.js.safety.ckplayer.source.com.adobe.utils static.assets.bigdata.js.safety.ckplayer.source.com.adobe.utils static.bigdata.js.safety.ckplayer.source.com.adobe.utils static.assets.js.vendor.safety.ckplayer.source.com.adobe.utils
+package static.assets.bigdata.js.safety.ckplayer.source.com.adobe.utils static.bigdata.js.safety.ckplayer.source.com.adobe.utils static.assets.js.vendor.safety.ckplayer.source.com.adobe.utils
 {
 	import com.adobe.utils.ArrayUtil;
 	import mx.formatters.DateBase;

module-bigdata/src/main/resources/static/assets/bigdata/js/safety/ckplayer/source/com/adobe/utils/DictionaryUtil.as

@@ -33,7 +33,7 @@
 	ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-package static.assets.bigdata.js.safety.ckplayer.source.com.adobe.utils static.assets.bigdata.js.safety.ckplayer.source.com.adobe.utils static.bigdata.js.safety.ckplayer.source.com.adobe.utils static.assets.js.vendor.safety.ckplayer.source.com.adobe.utils
+package static.assets.bigdata.js.safety.ckplayer.source.com.adobe.utils static.bigdata.js.safety.ckplayer.source.com.adobe.utils static.assets.js.vendor.safety.ckplayer.source.com.adobe.utils
 {
 	import flash.utils.Dictionary;
 	

module-bigdata/src/main/resources/static/assets/bigdata/js/safety/ckplayer/source/com/adobe/utils/IntUtil.as

@@ -1,5 +1,5 @@
 
-package static.assets.bigdata.js.safety.ckplayer.source.com.adobe.utils static.assets.bigdata.js.safety.ckplayer.source.com.adobe.utils static.bigdata.js.safety.ckplayer.source.com.adobe.utils static.assets.js.vendor.safety.ckplayer.source.com.adobe.utils {
+package static.assets.bigdata.js.safety.ckplayer.source.com.adobe.utils static.bigdata.js.safety.ckplayer.source.com.adobe.utils static.assets.js.vendor.safety.ckplayer.source.com.adobe.utils {
 	
 	import flash.utils.Endian;
 	

module-bigdata/src/main/resources/static/assets/bigdata/js/safety/ckplayer/source/com/adobe/utils/NumberFormatter.as

@@ -33,7 +33,7 @@
 	ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-package static.assets.bigdata.js.safety.ckplayer.source.com.adobe.utils static.assets.bigdata.js.safety.ckplayer.source.com.adobe.utils static.bigdata.js.safety.ckplayer.source.com.adobe.utils static.assets.js.vendor.safety.ckplayer.source.com.adobe.utils
+package static.assets.bigdata.js.safety.ckplayer.source.com.adobe.utils static.bigdata.js.safety.ckplayer.source.com.adobe.utils static.assets.js.vendor.safety.ckplayer.source.com.adobe.utils
 {
 
 	/**

module-bigdata/src/main/resources/static/assets/bigdata/js/safety/ckplayer/source/com/adobe/utils/StringUtil.as

@@ -33,7 +33,7 @@
 	ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-package static.assets.bigdata.js.safety.ckplayer.source.com.adobe.utils static.assets.bigdata.js.safety.ckplayer.source.com.adobe.utils static.bigdata.js.safety.ckplayer.source.com.adobe.utils static.assets.js.vendor.safety.ckplayer.source.com.adobe.utils
+package static.assets.bigdata.js.safety.ckplayer.source.com.adobe.utils static.bigdata.js.safety.ckplayer.source.com.adobe.utils static.assets.js.vendor.safety.ckplayer.source.com.adobe.utils
 {
 	
 	/**

module-bigdata/src/main/resources/static/assets/bigdata/js/safety/ckplayer/source/com/adobe/utils/XMLUtil.as

@@ -33,7 +33,7 @@
 	ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-package static.assets.bigdata.js.safety.ckplayer.source.com.adobe.utils static.assets.bigdata.js.safety.ckplayer.source.com.adobe.utils static.bigdata.js.safety.ckplayer.source.com.adobe.utils static.assets.js.vendor.safety.ckplayer.source.com.adobe.utils
+package static.assets.bigdata.js.safety.ckplayer.source.com.adobe.utils static.bigdata.js.safety.ckplayer.source.com.adobe.utils static.assets.js.vendor.safety.ckplayer.source.com.adobe.utils
 {
 
 	public class XMLUtil

module-bigdata/src/main/resources/static/assets/bigdata/js/safety/ckplayer/source/com/adobe/webapis/ServiceBase.as

@@ -34,7 +34,7 @@
 */
 
 
-package static.assets.bigdata.js.safety.ckplayer.source.com.adobe.webapis static.assets.bigdata.js.safety.ckplayer.source.com.adobe.webapis static.bigdata.js.safety.ckplayer.source.com.adobe.webapis static.assets.js.vendor.safety.ckplayer.source.com.adobe.webapis 
+package static.assets.bigdata.js.safety.ckplayer.source.com.adobe.webapis static.bigdata.js.safety.ckplayer.source.com.adobe.webapis static.assets.js.vendor.safety.ckplayer.source.com.adobe.webapis 
 {
 	import flash.events.EventDispatcher;
 

module-bigdata/src/main/resources/static/assets/bigdata/js/safety/ckplayer/source/com/adobe/webapis/URLLoaderBase.as

@@ -33,7 +33,7 @@
 	ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-package static.assets.bigdata.js.safety.ckplayer.source.com.adobe.webapis static.assets.bigdata.js.safety.ckplayer.source.com.adobe.webapis static.bigdata.js.safety.ckplayer.source.com.adobe.webapis static.assets.js.vendor.safety.ckplayer.source.com.adobe.webapis
+package static.assets.bigdata.js.safety.ckplayer.source.com.adobe.webapis static.bigdata.js.safety.ckplayer.source.com.adobe.webapis static.assets.js.vendor.safety.ckplayer.source.com.adobe.webapis
 {
 	import flash.events.IOErrorEvent;
 	import flash.events.SecurityErrorEvent;

module-bigdata/src/main/resources/static/assets/bigdata/js/safety/ckplayer/source/com/adobe/webapis/events/ServiceEvent.as

@@ -34,7 +34,7 @@
 */
 
 
-package static.assets.bigdata.js.safety.ckplayer.source.com.adobe.webapis.events static.assets.bigdata.js.safety.ckplayer.source.com.adobe.webapis.events static.bigdata.js.safety.ckplayer.source.com.adobe.webapis.events static.assets.js.vendor.safety.ckplayer.source.com.adobe.webapis.events
+package static.assets.bigdata.js.safety.ckplayer.source.com.adobe.webapis.events static.bigdata.js.safety.ckplayer.source.com.adobe.webapis.events static.assets.js.vendor.safety.ckplayer.source.com.adobe.webapis.events
 {
 
 	import flash.events.Event;

module-bigdata/src/main/resources/static/assets/js/vendor/jquery-web-ruler/jqueryui-ruler/js/jquery.ui.ruler.js

@@ -6,9 +6,7 @@
             tickMinor: 20,
             tickMicro: 10,
             showLabel: true,
-            arrowStyle: 'line',
+			arrowStyle: 'line'
-            height:undefined,
-            width:undefined
         },
 
         _$el: null,
@@ -61,21 +59,21 @@
             var $topRuler = $(document.createElement('div')).addClass('ruler').addClass('top');
             $topRuler.appendTo($container);
 
-            var toparrowClass, leftarrowClass
+			var toparrowClass, leftarrowClass
-            switch (this.options.arrowStyle) {
+			switch (this.options.arrowStyle) {
-                case 'arrow':
+			case 'arrow':
-                    toparrowClass = 'top-arrow';
+				toparrowClass = 'top-arrow';
-                    leftarrowClass = 'left-arrow';
+				leftarrowClass = 'left-arrow';
-                    break;
+				break;
-                case 'line':
+			case 'line':
-                    toparrowClass = 'top-line';
+				toparrowClass = 'top-line';
-                    leftarrowClass = 'left-line';
+				leftarrowClass = 'left-line';
-                    break;
+				break;
-                case 'none':
+			case 'none':
-                    toparrowClass = 'top-none';
+				toparrowClass = 'top-none';
-                    leftarrowClass = 'left-none';
+				leftarrowClass = 'left-none';
-                    break;
+				break;
-            }
+			}
 			
             var $topArrow = $(document.createElement('div')).addClass(toparrowClass);
             $topArrow.appendTo($topRuler);
@@ -109,6 +107,7 @@
             $container.scroll(function () {
                 self._scrollTop = $container.scrollTop();
                 self._scrollLeft = $container.scrollLeft();
+
                 self._fixRulerPosition();
             });
             this.element.mousemove(function (event) {
@@ -234,6 +233,7 @@
                 hContainer = this._$container.height(),
                 wStage = this._$stage.width(),
                 hStage = this._$stage.height();
+
             /* Fix rulers size */
             this._$topRuler.width(
                 (wContainer < wStage) ?
@@ -258,9 +258,6 @@
             /* Top ruler */
             unitPos = this._lastTopRulerPos * this._unitDiv;
             var topRulerWidth = this._$topRuler.width() + 100;
-            // 崔宝铖 2022年5月25日15:59:13
-            topRulerWidth = this.options.width;
-            console.log(topRulerWidth);
             while (this._lastTopRulerPos < topRulerWidth) {
                 if (this.options.tickMajor > 0 && (unitPos % this.options.tickMajor) === 0) {
                     $tick = $(document.createElement('div'))
@@ -292,9 +289,6 @@
             /* Left ruler */
             unitPos = this._lastLeftRulerPos * this._unitDiv;
             var leftRulerHeight = this._$leftRuler.height() + 100;
-            // 崔宝铖 2022年5月25日15:59:13
-            leftRulerHeight = this.options.height;
-            console.log(leftRulerHeight);
             while (this._lastLeftRulerPos < leftRulerHeight) {
                 if (this.options.tickMajor > 0 && (unitPos % this.options.tickMajor) === 0) {
                     $tick = $(document.createElement('div'))

module-bigdata/src/main/resources/static/assets/js/vendor/jqueryNavcd/demo.css

@@ -48,7 +48,7 @@ body.hc-nav-open { position: fixed; width: 100%; min-height: 100% }
 .hc-nav-trigger.toggle-open span::after { transform: rotate(-90deg) translate3d(10px, 0, 0) }
 .hc-mobile-nav::after,
 .hc-mobile-nav .nav-wrapper::after { background: rgba(0, 0, 0, 0.3) }
-.hc-mobile-nav .nav-wrapper { background: rgba(1, 166, 237, 0.45) }
+.hc-mobile-nav .nav-wrapper { background: #336ca6 }
 .hc-mobile-nav.nav-open .nav-wrapper { box-shadow: 1px 0 2px rgba(0, 0, 0, 0.2) }
 .hc-mobile-nav h2 { font-size: 19px; font-weight: normal; text-align: left; padding: 20px 17px; color: #1b3958 }
 .hc-mobile-nav a { padding: 14px 17px; font-size: 15px; color: #fff; z-index: 1; background: rgba(0, 0, 0, 0); border-bottom: 1px solid #2c5d8f }
@@ -114,7 +114,7 @@ ul { list-style: none }
 .cf::before,
 .cf::after { content: ''; display: block; height: 0; overflow: hidden }
 .cf::after { clear: both }
-#container { display: -ms-flexbox; display: flex; -ms-flex-direction: column; flex-direction: column; min-height: 100vh; height: 100%;}
+#container { display: -ms-flexbox; display: flex; -ms-flex-direction: column; flex-direction: column; min-height: 100vh; height: 100%; background: linear-gradient(-134deg, #517FA4 0%, #243949 100%) }
 .wrapper { max-width: 800px; margin: 0 auto; padding: 0 20px }
 #main-nav { display: none }
 header { position: relative; padding: 50px 0 20px }
@@ -161,7 +161,7 @@ main .actions div { padding: 0 15px 20px; box-sizing: border-box }
  main .actions div { float: left; -ms-flex: 1 1 33.33%; flex: 1 1 33.33%; max-width: 33.33% }
 }
 
-main .button { position: relative; display: block; padding: 18px 30px 16px; text-transform: uppercase; text-align: center; font-size: 16px; font-weight: 700; line-height: 1.4; letter-spacing: 1px; text-decoration: none;cursor: pointer; background: #fffce1; border-radius: 30px/80px; transition: all .1s ease-out }
+main .button { position: relative; display: block; padding: 18px 30px 16px; text-transform: uppercase; text-align: center; font-size: 16px; font-weight: 700; line-height: 1.4; letter-spacing: 1px; text-decoration: none; color: #243949; cursor: pointer; background: #fffce1; border-radius: 30px/80px; transition: all .1s ease-out }
 main .button:not(.active):hover { color: #d5af63 }
 main .button.active { background: #dab977 }
 

module-bigdata/src/main/resources/static/assets/js/vendor/safety/ckplayer/source/com/adobe/crypto/MD5.as

@@ -33,7 +33,7 @@ OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOURCE CODE, EVEN IF
 ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-package static.assets.js.vendor.safety.ckplayer.source.com.adobe.crypto static.assets.bigdata.js.safety.ckplayer.source.com.adobe.crypto static.bigdata.js.safety.ckplayer.source.com.adobe.crypto static.assets.js.vendor.safety.ckplayer.source.com.adobe.crypto {
+package static.assets.bigdata.js.safety.ckplayer.source.com.adobe.crypto static.bigdata.js.safety.ckplayer.source.com.adobe.crypto static.assets.js.vendor.safety.ckplayer.source.com.adobe.crypto {
 	
 	import com.adobe.utils.IntUtil;
 	

module-bigdata/src/main/resources/static/assets/js/vendor/safety/ckplayer/source/com/adobe/crypto/SHA1.as

@@ -33,7 +33,7 @@ OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOURCE CODE, EVEN IF
 ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-package static.assets.js.vendor.safety.ckplayer.source.com.adobe.crypto static.assets.bigdata.js.safety.ckplayer.source.com.adobe.crypto static.bigdata.js.safety.ckplayer.source.com.adobe.crypto static.assets.js.vendor.safety.ckplayer.source.com.adobe.crypto
+package static.assets.bigdata.js.safety.ckplayer.source.com.adobe.crypto static.bigdata.js.safety.ckplayer.source.com.adobe.crypto static.assets.js.vendor.safety.ckplayer.source.com.adobe.crypto
 {
 	import com.adobe.utils.IntUtil;
 	import flash.utils.ByteArray;

module-bigdata/src/main/resources/static/assets/js/vendor/safety/ckplayer/source/com/adobe/crypto/SHA224.as

@@ -33,7 +33,7 @@ OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOURCE CODE, EVEN IF
 ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-package static.assets.js.vendor.safety.ckplayer.source.com.adobe.crypto static.assets.bigdata.js.safety.ckplayer.source.com.adobe.crypto static.bigdata.js.safety.ckplayer.source.com.adobe.crypto static.assets.js.vendor.safety.ckplayer.source.com.adobe.crypto
+package static.assets.bigdata.js.safety.ckplayer.source.com.adobe.crypto static.bigdata.js.safety.ckplayer.source.com.adobe.crypto static.assets.js.vendor.safety.ckplayer.source.com.adobe.crypto
 {
 	import com.adobe.utils.IntUtil;
 	import flash.utils.ByteArray;

module-bigdata/src/main/resources/static/assets/js/vendor/safety/ckplayer/source/com/adobe/crypto/SHA256.as

@@ -33,7 +33,7 @@ OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOURCE CODE, EVEN IF
 ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-package static.assets.js.vendor.safety.ckplayer.source.com.adobe.crypto static.assets.bigdata.js.safety.ckplayer.source.com.adobe.crypto static.bigdata.js.safety.ckplayer.source.com.adobe.crypto static.assets.js.vendor.safety.ckplayer.source.com.adobe.crypto
+package static.assets.bigdata.js.safety.ckplayer.source.com.adobe.crypto static.bigdata.js.safety.ckplayer.source.com.adobe.crypto static.assets.js.vendor.safety.ckplayer.source.com.adobe.crypto
 {
 	import com.adobe.utils.IntUtil;
 	import flash.utils.ByteArray;

module-bigdata/src/main/resources/static/assets/js/vendor/safety/ckplayer/source/com/adobe/crypto/WSSEUsernameToken.as

@@ -33,7 +33,7 @@ OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOURCE CODE, EVEN IF
 ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-package static.assets.js.vendor.safety.ckplayer.source.com.adobe.crypto static.assets.bigdata.js.safety.ckplayer.source.com.adobe.crypto static.bigdata.js.safety.ckplayer.source.com.adobe.crypto static.assets.js.vendor.safety.ckplayer.source.com.adobe.crypto
+package static.assets.bigdata.js.safety.ckplayer.source.com.adobe.crypto static.bigdata.js.safety.ckplayer.source.com.adobe.crypto static.assets.js.vendor.safety.ckplayer.source.com.adobe.crypto
 {
 	import mx.formatters.DateFormatter;
 	import mx.utils.Base64Encoder;

module-bigdata/src/main/resources/static/assets/js/vendor/safety/ckplayer/source/com/adobe/errors/IllegalStateError.as

@@ -33,7 +33,7 @@
 	ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-package static.assets.js.vendor.safety.ckplayer.source.com.adobe.errors static.assets.bigdata.js.safety.ckplayer.source.com.adobe.errors static.bigdata.js.safety.ckplayer.source.com.adobe.errors static.assets.js.vendor.safety.ckplayer.source.com.adobe.errors
+package static.assets.bigdata.js.safety.ckplayer.source.com.adobe.errors static.bigdata.js.safety.ckplayer.source.com.adobe.errors static.assets.js.vendor.safety.ckplayer.source.com.adobe.errors
 {
 	/**
 	* This class represents an Error that is thrown when a method is called when

module-bigdata/src/main/resources/static/assets/js/vendor/safety/ckplayer/source/com/adobe/images/BitString.as

@@ -32,7 +32,7 @@
 	OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOURCE CODE, EVEN IF
 	ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-package static.assets.js.vendor.safety.ckplayer.source.com.adobe.images static.assets.bigdata.js.safety.ckplayer.source.com.adobe.images static.bigdata.js.safety.ckplayer.source.com.adobe.images static.assets.js.vendor.safety.ckplayer.source.com.adobe.images
+package static.assets.bigdata.js.safety.ckplayer.source.com.adobe.images static.bigdata.js.safety.ckplayer.source.com.adobe.images static.assets.js.vendor.safety.ckplayer.source.com.adobe.images
 {
 	public class BitString
 	{

module-bigdata/src/main/resources/static/assets/js/vendor/safety/ckplayer/source/com/adobe/images/JPGEncoder.as

@@ -32,7 +32,7 @@
 	OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOURCE CODE, EVEN IF
 	ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-package static.assets.js.vendor.safety.ckplayer.source.com.adobe.images static.assets.bigdata.js.safety.ckplayer.source.com.adobe.images static.bigdata.js.safety.ckplayer.source.com.adobe.images static.assets.js.vendor.safety.ckplayer.source.com.adobe.images
+package static.assets.bigdata.js.safety.ckplayer.source.com.adobe.images static.bigdata.js.safety.ckplayer.source.com.adobe.images static.assets.js.vendor.safety.ckplayer.source.com.adobe.images
 {
 	import flash.geom.*;
 	import flash.display.*;

module-bigdata/src/main/resources/static/assets/js/vendor/safety/ckplayer/source/com/adobe/images/PNGEncoder.as

@@ -32,7 +32,7 @@
 	OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOURCE CODE, EVEN IF
 	ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-package static.assets.js.vendor.safety.ckplayer.source.com.adobe.images static.assets.bigdata.js.safety.ckplayer.source.com.adobe.images static.bigdata.js.safety.ckplayer.source.com.adobe.images static.assets.js.vendor.safety.ckplayer.source.com.adobe.images
+package static.assets.bigdata.js.safety.ckplayer.source.com.adobe.images static.bigdata.js.safety.ckplayer.source.com.adobe.images static.assets.js.vendor.safety.ckplayer.source.com.adobe.images
 {
 	import flash.geom.*;
 	import flash.display.Bitmap;

module-bigdata/src/main/resources/static/assets/js/vendor/safety/ckplayer/source/com/adobe/net/DynamicURLLoader.as

@@ -33,7 +33,7 @@
 	ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-package static.assets.js.vendor.safety.ckplayer.source.com.adobe.net static.assets.bigdata.js.safety.ckplayer.source.com.adobe.net static.bigdata.js.safety.ckplayer.source.com.adobe.net static.assets.js.vendor.safety.ckplayer.source.com.adobe.net
+package static.assets.bigdata.js.safety.ckplayer.source.com.adobe.net static.bigdata.js.safety.ckplayer.source.com.adobe.net static.assets.js.vendor.safety.ckplayer.source.com.adobe.net
 {
 	import flash.net.URLLoader;
 

module-bigdata/src/main/resources/static/assets/js/vendor/safety/ckplayer/source/com/adobe/net/IURIResolver.as

@@ -33,7 +33,7 @@
 	ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-package static.assets.js.vendor.safety.ckplayer.source.com.adobe.net static.assets.bigdata.js.safety.ckplayer.source.com.adobe.net static.bigdata.js.safety.ckplayer.source.com.adobe.net static.assets.js.vendor.safety.ckplayer.source.com.adobe.net
+package static.assets.js.vendor.safety.ckplayer.source.com.adobe.net static.assets.js.vendor.safety.ckplayer.source.com.adobe.net static.assets.js.vendor.safety.ckplayer.source.com.adobe.net static.assets.js.vendor.safety.ckplayer.source.com.adobe.net
 {
 	/**
 	 * The URI class cannot know about DNS aliases, virtual hosts, or

module-bigdata/src/main/resources/static/assets/js/vendor/safety/ckplayer/source/com/adobe/net/URI.as

@@ -33,7 +33,7 @@ OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOURCE CODE, EVEN IF
 ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-package static.assets.js.vendor.safety.ckplayer.source.com.adobe.net static.assets.bigdata.js.safety.ckplayer.source.com.adobe.net static.bigdata.js.safety.ckplayer.source.com.adobe.net static.assets.js.vendor.safety.ckplayer.source.com.adobe.net
+package static.assets.js.vendor.safety.ckplayer.source.com.adobe.net static.assets.js.vendor.safety.ckplayer.source.com.adobe.net static.assets.js.vendor.safety.ckplayer.source.com.adobe.net static.assets.js.vendor.safety.ckplayer.source.com.adobe.net static.assets.js.vendor.safety.ckplayer.source.com.adobe.net
 {
 	import flash.utils.ByteArray;
 	

module-bigdata/src/main/resources/static/assets/js/vendor/safety/ckplayer/source/com/adobe/net/URIEncodingBitmap.as

@@ -33,7 +33,7 @@
 	ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-package static.assets.js.vendor.safety.ckplayer.source.com.adobe.net static.assets.bigdata.js.safety.ckplayer.source.com.adobe.net static.bigdata.js.safety.ckplayer.source.com.adobe.net static.assets.js.vendor.safety.ckplayer.source.com.adobe.net
+package static.assets.bigdata.js.safety.ckplayer.source.com.adobe.net static.bigdata.js.safety.ckplayer.source.com.adobe.net static.assets.js.vendor.safety.ckplayer.source.com.adobe.net
 {
 	import flash.utils.ByteArray;
 	

module-bigdata/src/main/resources/static/assets/js/vendor/safety/ckplayer/source/com/adobe/net/proxies/RFC2817Socket.as

@@ -32,7 +32,7 @@
 	OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOURCE CODE, EVEN IF
 	ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-package static.assets.js.vendor.safety.ckplayer.source.com.adobe.net.proxies static.assets.bigdata.js.safety.ckplayer.source.com.adobe.net.proxies static.bigdata.js.safety.ckplayer.source.com.adobe.net.proxies static.assets.js.vendor.safety.ckplayer.source.com.adobe.net.proxies
+package static.assets.js.vendor.safety.ckplayer.source.com.adobe.net.proxies static.assets.js.vendor.safety.ckplayer.source.com.adobe.net.proxies static.assets.js.vendor.safety.ckplayer.source.com.adobe.net.proxies static.assets.js.vendor.safety.ckplayer.source.com.adobe.net.proxies static.assets.js.vendor.safety.ckplayer.source.com.adobe.net.proxies
 {
 	import flash.events.Event;
 	import flash.events.IOErrorEvent;

module-bigdata/src/main/resources/static/assets/js/vendor/safety/ckplayer/source/com/adobe/serialization/json/JSON.as

@@ -33,7 +33,7 @@ OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOURCE CODE, EVEN IF
 ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-package static.assets.js.vendor.safety.ckplayer.source.com.adobe.serialization.json static.assets.bigdata.js.safety.ckplayer.source.com.adobe.serialization.json static.bigdata.js.safety.ckplayer.source.com.adobe.serialization.json static.assets.js.vendor.safety.ckplayer.source.com.adobe.serialization.json {
+package static.assets.bigdata.js.safety.ckplayer.source.com.adobe.serialization.json static.bigdata.js.safety.ckplayer.source.com.adobe.serialization.json static.assets.js.vendor.safety.ckplayer.source.com.adobe.serialization.json {
 
 	/**
 	 * This class provides encoding and decoding of the JSON format.

module-bigdata/src/main/resources/static/assets/js/vendor/safety/ckplayer/source/com/adobe/serialization/json/JSONDecoder.as

@@ -33,7 +33,7 @@ OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOURCE CODE, EVEN IF
 ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-package static.assets.js.vendor.safety.ckplayer.source.com.adobe.serialization.json static.assets.bigdata.js.safety.ckplayer.source.com.adobe.serialization.json static.bigdata.js.safety.ckplayer.source.com.adobe.serialization.json static.assets.js.vendor.safety.ckplayer.source.com.adobe.serialization.json {
+package static.assets.bigdata.js.safety.ckplayer.source.com.adobe.serialization.json static.bigdata.js.safety.ckplayer.source.com.adobe.serialization.json static.assets.js.vendor.safety.ckplayer.source.com.adobe.serialization.json {
 
 	public class JSONDecoder {
 		

module-bigdata/src/main/resources/static/assets/js/vendor/safety/ckplayer/source/com/adobe/serialization/json/JSONEncoder.as

@@ -33,7 +33,7 @@ OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOURCE CODE, EVEN IF
 ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-package static.assets.js.vendor.safety.ckplayer.source.com.adobe.serialization.json static.assets.bigdata.js.safety.ckplayer.source.com.adobe.serialization.json static.bigdata.js.safety.ckplayer.source.com.adobe.serialization.json static.assets.js.vendor.safety.ckplayer.source.com.adobe.serialization.json 
+package static.assets.bigdata.js.safety.ckplayer.source.com.adobe.serialization.json static.bigdata.js.safety.ckplayer.source.com.adobe.serialization.json static.assets.js.vendor.safety.ckplayer.source.com.adobe.serialization.json 
 {
 
 	import flash.utils.describeType;

module-bigdata/src/main/resources/static/assets/js/vendor/safety/ckplayer/source/com/adobe/serialization/json/JSONParseError.as

@@ -33,7 +33,7 @@ OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOURCE CODE, EVEN IF
 ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-package static.assets.js.vendor.safety.ckplayer.source.com.adobe.serialization.json static.assets.bigdata.js.safety.ckplayer.source.com.adobe.serialization.json static.bigdata.js.safety.ckplayer.source.com.adobe.serialization.json static.assets.js.vendor.safety.ckplayer.source.com.adobe.serialization.json {
+package static.assets.bigdata.js.safety.ckplayer.source.com.adobe.serialization.json static.bigdata.js.safety.ckplayer.source.com.adobe.serialization.json static.assets.js.vendor.safety.ckplayer.source.com.adobe.serialization.json {
 
 	/**
 	 *

module-bigdata/src/main/resources/static/assets/js/vendor/safety/ckplayer/source/com/adobe/serialization/json/JSONToken.as

@@ -33,7 +33,7 @@ OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOURCE CODE, EVEN IF
 ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-package static.assets.js.vendor.safety.ckplayer.source.com.adobe.serialization.json static.assets.bigdata.js.safety.ckplayer.source.com.adobe.serialization.json static.bigdata.js.safety.ckplayer.source.com.adobe.serialization.json static.assets.js.vendor.safety.ckplayer.source.com.adobe.serialization.json {
+package static.assets.bigdata.js.safety.ckplayer.source.com.adobe.serialization.json static.bigdata.js.safety.ckplayer.source.com.adobe.serialization.json static.assets.js.vendor.safety.ckplayer.source.com.adobe.serialization.json {
 
 	public class JSONToken {
 	

module-bigdata/src/main/resources/static/assets/js/vendor/safety/ckplayer/source/com/adobe/serialization/json/JSONTokenType.as

@@ -33,7 +33,7 @@ OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOURCE CODE, EVEN IF
 ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-package static.assets.js.vendor.safety.ckplayer.source.com.adobe.serialization.json static.assets.bigdata.js.safety.ckplayer.source.com.adobe.serialization.json static.bigdata.js.safety.ckplayer.source.com.adobe.serialization.json static.assets.js.vendor.safety.ckplayer.source.com.adobe.serialization.json {
+package static.assets.bigdata.js.safety.ckplayer.source.com.adobe.serialization.json static.bigdata.js.safety.ckplayer.source.com.adobe.serialization.json static.assets.js.vendor.safety.ckplayer.source.com.adobe.serialization.json {
 
 	/**
 	 * Class containing constant values for the different types

module-bigdata/src/main/resources/static/assets/js/vendor/safety/ckplayer/source/com/adobe/serialization/json/JSONTokenizer.as

@@ -33,7 +33,7 @@ OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOURCE CODE, EVEN IF
 ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-package static.assets.js.vendor.safety.ckplayer.source.com.adobe.serialization.json static.assets.bigdata.js.safety.ckplayer.source.com.adobe.serialization.json static.bigdata.js.safety.ckplayer.source.com.adobe.serialization.json static.assets.js.vendor.safety.ckplayer.source.com.adobe.serialization.json {
+package static.assets.bigdata.js.safety.ckplayer.source.com.adobe.serialization.json static.bigdata.js.safety.ckplayer.source.com.adobe.serialization.json static.assets.js.vendor.safety.ckplayer.source.com.adobe.serialization.json {
 
 	public class JSONTokenizer {
 	

module-bigdata/src/main/resources/static/assets/js/vendor/safety/ckplayer/source/com/adobe/utils/ArrayUtil.as

@@ -33,7 +33,7 @@
 	ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-package static.assets.js.vendor.safety.ckplayer.source.com.adobe.utils static.assets.bigdata.js.safety.ckplayer.source.com.adobe.utils static.bigdata.js.safety.ckplayer.source.com.adobe.utils static.assets.js.vendor.safety.ckplayer.source.com.adobe.utils
+package static.assets.bigdata.js.safety.ckplayer.source.com.adobe.utils static.bigdata.js.safety.ckplayer.source.com.adobe.utils static.assets.js.vendor.safety.ckplayer.source.com.adobe.utils
 {
 	
 	/**

module-bigdata/src/main/resources/static/assets/js/vendor/safety/ckplayer/source/com/adobe/utils/DateUtil.as

@@ -33,7 +33,7 @@
 	ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-package static.assets.js.vendor.safety.ckplayer.source.com.adobe.utils static.assets.bigdata.js.safety.ckplayer.source.com.adobe.utils static.bigdata.js.safety.ckplayer.source.com.adobe.utils static.assets.js.vendor.safety.ckplayer.source.com.adobe.utils
+package static.assets.bigdata.js.safety.ckplayer.source.com.adobe.utils static.bigdata.js.safety.ckplayer.source.com.adobe.utils static.assets.js.vendor.safety.ckplayer.source.com.adobe.utils
 {
 	import com.adobe.utils.ArrayUtil;
 	import mx.formatters.DateBase;

module-bigdata/src/main/resources/static/assets/js/vendor/safety/ckplayer/source/com/adobe/utils/DictionaryUtil.as

@@ -33,7 +33,7 @@
 	ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-package static.assets.js.vendor.safety.ckplayer.source.com.adobe.utils static.assets.bigdata.js.safety.ckplayer.source.com.adobe.utils static.bigdata.js.safety.ckplayer.source.com.adobe.utils static.assets.js.vendor.safety.ckplayer.source.com.adobe.utils
+package static.assets.bigdata.js.safety.ckplayer.source.com.adobe.utils static.bigdata.js.safety.ckplayer.source.com.adobe.utils static.assets.js.vendor.safety.ckplayer.source.com.adobe.utils
 {
 	import flash.utils.Dictionary;
 	

module-bigdata/src/main/resources/static/assets/js/vendor/safety/ckplayer/source/com/adobe/utils/IntUtil.as

@@ -1,5 +1,5 @@
 
-package static.assets.js.vendor.safety.ckplayer.source.com.adobe.utils static.assets.bigdata.js.safety.ckplayer.source.com.adobe.utils static.bigdata.js.safety.ckplayer.source.com.adobe.utils static.assets.js.vendor.safety.ckplayer.source.com.adobe.utils {
+package static.assets.bigdata.js.safety.ckplayer.source.com.adobe.utils static.bigdata.js.safety.ckplayer.source.com.adobe.utils static.assets.js.vendor.safety.ckplayer.source.com.adobe.utils {
 	
 	import flash.utils.Endian;
 	

module-bigdata/src/main/resources/static/assets/js/vendor/safety/ckplayer/source/com/adobe/utils/NumberFormatter.as

@@ -33,7 +33,7 @@
 	ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-package static.assets.js.vendor.safety.ckplayer.source.com.adobe.utils static.assets.bigdata.js.safety.ckplayer.source.com.adobe.utils static.bigdata.js.safety.ckplayer.source.com.adobe.utils static.assets.js.vendor.safety.ckplayer.source.com.adobe.utils
+package static.assets.bigdata.js.safety.ckplayer.source.com.adobe.utils static.bigdata.js.safety.ckplayer.source.com.adobe.utils static.assets.js.vendor.safety.ckplayer.source.com.adobe.utils
 {
 
 	/**

module-bigdata/src/main/resources/static/assets/js/vendor/safety/ckplayer/source/com/adobe/utils/StringUtil.as

@@ -33,7 +33,7 @@
 	ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-package static.assets.js.vendor.safety.ckplayer.source.com.adobe.utils static.assets.bigdata.js.safety.ckplayer.source.com.adobe.utils static.bigdata.js.safety.ckplayer.source.com.adobe.utils static.assets.js.vendor.safety.ckplayer.source.com.adobe.utils
+package static.assets.bigdata.js.safety.ckplayer.source.com.adobe.utils static.bigdata.js.safety.ckplayer.source.com.adobe.utils static.assets.js.vendor.safety.ckplayer.source.com.adobe.utils
 {
 	
 	/**