Browse Source

2025 4 22

xyh 1 month ago
parent
commit
4d4f946e01

+ 2 - 0
application-webadmin/src/main/java/com/orangeforms/webadmin/WebAdminApplication.java

@@ -6,6 +6,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.scheduling.annotation.EnableScheduling;
 
 /**
  * 应用服务启动类。
@@ -14,6 +15,7 @@ import org.springframework.scheduling.annotation.EnableAsync;
  * @date 2021-06-06
  */
 @EnableAsync
+@EnableScheduling   // 启用定时任务
 @SpringBootApplication(exclude = {DataSourceAutoConfiguration.class})
 @ComponentScan("com.orangeforms")
 @MapperScan("com.orangeforms.common.online.table.dao")

+ 43 - 0
application-webadmin/src/main/java/com/orangeforms/webadmin/situation/controller/fireController.java

@@ -0,0 +1,43 @@
+package com.orangeforms.webadmin.situation.controller;
+
+import com.orangeforms.webadmin.situation.model.center;
+import com.orangeforms.webadmin.situation.model.fightUnit;
+import com.orangeforms.webadmin.situation.model.satellite;
+import com.orangeforms.webadmin.situation.model.situation;
+import com.orangeforms.webadmin.situation.service.fireService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@Slf4j
+@RestController
+@RequestMapping("/admin/situation")
+public class fireController {
+
+    @Autowired
+    private fireService FireService;
+
+    @GetMapping("/center")
+    public List<center> getCenter(){
+        return FireService.getAllCenter();
+    }
+
+    @GetMapping("/unit")
+    public List<fightUnit> getUnit(){
+        return FireService.getAllUnit();
+    }
+
+    @GetMapping("/satellite")
+    public List<satellite> getSatellite(){
+        return FireService.getAllSatellite();
+    }
+
+    @GetMapping("/situation")
+    public List<situation> getSituation(){
+        return FireService.getAllSituation();
+    }
+}

+ 27 - 0
application-webadmin/src/main/java/com/orangeforms/webadmin/situation/dao/fireMapper.java

@@ -0,0 +1,27 @@
+package com.orangeforms.webadmin.situation.dao;
+
+import com.orangeforms.webadmin.situation.model.center;
+import com.orangeforms.webadmin.situation.model.fightUnit;
+import com.orangeforms.webadmin.situation.model.satellite;
+import com.orangeforms.webadmin.situation.model.situation;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+@Mapper
+public interface fireMapper {
+
+    @Select("SELECT * FROM model_xd")
+    List<situation> getAllSituation();
+
+    @Select("SELECT * FROM model_unit")
+    List<fightUnit> getAllUnit();
+
+    @Select("SELECT * FROM model_center")
+    List<center> getAllCenter();
+
+    @Select("SELECT * FROM model_satellite")
+    List<satellite> getAllSatellite();
+
+}

+ 60 - 0
application-webadmin/src/main/java/com/orangeforms/webadmin/situation/model/center.java

@@ -0,0 +1,60 @@
+package com.orangeforms.webadmin.situation.model;
+
+
+import cn.hutool.core.date.DateTime;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+
+/**
+ * 指挥中心实体对象。
+ *
+ */
+@Data
+@TableName(value = "model_center")
+public class center {
+
+    /**
+     * Id。
+     */
+    @TableField(value = "id")
+    private Long centerId;
+
+    /**
+     * 指挥中心编号
+     */
+    @TableField(value = "number")
+    private String centerNumber;
+
+    /**
+     * 指挥中心型号
+     */
+    @TableField(value = "type")
+    private String centerType;
+
+
+    /**
+     * 指挥中心高度
+     */
+    @TableField(value = "h")
+    private Double centerHeight;
+
+    /**
+     * 指挥中心经度
+     */
+    @TableField(value = "lon")
+    private Double centerLon;
+
+    /**
+     * 指挥中心纬度
+     */
+    @TableField(value = "lat")
+    private Double centerLat;
+
+    /**
+     * 贴图文件
+     */
+    @TableField(value = "picture")
+    private String centerPicture;
+
+
+}

+ 117 - 0
application-webadmin/src/main/java/com/orangeforms/webadmin/situation/model/fightUnit.java

@@ -0,0 +1,117 @@
+package com.orangeforms.webadmin.situation.model;
+
+
+import cn.hutool.core.date.DateTime;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+
+/**
+ * 作战单元实体对象。
+ *
+ */
+@Data
+@TableName(value = "model_unit")
+public class fightUnit {
+
+    /**
+     * Id。
+     */
+    @TableField(value = "id")
+    private Long unitId;
+
+    /**
+     * 作战单元型号。
+     */
+    @TableField(value = "name")
+    private String unitName;
+
+    /**
+     * 作战单元类型
+     */
+    @TableField(value = "type")
+    private String unitType;
+
+    /**
+     * 作战单元归属
+     */
+    @TableField(value = "belong")
+    private String unitBelong;
+
+    /**
+     * 作战单元健康度
+     */
+    @TableField(value = "health")
+    private Integer unitHealth;
+
+    /**
+     * 作战单元目标id
+     */
+    @TableField(value = "target")
+    private String unitTarget;
+
+    /**
+     * 作战单元所属编队
+     */
+    @TableField(value = "team")
+    private String unitTeam;
+
+    /**
+     * 作战单元任务意图
+     */
+    @TableField(value = "task")
+    private String unitTask;
+
+    /**
+     * 作战单元高度
+     */
+    @TableField(value = "height")
+    private String unitHeight;
+
+    /**
+     * 作战单元经度
+     */
+    @TableField(value = "lon")
+    private String unitLon;
+
+    /**
+     * 作战单元纬度
+     */
+    @TableField(value = "lat")
+    private String unitLat;
+
+    /**
+     * 作战单元搭载的运动模拟器id
+     */
+    @TableField(value = "component_movementid")
+    private String unitComponentMovementId;
+
+    /**
+     * 作战单元搭载的运动模拟器json
+     */
+    @TableField(value = "component_movementjson")
+    private String unitComponentMovementJson;
+
+    /**
+     * 作战单元搭载的其他模型数量
+     */
+    @TableField(value = "components_cnt")
+    private Integer unitComponentsCnt;
+
+    /**
+     * 作战单元搭载的各模型id
+     */
+    @TableField(value = "components_ids")
+    private String unitComponentsIds;
+
+    /**
+     * 作战单元模型ison
+     */
+    @TableField(value = "components_json")
+    private String unitComponentsJson;
+
+    /**
+     * 作战单元json
+     */
+    @TableField(value = "unit_json")
+    private String unitJson;
+}

+ 125 - 0
application-webadmin/src/main/java/com/orangeforms/webadmin/situation/model/satellite.java

@@ -0,0 +1,125 @@
+package com.orangeforms.webadmin.situation.model;
+
+
+import cn.hutool.core.date.DateTime;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 预警卫星实体对象。
+ *
+ */
+@Data
+@TableName(value = "model_satellite")
+public class satellite {
+
+    /**
+     * Id。
+     */
+    @TableField(value = "id")
+    private Long unitId;
+
+    /**
+     * 预警卫星编号。
+     */
+    @TableField(value = "number")
+    private String satelliteNumber;
+
+    /**
+     * 预警卫星型号
+     */
+    @TableField(value = "type")
+    private String satelliteType;
+
+    /**
+     * 预警卫星配置类型
+     */
+    @TableField(value = "config_type")
+    private String satelliteConfigType;
+
+    /**
+     * 卫星轨道半长轴
+     */
+    @TableField(value = "common_semiMajorAxis")
+    private Double commonSemiMajorAxis;
+
+    /**
+     * 卫星轨道偏心率
+     */
+    @TableField(value = "common_eccentricity")
+    private Double commonEccentricity;
+
+    /**
+     * 卫星轨道倾角
+     */
+    @TableField(value = "common_inclination")
+    private Double commonInclination;
+
+    /**
+     * 卫星轨道升交点赤经
+     */
+    @TableField(value = "common_RAAN")
+    private Double commonRAAN;
+
+    /**
+     * 卫星轨道近心点幅角
+     */
+    @TableField(value = "common_argofperiapsis")
+    private Double commonArgofperiapsis;
+
+    /**
+     * 卫星轨道真近点角
+     */
+    @TableField(value = "common_trueanomaly")
+    private Double commonTrueanomaly;
+
+    /**
+     * 卫星时序数据路径
+     */
+    @TableField(value = "CSV_path")
+    private String CSVpath;
+
+    /**
+     * 卫星时序数据开始时间
+     */
+    @TableField(value = "CSV_starttime")
+    private Date CSVstarttime;
+
+    /**
+     * 卫星时序数据结束时间
+     */
+    @TableField(value = "CSV_endtime")
+    private Date CSVendtime;
+
+    /**
+     * 采样时间
+     */
+    @TableField(value = "CSV_sampletime")
+    private Double CSVsampletime;
+
+    /**
+     * TLE文件路径
+     */
+    @TableField(value = "TLE_path")
+    private String TLEpath;
+
+    /**
+     * TLE轨道计算模型
+     */
+    @TableField(value = "TLE_Propagator")
+    private String TLEPropagator;
+
+    /**
+     * TLE or 六行根
+     */
+    @TableField(value = "mark")
+    private Integer mark;
+
+    /**
+     * 贴图文件
+     */
+    @TableField(value = "picture")
+    private String picture;
+}

