feat: 1.分析算法提交

jeecg-module-system/src/main/java/org/jeecg/codegenerate/CodeGenerate.java

@@ -25,11 +25,11 @@ public class CodeGenerate {
         String outputDir = projectPath + "\\jeecg-module-system\\src\\main\\java\\";
 
         // 模块名
-        String moduleName = "dynamicStaticAnalysis";
+        String moduleName = "checkData.equipmentCheckData";
 
         // 表名
         String[] tables = {
-                "t_dsa_analysis_batch_unit_device_tqi_score",
+                "t_djt_movement_additive_info_unit_device_map",
         };
 
 

jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/entity/MovementAdditiveInfoUnitDeviceMap.java

+package org.jeecg.modules.checkData.equipmentCheckData.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 动静态几何尺寸对应的添乘仪详情表
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-08-31
+ */
+@Getter
+@Setter
+@TableName("t_djt_movement_additive_info_unit_device_map")
+@ApiModel(value = "MovementAdditiveInfoUnitDeviceMap对象", description = "动静态几何尺寸对应的添乘仪详情表")
+public class MovementAdditiveInfoUnitDeviceMap implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    @TableId("id")
+    private String id;
+
+    @ApiModelProperty("创建人")
+    @TableField("create_by")
+    private String createBy;
+
+    @ApiModelProperty("创建日期")
+    @TableField("create_time")
+    private Date createTime;
+
+    @ApiModelProperty("更新人")
+    @TableField("update_by")
+    private String updateBy;
+
+    @ApiModelProperty("更新时间")
+    @TableField("update_time")
+    private Date updateTime;
+
+    @ApiModelProperty("动静态几何尺寸数据主表主键-》外键")
+    @TableField("movement_master_id")
+    private String movementMasterId;
+
+    @ApiModelProperty("设备单元id")
+    @TableField("unit_id")
+    private String unitId;
+
+    @ApiModelProperty("设备单元编码")
+    @TableField("unit_code")
+    private String unitCode;
+
+    @ApiModelProperty("设备单元编码")
+    @TableField("unit_device_code")
+    private String unitDeviceCode;
+
+    @ApiModelProperty("设备单元类型1-钢轨,2-曲线,3-竖曲线,4-道岔")
+    @TableField("unit_type")
+    private Integer unitType;
+
+    @ApiModelProperty("设备单元类型名称")
+    @TableField("unit_type_name")
+    private String unitTypeName;
+
+    @ApiModelProperty("设备单元起始里程")
+    @TableField("unit_start_mileage")
+    private BigDecimal unitStartMileage;
+
+    @ApiModelProperty("设备单元中心里程")
+    @TableField("unit_center_mileage")
+    private BigDecimal unitCenterMileage;
+
+    @ApiModelProperty("设备单元终点里程")
+    @TableField("unit_end_mileage")
+    private BigDecimal unitEndMileage;
+
+    @ApiModelProperty("测点里程")
+    @TableField("point_mileage")
+    private BigDecimal pointMileage;
+
+    @ApiModelProperty("水平加速度")
+    @TableField("zontal_speed")
+    private BigDecimal zontalSpeed;
+
+    @ApiModelProperty("水平加速度等级")
+    @TableField("zontal_speed_level")
+    private Integer zontalSpeedLevel;
+
+    @ApiModelProperty("垂直加速度")
+    @TableField("vertical_speed")
+    private BigDecimal verticalSpeed;
+
+    @ApiModelProperty("垂直加速度等级")
+    @TableField("vertical_speed_level")
+    private Integer verticalSpeedLevel;
+
+    @ApiModelProperty("速度")
+    @TableField("speed")
+    private BigDecimal speed;
+
+    @ApiModelProperty("手动标记")
+    @TableField("mark")
+    private String mark;
+
+    @ApiModelProperty("是否删除（0：未删除；1：已删除）")
+    @TableField("del_flag")
+    private String delFlag;
+
+    @ApiModelProperty("排序字段")
+    @TableField("info_sort")
+    private Integer infoSort;
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/mapper/MovementAdditiveInfoUnitDeviceMapMapper.java

+package org.jeecg.modules.checkData.equipmentCheckData.mapper;
+
+import org.jeecg.modules.checkData.equipmentCheckData.entity.MovementAdditiveInfoUnitDeviceMap;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 动静态几何尺寸对应的添乘仪详情表 Mapper 接口
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-08-31
+ */
+public interface MovementAdditiveInfoUnitDeviceMapMapper extends BaseMapper<MovementAdditiveInfoUnitDeviceMap> {
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/mapper/xml/MovementAdditiveInfoUnitDeviceMapMapper.xml

+<?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="org.jeecg.modules.checkData.equipmentCheckData.mapper.MovementAdditiveInfoUnitDeviceMapMapper">
+
+</mapper>

jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/service/IMovementAdditiveInfoUnitDeviceMapService.java

+package org.jeecg.modules.checkData.equipmentCheckData.service;
+
+import org.jeecg.modules.checkData.equipmentCheckData.entity.MovementAdditiveInfoUnitDeviceMap;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 动静态几何尺寸对应的添乘仪详情表 服务类
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-08-31
+ */
+public interface IMovementAdditiveInfoUnitDeviceMapService extends IService<MovementAdditiveInfoUnitDeviceMap> {
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/service/impl/MovementAdditiveInfoUnitDeviceMapServiceImpl.java

+package org.jeecg.modules.checkData.equipmentCheckData.service.impl;
+
+import org.jeecg.modules.checkData.equipmentCheckData.entity.MovementAdditiveInfoUnitDeviceMap;
+import org.jeecg.modules.checkData.equipmentCheckData.mapper.MovementAdditiveInfoUnitDeviceMapMapper;
+import org.jeecg.modules.checkData.equipmentCheckData.service.IMovementAdditiveInfoUnitDeviceMapService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 动静态几何尺寸对应的添乘仪详情表 服务实现类
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-08-31
+ */
+@Service
+public class MovementAdditiveInfoUnitDeviceMapServiceImpl extends ServiceImpl<MovementAdditiveInfoUnitDeviceMapMapper, MovementAdditiveInfoUnitDeviceMap> implements IMovementAdditiveInfoUnitDeviceMapService {
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/entity/AnalysisBatchUnitDevicePointScore.java

@@ -97,7 +97,7 @@ public class AnalysisBatchUnitDevicePointScore implements Serializable {
 
     @ApiModelProperty("测点值")
     @TableField("point_value")
-    private Double pointValue;
+    private BigDecimal pointValue;
 
     @ApiModelProperty("测点得分")
     @TableField("point_score")

jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/entity/AnalysisBatchUnitDeviceWork.java

+package org.jeecg.modules.dynamicStaticAnalysis.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 动静态分析-分析批次-单元设备派工表
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-08-30
+ */
+@Getter
+@Setter
+@TableName("t_dsa_analysis_batch_unit_device_work")
+@ApiModel(value = "AnalysisBatchUnitDeviceWork对象", description = "动静态分析-分析批次-单元设备派工表")
+public class AnalysisBatchUnitDeviceWork implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    @TableId("id")
+    private String id;
+
+    @ApiModelProperty("创建人")
+    @TableField("create_by")
+    private String createBy;
+
+    @ApiModelProperty("创建日期")
+    @TableField("create_time")
+    private Date createTime;
+
+    @ApiModelProperty("更新人")
+    @TableField("update_by")
+    private String updateBy;
+
+    @ApiModelProperty("更新时间")
+    @TableField("update_time")
+    private Date updateTime;
+
+    @ApiModelProperty("分析批次单元设备id")
+    @TableField("analysis_batch_unit_device_id")
+    private String analysisBatchUnitDeviceId;
+
+    @ApiModelProperty("分析批次号")
+    @TableField("analysis_batch_code")
+    private String analysisBatchCode;
+
+    @ApiModelProperty("分析批id")
+    @TableField("analysis_batch_id")
+    private String analysisBatchId;
+
+    @ApiModelProperty("单元设备id")
+    @TableField("unit_id")
+    private String unitId;
+
+    @ApiModelProperty("单元设备code")
+    @TableField("unit_code")
+    private String unitCode;
+
+    @ApiModelProperty("设备单元类型1-钢轨,2-曲线,3-竖曲线,4-道岔")
+    @TableField("unit_type")
+    private Integer unitType;
+
+    @ApiModelProperty("设备单元类型名称")
+    @TableField("unit_type_name")
+    private String unitTypeName;
+
+    @ApiModelProperty("派工原因")
+    @TableField("work_reason")
+    private Integer workReason;
+
+    @ApiModelProperty("备注")
+    @TableField("remark")
+    private String remark;
+
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/mapper/AnalysisBatchUnitDeviceWorkMapper.java

+package org.jeecg.modules.dynamicStaticAnalysis.mapper;
+
+import org.jeecg.modules.dynamicStaticAnalysis.entity.AnalysisBatchUnitDeviceWork;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 动静态分析-分析批次-单元设备派工表 Mapper 接口
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-08-30
+ */
+public interface AnalysisBatchUnitDeviceWorkMapper extends BaseMapper<AnalysisBatchUnitDeviceWork> {
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/mapper/xml/AnalysisBatchUnitDeviceWorkMapper.xml

+<?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="org.jeecg.modules.dynamicStaticAnalysis.mapper.AnalysisBatchUnitDeviceWorkMapper">
+
+</mapper>

jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/other/AnalysisBatchUnitDeviceWorkDTO.java

+package org.jeecg.modules.dynamicStaticAnalysis.entity;
+
+    import com.baomidou.mybatisplus.annotation.TableField;
+    import com.baomidou.mybatisplus.annotation.TableId;
+    import com.baomidou.mybatisplus.annotation.TableName;
+    import java.io.Serializable;
+    import java.util.Date;
+    import io.swagger.annotations.ApiModel;
+    import io.swagger.annotations.ApiModelProperty;
+    import lombok.Getter;
+    import lombok.Setter;
+
+/**
+* <p>
+    * 动静态分析-分析批次-单元设备派工表
+    * </p>
+*
+* @author hkl
+* @since 2023-08-30
+*/
+    @Getter
+    @Setter
+    @ApiModel(value = "AnalysisBatchUnitDeviceWork对象", description = "动静态分析-分析批次-单元设备派工表")
+
+public class AnalysisBatchUnitDeviceWorkDTO {
+
+
+    private static final long serialVersionUID = 1L;
+
+            @ApiModelProperty("主键")
+    private String id;
+
+            @ApiModelProperty("创建人")
+    private String createBy;
+
+            @ApiModelProperty("创建日期")
+    private Date createTime;
+
+            @ApiModelProperty("更新人")
+    private String updateBy;
+
+            @ApiModelProperty("更新时间")
+    private Date updateTime;
+
+            @ApiModelProperty("分析批次单元设备id")
+    private String analysisBatchUnitDeviceId;
+
+            @ApiModelProperty("分析批次号")
+    private String analysisBatchCode;
+
+            @ApiModelProperty("分析批id")
+    private String analysisBatchId;
+
+            @ApiModelProperty("单元设备id")
+    private String unitId;
+
+            @ApiModelProperty("单元设备code")
+    private String unitCode;
+
+            @ApiModelProperty("设备单元类型1-钢轨,2-曲线,3-竖曲线,4-道岔")
+    private Integer unitType;
+
+            @ApiModelProperty("设备单元类型名称")
+    private String unitTypeName;
+
+            @ApiModelProperty("派工原因")
+    private Integer workReason;
+
+            @ApiModelProperty("备注")
+    private String remark;
+
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/other/AnalysisBatchUnitDeviceWorkVO.java

+package org.jeecg.modules.dynamicStaticAnalysis.entity;
+
+    import com.baomidou.mybatisplus.annotation.TableField;
+    import com.baomidou.mybatisplus.annotation.TableId;
+    import com.baomidou.mybatisplus.annotation.TableName;
+    import java.io.Serializable;
+    import java.util.Date;
+    import io.swagger.annotations.ApiModel;
+    import io.swagger.annotations.ApiModelProperty;
+    import lombok.Getter;
+    import lombok.Setter;
+
+/**
+* <p>
+    * 动静态分析-分析批次-单元设备派工表
+    * </p>
+*
+* @author hkl
+* @since 2023-08-30
+*/
+    @Getter
+    @Setter
+    @ApiModel(value = "AnalysisBatchUnitDeviceWork对象", description = "动静态分析-分析批次-单元设备派工表")
+
+public class AnalysisBatchUnitDeviceWorkVO {
+
+
+    private static final long serialVersionUID = 1L;
+
+            @ApiModelProperty("主键")
+            @TableId("id")
+    private String id;
+
+            @ApiModelProperty("创建人")
+        @TableField("create_by")
+    private String createBy;
+
+            @ApiModelProperty("创建日期")
+        @TableField("create_time")
+    private Date createTime;
+
+            @ApiModelProperty("更新人")
+        @TableField("update_by")
+    private String updateBy;
+
+            @ApiModelProperty("更新时间")
+        @TableField("update_time")
+    private Date updateTime;
+
+            @ApiModelProperty("分析批次单元设备id")
+        @TableField("analysis_batch_unit_device_id")
+    private String analysisBatchUnitDeviceId;
+
+            @ApiModelProperty("分析批次号")
+        @TableField("analysis_batch_code")
+    private String analysisBatchCode;
+
+            @ApiModelProperty("分析批id")
+        @TableField("analysis_batch_id")
+    private String analysisBatchId;
+
+            @ApiModelProperty("单元设备id")
+        @TableField("unit_id")
+    private String unitId;
+
+            @ApiModelProperty("单元设备code")
+        @TableField("unit_code")
+    private String unitCode;
+
+            @ApiModelProperty("设备单元类型1-钢轨,2-曲线,3-竖曲线,4-道岔")
+        @TableField("unit_type")
+    private Integer unitType;
+
+            @ApiModelProperty("设备单元类型名称")
+        @TableField("unit_type_name")
+    private String unitTypeName;
+
+            @ApiModelProperty("派工原因")
+        @TableField("work_reason")
+    private Integer workReason;
+
+            @ApiModelProperty("备注")
+        @TableField("remark")
+    private String remark;
+
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/service/IAnalysisBatchUnitDeviceWorkService.java

+package org.jeecg.modules.dynamicStaticAnalysis.service;
+
+import org.jeecg.modules.dynamicStaticAnalysis.entity.AnalysisBatchUnitDeviceWork;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 动静态分析-分析批次-单元设备派工表 服务类
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-08-30
+ */
+public interface IAnalysisBatchUnitDeviceWorkService extends IService<AnalysisBatchUnitDeviceWork> {
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/service/impl/AnalysisBatchServiceImpl.java

@@ -141,6 +141,8 @@ public class AnalysisBatchServiceImpl extends ServiceImpl<AnalysisBatchMapper, A
         wrapper.eq(AnalysisBatchCheckDataMap::getAnalysisBatchId, id);
         analysisBatchCheckDataMapMapper.delete(wrapper);
 
+
+
         // 2.删除主信息
         this.removeById(id);
     }

jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/service/impl/AnalysisBatchUnitDeviceWorkServiceImpl.java

+package org.jeecg.modules.dynamicStaticAnalysis.service.impl;
+
+import org.jeecg.modules.dynamicStaticAnalysis.entity.AnalysisBatchUnitDeviceWork;
+import org.jeecg.modules.dynamicStaticAnalysis.mapper.AnalysisBatchUnitDeviceWorkMapper;
+import org.jeecg.modules.dynamicStaticAnalysis.service.IAnalysisBatchUnitDeviceWorkService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 动静态分析-分析批次-单元设备派工表 服务实现类
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-08-30
+ */
+@Service
+public class AnalysisBatchUnitDeviceWorkServiceImpl extends ServiceImpl<AnalysisBatchUnitDeviceWorkMapper, AnalysisBatchUnitDeviceWork> implements IAnalysisBatchUnitDeviceWorkService {
+
+}

subwayOA-app/pom.xml

@@ -125,6 +125,12 @@
             <artifactId>dingtalk</artifactId>
             <version>2.0.30</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi</artifactId>
+            <version>4.1.2</version>
+            <scope>compile</scope>
+        </dependency>
 
 
     </dependencies>

subwayOA-app/src/main/java/com/suntray/oa/app/common/exception/GlobalExceptionHandler.java

@@ -13,8 +13,8 @@ public class GlobalExceptionHandler {
 
     @ExceptionHandler(value = {Exception.class})
     @ResponseBody
-    public BaseResponse<?> deal(Exception e) {
-        BaseResponse<?> response = new BaseResponse<>();
+    public <T> BaseResponse<T> deal(Exception e) {
+        BaseResponse<T> response = new BaseResponse<>();
         if (e instanceof BusinessException) {
 
         } else if (e instanceof ParamValidException) {