水稻代码更新11111

src/main/java/com/izouma/nineth/domain/Rice.java

@@ -44,9 +44,6 @@ public class Rice extends BaseEntity {
     @ApiModelProperty("经验值")
     private Long EmpiricalValue;
 
-    @ApiModelProperty("当前用户排行")
-    @Column(name = "score_rank")
-    private Integer scoreRank;
 
 
 }

src/main/java/com/izouma/nineth/domain/RiceUserIntegral.java

@@ -1,30 +0,0 @@
-package com.izouma.nineth.domain;
-
-import com.alibaba.excel.annotation.ExcelProperty;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import javax.persistence.Entity;
-
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@Entity
-@ApiModel("玩家积分")
-public class RiceUserIntegral extends BaseEntity {
-
-    @ApiModelProperty("用户id")
-    @ExcelProperty("用户id")
-    private Long userId;
-
-    @ApiModelProperty("积分")
-    @ExcelProperty("积分")
-    private int num;
-}
-
-
-

src/main/java/com/izouma/nineth/domain/RiceUserIntegralRecord.java

@@ -1,47 +0,0 @@
-package com.izouma.nineth.domain;
-
-import com.alibaba.excel.annotation.ExcelProperty;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import javax.persistence.Entity;
-
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@Entity
-@ApiModel("水稻玩家积分明细")
-public class RiceUserIntegralRecord extends BaseEntity {
-
-    @ApiModelProperty("用户id")
-    @ExcelProperty("用户id")
-    private Long userId;
-
-    @ApiModelProperty("操作前积分数量")
-    @ExcelProperty("操作前积分数量")
-    private int beforeNum;
-
-    @ApiModelProperty("本次操作积分数量")
-    @ExcelProperty("本次操作积分数量")
-    private int operationNum;
-
-    @ApiModelProperty("操作后积分数量")
-    @ExcelProperty("操作后积分数量")
-    private int afterNum;
-
-    @ApiModelProperty("备注")
-    @ExcelProperty("备注")
-    private String remark;
-}
-
-
-
-
-
-
-
-

src/main/java/com/izouma/nineth/domain/RiceUserWaterDrop.java

@@ -1,29 +0,0 @@
-package com.izouma.nineth.domain;
-
-
-import com.alibaba.excel.annotation.ExcelProperty;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import javax.persistence.Entity;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@Entity
-@ApiModel("玩家水滴数量")
-public class RiceUserWaterDrop extends BaseEntity {
-
-    @ApiModelProperty("用户id")
-    @ExcelProperty("用户id")
-    private Long userId;
-
-    @ApiModelProperty("水滴数量")
-    @ExcelProperty("水滴数量")
-    private int num;
-
-
-}

src/main/java/com/izouma/nineth/domain/RiceUserWaterDropRecord.java

@@ -1,42 +1,31 @@
 package com.izouma.nineth.domain;
 
-import com.alibaba.excel.annotation.ExcelProperty;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
 import lombok.Data;
-import lombok.NoArgsConstructor;
 
-import javax.persistence.Entity;
+import javax.persistence.*;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
 
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
 @Entity
-@ApiModel("水稻玩家水滴明细")
+@Table(name = "watering_record")
+@Data
 public class RiceUserWaterDropRecord extends BaseEntity {
 
 
-    @ApiModelProperty("用户id")
-    @ExcelProperty("用户id")
+    @Column(name = "user_id")
     private Long userId;
 
-    @ApiModelProperty("操作前水滴数量")
-    @ExcelProperty("操作前数量")
-    private int beforeNum;
+    @Column(name = "watering_time")
+    private LocalDateTime wateringTime;
+
+    public boolean isToday() {
+        return wateringTime.toLocalDate().equals(LocalDate.now());
+    }
+}
+
 
-    @ApiModelProperty("本次操作水滴数量")
-    @ExcelProperty("本次操作水滴数量")
-    private int operationNum;
 
