Merge branch 'dev'

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

+package com.patzn.cloud.service.lims.soil.controller;
+
+import com.patzn.cloud.service.soil.entity.SoilEnvMonitor;
+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.ISoilEnvMonitorService;
+
+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 2021-03-17
+ */
+@Api(tags = "环境表")
+@RestController
+@RequestMapping("/v1/env_monitor")
+public class SoilEnvMonitorController extends ServiceController {
+
+    @Autowired
+    private ISoilEnvMonitorService soilEnvMonitorService;
+
+    @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),
+    })
+    @PostMapping("/page")
+	public RestResult<Page<SoilEnvMonitor>> getPage(SoilEnvMonitor soilEnvMonitor) {
+        return success(soilEnvMonitorService.page(getPage(), soilEnvMonitor));
+	}
+
+    @ApiOperation("查询 id 信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "主键", required = true, paramType = "path", dataTypeClass = Long.class),
+    })
+    @GetMapping("/{id}")
+    public RestResult<SoilEnvMonitor> get(@PathVariable("id") Long id) {
+        return success(soilEnvMonitorService.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, SoilEnvMonitor soilEnvMonitor) {
+        soilEnvMonitor.setId(id);
+        return success(soilEnvMonitorService.updateById(soilEnvMonitor));
+	}
+
+    @ApiOperation("添加")
+    @PostMapping("/")
+	public RestResult<Boolean> add(SoilEnvMonitor soilEnvMonitor) {
+        return success(soilEnvMonitorService.save(soilEnvMonitor));
+	}
+
+    @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(soilEnvMonitorService.removeByIds(ids));
+	}
+}

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

+package com.patzn.cloud.service.lims.soil.controller;
+
+import com.patzn.cloud.service.soil.entity.SoilEnvMonitorWarning;
+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.ISoilEnvMonitorWarningService;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+
+import java.util.List;
+
+/**
+ * ${table.comment} 前端控制器
+ *
+ * @author wwd
+ * @since 2021-03-17
+ */
+@Api(tags = "环境预警")
+@RestController
+@RequestMapping("/v1/env_monitor_warning")
+public class SoilEnvMonitorWarningController extends ServiceController {
+
+    @Autowired
+    private ISoilEnvMonitorWarningService soilEnvMonitorWarningService;
+
+    @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),
+    })
+    @PostMapping("/page")
+	public RestResult<Page<SoilEnvMonitorWarning>> getPage(SoilEnvMonitorWarning soilEnvMonitorWarning) {
+        return success(soilEnvMonitorWarningService.page(getPage(), soilEnvMonitorWarning));
+	}
+
+    @ApiOperation("查询 id 信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "主键", required = true, paramType = "path", dataTypeClass = Long.class),
+    })
+    @GetMapping("/{id}")
+    public RestResult<SoilEnvMonitorWarning> get(@PathVariable("id") Long id) {
+        return success(soilEnvMonitorWarningService.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, SoilEnvMonitorWarning soilEnvMonitorWarning) {
+        soilEnvMonitorWarning.setId(id);
+        return success(soilEnvMonitorWarningService.updateById(soilEnvMonitorWarning));
+	}
+
+    @ApiOperation("添加")
+    @PostMapping("/")
+	public RestResult<Boolean> add(SoilEnvMonitorWarning soilEnvMonitorWarning) {
+        return success(soilEnvMonitorWarningService.save(soilEnvMonitorWarning));
+	}
+
+    @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(soilEnvMonitorWarningService.removeByIds(ids));
+	}
+}

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

@@ -137,6 +137,13 @@ public class SoilExperimentController extends ServiceController  {
     }
 
 
+    @ApiOperation(value = "自动分配试验项目", notes = "分配试验项目")
+    @PostMapping("/auto_allot_exp")
+    public RestResult<Boolean> allotExp(@RequestParam("ids") Long [] ids) {
+        return success(soilExperimentService.autoAllotExp(ids,getAccount()));
+    }
+
+
 
     @ApiOperation(value = "试验项目分配调整", notes = "试验项目分配调整")
     @PostMapping("/change_exp_allot")

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

