修改名字更新

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

@@ -25,7 +25,7 @@ public interface RiceRepo extends JpaRepository<Rice, Long>, JpaSpecificationExe
     @Query("update Rice t set t.nickname = ?2 where t.userId = ?1")
     @Modifying
     @Transactional
-    void updateNickName(Long userId, String nickname);
+    void updateNickName(String userId, String nickname);
 
 
 

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

@@ -0,0 +1,20 @@
+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;
+import java.time.LocalDateTime;
+
+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);
+
+
+    long countByUserIdAndWateringTimeAfter(Long userId, LocalDateTime startOfToday);
+}

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

@@ -80,7 +80,7 @@ public class RiceService {
     }
 
 
-    public R updateNickName(Long userId, String nickname) {
+    public R updateNickName(String userId, String nickname) {
         String trimmedNickname = StringUtils.trim(nickname);
         if (trimmedNickname.length() > MAX_NICKNAME_LENGTH) {
             return R.error("昵称不能超过" + MAX_NICKNAME_LENGTH + "个字符");

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

@@ -0,0 +1,20 @@
+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/web/RiceController.java

@@ -92,7 +92,7 @@ public class RiceController extends BaseController {
 
     //修改用户昵称
     @PostMapping("/updateNickName")
-    public R updateNickName(@RequestParam("userId") Long userId, @RequestParam("nickname") String nickname) {
+    public R updateNickName(@RequestParam("userId") String userId, @RequestParam("nickname") String nickname) {
         return riceService.updateNickName(userId, nickname);
     }
 

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

@@ -0,0 +1,60 @@
+package com.izouma.nineth.web;
+import com.izouma.nineth.domain.RiceUserWaterDropRecord;
+import com.izouma.nineth.service.RiceUserWaterDropRecordService;
+import com.izouma.nineth.dto.PageQuery;
+import com.izouma.nineth.exception.BusinessException;
+import com.izouma.nineth.repo.RiceUserWaterDropRecordRepo;
+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.security.access.prepost.PreAuthorize;
+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);
+    }
+}
+

src/main/vue/.env.development

@@ -1 +1 @@
-VUE_APP_BASE_URL=https://test.raex.vip/
+VUE_APP_BASE_URL=http://localhost:8080/

src/main/vue/src/router.js

@@ -1829,6 +1829,22 @@ const router = new Router({
                     meta: {
                        title: '频道管理',
                     },
+               },
+                {
+                    path: '/riceUserWaterDropRecordEdit',
+                    name: 'RiceUserWaterDropRecordEdit',
+                    component: () => import(/* webpackChunkName: "riceUserWaterDropRecordEdit" */ '@/views/RiceUserWaterDropRecordEdit.vue'),
+                    meta: {
+                       title: '水滴记录表编辑',
+                    },
+                },
+                {
+                    path: '/riceUserWaterDropRecordList',
+                    name: 'RiceUserWaterDropRecordList',
+                    component: () => import(/* webpackChunkName: "riceUserWaterDropRecordList" */ '@/views/RiceUserWaterDropRecordList.vue'),
+                    meta: {
+                       title: '水滴记录表',
+                    },
                }
                 /**INSERT_LOCATION**/
             ]

src/main/vue/src/views/RiceUserWaterDropRecordEdit.vue

@@ -9,23 +9,19 @@
         </page-title>
         <div class="edit-view__content-wrapper">
             <div class="edit-view__content-section">
-                <el-form :model="formData" :rules="rules" ref="form" label-width="136px" label-position="right"
+                <el-form :model="formData" :rules="rules" ref="form" label-width="114px" label-position="right"
                          size="small"
                          style="max-width: 500px;">
-                        <el-form-item prop="userId" label="用户id">
+                        <el-form-item prop="userId" label="userId">
                                     <el-input-number type="number" v-model="formData.userId"></el-input-number>
                         </el-form-item>
-                        <el-form-item prop="beforeNum" label="操作前水滴数量">
-                                    <el-input v-model="formData.beforeNum"></el-input>
-                        </el-form-item>
-                        <el-form-item prop="operationNum" label="本次操作水滴数量">
-                                    <el-input v-model="formData.operationNum"></el-input>
-                        </el-form-item>
-                        <el-form-item prop="afterNum" label="操作后水滴数量">
-                                    <el-input v-model="formData.afterNum"></el-input>
-                        </el-form-item>
-                        <el-form-item prop="remark" label="备注">
-                                    <el-input v-model="formData.remark"></el-input>
+                        <el-form-item prop="wateringTime" label="wateringTime">
+                                    <el-date-picker
+                                            v-model="formData.wateringTime"
+                                            type="datetime"
+                                            value-format="yyyy-MM-dd HH:mm:ss"
+                                            placeholder="选择日期时间">
+                                    </el-date-picker>
                         </el-form-item>
                     <el-form-item class="form-submit">
                         <el-button @click="onSave" :loading="saving" type="primary">

src/main/vue/src/views/RiceUserWaterDropRecordList.vue

@@ -29,19 +29,10 @@
             </el-table-column>
             <el-table-column prop="id" label="ID" width="100">
             </el-table-column>
-                                <el-table-column prop="userId" label="用户id"
+                                <el-table-column prop="userId" label="userId"
 >
                     </el-table-column>
-                    <el-table-column prop="beforeNum" label="操作前水滴数量"
->
-                    </el-table-column>
-                    <el-table-column prop="operationNum" label="本次操作水滴数量"
->
-                    </el-table-column>
-                    <el-table-column prop="afterNum" label="操作后水滴数量"
->
-                    </el-table-column>
-                    <el-table-column prop="remark" label="备注"
+                    <el-table-column prop="wateringTime" label="wateringTime"
 >
                     </el-table-column>
             <el-table-column