异常描述

src/main/java/com/unissoft/grainManage/controller/GrainAbnormalDescribeController.java

@@ -1,9 +1,11 @@
+/*
 package com.unissoft.grainManage.controller;
 
 
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+*/
 /**
  * <p>
  *  前端控制器
@@ -11,9 +13,11 @@ import org.springframework.web.bind.annotation.RestController;
  *
  * @author root
  * @since 2020-12-07
- */
+ *//*
+
 @RestController
 @RequestMapping("/grainAbnormalDescribe")
 public class GrainAbnormalDescribeController {
 
 }
+*/

src/main/java/com/unissoft/grainManage/service/GrainAbnormalDescribeService.java

@@ -1,9 +1,11 @@
+/*
 package com.unissoft.grainManage.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.unissoft.model.GrainAbnormalDescribe;
 
 
+*/
 /**
  * <p>
  *  服务类
@@ -11,7 +13,9 @@ import com.unissoft.model.GrainAbnormalDescribe;
  *
  * @author root
  * @since 2020-12-07
- */
+ *//*
+
 public interface GrainAbnormalDescribeService extends IService<GrainAbnormalDescribe> {
 
 }
+*/

src/main/java/com/unissoft/grainManage/service/impl/GrainAbnormalDescribeServiceImpl.java

@@ -1,3 +1,4 @@
+/*
 package com.unissoft.grainManage.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -7,6 +8,7 @@ import com.unissoft.model.GrainAbnormalDescribe;
 import com.unissoft.grainManage.service.GrainAbnormalDescribeService;
 import org.springframework.stereotype.Service;
 
+*/
 /**
  * <p>
  *  服务实现类
@@ -14,8 +16,10 @@ import org.springframework.stereotype.Service;
  *
  * @author root
  * @since 2020-12-07
- */
+ *//*
+
 @Service
 public class GrainAbnormalDescribeServiceImpl extends ServiceImpl<GrainAbnormalDescribeMapper, GrainAbnormalDescribe> implements GrainAbnormalDescribeService {
 
 }
+*/

src/main/java/com/unissoft/grainManage/service/impl/GrainConditionRecordServiceImpl.java

@@ -42,8 +42,6 @@ public class GrainConditionRecordServiceImpl extends ServiceImpl<GrainConditionR
     @Autowired
     private GrainConditionRecordMapper grainConditionRecordMapper;
     @Autowired
-    private GrainAbnormalDescribeMapper grainAbnormalDescribeMapper;
-    @Autowired
     private GrainConditionRecordChildMapper childMapper;
     @Resource
     private SystemFeign systemFeign;

src/main/java/com/unissoft/mapper/GrainAbnormalDescribeMapper.java

@@ -1,3 +1,4 @@
+/*
 package com.unissoft.mapper;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -6,6 +7,7 @@ import com.unissoft.model.GrainAbnormalDescribe;
 import com.unissoft.model.GrainConditionRecord;
 import org.springframework.stereotype.Repository;
 
+*/
 /**
  * <p>
  *  Mapper 接口
@@ -13,7 +15,8 @@ import org.springframework.stereotype.Repository;
  *
  * @author root
  * @since 2020-12-07
- */
+ *//*
+
 @Repository
 public interface GrainAbnormalDescribeMapper extends BaseMapper<GrainAbnormalDescribe> {
 
@@ -22,3 +25,4 @@ public interface GrainAbnormalDescribeMapper extends BaseMapper<GrainAbnormalDes
     GrainAbnormalDescribe getSelectId(Integer id);
 
 }
+*/

src/main/java/com/unissoft/mapper/GrainAbnormalDescribeMapper.xml

@@ -1,8 +1,9 @@
 <?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.unissoft.mapper.GrainAbnormalDescribeMapper">
+<mapper namespace="">
+<!--<mapper namespace="com.unissoft.mapper.GrainAbnormalDescribeMapper">
 
-    <!-- 通用查询映射结果 -->
+    &lt;!&ndash; 通用查询映射结果 &ndash;&gt;
     <resultMap id="BaseResultMap" type="com.unissoft.model.GrainAbnormalDescribe">
         <id column="grain_record_id" property="grainRecordId" />
         <result column="pest_density" property="pestDensity" />
@@ -13,7 +14,7 @@
         <result column="abnormal_grain" property="abnormalGrain" />
     </resultMap>
 
-    <!-- 通用查询结果列 -->
+    &lt;!&ndash; 通用查询结果列 &ndash;&gt;
     <sql id="Base_Column_List">
         grain_record_id, pest_density, occur_position, occur_area, pest_type, abnormal_pest, abnormal_grain
     </sql>
@@ -37,6 +38,6 @@
         FROM   grain_abnormal_describe                        /* 粮情描述*/
         WHERE
         grain_record_id =  #{id} /* 主键  id */
-    </select>
+    </select>-->
 
 </mapper>

src/main/java/com/unissoft/mapper/GrainConditionRecordChildMapper.xml

@@ -9,11 +9,12 @@
         <result column="anomalous_status" property="anomalousStatus" />
         <result column="enum_id" property="enumId" />
         <result column="operation_time" property="operationTime" />
+        <result column="error_described" property="errorDescribed" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, parent_id, anomalous_status, enum_id, operation_time
+        id, parent_id, anomalous_status, enum_id, operation_time, error_described
     </sql>
 
 </mapper>

src/main/java/com/unissoft/model/GrainAbnormalDescribe.java

@@ -1,3 +1,4 @@
+/*
 package com.unissoft.model;
 
 import com.baomidou.mybatisplus.annotation.IdType;
@@ -11,6 +12,7 @@ import lombok.EqualsAndHashCode;
 
 import java.io.Serializable;
 
+*/
 /**
  * <p>
  * 
@@ -18,7 +20,8 @@ import java.io.Serializable;
  *
  * @author root
  * @since 2020-12-07
- */
+ *//*
+
 @Data
 @EqualsAndHashCode(callSuper = false)
 @TableName("grain_abnormal_describe")
@@ -60,3 +63,4 @@ public class GrainAbnormalDescribe implements Serializable {
     private String abnormalGrain;
 
 }
+*/

src/main/java/com/unissoft/model/GrainConditionRecordChild.java

@@ -55,5 +55,12 @@ public class GrainConditionRecordChild implements Serializable {
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date operationTime;
 
+    /**
+     *
+     */
+    @ApiModelProperty(value = "粮情情异常描述json字符串")
+    @TableField("error_described")
+    private String errorDescribed;
+
 
 }