10-09 数据质量探查部署

src/main/java/io/renren/modules/dataSet/controller/DynamicSystemController.java

@@ -35,6 +35,9 @@ public class DynamicSystemController {
     @PostMapping("/getContent")
     public  R getContent(@RequestBody Map map){
         final List equmentAll = dynamicSystemService.getEqumentLimit( map.get("hbaseTableName").toString(),100);
+        if (equmentAll.size() ==0) {
+            return R.error("TableNotFound");
+        }else
         return R.ok().put("equmentAll",equmentAll);
     }
 

src/main/java/io/renren/modules/dataSet/controller/SubsystemController.java

@@ -29,11 +29,25 @@ public class SubsystemController {
     @Autowired
     private SubsystemServiceImpl subsystemService;
 
-
+    //查询现有的煤矿数据
+    @RequestMapping("getcoal")
+    public R getCoal(@RequestBody Map map){
+        List getcoal = subsystemService.getcoal((Integer) map.get("userID"));
+//        return getcoal;
+//        System.out.println(getcoal);
+        return R.ok().put("info",getcoal);
+    }
+    //根据煤矿id 查询对应的系统
+    @RequestMapping("getfisystem")
+    public String getfiSystem(@RequestBody Map map){
+        String system = subsystemService.getSystem((Integer) map.get("coalid"),(Integer) map.get("userID"));
+        System.out.println(system);
+        return system;
+    }
     //根据系统ID 查询对应的子系统
     @RequestMapping("getsubSystem")
-    public String demo(){
-        String demo = subsystemService.demo();
+    public String demo(@RequestBody Map map){
+        String demo = subsystemService.getsubSystem((Integer) map.get("systemid"),(Integer) map.get("userID"));
         System.out.println("=====================================");
 //        System.out.println((Integer) map.get("systemid"));
 //        System.out.println(demo);
@@ -42,7 +56,7 @@ public class SubsystemController {
     //根据子系统id 查询对应的设备
     @RequestMapping("getequipment")
     public  String getequipment(@RequestBody Map map){
-        String equipment = subsystemService.getEquipment((Integer) map.get("subSystemid"));
+        String equipment = subsystemService.getEquipment((Integer) map.get("subSystemid"),(Integer) map.get("userID"));
 //        System.out.println((Integer) map.get("subSystemid"));
 //        System.out.println(equipment);
         return equipment;
@@ -51,7 +65,7 @@ public class SubsystemController {
     //    根据设备ID 查询对应的子设备
     @RequestMapping("getsubequipment")
     public String getsubequipment(@RequestBody Map map){
-        String subEquiment = subsystemService.getSubequipment((Integer) map.get("equipment"));
+        String subEquiment = subsystemService.getSubequipment((Integer) map.get("equipment"),(Integer) map.get("userID"));
         return subEquiment;
     }
 

src/main/java/io/renren/modules/dataSet/mapper/SubsystemMapper.java

@@ -4,7 +4,6 @@ package io.renren.modules.dataSet.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import io.renren.modules.dataSet.entity.Subsystem;
 import org.apache.ibatis.annotations.Mapper;
-import org.springframework.stereotype.Repository;
 
 import java.util.List;
 
@@ -18,8 +17,11 @@ import java.util.List;
  */
 @Mapper
 public interface SubsystemMapper extends BaseMapper<Subsystem> {
-    public List<Subsystem> subsystem();
-    public List<Subsystem> getEquipment(Integer id);
-    public List<Subsystem>  getSubequipment(Integer id);
+    public List<Subsystem> getsubsystem(Integer id,Integer userId);
+    public List<Subsystem> getEquipment(Integer id,Integer userId);
+    public List<Subsystem>  getSubequipment(Integer id,Integer userId);
     public List<Subsystem> getcolumns(Integer equpmentId);
+    public List<Subsystem>  getSystem( Integer id,Integer userId);
+    public List<Subsystem>  getcoal(Integer userid);
+
 }

src/main/java/io/renren/modules/dataSet/service/impl/DynamicSystemServiceImpl.java

@@ -78,8 +78,6 @@ public class DynamicSystemServiceImpl implements DynamicSystemService {
 
     @Override
     public List getContentTimeLimit(String hbaseTableName, Long start, Long end) {
-
-
         Connection connection = null;
         Table table = null;
 //        System.out.println(hbaseTableName);
@@ -99,14 +97,16 @@ public class DynamicSystemServiceImpl implements DynamicSystemService {
                     Cell cell = var8[var10];
                     String key = Bytes.toString(CellUtil.cloneQualifier(cell));
                     String value = Bytes.toString(CellUtil.cloneValue(cell));
-                    if (key.contains("after")) {
-                        map.put(key, value);
-                    }
-                    if (!map.containsKey("time")) {
-                        timestamp = cell.getTimestamp();
-                        String ss = format.format(timestamp);
-                        map.put("time", ss);
-                    }
+                        if (key.contains("after")) {
+                            map.put(key, value);
+                        }
+                        if (!map.containsKey("time")) {
+                            timestamp = cell.getTimestamp();
+                            String ss = format.format(timestamp);
+                            map.put("time", ss);
+                        }
+
+
 
                 }
                 equmentContextLists.add(map);
@@ -150,14 +150,16 @@ public class DynamicSystemServiceImpl implements DynamicSystemService {
                     Cell cell = var8[var10];
                     String key = Bytes.toString(CellUtil.cloneQualifier(cell));
                     String value = Bytes.toString(CellUtil.cloneValue(cell));
-                    if (key.contains("after")) {
-                        map.put(key, value);
-                    }
-                    if (!map.containsKey("time")) {
-                        timestamp = cell.getTimestamp();
-                        String ss = format.format(timestamp);
-                        map.put("time", ss);
-                    }
+                        if (key.contains("after")) {
+                            map.put(key, value);
+                        }
+                        if (!map.containsKey("time")) {
+                            timestamp = cell.getTimestamp();
+                            String ss = format.format(timestamp);
+                            map.put("time", ss);
+                        }
+
+
 
                 }
                 equmentContextLists.add(map);
@@ -180,14 +182,14 @@ public class DynamicSystemServiceImpl implements DynamicSystemService {
 
     @Override
     public List getEqumentHead_InMysql(Integer equipmentId) {
-        System.out.println("getEqumentHead_InMysql");
+//        System.out.println("getEqumentHead_InMysql");
         final List<Map<String, String>> getcolumns = subsystemService.getcolumns(equipmentId);
-        for (Map<String, String> getcolumn : getcolumns) {
-            for (String o : getcolumn.keySet()) {
-                System.out.println("key:" + o + "             value : " + getcolumn.get(o));
-            }
-        }
-        System.out.println(equipmentId);
+//        for (Map<String, String> getcolumn : getcolumns) {
+//            for (String o : getcolumn.keySet()) {
+//                System.out.println("key:" + o + "             value : " + getcolumn.get(o));
+//            }
+//        }
+//        System.out.println(equipmentId);
         return getcolumns;
 
     }
@@ -212,7 +214,7 @@ public class DynamicSystemServiceImpl implements DynamicSystemService {
                     Cell cell = var8[var10];
                     String key = Bytes.toString(CellUtil.cloneQualifier(cell));
                     String value = Bytes.toString(CellUtil.cloneValue(cell));
-                    if (key.contains("after")) {
+                    if (key.contains("after") ) {
                         map.put(key, value);
                     }
 
@@ -257,17 +259,19 @@ public class DynamicSystemServiceImpl implements DynamicSystemService {
                     Cell cell = var8[var10];
                     String key = Bytes.toString(CellUtil.cloneQualifier(cell));
                     String value = Bytes.toString(CellUtil.cloneValue(cell));
-                    if (key.contains("after")) {
-                        map.put(key, value);
-                    }
-                    if (!map.containsKey("time")){
-                        timestamp = cell.getTimestamp();
-                        String s = format.format(timestamp);
-                        map.put("time",s);
-                    }
+                        if (key.contains("after") ) {
+                            map.put(key, value);
+                        }
+                        if (!map.containsKey("time")){
+                            timestamp = cell.getTimestamp();
+                            String s = format.format(timestamp);
+                            map.put("time",s);
+                        }
+
+
 
                 }
-                equmentContextLists.add(map);
+                if (!map.isEmpty()) equmentContextLists.add(map);
             }
         } catch (IOException e) {
             e.printStackTrace();
@@ -275,14 +279,16 @@ public class DynamicSystemServiceImpl implements DynamicSystemService {
             if (table != null) {
                 try {
                     table.close();
+
                 } catch (IOException e) {
                     e.printStackTrace();
                 }
+
             }
+            return equmentContextLists;
         }
 
-//        equmentContextLists.forEach(System.out::println);
-        return equmentContextLists;
+
     }
 
     @Override
@@ -372,16 +378,17 @@ public class DynamicSystemServiceImpl implements DynamicSystemService {
             final Map<String, List<String>> equmentOneColumn = getEqumentOneColumn(hbaseTableName, chosedatas, limit);
             for (String chosedata : chosedatas) {
                 final List<String> strings = equmentOneColumn.get(chosedata);
-                for (int i = 0; i < 10 && i < strings.size(); i++) {
+                int max = Math.min(10,strings.size());
+                for (int i = 0; i < max; i++) {
                     final String s = strings.get(i);
                     final HashMap<String, Object> clumData = new HashMap<>();
                     clumData.put(subEquipmentID + "_" + chosedata, s);
-                    if (sign < 10) {
+                    if (sign < max) {
                         listMapSum.add(clumData);
                     } else {
-                        final Map map = listMapSum.get(sign % 10);
+                        final Map map = listMapSum.get(sign % max);
                         map.putAll(clumData);
-                        listMapSum.set(sign % 10, map);
+                        listMapSum.set(sign % max, map);
                     }
                     sign++;
                 }
@@ -403,16 +410,17 @@ public class DynamicSystemServiceImpl implements DynamicSystemService {
             final Map<String, List<String>> equmentOneColumn = getEqumentOneColumnTimeLimit(hbaseTableName, chosedatas, limit,start,end);
             for (String chosedata : chosedatas) {
                 final List<String> strings = equmentOneColumn.get(chosedata);
-                for (int i = 0; i < 10; i++) {
+                int max = Math.min(10,strings.size());
+                for (int i = 0; i < max; i++) {
                     final String s = strings.get(i);
                     final HashMap<String, Object> clumData = new HashMap<>();
                     clumData.put(subEquipmentID + "_" + chosedata, s);
-                    if (sign < 10) {
+                    if (sign < max) {
                         listMapSum.add(clumData);
                     } else {
-                        final Map map = listMapSum.get(sign % 10);
+                        final Map map = listMapSum.get(sign % max);
                         map.putAll(clumData);
-                        listMapSum.set(sign % 10, map);
+                        listMapSum.set(sign % max, map);
                     }
                     sign++;
                 }

src/main/java/io/renren/modules/dataSet/service/impl/SubsystemServiceImpl.java

@@ -33,29 +33,41 @@ public class SubsystemServiceImpl extends ServiceImpl<SubsystemMapper, Subsystem
     @Autowired
     private  SubsystemMapper subsystemMapper;
 
-    public  String demo(){
-        List<Subsystem> demo = subsystemMapper.subsystem();
+    public List getcoal(Integer userid){
+        List<Subsystem> getcoal = subsystemMapper.getcoal(userid);
+        String s = JSON.toJSONString(getcoal);
+        return getcoal;
+    }
+    public String getSystem(Integer id,Integer userId){
+        List<Subsystem> system = subsystemMapper.getSystem(id,userId);
+        String s = JSON.toJSONString(system);
+        return s;
+    }
+
+
+    public  String getsubSystem(Integer id,Integer userId){
+        List<Subsystem> demo = subsystemMapper.getsubsystem(id,userId);
         String s = JSON.toJSONString(demo);
         return s;
     }
 
-    public String getEquipment(Integer id){
-        List<Subsystem> equipment = subsystemMapper.getEquipment(id);
+    public String getEquipment(Integer id,Integer userId){
+        List<Subsystem> equipment = subsystemMapper.getEquipment(id,userId);
         String s = JSON.toJSONString(equipment);
         return s;
     }
 
-    public String getSubequipment(Integer id){
-        List<Subsystem> subequiment = subsystemMapper.getSubequipment(id);
+    public String getSubequipment(Integer id,Integer userId){
+        List<Subsystem> subequiment = subsystemMapper.getSubequipment(id,userId);
         String s = JSON.toJSONString(subequiment);
         return s;
     }
     public List getcolumns(Integer equpmentId){
-        System.out.println("getcolumns");
+//        System.out.println("getcolumns");
         List<Map<String,String>> equpmengColumnList = new ArrayList<>();
 
         List<Subsystem> getEqupmengColumns = subsystemMapper.getcolumns(equpmentId);
-        System.out.println(getEqupmengColumns.size());
+//        System.out.println(getEqupmengColumns.size());
         for (Subsystem equpmengColumn : getEqupmengColumns) {
             System.out.println(equpmengColumn);
             HashMap<String, String> equpmentMap = new HashMap<>();

src/main/java/io/renren/modules/sys/service/impl/DataSetDyServiceImpl.java

@@ -53,7 +53,7 @@ public class DataSetDyServiceImpl extends ServiceImpl<DataSetDyMapper, DataSetDy
         }
         Long categoryId = categoryService.getByName(classificationtag);
         //获取当前登录的用户,如果是管理员的话，uid就为null
-        Long uid = (Long) params.get("currentUserId");
+        Long uid = Long.parseLong((String) params.get("currentUserId"));
         List<DataSetDy_Vo> datasetInfo = new ArrayList<>();
         List<DataSetDy_Vo> datasetAllInfo = new ArrayList<>();
         int pageSize = Integer.valueOf((String) params.get("limit"));
@@ -66,6 +66,7 @@ public class DataSetDyServiceImpl extends ServiceImpl<DataSetDyMapper, DataSetDy
                         .eq(uid != null, "uid", uid)
                         .eq(classificationtag != null, "category_id", categoryId)
                 // 用于查询数据状态 区分动态和静态数据
+                        .orderByDesc("dataset_id")
 //                        .eq(params.get("status") != null, "dataset_status", 2)
 //                使用limit用于分页,下面的函数没有limit进行分页
                         .last("limit " + (pageIndex - 1) * pageSize + "," + pageSize + ";")

src/main/java/io/renren/modules/sys/service/impl/DataSetServiceImpl.java

@@ -53,7 +53,7 @@ public class DataSetServiceImpl extends ServiceImpl<DataSetMapper, DataSet>  imp
         }
         Long categoryId = categoryService.getByName(classificationtag);
         //获取当前登录的用户,如果是管理员的话，uid就为null
-        Long uid = (Long) params.get("currentUserId");
+        Long uid = Long.parseLong((String) params.get("currentUserId")) ;
         List<DataSet_Vo> datasetInfo = new ArrayList<>();
         List<DataSet_Vo> datasetAllInfo = new ArrayList<>();
         int pageSize = Integer.valueOf((String) params.get("limit"));
@@ -66,8 +66,10 @@ public class DataSetServiceImpl extends ServiceImpl<DataSetMapper, DataSet>  imp
                         .eq(uid != null, "uid", uid)
                         .eq(classificationtag != null, "category_id", categoryId)
                         .eq(params.get("status") != null, "dataset_status", status)
+                        .orderByDesc("dataset_id")
 //                使用limit用于分页,下面的函数没有limit进行分页
                         .last("limit " + (pageIndex - 1) * pageSize + "," + pageSize + ";")
+
         );
 
         //用于查全部，获取总页数。

src/main/resources/application-dev.yml

@@ -40,12 +40,12 @@ dynamic:
   datasource:
     bigData:
 #      url: jdbc:mysql://112.126.68.148:6033/hebing?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useSSL=false
-#        url: jdbc:mysql://localhost:3306/bigdata_sgwtest?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useSSL=false&allowPublicKeyRetrieval=true
-        url: jdbc:mysql://localhost:3306/hebing?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useSSL=false&allowPublicKeyRetrieval=true
+        url: jdbc:mysql://lab2:6033/bigdata_sgwtest?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useSSL=false&allowPublicKeyRetrieval=true
+#        url: jdbc:mysql://localhost:3306/hebing?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useSSL=false&allowPublicKeyRetrieval=true
         username: root
-#      password: XDUbdm520Mysql
+        password: XDU520bdm
 #        password: root
-        password: 123456
+#        password: 123456
         driver-class-name: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置
 server:
     port: 8082

src/main/resources/mapper/dataSet/SubsystemMapper.xml

@@ -1,9 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="io.renren.modules.dataSet.mapper.SubsystemMapper">
+    <select id="getcoal" resultType="io.renren.modules.dataSet.entity.Subsystem">
+        select id,substring(name,5) as name from coal
+        WHERE coal.uid = #{userId,jdbcType=INTEGER}
+    </select>
+
 
-    <select id="subsystem" resultType="io.renren.modules.dataSet.entity.Subsystem">
-        SELECT id,substring(name,5)  as name  FROM subSystem
+    <select id="getSystem" resultType="io.renren.modules.dataSet.entity.Subsystem">
+        SELECT id,substring(name,5)  as name  FROM `system`
+        WHERE id IN(
+            SELECT coal_system.sid FROM coal,coal_system
+            WHERE coal.id = coal_system.cid
+              AND coal.id =#{id,jdbcType=INTEGER}
+        )
+        AND `system`.uid = #{userId,jdbcType=INTEGER}
+    </select>
+    <select id="getsubsystem" resultType="io.renren.modules.dataSet.entity.Subsystem">
+--         SELECT id,substring(name,5)  as name  FROM subSystem
+            SELECT id,substring(name,5)  as name  FROM subsystem
+            WHERE id IN(
+                SELECT system_subsystem.subSystemId FROM `system`,system_subsystem
+                WHERE `system`.id = system_subsystem.systemId
+                  AND `system`.id =#{id,jdbcType=INTEGER}
+            )
+            AND subsystem.uid = #{userId,jdbcType=INTEGER}
     </select>
 
     <select id="getEquipment" resultType="io.renren.modules.dataSet.entity.Subsystem">
@@ -21,6 +42,7 @@
                   AND
                     subSystem.id =#{id,jdbcType=INTEGER}
             )
+          AND equipment.uid = #{userId,jdbcType=INTEGER}
     </select>
 
     <select id="getSubequipment" resultType="io.renren.modules.dataSet.entity.Subsystem">
@@ -35,6 +57,7 @@
               AND
                 equipment.id =#{id,jdbcType=INTEGER}
         )
+          AND subEquipment.uid = #{userId,jdbcType=INTEGER}
     </select>
 
 
@@ -53,5 +76,6 @@
                     WHERE
                             subEquipment_measurePoint.subEquipmentId = #{equpmentId,jdbcType=INTEGER}
                 )
+        AND measurePoint.delete =0
     </select>
 </mapper>