+ 89 - 0
application-webadmin/src/main/java/com/orangeforms/webadmin/situation/model/situation.java

@@ -0,0 +1,89 @@
+package com.orangeforms.webadmin.situation.model;
+
+
+import cn.hutool.core.date.DateTime;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 场景想定实体对象。
+ *
+ */
+@Data
+@TableName(value = "model_xd")
+public class situation {
+
+    /**
+     * Id。
+     */
+    @TableId(value = "id")
+    private Long situationId;
+
+    /**
+     * 场景想定类型。
+     */
+    @TableId(value = "type")
+    private String situationType;
+
+    /**
+     * 场景想定创建人。
+     */
+    @TableId(value = "creator")
+    private String situationCreator;
+
+    /**
+     *
+     */
+    @TableId(value = "createtime")
+    private String situationCreateTime;
+
+    /**
+     * 场景想定名称。
+     */
+    @TableId(value = "xdname")
+    private String situationName;
+
+    /**
+     * 场景想定开始时间。
+     */
+    @TableId(value = "starttime")
+    private Date situationStartTime;
+
+    /**
+     * 场景想定结束时间。
+     */
+    @TableId(value = "endtime")
+    private Date situationEndTime;
+
+    /**
+     * 场景想定步长。
+     */
+    @TableId(value = "steptime")
+    private Double situationStepTime;
+
+    /**
+     * 场景想定蓝方单元数。
+     */
+    @TableId(value = "bluecnt")
+    private Integer situationBlueCnt;
+
+    /**
+     * 场景想定蓝方作战单元。
+     */
+    @TableId(value = "blueunit")
+    private String situationBlueUnit;
+
+    /**
+     * 场景想定红方单元数。
+     */
+    @TableId(value = "redcnt")
+    private Integer situationRedCnt;
+
+    /**
+     * 场景想定蓝方作战单元。
+     */
+    @TableId(value = "redunit")
+    private String situationRedUnit;
+}

+ 42 - 0
application-webadmin/src/main/java/com/orangeforms/webadmin/situation/service/Impl/fireServiceImpl.java

@@ -0,0 +1,42 @@
+package com.orangeforms.webadmin.situation.service.Impl;
+
+import com.orangeforms.webadmin.situation.dao.fireMapper;
+import com.orangeforms.webadmin.situation.model.center;
+import com.orangeforms.webadmin.situation.model.fightUnit;
+import com.orangeforms.webadmin.situation.model.satellite;
+import com.orangeforms.webadmin.situation.model.situation;
+import com.orangeforms.webadmin.situation.service.fireService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class fireServiceImpl implements fireService {
+    @Autowired
+    private fireMapper FireMapper;
+
+    @Override
+    public List<center> getAllCenter(){
+        List<center> centerList = FireMapper.getAllCenter();
+        return centerList;
+    }
+
+    @Override
+    public List<fightUnit> getAllUnit(){
+        List<fightUnit> unitList = FireMapper.getAllUnit();
+        return unitList;
+    }
+
+    @Override
+    public List<satellite> getAllSatellite(){
+        List<satellite> satelliteList = FireMapper.getAllSatellite();
+        return satelliteList;
+    }
+
+    @Override
+    public List<situation> getAllSituation(){
+        List<situation> situationList = FireMapper.getAllSituation();
+        return situationList;
+    }
+}

