土工平台修改

src/main/java/com/patzn/cloud/service/lims/soil/controller/SoilBoxController.java

+package com.patzn.cloud.service.lims.soil.controller;
+
+import com.patzn.cloud.service.soil.entity.SoilBox;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.patzn.cloud.commons.api.RestConstants;
+import com.patzn.cloud.commons.api.RestResult;
+import com.patzn.cloud.commons.controller.ServiceController;
+import com.patzn.cloud.service.lims.soil.service.ISoilBoxService;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+
+import java.util.List;
+
+/**
+ * 盒子管理 前端控制器
+ *
+ * @author wwd
+ * @since 2020-12-04
+ */
+@Api(tags = "盒子管理")
+@RestController
+@RequestMapping("/v1/box")
+public class SoilBoxController extends ServiceController {
+
+    @Autowired
+    private ISoilBoxService soilBoxService;
+
+    @ApiOperation("分页列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataTypeClass = Integer.class),
+            @ApiImplicitParam(name = RestConstants.PAGE_ROWS, value = "每页条数", required = true, paramType = "query", dataTypeClass = Integer.class),
+            @ApiImplicitParam(name = RestConstants.PAGE_SIDX, value = "排序字段", paramType = "query", dataTypeClass = String.class),
+            @ApiImplicitParam(name = RestConstants.PAGE_SORD, value = "排序方式", paramType = "query", dataTypeClass = String.class),
+    })
+    @PostMapping("/page")
+	public RestResult<Page<SoilBox>> getPage(SoilBox soilBox) {
+        return success(soilBoxService.page(getPage(), soilBox));
+	}
+
+    @ApiOperation("查询 id 信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "主键", required = true, paramType = "path", dataTypeClass = Long.class),
+    })
+    @GetMapping("/{id}")
+    public RestResult<SoilBox> get(@PathVariable("id") Long id) {
+        return success(soilBoxService.getById(id));
+    }
+
+    @ApiOperation("根据 id 修改信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "主键", required = true, paramType = "path", dataTypeClass = Long.class),
+    })
+    @PutMapping("/{id}")
+	public RestResult<Boolean> edit(@PathVariable("id") Long id, SoilBox soilBox) {
+        soilBox.setId(id);
+        return success(soilBoxService.updateById(soilBox));
+	}
+
+    @ApiOperation("添加")
+    @PostMapping("/")
+	public RestResult<Boolean> add(SoilBox soilBox) {
+        return success(soilBoxService.save(soilBox));
+	}
+
+    @ApiOperation("根据 ids 删除")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "ids", value = "主键列表", required = true, paramType = "query", allowMultiple = true, dataTypeClass = Long.class),
+    })
+	@DeleteMapping("/")
+	public RestResult<Boolean> delete(@RequestParam("ids") List<Long> ids) {
+        return success(soilBoxService.removeByIds(ids));
+	}
+}

src/main/java/com/patzn/cloud/service/lims/soil/mapper/SoilBoxMapper.java

+package com.patzn.cloud.service.lims.soil.mapper;
+
+import com.patzn.cloud.commons.mapper.BatchMapper;
+import com.patzn.cloud.service.soil.entity.SoilBox;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author wwd
+ * @since 2020-12-04
+ */
+public interface SoilBoxMapper extends BatchMapper<SoilBox> {
+
+}

src/main/java/com/patzn/cloud/service/lims/soil/service/ISoilBoxService.java

+package com.patzn.cloud.service.lims.soil.service;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.patzn.cloud.commons.service.IBaseService;
+import com.patzn.cloud.service.soil.entity.SoilBox;
+
+import java.util.List;
+
+/**
+ *  服务类
+ *
+ * @author wwd
+ * @since 2020-12-04
+ */
+public interface ISoilBoxService extends IBaseService<SoilBox> {
+
+    Page<SoilBox> page(Page<SoilBox> page, SoilBox soilBox);
+
+    boolean removeByIds(List<Long> ids);
+}

src/main/java/com/patzn/cloud/service/lims/soil/service/impl/SoilBoxServiceImpl.java