+package com.patzn.cloud.service.lims.soil.mapper;
+
+import com.patzn.cloud.commons.mapper.BatchMapper;
+import com.patzn.cloud.service.soil.entity.SoilEnvMonitor;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author wwd
+ * @since 2021-03-17
+ */
+public interface SoilEnvMonitorMapper extends BatchMapper<SoilEnvMonitor> {
+
+}

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

+package com.patzn.cloud.service.lims.soil.mapper;
+
+import com.patzn.cloud.commons.mapper.BatchMapper;
+import com.patzn.cloud.service.soil.entity.SoilEnvMonitorWarning;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author wwd
+ * @since 2021-03-17
+ */
+public interface SoilEnvMonitorWarningMapper extends BatchMapper<SoilEnvMonitorWarning> {
+
+}

src/main/java/com/patzn/cloud/service/lims/soil/service/ISoilEnvMonitorService.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.SoilEnvMonitor;
+
+import java.util.List;
+
+/**
+ *  服务类
+ *
+ * @author wwd
+ * @since 2021-03-17
+ */
+public interface ISoilEnvMonitorService extends IBaseService<SoilEnvMonitor> {
+
+    Page<SoilEnvMonitor> page(Page<SoilEnvMonitor> page, SoilEnvMonitor soilEnvMonitor);
+
+    boolean removeByIds(List<Long> ids);
+}

src/main/java/com/patzn/cloud/service/lims/soil/service/ISoilEnvMonitorWarningService.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.SoilEnvMonitorWarning;
+
+import java.util.List;
+
+/**
+ *  服务类
+ *
+ * @author wwd
+ * @since 2021-03-17
+ */
+public interface ISoilEnvMonitorWarningService extends IBaseService<SoilEnvMonitorWarning> {
+
+    Page<SoilEnvMonitorWarning> page(Page<SoilEnvMonitorWarning> page, SoilEnvMonitorWarning soilEnvMonitorWarning);
+
+    boolean removeByIds(List<Long> ids);
+}

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