+ 19 - 0
application-webadmin/src/main/java/com/orangeforms/webadmin/situation/service/fireService.java

@@ -0,0 +1,19 @@
+package com.orangeforms.webadmin.situation.service;
+
+import com.orangeforms.webadmin.situation.model.center;
+import com.orangeforms.webadmin.situation.model.fightUnit;
+import com.orangeforms.webadmin.situation.model.satellite;
+import com.orangeforms.webadmin.situation.model.situation;
+
+import java.util.List;
+
+public interface fireService {
+
+    List<center> getAllCenter();
+
+    List<satellite> getAllSatellite();
+
+    List<situation> getAllSituation();
+
+    List<fightUnit> getAllUnit();
+}

+ 7 - 8
application-webadmin/src/main/resources/application.yml

@@ -79,16 +79,15 @@ redis:
     # master-slave:
     #   每个节点逗号分隔,第一个为主节点,其余为从节点。同时每个节点前必须以redis://开头。
     #   address: redis://localhost:6379,redis://localhost:6378,...
-    address: redis://180.76.231.231:9736
-    database: 2
+    address: redis://localhost:9376
+    #    address: redis://localhost:6379
     # 链接超时,单位毫秒。
     timeout: 6000
-#    database: 1
     # 单位毫秒。分布式锁的超时检测时长。
     # 如果一次锁内操作超该毫秒数,或在释放锁之前异常退出,Redis会在该时长之后主动删除该锁使用的key。
     lockWatchdogTimeout: 60000
     # redis 密码,空可以不填。
-    password: sunhaobo
+    password: xyh20000101
     pool:
       # 连接池数量。
       poolSize: 20
@@ -172,9 +171,9 @@ spring:
     type: com.alibaba.druid.pool.DruidDataSource
     druid:
       main:
-        url: jdbc:mysql://43.143.221.128:6033/zzdemo_develop?characterEncoding=utf8&useSSL=true&serverTimezone=Asia/Shanghai
+        url: jdbc:mysql://127.0.0.1:3306/zzdemo_develop?characterEncoding=utf8&useSSL=true&serverTimezone=Asia/Shanghai
         username: root
-        password: XDUxdu2022
+        password: 20000101
       driver-class-name: com.mysql.cj.jdbc.Driver
       #driver-class-name: com.dm.jdbc.driver.DmDriver
       name: application-webadmin
@@ -233,9 +232,9 @@ spring:
     type: com.alibaba.druid.pool.DruidDataSource
     druid:
       main:
-        url: jdbc:mysql://43.143.221.128:6033/zzdemo_develop?characterEncoding=utf8&useSSL=true&serverTimezone=Asia/Shanghai
+        url: jdbc:mysql://127.0.0.1:3306/zzdemo_develop?characterEncoding=utf8&useSSL=true&serverTimezone=Asia/Shanghai
         username: root
-        password: XDUxdu2022
+        password: 20000101
       driver-class-name: com.mysql.cj.jdbc.Driver
       #driver-class-name: com.dm.jdbc.driver.DmDriver
       name: application-webadmin

+ 5 - 0
application-webadmin/src/test/java/com/orangeforms/webadmin/TableMapperTest.java

@@ -35,6 +35,11 @@ public class TableMapperTest {
         System.out.println(i);
     }
 
+    @Test
+    public void add() {
+
+        System.out.println("6666666");
+    }
     @Test
     public void updateDataByTableName() {
         HashMap<String, Object> data = new HashMap<>();

+ 17 - 0
pom.xml

@@ -47,6 +47,23 @@
     </modules>
 
     <dependencies>
+        <dependency>
+            <groupId>org.flowable</groupId>
+            <artifactId>flowable-spring-boot-starter</artifactId>
+            <version>6.6.0</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.liquibase</groupId>
+                    <artifactId>liquibase-core</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.liquibase</groupId>
+            <artifactId>liquibase-core</artifactId>
+            <version>4.5.0</version>
+        </dependency>
+
         <!--web 模块-->
         <dependency>
             <groupId>org.springframework.boot</groupId>