+package com.patzn.cloud.service.lims.soil.service.impl;
+
+import com.baomidou.mybatisplus.mapper.Condition;
+import com.patzn.cloud.service.lims.soil.mapper.SoilBoxMapper;
+import com.patzn.cloud.service.lims.soil.service.ISoilBoxService;
+import com.patzn.cloud.commons.service.impl.BaseServiceImpl;
+import com.patzn.cloud.service.soil.entity.SoilBox;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.baomidou.mybatisplus.plugins.Page;
+
+import java.util.List;
+
+/**
+ *  服务实现类
+ *
+ * @author wwd
+ * @since 2020-12-04
+ */
+@Service
+public class SoilBoxServiceImpl extends BaseServiceImpl<SoilBoxMapper, SoilBox> implements ISoilBoxService {
+
+    @Override
+    public Page<SoilBox> page(Page<SoilBox> page, SoilBox soilBox) {
+        Wrapper wrapper = new EntityWrapper<>(soilBox);
+        if (StringUtils.isNotBlank(soilBox.getBoxCode())){
+            wrapper.like("box_code",soilBox.getBoxCode());
+            soilBox.setBoxCode(null);
+        }
+
+        return this.page(page, wrapper);
+    }
+
+    @Override
+    public boolean removeByIds(List<Long> ids) {
+        return baseMapper.deleteBatchIds(ids) > 0;
+    }
+}

src/main/java/com/patzn/cloud/service/lims/soil/service/impl/SoilEntrustServiceImpl.java

@@ -658,6 +658,7 @@ public class SoilEntrustServiceImpl extends BaseServiceImpl<SoilEntrustMapper, S
         String gch="";
         String client= "";
         String zkmc= "";
+        String projectName= "";
         String zkwz="";
         String ss="";
         boolean endEn=false;