-    @ApiModelProperty("操作后水滴数量")
-    @ExcelProperty("操作后数量")
-    private int afterNum;
 
-    @ApiModelProperty("备注")
-    @ExcelProperty("备注")
-    private String remark;
-}
 
 
 

src/main/java/com/izouma/nineth/dto/RiceDTO.java

@@ -0,0 +1,25 @@
+package com.izouma.nineth.dto;
+
+
+import com.izouma.nineth.domain.Rice;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.persistence.Column;
+
+@Data
+public class RiceDTO extends Rice {
+
+
+    @ApiModelProperty("当前用户排行")
+    @Column(name = "score_rank")
+    private Integer scoreRank;
+
+
+    @ApiModelProperty("是否上榜")
+    private boolean isOnTop100;
+
+    @ApiModelProperty("离上榜还差多少名")
+    private int rankGap;
+
+}

src/main/java/com/izouma/nineth/repo/RiceUserIntegralRecordRepo.java

@@ -1,16 +0,0 @@
-package com.izouma.nineth.repo;
-
-import com.izouma.nineth.domain.RiceUserIntegralRecord;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.data.jpa.repository.Modifying;
-import org.springframework.data.jpa.repository.Query;
-
-import javax.transaction.Transactional;
-
-public interface RiceUserIntegralRecordRepo extends JpaRepository<RiceUserIntegralRecord, Long>, JpaSpecificationExecutor<RiceUserIntegralRecord> {
-    @Query("update RiceUserIntegralRecord t set t.del = true where t.id = ?1")
-    @Modifying
-    @Transactional
-    void softDelete(Long id);
-}

src/main/java/com/izouma/nineth/repo/RiceUserIntegralRepo.java

@@ -1,16 +0,0 @@
-package com.izouma.nineth.repo;
-
-import com.izouma.nineth.domain.RiceUserIntegral;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.data.jpa.repository.Modifying;
-import org.springframework.data.jpa.repository.Query;
-
-import javax.transaction.Transactional;
-
-public interface RiceUserIntegralRepo extends JpaRepository<RiceUserIntegral, Long>, JpaSpecificationExecutor<RiceUserIntegral> {
-    @Query("update RiceUserIntegral t set t.del = true where t.id = ?1")
-    @Modifying
-    @Transactional
-    void softDelete(Long id);
-}

src/main/java/com/izouma/nineth/repo/RiceUserWaterDropRecordRepo.java

@@ -1,16 +0,0 @@
-package com.izouma.nineth.repo;
-
-import com.izouma.nineth.domain.RiceUserWaterDropRecord;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.data.jpa.repository.Modifying;
-import org.springframework.data.jpa.repository.Query;
-
-import javax.transaction.Transactional;
-
-public interface RiceUserWaterDropRecordRepo extends JpaRepository<RiceUserWaterDropRecord, Long>, JpaSpecificationExecutor<RiceUserWaterDropRecord> {
-    @Query("update RiceUserWaterDropRecord t set t.del = true where t.id = ?1")
-    @Modifying
-    @Transactional
-    void softDelete(Long id);
-}

src/main/java/com/izouma/nineth/repo/RiceUserWaterDropRepo.java

@@ -1,16 +0,0 @@
-package com.izouma.nineth.repo;
-
-import com.izouma.nineth.domain.RiceUserWaterDrop;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.data.jpa.repository.Modifying;
-import org.springframework.data.jpa.repository.Query;
-
-import javax.transaction.Transactional;
-
-public interface RiceUserWaterDropRepo extends JpaRepository<RiceUserWaterDrop, Long>, JpaSpecificationExecutor<RiceUserWaterDrop> {
-    @Query("update RiceUserWaterDrop t set t.del = true where t.id = ?1")
-    @Modifying
-    @Transactional
-    void softDelete(Long id);
-}

src/main/java/com/izouma/nineth/service/RiceService.java

