Skip to content

A
amos-boot-biz
Commit 1c25877f authored by suhuiguang's avatar suhuiguang
Browse files
Options

1.代码格式化 删除不用的controlller

parent f2bfd82d
Hide whitespace changes
Inline Side-by-side
Showing with 107 additions and 251 deletions
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 deleted 100644 → 0
View file @ f2bfd82d
package com.yeejoin.amos.boot.module.common.biz.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.yeejoin.amos.boot.biz.common.feign.AmosFeignService;
import com.yeejoin.amos.boot.module.common.api.entity.DutyPersonShift;
import com.yeejoin.amos.feign.systemctl.model.DictionarieValueModel;
import org.springframework.beans.factory.annotation.Value;
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.yeejoin.amos.boot.biz.common.controller.BaseController;
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;
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.DutyPersonShiftDto;
import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import org.typroject.tyboot.core.foundation.enumeration.UserType;
/**
* 值班人员日期关联关系表
*
* @author system_generator
* @date 2021-07-06
*/
@RestController
@Api(tags = "值班人员日期关联关系表Api")
@RequestMapping(value = "/common/duty-person-shift")
public class DutyPersonShiftController extends BaseController {
@Autowired
DutyPersonShiftServiceImpl dutyPersonShiftServiceImpl;
@Autowired
AmosFeignService amosFeignService;
/**
* 新增值班人员日期关联关系表
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/save")
@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);
}
/**
* 根据sequenceNbr更新
* @param sequenceNbr 主键
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PutMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新值班人员日期关联关系表", notes = "根据sequenceNbr更新值班人员日期关联关系表")
public ResponseModel<DutyPersonShiftDto> updateBySequenceNbrDutyPersonShift(@RequestBody DutyPersonShiftDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
String appKey = RequestContext.getAppKey();
model.setAppKey(appKey);
model.setSequenceNbr(sequenceNbr);
return ResponseHelper.buildResponse(dutyPersonShiftServiceImpl.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){
DutyPersonShift shift = dutyPersonShiftServiceImpl.getById(sequenceNbr);
Long instanceId = shift.getInstanceId();
Long dateTime = shift.getDutyDate().getTime();
List<Long> shifts = new ArrayList<>();
List<DutyPersonShift> list = dutyPersonShiftServiceImpl.list(new QueryWrapper<DutyPersonShift>().eq("instance_id", instanceId));
list.forEach(x -> {
if (dateTime >= x.getDutyDate().getTime()) {
shifts.add(x.getSequenceNbr());
}
});
return ResponseHelper.buildResponse(dutyPersonShiftServiceImpl.removeByIds(shifts));
}
/**
* 根据sequenceNbr查询
* @param sequenceNbr 主键
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个值班人员日期关联关系表", notes = "根据sequenceNbr查询单个值班人员日期关联关系表")
public ResponseModel<DutyPersonShiftDto> seleteOne(@PathVariable Long sequenceNbr)
{
return ResponseHelper.buildResponse(dutyPersonShiftServiceImpl.queryBySeq(sequenceNbr));
}
/**
* 列表分页查询
*@param current 当前页
*@param current 每页大小
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/page")
@ApiOperation(httpMethod = "GET",value = "值班人员日期关联关系表分页查询", notes = "值班人员日期关联关系表分页查询")
public ResponseModel<Page<DutyPersonShiftDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam(value = "size") int size)
{
Page<DutyPersonShiftDto> page=new Page<DutyPersonShiftDto>();
page.setCurrent(current);
page.setSize(size);
return ResponseHelper.buildResponse(dutyPersonShiftServiceImpl.queryForDutyPersonShiftPage(page));
}
/**
*列表全部数据查询
*@return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET",value = "值班人员日期关联关系表列表全部数据查询", notes = "值班人员日期关联关系表列表全部数据查询")
@GetMapping(value = "/list")
public ResponseModel<List<DutyPersonShiftDto>> selectForList()
{
return ResponseHelper.buildResponse(dutyPersonShiftServiceImpl.queryForDutyPersonShiftList());
}
/**
* <pre>
* @Description:
* </pre>
*
* @MethodName:
* @Param:
* @Return:
* @Throws
* @Author keyong
* @Date 2021/7/7 19:34
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET",value = "岗位枚举数据查询", notes = "岗位枚举数据查询")
@GetMapping(value = "/list/station")
public ResponseModel<List<DictionarieValueModel>> selectStationList() throws Exception {
return ResponseHelper.buildResponse(amosFeignService.listDictionaryByDictCode("POST_TYPE"));
}
}
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
View file @ 1c25877f
...@@ -19,11 +19,11 @@ import java.util.List; ...@@ -19,11 +19,11 @@ import java.util.List;
/** /**
* 值班班次 * 值班班次
* *
* @author system_generator * @author system_generator
* @date 2021-07-06 * @date 2021-07-06
*/ */
@RestController @RestController
@Api(tags = "值班班次Api") @Api(tags = "值班班次Api")
@RequestMapping(value = "/common/duty-shift") @RequestMapping(value = "/common/duty-shift")
...@@ -33,87 +33,94 @@ public class DutyShiftController extends BaseController { ...@@ -33,87 +33,94 @@ public class DutyShiftController extends BaseController {
DutyShiftServiceImpl dutyShiftServiceImpl; DutyShiftServiceImpl dutyShiftServiceImpl;
/** /**
* 新增值班班次 * 新增值班班次
* @return *
*/ * @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/save") @PostMapping(value = "/save")
@ApiOperation(httpMethod = "POST", value = "新增值班班次", notes = "新增值班班次") @ApiOperation(httpMethod = "POST", value = "新增值班班次", notes = "新增值班班次")
public ResponseModel<DutyShiftDto> save(HttpServletRequest request, @RequestBody DutyShiftDto model) public ResponseModel<DutyShiftDto> save(HttpServletRequest request, @RequestBody DutyShiftDto model) {
{ String appKey = request.getHeader("appKey");
String appKey = request.getHeader("appKey"); model.setAppKey(appKey);
model.setAppKey(appKey); model = dutyShiftServiceImpl.createWithModel(model);
model=dutyShiftServiceImpl.createWithModel(model); return ResponseHelper.buildResponse(model);
return ResponseHelper.buildResponse(model); }
}
/** /**
* 根据sequenceNbr更新 * 根据sequenceNbr更新
* @param sequenceNbr 主键 *
* @return * @param sequenceNbr 主键
*/ * @return
@TycloudOperation(ApiLevel = UserType.AGENCY) */
@PutMapping(value = "/{sequenceNbr}") @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新值班班次", notes = "根据sequenceNbr更新值班班次") @PutMapping(value = "/{sequenceNbr}")
public ResponseModel<DutyShiftDto> updateBySequenceNbrDutyShift(HttpServletRequest request, @RequestBody DutyShiftDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) { @ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新值班班次", notes = "根据sequenceNbr更新值班班次")
String appKey = request.getHeader("appKey"); public ResponseModel<DutyShiftDto> updateBySequenceNbrDutyShift(HttpServletRequest request, @RequestBody DutyShiftDto model, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
model.setAppKey(appKey); String appKey = request.getHeader("appKey");
model.setSequenceNbr(sequenceNbr); model.setAppKey(appKey);
return ResponseHelper.buildResponse(dutyShiftServiceImpl.updateWithModel(model)); model.setSequenceNbr(sequenceNbr);
} return ResponseHelper.buildResponse(dutyShiftServiceImpl.updateWithModel(model));
/** }
* 根据sequenceNbr删除
* @param sequenceNbr 主键 /**
* @return * 根据sequenceNbr删除
*/ *
* @param sequenceNbr 主键
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@DeleteMapping(value = "/{sequenceNbr}") @DeleteMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除值班班次", notes = "根据sequenceNbr删除值班班次") @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除值班班次", notes = "根据sequenceNbr删除值班班次")
public ResponseModel<Boolean> deleteBySequenceNbr(@PathVariable(value = "sequenceNbr") Long sequenceNbr){ public ResponseModel<Boolean> deleteBySequenceNbr(@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
DutyShift dutyShift = dutyShiftServiceImpl.getById(sequenceNbr); DutyShift dutyShift = dutyShiftServiceImpl.getById(sequenceNbr);
if (null != dutyShift) { if (null != dutyShift) {
dutyShift.setIsDelete(true); dutyShift.setIsDelete(true);
} }
return ResponseHelper.buildResponse(dutyShiftServiceImpl.updateById(dutyShift)); return ResponseHelper.buildResponse(dutyShiftServiceImpl.updateById(dutyShift));
} }
/**
* 根据sequenceNbr查询
*
* @param sequenceNbr 主键
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个值班班次", notes = "根据sequenceNbr查询单个值班班次")
public ResponseModel<DutyShiftDto> selectOne(@PathVariable Long sequenceNbr) {
return ResponseHelper.buildResponse(dutyShiftServiceImpl.queryBySeq(sequenceNbr));
}
/** /**
* 根据sequenceNbr查询 * 列表分页查询
* @param sequenceNbr 主键 *
* @return * @param current 当前页
*/ * @param current 每页大小
@TycloudOperation(ApiLevel = UserType.AGENCY) * @return
@GetMapping(value = "/{sequenceNbr}") */
@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个值班班次", notes = "根据sequenceNbr查询单个值班班次") @TycloudOperation(ApiLevel = UserType.AGENCY)
public ResponseModel<DutyShiftDto> seleteOne(@PathVariable Long sequenceNbr) @GetMapping(value = "/page")
{ @ApiOperation(httpMethod = "GET", value = "值班班次分页查询", notes = "值班班次分页查询")
return ResponseHelper.buildResponse(dutyShiftServiceImpl.queryBySeq(sequenceNbr)); 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<>();
* 列表分页查询 page.setCurrent(current);
*@param current 当前页 page.setSize(size);
*@param current 每页大小 return ResponseHelper.buildResponse(dutyShiftServiceImpl.queryForDutyShiftPage(page, appKey));
* @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) * @return
{ */
String appKey = request.getHeader("appKey"); @TycloudOperation(ApiLevel = UserType.AGENCY)
Page<DutyShiftDto> page=new Page<DutyShiftDto>(); @ApiOperation(httpMethod = "GET", value = "值班班次列表全部数据查询", notes = "值班班次列表全部数据查询")
page.setCurrent(current); @GetMapping(value = "/list")
page.setSize(size); public ResponseModel<List<DutyShiftDto>> selectForList(HttpServletRequest request) {
return ResponseHelper.buildResponse(dutyShiftServiceImpl.queryForDutyShiftPage(page, appKey)); String appKey = request.getHeader("appKey");
} return ResponseHelper.buildResponse(dutyShiftServiceImpl.queryForDutyShiftList(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
View file @ 1c25877f
...@@ -9,25 +9,26 @@ import org.springframework.stereotype.Service; ...@@ -9,25 +9,26 @@ import org.springframework.stereotype.Service;
import org.typroject.tyboot.core.rdbms.service.BaseService; import org.typroject.tyboot.core.rdbms.service.BaseService;
import java.util.List; import java.util.List;
/** /**
* 值班班次服务实现类 * 值班班次服务实现类
* *
* @author system_generator * @author system_generator
* @date 2021-07-06 * @date 2021-07-06
*/ */
@Service @Service
public class DutyShiftServiceImpl extends BaseService<DutyShiftDto,DutyShift,DutyShiftMapper> implements IDutyShiftService { public class DutyShiftServiceImpl extends BaseService<DutyShiftDto, DutyShift, DutyShiftMapper> implements IDutyShiftService {
/** /**
* 分页查询 * 分页查询
*/ */
public Page<DutyShiftDto> queryForDutyShiftPage(Page<DutyShiftDto> page, String appKey) { public Page<DutyShiftDto> queryForDutyShiftPage(Page<DutyShiftDto> page, String appKey) {
return this.queryForPage(page, null, false, appKey); return this.queryForPage(page, null, false, appKey);
} }
/** /**
* 列表查询 示例 * 列表查询 示例
*/ */
public List<DutyShiftDto> queryForDutyShiftList(String appKey) { public List<DutyShiftDto> queryForDutyShiftList(String appKey) {
return this.queryForList("" , false, appKey); return this.queryForList("", false, appKey);
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment