修改实体类位置,添加兽医站位置编码

admin/src/main/java/com/huimv/farm/damsubsidy/controller/BaseVeterStationController.java

@@ -1,5 +1,7 @@
 package com.huimv.farm.damsubsidy.controller;
 
+import cn.hutool.core.date.DateTime;
+import com.huimv.farm.damsubsidy.common.token.TokenSign;
 import com.huimv.farm.damsubsidy.common.utils.Result;
 import com.huimv.farm.damsubsidy.common.utils.ResultCode;
 import com.huimv.farm.damsubsidy.entity.BaseVeterStation;
@@ -28,12 +30,16 @@ public class BaseVeterStationController {
 
     @PostMapping("/add")
     public Result addMenu(@RequestBody BaseVeterStation baseVeterStation , HttpServletRequest request){
+        baseVeterStation.setCreateUser(TokenSign.getMemberIdByJwtToken(request));
+        baseVeterStation.setCreateTime(DateTime.now());
         baseVeterStationService.save(baseVeterStation);
         return new Result(ResultCode.SUCCESS,"添加成功");
     }
 
     @PostMapping("/edit")
-    public Result editMenu(@RequestBody BaseVeterStation baseVeterStation){
+    public Result editMenu(@RequestBody BaseVeterStation baseVeterStation, HttpServletRequest httpServletRequest){
+        baseVeterStation.setUpdateUser(TokenSign.getMemberIdByJwtToken(httpServletRequest));
+        baseVeterStation.setUpdateTime(DateTime.now());
         baseVeterStationService.updateById(baseVeterStation);
         return new Result(ResultCode.SUCCESS,"修改成功");
     }

admin/src/main/java/com/huimv/farm/damsubsidy/controller/BillLandingInspectionController.java

@@ -9,7 +9,7 @@ import com.huimv.farm.damsubsidy.common.token.TokenSign;
 import com.huimv.farm.damsubsidy.common.utils.Result;
 import com.huimv.farm.damsubsidy.common.utils.ResultCode;
 import com.huimv.farm.damsubsidy.common.utils.UploadImage;
-import com.huimv.farm.damsubsidy.entity.vo.BillLandingInspection;
+import com.huimv.farm.damsubsidy.entity.BillLandingInspection;
 import com.huimv.farm.damsubsidy.service.IBillLandingInspectionService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.StringUtils;

admin/src/main/java/com/huimv/farm/damsubsidy/entity/BaseEntity.java

@@ -67,7 +67,7 @@ public class BaseEntity implements Serializable {
      * 更新人
      */
     @TableField(fill = FieldFill.UPDATE)
-    private String updateUser;
+    private Long updateUser;
 
     private  Integer isDelete;
 

admin/src/main/java/com/huimv/farm/damsubsidy/entity/BaseVeterStation.java

@@ -21,7 +21,7 @@ import lombok.experimental.Accessors;
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
 @TableName("base_veter_station")
-public class BaseVeterStation implements Serializable {
+public class BaseVeterStation extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -34,10 +34,13 @@ public class BaseVeterStation implements Serializable {
 //    @DictTranslate(dataSource = "ss", targetField = "ss")
     private String stationName;
 
-    /**
-     * 地址
-     */
-//    private String address;
+    private String detailedAdress;
+
+    private String detailedAdressCode;
+
+    private String briefAddress;
+
+    private String briefAddressCode;
 
 
 }

admin/src/main/java/com/huimv/farm/damsubsidy/entity/vo/BillLandingInspection.java

@@ -1,4 +1,4 @@
-package com.huimv.farm.damsubsidy.entity.vo;
+package com.huimv.farm.damsubsidy.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;

admin/src/main/java/com/huimv/farm/damsubsidy/entity/vo/BillLandingInspectionVo.java

@@ -1,5 +1,6 @@
 package com.huimv.farm.damsubsidy.entity.vo;
 
+import com.huimv.farm.damsubsidy.entity.BillLandingInspection;
 import lombok.Data;
 
 @Data

admin/src/main/java/com/huimv/farm/damsubsidy/mapper/BillLandingInspectionMapper.java

@@ -1,10 +1,8 @@
 package com.huimv.farm.damsubsidy.mapper;
 
-import com.huimv.farm.damsubsidy.entity.vo.BillLandingInspection;
+import com.huimv.farm.damsubsidy.entity.BillLandingInspection;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
-import java.util.List;
-
 /**
  * <p>
  * 落地检 Mapper 接口

admin/src/main/java/com/huimv/farm/damsubsidy/service/IBillLandingInspectionService.java

@@ -1,7 +1,7 @@
 package com.huimv.farm.damsubsidy.service;
 
 import com.huimv.farm.damsubsidy.common.utils.Result;
-import com.huimv.farm.damsubsidy.entity.vo.BillLandingInspection;
+import com.huimv.farm.damsubsidy.entity.BillLandingInspection;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import javax.servlet.http.HttpServletRequest;

admin/src/main/java/com/huimv/farm/damsubsidy/service/impl/BillBuyInfoServiceImpl.java

@@ -9,7 +9,7 @@ import com.huimv.farm.damsubsidy.common.utils.ResultCode;
 import com.huimv.farm.damsubsidy.common.utils.UploadImage;
 import com.huimv.farm.damsubsidy.entity.*;
 import com.huimv.farm.damsubsidy.entity.vo.BillBuyInfoVo;
-import com.huimv.farm.damsubsidy.entity.vo.BillLandingInspection;
+import com.huimv.farm.damsubsidy.entity.BillLandingInspection;
 import com.huimv.farm.damsubsidy.mapper.BaseAnimalMapper;
 import com.huimv.farm.damsubsidy.mapper.BillBuyInfoMapper;
 import com.huimv.farm.damsubsidy.mapper.BillLandingInspectionMapper;

admin/src/main/java/com/huimv/farm/damsubsidy/service/impl/BillIsolatedServiceImpl.java

@@ -12,7 +12,7 @@ import com.huimv.farm.damsubsidy.common.utils.ResultCode;
 import com.huimv.farm.damsubsidy.common.utils.UploadImage;
 import com.huimv.farm.damsubsidy.entity.BaseAnimal;
 import com.huimv.farm.damsubsidy.entity.BillIsolated;
-import com.huimv.farm.damsubsidy.entity.vo.BillLandingInspection;
+import com.huimv.farm.damsubsidy.entity.BillLandingInspection;
 import com.huimv.farm.damsubsidy.mapper.BaseAnimalMapper;
 import com.huimv.farm.damsubsidy.mapper.BillIsolatedMapper;
 import com.huimv.farm.damsubsidy.mapper.BillLandingInspectionMapper;

admin/src/main/java/com/huimv/farm/damsubsidy/service/impl/BillLandingInspectionServiceImpl.java

@@ -9,7 +9,7 @@ import com.huimv.farm.damsubsidy.common.token.TokenSign;
 import com.huimv.farm.damsubsidy.common.utils.Result;
 import com.huimv.farm.damsubsidy.common.utils.ResultCode;
 import com.huimv.farm.damsubsidy.entity.*;
-import com.huimv.farm.damsubsidy.entity.vo.BillLandingInspection;
+import com.huimv.farm.damsubsidy.entity.BillLandingInspection;
 import com.huimv.farm.damsubsidy.mapper.*;
 import com.huimv.farm.damsubsidy.service.IBillLandingInspectionService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

admin/src/main/resources/com/huimv/farm/damsubsidy/mapper/BillLandingInspectionMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.huimv.farm.damsubsidy.mapper.BillLandingInspectionMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.huimv.farm.damsubsidy.entity.vo.BillLandingInspection">
+    <resultMap id="BaseResultMap" type="com.huimv.farm.damsubsidy.entity.BillLandingInspection">
         <id column="id" property="id" />
         <result column="inspection_name" property="inspectionName" />
         <result column="inspection_sch" property="inspectionSch" />