Browse Source

2021/5/20后台管理逻辑删除与数据库唯一索引处理

yinhao 4 years ago
parent
commit
fc6b8eee85
44 changed files with 162 additions and 135 deletions
  1. 1 1
      huimv-smart-apiservice/src/main/java/com/huimv/apiservice/entity/AnimalHeatEntity.java
  2. 1 1
      huimv-smart-apiservice/src/main/java/com/huimv/apiservice/entity/EatTimeEntity.java
  3. 1 1
      huimv-smart-apiservice/src/main/java/com/huimv/apiservice/entity/EmployeeEntity.java
  4. 1 1
      huimv-smart-apiservice/src/main/java/com/huimv/apiservice/entity/IndoorEnvironmentEntity.java
  5. 1 1
      huimv-smart-apiservice/src/main/java/com/huimv/apiservice/entity/OutdoorEnvironmentEntity.java
  6. 4 4
      huimv-smart-apiservice/src/main/java/com/huimv/apiservice/entity/PastureEntity.java
  7. 1 1
      huimv-smart-apiservice/src/main/java/com/huimv/apiservice/entity/PeriodEntity.java
  8. 1 1
      huimv-smart-apiservice/src/main/java/com/huimv/apiservice/entity/PigstyEntity.java
  9. 1 1
      huimv-smart-apiservice/src/main/java/com/huimv/apiservice/entity/PigstyPigEntity.java
  10. 1 1
      huimv-smart-apiservice/src/main/java/com/huimv/apiservice/entity/SleepStatusEntity.java
  11. 1 1
      huimv-smart-apiservice/src/main/java/com/huimv/apiservice/entity/SportTimeEntity.java
  12. 4 4
      huimv-smart-apiservice/src/main/java/com/huimv/apiservice/entity/UnitEntity.java
  13. 1 1
      huimv-smart-apiservice/src/main/java/com/huimv/apiservice/entity/WaterTargetEntity.java
  14. 3 1
      huimv-smart-apiservice/src/main/java/com/huimv/apiservice/entity/YearPigBaseEntity.java
  15. 1 1
      huimv-smart-apiservice/src/main/java/com/huimv/apiservice/entity/YearPigHistortWeightEntity.java
  16. 1 1
      huimv-smart-apiservice/src/main/java/com/huimv/apiservice/entity/YearPigHistoryImgEntity.java
  17. 1 1
      huimv-smart-apiservice/src/main/java/com/huimv/apiservice/entity/YearPigPedigreeEntity.java
  18. 1 1
      huimv-smart-apiservice/src/main/java/com/huimv/apiservice/service/impl/PigServiceImpl.java
  19. 1 1
      huimv-smart-apiservice/src/main/resources/application-dev.yml
  20. 5 2
      huimv-smart-common/src/main/java/com/huimv/common/exception/RRExceptionHandler.java
  21. 5 5
      huimv-smart-gateway/src/main/resources/application.yml
  22. 53 49
      huimv-smart-management/src/main/java/com/huimv/management/Abc.java
  23. 18 20
      huimv-smart-management/src/main/java/com/huimv/management/controller/PastureController.java
  24. 2 0
      huimv-smart-management/src/main/java/com/huimv/management/dao/PigstyDao.java
  25. 1 1
      huimv-smart-management/src/main/java/com/huimv/management/entity/AnimalHeatEntity.java
  26. 1 1
      huimv-smart-management/src/main/java/com/huimv/management/entity/EatTimeEntity.java
  27. 1 1
      huimv-smart-management/src/main/java/com/huimv/management/entity/EmployeeEntity.java
  28. 1 1
      huimv-smart-management/src/main/java/com/huimv/management/entity/IndoorEnvironmentEntity.java
  29. 1 1
      huimv-smart-management/src/main/java/com/huimv/management/entity/OutdoorEnvironmentEntity.java
  30. 7 1
      huimv-smart-management/src/main/java/com/huimv/management/entity/PastureEntity.java
  31. 4 2
      huimv-smart-management/src/main/java/com/huimv/management/entity/PeriodEntity.java
  32. 1 1
      huimv-smart-management/src/main/java/com/huimv/management/entity/PigstyEntity.java
  33. 1 1
      huimv-smart-management/src/main/java/com/huimv/management/entity/PigstyPigEntity.java
  34. 1 1
      huimv-smart-management/src/main/java/com/huimv/management/entity/SleepStatusEntity.java
  35. 1 1
      huimv-smart-management/src/main/java/com/huimv/management/entity/SportTimeEntity.java
  36. 4 4
      huimv-smart-management/src/main/java/com/huimv/management/entity/UnitEntity.java
  37. 1 1
      huimv-smart-management/src/main/java/com/huimv/management/entity/WaterTargetEntity.java
  38. 13 1
      huimv-smart-management/src/main/java/com/huimv/management/entity/YearPigBaseEntity.java
  39. 1 1
      huimv-smart-management/src/main/java/com/huimv/management/entity/YearPigHistortWeightEntity.java
  40. 1 1
      huimv-smart-management/src/main/java/com/huimv/management/entity/YearPigHistoryImgEntity.java
  41. 1 1
      huimv-smart-management/src/main/java/com/huimv/management/entity/YearPigPedigreeEntity.java
  42. 9 12
      huimv-smart-management/src/main/java/com/huimv/management/service/impl/PastureServiceImpl.java
  43. 1 1
      huimv-smart-management/src/main/resources/application-dev.yml
  44. 1 0
      huimv-smart-management/src/main/resources/logback-spring.xml

