Skip to content

A
amos-boot-biz
Commit d9f14a6c authored by 付培阳's avatar 付培阳
Browse files
Options

力量调派记录列表

parent 7af2f1c8
Show whitespace changes
Inline Side-by-side
Showing with 310 additions and 108 deletions
amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/PowerTransferCompanyDto.java
View file @ d9f14a6c
...@@ -12,6 +12,9 @@ import com.baomidou.mybatisplus.annotation.TableId; ...@@ -12,6 +12,9 @@ import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import java.util.List;
/** /**
* 调派单位 * 调派单位
* *
...@@ -45,4 +48,7 @@ public class PowerTransferCompanyDto extends BaseEntity { ...@@ -45,4 +48,7 @@ public class PowerTransferCompanyDto extends BaseEntity {
@ApiModelProperty(value = "操作人名称") @ApiModelProperty(value = "操作人名称")
private String recUserName; private String recUserName;
@ApiModelProperty(value = "调派单位资源列表")
private List<PowerTransferCompanyResourcesDto> powerTransferCompanyResourcesDtoList;
} }
amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/PowerTransferDto.java
View file @ d9f14a6c
...@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.jcs.api.dto; ...@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.jcs.api.dto;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity; import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import com.yeejoin.amos.boot.module.jcs.api.entity.FireTeam;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
...@@ -12,6 +13,9 @@ import com.baomidou.mybatisplus.annotation.TableId; ...@@ -12,6 +13,9 @@ import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import java.util.List;
/** /**
* 力量调派 * 力量调派
* *
...@@ -66,4 +70,7 @@ public class PowerTransferDto extends BaseEntity { ...@@ -66,4 +70,7 @@ public class PowerTransferDto extends BaseEntity {
@ApiModelProperty(value = "操作人名称") @ApiModelProperty(value = "操作人名称")
private String recUserName; private String recUserName;
@ApiModelProperty(value = "调派单位列表")
private List<PowerTransferCompanyDto> powerTransferCompanyDotList;
} }
amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/PowerTransfer.java
View file @ d9f14a6c
...@@ -7,11 +7,7 @@ import io.swagger.annotations.ApiModelProperty; ...@@ -7,11 +7,7 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
/** /**
* 力量调派 * 力量调派
* *
......
amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/mapper/PowerTransferListMapper.java 0 → 100644
View file @ d9f14a6c
package com.yeejoin.amos.boot.module.jcs.api.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yeejoin.amos.boot.module.jcs.api.vo.PowerTransferListVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Select;
import org.springframework.stereotype.Component;
import java.util.List;
/**
* @title: PowerTransferListMapper
* @Author fpy
* @Date: 2021/6/18 13:48
* @Version 1.0
*/
@Mapper
public interface PowerTransferListMapper extends BaseMapper<PowerTransferListVo> {
@Select("select ptc.company_name,ptcr.type,resources_num from jc_power_transfer_company_resources ptcr\n" +
"inner join jc_power_transfer_company ptc on ptcr.power_transfer_company_id = ptc.sequence_nbr\n" +
"inner join jc_power_transfer pt on ptc.power_transfer_id = pt.sequence_nbr\n" +
"where pt.alert_called_id = #{alertCalledId} order by ptcr.sequence_nbr desc")
List<PowerTransferListVo> getPowerTransferList(Long alertCalledId);
}
\ No newline at end of file
amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/service/IPowerTransferService.java
View file @ d9f14a6c
package com.yeejoin.amos.boot.module.jcs.api.service; package com.yeejoin.amos.boot.module.jcs.api.service;
import com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferDto;
import com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransfer; import com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransfer;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.yeejoin.amos.boot.module.jcs.api.vo.PowerTransferListVo;
import java.util.List;
/** /**
* 力量调派 服务类 * 力量调派 服务类
...@@ -11,4 +15,7 @@ import com.baomidou.mybatisplus.extension.service.IService; ...@@ -11,4 +15,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
*/ */
public interface IPowerTransferService extends IService<PowerTransfer> { public interface IPowerTransferService extends IService<PowerTransfer> {
List<PowerTransferListVo> getPowerTransferList(Long alertCalledId);
boolean createPowerTransfer(PowerTransferDto powerTransferDto);
} }
amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/vo/PowerTransferListVo.java 0 → 100644
View file @ d9f14a6c
package com.yeejoin.amos.boot.module.jcs.api.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/**
* @title: PowerTransferListVo
* @Author fpy
* @Date: 2021/6/18 12:01
* @Version 1.0
*/
@Data
@EqualsAndHashCode()
@Accessors(chain = true)
@ApiModel(value="PowerTransfer对象", description="力量调派")
public class PowerTransferListVo {
@ApiModelProperty(value = " 单位名称")
private String companyName;
@ApiModelProperty(value = "资源类型")
private String type;
@ApiModelProperty(value = "资源编号（如车牌号）")
private String resourcesNum;
}
\ No newline at end of file
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/AlertCalledController.java
View file @ d9f14a6c
...@@ -52,7 +52,7 @@ public class AlertCalledController extends BaseController { ...@@ -52,7 +52,7 @@ public class AlertCalledController extends BaseController {
* *
* @return * @return
*/ */
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY) @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/save", method = RequestMethod.POST) @RequestMapping(value = "/save", method = RequestMethod.POST)
@ApiOperation(httpMethod = "POST", value = "新增警情接警记录", notes = "新增警情接警记录") @ApiOperation(httpMethod = "POST", value = "新增警情接警记录", notes = "新增警情接警记录")
@Transactional @Transactional
...@@ -86,7 +86,7 @@ public class AlertCalledController extends BaseController { ...@@ -86,7 +86,7 @@ public class AlertCalledController extends BaseController {
* @param id * @param id
* @return * @return
*/ */
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY) @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/{id}", method = RequestMethod.DELETE) @RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
@ApiOperation(httpMethod = "DELETE", value = "根据id删除", notes = "根据id删除") @ApiOperation(httpMethod = "DELETE", value = "根据id删除", notes = "根据id删除")
public boolean deleteById(HttpServletRequest request, @PathVariable Long id) { public boolean deleteById(HttpServletRequest request, @PathVariable Long id) {
...@@ -98,7 +98,7 @@ public class AlertCalledController extends BaseController { ...@@ -98,7 +98,7 @@ public class AlertCalledController extends BaseController {
* *
* @return * @return
*/ */
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY) @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/updateById", method = RequestMethod.PUT) @RequestMapping(value = "/updateById", method = RequestMethod.PUT)
@ApiOperation(httpMethod = "PUT", value = "修改警情接警记录", notes = "修改警情接警记录") @ApiOperation(httpMethod = "PUT", value = "修改警情接警记录", notes = "修改警情接警记录")
public boolean updateByIdAlertCalled(HttpServletRequest request, @RequestBody AlertCalled alertCalled) { public boolean updateByIdAlertCalled(HttpServletRequest request, @RequestBody AlertCalled alertCalled) {
...@@ -111,7 +111,7 @@ public class AlertCalledController extends BaseController { ...@@ -111,7 +111,7 @@ public class AlertCalledController extends BaseController {
* @param id * @param id
* @return * @return
*/ */
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY) @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/{id}", method = RequestMethod.GET) @RequestMapping(value = "/{id}", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "根据id查询", notes = "根据id查询") @ApiOperation(httpMethod = "GET", value = "根据id查询", notes = "根据id查询")
public ResponseModel selectById(HttpServletRequest request, @PathVariable Long id) { public ResponseModel selectById(HttpServletRequest request, @PathVariable Long id) {
...@@ -130,7 +130,7 @@ public class AlertCalledController extends BaseController { ...@@ -130,7 +130,7 @@ public class AlertCalledController extends BaseController {
* *
* @return * @return
*/ */
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY) @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/list", method = RequestMethod.GET) @RequestMapping(value = "/list", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "列表分页查询", notes = "列表分页查询") @ApiOperation(httpMethod = "GET", value = "列表分页查询", notes = "列表分页查询")
public ResponseModel listPage(String pageNum, String pageSize, AlertCalled alertCalled) { public ResponseModel listPage(String pageNum, String pageSize, AlertCalled alertCalled) {
...@@ -183,7 +183,7 @@ public class AlertCalledController extends BaseController { ...@@ -183,7 +183,7 @@ public class AlertCalledController extends BaseController {
* *
* @return * @return
*/ */
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY) @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/getList", method = RequestMethod.GET) @RequestMapping(value = "/getList", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "列表无分页查询", notes = "列表无分页查询") @ApiOperation(httpMethod = "GET", value = "列表无分页查询", notes = "列表无分页查询")
public ResponseModel list(AlertCalled alertCalled) { public ResponseModel list(AlertCalled alertCalled) {
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/AlertFromController.java
View file @ d9f14a6c
...@@ -45,7 +45,7 @@ public class AlertFromController extends BaseController { ...@@ -45,7 +45,7 @@ public class AlertFromController extends BaseController {
* 新增警情表单 * 新增警情表单
* @return * @return
*/ */
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY) @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/save", method = RequestMethod.POST) @RequestMapping(value = "/save", method = RequestMethod.POST)
@ApiOperation(httpMethod = "POST", value = "新增警情表单", notes = "新增警情表单") @ApiOperation(httpMethod = "POST", value = "新增警情表单", notes = "新增警情表单")
public boolean saveAlertFrom(HttpServletRequest request, @RequestBody AlertFrom alertFrom){ public boolean saveAlertFrom(HttpServletRequest request, @RequestBody AlertFrom alertFrom){
...@@ -57,7 +57,7 @@ public class AlertFromController extends BaseController { ...@@ -57,7 +57,7 @@ public class AlertFromController extends BaseController {
* @param id * @param id
* @return * @return
*/ */
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY) @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/{id}", method = RequestMethod.DELETE) @RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
@ApiOperation(httpMethod = "DELETE", value = "根据id删除", notes = "根据id删除") @ApiOperation(httpMethod = "DELETE", value = "根据id删除", notes = "根据id删除")
public boolean deleteById(HttpServletRequest request, @PathVariable Long id){ public boolean deleteById(HttpServletRequest request, @PathVariable Long id){
...@@ -71,7 +71,7 @@ public class AlertFromController extends BaseController { ...@@ -71,7 +71,7 @@ public class AlertFromController extends BaseController {
* 修改警情表单 * 修改警情表单
* @return * @return
*/ */
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY) @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/updateById", method = RequestMethod.PUT) @RequestMapping(value = "/updateById", method = RequestMethod.PUT)
@ApiOperation(httpMethod = "PUT", value = "修改警情表单", notes = "修改警情表单") @ApiOperation(httpMethod = "PUT", value = "修改警情表单", notes = "修改警情表单")
public boolean updateByIdAlertFrom(HttpServletRequest request, @RequestBody AlertFrom alertFrom){ public boolean updateByIdAlertFrom(HttpServletRequest request, @RequestBody AlertFrom alertFrom){
...@@ -85,7 +85,7 @@ public class AlertFromController extends BaseController { ...@@ -85,7 +85,7 @@ public class AlertFromController extends BaseController {
* @param id * @param id
* @return * @return
*/ */
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY) @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/{id}", method = RequestMethod.GET) @RequestMapping(value = "/{id}", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "根据id查询", notes = "根据id查询") @ApiOperation(httpMethod = "GET", value = "根据id查询", notes = "根据id查询")
public AlertFrom selectById(HttpServletRequest request, @PathVariable Long id){ public AlertFrom selectById(HttpServletRequest request, @PathVariable Long id){
...@@ -100,7 +100,7 @@ public class AlertFromController extends BaseController { ...@@ -100,7 +100,7 @@ public class AlertFromController extends BaseController {
* @param id * @param id
* @return * @return
*/ */
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY) @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/from/{code}", method = RequestMethod.GET) @RequestMapping(value = "/from/{code}", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "根据id查询", notes = "根据id查询") @ApiOperation(httpMethod = "GET", value = "根据id查询", notes = "根据id查询")
public ResponseModel selectFromdItem(HttpServletRequest request, @PathVariable String code){ public ResponseModel selectFromdItem(HttpServletRequest request, @PathVariable String code){
...@@ -125,7 +125,7 @@ public class AlertFromController extends BaseController { ...@@ -125,7 +125,7 @@ public class AlertFromController extends BaseController {
* 列表分页查询 * 列表分页查询
* @return * @return
*/ */
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY) @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/list", method = RequestMethod.GET) @RequestMapping(value = "/list", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "列表分页查询", notes = "列表分页查询") @ApiOperation(httpMethod = "GET", value = "列表分页查询", notes = "列表分页查询")
public IPage<AlertFrom> listPage(String pageNum,String pageSize, AlertFrom alertFrom){ public IPage<AlertFrom> listPage(String pageNum,String pageSize, AlertFrom alertFrom){
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/AlertFromTypeController.java
View file @ d9f14a6c
...@@ -39,7 +39,7 @@ public class AlertFromTypeController extends BaseController { ...@@ -39,7 +39,7 @@ public class AlertFromTypeController extends BaseController {
* 新增动态表单类型 * 新增动态表单类型
* @return * @return
*/ */
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY) @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/save", method = RequestMethod.POST) @RequestMapping(value = "/save", method = RequestMethod.POST)
@ApiOperation(httpMethod = "POST", value = "新增动态表单类型", notes = "新增动态表单类型") @ApiOperation(httpMethod = "POST", value = "新增动态表单类型", notes = "新增动态表单类型")
public boolean saveAlertFromType(HttpServletRequest request, @RequestBody AlertFromType alertFromType){ public boolean saveAlertFromType(HttpServletRequest request, @RequestBody AlertFromType alertFromType){
...@@ -51,7 +51,7 @@ public class AlertFromTypeController extends BaseController { ...@@ -51,7 +51,7 @@ public class AlertFromTypeController extends BaseController {
* @param id * @param id
* @return * @return
*/ */
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY) @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/{id}", method = RequestMethod.DELETE) @RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
@ApiOperation(httpMethod = "DELETE", value = "根据id删除", notes = "根据id删除") @ApiOperation(httpMethod = "DELETE", value = "根据id删除", notes = "根据id删除")
public boolean deleteById(HttpServletRequest request, @PathVariable Long id){ public boolean deleteById(HttpServletRequest request, @PathVariable Long id){
...@@ -65,7 +65,7 @@ public class AlertFromTypeController extends BaseController { ...@@ -65,7 +65,7 @@ public class AlertFromTypeController extends BaseController {
* 修改动态表单类型 * 修改动态表单类型
* @return * @return
*/ */
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY) @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/updateById", method = RequestMethod.PUT) @RequestMapping(value = "/updateById", method = RequestMethod.PUT)
@ApiOperation(httpMethod = "PUT", value = "修改动态表单类型", notes = "修改动态表单类型") @ApiOperation(httpMethod = "PUT", value = "修改动态表单类型", notes = "修改动态表单类型")
public boolean updateByIdAlertFromType(HttpServletRequest request, @RequestBody AlertFromType alertFromType){ public boolean updateByIdAlertFromType(HttpServletRequest request, @RequestBody AlertFromType alertFromType){
...@@ -79,7 +79,7 @@ public class AlertFromTypeController extends BaseController { ...@@ -79,7 +79,7 @@ public class AlertFromTypeController extends BaseController {
* @param id * @param id
* @return * @return
*/ */
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY) @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/{id}", method = RequestMethod.GET) @RequestMapping(value = "/{id}", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "根据id查询", notes = "根据id查询") @ApiOperation(httpMethod = "GET", value = "根据id查询", notes = "根据id查询")
public AlertFromType selectById(HttpServletRequest request, @PathVariable Long id){ public AlertFromType selectById(HttpServletRequest request, @PathVariable Long id){
...@@ -92,7 +92,7 @@ public class AlertFromTypeController extends BaseController { ...@@ -92,7 +92,7 @@ public class AlertFromTypeController extends BaseController {
* 列表分页查询 * 列表分页查询
* @return * @return
*/ */
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY) @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/list", method = RequestMethod.GET) @RequestMapping(value = "/list", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "列表分页查询", notes = "列表分页查询") @ApiOperation(httpMethod = "GET", value = "列表分页查询", notes = "列表分页查询")
public IPage<AlertFromType> listPage(String pageNum,String pageSize, AlertFromType alertFromType){ public IPage<AlertFromType> listPage(String pageNum,String pageSize, AlertFromType alertFromType){
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/AlertFromValueController.java
View file @ d9f14a6c
...@@ -39,7 +39,7 @@ public class AlertFromValueController extends BaseController { ...@@ -39,7 +39,7 @@ public class AlertFromValueController extends BaseController {
* 新增 * 新增
* @return * @return
*/ */
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY) @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/save", method = RequestMethod.POST) @RequestMapping(value = "/save", method = RequestMethod.POST)
@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增") @ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
public boolean saveAlertFromValue(HttpServletRequest request, @RequestBody AlertFromValue alertFromValue){ public boolean saveAlertFromValue(HttpServletRequest request, @RequestBody AlertFromValue alertFromValue){
...@@ -51,7 +51,7 @@ public class AlertFromValueController extends BaseController { ...@@ -51,7 +51,7 @@ public class AlertFromValueController extends BaseController {
* @param id * @param id
* @return * @return
*/ */
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY) @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/{id}", method = RequestMethod.DELETE) @RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
@ApiOperation(httpMethod = "DELETE", value = "根据id删除", notes = "根据id删除") @ApiOperation(httpMethod = "DELETE", value = "根据id删除", notes = "根据id删除")
public boolean deleteById(HttpServletRequest request, @PathVariable Long id){ public boolean deleteById(HttpServletRequest request, @PathVariable Long id){
...@@ -65,7 +65,7 @@ public class AlertFromValueController extends BaseController { ...@@ -65,7 +65,7 @@ public class AlertFromValueController extends BaseController {
* 修改 * 修改
* @return * @return
*/ */
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY) @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/updateById", method = RequestMethod.PUT) @RequestMapping(value = "/updateById", method = RequestMethod.PUT)
@ApiOperation(httpMethod = "PUT", value = "修改", notes = "修改") @ApiOperation(httpMethod = "PUT", value = "修改", notes = "修改")
public boolean updateByIdAlertFromValue(HttpServletRequest request, @RequestBody AlertFromValue alertFromValue){ public boolean updateByIdAlertFromValue(HttpServletRequest request, @RequestBody AlertFromValue alertFromValue){
...@@ -79,7 +79,7 @@ public class AlertFromValueController extends BaseController { ...@@ -79,7 +79,7 @@ public class AlertFromValueController extends BaseController {
* @param id * @param id
* @return * @return
*/ */
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY) @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/{id}", method = RequestMethod.GET) @RequestMapping(value = "/{id}", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "根据id查询", notes = "根据id查询") @ApiOperation(httpMethod = "GET", value = "根据id查询", notes = "根据id查询")
public AlertFromValue selectById(HttpServletRequest request, @PathVariable Long id){ public AlertFromValue selectById(HttpServletRequest request, @PathVariable Long id){
...@@ -92,7 +92,7 @@ public class AlertFromValueController extends BaseController { ...@@ -92,7 +92,7 @@ public class AlertFromValueController extends BaseController {
* 列表分页查询 * 列表分页查询
* @return * @return
*/ */
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY) @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/list", method = RequestMethod.GET) @RequestMapping(value = "/list", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "列表分页查询", notes = "列表分页查询") @ApiOperation(httpMethod = "GET", value = "列表分页查询", notes = "列表分页查询")
public IPage<AlertFromValue> listPage(String pageNum,String pageSize, AlertFromValue alertFromValue){ public IPage<AlertFromValue> listPage(String pageNum,String pageSize, AlertFromValue alertFromValue){
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/AlertSubmittedController.java
View file @ d9f14a6c
...@@ -44,7 +44,7 @@ public class AlertSubmittedController extends BaseController { ...@@ -44,7 +44,7 @@ public class AlertSubmittedController extends BaseController {
* 新增警情报送记录 * 新增警情报送记录
* @return * @return
*/ */
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY) @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/save", method = RequestMethod.POST) @RequestMapping(value = "/save", method = RequestMethod.POST)
@ApiOperation(httpMethod = "POST", value = "新增警情报送记录", notes = "新增警情报送记录") @ApiOperation(httpMethod = "POST", value = "新增警情报送记录", notes = "新增警情报送记录")
public ResponseModel saveAlertSubmitted(HttpServletRequest request, @RequestBody AlertSubmitted alertSubmitted){ public ResponseModel saveAlertSubmitted(HttpServletRequest request, @RequestBody AlertSubmitted alertSubmitted){
...@@ -56,7 +56,7 @@ public class AlertSubmittedController extends BaseController { ...@@ -56,7 +56,7 @@ public class AlertSubmittedController extends BaseController {
* @param id * @param id
* @return * @return
*/ */
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY) @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/{id}", method = RequestMethod.DELETE) @RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
@ApiOperation(httpMethod = "DELETE", value = "根据id删除", notes = "根据id删除") @ApiOperation(httpMethod = "DELETE", value = "根据id删除", notes = "根据id删除")
public ResponseModel deleteById(HttpServletRequest request, @PathVariable Long id){ public ResponseModel deleteById(HttpServletRequest request, @PathVariable Long id){
...@@ -70,7 +70,7 @@ public class AlertSubmittedController extends BaseController { ...@@ -70,7 +70,7 @@ public class AlertSubmittedController extends BaseController {
* 修改警情报送记录 * 修改警情报送记录
* @return * @return
*/ */
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY) @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/updateById", method = RequestMethod.PUT) @RequestMapping(value = "/updateById", method = RequestMethod.PUT)
@ApiOperation(httpMethod = "PUT", value = "修改警情报送记录", notes = "修改警情报送记录") @ApiOperation(httpMethod = "PUT", value = "修改警情报送记录", notes = "修改警情报送记录")
public ResponseModel updateByIdAlertSubmitted(HttpServletRequest request, @RequestBody AlertSubmitted alertSubmitted){ public ResponseModel updateByIdAlertSubmitted(HttpServletRequest request, @RequestBody AlertSubmitted alertSubmitted){
...@@ -84,14 +84,14 @@ public class AlertSubmittedController extends BaseController { ...@@ -84,14 +84,14 @@ public class AlertSubmittedController extends BaseController {
* @param id * @param id
* @return * @return
*/ */
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY) @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/{id}", method = RequestMethod.GET) @RequestMapping(value = "/{id}", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "根据id查询", notes = "根据id查询") @ApiOperation(httpMethod = "GET", value = "根据id查询", notes = "根据id查询")
public ResponseModel selectById(HttpServletRequest request, @PathVariable Long id){ public ResponseModel selectById(HttpServletRequest request, @PathVariable Long id){
return CommonResponseUtil.success(iAlertSubmittedService.getById(id)); return CommonResponseUtil.success(iAlertSubmittedService.getById(id));
} }
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY) @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/schedulingReporting/list", method = RequestMethod.POST) @RequestMapping(value = "/schedulingReporting/list", method = RequestMethod.POST)
@ApiOperation(httpMethod = "POST", value = "根据警情id查询融合调度、警情报送列表", notes = "根据警情id查询融合调度、警情报送列表") @ApiOperation(httpMethod = "POST", value = "根据警情id查询融合调度、警情报送列表", notes = "根据警情id查询融合调度、警情报送列表")
public ResponseModel listByParam(@RequestBody AlertSubmittedDto queryParam) { public ResponseModel listByParam(@RequestBody AlertSubmittedDto queryParam) {
...@@ -102,7 +102,7 @@ public class AlertSubmittedController extends BaseController { ...@@ -102,7 +102,7 @@ public class AlertSubmittedController extends BaseController {
* 列表分页查询 * 列表分页查询
* @return * @return
*/ */
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY) @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/list", method = RequestMethod.GET) @RequestMapping(value = "/list", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "列表分页查询", notes = "列表分页查询") @ApiOperation(httpMethod = "GET", value = "列表分页查询", notes = "列表分页查询")
public IPage<AlertSubmitted> listPage(String pageNum, String pageSize, AlertSubmitted alertSubmitted) { public IPage<AlertSubmitted> listPage(String pageNum, String pageSize, AlertSubmitted alertSubmitted) {
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/AlertSubmittedObjectController.java
View file @ d9f14a6c
...@@ -39,7 +39,7 @@ public class AlertSubmittedObjectController extends BaseController { ...@@ -39,7 +39,7 @@ public class AlertSubmittedObjectController extends BaseController {
* 新增报送对象 * 新增报送对象
* @return * @return
*/ */
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY) @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/save", method = RequestMethod.POST) @RequestMapping(value = "/save", method = RequestMethod.POST)
@ApiOperation(httpMethod = "POST", value = "新增报送对象", notes = "新增报送对象") @ApiOperation(httpMethod = "POST", value = "新增报送对象", notes = "新增报送对象")
public boolean saveAlertSubmittedObject(HttpServletRequest request, @RequestBody AlertSubmittedObject alertSubmittedObject){ public boolean saveAlertSubmittedObject(HttpServletRequest request, @RequestBody AlertSubmittedObject alertSubmittedObject){
...@@ -51,7 +51,7 @@ public class AlertSubmittedObjectController extends BaseController { ...@@ -51,7 +51,7 @@ public class AlertSubmittedObjectController extends BaseController {
* @param id * @param id
* @return * @return
*/ */
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY) @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/{id}", method = RequestMethod.DELETE) @RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
@ApiOperation(httpMethod = "DELETE", value = "根据id删除", notes = "根据id删除") @ApiOperation(httpMethod = "DELETE", value = "根据id删除", notes = "根据id删除")
public boolean deleteById(HttpServletRequest request, @PathVariable Long id){ public boolean deleteById(HttpServletRequest request, @PathVariable Long id){
...@@ -65,7 +65,7 @@ public class AlertSubmittedObjectController extends BaseController { ...@@ -65,7 +65,7 @@ public class AlertSubmittedObjectController extends BaseController {
* 修改报送对象 * 修改报送对象
* @return * @return
*/ */
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY) @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/updateById", method = RequestMethod.PUT) @RequestMapping(value = "/updateById", method = RequestMethod.PUT)
@ApiOperation(httpMethod = "PUT", value = "修改报送对象", notes = "修改报送对象") @ApiOperation(httpMethod = "PUT", value = "修改报送对象", notes = "修改报送对象")
public boolean updateByIdAlertSubmittedObject(HttpServletRequest request, @RequestBody AlertSubmittedObject alertSubmittedObject){ public boolean updateByIdAlertSubmittedObject(HttpServletRequest request, @RequestBody AlertSubmittedObject alertSubmittedObject){
...@@ -79,7 +79,7 @@ public class AlertSubmittedObjectController extends BaseController { ...@@ -79,7 +79,7 @@ public class AlertSubmittedObjectController extends BaseController {
* @param id * @param id
* @return * @return
*/ */
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY) @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/{id}", method = RequestMethod.GET) @RequestMapping(value = "/{id}", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "根据id查询", notes = "根据id查询") @ApiOperation(httpMethod = "GET", value = "根据id查询", notes = "根据id查询")
public AlertSubmittedObject selectById(HttpServletRequest request, @PathVariable Long id){ public AlertSubmittedObject selectById(HttpServletRequest request, @PathVariable Long id){
...@@ -92,7 +92,7 @@ public class AlertSubmittedObjectController extends BaseController { ...@@ -92,7 +92,7 @@ public class AlertSubmittedObjectController extends BaseController {
* 列表分页查询 * 列表分页查询
* @return * @return
*/ */
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY) @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/list", method = RequestMethod.GET) @RequestMapping(value = "/list", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "列表分页查询", notes = "列表分页查询") @ApiOperation(httpMethod = "GET", value = "列表分页查询", notes = "列表分页查询")
public IPage<AlertSubmittedObject> listPage(String pageNum,String pageSize, AlertSubmittedObject alertSubmittedObject){ public IPage<AlertSubmittedObject> listPage(String pageNum,String pageSize, AlertSubmittedObject alertSubmittedObject){
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/DataDictionaryController.java
View file @ d9f14a6c
...@@ -48,7 +48,7 @@ public class DataDictionaryController extends BaseController { ...@@ -48,7 +48,7 @@ public class DataDictionaryController extends BaseController {
* 新增数据字典 * 新增数据字典
* @return * @return
*/ */
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY) @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/save", method = RequestMethod.POST) @RequestMapping(value = "/save", method = RequestMethod.POST)
@ApiOperation(httpMethod = "POST", value = "新增数据字典", notes = "新增数据字典") @ApiOperation(httpMethod = "POST", value = "新增数据字典", notes = "新增数据字典")
public boolean saveDataDictionary(HttpServletRequest request, @RequestBody DataDictionary dataDictionary){ public boolean saveDataDictionary(HttpServletRequest request, @RequestBody DataDictionary dataDictionary){
...@@ -60,7 +60,7 @@ public class DataDictionaryController extends BaseController { ...@@ -60,7 +60,7 @@ public class DataDictionaryController extends BaseController {
* @param id * @param id
* @return * @return
*/ */
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY) @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/{id}", method = RequestMethod.DELETE) @RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
@ApiOperation(httpMethod = "DELETE", value = "根据id删除", notes = "根据id删除") @ApiOperation(httpMethod = "DELETE", value = "根据id删除", notes = "根据id删除")
public boolean deleteById(HttpServletRequest request, @PathVariable Long id){ public boolean deleteById(HttpServletRequest request, @PathVariable Long id){
...@@ -74,7 +74,7 @@ public class DataDictionaryController extends BaseController { ...@@ -74,7 +74,7 @@ public class DataDictionaryController extends BaseController {
* 修改数据字典 * 修改数据字典
* @return * @return
*/ */
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY) @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/updateById", method = RequestMethod.PUT) @RequestMapping(value = "/updateById", method = RequestMethod.PUT)
@ApiOperation(httpMethod = "PUT", value = "修改数据字典", notes = "修改数据字典") @ApiOperation(httpMethod = "PUT", value = "修改数据字典", notes = "修改数据字典")
public boolean updateByIdDataDictionary(HttpServletRequest request, @RequestBody DataDictionary dataDictionary){ public boolean updateByIdDataDictionary(HttpServletRequest request, @RequestBody DataDictionary dataDictionary){
...@@ -88,7 +88,7 @@ public class DataDictionaryController extends BaseController { ...@@ -88,7 +88,7 @@ public class DataDictionaryController extends BaseController {
* @param id * @param id
* @return * @return
*/ */
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY) @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/{id}", method = RequestMethod.GET) @RequestMapping(value = "/{id}", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "根据id查询", notes = "根据id查询") @ApiOperation(httpMethod = "GET", value = "根据id查询", notes = "根据id查询")
public DataDictionary selectById(HttpServletRequest request, @PathVariable Long id){ public DataDictionary selectById(HttpServletRequest request, @PathVariable Long id){
...@@ -101,7 +101,7 @@ public class DataDictionaryController extends BaseController { ...@@ -101,7 +101,7 @@ public class DataDictionaryController extends BaseController {
* 列表分页查询 * 列表分页查询
* @return * @return
*/ */
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY) @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/list", method = RequestMethod.GET) @RequestMapping(value = "/list", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "列表分页查询", notes = "列表分页查询") @ApiOperation(httpMethod = "GET", value = "列表分页查询", notes = "列表分页查询")
public IPage<DataDictionary> listPage(String pageNum,String pageSize, DataDictionary dataDictionary){ public IPage<DataDictionary> listPage(String pageNum,String pageSize, DataDictionary dataDictionary){
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/DemoController.java
View file @ d9f14a6c
...@@ -34,7 +34,7 @@ public class DemoController extends BaseController { ...@@ -34,7 +34,7 @@ public class DemoController extends BaseController {
@Autowired @Autowired
private IDemoService demoService; private IDemoService demoService;
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY) @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
@GetMapping(value = "/user") @GetMapping(value = "/user")
@ApiOperation(value = "cs1") @ApiOperation(value = "cs1")
public ResponseModel<Object> findUserList() { public ResponseModel<Object> findUserList() {
...@@ -42,7 +42,7 @@ public class DemoController extends BaseController { ...@@ -42,7 +42,7 @@ public class DemoController extends BaseController {
return CommonResponseUtil.success(lists); return CommonResponseUtil.success(lists);
} }
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY) @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
@GetMapping(value = "/demo/{seqNbr}") @GetMapping(value = "/demo/{seqNbr}")
@ApiOperation(value = "cs2") @ApiOperation(value = "cs2")
public ResponseModel findOneBySeqNbr(@PathVariable("seqNbr") Long seqNbr) { public ResponseModel findOneBySeqNbr(@PathVariable("seqNbr") Long seqNbr) {
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/OrgUsrAuthController.java
View file @ d9f14a6c
...@@ -39,7 +39,7 @@ public class OrgUsrAuthController extends BaseController { ...@@ -39,7 +39,7 @@ public class OrgUsrAuthController extends BaseController {
* 新增 * 新增
* @return * @return
*/ */
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY) @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/save", method = RequestMethod.POST) @RequestMapping(value = "/save", method = RequestMethod.POST)
@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增") @ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
public boolean saveOrgUsrAuth(HttpServletRequest request, @RequestBody OrgUsrAuth orgUsrAuth){ public boolean saveOrgUsrAuth(HttpServletRequest request, @RequestBody OrgUsrAuth orgUsrAuth){
...@@ -51,7 +51,7 @@ public class OrgUsrAuthController extends BaseController { ...@@ -51,7 +51,7 @@ public class OrgUsrAuthController extends BaseController {
* @param id * @param id
* @return * @return
*/ */
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY) @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/{id}", method = RequestMethod.DELETE) @RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
@ApiOperation(httpMethod = "DELETE", value = "根据id删除", notes = "根据id删除") @ApiOperation(httpMethod = "DELETE", value = "根据id删除", notes = "根据id删除")
public boolean deleteById(HttpServletRequest request, @PathVariable Long id){ public boolean deleteById(HttpServletRequest request, @PathVariable Long id){
...@@ -65,7 +65,7 @@ public class OrgUsrAuthController extends BaseController { ...@@ -65,7 +65,7 @@ public class OrgUsrAuthController extends BaseController {
* 修改 * 修改
* @return * @return
*/ */
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY) @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/updateById", method = RequestMethod.PUT) @RequestMapping(value = "/updateById", method = RequestMethod.PUT)
@ApiOperation(httpMethod = "PUT", value = "修改", notes = "修改") @ApiOperation(httpMethod = "PUT", value = "修改", notes = "修改")
public boolean updateByIdOrgUsrAuth(HttpServletRequest request, @RequestBody OrgUsrAuth orgUsrAuth){ public boolean updateByIdOrgUsrAuth(HttpServletRequest request, @RequestBody OrgUsrAuth orgUsrAuth){
...@@ -79,7 +79,7 @@ public class OrgUsrAuthController extends BaseController { ...@@ -79,7 +79,7 @@ public class OrgUsrAuthController extends BaseController {
* @param id * @param id
* @return * @return
*/ */
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY) @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/{id}", method = RequestMethod.GET) @RequestMapping(value = "/{id}", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "根据id查询", notes = "根据id查询") @ApiOperation(httpMethod = "GET", value = "根据id查询", notes = "根据id查询")
public OrgUsrAuth selectById(HttpServletRequest request, @PathVariable Long id){ public OrgUsrAuth selectById(HttpServletRequest request, @PathVariable Long id){
...@@ -92,7 +92,7 @@ public class OrgUsrAuthController extends BaseController { ...@@ -92,7 +92,7 @@ public class OrgUsrAuthController extends BaseController {
* 列表分页查询 * 列表分页查询
* @return * @return
*/ */
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY) @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/list", method = RequestMethod.GET) @RequestMapping(value = "/list", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "列表分页查询", notes = "列表分页查询") @ApiOperation(httpMethod = "GET", value = "列表分页查询", notes = "列表分页查询")
public IPage<OrgUsrAuth> listPage(String pageNum,String pageSize, OrgUsrAuth orgUsrAuth){ public IPage<OrgUsrAuth> listPage(String pageNum,String pageSize, OrgUsrAuth orgUsrAuth){
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/OrgUsrController.java
View file @ d9f14a6c
...@@ -39,7 +39,7 @@ public class OrgUsrController extends BaseController { ...@@ -39,7 +39,7 @@ public class OrgUsrController extends BaseController {
* 新增机构/部门/人员表 * 新增机构/部门/人员表
* @return * @return
*/ */
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY) @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/save", method = RequestMethod.POST) @RequestMapping(value = "/save", method = RequestMethod.POST)
@ApiOperation(httpMethod = "POST", value = "新增机构/部门/人员表", notes = "新增机构/部门/人员表") @ApiOperation(httpMethod = "POST", value = "新增机构/部门/人员表", notes = "新增机构/部门/人员表")
public boolean saveOrgUsr(HttpServletRequest request, @RequestBody OrgUsr orgUsr){ public boolean saveOrgUsr(HttpServletRequest request, @RequestBody OrgUsr orgUsr){
...@@ -51,7 +51,7 @@ public class OrgUsrController extends BaseController { ...@@ -51,7 +51,7 @@ public class OrgUsrController extends BaseController {
* @param id * @param id
* @return * @return
*/ */
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY) @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/{id}", method = RequestMethod.DELETE) @RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
@ApiOperation(httpMethod = "DELETE", value = "根据id删除", notes = "根据id删除") @ApiOperation(httpMethod = "DELETE", value = "根据id删除", notes = "根据id删除")
public boolean deleteById(HttpServletRequest request, @PathVariable Long id){ public boolean deleteById(HttpServletRequest request, @PathVariable Long id){
...@@ -65,7 +65,7 @@ public class OrgUsrController extends BaseController { ...@@ -65,7 +65,7 @@ public class OrgUsrController extends BaseController {
* 修改机构/部门/人员表 * 修改机构/部门/人员表
* @return * @return
*/ */
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY) @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/updateById", method = RequestMethod.PUT) @RequestMapping(value = "/updateById", method = RequestMethod.PUT)
@ApiOperation(httpMethod = "PUT", value = "修改机构/部门/人员表", notes = "修改机构/部门/人员表") @ApiOperation(httpMethod = "PUT", value = "修改机构/部门/人员表", notes = "修改机构/部门/人员表")
public boolean updateByIdOrgUsr(HttpServletRequest request, @RequestBody OrgUsr orgUsr){ public boolean updateByIdOrgUsr(HttpServletRequest request, @RequestBody OrgUsr orgUsr){
...@@ -79,7 +79,7 @@ public class OrgUsrController extends BaseController { ...@@ -79,7 +79,7 @@ public class OrgUsrController extends BaseController {
* @param id * @param id
* @return * @return
*/ */
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY) @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/{id}", method = RequestMethod.GET) @RequestMapping(value = "/{id}", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "根据id查询", notes = "根据id查询") @ApiOperation(httpMethod = "GET", value = "根据id查询", notes = "根据id查询")
public OrgUsr selectById(HttpServletRequest request, @PathVariable Long id){ public OrgUsr selectById(HttpServletRequest request, @PathVariable Long id){
...@@ -92,7 +92,7 @@ public class OrgUsrController extends BaseController { ...@@ -92,7 +92,7 @@ public class OrgUsrController extends BaseController {
* 列表分页查询 * 列表分页查询
* @return * @return
*/ */
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY) @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/list", method = RequestMethod.GET) @RequestMapping(value = "/list", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "列表分页查询", notes = "列表分页查询") @ApiOperation(httpMethod = "GET", value = "列表分页查询", notes = "列表分页查询")
public IPage<OrgUsr> listPage(String pageNum,String pageSize, OrgUsr orgUsr){ public IPage<OrgUsr> listPage(String pageNum,String pageSize, OrgUsr orgUsr){
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/PowerTransferCompanyController.java
View file @ d9f14a6c
...@@ -39,7 +39,7 @@ public class PowerTransferCompanyController extends BaseController { ...@@ -39,7 +39,7 @@ public class PowerTransferCompanyController extends BaseController {
* 新增调派单位 * 新增调派单位
* @return * @return
*/ */
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY) @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/save", method = RequestMethod.POST) @RequestMapping(value = "/save", method = RequestMethod.POST)
@ApiOperation(httpMethod = "POST", value = "新增调派单位", notes = "新增调派单位") @ApiOperation(httpMethod = "POST", value = "新增调派单位", notes = "新增调派单位")
public boolean savePowerTransferCompany(HttpServletRequest request, @RequestBody PowerTransferCompany powerTransferCompany){ public boolean savePowerTransferCompany(HttpServletRequest request, @RequestBody PowerTransferCompany powerTransferCompany){
...@@ -51,7 +51,7 @@ public class PowerTransferCompanyController extends BaseController { ...@@ -51,7 +51,7 @@ public class PowerTransferCompanyController extends BaseController {
* @param id * @param id
* @return * @return
*/ */
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY) @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/{id}", method = RequestMethod.DELETE) @RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
@ApiOperation(httpMethod = "DELETE", value = "根据id删除", notes = "根据id删除") @ApiOperation(httpMethod = "DELETE", value = "根据id删除", notes = "根据id删除")
public boolean deleteById(HttpServletRequest request, @PathVariable Long id){ public boolean deleteById(HttpServletRequest request, @PathVariable Long id){
...@@ -65,7 +65,7 @@ public class PowerTransferCompanyController extends BaseController { ...@@ -65,7 +65,7 @@ public class PowerTransferCompanyController extends BaseController {
* 修改调派单位 * 修改调派单位
* @return * @return
*/ */
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY) @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/updateById", method = RequestMethod.PUT) @RequestMapping(value = "/updateById", method = RequestMethod.PUT)
@ApiOperation(httpMethod = "PUT", value = "修改调派单位", notes = "修改调派单位") @ApiOperation(httpMethod = "PUT", value = "修改调派单位", notes = "修改调派单位")
public boolean updateByIdPowerTransferCompany(HttpServletRequest request, @RequestBody PowerTransferCompany powerTransferCompany){ public boolean updateByIdPowerTransferCompany(HttpServletRequest request, @RequestBody PowerTransferCompany powerTransferCompany){
...@@ -79,7 +79,7 @@ public class PowerTransferCompanyController extends BaseController { ...@@ -79,7 +79,7 @@ public class PowerTransferCompanyController extends BaseController {
* @param id * @param id
* @return * @return
*/ */
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY) @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/{id}", method = RequestMethod.GET) @RequestMapping(value = "/{id}", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "根据id查询", notes = "根据id查询") @ApiOperation(httpMethod = "GET", value = "根据id查询", notes = "根据id查询")
public PowerTransferCompany selectById(HttpServletRequest request, @PathVariable Long id){ public PowerTransferCompany selectById(HttpServletRequest request, @PathVariable Long id){
...@@ -92,7 +92,7 @@ public class PowerTransferCompanyController extends BaseController { ...@@ -92,7 +92,7 @@ public class PowerTransferCompanyController extends BaseController {
* 列表分页查询 * 列表分页查询
* @return * @return
*/ */
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY) @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/list", method = RequestMethod.GET) @RequestMapping(value = "/list", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "列表分页查询", notes = "列表分页查询") @ApiOperation(httpMethod = "GET", value = "列表分页查询", notes = "列表分页查询")
public IPage<PowerTransferCompany> listPage(String pageNum,String pageSize, PowerTransferCompany powerTransferCompany){ public IPage<PowerTransferCompany> listPage(String pageNum,String pageSize, PowerTransferCompany powerTransferCompany){
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/PowerTransferCompanyResourcesController.java
View file @ d9f14a6c
...@@ -39,7 +39,7 @@ public class PowerTransferCompanyResourcesController extends BaseController { ...@@ -39,7 +39,7 @@ public class PowerTransferCompanyResourcesController extends BaseController {
* 新增调派单位资源 * 新增调派单位资源
* @return * @return
*/ */
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY) @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/save", method = RequestMethod.POST) @RequestMapping(value = "/save", method = RequestMethod.POST)
@ApiOperation(httpMethod = "POST", value = "新增调派单位资源", notes = "新增调派单位资源") @ApiOperation(httpMethod = "POST", value = "新增调派单位资源", notes = "新增调派单位资源")
public boolean savePowerTransferCompanyResources(HttpServletRequest request, @RequestBody PowerTransferCompanyResources powerTransferCompanyResources){ public boolean savePowerTransferCompanyResources(HttpServletRequest request, @RequestBody PowerTransferCompanyResources powerTransferCompanyResources){
...@@ -51,7 +51,7 @@ public class PowerTransferCompanyResourcesController extends BaseController { ...@@ -51,7 +51,7 @@ public class PowerTransferCompanyResourcesController extends BaseController {
* @param id * @param id
* @return * @return
*/ */
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY) @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/{id}", method = RequestMethod.DELETE) @RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
@ApiOperation(httpMethod = "DELETE", value = "根据id删除", notes = "根据id删除") @ApiOperation(httpMethod = "DELETE", value = "根据id删除", notes = "根据id删除")
public boolean deleteById(HttpServletRequest request, @PathVariable Long id){ public boolean deleteById(HttpServletRequest request, @PathVariable Long id){
...@@ -65,7 +65,7 @@ public class PowerTransferCompanyResourcesController extends BaseController { ...@@ -65,7 +65,7 @@ public class PowerTransferCompanyResourcesController extends BaseController {
* 修改调派单位资源 * 修改调派单位资源
* @return * @return
*/ */
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY) @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/updateById", method = RequestMethod.PUT) @RequestMapping(value = "/updateById", method = RequestMethod.PUT)
@ApiOperation(httpMethod = "PUT", value = "修改调派单位资源", notes = "修改调派单位资源") @ApiOperation(httpMethod = "PUT", value = "修改调派单位资源", notes = "修改调派单位资源")
public boolean updateByIdPowerTransferCompanyResources(HttpServletRequest request, @RequestBody PowerTransferCompanyResources powerTransferCompanyResources){ public boolean updateByIdPowerTransferCompanyResources(HttpServletRequest request, @RequestBody PowerTransferCompanyResources powerTransferCompanyResources){
...@@ -79,7 +79,7 @@ public class PowerTransferCompanyResourcesController extends BaseController { ...@@ -79,7 +79,7 @@ public class PowerTransferCompanyResourcesController extends BaseController {
* @param id * @param id
* @return * @return
*/ */
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY) @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/{id}", method = RequestMethod.GET) @RequestMapping(value = "/{id}", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "根据id查询", notes = "根据id查询") @ApiOperation(httpMethod = "GET", value = "根据id查询", notes = "根据id查询")
public PowerTransferCompanyResources selectById(HttpServletRequest request, @PathVariable Long id){ public PowerTransferCompanyResources selectById(HttpServletRequest request, @PathVariable Long id){
...@@ -92,7 +92,7 @@ public class PowerTransferCompanyResourcesController extends BaseController { ...@@ -92,7 +92,7 @@ public class PowerTransferCompanyResourcesController extends BaseController {
* 列表分页查询 * 列表分页查询
* @return * @return
*/ */
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY) @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/list", method = RequestMethod.GET) @RequestMapping(value = "/list", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "列表分页查询", notes = "列表分页查询") @ApiOperation(httpMethod = "GET", value = "列表分页查询", notes = "列表分页查询")
public IPage<PowerTransferCompanyResources> listPage(String pageNum,String pageSize, PowerTransferCompanyResources powerTransferCompanyResources){ public IPage<PowerTransferCompanyResources> listPage(String pageNum,String pageSize, PowerTransferCompanyResources powerTransferCompanyResources){
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/PowerTransferController.java
View file @ d9f14a6c
package com.yeejoin.amos.boot.module.jcs.biz.controller; package com.yeejoin.amos.boot.module.jcs.biz.controller;
import com.yeejoin.amos.boot.biz.common.utils.CommonResponseUtil;
import com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferDto;
import com.yeejoin.amos.boot.module.jcs.api.vo.PowerTransferListVo;
import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
import org.springframework.beans.BeanUtils;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import com.yeejoin.amos.boot.biz.common.controller.BaseController; import com.yeejoin.amos.boot.biz.common.controller.BaseController;
import com.yeejoin.amos.boot.module.jcs.api.service.IPowerTransferService; import com.yeejoin.amos.boot.module.jcs.api.service.IPowerTransferService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import javax.servlet.http.HttpServletRequest;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
...@@ -18,15 +21,18 @@ import com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransfer; ...@@ -18,15 +21,18 @@ import com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransfer;
import com.yeejoin.amos.boot.biz.common.utils.NameUtils; import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
import org.typroject.tyboot.core.restful.doc.TycloudOperation; import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import org.typroject.tyboot.core.foundation.enumeration.UserType; import org.typroject.tyboot.core.foundation.enumeration.UserType;
import java.util.Arrays; import org.typroject.tyboot.core.restful.utils.ResponseModel;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
/** /**
* 力量调派 * 力量调派
* *
* @author tb * @author tb
* @date 2021-06-17 * @date 2021-06-17
*/ */
@RestController @RestController
@Api(tags = "力量调派Api") @Api(tags = "力量调派Api")
@RequestMapping(value = "/jcs/power-transfer") @RequestMapping(value = "/jcs/power-transfer")
...@@ -35,67 +41,78 @@ public class PowerTransferController extends BaseController { ...@@ -35,67 +41,78 @@ public class PowerTransferController extends BaseController {
@Autowired @Autowired
IPowerTransferService iPowerTransferService; IPowerTransferService iPowerTransferService;
/** /**
* 新增力量调派 * 新增力量调派
* @return *
* @return 返回结果
*/ */
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY) @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/save", method = RequestMethod.POST) @RequestMapping(value = "/save", method = RequestMethod.POST)
@ApiOperation(httpMethod = "POST", value = "新增力量调派", notes = "新增力量调派") @ApiOperation(httpMethod = "POST", value = "新增力量调派", notes = "新增力量调派")
public boolean savePowerTransfer(HttpServletRequest request, @RequestBody PowerTransfer powerTransfer){ public ResponseModel<Object> savePowerTransfer(@RequestBody PowerTransferDto powerTransferDto) {
return iPowerTransferService.save(powerTransfer); // AgencyUserModel userInfo = getUserInfo();
// powerTransferdto.setRecUserId(userInfo.getUserId());
// powerTransferdto.setRecUserName(userInfo.getUserName());
// powerTransferdto.setRecDate(new Date());
// boolean save = iPowerTransferService.createPowerTransfer(powerTransferDto);
PowerTransfer powerTransfer = new PowerTransfer();
BeanUtils.copyProperties(powerTransferDto,powerTransfer);
boolean save = iPowerTransferService.save(powerTransfer);
return CommonResponseUtil.success(save);
} }
/** /**
* 根据id删除 * 根据id删除
* @param id *
* @return * @param id id
* @return 返回结果
*/ */
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY) @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/{id}", method = RequestMethod.DELETE) @RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
@ApiOperation(httpMethod = "DELETE", value = "根据id删除", notes = "根据id删除") @ApiOperation(httpMethod = "DELETE", value = "根据id删除", notes = "根据id删除")
public boolean deleteById(HttpServletRequest request, @PathVariable Long id){ public boolean deleteById(@PathVariable Long id) {
return iPowerTransferService.removeById(id); return iPowerTransferService.removeById(id);
} }
/** /**
* 修改力量调派 * 修改力量调派
* @return *
* @return 返回结果
*/ */
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY) @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/updateById", method = RequestMethod.PUT) @RequestMapping(value = "/updateById", method = RequestMethod.PUT)
@ApiOperation(httpMethod = "PUT", value = "修改力量调派", notes = "修改力量调派") @ApiOperation(httpMethod = "PUT", value = "修改力量调派", notes = "修改力量调派")
public boolean updateByIdPowerTransfer(HttpServletRequest request, @RequestBody PowerTransfer powerTransfer){ public boolean updateByIdPowerTransfer(@RequestBody PowerTransfer powerTransfer) {
return iPowerTransferService.updateById(powerTransfer); return iPowerTransferService.updateById(powerTransfer);
} }
/** /**
* 根据id查询 * 根据id查询
* @param id *
* @return * @param id id
* @return 返回结果
*/ */
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY) @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/{id}", method = RequestMethod.GET) @RequestMapping(value = "/{id}", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "根据id查询", notes = "根据id查询") @ApiOperation(httpMethod = "GET", value = "根据id查询", notes = "根据id查询")
public PowerTransfer selectById(HttpServletRequest request, @PathVariable Long id){ public PowerTransfer selectById(@PathVariable Long id) {
return iPowerTransferService.getById(id); return iPowerTransferService.getById(id);
} }
/** /**
* 列表分页查询 * 列表分页查询
* @return *
* @return 返回结果
*/ */
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY) @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/list", method = RequestMethod.GET) @RequestMapping(value = "/list", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "列表分页查询", notes = "列表分页查询") @ApiOperation(httpMethod = "GET", value = "列表分页查询", notes = "列表分页查询")
public IPage<PowerTransfer> listPage(String pageNum,String pageSize, PowerTransfer powerTransfer){ public IPage<PowerTransfer> listPage(String pageNum, String pageSize, PowerTransfer powerTransfer) {
Page<PowerTransfer> pageBean; Page<PowerTransfer> pageBean;
QueryWrapper<PowerTransfer> powerTransferQueryWrapper = new QueryWrapper<>(); QueryWrapper<PowerTransfer> powerTransferQueryWrapper = new QueryWrapper<>();
...@@ -122,7 +139,7 @@ public class PowerTransferController extends BaseController { ...@@ -122,7 +139,7 @@ public class PowerTransferController extends BaseController {
} }
} }
} catch (Exception e) { } catch (Exception e) {
throw new RuntimeException("系统异常"); e.printStackTrace();
} }
}); });
IPage<PowerTransfer> page; IPage<PowerTransfer> page;
...@@ -134,5 +151,20 @@ public class PowerTransferController extends BaseController { ...@@ -134,5 +151,20 @@ public class PowerTransferController extends BaseController {
page = iPowerTransferService.page(pageBean, powerTransferQueryWrapper); page = iPowerTransferService.page(pageBean, powerTransferQueryWrapper);
return page; return page;
} }
/**
* 根据警情id获取力量调派列表
*
* @return 返回结果
*/
@TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/list/{alert_called_id}", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "根据警情id获取力量调派列表", notes = "根据警情id获取力量调派列表")
public ResponseModel<Object> list(@PathVariable String alert_called_id) {
List<PowerTransferListVo> powerTransferList =
iPowerTransferService.getPowerTransferList(Long.parseLong(alert_called_id));
return CommonResponseUtil.success(powerTransferList);
} }
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/TemplateController.java
View file @ d9f14a6c
...@@ -39,7 +39,7 @@ public class TemplateController extends BaseController { ...@@ -39,7 +39,7 @@ public class TemplateController extends BaseController {
* 新增模板表 * 新增模板表
* @return * @return
*/ */
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY) @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/save", method = RequestMethod.POST) @RequestMapping(value = "/save", method = RequestMethod.POST)
@ApiOperation(httpMethod = "POST", value = "新增模板表", notes = "新增模板表") @ApiOperation(httpMethod = "POST", value = "新增模板表", notes = "新增模板表")
public boolean saveTemplate(HttpServletRequest request, @RequestBody Template template){ public boolean saveTemplate(HttpServletRequest request, @RequestBody Template template){
...@@ -51,7 +51,7 @@ public class TemplateController extends BaseController { ...@@ -51,7 +51,7 @@ public class TemplateController extends BaseController {
* @param id * @param id
* @return * @return
*/ */
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY) @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/{id}", method = RequestMethod.DELETE) @RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
@ApiOperation(httpMethod = "DELETE", value = "根据id删除", notes = "根据id删除") @ApiOperation(httpMethod = "DELETE", value = "根据id删除", notes = "根据id删除")
public boolean deleteById(HttpServletRequest request, @PathVariable Long id){ public boolean deleteById(HttpServletRequest request, @PathVariable Long id){
...@@ -65,7 +65,7 @@ public class TemplateController extends BaseController { ...@@ -65,7 +65,7 @@ public class TemplateController extends BaseController {
* 修改模板表 * 修改模板表
* @return * @return
*/ */
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY) @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/updateById", method = RequestMethod.PUT) @RequestMapping(value = "/updateById", method = RequestMethod.PUT)
@ApiOperation(httpMethod = "PUT", value = "修改模板表", notes = "修改模板表") @ApiOperation(httpMethod = "PUT", value = "修改模板表", notes = "修改模板表")
public boolean updateByIdTemplate(HttpServletRequest request, @RequestBody Template template){ public boolean updateByIdTemplate(HttpServletRequest request, @RequestBody Template template){
...@@ -79,7 +79,7 @@ public class TemplateController extends BaseController { ...@@ -79,7 +79,7 @@ public class TemplateController extends BaseController {
* @param id * @param id
* @return * @return
*/ */
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY) @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/{id}", method = RequestMethod.GET) @RequestMapping(value = "/{id}", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "根据id查询", notes = "根据id查询") @ApiOperation(httpMethod = "GET", value = "根据id查询", notes = "根据id查询")
public Template selectById(HttpServletRequest request, @PathVariable Long id){ public Template selectById(HttpServletRequest request, @PathVariable Long id){
...@@ -92,7 +92,7 @@ public class TemplateController extends BaseController { ...@@ -92,7 +92,7 @@ public class TemplateController extends BaseController {
* 列表分页查询 * 列表分页查询
* @return * @return
*/ */
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY) @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/list", method = RequestMethod.GET) @RequestMapping(value = "/list", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "列表分页查询", notes = "列表分页查询") @ApiOperation(httpMethod = "GET", value = "列表分页查询", notes = "列表分页查询")
public IPage<Template> listPage(String pageNum,String pageSize, Template template){ public IPage<Template> listPage(String pageNum,String pageSize, Template template){
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/PowerTransferServiceImpl.java
View file @ d9f14a6c
package com.yeejoin.amos.boot.module.jcs.biz.service.impl; package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferCompanyDto;
import com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferCompanyResourcesDto;
import com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferDto;
import com.yeejoin.amos.boot.module.jcs.api.entity.AlertCalled;
import com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransfer; import com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransfer;
import com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransferCompany;
import com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransferCompanyResources;
import com.yeejoin.amos.boot.module.jcs.api.mapper.PowerTransferListMapper;
import com.yeejoin.amos.boot.module.jcs.api.mapper.PowerTransferMapper; import com.yeejoin.amos.boot.module.jcs.api.mapper.PowerTransferMapper;
import com.yeejoin.amos.boot.module.jcs.api.service.IAlertCalledService;
import com.yeejoin.amos.boot.module.jcs.api.service.IPowerTransferCompanyResourcesService;
import com.yeejoin.amos.boot.module.jcs.api.service.IPowerTransferCompanyService;
import com.yeejoin.amos.boot.module.jcs.api.service.IPowerTransferService; import com.yeejoin.amos.boot.module.jcs.api.service.IPowerTransferService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yeejoin.amos.boot.module.jcs.api.vo.PowerTransferListVo;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.List;
/** /**
* 力量调派 服务实现类 * 力量调派 服务实现类
* *
* @author tb * @author tb
* @date 2021-06-17 * @date 2021-06-17
*/ */
@Service @Service
public class PowerTransferServiceImpl extends ServiceImpl<PowerTransferMapper, PowerTransfer> implements IPowerTransferService { public class PowerTransferServiceImpl extends ServiceImpl<PowerTransferMapper, PowerTransfer> implements IPowerTransferService {
@Autowired
PowerTransferListMapper powerTransferListMapper;
@Autowired
IAlertCalledService iAlertCalledService;
@Autowired
IPowerTransferCompanyService iPowerTransferCompanyService;
@Autowired
IPowerTransferCompanyResourcesService iPowerTransferCompanyResourcesService;
public List<PowerTransferListVo> getPowerTransferList(Long alertCalledId) {
return powerTransferListMapper.getPowerTransferList(alertCalledId);
}
@Override
@Transactional
public boolean createPowerTransfer(PowerTransferDto powerTransferDto) {
// 获取调派ID
Long alertCalledId = powerTransferDto.getAlertCalledId();
int count = count(new QueryWrapper<PowerTransfer>().eq("alert_called_id", alertCalledId));
String dispatch_num = alertCalledId.toString() + (count + 1);
// 获取警情详情
AlertCalled alertCalled = iAlertCalledService.getById(alertCalledId);
// 创建力量调派
PowerTransfer powerTransfer = new PowerTransfer();
powerTransfer.setAlertCalledId(alertCalledId);
powerTransfer.setDispatchNum(dispatch_num);
powerTransfer.setDispatchType(powerTransferDto.getDispatchType());
powerTransfer.setTaskSenderName(powerTransferDto.getTaskSenderName());
powerTransfer.setTaskSenderId(powerTransferDto.getTaskSenderId());
powerTransfer.setAddress(alertCalled.getAddress());
powerTransfer.setCoordinateX(alertCalled.getCoordinateX());
powerTransfer.setCoordinateY(alertCalled.getCoordinateY());
powerTransfer.setRescueGrid(alertCalled.getRescueGrid());
powerTransfer.setCarAddress(alertCalled.getAddress());
powerTransfer.setCarCoordinateX(alertCalled.getCoordinateX());
powerTransfer.setCarCoordinateY(alertCalled.getCoordinateY());
powerTransfer.setRecUserId(powerTransferDto.getRecUserId());
powerTransfer.setRecUserName(powerTransferDto.getRecUserName());
boolean b = save(powerTransfer);
Long powerTransferSequenceNbr = powerTransfer.getSequenceNbr();
// 创建力量调派单位
List<PowerTransferCompanyDto> powerTransferCompanyDotList = powerTransferDto.getPowerTransferCompanyDotList();
PowerTransferCompany powerTransferCompany = null;
// 获取任务派发模板
for (PowerTransferCompanyDto powerTransferCompanyDto : powerTransferCompanyDotList) {
BeanUtils.copyProperties(powerTransferCompanyDto, powerTransferCompany);
powerTransferCompany.setPowerTransferId(powerTransferSequenceNbr);
List<PowerTransferCompanyResourcesDto> powerTransferCompanyResourcesDtoList =
powerTransferCompanyDto.getPowerTransferCompanyResourcesDtoList();
if (powerTransferCompanyResourcesDtoList.size() == 0) {
powerTransferCompany.setIsDistributionAgencies(true);
iPowerTransferCompanyService.save(powerTransferCompany);
} else {
powerTransferCompany.setIsDistributionAgencies(false);
iPowerTransferCompanyService.save(powerTransferCompany);
Long powerTransferCompanySequenceNbr = powerTransferCompany.getSequenceNbr();
List<PowerTransferCompanyResources> powerTransferCompanyResourcesList =
DtoEntityBatchConvert(powerTransferCompanyResourcesDtoList, powerTransferCompanySequenceNbr);
iPowerTransferCompanyResourcesService.saveBatch(powerTransferCompanyResourcesList);
}
}
return true;
}
private List<PowerTransferCompanyResources> DtoEntityBatchConvert(List<PowerTransferCompanyResourcesDto> powerTransferCompanyResourcesDtoList, Long powerTransferCompanySequenceNbr) {
ArrayList<PowerTransferCompanyResources> powerTransferCompanyResourcesList = new ArrayList<>();
PowerTransferCompanyResources powerTransferCompanyResources = null;
for (PowerTransferCompanyResourcesDto powerTransferCompanyResourcesDto : powerTransferCompanyResourcesDtoList) {
BeanUtils.copyProperties(powerTransferCompanyResourcesDto, powerTransferCompanyResources);
powerTransferCompanyResources.setPowerTransferCompanyId(powerTransferCompanySequenceNbr);
powerTransferCompanyResourcesList.add(powerTransferCompanyResources);
}
return powerTransferCompanyResourcesList;
}
} }
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