@@ -4,6 +4,7 @@ import com.izouma.nineth.domain.Rice;
 import com.izouma.nineth.domain.User;
 import com.izouma.nineth.dto.PageQuery;
 import com.izouma.nineth.dto.R;
+import com.izouma.nineth.dto.RiceDTO;
 import com.izouma.nineth.exception.BusinessException;
 import com.izouma.nineth.repo.RiceRepo;
 import com.izouma.nineth.repo.UserRepo;
@@ -11,6 +12,7 @@ import com.izouma.nineth.utils.JpaUtils;
 import com.izouma.nineth.utils.SecurityUtils;
 import lombok.AllArgsConstructor;
 import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.stereotype.Service;
@@ -62,8 +64,8 @@ public class RiceService {
             Rice rice = byUserId.get();
             return rice;
         } else {
-            Rice rice = byUserId.get();
-//            Rice rice = new Rice();
+
+            Rice rice = new Rice();
             rice.setUserId(id);
             rice.setAvatar(avatar);
             rice.setNickname(nickname);
@@ -150,31 +152,55 @@ public class RiceService {
         allRices.sort(Comparator.comparing(Rice::getSelfScore).reversed());
         for (int i = 0; i < allRices.size(); i++) {
             Rice rice = allRices.get(i);
-            rice.setScoreRank(i + 1);
+//            rice.setScoreRank(i + 1);
             riceRepo.save(rice);
         }
     }
 
 
-    public List<Map<String, Object>> getTop100() {
+    public List<RiceDTO> getTop100(Long userId) {
         List<Rice> top100Rices = riceRepo.findTop100ByOrderBySelfScoreDesc();
-        List<Map<String, Object>> result = new ArrayList<>();
-        for (Rice rice : top100Rices) {
-            Map<String, Object> map = new HashMap<>();
-            map.put("avatarUrl", rice.getAvatar());
-            map.put("nickName", rice.getNickname());
-            map.put("level", rice.getLevel());
-            map.put("scoreRank", rice.getScoreRank());
-            map.put("selfScore", rice.getSelfScore());
-            result.add(map);
+        List<RiceDTO> result = new ArrayList<>();
+
+        // 计算自己的排名
+        int selfRank = 0;
+        for (int i = 0; i < top100Rices.size(); i++) {
+            if (top100Rices.get(i).getId().equals(userId)) {
+                selfRank = i + 1;
+                break;
+            }
+        }
+
+        for (int i = 0; i < top100Rices.size(); i++) {
+            Rice rice = top100Rices.get(i);
+            RiceDTO riceDTO = new RiceDTO();
+            BeanUtils.copyProperties(rice, riceDTO);
+            riceDTO.setScoreRank(i + 1);
+            // 判断是否上榜
+            if (i < 100) {
+                riceDTO.setOnTop100(true);
+            } else {
+                riceDTO.setOnTop100(false);
+            }
+            // 如果是自己，则设置自己的头像、昵称、等级和离上榜还差多少名
+            if (rice.getId().equals(userId)) {
+                riceDTO.setAvatar(rice.getAvatar());
+                riceDTO.setNickname(rice.getNickname());
+                riceDTO.setLevel(rice.getLevel());
+                if (i < 100) {
+                    riceDTO.setRankGap(0);
+                } else {
+                    riceDTO.setRankGap(i + 1 - 100);
+                }
+            }
+            result.add(riceDTO);
         }
         return result;
     }
 
-
     //浇水
     public R<? extends Object> watering() {
-        // 获取当前用户 ID，这里假设是 1
+        // 获取当前用户 ID，
         User authenticatedUser = SecurityUtils.getAuthenticatedUser();
         Long authId = authenticatedUser.getId();
         Optional<Rice> byUserId = riceRepo.findByUserId(authId);

src/main/java/com/izouma/nineth/service/RiceUserIntegralRecordService.java

@@ -1,20 +0,0 @@
-package com.izouma.nineth.service;
-
-import com.izouma.nineth.domain.RiceUserIntegralRecord;
-import com.izouma.nineth.dto.PageQuery;
-import com.izouma.nineth.repo.RiceUserIntegralRecordRepo;
-import com.izouma.nineth.utils.JpaUtils;
-import lombok.AllArgsConstructor;
-import org.springframework.data.domain.Page;
-import org.springframework.stereotype.Service;
-
-@Service
-@AllArgsConstructor
-public class RiceUserIntegralRecordService {
-
-    private RiceUserIntegralRecordRepo riceUserIntegralRecordRepo;
-
-    public Page<RiceUserIntegralRecord> all(PageQuery pageQuery) {
-        return riceUserIntegralRecordRepo.findAll(JpaUtils.toSpecification(pageQuery, RiceUserIntegralRecord.class), JpaUtils.toPageRequest(pageQuery));
-    }
-}

src/main/java/com/izouma/nineth/service/RiceUserIntegralService.java

@@ -1,20 +0,0 @@
-package com.izouma.nineth.service;
-
-import com.izouma.nineth.domain.RiceUserIntegral;
-import com.izouma.nineth.dto.PageQuery;
-import com.izouma.nineth.repo.RiceUserIntegralRepo;
-import com.izouma.nineth.utils.JpaUtils;
-import lombok.AllArgsConstructor;
-import org.springframework.data.domain.Page;
-import org.springframework.stereotype.Service;
-
-@Service
-@AllArgsConstructor
-public class RiceUserIntegralService {
-
-    private RiceUserIntegralRepo riceUserIntegralRepo;
-
-    public Page<RiceUserIntegral> all(PageQuery pageQuery) {
-        return riceUserIntegralRepo.findAll(JpaUtils.toSpecification(pageQuery, RiceUserIntegral.class), JpaUtils.toPageRequest(pageQuery));
-    }
-}

src/main/java/com/izouma/nineth/service/RiceUserWaterDropRecordService.java

@@ -1,20 +0,0 @@
-package com.izouma.nineth.service;
-
-import com.izouma.nineth.domain.RiceUserWaterDropRecord;
-import com.izouma.nineth.dto.PageQuery;
-import com.izouma.nineth.repo.RiceUserWaterDropRecordRepo;
-import com.izouma.nineth.utils.JpaUtils;
-import lombok.AllArgsConstructor;
-import org.springframework.data.domain.Page;
-import org.springframework.stereotype.Service;
-
-@Service
-@AllArgsConstructor
-public class RiceUserWaterDropRecordService {
-
-    private RiceUserWaterDropRecordRepo riceUserWaterDropRecordRepo;
-
-    public Page<RiceUserWaterDropRecord> all(PageQuery pageQuery) {
-        return riceUserWaterDropRecordRepo.findAll(JpaUtils.toSpecification(pageQuery, RiceUserWaterDropRecord.class), JpaUtils.toPageRequest(pageQuery));
-    }
-}

src/main/java/com/izouma/nineth/service/RiceUserWaterDropService.java

@@ -1,20 +0,0 @@
-package com.izouma.nineth.service;
-
-import com.izouma.nineth.domain.RiceUserWaterDrop;
-import com.izouma.nineth.dto.PageQuery;
-import com.izouma.nineth.repo.RiceUserWaterDropRepo;
-import com.izouma.nineth.utils.JpaUtils;
-import lombok.AllArgsConstructor;
-import org.springframework.data.domain.Page;
-import org.springframework.stereotype.Service;
-
-@Service
-@AllArgsConstructor
-public class RiceUserWaterDropService {
-
-    private RiceUserWaterDropRepo riceUserWaterDropRepo;
-
-    public Page<RiceUserWaterDrop> all(PageQuery pageQuery) {
-        return riceUserWaterDropRepo.findAll(JpaUtils.toSpecification(pageQuery, RiceUserWaterDrop.class), JpaUtils.toPageRequest(pageQuery));
-    }
-}

src/main/java/com/izouma/nineth/web/RiceController.java

@@ -5,6 +5,7 @@ import com.izouma.nineth.domain.Rice;
 import com.izouma.nineth.domain.User;
 import com.izouma.nineth.dto.PageQuery;
 import com.izouma.nineth.dto.R;
+import com.izouma.nineth.dto.RiceDTO;
 import com.izouma.nineth.exception.BusinessException;
 import com.izouma.nineth.repo.RiceRepo;
 import com.izouma.nineth.repo.SysConfigRepo;
@@ -119,8 +120,12 @@ public class RiceController extends BaseController {
 
     //一个获取积分排行榜的接口
     @GetMapping("/scoreRanking")
-    public R<List<Map<String, Object>>> getScoreRanking() {
-        List<Map<String, Object>> top100 = riceService.getTop100();
+    public R<List<RiceDTO>> getTop100AndSelf() {
+
+        // 获取当前用户的id，假设这个方法可以获取当前用户的id
+        User authenticatedUser = SecurityUtils.getAuthenticatedUser();
+        Long authId = authenticatedUser.getId();
+        List<RiceDTO> top100 = riceService.getTop100(authId);
         return R.success(top100);
     }
 
@@ -132,5 +137,8 @@ public class RiceController extends BaseController {
     }
 
 
+
+
+
 }
 

src/main/java/com/izouma/nineth/web/RiceUserIntegralController.java

@@ -1,60 +0,0 @@
-package com.izouma.nineth.web;
-
-import com.izouma.nineth.domain.RiceUserIntegral;
-import com.izouma.nineth.dto.PageQuery;
-import com.izouma.nineth.exception.BusinessException;
-import com.izouma.nineth.repo.RiceUserIntegralRepo;
-import com.izouma.nineth.service.RiceUserIntegralService;
-import com.izouma.nineth.utils.ObjUtils;
-import com.izouma.nineth.utils.excel.ExcelUtils;
-import lombok.AllArgsConstructor;
-import org.springframework.data.domain.Page;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.util.List;
-
-@RestController
-@RequestMapping("/riceUserIntegral")
-@AllArgsConstructor
-public class RiceUserIntegralController extends BaseController {
-    private RiceUserIntegralService riceUserIntegralService;
-    private RiceUserIntegralRepo riceUserIntegralRepo;
-
-    //@PreAuthorize("hasRole('ADMIN')")
-    @PostMapping("/save")
-    public RiceUserIntegral save(@RequestBody RiceUserIntegral record) {
-        if (record.getId() != null) {
-            RiceUserIntegral orig = riceUserIntegralRepo.findById(record.getId()).orElseThrow(new BusinessException("无记录"));
-            ObjUtils.merge(orig, record);
-            return riceUserIntegralRepo.save(orig);
-        }
-        return riceUserIntegralRepo.save(record);
-    }
-
-
-    //@PreAuthorize("hasRole('ADMIN')")
-    @PostMapping("/all")
-    public Page<RiceUserIntegral> all(@RequestBody PageQuery pageQuery) {
-        return riceUserIntegralService.all(pageQuery);
-    }
-
-    @GetMapping("/get/{id}")
-    public RiceUserIntegral get(@PathVariable Long id) {
-        return riceUserIntegralRepo.findById(id).orElseThrow(new BusinessException("无记录"));
-    }
-
-    @PostMapping("/del/{id}")
-    public void del(@PathVariable Long id) {
-        riceUserIntegralRepo.softDelete(id);
-    }
-
-    @GetMapping("/excel")
-    @ResponseBody
-    public void excel(HttpServletResponse response, PageQuery pageQuery) throws IOException {
-        List<RiceUserIntegral> data = all(pageQuery).getContent();
-        ExcelUtils.export(response, data);
-    }
-}
-

src/main/java/com/izouma/nineth/web/RiceUserIntegralRecordController.java

@@ -1,60 +0,0 @@
-package com.izouma.nineth.web;
-
-import com.izouma.nineth.domain.RiceUserIntegralRecord;
-import com.izouma.nineth.dto.PageQuery;
-import com.izouma.nineth.exception.BusinessException;
-import com.izouma.nineth.repo.RiceUserIntegralRecordRepo;
-import com.izouma.nineth.service.RiceUserIntegralRecordService;
-import com.izouma.nineth.utils.ObjUtils;
-import com.izouma.nineth.utils.excel.ExcelUtils;
-import lombok.AllArgsConstructor;
-import org.springframework.data.domain.Page;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.util.List;
-
-@RestController
-@RequestMapping("/riceUserIntegralRecord")
-@AllArgsConstructor
-public class RiceUserIntegralRecordController extends BaseController {
-    private RiceUserIntegralRecordService riceUserIntegralRecordService;
-    private RiceUserIntegralRecordRepo riceUserIntegralRecordRepo;
-
-    //@PreAuthorize("hasRole('ADMIN')")
-    @PostMapping("/save")
-    public RiceUserIntegralRecord save(@RequestBody RiceUserIntegralRecord record) {
-        if (record.getId() != null) {
-            RiceUserIntegralRecord orig = riceUserIntegralRecordRepo.findById(record.getId()).orElseThrow(new BusinessException("无记录"));
-            ObjUtils.merge(orig, record);
-            return riceUserIntegralRecordRepo.save(orig);
-        }
-        return riceUserIntegralRecordRepo.save(record);
-    }
-
-
-    //@PreAuthorize("hasRole('ADMIN')")
-    @PostMapping("/all")
-    public Page<RiceUserIntegralRecord> all(@RequestBody PageQuery pageQuery) {
-        return riceUserIntegralRecordService.all(pageQuery);
-    }
-
-    @GetMapping("/get/{id}")
-    public RiceUserIntegralRecord get(@PathVariable Long id) {
-        return riceUserIntegralRecordRepo.findById(id).orElseThrow(new BusinessException("无记录"));
-    }
-
-    @PostMapping("/del/{id}")
-    public void del(@PathVariable Long id) {
-        riceUserIntegralRecordRepo.softDelete(id);
-    }
-
-    @GetMapping("/excel")
-    @ResponseBody
-    public void excel(HttpServletResponse response, PageQuery pageQuery) throws IOException {
-        List<RiceUserIntegralRecord> data = all(pageQuery).getContent();
-        ExcelUtils.export(response, data);
-    }
-}
-

src/main/java/com/izouma/nineth/web/RiceUserWaterDropController.java

@@ -1,60 +0,0 @@
-package com.izouma.nineth.web;
-
-import com.izouma.nineth.domain.RiceUserWaterDrop;
-import com.izouma.nineth.dto.PageQuery;
-import com.izouma.nineth.exception.BusinessException;
-import com.izouma.nineth.repo.RiceUserWaterDropRepo;
-import com.izouma.nineth.service.RiceUserWaterDropService;
-import com.izouma.nineth.utils.ObjUtils;
-import com.izouma.nineth.utils.excel.ExcelUtils;
-import lombok.AllArgsConstructor;
-import org.springframework.data.domain.Page;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.util.List;
-
-@RestController
-@RequestMapping("/riceUserWaterDrop")
-@AllArgsConstructor
-public class RiceUserWaterDropController extends BaseController {
-    private RiceUserWaterDropService riceUserWaterDropService;
-    private RiceUserWaterDropRepo riceUserWaterDropRepo;
-
-    //@PreAuthorize("hasRole('ADMIN')")
-    @PostMapping("/save")
-    public RiceUserWaterDrop save(@RequestBody RiceUserWaterDrop record) {
-        if (record.getId() != null) {
-            RiceUserWaterDrop orig = riceUserWaterDropRepo.findById(record.getId()).orElseThrow(new BusinessException("无记录"));
-            ObjUtils.merge(orig, record);
-            return riceUserWaterDropRepo.save(orig);
-        }
-        return riceUserWaterDropRepo.save(record);
-    }
-
-
-    //@PreAuthorize("hasRole('ADMIN')")
-    @PostMapping("/all")
-    public Page<RiceUserWaterDrop> all(@RequestBody PageQuery pageQuery) {
-        return riceUserWaterDropService.all(pageQuery);
-    }
-
-    @GetMapping("/get/{id}")
-    public RiceUserWaterDrop get(@PathVariable Long id) {
-        return riceUserWaterDropRepo.findById(id).orElseThrow(new BusinessException("无记录"));
-    }
-
-    @PostMapping("/del/{id}")
-    public void del(@PathVariable Long id) {
-        riceUserWaterDropRepo.softDelete(id);
-    }
-
-    @GetMapping("/excel")
-    @ResponseBody
-    public void excel(HttpServletResponse response, PageQuery pageQuery) throws IOException {
-        List<RiceUserWaterDrop> data = all(pageQuery).getContent();
-        ExcelUtils.export(response, data);
-    }
-}
-

src/main/java/com/izouma/nineth/web/RiceUserWaterDropRecordController.java

@@ -1,60 +0,0 @@
-package com.izouma.nineth.web;
-
-import com.izouma.nineth.domain.RiceUserWaterDropRecord;
-import com.izouma.nineth.dto.PageQuery;
-import com.izouma.nineth.exception.BusinessException;
-import com.izouma.nineth.repo.RiceUserWaterDropRecordRepo;
-import com.izouma.nineth.service.RiceUserWaterDropRecordService;
-import com.izouma.nineth.utils.ObjUtils;
-import com.izouma.nineth.utils.excel.ExcelUtils;
-import lombok.AllArgsConstructor;
-import org.springframework.data.domain.Page;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.util.List;
-
-@RestController
-@RequestMapping("/riceUserWaterDropRecord")
-@AllArgsConstructor
-public class RiceUserWaterDropRecordController extends BaseController {
-    private RiceUserWaterDropRecordService riceUserWaterDropRecordService;
-    private RiceUserWaterDropRecordRepo riceUserWaterDropRecordRepo;
-
-    //@PreAuthorize("hasRole('ADMIN')")
-    @PostMapping("/save")
-    public RiceUserWaterDropRecord save(@RequestBody RiceUserWaterDropRecord record) {
-        if (record.getId() != null) {
-            RiceUserWaterDropRecord orig = riceUserWaterDropRecordRepo.findById(record.getId()).orElseThrow(new BusinessException("无记录"));
-            ObjUtils.merge(orig, record);
-            return riceUserWaterDropRecordRepo.save(orig);
-        }
-        return riceUserWaterDropRecordRepo.save(record);
-    }
-
-
-    //@PreAuthorize("hasRole('ADMIN')")
-    @PostMapping("/all")
-    public Page<RiceUserWaterDropRecord> all(@RequestBody PageQuery pageQuery) {
-        return riceUserWaterDropRecordService.all(pageQuery);
-    }
-
-    @GetMapping("/get/{id}")
-    public RiceUserWaterDropRecord get(@PathVariable Long id) {
-        return riceUserWaterDropRecordRepo.findById(id).orElseThrow(new BusinessException("无记录"));
-    }
-
-    @PostMapping("/del/{id}")
-    public void del(@PathVariable Long id) {
-        riceUserWaterDropRecordRepo.softDelete(id);
-    }
-
-    @GetMapping("/excel")
-    @ResponseBody
-    public void excel(HttpServletResponse response, PageQuery pageQuery) throws IOException {
-        List<RiceUserWaterDropRecord> data = all(pageQuery).getContent();
-        ExcelUtils.export(response, data);
-    }
-}
-