看板相关接口开发整合

fiveep-model/src/main/java/com/bizmatics/model/BulletinCruxConfig.java

@@ -89,6 +89,11 @@ public class BulletinCruxConfig implements Serializable {
      */
     private Integer siteId;
 
+    /**
+     * 监控设备id
+     */
+    private Integer deviceId;
+
     /**
      * 变量ID
      */

fiveep-model/src/main/java/com/bizmatics/model/vo/BulletinCruxConfigVo.java

@@ -11,7 +11,7 @@ import java.time.LocalDateTime;
 
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author ya
@@ -22,7 +22,7 @@ import java.time.LocalDateTime;
 @Accessors(chain = true)
 public class BulletinCruxConfigVo implements Serializable {
 
-    private static final long serialVersionUID=1L;
+    private static final long serialVersionUID = 1L;
 
     /**
      * 关键数据配置表ID
@@ -113,7 +113,7 @@ public class BulletinCruxConfigVo implements Serializable {
 
     private Object textValue;
 
-    private String idx;
+    private String i;
 
     /**
      * X轴坐标
@@ -183,4 +183,44 @@ public class BulletinCruxConfigVo implements Serializable {
      */
     private String alarmType;
 
+    private Integer x;
+    private Integer y;
+    private Integer w;
+    private Integer h;
+
+    /**
+     * 数据标题
+     */
+    private String dataTitle;
+
+    /**
+     * 查询周期
+     */
+    private Integer queryCycle;
+
+    /**
+     * 查询类型
+     */
+    private Integer queryType;
+
+    /**
+     * 最大值是否标注
+     */
+    private Integer maxDimension;
+
+    /**
+     * 最小值是否标注
+     */
+    private Integer minDimension;
+
+    /**
+     * 平均值是否标注
+     */
+    private Integer meanDimension;
+
+    /**
+     * 纵轴自适应
+     */
+    private Integer lonAdaptation;
+
 }

fiveep-persistence/src/main/resources/mapper/mysql/BulletinCruxConfigMapper.xml

@@ -17,6 +17,7 @@
         <result column="create_by" property="createBy" />
         <result column="create_time" property="createTime" />
         <result column="site_id" property="siteId" />
+        <result column="device_id" property="deviceId" />
         <result column="variable_id" property="variableId" />
         <result column="cycle" property="cycle" />
         <result column="method" property="method" />

fiveep-service/src/main/java/com/bizmatics/service/impl/BulletinCruxConfigServiceImpl.java

@@ -59,7 +59,11 @@ public class BulletinCruxConfigServiceImpl extends AbstractCrudService<BulletinC
             List<BulletinCruxConfigVo> lsit1 = this.getbulletinCruxConfig(siteId, id);
             if (lsit1.size() > 0) {
                 for (int i = 0; i < lsit1.size(); i++) {
-                    lsit1.get(i).setIdx("" + (list2.size() + 1));
+                    lsit1.get(i).setI("" + (list2.size() + 1));
+                    lsit1.get(i).setX(lsit1.get(i).getCoordinatex());
+                    lsit1.get(i).setY(lsit1.get(i).getCoordinatey());
+                    lsit1.get(i).setW(lsit1.get(i).getWide());
+                    lsit1.get(i).setH(lsit1.get(i).getHigh());
                     list2.add(lsit1.get(i));
                 }
             }
@@ -69,7 +73,12 @@ public class BulletinCruxConfigServiceImpl extends AbstractCrudService<BulletinC
             if (lsit3.size() > 0) {
                 for (int i = 0; i < lsit3.size(); i++) {
                     lsit3.get(i).setColorType("echarts");
-                    lsit3.get(i).setIdx("" + (list2.size() + 1));
+                    lsit3.get(i).setI("" + (list2.size() + 1));
+                    lsit3.get(i).setX(lsit3.get(i).getCoordinatex());
+                    lsit3.get(i).setY(lsit3.get(i).getCoordinatey());
+                    lsit3.get(i).setW(lsit3.get(i).getWide());
+                    lsit3.get(i).setH(lsit3.get(i).getHigh());
+                    lsit3.get(i).setDataName(lsit3.get(i).getDataTitle());
                     list2.add(lsit3.get(i));
                 }
             }
@@ -78,7 +87,12 @@ public class BulletinCruxConfigServiceImpl extends AbstractCrudService<BulletinC
             List<BulletinCruxConfigVo> lsit4 = this.getBulletinAlarmConfig(siteId,id);
             if (lsit4.size() > 0) {
                 for (int i = 0; i < lsit4.size(); i++) {
-                    lsit4.get(i).setIdx("" + (list2.size() + 1));
+                    lsit4.get(i).setI("" + (list2.size() + 1));
+                    lsit4.get(i).setX(lsit4.get(i).getCoordinatex());
+                    lsit4.get(i).setY(lsit4.get(i).getCoordinatey());
+                    lsit4.get(i).setW(lsit4.get(i).getWide());
+                    lsit4.get(i).setH(lsit4.get(i).getHigh());
+                    lsit4.get(i).setDataName(lsit4.get(i).getListTitle());
                     list2.add(lsit4.get(i));
                 }
             }
@@ -88,7 +102,11 @@ public class BulletinCruxConfigServiceImpl extends AbstractCrudService<BulletinC
             List<BulletinCruxConfigVo> lsit1 = this.getbulletinCruxConfig(siteId, id);
             if (lsit1.size() > 0) {
                 for (int i = 0; i < lsit1.size(); i++) {
-                    lsit1.get(i).setIdx("" + (list2.size() + 1));
+                    lsit1.get(i).setI("" + (list2.size() + 1));
+                    lsit1.get(i).setX(lsit1.get(i).getCoordinatex());
+                    lsit1.get(i).setY(lsit1.get(i).getCoordinatey());
+                    lsit1.get(i).setW(lsit1.get(i).getWide());
+                    lsit1.get(i).setH(lsit1.get(i).getHigh());
                     list2.add(lsit1.get(i));
                 }
             }
@@ -98,7 +116,12 @@ public class BulletinCruxConfigServiceImpl extends AbstractCrudService<BulletinC
             if (lsit3.size() > 0) {
                 for (int i = 0; i < lsit3.size(); i++) {
                     lsit3.get(i).setColorType("echarts");
-                    lsit3.get(i).setIdx("" + (list2.size() + 1));
+                    lsit3.get(i).setI("" + (list2.size() + 1));
+                    lsit3.get(i).setX(lsit3.get(i).getCoordinatex());
+                    lsit3.get(i).setY(lsit3.get(i).getCoordinatey());
+                    lsit3.get(i).setW(lsit3.get(i).getWide());
+                    lsit3.get(i).setH(lsit3.get(i).getHigh());
+                    lsit3.get(i).setDataName(lsit3.get(i).getDataTitle());
                     list2.add(lsit3.get(i));
                 }
             }
@@ -107,7 +130,12 @@ public class BulletinCruxConfigServiceImpl extends AbstractCrudService<BulletinC
             List<BulletinCruxConfigVo> lsit4 = this.getBulletinAlarmConfig(siteId,id);
             if (lsit4.size() > 0) {
                 for (int i = 0; i < lsit4.size(); i++) {
-                    lsit4.get(i).setIdx("" + (list2.size() + 1));
+                    lsit4.get(i).setI("" + (list2.size() + 1));
+                    lsit4.get(i).setX(lsit4.get(i).getCoordinatex());
+                    lsit4.get(i).setY(lsit4.get(i).getCoordinatey());
+                    lsit4.get(i).setW(lsit4.get(i).getWide());
+                    lsit4.get(i).setH(lsit4.get(i).getHigh());
+                    lsit4.get(i).setDataName(lsit4.get(i).getListTitle());
                     list2.add(lsit4.get(i));
                 }
             }
@@ -155,7 +183,7 @@ public class BulletinCruxConfigServiceImpl extends AbstractCrudService<BulletinC
                 bulletinCruxConfigVo.setCoordinatey(list.get(i).getCoordinatey());
                 bulletinCruxConfigVo.setWide(list.get(i).getWide());
                 bulletinCruxConfigVo.setHigh(list.get(i).getHigh());
-//                bulletinCruxConfigVo.setIdx(""+(list2.size()+1));
+                bulletinCruxConfigVo.setDeviceId(list.get(i).getDeviceId());
                 bulletinCruxConfigVo.setColorType("iconText");
                 if (list.get(i).getDataType() == 1) {//普通文本
 

fiveep-service/src/main/java/com/bizmatics/service/impl/SysPlatformServiceImpl.java

@@ -192,8 +192,8 @@ public class SysPlatformServiceImpl extends AbstractCrudService<SysPlatformMappe
         SysPlatform sysPlatform = new SysPlatform();
         if(platformMenuVo.getPlatformId().intValue()==0){
             sysPlatform.setPlatformName(platformMenuVo.getPlatformName());
-            sysPlatform.setUpdateBy(SecurityUtils.getUser().getUserName());
-            sysPlatform.setUpdateTime(LocalDateTime.now());
+            sysPlatform.setCreateBy(SecurityUtils.getUser().getUserName());
+            sysPlatform.setCreateTime(LocalDateTime.now());
             this.save(sysPlatform);
             Integer fid = sysPlatform.getId();
             platformMenuVo.setPlatformId(fid.longValue());