Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer

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

@@ -14,6 +14,7 @@ import java.util.*;
 import java.util.stream.Collectors;
 
 import com.yeejoin.amos.boot.module.common.biz.service.impl.DutyPersonShiftServiceImpl;
+import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -50,6 +51,8 @@ public class DutyPersonShiftController extends BaseController {
 	@ApiOperation(httpMethod = "POST", value = "新增值班人员日期关联关系表", notes = "新增值班人员日期关联关系表")
 	public ResponseModel<DutyPersonShiftDto> save(@RequestBody DutyPersonShiftDto model)
 	{
+		String appKey = RequestContext.getAppKey();
+		model.setAppKey(appKey);
 	    model=dutyPersonShiftServiceImpl.createWithModel(model);
 	    return ResponseHelper.buildResponse(model);
 	}
@@ -62,7 +65,9 @@ public class DutyPersonShiftController extends BaseController {
 	@PutMapping(value = "/{sequenceNbr}")
 	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新值班人员日期关联关系表", notes = "根据sequenceNbr更新值班人员日期关联关系表")
 	public ResponseModel<DutyPersonShiftDto> updateBySequenceNbrDutyPersonShift(@RequestBody DutyPersonShiftDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
-	    model.setSequenceNbr(sequenceNbr);
+		String appKey = RequestContext.getAppKey();
+		model.setAppKey(appKey);
+		model.setSequenceNbr(sequenceNbr);
 	    return ResponseHelper.buildResponse(dutyPersonShiftServiceImpl.updateWithModel(model));
 	}
 	/**

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

@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.common.biz.controller;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 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 io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -18,11 +19,11 @@ import java.util.List;
 
 
 /**
- * 值班班次
- *
- * @author system_generator
- * @date 2021-07-06
- */
+* 值班班次
+*
+* @author system_generator
+* @date 2021-07-06
+*/
 @RestController
 @Api(tags = "值班班次Api")
 @RequestMapping(value = "/common/duty-shift")
@@ -32,84 +33,87 @@ public class DutyShiftController extends BaseController {
     DutyShiftServiceImpl dutyShiftServiceImpl;
 
     /**
-     * 新增值班班次
-     *
-     * @return
-     */
+             * 新增值班班次
+    * @return
+    */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @PostMapping(value = "/save")
-    @ApiOperation(httpMethod = "POST", value = "新增值班班次", notes = "新增值班班次")
-    public ResponseModel<DutyShiftDto> save(@RequestBody DutyShiftDto model) {
-        model = dutyShiftServiceImpl.createWithModel(model);
-        return ResponseHelper.buildResponse(model);
-    }
-
-    /**
-     * 根据sequenceNbr更新
-     *
-     * @param sequenceNbr 主键
-     * @return
-     */
-    @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) {
-        model.setSequenceNbr(sequenceNbr);
-        return ResponseHelper.buildResponse(dutyShiftServiceImpl.updateWithModel(model));
-    }
-
-    /**
-     * 根据sequenceNbr删除
-     *
-     * @param sequenceNbr 主键
-     * @return
-     */
+	@PostMapping(value = "/save")
+	@ApiOperation(httpMethod = "POST", value = "新增值班班次", notes = "新增值班班次")
+	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);
+	}
+	/**
+             * 根据sequenceNbr更新
+    * @param sequenceNbr 主键
+    * @return
+    */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PutMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新值班班次", notes = "根据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));
+	}
+	/**
+             * 根据sequenceNbr删除
+    * @param sequenceNbr 主键
+    * @return
+    */
     @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));
-    }
-
-    /**
-     * 根据sequenceNbr查询
-     *
-     * @param sequenceNbr 主键
-     * @return
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @GetMapping(value = "/{sequenceNbr}")
-    @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个值班班次", notes = "根据sequenceNbr查询单个值班班次")
-    public ResponseModel<DutyShiftDto> seleteOne(@PathVariable Long sequenceNbr) {
-        return ResponseHelper.buildResponse(dutyShiftServiceImpl.queryBySeq(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));
     }
-
     /**
-     * 列表分页查询
-     *
-     * @param current 当前页
-     * @param current 每页大小
-     * @return
-     */
-    @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) {
-        Page<DutyShiftDto> page = new Page<DutyShiftDto>();
-        page.setCurrent(current);
-        page.setSize(size);
-        return ResponseHelper.buildResponse(dutyShiftServiceImpl.queryForDutyShiftPage(page));
-    }
-
-    /**
-     * 列表全部数据查询
-     *
-     * @return
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @ApiOperation(httpMethod = "GET", value = "值班班次列表全部数据查询", notes = "值班班次列表全部数据查询")
-    @GetMapping(value = "/list")
-    public ResponseModel<List<DutyShiftDto>> selectForList() {
-        return ResponseHelper.buildResponse(dutyShiftServiceImpl.queryForDutyShiftList());
-    }
+             * 根据sequenceNbr查询
+    * @param sequenceNbr  主键
+    * @return
+    */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个值班班次",  notes = "根据sequenceNbr查询单个值班班次")
+	public ResponseModel<DutyShiftDto> seleteOne(@PathVariable Long sequenceNbr)
+	{
+	    return ResponseHelper.buildResponse(dutyShiftServiceImpl.queryBySeq(sequenceNbr));
+	}
+	/**
+             * 列表分页查询
+    *@param current 当前页
+    *@param current 每页大小
+    * @return
+    */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/page")
+	@ApiOperation(httpMethod = "GET",value = "值班班次分页查询",  notes = "值班班次分页查询")
+	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, appKey));
+	}
+	/**
+	*列表全部数据查询
+	*@return
+	*/
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "值班班次列表全部数据查询",   notes = "值班班次列表全部数据查询")
+	@GetMapping(value = "/list")
+	public ResponseModel<List<DutyShiftDto>>  selectForList(HttpServletRequest request)
+	{
+		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

@@ -9,26 +9,25 @@ import org.springframework.stereotype.Service;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 
 import java.util.List;
-
 /**
- * 值班班次服务实现类
- *
- * @author system_generator
- * @date 2021-07-06
- */
+* 值班班次服务实现类
+*
+* @author system_generator
+* @date 2021-07-06
+*/
 @Service
-public class DutyShiftServiceImpl extends BaseService<DutyShiftDto, DutyShift, DutyShiftMapper> implements IDutyShiftService {
-    /**
-     * 分页查询
-     */
-    public Page<DutyShiftDto> queryForDutyShiftPage(Page<DutyShiftDto> page) {
-        return this.queryForPage(page, null, false);
-    }
+public class DutyShiftServiceImpl extends BaseService<DutyShiftDto,DutyShift,DutyShiftMapper> implements IDutyShiftService {
+        /**
+         * 分页查询
+         */
+        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);
+        }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/ExcelController.java

@@ -527,7 +527,7 @@ public class ExcelController extends BaseController {
 
     private String[] getDutyNameList() {
         List<String> dutyShiftList = new ArrayList<>();
-        List<DutyShiftDto> dutyShiftDtoList = dutyShiftService.queryForDutyShiftList();
+        List<DutyShiftDto> dutyShiftDtoList = dutyShiftService.queryForDutyShiftList(null);
         dutyShiftDtoList.forEach(item -> dutyShiftList.add(item.getName() + "@" + item.getSequenceNbr()));
         String[] dutyNameList = dutyShiftList.toArray(new String[dutyShiftList.size()]);
         return dutyNameList;