@@ -39,6 +39,8 @@ public interface ISoilExperimentService extends IBaseService<SoilExperiment> {
 
     boolean allotExp(Long[] ids, String user, Long userId, Account account);
 
+    boolean autoAllotExp(Long[] ids, Account account);
+
     Page<SoilExperimentVO> pageBySampleIds(Page<SoilExperimentVO> page, Long[] sampleIds, SoilExperimentVO vo);
 
     Page<SoilExperimentVO> pageTestByExp(Page<SoilExperimentVO> page, SoilExperimentVO vo);

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

@@ -1699,6 +1699,8 @@ public class SoilEntrustServiceImpl extends BaseServiceImpl<SoilEntrustMapper, S
                         experiment.setName(key);
                         SoilAptitudeExp soilAptitudeExp=    expMap.get(key);
                         if (null!=soilAptitudeExp){
+
+                            experiment.setAptitudeExpId(soilAptitudeExp.getId());
                             experiment.setGroupName(soilAptitudeExp.getGroupName());
                             experiment.setGroupId(soilAptitudeExp.getGroupId());
                             experiment.setShortName(soilAptitudeExp.getShortName());

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

+package com.patzn.cloud.service.lims.soil.service.impl;
+
+import com.patzn.cloud.service.lims.soil.mapper.SoilEnvMonitorMapper;
+import com.patzn.cloud.service.lims.soil.service.ISoilEnvMonitorService;
+import com.patzn.cloud.commons.service.impl.BaseServiceImpl;
+import com.patzn.cloud.service.soil.entity.SoilEnvMonitor;
+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 2021-03-17
+ */
+@Service
+public class SoilEnvMonitorServiceImpl extends BaseServiceImpl<SoilEnvMonitorMapper, SoilEnvMonitor> implements ISoilEnvMonitorService {
+
+    @Override
+    public Page<SoilEnvMonitor> page(Page<SoilEnvMonitor> page, SoilEnvMonitor soilEnvMonitor) {
+        Wrapper wrapper = new EntityWrapper<>(soilEnvMonitor);
+
+        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/SoilEnvMonitorWarningServiceImpl.java

+package com.patzn.cloud.service.lims.soil.service.impl;
+
+import com.patzn.cloud.service.lims.soil.mapper.SoilEnvMonitorWarningMapper;
+import com.patzn.cloud.service.lims.soil.service.ISoilEnvMonitorWarningService;
+import com.patzn.cloud.commons.service.impl.BaseServiceImpl;
+import com.patzn.cloud.service.soil.entity.SoilEnvMonitorWarning;
+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 2021-03-17
+ */
+@Service
+public class SoilEnvMonitorWarningServiceImpl extends BaseServiceImpl<SoilEnvMonitorWarningMapper, SoilEnvMonitorWarning> implements ISoilEnvMonitorWarningService {
+
+    @Override
+    public Page<SoilEnvMonitorWarning> page(Page<SoilEnvMonitorWarning> page, SoilEnvMonitorWarning soilEnvMonitorWarning) {
+        Wrapper wrapper = new EntityWrapper<>(soilEnvMonitorWarning);
+
+        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/SoilExperimentServiceImpl.java

@@ -225,6 +225,62 @@ public class SoilExperimentServiceImpl extends BaseServiceImpl<SoilExperimentMap
     }
 
 
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public boolean autoAllotExp(Long[] ids, Account account) {
+        RestAssert.fail(ArrayUtils.isEmpty(ids),"请选择要分配的试验项目");
+        List<SoilExperiment> experimentList = list(Condition.create().setSqlSelect("id","aptitude_exp_id").in("id",ids));
+
+        for (SoilExperiment experiment : experimentList) {
+            RestAssert.fail(null == experiment.getAptitudeExpId(),"不能自动分配，试验项目"+experiment.getName()+"请关联资质项目！");
+        }
+
+        List<Long> aptitudeIds = new ArrayList<>();
+        for (SoilExperiment experiment : experimentList) {
+            aptitudeIds.add(experiment.getAptitudeExpId());
+        }
+
+        List<SoilAptitudeExp> aptitudeExpList = soilAptitudeExpService.list(Condition.create().setSqlSelect("id","main_tester_id","main_tester").in("id",aptitudeIds));
+
+        for (SoilAptitudeExp soilAptitudeExp : aptitudeExpList) {
+            RestAssert.fail(null == soilAptitudeExp.getMainTesterId()||StringUtils.isBlank(soilAptitudeExp.getMainTester()),"不能自动分配，"+soilAptitudeExp.getName()+"请设置资质项目的主检测人！");
+        }
+        Map<Long,SoilAptitudeExp> map = new HashMap<>();
+        for (SoilAptitudeExp soilAptitudeExp : aptitudeExpList) {
+            map.put(soilAptitudeExp.getId(),soilAptitudeExp);
+        }
+
+
+        List<SoilExperiment> updateList = new ArrayList<>();
+
+        for (SoilExperiment experiment : experimentList) {
+            SoilAptitudeExp exp=  map.get(experiment.getAptitudeExpId());
+            if (null == exp || null == exp.getMainTesterId() ||StringUtils.isBlank(exp.getMainTester())){
+                continue;
+            }
+
+            SoilExperiment updateExp = new SoilExperiment();
+            updateExp.setStatus(SoilExpStatusEnum.TEST);
+            updateExp.setProgress(SoilExpStatusEnum.TEST);
+            updateExp.setTesterId(exp.getMainTesterId());
+            updateExp.setTester(exp.getMainTester());
+            updateExp.setId(experiment.getId());
+
+            updateList.add(updateExp);
+        }
+
+
+        if (updateBatchById(updateList)){
+            soilExperimentOperationService.recordAllotInfo(ids,account);
+            soilExperimentRecordService.record(ids,SoilExpStatusEnum.ALLOT,SoilExpStatusEnum.TEST,0,account,"试验项目分配");
+            lmsMsgService.sendMsg("/soil/test/do_test","试验项目已分配请及时进行检测","新的试验检测工作",account,null);
+
+        }
+        return true;
+    }
+
+
+
 
     @Transactional(rollbackFor = Exception.class)
     @Override

src/main/resources/mapper/soil/SoilEnvMonitorMapper.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.SoilEnvMonitorMapper">
+
+</mapper>

src/main/resources/mapper/soil/SoilEnvMonitorWarningMapper.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.SoilEnvMonitorWarningMapper">
+
+</mapper>

src/test/java/resources/db_sql/v2.0.2/新增数据表.sql

-CREATE TABLE "public"."soil_original_template_balance" (
+CREATE TABLE "public"."soil_original_template_balance" (
@@ -34,4 +34,99 @@ COMMENT ON COLUMN "public"."soil_original_template_balance"."template_id" IS '
 ALTER TABLE "public"."soil_original_template_config"
   ADD COLUMN "clicked" int2 DEFAULT 0;
 
-COMMENT ON COLUMN "public"."soil_original_template_config"."clicked" IS '是否需要点击天平';
+COMMENT ON COLUMN "public"."soil_original_template_config"."clicked" IS '是否需要点击天平';
\ No newline at end of file
+
+
+ALTER TABLE "public"."soil_aptitude_exp"
+  ADD COLUMN "main_tester" varchar(150),
+  ADD COLUMN "main_tester_id" int8,
+  ADD COLUMN "checker" varchar(100),
+  ADD COLUMN "checker_id" int8;
+
+COMMENT ON COLUMN "public"."soil_aptitude_exp"."main_tester" IS '主检人';
+
+COMMENT ON COLUMN "public"."soil_aptitude_exp"."main_tester_id" IS '主检人ID';
+
+COMMENT ON COLUMN "public"."soil_aptitude_exp"."checker" IS '审核人';
+
+COMMENT ON COLUMN "public"."soil_aptitude_exp"."checker_id" IS '审核人ID';
+
+
+
+CREATE TABLE "public"."soil_env_monitor_warning" (
+  "id" int8 NOT NULL DEFAULT NULL,
+  "warning_type" varchar(255) COLLATE "pg_catalog"."default" DEFAULT NULL::character varying,
+  "upper_limit" varchar(100) COLLATE "pg_catalog"."default" DEFAULT NULL::character varying,
+  "lower_limit" varchar(100) COLLATE "pg_catalog"."default" DEFAULT NULL::character varying,
+  "tel" varchar(255) COLLATE "pg_catalog"."default" DEFAULT NULL::character varying,
+  "email" varchar(255) COLLATE "pg_catalog"."default" DEFAULT NULL::character varying,
+  "remark" varchar(255) COLLATE "pg_catalog"."default" DEFAULT NULL::character varying,
+  "company_id" int8 DEFAULT NULL,
+  "deleted" int2 DEFAULT 0,
+  "uid" int8 DEFAULT NULL,
+  "ctime" timestamp(0) DEFAULT NULL::timestamp without time zone,
+  "lid" int8 DEFAULT NULL,
+  "ltime" timestamp(0) DEFAULT NULL::timestamp without time zone,
+  "group_name" varchar(150) COLLATE "pg_catalog"."default" DEFAULT NULL::character varying,
+  "group_id" int8 DEFAULT NULL
+)
+;
+COMMENT ON COLUMN "public"."soil_env_monitor_warning"."id" IS '主键';
+COMMENT ON COLUMN "public"."soil_env_monitor_warning"."warning_type" IS '预警项目';
+COMMENT ON COLUMN "public"."soil_env_monitor_warning"."upper_limit" IS '预警上限';
+COMMENT ON COLUMN "public"."soil_env_monitor_warning"."lower_limit" IS '预警下限';
+COMMENT ON COLUMN "public"."soil_env_monitor_warning"."tel" IS '手机号';
+COMMENT ON COLUMN "public"."soil_env_monitor_warning"."email" IS '邮箱';
+COMMENT ON COLUMN "public"."soil_env_monitor_warning"."remark" IS '备注';
+COMMENT ON COLUMN "public"."soil_env_monitor_warning"."company_id" IS '公司id';
+COMMENT ON COLUMN "public"."soil_env_monitor_warning"."deleted" IS '是否删除 0否1是';
+COMMENT ON COLUMN "public"."soil_env_monitor_warning"."uid" IS '创建人id';
+COMMENT ON COLUMN "public"."soil_env_monitor_warning"."ctime" IS '创建时间';
+COMMENT ON COLUMN "public"."soil_env_monitor_warning"."lid" IS '最后修改人id';
+COMMENT ON COLUMN "public"."soil_env_monitor_warning"."ltime" IS '最后修改时间';
+COMMENT ON COLUMN "public"."soil_env_monitor_warning"."group_name" IS '科室';
+COMMENT ON COLUMN "public"."soil_env_monitor_warning"."group_id" IS '科室ID';
+
+
+CREATE TABLE "public"."soil_env_monitor" (
+  "id" int8 NOT NULL DEFAULT NULL,
+  "type" int2 DEFAULT NULL,
+  "location" varchar(255) COLLATE "pg_catalog"."default" DEFAULT NULL::character varying,
+  "humidity" varchar(255) COLLATE "pg_catalog"."default" DEFAULT NULL::character varying,
+  "temperature" varchar(255) COLLATE "pg_catalog"."default" DEFAULT NULL::character varying,
+  "monitor_date" timestamp(0) DEFAULT NULL::timestamp without time zone,
+  "recorder" int8 DEFAULT NULL,
+  "company_id" int8 DEFAULT NULL,
+  "recorder_name" varchar(255) COLLATE "pg_catalog"."default" DEFAULT NULL::character varying,
+  "deleted" int2 DEFAULT 0,
+  "uid" int8 DEFAULT NULL,
+  "ctime" timestamp(0) DEFAULT NULL::timestamp without time zone,
+  "lid" int8 DEFAULT NULL,
+  "ltime" timestamp(0) DEFAULT NULL::timestamp without time zone,
+  "monitor_format" varchar(80) COLLATE "pg_catalog"."default" DEFAULT NULL::character varying,
+  "equip_num" varchar(100) COLLATE "pg_catalog"."default" DEFAULT NULL::character varying
+)
+;
+COMMENT ON COLUMN "public"."soil_env_monitor"."id" IS '主键';
+COMMENT ON COLUMN "public"."soil_env_monitor"."type" IS '类型（0常规，1微生物）';
+COMMENT ON COLUMN "public"."soil_env_monitor"."location" IS '位置';
+COMMENT ON COLUMN "public"."soil_env_monitor"."humidity" IS '相对湿度';
+COMMENT ON COLUMN "public"."soil_env_monitor"."temperature" IS '温度';
+COMMENT ON COLUMN "public"."soil_env_monitor"."monitor_date" IS '监测日期';
+COMMENT ON COLUMN "public"."soil_env_monitor"."recorder" IS '记录人';
+COMMENT ON COLUMN "public"."soil_env_monitor"."company_id" IS '公司id';
+COMMENT ON COLUMN "public"."soil_env_monitor"."recorder_name" IS '记录人名称';
+COMMENT ON COLUMN "public"."soil_env_monitor"."deleted" IS '是否删除 0否1是';
+COMMENT ON COLUMN "public"."soil_env_monitor"."uid" IS '创建人id';
+COMMENT ON COLUMN "public"."soil_env_monitor"."ctime" IS '创建时间';
+COMMENT ON COLUMN "public"."soil_env_monitor"."lid" IS '最后修改人id';
+COMMENT ON COLUMN "public"."soil_env_monitor"."ltime" IS '最后修改时间';
+COMMENT ON COLUMN "public"."soil_env_monitor"."monitor_format" IS '监测日期格式';
+COMMENT ON COLUMN "public"."soil_env_monitor"."equip_num" IS '设备编号';
+
+-- ----------------------------
+-- Primary Key structure for table soil_env_monitor
+-- ----------------------------
+ALTER TABLE "public"."soil_env_monitor" ADD CONSTRAINT "soil_env_monitor_pkey" PRIMARY KEY ("id");
+
+