@@ -670,7 +671,7 @@ public class SoilEntrustServiceImpl extends BaseServiceImpl<SoilEntrustMapper, S
                 for (int j = 0; j < lastCellNum; j++) {
                     XSSFCell cell= row.getCell(j);
                     String cellValue = HSSFWorkbookUtil.getJavaValue(cell).toString();
-                    if ("平均容重".equals(cellValue)){
+                    if ("平均容重".equals(cellValue)||"平均容重，kN/m3".equals(cellValue)){
                         for (int m = j+1; m < lastCellNum; m++) {
                             String value= HSSFWorkbookUtil.getJavaValue(row.getCell(m)).toString();
                             if (StringUtils.isNotBlank(value)){
@@ -696,6 +697,15 @@ public class SoilEntrustServiceImpl extends BaseServiceImpl<SoilEntrustMapper, S
                                 break;
                             }
                         }
+                    }else if ("项目名称".equals(cellValue)){
+
+                        for (int m = j+1; m < lastCellNum; m++) {
+                            String value= HSSFWorkbookUtil.getJavaValue(row.getCell(m)).toString();
+                            if (StringUtils.isNotBlank(value)){
+                                projectName = value;
+                                break;
+                            }
+                        }
                     }else if ("钻孔位置".equals(cellValue)){
 
                         for (int m = j+1; m < lastCellNum; m++) {
@@ -803,7 +813,9 @@ public class SoilEntrustServiceImpl extends BaseServiceImpl<SoilEntrustMapper, S
         if (StringUtils.isBlank(soilEntrust.getBoreholeName())){
             entrust.setBoreholeName(zkmc);
         }
-
+        if (StringUtils.isBlank(soilEntrust.getProjectName())){
+            entrust.setProjectName(projectName);
+        }
 
 
         if (StringUtils.isBlank(soilEntrust.getProjectNo())){
@@ -1099,6 +1111,7 @@ public class SoilEntrustServiceImpl extends BaseServiceImpl<SoilEntrustMapper, S
             String client= "";
             String zkmc= "";
             String zkwz="";
+            String projectName="";
             String ss="";
             boolean endEn=false;
             for (int i = 0; i < num; i++) {
@@ -1110,7 +1123,7 @@ public class SoilEntrustServiceImpl extends BaseServiceImpl<SoilEntrustMapper, S
                     for (int j = 0; j < lastCellNum; j++) {
                         XSSFCell cell= row.getCell(j);
                         String cellValue = HSSFWorkbookUtil.getJavaValue(cell).toString();
-                        if ("平均容重".equals(cellValue)){
+                        if ("平均容重".equals(cellValue)||"平均容重，kN/m3".equals(cellValue)){
                             for (int m = j+1; m < lastCellNum; m++) {
                                 String value= HSSFWorkbookUtil.getJavaValue(row.getCell(m)).toString();
                                 if (StringUtils.isNotBlank(value)){
@@ -1127,6 +1140,15 @@ public class SoilEntrustServiceImpl extends BaseServiceImpl<SoilEntrustMapper, S
                                     break;
                                 }
                             }
+                        }else if ("项目名称".equals(cellValue)){
+
+                            for (int m = j+1; m < lastCellNum; m++) {
+                                String value= HSSFWorkbookUtil.getJavaValue(row.getCell(m)).toString();
+                                if (StringUtils.isNotBlank(value)){
+                                    projectName = value;
+                                    break;
+                                }
+                            }
                         }else if ("钻孔名称".equals(cellValue)){
 
                             for (int m = j+1; m < lastCellNum; m++) {
@@ -1225,6 +1247,7 @@ public class SoilEntrustServiceImpl extends BaseServiceImpl<SoilEntrustMapper, S
             entrust.setBoreholeLocation(zkwz);
             entrust.setBoreholeName(zkmc);
             entrust.setProjectNo(gch);
+            entrust.setProjectName(projectName);
 
             SoilEntrustDTO dto = entrust.convert(SoilEntrustDTO.class);
             List<SoilSampleDTO> sampleDTOS = new ArrayList<>();
@@ -1264,7 +1287,7 @@ public class SoilEntrustServiceImpl extends BaseServiceImpl<SoilEntrustMapper, S
                         continue;
                     }else if ("".equals(value)){
                         continue;
-                    }else if ("Ö".equals(value)){
+                    }else if ("Ö".equals(value)||"S".equals(value)){
                         SoilExperiment experiment = new SoilExperiment();
                         experiment.setName(key);
                         SoilAptitudeExp soilAptitudeExp=    expMap.get(key);

src/main/java/com/patzn/cloud/service/lims/soil/service/impl/SoilSampleServiceImpl.java

@@ -309,7 +309,7 @@ public class SoilSampleServiceImpl extends BaseServiceImpl<SoilSampleMapper, Soi
                  continue;
              }
             if (!shortNameMap.containsKey(experiment.getSampleId())){
-                    Set<String> set = new TreeSet<>();
+                    Set<String> set = new LinkedHashSet<>();
 
                 set.add(experiment.getShortName());
                 shortNameMap.put(experiment.getSampleId(),set);

src/main/resources/mapper/soil/SoilBoxMapper.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="com.patzn.cloud.service.lims.soil.mapper.SoilBoxMapper">
+
+</mapper>

src/test/java/resources/db_sql/v1.0.5/新增项目名称字段.sql

+ALTER TABLE "public"."soil_entrust"
+ALTER TABLE "public"."soil_entrust"
+  ADD COLUMN "project_name" varchar(150);
+
+COMMENT ON COLUMN "public"."soil_entrust"."project_name" IS '项目名称';
+
+
+CREATE TABLE "public"."soil_box" (
+  "id" int8 NOT NULL DEFAULT NULL,
+  "name" varchar(120) COLLATE "pg_catalog"."default" DEFAULT NULL::character varying,
+  "box_code" varchar(120) COLLATE "pg_catalog"."default" DEFAULT NULL::character varying,
+  "quality" numeric(10,2) DEFAULT NULL::numeric,
+  "unit" varchar(50) COLLATE "pg_catalog"."default" DEFAULT 'g'::character varying,
+  "company_id" int8 DEFAULT NULL,
+  "uid" int8 DEFAULT NULL,
+  "ctime" timestamp(6) DEFAULT NULL::timestamp without time zone,
+  "lid" int8 DEFAULT NULL,
+  "ltime" timestamp(6) DEFAULT NULL::timestamp without time zone,
+  "deleted" int2 DEFAULT 0
+)
+;
+COMMENT ON COLUMN "public"."soil_box"."id" IS '主键ID';
+COMMENT ON COLUMN "public"."soil_box"."name" IS '盒子名称';
+COMMENT ON COLUMN "public"."soil_box"."box_code" IS '盒号';
+COMMENT ON COLUMN "public"."soil_box"."quality" IS '质量';
+COMMENT ON COLUMN "public"."soil_box"."unit" IS '单位';
+COMMENT ON COLUMN "public"."soil_box"."company_id" IS '企业ID';
+COMMENT ON COLUMN "public"."soil_box"."uid" IS '创建人ID';
+COMMENT ON COLUMN "public"."soil_box"."ctime" IS '创建时间';
+COMMENT ON COLUMN "public"."soil_box"."lid" IS '最后修改人ID';
+COMMENT ON COLUMN "public"."soil_box"."ltime" IS '最后修改时间';
+COMMENT ON COLUMN "public"."soil_box"."deleted" IS '是否删除（0否1是）';
+
+-- ----------------------------
+-- Primary Key structure for table soil_box
+-- ----------------------------
+ALTER TABLE "public"."soil_box" ADD CONSTRAINT "soil_box_pkey" PRIMARY KEY ("id");
\ No newline at end of file