Skip to content

A
amos-boot-biz
Commit 37f34095 authored by tangwei's avatar tangwei
Browse files
Options

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

parents d2681852 2e705281
Show whitespace changes
Inline Side-by-side
Showing with 139 additions and 131 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 @ 37f34095
...@@ -7,11 +7,6 @@ import io.swagger.annotations.ApiModelProperty; ...@@ -7,11 +7,6 @@ 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;
import java.util.List; import java.util.List;
......
amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/PowerTransferCompanyResourcesDto.java
View file @ 37f34095
...@@ -7,11 +7,6 @@ import io.swagger.annotations.ApiModelProperty; ...@@ -7,11 +7,6 @@ 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/dto/PowerTransferDto.java
View file @ 37f34095
...@@ -2,17 +2,11 @@ package com.yeejoin.amos.boot.module.jcs.api.dto; ...@@ -2,17 +2,11 @@ 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;
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;
import java.util.List; import java.util.List;
...@@ -46,6 +40,9 @@ public class PowerTransferDto extends BaseEntity { ...@@ -46,6 +40,9 @@ public class PowerTransferDto extends BaseEntity {
@ApiModelProperty(value = "发送者id") @ApiModelProperty(value = "发送者id")
private Long taskSenderId; private Long taskSenderId;
@ApiModelProperty(value = "发送者单位")
private String companyName;
@ApiModelProperty(value = "地址") @ApiModelProperty(value = "地址")
private String address; private String address;
......
amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/PowerTransferCompany.java
View file @ 37f34095
...@@ -7,9 +7,7 @@ import io.swagger.annotations.ApiModelProperty; ...@@ -7,9 +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.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;
/** /**
* 调派单位 * 调派单位
* *
......
amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/PowerTransferCompanyResources.java
View file @ 37f34095
...@@ -7,9 +7,7 @@ import io.swagger.annotations.ApiModelProperty; ...@@ -7,9 +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.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;
/** /**
* 调派单位资源 * 调派单位资源
* *
......
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
View file @ 37f34095
...@@ -3,7 +3,6 @@ package com.yeejoin.amos.boot.module.jcs.api.mapper; ...@@ -3,7 +3,6 @@ package com.yeejoin.amos.boot.module.jcs.api.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yeejoin.amos.boot.module.jcs.api.vo.PowerTransferListVo; import com.yeejoin.amos.boot.module.jcs.api.vo.PowerTransferListVo;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Select;
import java.util.List; import java.util.List;
......
amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/vo/PowerTransferCompanyResourcesVo.java
View file @ 37f34095
package com.yeejoin.amos.boot.module.jcs.api.vo; package com.yeejoin.amos.boot.module.jcs.api.vo;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
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;
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/vo/PowerTransferCompanyVo.java
View file @ 37f34095
package com.yeejoin.amos.boot.module.jcs.api.vo; package com.yeejoin.amos.boot.module.jcs.api.vo;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
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;
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/vo/PowerTransferVo.java
View file @ 37f34095
package com.yeejoin.amos.boot.module.jcs.api.vo; package com.yeejoin.amos.boot.module.jcs.api.vo;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
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;
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-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/PowerTransferCompanyController.java
View file @ 37f34095
package com.yeejoin.amos.boot.module.jcs.biz.controller; package com.yeejoin.amos.boot.module.jcs.biz.controller;
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;
...@@ -10,7 +11,7 @@ import com.yeejoin.amos.boot.module.jcs.api.service.IPowerTransferCompanyService ...@@ -10,7 +11,7 @@ import com.yeejoin.amos.boot.module.jcs.api.service.IPowerTransferCompanyService
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 +19,16 @@ import com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransferCompany; ...@@ -18,15 +19,16 @@ import com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransferCompany;
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 java.util.Arrays;
/** /**
* 调派单位 * 调派单位
* *
* @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-company") @RequestMapping(value = "/jcs/power-transfer-company")
...@@ -37,65 +39,67 @@ public class PowerTransferCompanyController extends BaseController { ...@@ -37,65 +39,67 @@ public class PowerTransferCompanyController extends BaseController {
/** /**
* 新增调派单位 * 新增调派单位
* @return *
* @return 返回结果
*/ */
@TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY) @TycloudOperation(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(@RequestBody PowerTransferCompany powerTransferCompany) {
return iPowerTransferCompanyService.save(powerTransferCompany); return iPowerTransferCompanyService.save(powerTransferCompany);
} }
/** /**
* 根据id删除 * 根据id删除
* @param id *
* @return * @param id id
* @return 返回结果
*/ */
@TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY) @TycloudOperation(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 iPowerTransferCompanyService.removeById(id); return iPowerTransferCompanyService.removeById(id);
} }
/** /**
* 修改调派单位 * 修改调派单位
* @return *
* @return 返回结果
*/ */
@TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY) @TycloudOperation(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(@RequestBody PowerTransferCompany powerTransferCompany) {
return iPowerTransferCompanyService.updateById(powerTransferCompany); return iPowerTransferCompanyService.updateById(powerTransferCompany);
} }
/** /**
* 根据id查询 * 根据id查询
* @param id *
* @return * @param id id
* @return 返回结果
*/ */
@TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY) @TycloudOperation(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(@PathVariable Long id) {
return iPowerTransferCompanyService.getById(id); return iPowerTransferCompanyService.getById(id);
} }
/** /**
* 列表分页查询 * 列表分页查询
* @return *
* @return 返回结果
*/ */
@TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY) @TycloudOperation(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) {
Page<PowerTransferCompany> pageBean; Page<PowerTransferCompany> pageBean;
QueryWrapper<PowerTransferCompany> powerTransferCompanyQueryWrapper = new QueryWrapper<>(); QueryWrapper<PowerTransferCompany> powerTransferCompanyQueryWrapper = new QueryWrapper<>();
...@@ -134,5 +138,5 @@ public class PowerTransferCompanyController extends BaseController { ...@@ -134,5 +138,5 @@ public class PowerTransferCompanyController extends BaseController {
page = iPowerTransferCompanyService.page(pageBean, powerTransferCompanyQueryWrapper); page = iPowerTransferCompanyService.page(pageBean, powerTransferCompanyQueryWrapper);
return page; return page;
} }
} }
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 @ 37f34095
package com.yeejoin.amos.boot.module.jcs.biz.controller; package com.yeejoin.amos.boot.module.jcs.biz.controller;
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;
...@@ -10,7 +11,7 @@ import com.yeejoin.amos.boot.module.jcs.api.service.IPowerTransferCompanyResourc ...@@ -10,7 +11,7 @@ import com.yeejoin.amos.boot.module.jcs.api.service.IPowerTransferCompanyResourc
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 +19,16 @@ import com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransferCompanyResources ...@@ -18,15 +19,16 @@ import com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransferCompanyResources
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 java.util.Arrays;
/** /**
* 调派单位资源 * 调派单位资源
* *
* @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-company-resources") @RequestMapping(value = "/jcs/power-transfer-company-resources")
...@@ -37,65 +39,67 @@ public class PowerTransferCompanyResourcesController extends BaseController { ...@@ -37,65 +39,67 @@ public class PowerTransferCompanyResourcesController extends BaseController {
/** /**
* 新增调派单位资源 * 新增调派单位资源
* @return *
* @return 返回结果
*/ */
@TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY) @TycloudOperation(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(@RequestBody PowerTransferCompanyResources powerTransferCompanyResources) {
return iPowerTransferCompanyResourcesService.save(powerTransferCompanyResources); return iPowerTransferCompanyResourcesService.save(powerTransferCompanyResources);
} }
/** /**
* 根据id删除 * 根据id删除
* @param id *
* @return * @param id id
* @return 返回结果
*/ */
@TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY) @TycloudOperation(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 iPowerTransferCompanyResourcesService.removeById(id); return iPowerTransferCompanyResourcesService.removeById(id);
} }
/** /**
* 修改调派单位资源 * 修改调派单位资源
* @return *
* @return 返回结果
*/ */
@TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY) @TycloudOperation(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(@RequestBody PowerTransferCompanyResources powerTransferCompanyResources) {
return iPowerTransferCompanyResourcesService.updateById(powerTransferCompanyResources); return iPowerTransferCompanyResourcesService.updateById(powerTransferCompanyResources);
} }
/** /**
* 根据id查询 * 根据id查询
* @param id *
* @return * @param id id
* @return 返回结果
*/ */
@TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY) @TycloudOperation(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(@PathVariable Long id) {
return iPowerTransferCompanyResourcesService.getById(id); return iPowerTransferCompanyResourcesService.getById(id);
} }
/** /**
* 列表分页查询 * 列表分页查询
* @return *
* @return 返回结果
*/ */
@TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY) @TycloudOperation(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) {
Page<PowerTransferCompanyResources> pageBean; Page<PowerTransferCompanyResources> pageBean;
QueryWrapper<PowerTransferCompanyResources> powerTransferCompanyResourcesQueryWrapper = new QueryWrapper<>(); QueryWrapper<PowerTransferCompanyResources> powerTransferCompanyResourcesQueryWrapper = new QueryWrapper<>();
...@@ -134,5 +138,5 @@ public class PowerTransferCompanyResourcesController extends BaseController { ...@@ -134,5 +138,5 @@ public class PowerTransferCompanyResourcesController extends BaseController {
page = iPowerTransferCompanyResourcesService.page(pageBean, powerTransferCompanyResourcesQueryWrapper); page = iPowerTransferCompanyResourcesService.page(pageBean, powerTransferCompanyResourcesQueryWrapper);
return page; return page;
} }
} }
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 @ 37f34095
...@@ -4,7 +4,6 @@ import com.yeejoin.amos.boot.biz.common.utils.CommonResponseUtil; ...@@ -4,7 +4,6 @@ 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.dto.PowerTransferDto;
import com.yeejoin.amos.boot.module.jcs.api.vo.PowerTransferListVo; import com.yeejoin.amos.boot.module.jcs.api.vo.PowerTransferListVo;
import com.yeejoin.amos.feign.privilege.model.AgencyUserModel; 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;
...@@ -24,7 +23,6 @@ import org.typroject.tyboot.core.foundation.enumeration.UserType; ...@@ -24,7 +23,6 @@ import org.typroject.tyboot.core.foundation.enumeration.UserType;
import org.typroject.tyboot.core.restful.utils.ResponseModel; import org.typroject.tyboot.core.restful.utils.ResponseModel;
import java.util.Arrays; import java.util.Arrays;
import java.util.Date;
import java.util.List; import java.util.List;
/** /**
...@@ -47,7 +45,7 @@ public class PowerTransferController extends BaseController { ...@@ -47,7 +45,7 @@ public class PowerTransferController extends BaseController {
* *
* @return 返回结果 * @return 返回结果
*/ */
@TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY) @TycloudOperation(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(@RequestBody PowerTransfer powerTransfer) { public boolean savePowerTransfer(@RequestBody PowerTransfer powerTransfer) {
...@@ -60,7 +58,7 @@ public class PowerTransferController extends BaseController { ...@@ -60,7 +58,7 @@ public class PowerTransferController extends BaseController {
* @param id id * @param id id
* @return 返回结果 * @return 返回结果
*/ */
@TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY) @TycloudOperation(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(@PathVariable Long id) { public boolean deleteById(@PathVariable Long id) {
...@@ -73,7 +71,7 @@ public class PowerTransferController extends BaseController { ...@@ -73,7 +71,7 @@ public class PowerTransferController extends BaseController {
* *
* @return 返回结果 * @return 返回结果
*/ */
@TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY) @TycloudOperation(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(@RequestBody PowerTransfer powerTransfer) { public boolean updateByIdPowerTransfer(@RequestBody PowerTransfer powerTransfer) {
...@@ -87,7 +85,7 @@ public class PowerTransferController extends BaseController { ...@@ -87,7 +85,7 @@ public class PowerTransferController extends BaseController {
* @param id id * @param id id
* @return 返回结果 * @return 返回结果
*/ */
@TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY) @TycloudOperation(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(@PathVariable Long id) { public PowerTransfer selectById(@PathVariable Long id) {
...@@ -99,7 +97,7 @@ public class PowerTransferController extends BaseController { ...@@ -99,7 +97,7 @@ public class PowerTransferController extends BaseController {
* *
* @return 返回结果 * @return 返回结果
*/ */
@TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY) @TycloudOperation(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) {
...@@ -147,7 +145,7 @@ public class PowerTransferController extends BaseController { ...@@ -147,7 +145,7 @@ public class PowerTransferController extends BaseController {
* *
* @return 返回结果 * @return 返回结果
*/ */
@TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/list/{alert_called_id}", method = RequestMethod.GET) @RequestMapping(value = "/list/{alert_called_id}", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "根据警情id获取力量调派列表", notes = "根据警情id获取力量调派列表") @ApiOperation(httpMethod = "GET", value = "根据警情id获取力量调派列表", notes = "根据警情id获取力量调派列表")
public ResponseModel<Object> list(@PathVariable String alert_called_id) { public ResponseModel<Object> list(@PathVariable String alert_called_id) {
...@@ -163,13 +161,16 @@ public class PowerTransferController extends BaseController { ...@@ -163,13 +161,16 @@ public class PowerTransferController extends BaseController {
* *
* @return 返回结果 * @return 返回结果
*/ */
@TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/create", method = RequestMethod.POST) @RequestMapping(value = "/create", method = RequestMethod.POST)
@ApiOperation(httpMethod = "POST", value = "力量调派-任务派发", notes = "力量调派-任务派发") @ApiOperation(httpMethod = "POST", value = "力量调派-任务派发", notes = "力量调派-任务派发")
public ResponseModel<Object> createPowerTransfer(@RequestBody PowerTransferDto powerTransferDto) { public ResponseModel<Object> createPowerTransfer(@RequestBody PowerTransferDto powerTransferDto) {
AgencyUserModel userInfo = getUserInfo(); AgencyUserModel userInfo = getUserInfo();
powerTransferDto.setRecUserId(userInfo.getUserId()); powerTransferDto.setTaskSenderId(Long.parseLong(userInfo.getUserId()));
powerTransferDto.setRecUserName(userInfo.getUserName()); powerTransferDto.setTaskSenderName(userInfo.getUserName());
String companyName = getSelectedOrgInfo().getCompany().getCompanyName();
powerTransferDto.setCompanyName(companyName);
boolean save = iPowerTransferService.createPowerTransfer(powerTransferDto); boolean save = iPowerTransferService.createPowerTransfer(powerTransferDto);
return CommonResponseUtil.success(save); return CommonResponseUtil.success(save);
......
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 @ 37f34095
...@@ -4,27 +4,19 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; ...@@ -4,27 +4,19 @@ 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.PowerTransferCompanyDto;
import com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferCompanyResourcesDto; 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.dto.PowerTransferDto;
import com.yeejoin.amos.boot.module.jcs.api.entity.AlertCalled; import com.yeejoin.amos.boot.module.jcs.api.entity.*;
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.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.*;
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.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 com.yeejoin.amos.boot.module.jcs.api.vo.PowerTransferListVo;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList; import java.util.*;
import java.util.Collection;
import java.util.List;
import java.util.stream.Collectors;
/** /**
* 力量调派 服务实现类 * 力量调派 服务实现类
...@@ -47,6 +39,12 @@ public class PowerTransferServiceImpl extends ServiceImpl<PowerTransferMapper, P ...@@ -47,6 +39,12 @@ public class PowerTransferServiceImpl extends ServiceImpl<PowerTransferMapper, P
@Autowired @Autowired
IPowerTransferCompanyResourcesService iPowerTransferCompanyResourcesService; IPowerTransferCompanyResourcesService iPowerTransferCompanyResourcesService;
@Autowired
ITemplateService iTemplateService;
@Autowired
IAlertFormValueService iAlertFormValueService;
public List<PowerTransferListVo> getPowerTransferList(Long alertCalledId) { public List<PowerTransferListVo> getPowerTransferList(Long alertCalledId) {
return powerTransferListMapper.getPowerTransferList(alertCalledId); return powerTransferListMapper.getPowerTransferList(alertCalledId);
} }
...@@ -61,30 +59,51 @@ public class PowerTransferServiceImpl extends ServiceImpl<PowerTransferMapper, P ...@@ -61,30 +59,51 @@ public class PowerTransferServiceImpl extends ServiceImpl<PowerTransferMapper, P
// 获取警情详情 // 获取警情详情
AlertCalled alertCalled = iAlertCalledService.getById(alertCalledId); AlertCalled alertCalled = iAlertCalledService.getById(alertCalledId);
String rescueGrid = StringUtils.isEmpty(alertCalled.getRescueGrid()) ? "" : alertCalled.getRescueGrid();
String alertType = StringUtils.isEmpty(alertCalled.getAlertType()) ? "" : alertCalled.getAlertType();
String address = StringUtils.isEmpty(alertCalled.getAddress()) ? "" : alertCalled.getAddress();
String coordinateX = alertCalled.getCoordinateX();
String coordinateY = alertCalled.getCoordinateY();
// 创建力量调派 // 创建力量调派
PowerTransfer powerTransfer = new PowerTransfer(); PowerTransfer powerTransfer = new PowerTransfer();
powerTransfer.setAlertCalledId(alertCalledId); powerTransfer.setAlertCalledId(alertCalledId);
powerTransfer.setDispatchNum(dispatch_num); powerTransfer.setDispatchNum(dispatch_num);
powerTransfer.setDispatchType(powerTransferDto.getDispatchType()); powerTransfer.setDispatchType(powerTransferDto.getDispatchType());
powerTransfer.setTaskSenderName(powerTransferDto.getRecUserName()); powerTransfer.setTaskSenderName(powerTransferDto.getTaskSenderName());
powerTransfer.setTaskSenderId(Long.parseLong(powerTransferDto.getRecUserId())); powerTransfer.setTaskSenderId(powerTransferDto.getTaskSenderId());
powerTransfer.setAddress(alertCalled.getAddress()); powerTransfer.setAddress(address);
powerTransfer.setCoordinateX(alertCalled.getCoordinateX()); powerTransfer.setCoordinateX(coordinateX);
powerTransfer.setCoordinateY(alertCalled.getCoordinateY()); powerTransfer.setCoordinateY(coordinateY);
powerTransfer.setRescueGrid(alertCalled.getRescueGrid()); powerTransfer.setRescueGrid(rescueGrid);
powerTransfer.setCarAddress(alertCalled.getAddress()); powerTransfer.setCarAddress(address);
powerTransfer.setCarCoordinateX(alertCalled.getCoordinateX()); powerTransfer.setCarCoordinateX(coordinateX);
powerTransfer.setCarCoordinateY(alertCalled.getCoordinateY()); powerTransfer.setCarCoordinateY(coordinateY);
save(powerTransfer); save(powerTransfer);
Long powerTransferSequenceNbr = powerTransfer.getSequenceNbr(); Long powerTransferSequenceNbr = powerTransfer.getSequenceNbr();
// 创建力量调派单位 // 创建力量调派单位
List<PowerTransferCompanyDto> powerTransferCompanyDotList = powerTransferDto.getPowerTransferCompanyDotList(); List<PowerTransferCompanyDto> powerTransferCompanyDotList = powerTransferDto.getPowerTransferCompanyDotList();
PowerTransferCompany powerTransferCompany; PowerTransferCompany powerTransferCompany;
// 获取任务派发模板
List<AlertFormValue> alertFormValue = iAlertFormValueService.list(new QueryWrapper<AlertFormValue>().eq(
"alert_called_id", alertCalledId));
// 获取任务派发模板
Template template = iTemplateService.getOne(new QueryWrapper<Template>().eq("type", "ptransfer"));
String content = template.getContent();
Map<String, String> definitions = new HashMap<>();
definitions.put("rescueGrid", rescueGrid);
definitions.put("alertType", alertType);
definitions.put("address", address);
definitions.put("trappedNum", alertCalled.getTrappedNum().toString());
definitions.put("casualtiesNum", alertCalled.getCasualtiesNum().toString());
definitions.put("companyName", powerTransferDto.getCompanyName());
for (AlertFormValue formValue : alertFormValue) {
content = StringUtils.replaceOnce(content, formValue.getFieldCode(), formValue.getFieldValue());
}
for (PowerTransferCompanyDto powerTransferCompanyDto : powerTransferCompanyDotList) { for (PowerTransferCompanyDto powerTransferCompanyDto : powerTransferCompanyDotList) {
powerTransferCompany = new PowerTransferCompany(); powerTransferCompany = new PowerTransferCompany();
BeanUtils.copyProperties(powerTransferCompanyDto, powerTransferCompany); BeanUtils.copyProperties(powerTransferCompanyDto, powerTransferCompany);
...@@ -93,9 +112,21 @@ public class PowerTransferServiceImpl extends ServiceImpl<PowerTransferMapper, P ...@@ -93,9 +112,21 @@ public class PowerTransferServiceImpl extends ServiceImpl<PowerTransferMapper, P
powerTransferCompanyDto.getPowerTransferCompanyResourcesDtoList(); powerTransferCompanyDto.getPowerTransferCompanyResourcesDtoList();
if (powerTransferCompanyResourcesDtoList.size() == 0) { if (powerTransferCompanyResourcesDtoList.size() == 0) {
powerTransferCompany.setIsDistributionAgencies(true); powerTransferCompany.setIsDistributionAgencies(true);
definitions.put("type", "");
definitions.put("resourcesNum", "");
powerTransferCompany.setTaskInformation(getTaskInformation(content, definitions));
iPowerTransferCompanyService.save(powerTransferCompany); iPowerTransferCompanyService.save(powerTransferCompany);
} else { } else {
powerTransferCompany.setIsDistributionAgencies(false); powerTransferCompany.setIsDistributionAgencies(false);
StringBuilder taskInformation = new StringBuilder();
for (PowerTransferCompanyResourcesDto powerTransferCompanyResourcesDto :
powerTransferCompanyResourcesDtoList) {
definitions.put("type", powerTransferCompanyResourcesDto.getType());
definitions.put("resourcesNum", powerTransferCompanyResourcesDto.getResourcesNum());
String information = getTaskInformation(content, definitions);
taskInformation.append(information).append(";");
}
powerTransferCompany.setTaskInformation(taskInformation.toString());
iPowerTransferCompanyService.save(powerTransferCompany); iPowerTransferCompanyService.save(powerTransferCompany);
Long powerTransferCompanySequenceNbr = powerTransferCompany.getSequenceNbr(); Long powerTransferCompanySequenceNbr = powerTransferCompany.getSequenceNbr();
List<PowerTransferCompanyResources> powerTransferCompanyResourcesList = List<PowerTransferCompanyResources> powerTransferCompanyResourcesList =
...@@ -117,4 +148,11 @@ public class PowerTransferServiceImpl extends ServiceImpl<PowerTransferMapper, P ...@@ -117,4 +148,11 @@ public class PowerTransferServiceImpl extends ServiceImpl<PowerTransferMapper, P
} }
return powerTransferCompanyResourcesList; return powerTransferCompanyResourcesList;
} }
private String getTaskInformation(String taskInformation, Map<String, String> definitions) {
int size = definitions.size();
String[] keys = definitions.keySet().toArray(new String[size]);
String[] values = definitions.values().toArray(new String[size]);
return StringUtils.replaceEach(taskInformation, keys, values);
}
} }
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