dev

kgraph-admin/src/main/java/com/kgraph/web/controller/BreakdownController.java

@@ -140,6 +140,16 @@ public class BreakdownController extends BaseController
         return success(breakdownService.getAirplaneModelCountByMonth(date));
     }
 
+    /**
+     * 根据月份获取专业故障数
+     * @param date 年-月
+     */
+    @GetMapping(value = "/getUnitCountByMonth/{date}")
+    public AjaxResult getUnitCountByMonth(@PathVariable String date)
+    {
+        return success(breakdownService.getUnitCountByMonth(date));
+    }
+
     /**
      * 根据月份获取专业故障数
      * @param date 年-月

kgraph-admin/src/main/java/com/kgraph/web/mapper/BreakdownMapper.java

@@ -102,4 +102,6 @@ public interface BreakdownMapper
      * 获取未修理完成数据
      */
     public List<Breakdown> getBreakdownSchedule();
+
+    List getUnitCountByMonth(String date);
 }

kgraph-admin/src/main/java/com/kgraph/web/service/IBreakdownService.java

@@ -81,6 +81,13 @@ public interface IBreakdownService
      */
     public List getMajorCountByMonth(String date);
 
+    /**
+     * 根据月份获取故障件数
+     * @param date 年-月
+     * @return
+     */
+    List getUnitCountByMonth(String date);
+
     /**
      * 获取所有飞机状态
      * @return
@@ -104,4 +111,5 @@ public interface IBreakdownService
      * 获取未修理完成数据
      */
     public List<Breakdown> getBreakdownSchedule();
+
 }

kgraph-admin/src/main/java/com/kgraph/web/service/impl/BreakdownServiceImpl.java

@@ -138,6 +138,11 @@ public class BreakdownServiceImpl implements IBreakdownService
         return breakdownMapper.getMajorCountByMonth(date);
     }
 
