bug修复

src/main/java/com/WisdomSiteApplication.java

@@ -150,59 +150,3 @@ public class WisdomSiteApplication extends SpringBootServletInitializer {
     }
 
 }
-/*
-CREATE TABLE `PressureTestMachineManage` (
-  `id` bigint(20) NOT NULL COMMENT 'id',
-  `dev_sn` varchar(255) DEFAULT NULL COMMENT '设备编码',
-  `test_number` varchar(255) DEFAULT NULL COMMENT '试验编号',
-  `test_type` int(11) DEFAULT NULL COMMENT '试验类型',
-  `specimen_num` varchar(255) DEFAULT NULL COMMENT '试件数量',
-  `age` varchar(255) DEFAULT NULL COMMENT '龄期(天)',
-  `design_strength` varchar(50) DEFAULT NULL COMMENT '设计强度',
-  `intensity_representative_value` double DEFAULT NULL COMMENT '强度代表值(Mpa)',
-  `test_time` datetime DEFAULT NULL COMMENT '试验时间（试验开始时间）',
-  `production_time` datetime DEFAULT NULL COMMENT '制件时间',
-  `status` int(11) DEFAULT NULL COMMENT '状态：1合格2不合格3未判定',
-  `operator` varchar(50) DEFAULT NULL COMMENT '操作员',
-  `equipment_strength` varchar(50) DEFAULT NULL COMMENT '设备强度',
-  `upload_attachment` varchar(2555) DEFAULT NULL COMMENT '上传附件',
-  `specimen_size` varchar(50) DEFAULT NULL COMMENT '试件尺寸',
-  `specimen_age` double DEFAULT NULL COMMENT '试件龄期',
-  `specimen_area` double DEFAULT NULL COMMENT '试件面积',
-  `nominal_diameter` double DEFAULT NULL COMMENT '公称直径(mm)',
-  `create_date` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间 yyyy-MM-dd HH:mm:ss',
-  `update_date` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间 yyyy-MM-dd HH:mm:ss',
-  `project_sn` varchar(50) DEFAULT NULL COMMENT '项目sn',
-  PRIMARY KEY (`id`) USING BTREE,
-  KEY `idx_dev_id` (`dev_sn`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='试验检测管理';
-
-
-CREATE TABLE `pressure_test_machine_manage_block_number` (
-  `id` bigint(20) NOT NULL COMMENT 'id',
-  `dev_sn` varchar(255) DEFAULT NULL COMMENT '设备编码',
-  `pressure_test_machine_manage_id` bigint(20) NOT NULL COMMENT '试验检测管理id',
-  `test_number` varchar(255) DEFAULT NULL COMMENT '试验编号',
-  `maximum_breaking_force` double DEFAULT NULL COMMENT '拉断最大力值(KN)',
-  `yield_point` double DEFAULT NULL COMMENT '屈服点(KN)',
-  `yield_point_strength` double DEFAULT NULL COMMENT '屈服点强度(Mpa)',
-  `pit_tensile_strength` double DEFAULT NULL COMMENT '坑拉强度(Mpa)',
-  `elongation` double DEFAULT NULL COMMENT '伸长率(%)',
-  `create_date` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间 yyyy-MM-dd HH:mm:ss',
-  `update_date` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间 yyyy-MM-dd HH:mm:ss',
-  `project_sn` varchar(50) DEFAULT NULL COMMENT '项目sn',
-  PRIMARY KEY (`id`) USING BTREE,
-  KEY `idx_dev_id` (`dev_sn`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='试验检测管理-试块编号';
-
-CREATE TABLE `pressure_test_machine_manage_block_data` (
-  `id` bigint(20) NOT NULL COMMENT 'id',
-  `pressure_test_machine_manage_block_number_id` bigint(20) NOT NULL COMMENT '试验检测管理-试块编号id',
-  `code` double DEFAULT NULL COMMENT 'code',
-  `value` double DEFAULT NULL COMMENT 'value',
-  `create_date` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间 yyyy-MM-dd HH:mm:ss',
-  `update_date` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间 yyyy-MM-dd HH:mm:ss',
-  `project_sn` varchar(50) DEFAULT NULL COMMENT '项目sn',
-  PRIMARY KEY (`id`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='试验检测管理-试块数值';
- */

src/main/java/com/zhgd/xmgl/modules/pressuretest/controller/PressureTestMachineManageController.java

