更新班次逻辑删除及列表查询

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/DutyShiftController.java

 package com.yeejoin.amos.boot.module.common.biz.controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.Api;
-import org.springframework.web.bind.annotation.RestController;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
-import java.util.List;
+import com.yeejoin.amos.boot.module.common.api.dto.DutyShiftDto;
+import com.yeejoin.amos.boot.module.common.api.entity.DutyShift;
 import com.yeejoin.amos.boot.module.common.biz.service.impl.DutyShiftServiceImpl;
-import org.typroject.tyboot.core.restful.utils.ResponseHelper;
-import org.typroject.tyboot.core.restful.utils.ResponseModel;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import javax.servlet.http.HttpServletRequest;
 import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yeejoin.amos.boot.module.common.api.dto.DutyShiftDto;
-import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
 
 
 /**
@@ -38,8 +39,10 @@ public class DutyShiftController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/save")
 	@ApiOperation(httpMethod = "POST", value = "新增值班班次", notes = "新增值班班次")
-	public ResponseModel<DutyShiftDto> save(@RequestBody DutyShiftDto model)
+	public ResponseModel<DutyShiftDto> save(HttpServletRequest request, @RequestBody DutyShiftDto model)
 	{
+		String appKey = request.getHeader("appKey");
+		model.setAppKey(appKey);
 	    model=dutyShiftServiceImpl.createWithModel(model);
 	    return ResponseHelper.buildResponse(model);
 	}
@@ -51,7 +54,9 @@ public class DutyShiftController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PutMapping(value = "/{sequenceNbr}")
 	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新值班班次", notes = "根据sequenceNbr更新值班班次")
-	public ResponseModel<DutyShiftDto> updateBySequenceNbrDutyShift(@RequestBody DutyShiftDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+	public ResponseModel<DutyShiftDto> updateBySequenceNbrDutyShift(HttpServletRequest request, @RequestBody DutyShiftDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+		String appKey = request.getHeader("appKey");
+		model.setAppKey(appKey);
 		model.setSequenceNbr(sequenceNbr);
 	    return ResponseHelper.buildResponse(dutyShiftServiceImpl.updateWithModel(model));
 	}
@@ -63,8 +68,12 @@ public class DutyShiftController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @DeleteMapping(value = "/{sequenceNbr}")
     @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除值班班次", notes = "根据sequenceNbr删除值班班次")
-    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
-        return ResponseHelper.buildResponse(dutyShiftServiceImpl.removeById(sequenceNbr));
+    public ResponseModel<Boolean> deleteBySequenceNbr(@PathVariable(value = "sequenceNbr") Long sequenceNbr){
+		DutyShift dutyShift = dutyShiftServiceImpl.getById(sequenceNbr);
+		if (null != dutyShift) {
+			dutyShift.setIsDelete(true);
+		}
+        return ResponseHelper.buildResponse(dutyShiftServiceImpl.updateById(dutyShift));
     }
     /**
              * 根据sequenceNbr查询
@@ -87,12 +96,13 @@ public class DutyShiftController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/page")
 	@ApiOperation(httpMethod = "GET",value = "值班班次分页查询",  notes = "值班班次分页查询")
-	public ResponseModel<Page<DutyShiftDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam(value = "size") int size)
+	public ResponseModel<Page<DutyShiftDto>> queryForPage(HttpServletRequest request, @RequestParam(value = "current") int current,@RequestParam(value = "size") int size)
 	{
+		String appKey = request.getHeader("appKey");
 		Page<DutyShiftDto> page=new Page<DutyShiftDto>();
 	    page.setCurrent(current);
 	    page.setSize(size);
-	    return ResponseHelper.buildResponse(dutyShiftServiceImpl.queryForDutyShiftPage(page));
+	    return ResponseHelper.buildResponse(dutyShiftServiceImpl.queryForDutyShiftPage(page, appKey));
 	}
 	/**
 	*列表全部数据查询
@@ -101,8 +111,9 @@ public class DutyShiftController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@ApiOperation(httpMethod = "GET",value = "值班班次列表全部数据查询",   notes = "值班班次列表全部数据查询")
 	@GetMapping(value = "/list")
-	public ResponseModel<List<DutyShiftDto>>  selectForList()
+	public ResponseModel<List<DutyShiftDto>>  selectForList(HttpServletRequest request)
 	{
-	    return ResponseHelper.buildResponse(dutyShiftServiceImpl.queryForDutyShiftList());
+		String appKey = request.getHeader("appKey");
+	    return ResponseHelper.buildResponse(dutyShiftServiceImpl.queryForDutyShiftList(appKey));
 	}
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/DutyShiftServiceImpl.java

@@ -19,14 +19,14 @@ public class DutyShiftServiceImpl extends BaseService<DutyShiftDto,DutyShift,Dut
         /**
                             * 分页查询
          */
-        public Page<DutyShiftDto> queryForDutyShiftPage(Page<DutyShiftDto> page)   {
-                return this.queryForPage(page, null, false);
+        public Page<DutyShiftDto> queryForDutyShiftPage(Page<DutyShiftDto> page, String appKey)   {
+                return this.queryForPage(page, null, false, appKey);
         }
 
         /**
                             * 列表查询 示例
          */
-        public List<DutyShiftDto> queryForDutyShiftList()   {
-                return this.queryForList("" , false);
+        public List<DutyShiftDto> queryForDutyShiftList(String appKey)   {
+                return this.queryForList("" , false, appKey);
         }
 }