+ 1 - 1
huimv-smart-apiservice/src/main/java/com/huimv/apiservice/entity/AnimalHeatEntity.java

@@ -46,7 +46,7 @@ public class AnimalHeatEntity implements Serializable {
      * 删除状态 0正常 1已删除
      */
     @TableLogic
-    private Boolean deleted;
+    private Integer deleted;
     /**
      * 创建时间
      */

+ 1 - 1
huimv-smart-apiservice/src/main/java/com/huimv/apiservice/entity/EatTimeEntity.java

@@ -50,7 +50,7 @@ public class EatTimeEntity implements Serializable {
      * 删除状态 0正常 1已删除
      */
     @TableLogic
-    private Boolean deleted;
+    private Integer deleted;
     /**
      * 创建时间
      */

+ 1 - 1
huimv-smart-apiservice/src/main/java/com/huimv/apiservice/entity/EmployeeEntity.java

@@ -47,7 +47,7 @@ public class EmployeeEntity implements Serializable {
      * 删除状态 0正常 1已删除
      */
     @TableLogic
-    private Boolean deleted;
+    private Integer deleted;
     /**
      * 创建时间
      */

+ 1 - 1
huimv-smart-apiservice/src/main/java/com/huimv/apiservice/entity/IndoorEnvironmentEntity.java

@@ -53,7 +53,7 @@ public class IndoorEnvironmentEntity implements Serializable {
      * 删除状态 0正常 1已删除
      */
     @TableLogic
-    private Boolean deleted;
+    private Integer deleted;
     /**
      * 创建时间
      */

+ 1 - 1
huimv-smart-apiservice/src/main/java/com/huimv/apiservice/entity/OutdoorEnvironmentEntity.java

@@ -49,7 +49,7 @@ public class OutdoorEnvironmentEntity implements Serializable {
      * 删除状态 0正常 1已删除
      */
     @TableLogic
-    private Boolean deleted;
+    private Integer deleted;
     /**
      * 创建时间
      */

+ 4 - 4
huimv-smart-apiservice/src/main/java/com/huimv/apiservice/entity/PastureEntity.java

@@ -43,10 +43,10 @@ public class PastureEntity implements Serializable {
 	@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
 	private Date buildTime;
 	/**
-	 * 删除状态 0正常 1已删除
-	 */
-	@TableLogic
-	private Boolean deleted;
+     * 删除状态 0正常 1已删除
+     */
+    @TableLogic
+    private Integer deleted;
 	/**
 	 * 创建时间
 	 */

+ 1 - 1
huimv-smart-apiservice/src/main/java/com/huimv/apiservice/entity/PeriodEntity.java

@@ -39,7 +39,7 @@ public class PeriodEntity implements Serializable {
     /**
      * 删除状态 0.正常 1.已删除
      */
-    private Boolean deleted;
+    private Integer deleted;
     /**
      * 创建时间
      */

+ 1 - 1
huimv-smart-apiservice/src/main/java/com/huimv/apiservice/entity/PigstyEntity.java

@@ -39,7 +39,7 @@ public class PigstyEntity implements Serializable {
      * 删除状态 0正常 1已删除
      */
     @TableLogic
-    private Boolean deleted;
+    private Integer deleted;
     /**
      * 创建时间
      */

+ 1 - 1
huimv-smart-apiservice/src/main/java/com/huimv/apiservice/entity/PigstyPigEntity.java

@@ -51,7 +51,7 @@ public class PigstyPigEntity implements Serializable {
      * 删除状态 0正常 1已删除
      */
     @TableLogic
-    private Boolean deleted;
+    private Integer deleted;
     /**
      * 创建时间
      */

+ 1 - 1
huimv-smart-apiservice/src/main/java/com/huimv/apiservice/entity/SleepStatusEntity.java

@@ -49,7 +49,7 @@ public class SleepStatusEntity implements Serializable {
      * 删除状态 0正常 1已删除
      */
     @TableLogic
-    private Boolean deleted;
+    private Integer deleted;
     /**
      * 创建时间
      */

+ 1 - 1
huimv-smart-apiservice/src/main/java/com/huimv/apiservice/entity/SportTimeEntity.java

@@ -45,7 +45,7 @@ public class SportTimeEntity implements Serializable {
      * 删除状态 0正常 1已删除
      */
     @TableLogic
-    private Boolean deleted;
+    private Integer deleted;
     /**
      * 创建时间
      */

+ 4 - 4
huimv-smart-apiservice/src/main/java/com/huimv/apiservice/entity/UnitEntity.java

@@ -37,10 +37,10 @@ public class UnitEntity implements Serializable {
     private Integer pastureId;
 
 	/**
-	 * 删除状态 0正常 1已删除
-	 */
-	@TableLogic
-	private Boolean deleted;
+     * 删除状态 0正常 1已删除
+     */
+    @TableLogic
+    private Integer deleted;
 	/**
 	 * 创建时间
 	 */

+ 1 - 1
huimv-smart-apiservice/src/main/java/com/huimv/apiservice/entity/WaterTargetEntity.java

@@ -37,7 +37,7 @@ public class WaterTargetEntity implements Serializable {
      * 删除状态 0正常 1已删除
      */
     @TableLogic
-    private Boolean deleted;
+    private Integer deleted;
     /**
      * 创建时间
      */

+ 3 - 1
huimv-smart-apiservice/src/main/java/com/huimv/apiservice/entity/YearPigBaseEntity.java

@@ -1,6 +1,7 @@
 package com.huimv.apiservice.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -65,6 +66,7 @@ public class YearPigBaseEntity implements Serializable {
     /**
      * 出生日期
      */
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date birthday;
 
     /**
@@ -111,7 +113,7 @@ public class YearPigBaseEntity implements Serializable {
      * 删除状态 0正常 1已删除
      */
     @TableLogic
-    private Boolean deleted;
+    private Integer deleted;
     /**
      * 创建时间
      */

+ 1 - 1
huimv-smart-apiservice/src/main/java/com/huimv/apiservice/entity/YearPigHistortWeightEntity.java

@@ -39,7 +39,7 @@ public class YearPigHistortWeightEntity implements Serializable {
      * 删除状态 0正常 1已删除
      */
     @TableLogic
-    private Boolean deleted;
+    private Integer deleted;
     /**
      * 创建时间
      */

+ 1 - 1
huimv-smart-apiservice/src/main/java/com/huimv/apiservice/entity/YearPigHistoryImgEntity.java

@@ -35,7 +35,7 @@ public class YearPigHistoryImgEntity implements Serializable {
      * 删除状态 0正常 1已删除
      */
     @TableLogic
-    private Boolean deleted;
+    private Integer deleted;
     /**
      * 创建时间
      */

+ 1 - 1
huimv-smart-apiservice/src/main/java/com/huimv/apiservice/entity/YearPigPedigreeEntity.java

@@ -39,7 +39,7 @@ public class YearPigPedigreeEntity implements Serializable {
      * 删除状态 0正常 1已删除
      */
     @TableLogic
-    private Boolean deleted;
+    private Integer deleted;
     /**
      * 创建时间
      */

+ 1 - 1
huimv-smart-apiservice/src/main/java/com/huimv/apiservice/service/impl/PigServiceImpl.java

@@ -306,7 +306,7 @@ public class PigServiceImpl extends ServiceImpl<PigDao, YearPigBaseEntity> imple
 
         LambdaUpdateWrapper<YearPigBaseEntity> pigBaseLambdaUpdate = Wrappers.lambdaUpdate();
         pigBaseLambdaUpdate.eq(YearPigBaseEntity::getEartag, pigEarTagNo)
-                .set(YearPigBaseEntity::getDeleted, true)
+                .set(YearPigBaseEntity::getDeleted, System.currentTimeMillis())
                 .set(YearPigBaseEntity::getFosterStatus, false)
                 .set(YearPigBaseEntity::getOutFenceTime,new Date())
                 .set(YearPigBaseEntity::getOutFenceStatus, status);

+ 1 - 1
huimv-smart-apiservice/src/main/resources/application-dev.yml

@@ -90,7 +90,7 @@ mybatis-plus:
       id-type: auto
       logic-delete-field: deleted  # 全局逻辑删除的实体字段名(since 3.3.0,配置后可以忽略不配置步骤2)
       logic-not-delete-value: 0 # 逻辑未删除值(默认为 0)
-      logic-delete-value: 1 # 逻辑已删除值(默认为 1)
+      logic-delete-value: UNIX_TIMESTAMP() # 逻辑已删除值(unix时间戳)
   #原生配置
   configuration:
     map-underscore-to-camel-case: true

+ 5 - 2
huimv-smart-common/src/main/java/com/huimv/common/exception/RRExceptionHandler.java

@@ -23,6 +23,7 @@ import org.springframework.web.bind.annotation.RestControllerAdvice;
 import org.springframework.web.servlet.NoHandlerFoundException;
 
 import javax.validation.ConstraintViolationException;
+import java.sql.SQLIntegrityConstraintViolationException;
 
 /**
  * 异常处理器
@@ -53,8 +54,10 @@ public class RRExceptionHandler {
 
 	@ExceptionHandler(DuplicateKeyException.class)
 	public R handleDuplicateKeyException(DuplicateKeyException e){
-		logger.error(e.getMessage(), e);
-		return R.error("数据库中已存在该记录");
+		logger.error(e.toString());
+		String message = e.getCause().getMessage();
+		String[] s = message.split(" ");
+		return R.error(600,s[2].replace("'","") + " 已经存在!");
 	}
 
 	@ExceptionHandler(AuthorizationException.class)

+ 5 - 5
huimv-smart-gateway/src/main/resources/application.yml

@@ -32,11 +32,11 @@ spring:
           filters:
             - RewritePath=/api/(?<segment>/?.*), /renren-fast/$\{segment}
 
-        - id: apiservice_route
-          uri: http://127.0.0.1:9001
-        # apiservice后台接口路由
-          predicates:
-            - Path=/**
+#        - id: apiservice_route
+#          uri: http://127.0.0.1:9001
+#        # apiservice后台接口路由
+#          predicates:
+#            - Path=/**
 
 #      discovery:
 #        locator:

File diff suppressed because it is too large
+ 53 - 49
huimv-smart-management/src/main/java/com/huimv/management/Abc.java


+ 18 - 20
huimv-smart-management/src/main/java/com/huimv/management/controller/PastureController.java

@@ -1,4 +1,4 @@
- package com.huimv.management.controller;
+package com.huimv.management.controller;
 
 import java.util.Arrays;
 import java.util.List;
@@ -18,7 +18,6 @@ import com.huimv.common.utils.PageUtils;
 import com.huimv.common.utils.R;
 
 
-
 /**
  * 牧场表
  *
@@ -37,7 +36,7 @@ public class PastureController {
      * 列表
      */
     @RequestMapping("/list")
-    public R list(@RequestParam Map<String, Object> params){
+    public R list(@RequestParam Map<String, Object> params) {
         PageUtils page = pastureService.queryPage(params);
 
         return R.ok().put("page", page);
@@ -48,8 +47,8 @@ public class PastureController {
      * 信息
      */
     @RequestMapping("/info/{id}")
-    public R info(@PathVariable("id") Integer id){
-		PastureEntity pasture = pastureService.getById(id);
+    public R info(@PathVariable("id") Integer id) {
+        PastureEntity pasture = pastureService.getById(id);
 
         return R.ok().put("pasture", pasture);
     }
@@ -58,21 +57,20 @@ public class PastureController {
      * 保存
      */
     @RequestMapping("/save")
-    public R save(@RequestBody PastureEntity pasture){
-        Boolean isExist = pastureService.findByName(pasture);
-        if (isExist){
-            pastureService.save(pasture);
-            return R.ok();
-        }
-        return R.error().put("msg","牧场名称名称重复");
+    public R save(@RequestBody PastureEntity pasture) {
+//        Boolean isExist = pastureService.findByName(pasture);
+//        if (isExist){
+        pastureService.save(pasture);
+        return R.ok();
+
     }
 
     /**
      * 修改
      */
     @RequestMapping("/update")
-    public R update(@RequestBody PastureEntity pasture){
-		pastureService.updateById(pasture);
+    public R update(@RequestBody PastureEntity pasture) {
+        pastureService.updateById(pasture);
 
         return R.ok();
     }
@@ -81,14 +79,14 @@ public class PastureController {
      * 删除
      */
     @RequestMapping("/delete")
-    public R delete(@RequestBody Integer[] ids){
+    public R delete(@RequestBody Integer[] ids) {
 //		pigstyService.removeByIds(Arrays.asList(ids));
         Integer delete = pastureService.delete(ids);
-        if (delete == 1){
+        if (delete == 1) {
             pastureService.removeByIds(Arrays.asList(ids));
             return R.ok();
-        }else {
-            return R.error().put("msg","牧场中有未清空猪舍");
+        } else {
+            return R.error().put("msg", "牧场中有未清空猪舍");
         }
 
 
@@ -98,10 +96,10 @@ public class PastureController {
      * 查询全部
      */
     @RequestMapping("/findAll")
-    public R findAll(){
+    public R findAll() {
         List list = pastureService.findAll();
 
-        return R.ok().put("all",list);
+        return R.ok().put("all", list);
     }
 
 }

+ 2 - 0
huimv-smart-management/src/main/java/com/huimv/management/dao/PigstyDao.java

@@ -3,6 +3,7 @@ package com.huimv.management.dao;
 import com.huimv.management.entity.PigstyEntity;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
 
 /**
  * 猪舍表
@@ -12,6 +13,7 @@ import org.apache.ibatis.annotations.Mapper;
  * @date 2021-05-07 15:32:42
  */
 @Mapper
+@Repository
 public interface PigstyDao extends BaseMapper<PigstyEntity> {
 	
 }

+ 1 - 1
huimv-smart-management/src/main/java/com/huimv/management/entity/AnimalHeatEntity.java

@@ -46,7 +46,7 @@ public class AnimalHeatEntity implements Serializable {
      * 删除状态 0正常 1已删除
      */
     @TableLogic
-    private Boolean deleted;
+    private Integer deleted;
     /**
      * 创建时间
      */

+ 1 - 1
huimv-smart-management/src/main/java/com/huimv/management/entity/EatTimeEntity.java

@@ -50,7 +50,7 @@ public class EatTimeEntity implements Serializable {
      * 删除状态 0正常 1已删除
      */
     @TableLogic
-    private Boolean deleted;
+    private Integer deleted;
     /**
      * 创建时间
      */

+ 1 - 1
huimv-smart-management/src/main/java/com/huimv/management/entity/EmployeeEntity.java

@@ -47,7 +47,7 @@ public class EmployeeEntity implements Serializable {
      * 删除状态 0正常 1已删除
      */
     @TableLogic
-    private Boolean deleted;
+    private Integer deleted;
     /**
      * 创建时间
      */

+ 1 - 1
huimv-smart-management/src/main/java/com/huimv/management/entity/IndoorEnvironmentEntity.java

@@ -53,7 +53,7 @@ public class IndoorEnvironmentEntity implements Serializable {
      * 删除状态 0正常 1已删除
      */
     @TableLogic
-    private Boolean deleted;
+    private Integer deleted;
     /**
      * 创建时间
      */

+ 1 - 1
huimv-smart-management/src/main/java/com/huimv/management/entity/OutdoorEnvironmentEntity.java

@@ -49,7 +49,7 @@ public class OutdoorEnvironmentEntity implements Serializable {
      * 删除状态 0正常 1已删除
      */
     @TableLogic
-    private Boolean deleted;
+    private Integer deleted;
     /**
      * 创建时间
      */

+ 7 - 1
huimv-smart-management/src/main/java/com/huimv/management/entity/PastureEntity.java

@@ -6,6 +6,7 @@ import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.Random;
 
 /**
  * 牧场表
@@ -33,6 +34,10 @@ public class PastureEntity implements Serializable {
 	 */
 	private String location;
 	/**
+	 * 牧场地址(front)
+	 */
+	private String frontLocation;
+	/**
 	 * 负责人
 	 */
 	private String manager;
@@ -46,7 +51,8 @@ public class PastureEntity implements Serializable {
 	 * 删除状态 0正常 1已删除
 	 */
 	@TableLogic
-	private Boolean deleted;
+//	@TableField(fill = FieldFill.INSERT)
+	private Integer deleted;
 	/**
 	 * 创建时间
 	 */

+ 4 - 2
huimv-smart-management/src/main/java/com/huimv/management/entity/PeriodEntity.java

@@ -1,7 +1,6 @@
 package com.huimv.management.entity;
 
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -39,14 +38,17 @@ public class PeriodEntity implements Serializable {
     /**
      * 删除状态 0.正常 1.已删除
      */
+    @TableLogic
     private Boolean deleted;
     /**
      * 创建时间
      */
+    @TableField(fill = FieldFill.INSERT)
     private Date gmtCreate;
     /**
      * 修改时间
      */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
     private Date gmtModified;
 
 }

+ 1 - 1
huimv-smart-management/src/main/java/com/huimv/management/entity/PigstyEntity.java

@@ -39,7 +39,7 @@ public class PigstyEntity implements Serializable {
      * 删除状态 0正常 1已删除
      */
     @TableLogic
-    private Boolean deleted;
+    private Integer deleted;
     /**
      * 创建时间
      */

+ 1 - 1
huimv-smart-management/src/main/java/com/huimv/management/entity/PigstyPigEntity.java

@@ -51,7 +51,7 @@ public class PigstyPigEntity implements Serializable {
      * 删除状态 0正常 1已删除
      */
     @TableLogic
-    private Boolean deleted;
+    private Integer deleted;
     /**
      * 创建时间
      */

+ 1 - 1
huimv-smart-management/src/main/java/com/huimv/management/entity/SleepStatusEntity.java

@@ -49,7 +49,7 @@ public class SleepStatusEntity implements Serializable {
      * 删除状态 0正常 1已删除
      */
     @TableLogic
-    private Boolean deleted;
+    private Integer deleted;
     /**
      * 创建时间
      */

+ 1 - 1
huimv-smart-management/src/main/java/com/huimv/management/entity/SportTimeEntity.java

@@ -45,7 +45,7 @@ public class SportTimeEntity implements Serializable {
      * 删除状态 0正常 1已删除
      */
     @TableLogic
-    private Boolean deleted;
+    private Integer deleted;
     /**
      * 创建时间
      */

+ 4 - 4
huimv-smart-management/src/main/java/com/huimv/management/entity/UnitEntity.java

@@ -37,10 +37,10 @@ public class UnitEntity implements Serializable {
     private Integer pastureId;
 
 	/**
-	 * 删除状态 0正常 1已删除
-	 */
-	@TableLogic
-	private Boolean deleted;
+     * 删除状态 0正常 1已删除
+     */
+    @TableLogic
+    private Integer deleted;
 	/**
 	 * 创建时间
 	 */

+ 1 - 1
huimv-smart-management/src/main/java/com/huimv/management/entity/WaterTargetEntity.java

@@ -37,7 +37,7 @@ public class WaterTargetEntity implements Serializable {
      * 删除状态 0正常 1已删除
      */
     @TableLogic
-    private Boolean deleted;
+    private Integer deleted;
     /**
      * 创建时间
      */

+ 13 - 1
huimv-smart-management/src/main/java/com/huimv/management/entity/YearPigBaseEntity.java

@@ -1,6 +1,7 @@
 package com.huimv.management.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -65,6 +66,7 @@ public class YearPigBaseEntity implements Serializable {
     /**
      * 出生日期
      */
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date birthday;
 
     /**
@@ -83,6 +85,16 @@ public class YearPigBaseEntity implements Serializable {
     private Integer periodId;
 
     /**
+     * 入栏时间
+     */
+    private Date inFenceTime;
+
+    /**
+     * 出栏时间
+     */
+    private Date outFenceTime;
+
+    /**
      * 出栏状态
      */
     private Integer outFenceStatus;
@@ -101,7 +113,7 @@ public class YearPigBaseEntity implements Serializable {
      * 删除状态 0正常 1已删除
      */
     @TableLogic
-    private Boolean deleted;
+    private Integer deleted;
     /**
      * 创建时间
      */

+ 1 - 1
huimv-smart-management/src/main/java/com/huimv/management/entity/YearPigHistortWeightEntity.java

@@ -39,7 +39,7 @@ public class YearPigHistortWeightEntity implements Serializable {
      * 删除状态 0正常 1已删除
      */
     @TableLogic
-    private Boolean deleted;
+    private Integer deleted;
     /**
      * 创建时间
      */

+ 1 - 1
huimv-smart-management/src/main/java/com/huimv/management/entity/YearPigHistoryImgEntity.java

@@ -35,7 +35,7 @@ public class YearPigHistoryImgEntity implements Serializable {
      * 删除状态 0正常 1已删除
      */
     @TableLogic
-    private Boolean deleted;
+    private Integer deleted;
     /**
      * 创建时间
      */

+ 1 - 1
huimv-smart-management/src/main/java/com/huimv/management/entity/YearPigPedigreeEntity.java

@@ -39,7 +39,7 @@ public class YearPigPedigreeEntity implements Serializable {
      * 删除状态 0正常 1已删除
      */
     @TableLogic
-    private Boolean deleted;
+    private Integer deleted;
     /**
      * 创建时间
      */

+ 9 - 12
huimv-smart-management/src/main/java/com/huimv/management/service/impl/PastureServiceImpl.java

@@ -8,11 +8,13 @@ import com.huimv.management.dao.YearPigBaseDao;
 import com.huimv.management.entity.*;
 import com.huimv.management.entity.PastureEntity;
 import com.huimv.management.entity.PastureEntity;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
 import java.util.Map;
+
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -38,16 +40,11 @@ public class PastureServiceImpl extends ServiceImpl<PastureDao, PastureEntity> i
 
         LambdaQueryWrapper<PastureEntity> lambdaQuery = Wrappers.lambdaQuery();
         String keywords = (String) params.get("keywords");
-        //没有参数
-        if (keywords == null || keywords.equals("")){
-            IPage<PastureEntity> page = this.page(
-                    new Query<PastureEntity>().getPage(params),
-                    new QueryWrapper<PastureEntity>()
-            );
-            return new PageUtils(page);
+        //有参数
+        if (StringUtils.isNotEmpty(keywords)) {
+            lambdaQuery.apply("CONCAT(name,front_location ,manager,build_time) like CONCAT('%',{0},'%')",keywords);
         }
 
-        lambdaQuery.like(PastureEntity::getName,keywords);
         IPage<PastureEntity> page = page(this.page(
                 new Query<PastureEntity>().getPage(params)
         ), lambdaQuery);
@@ -67,9 +64,9 @@ public class PastureServiceImpl extends ServiceImpl<PastureDao, PastureEntity> i
     public Integer delete(Integer[] ids) {
         LambdaQueryWrapper<PigstyEntity> lambdaQuery = Wrappers.lambdaQuery();
         for (Integer id : ids) {
-            lambdaQuery.eq(PigstyEntity::getPastureId,id);
+            lambdaQuery.eq(PigstyEntity::getPastureId, id);
             List<PigstyEntity> yearPigBaseEntities = pigstyDao.selectList(lambdaQuery);
-            if (yearPigBaseEntities != null && yearPigBaseEntities.size() >0){
+            if (yearPigBaseEntities != null && yearPigBaseEntities.size() > 0) {
                 return 2;
             }
         }
@@ -80,9 +77,9 @@ public class PastureServiceImpl extends ServiceImpl<PastureDao, PastureEntity> i
     @Override
     public Boolean findByName(PastureEntity pasture) {
         LambdaQueryWrapper<PastureEntity> lambdaQuery = Wrappers.lambdaQuery();
-        lambdaQuery.eq(PastureEntity::getName,pasture.getName());
+        lambdaQuery.eq(PastureEntity::getName, pasture.getName());
         PastureEntity pastureEntity = pastureDao.selectOne(lambdaQuery);
-        if (pastureEntity == null){
+        if (pastureEntity == null) {
             return true;
         }
         return false;

+ 1 - 1
huimv-smart-management/src/main/resources/application-dev.yml

@@ -93,7 +93,7 @@ mybatis-plus:
       id-type: auto
       logic-delete-field: deleted  # 全局逻辑删除的实体字段名(since 3.3.0,配置后可以忽略不配置步骤2)
       logic-not-delete-value: 0 # 逻辑未删除值(默认为 0)
-      logic-delete-value: 1 # 逻辑已删除值(默认为 1)
+      logic-delete-value: UNIX_TIMESTAMP() # 逻辑已删除值(unix时间戳)
   #原生配置
   configuration:
     map-underscore-to-camel-case: true

+ 1 - 0
huimv-smart-management/src/main/resources/logback-spring.xml

@@ -9,6 +9,7 @@
         <logger name="org.springframework.web" level="INFO"/>
         <logger name="org.springboot.sample" level="INFO" />
         <logger name="com.huimv" level="DEBUG" />
+        <logger name="c.a.druid.pool" level="ERROR" />
     </springProfile>
 
     <!-- 生产环境 -->