+    @Override
+    public List getUnitCountByMonth(String date) {
+        return breakdownMapper.getUnitCountByMonth(date);
+    }
+
     /**
      * 获取所有飞机状态
      * @return
@@ -173,4 +178,5 @@ public class BreakdownServiceImpl implements IBreakdownService
     public List<Breakdown> getBreakdownSchedule(){
         return breakdownMapper.getBreakdownSchedule();
     }
+
 }

kgraph-admin/src/main/resources/mapper/showInfo/BreakdownMapper.xml

@@ -219,6 +219,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         GROUP BY major
     </select>
 
+    <select id="getUnitCountByMonth" resultType="Map" parameterType="String">
+        SELECT
+            breakdown_unit_name `name`,
+            count(*) `value`
+        FROM
+            t_breakdown
+        WHERE
+        <choose>
+            <when test="name != null">DATE_FORMAT( discovery_date, '%Y-%m' ) = #{value} </when>
+            <otherwise>
+                DATE_FORMAT( discovery_date, '%Y-%m' ) = DATE_FORMAT( now(), '%Y-%m' )
+            </otherwise>
+        </choose>
+        GROUP BY breakdown_unit_name
+    </select>
+
     <select id="getAircraftStatus" resultType="Map" parameterType="String">
         SELECT
             am.air_number airNumber,

kgraph-common/src/main/java/com/kgraph/common/utils/DateUtils.java

@@ -30,7 +30,8 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
     private static String[] parsePatterns = {
             "yyyy-MM-dd", "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm", "yyyy-MM", 
             "yyyy/MM/dd", "yyyy/MM/dd HH:mm:ss", "yyyy/MM/dd HH:mm", "yyyy/MM",
-            "yyyy.MM.dd", "yyyy.MM.dd HH:mm:ss", "yyyy.MM.dd HH:mm", "yyyy.MM"};
+            "yyyy.MM.dd", "yyyy.MM.dd HH:mm:ss", "yyyy.MM.dd HH:mm", "yyyy.MM",
+            "yyyy-MM-dd HH:mm:ss.S", "yyyy/MM/dd HH:mm:ss.S", "yyyy.MM.dd HH:mm:ss.S"};
 
     /**
      * 获取当前Date型日期

kgraph-graph/src/main/java/com/kgraph/graph/neo4j/controller/KgController.java

@@ -96,7 +96,8 @@ public class KgController extends BaseController {
 
     @GetMapping("/question")
     public AjaxResult question(@RequestParam("text") String question) {
-        String result = kgService.question(question);
+//        String result = kgService.question(question);
+        String result = "question\n123\n456\n789";
         QuestionRecord questionRecord = new QuestionRecord();
         questionRecord.setQuestion(question);
         questionRecord.setResult(result);

sql/update20230523.sql

@@ -50,20 +50,33 @@ CREATE TABLE t_build_entity_relation (
 PRIMARY KEY ( id )
 ) ENGINE = INNODB auto_increment = 1 COMMENT = '实体构建表';
 
-DROP TABLE
-IF
-	EXISTS t_build_flow;
-CREATE TABLE t_build_flow (
-	id BIGINT ( 20 ) NOT NULL auto_increment COMMENT '序号',
-	error_code VARCHAR ( 64 ) DEFAULT '' COMMENT '故障编码',
-	flow_encode VARCHAR ( 1023 ) DEFAULT '' COMMENT '流程数据',
-	flow_tree_json TINYTEXT COMMENT '流程树json',
-	create_by VARCHAR ( 64 ) DEFAULT '' COMMENT '创建者',
-	create_time datetime COMMENT '创建时间',
-	update_by VARCHAR ( 64 ) DEFAULT '' COMMENT '更新者',
-	update_time datetime COMMENT '更新时间',
-PRIMARY KEY ( id )
-) ENGINE = INNODB COMMENT = '构建流程';
+DROP TABLE IF EXISTS `t_check_piont`;
+CREATE TABLE `t_check_piont`  (
+  `id` bigint NOT NULL AUTO_INCREMENT COMMENT '序号',
+  `code` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '编码',
+  `check_piont` varchar(1023) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '检查点',
+  `create_by` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '创建者',
+  `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
+  `update_by` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '更新者',
+  `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '检查点管理' ROW_FORMAT = Dynamic;
+
+DROP TABLE IF EXISTS `t_build_flow`;
+CREATE TABLE `t_build_flow`  (
+  `id` bigint NOT NULL AUTO_INCREMENT COMMENT '序号',
+  `sub_task_id` bigint NULL DEFAULT NULL COMMENT '子任务id',
+  `error_appearance` varchar(128) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '故障现象',
+  `error_code` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '故障编码',
+  `flow_encode` varchar(1023) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '排故流程数据编码',
+  `flow_tree_json` tinytext CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '流程树json',
+  `create_by` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '创建者',
+  `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
+  `update_by` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '更新者',
+  `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '构建流程' ROW_FORMAT = Dynamic;
+
 
 DROP TABLE
 IF

sql/update20230602.sql

@@ -0,0 +1,28 @@
+use kgraph;
+
+DROP TABLE IF EXISTS `t_check_piont`;
+CREATE TABLE `t_check_piont`  (
+  `id` bigint NOT NULL AUTO_INCREMENT COMMENT '序号',
+  `code` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '编码',
+  `check_piont` varchar(1023) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '检查点',
+  `create_by` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '创建者',
+  `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
+  `update_by` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '更新者',
+  `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '检查点管理' ROW_FORMAT = Dynamic;
+
+DROP TABLE IF EXISTS `t_build_flow`;
+CREATE TABLE `t_build_flow`  (
+  `id` bigint NOT NULL AUTO_INCREMENT COMMENT '序号',
+  `sub_task_id` bigint NULL DEFAULT NULL COMMENT '子任务id',
+  `error_appearance` varchar(128) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '故障现象',
+  `error_code` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '故障编码',
+  `flow_encode` varchar(1023) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '排故流程数据编码',
+  `flow_tree_json` tinytext CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '流程树json',
+  `create_by` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '创建者',
+  `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
+  `update_by` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '更新者',
+  `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '构建流程' ROW_FORMAT = Dynamic;