Merge branch 'han' of uskycloud/usky-modules into server-165

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/DataJinganPersonController.java

@@ -1,7 +1,14 @@
 package com.usky.fire.controller.web;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.usky.common.core.bean.ApiResult;
+import com.usky.common.core.bean.CommonPage;
+import com.usky.fire.domain.DataJinganAnalysis;
+import com.usky.fire.domain.DataJinganPerson;
+import com.usky.fire.service.DataJinganAnalysisService;
+import com.usky.fire.service.DataJinganPersonService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
 
 import org.springframework.stereotype.Controller;
 
@@ -13,9 +20,38 @@ import org.springframework.stereotype.Controller;
  * @author han
  * @since 2024-03-07
  */
-@Controller
+@RestController
 @RequestMapping("/dataJinganPerson")
 public class DataJinganPersonController {
+    @Autowired
+    private DataJinganPersonService dataJinganPersonService;
 
+    /**
+     * 人工督察单管理-人工督察单列表查询
+     *
+     * @param id  主键ID
+     * @param handleStatus  处理状态
+     * @param pageNum      当前页
+     * @param pageSize     每页条数
+     * @return
+     */
+    @GetMapping("personList")
+    public ApiResult<CommonPage<DataJinganPerson>> personList(@RequestParam(value = "id", required = false) Integer id,
+                                                              @RequestParam(value = "handleStatus", required = false) Integer handleStatus,
+                                                              @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum,
+                                                              @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize) {
+        return ApiResult.success(dataJinganPersonService.personList(id,handleStatus,pageNum, pageSize));
+    }
+
+    /**
+     * 修改
+     * @param dataJinganPerson
+     * @return
+     */
+    @PutMapping
+    public ApiResult<Void> update(@RequestBody DataJinganPerson dataJinganPerson){
+        dataJinganPersonService.update(dataJinganPerson);
+        return ApiResult.success();
+    }
 }
 

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/DataJinganPersonService.java

@@ -1,5 +1,7 @@
 package com.usky.fire.service;
 
+import com.usky.common.core.bean.CommonPage;
+import com.usky.fire.domain.DataJinganAnalysis;
 import com.usky.fire.domain.DataJinganPerson;
 import com.usky.common.mybatis.core.CrudService;
 
@@ -12,5 +14,16 @@ import com.usky.common.mybatis.core.CrudService;
  * @since 2024-03-07
  */
 public interface DataJinganPersonService extends CrudService<DataJinganPerson> {
+    /**
+     * 人工督察单管理-人工督察单列表查询
+     *
+     * @param id  主键ID
+     * @param handleStatus  处理状态
+     * @param pageNum      当前页
+     * @param pageSize     每页条数
+     * @return
+     */
+    CommonPage<DataJinganPerson> personList(Integer id, Integer handleStatus, Integer pageNum, Integer pageSize);
 
+    void update(DataJinganPerson dataJinganPerson);
 }

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/DataJinganAnalysisServiceImpl.java

@@ -32,7 +32,7 @@ public class DataJinganAnalysisServiceImpl extends AbstractCrudService<DataJinga
                                                        Integer pageSize) {
         IPage<DataJinganAnalysis> page = new Page<>(pageNum, pageSize);
         LambdaQueryWrapper<DataJinganAnalysis> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper
+        queryWrapper.eq(DataJinganAnalysis::getTenantId, SecurityUtils.getTenantId())
                 .eq(null != handleStatus,DataJinganAnalysis::getHandleStatus, handleStatus)
                 .eq(null != id,DataJinganAnalysis::getId, id)
                 .orderByDesc(DataJinganAnalysis::getId);

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/DataJinganPersonServiceImpl.java

@@ -1,11 +1,20 @@
 package com.usky.fire.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.usky.common.core.bean.CommonPage;
+import com.usky.common.security.utils.SecurityUtils;
+import com.usky.fire.domain.DataJinganAnalysis;
 import com.usky.fire.domain.DataJinganPerson;
 import com.usky.fire.mapper.DataJinganPersonMapper;
 import com.usky.fire.service.DataJinganPersonService;
 import com.usky.common.mybatis.core.AbstractCrudService;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
+
 /**
  * <p>
  *  服务实现类
@@ -16,5 +25,23 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class DataJinganPersonServiceImpl extends AbstractCrudService<DataJinganPersonMapper, DataJinganPerson> implements DataJinganPersonService {
+    @Override
+    public CommonPage<DataJinganPerson> personList(Integer id, Integer handleStatus, Integer pageNum, Integer pageSize) {
+        IPage<DataJinganPerson> page = new Page<>(pageNum, pageSize);
+        LambdaQueryWrapper<DataJinganPerson> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.eq(DataJinganPerson::getTenantId, SecurityUtils.getTenantId())
+                .eq(null != handleStatus,DataJinganPerson::getHandleStatus, handleStatus)
+                .eq(null != id,DataJinganPerson::getId, id)
+                .orderByDesc(DataJinganPerson::getId);
+        page = this.page(page,queryWrapper);
+        return new CommonPage<>(page.getRecords(),page.getTotal(),page.getCurrent(),page.getSize());
+    }
 
+    public void update(DataJinganPerson dataJinganPerson){
+        dataJinganPerson.setHandleStatus(1);
+        dataJinganPerson.setHandleBy(SecurityUtils.getUsername());
+        dataJinganPerson.setHandleTime(LocalDateTime.now());
+        dataJinganPerson.setHandlePhone(SecurityUtils.getLoginUser().getSysUser().getPhonenumber());
+        this.updateById(dataJinganPerson);
+    }
 }