@@ -138,15 +138,7 @@ public class PressureTestMachineManageController {
 	@ApiImplicitParam(name = "id", value = "试验检测管理ID", paramType = "query", required = true, dataType = "Integer")
 	@GetMapping(value = "/queryById")
 	public Result<PressureTestMachineManage> queryById(@RequestParam(name = "id", required = true) String id) {
-		Result<PressureTestMachineManage> result = new Result<PressureTestMachineManage>();
+		return Result.success(pressureTestMachineManageService.queryById(id));
-		PressureTestMachineManage pressureTestMachineManage = pressureTestMachineManageService.getById(id);
-		if (pressureTestMachineManage == null) {
-			result.error500("未找到对应实体");
-		} else {
-			result.setResult(pressureTestMachineManage);
-			result.setSuccess(true);
-		}
-		return result;
 	}
 
 	/**

src/main/java/com/zhgd/xmgl/modules/pressuretest/entity/PressureTestMachineManage.java

@@ -1,17 +1,18 @@
 package com.zhgd.xmgl.modules.pressuretest.entity;
 
-import java.io.Serializable;
-import java.util.Date;
-
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.jeecgframework.poi.excel.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.List;
 
 /**
  * @Description: 试验检测管理
@@ -159,4 +160,12 @@ public class PressureTestMachineManage implements Serializable {
     @Excel(name = "项目sn", width = 15)
     @ApiModelProperty(value = "项目sn")
     private java.lang.String projectSn;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "试块编号列表")
+    private List<PressureTestMachineManageBlockNumber> blockNumbers;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "试块数值列表")
+    private List<PressureTestMachineManageBlockData> blockDatas;
+
 }

src/main/java/com/zhgd/xmgl/modules/pressuretest/service/IPressureTestMachineManageService.java

@@ -18,4 +18,6 @@ public interface IPressureTestMachineManageService extends IService<PressureTest
     IPage<PressureTestMachineManage> queryPageList(HashMap<String, Object> paramMap);
 
     List<PressureTestMachineManage> queryList(HashMap<String, Object> paramMap);
+
+    PressureTestMachineManage queryById(String id);
 }

src/main/java/com/zhgd/xmgl/modules/pressuretest/service/impl/PressureTestMachineManageBlockDataServiceImpl.java

@@ -15,6 +15,7 @@ import java.util.HashMap;
 import java.util.List;
 
 import com.zhgd.xmgl.util.RefUtil;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * @Description: 试验检测管理-试块数值

src/main/java/com/zhgd/xmgl/modules/pressuretest/service/impl/PressureTestMachineManageBlockNumberServiceImpl.java

@@ -15,6 +15,7 @@ import java.util.HashMap;
 import java.util.List;
 
 import com.zhgd.xmgl.util.RefUtil;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * @Description: 试验检测管理-试块编号

src/main/java/com/zhgd/xmgl/modules/pressuretest/service/impl/PressureTestMachineManageServiceImpl.java

@@ -1,8 +1,14 @@
 package com.zhgd.xmgl.modules.pressuretest.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.zhgd.xmgl.modules.pressuretest.entity.PressureTestMachineManage;
+import com.zhgd.xmgl.modules.pressuretest.entity.PressureTestMachineManageBlockData;
+import com.zhgd.xmgl.modules.pressuretest.entity.PressureTestMachineManageBlockNumber;
+import com.zhgd.xmgl.modules.pressuretest.mapper.PressureTestMachineManageBlockDataMapper;
+import com.zhgd.xmgl.modules.pressuretest.mapper.PressureTestMachineManageBlockNumberMapper;
 import com.zhgd.xmgl.modules.pressuretest.mapper.PressureTestMachineManageMapper;
 import com.zhgd.xmgl.modules.pressuretest.service.IPressureTestMachineManageService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -15,6 +21,7 @@ import java.util.HashMap;
 import java.util.List;
 
 import com.zhgd.xmgl.util.RefUtil;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * @Description: 试验检测管理
@@ -25,6 +32,11 @@ import com.zhgd.xmgl.util.RefUtil;
 @Service
 @Transactional(rollbackFor = Exception.class)
 public class PressureTestMachineManageServiceImpl extends ServiceImpl<PressureTestMachineManageMapper, PressureTestMachineManage> implements IPressureTestMachineManageService {
+    @Autowired
+    PressureTestMachineManageBlockNumberMapper pressureTestMachineManageBlockNumberMapper;
+    @Autowired
+    PressureTestMachineManageBlockDataMapper pressureTestMachineManageBlockDataMapper;
+
     @Override
     public IPage<PressureTestMachineManage> queryPageList(HashMap<String, Object> paramMap) {
         QueryWrapper<PressureTestMachineManage> queryWrapper = getQueryWrapper(paramMap);
@@ -40,6 +52,18 @@ public class PressureTestMachineManageServiceImpl extends ServiceImpl<PressureTe
         return dealList(this.list(queryWrapper));
     }
 
+    @Override
+    public PressureTestMachineManage queryById(String id) {
+        PressureTestMachineManage manage = getById(id);
+        List<PressureTestMachineManageBlockNumber> blockNumbers = pressureTestMachineManageBlockNumberMapper.selectList(new LambdaQueryWrapper<PressureTestMachineManageBlockNumber>()
+                .eq(PressureTestMachineManageBlockNumber::getPressureTestMachineManageId, id));
+        List<PressureTestMachineManageBlockData> blockDatas = pressureTestMachineManageBlockDataMapper.selectList(new LambdaQueryWrapper<PressureTestMachineManageBlockData>()
+                .eq(PressureTestMachineManageBlockData::getPressureTestMachineManageBlockNumberId, id));
+        manage.setBlockDatas(blockDatas);
+        manage.setBlockNumbers(blockNumbers);
+        return manage;
+    }
+
     private QueryWrapper<PressureTestMachineManage> getQueryWrapper(HashMap<String, Object> paramMap) {
         QueryWrapper<PressureTestMachineManage> queryWrapper = QueryGenerator.initPageQueryWrapper(PressureTestMachineManage.class, paramMap);
         queryWrapper.orderByDesc(RefUtil.fieldNameUlc(PressureTestMachineManage::getId));

src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java

@@ -249,6 +249,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
                     .antMatchers("/xmgl/bridgeProduceRecord/add").permitAll()
                     .antMatchers("/xmgl/vehiclePositionData/add").permitAll()
                     .antMatchers("/xmgl/vehiclePositionAlarm/add").permitAll()
+                    .antMatchers("/xmgl/vehiclePositionDayRecord/add").permitAll()
                     .antMatchers(HttpMethod.OPTIONS, "/**").anonymous()
                     .anyRequest().authenticated()       // 剩下所有的验证都需要验证
                     .and()

src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai

@@ -13,6 +13,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import java.util.HashMap;
 import java.util.List;
 import com.zhgd.xmgl.util.RefUtil;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * @Description: ${tableVo.ftlDescription}