From 35445c11dc19aa9160c46d68a7ac964b6c126302 Mon Sep 17 00:00:00 2001
From: wangxiang <1827945911@qq.com>
Date: Fri, 19 Aug 2022 17:26:02 +0800
Subject: [PATCH] =?UTF-8?q?:art:=20=E4=BF=AE=E5=A4=8D=E8=8F=9C=E5=8D=95?=
=?UTF-8?q?=E6=8E=88=E6=9D=83bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../DatascreenCategoryController.java | 22 ++++
.../controller/DatascreenController.java | 123 ++++++++++++++++++
.../controller/DatascreenMapController.java | 22 ++++
.../mapper/DatascreenCategoryMapper.java | 16 +++
.../commonbiz/mapper/DatascreenMapMapper.java | 16 +++
.../commonbiz/mapper/DatascreenMapper.java | 16 +++
.../service/IDatascreenCategoryService.java | 16 +++
.../service/IDatascreenMapService.java | 16 +++
.../commonbiz/service/IDatascreenService.java | 16 +++
.../impl/DatascreenCategoryServiceImpl.java | 20 +++
.../impl/DatascreenMapServiceImpl.java | 20 +++
.../service/impl/DatascreenServiceImpl.java | 20 +++
.../mapper/DatascreenCategoryMapper.xml | 5 +
.../resources/mapper/DatascreenMapMapper.xml | 5 +
.../resources/mapper/DatascreenMapper.xml | 5 +
15 files changed, 338 insertions(+)
create mode 100644 kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/DatascreenCategoryController.java
create mode 100644 kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/DatascreenController.java
create mode 100644 kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/DatascreenMapController.java
create mode 100644 kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/DatascreenCategoryMapper.java
create mode 100644 kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/DatascreenMapMapper.java
create mode 100644 kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/DatascreenMapper.java
create mode 100644 kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/IDatascreenCategoryService.java
create mode 100644 kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/IDatascreenMapService.java
create mode 100644 kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/IDatascreenService.java
create mode 100644 kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/DatascreenCategoryServiceImpl.java
create mode 100644 kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/DatascreenMapServiceImpl.java
create mode 100644 kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/DatascreenServiceImpl.java
create mode 100644 kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/DatascreenCategoryMapper.xml
create mode 100644 kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/DatascreenMapMapper.xml
create mode 100644 kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/DatascreenMapper.xml
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/DatascreenCategoryController.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/DatascreenCategoryController.java
new file mode 100644
index 00000000..fb438903
--- /dev/null
+++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/DatascreenCategoryController.java
@@ -0,0 +1,22 @@
+package com.cloud.kicc.commonbiz.controller;
+
+
+import com.cloud.kicc.common.core.constant.AppConstants;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ *
+ * 大屏分类 前端控制器
+ *
+ *
+ * @author entfrm开发团队-王翔
+ * @since 2022-08-04
+ */
+@Controller
+@RequestMapping(AppConstants.APP_COMMON + "/datascreenCategory")
+public class DatascreenCategoryController {
+
+}
+
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/DatascreenController.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/DatascreenController.java
new file mode 100644
index 00000000..73bd0d7b
--- /dev/null
+++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/DatascreenController.java
@@ -0,0 +1,123 @@
+package com.cloud.kicc.commonbiz.controller;
+
+
+import com.cloud.kicc.common.core.constant.AppConstants;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+/**
+ *
+ * 大屏管理 前端控制器
+ *
+ *
+ * @author entfrm开发团队-王翔
+ * @since 2022-08-04
+ */
+@Controller
+@RequestMapping(AppConstants.APP_COMMON + "/datascreen")
+@RequiredArgsConstructor
+public class DatascreenController {
+
+ /*private final IDatascreenService iDatascreenService;
+
+ @ModelAttribute
+ public DataScreen get(@RequestParam(required=false) String id) {
+ DataScreen entity = null;
+ if (StringUtils.isNotBlank(id)){
+ entity = dataScreenService.get(id);
+ }
+ if (entity == null){
+ entity = new DataScreen();
+ }
+ return entity;
+ }
+
+ *//**
+ * 大屏设计列表数据
+ *//*
+ @RequiresPermissions("datav:dataScreen:list")
+ @GetMapping("list")
+ public AjaxJson list(DataScreen dataScreen, HttpServletRequest request, HttpServletResponse response) {
+ Page page = dataScreenService.findPage(new Page(request, response), dataScreen);
+ return AjaxJson.success().put("page",page);
+ }
+
+ *//**
+ * 根据Id获取大屏设计数据
+ *//*
+ @RequiresPermissions(value={"datav:dataScreen:view","datav:dataScreen:add","datav:dataScreen:edit"},logical=Logical.OR)
+ @GetMapping("queryById")
+ public AjaxJson queryById(DataScreen dataScreen) {
+ return AjaxJson.success().put("dataScreen", dataScreen);
+ }
+
+ *//**
+ * 复制大屏
+ *//*
+ @GetMapping("copy")
+ public AjaxJson copy(DataScreen dataScreen) {
+ dataScreen.setId (null);
+ dataScreen.setName (dataScreen.getName () + "-copy");
+ dataScreenService.save (dataScreen);
+ return AjaxJson.success("复制大屏成功!");
+ }
+
+
+ *//**
+ * 保存大屏设计
+ *//*
+ @RequiresPermissions(value={"datav:dataScreen:add","datav:dataScreen:edit"},logical=Logical.OR)
+ @PostMapping("save")
+ public AjaxJson save(DataScreen dataScreen) throws Exception{
+ *//**
+ * 后台hibernate-validation插件校验
+ *//*
+ String errMsg = beanValidator(dataScreen);
+ if (StringUtils.isNotBlank(errMsg)){
+ return AjaxJson.error(errMsg);
+ }
+ //新增或编辑表单保存
+ dataScreenService.save(dataScreen);//保存
+ return AjaxJson.success("保存大屏设计成功");
+ }
+
+
+ *//**
+ * 批量删除大屏设计
+ *//*
+ @RequiresPermissions("datav:dataScreen:del")
+ @DeleteMapping("delete")
+ public AjaxJson delete(String ids) {
+ String idArray[] =ids.split(",");
+ for(String id : idArray){
+ dataScreenService.delete(new DataScreen(id));
+ }
+ return AjaxJson.success("删除大屏设计成功");
+ }
+
+
+ @PostMapping(value = "/sqlQuery")
+ public AjaxJson exec(@RequestParam(value = "db", required = false)String db, @RequestParam(value = "sql", required = false)String sql, @RequestParam(value = "field[]", required = false)String[] field, @RequestParam(value = "defaultValue[]", required = false)String[] defaultValue) {
+ AjaxJson j = new AjaxJson();
+ DataSource dataSource = dataSourceService.get(db);
+ if (dataSource == null) {
+ j.setSuccess(false);
+ j.setMsg("数据库链接不存在!");
+ return j;
+ }
+
+ JdbcTemplate jdbcTemplate = DBPool.getInstance().getDataSource(dataSource.getEnName());
+ if (sql.contains("delete") || sql.contains("update")) {
+ j.setSuccess(false);
+ j.setMsg("只允许查询操作!");
+ return j;
+ };
+
+ List> list = jdbcTemplate.queryForList(sql);
+ j.put ("data", list);
+
+ return j;
+ }*/
+}
+
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/DatascreenMapController.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/DatascreenMapController.java
new file mode 100644
index 00000000..d8b42402
--- /dev/null
+++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/DatascreenMapController.java
@@ -0,0 +1,22 @@
+package com.cloud.kicc.commonbiz.controller;
+
+
+import com.cloud.kicc.common.core.constant.AppConstants;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ *
+ * 地图 前端控制器
+ *
+ *
+ * @author entfrm开发团队-王翔
+ * @since 2022-08-04
+ */
+@Controller
+@RequestMapping(AppConstants.APP_COMMON + "/datascreenMap")
+public class DatascreenMapController {
+
+}
+
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/DatascreenCategoryMapper.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/DatascreenCategoryMapper.java
new file mode 100644
index 00000000..b3233f21
--- /dev/null
+++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/DatascreenCategoryMapper.java
@@ -0,0 +1,16 @@
+package com.cloud.kicc.commonbiz.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.cloud.kicc.commonbiz.api.entity.DataScreenCategory;
+
+/**
+ *
+ * 大屏分类 Mapper 接口
+ *
+ *
+ * @author entfrm开发团队-王翔
+ * @since 2022-08-04
+ */
+public interface DatascreenCategoryMapper extends BaseMapper {
+
+}
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/DatascreenMapMapper.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/DatascreenMapMapper.java
new file mode 100644
index 00000000..342f1b83
--- /dev/null
+++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/DatascreenMapMapper.java
@@ -0,0 +1,16 @@
+package com.cloud.kicc.commonbiz.mapper;
+
+import com.cloud.kicc.commonbiz.api.entity.DatascreenMap;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ *
+ * 地图 Mapper 接口
+ *
+ *
+ * @author entfrm开发团队-王翔
+ * @since 2022-08-04
+ */
+public interface DatascreenMapMapper extends BaseMapper {
+
+}
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/DatascreenMapper.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/DatascreenMapper.java
new file mode 100644
index 00000000..91f02415
--- /dev/null
+++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/DatascreenMapper.java
@@ -0,0 +1,16 @@
+package com.cloud.kicc.commonbiz.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.cloud.kicc.commonbiz.api.entity.DataScreen;
+
+/**
+ *
+ * 大屏管理 Mapper 接口
+ *
+ *
+ * @author entfrm开发团队-王翔
+ * @since 2022-08-04
+ */
+public interface DatascreenMapper extends BaseMapper {
+
+}
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/IDatascreenCategoryService.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/IDatascreenCategoryService.java
new file mode 100644
index 00000000..4eed6b14
--- /dev/null
+++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/IDatascreenCategoryService.java
@@ -0,0 +1,16 @@
+package com.cloud.kicc.commonbiz.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.cloud.kicc.commonbiz.api.entity.DataScreenCategory;
+
+/**
+ *
+ * 大屏分类 服务类
+ *
+ *
+ * @author entfrm开发团队-王翔
+ * @since 2022-08-04
+ */
+public interface IDatascreenCategoryService extends IService {
+
+}
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/IDatascreenMapService.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/IDatascreenMapService.java
new file mode 100644
index 00000000..d93f3153
--- /dev/null
+++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/IDatascreenMapService.java
@@ -0,0 +1,16 @@
+package com.cloud.kicc.commonbiz.service;
+
+import com.cloud.kicc.commonbiz.api.entity.DatascreenMap;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ *
+ * 地图 服务类
+ *
+ *
+ * @author entfrm开发团队-王翔
+ * @since 2022-08-04
+ */
+public interface IDatascreenMapService extends IService {
+
+}
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/IDatascreenService.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/IDatascreenService.java
new file mode 100644
index 00000000..93b62cde
--- /dev/null
+++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/IDatascreenService.java
@@ -0,0 +1,16 @@
+package com.cloud.kicc.commonbiz.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.cloud.kicc.commonbiz.api.entity.DataScreen;
+
+/**
+ *
+ * 大屏管理 服务类
+ *
+ *
+ * @author entfrm开发团队-王翔
+ * @since 2022-08-04
+ */
+public interface IDatascreenService extends IService {
+
+}
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/DatascreenCategoryServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/DatascreenCategoryServiceImpl.java
new file mode 100644
index 00000000..62819cec
--- /dev/null
+++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/DatascreenCategoryServiceImpl.java
@@ -0,0 +1,20 @@
+package com.cloud.kicc.commonbiz.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.cloud.kicc.commonbiz.api.entity.DataScreenCategory;
+import com.cloud.kicc.commonbiz.mapper.DatascreenCategoryMapper;
+import com.cloud.kicc.commonbiz.service.IDatascreenCategoryService;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ * 大屏分类 服务实现类
+ *
+ *
+ * @author entfrm开发团队-王翔
+ * @since 2022-08-04
+ */
+@Service
+public class DatascreenCategoryServiceImpl extends ServiceImpl implements IDatascreenCategoryService {
+
+}
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/DatascreenMapServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/DatascreenMapServiceImpl.java
new file mode 100644
index 00000000..eb57dfca
--- /dev/null
+++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/DatascreenMapServiceImpl.java
@@ -0,0 +1,20 @@
+package com.cloud.kicc.commonbiz.service.impl;
+
+import com.cloud.kicc.commonbiz.api.entity.DatascreenMap;
+import com.cloud.kicc.commonbiz.mapper.DatascreenMapMapper;
+import com.cloud.kicc.commonbiz.service.IDatascreenMapService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ * 地图 服务实现类
+ *
+ *
+ * @author entfrm开发团队-王翔
+ * @since 2022-08-04
+ */
+@Service
+public class DatascreenMapServiceImpl extends ServiceImpl implements IDatascreenMapService {
+
+}
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/DatascreenServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/DatascreenServiceImpl.java
new file mode 100644
index 00000000..348c31a3
--- /dev/null
+++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/DatascreenServiceImpl.java
@@ -0,0 +1,20 @@
+package com.cloud.kicc.commonbiz.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.cloud.kicc.commonbiz.api.entity.DataScreen;
+import com.cloud.kicc.commonbiz.mapper.DatascreenMapper;
+import com.cloud.kicc.commonbiz.service.IDatascreenService;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ * 大屏管理 服务实现类
+ *
+ *
+ * @author entfrm开发团队-王翔
+ * @since 2022-08-04
+ */
+@Service
+public class DatascreenServiceImpl extends ServiceImpl implements IDatascreenService {
+
+}
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/DatascreenCategoryMapper.xml b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/DatascreenCategoryMapper.xml
new file mode 100644
index 00000000..fa6dbffa
--- /dev/null
+++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/DatascreenCategoryMapper.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/DatascreenMapMapper.xml b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/DatascreenMapMapper.xml
new file mode 100644
index 00000000..81c3bd15
--- /dev/null
+++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/DatascreenMapMapper.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/DatascreenMapper.xml b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/DatascreenMapper.xml
new file mode 100644
index 00000000..0247e2a3
--- /dev/null
+++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/DatascreenMapper.xml
@@ -0,0 +1,5 @@
+
+
+
+
+