Commit 1626a190 authored by tangwei's avatar tangwei

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

parents 2c27c0ae 4ffc0051
package com.yeejoin.amos.boot.biz.common.feign;
import com.yeejoin.amos.component.feign.utils.FeignUtil;
import com.yeejoin.amos.feign.systemctl.Systemctl;
import com.yeejoin.amos.feign.systemctl.model.DictionarieValueModel;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* 平台Feign service
*
* @author tb
*/
@Service
public class AmosFeignService {
private final Logger logger = LogManager.getLogger(AmosFeignService.class);
/**
* 根据dictCode从平台获取数据字典
*
* @param dictCode
* @return
*/
public Object listDictionaryByDictCode(String dictCode) throws Exception {
logger.info("===========>listDictionaryByDictCode方法请求参数:{}", dictCode);
List<DictionarieValueModel> dictionaryModel;
dictionaryModel = FeignUtil.remoteCall(() -> Systemctl.dictionarieClient.dictValues(dictCode));
return dictionaryModel;
}
}
package com.yeejoin.amos.boot.biz.common.feign;
import feign.RequestInterceptor;
import feign.RequestTemplate;
import org.springframework.util.StringUtils;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
import javax.servlet.http.HttpServletRequest;
/**
* @author DELL
*/
public class FeignAuthRequestInterceptor implements RequestInterceptor {
public FeignAuthRequestInterceptor() {
}
@Override
public void apply(RequestTemplate template) {
ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
if (attributes != null) {
HttpServletRequest request = attributes.getRequest();
/* Get token from header */
String authToken = StringUtils.isEmpty(request.getHeader("X-Access-Token")) ? request.getHeader("token") : request.getHeader("X-Access-Token");
/* If token not found get it from request parameter */
if (authToken == null) {
authToken = request.getParameter("token");
}
template.header("X-Access-Token", authToken);
template.header("token", authToken);
template.header("appKey", request.getHeader("appKey"));
template.header("product", request.getHeader("product"));
}
}
}
package com.yeejoin.amos.boot.biz.common.feign;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
/**
* @author DELL
*/
@Configuration
public class FeignConfiguration {
/**
* 创建Feign请求拦截器,在发送请求前设置认证的token,各个微服务将token设置到环境变量中来达到通用
* @return
*/
@Bean
public FeignAuthRequestInterceptor basicAuthRequestInterceptor() {
return new FeignAuthRequestInterceptor();
}
}
......@@ -28,25 +28,19 @@ public class ElevatorDto extends BaseEntity {
private Integer rescueCode;
@ApiModelProperty(value = "设备注册代码")
private String registorCode;
private String registerCode;
@ApiModelProperty(value = "所属省")
private String province;
@ApiModelProperty(value = "所属省代码")
private String provinceCode;
@ApiModelProperty(value = "所属地市")
private String city;
@ApiModelProperty(value = "所属地市代码")
private String cityCode;
@ApiModelProperty(value = "所属区县")
private String district;
@ApiModelProperty(value = "所属区代码")
private String districtCode;
@ApiModelProperty(value = "所属区代码")
private String regionCode;
@ApiModelProperty(value = "安装地址")
private String address;
......
......@@ -36,20 +36,14 @@ public class MaintenanceUnitDto extends BaseEntity {
@ApiModelProperty(value = "省份")
private String province;
@ApiModelProperty(value = "省份代码")
private String provinceCode;
@ApiModelProperty(value = "地市")
private String city;
@ApiModelProperty(value = "地市代码")
private String cityCode;
@ApiModelProperty(value = "区县")
private String district;
@ApiModelProperty(value = "区代码")
private String districtCode;
@ApiModelProperty(value = "区代码")
private String regionCode;
@ApiModelProperty(value = "地址(详细地址,包括道路、门牌号码)")
private String address;
......
......@@ -33,20 +33,14 @@ public class RescueStationDto extends BaseEntity {
@ApiModelProperty(value = "省份")
private String province;
@ApiModelProperty(value = "省份代码")
private String provinceCode;
@ApiModelProperty(value = "地市")
private String city;
@ApiModelProperty(value = "地市代码")
private String cityCode;
@ApiModelProperty(value = "区县")
private String district;
@ApiModelProperty(value = "区代码")
private String districtCode;
@ApiModelProperty(value = "区代码")
private String regionCode;
@ApiModelProperty(value = "地址(详细地址,包括道路、门牌号码)")
private String address;
......
......@@ -42,20 +42,14 @@ public class UseUnitDto extends BaseEntity {
@ApiModelProperty(value = "省份")
private String province;
@ApiModelProperty(value = "省份代码")
private String provinceCode;
@ApiModelProperty(value = "地市")
private String city;
@ApiModelProperty(value = "地市代码")
private String cityCode;
@ApiModelProperty(value = "区县")
private String district;
@ApiModelProperty(value = "区代码")
private String districtCode;
@ApiModelProperty(value = "区代码")
private String regionCode;
@ApiModelProperty(value = "地址")
private String address;
......
......@@ -29,25 +29,19 @@ public class Elevator extends BaseEntity {
private Integer rescueCode;
@ApiModelProperty(value = "设备注册代码")
private String registorCode;
private String registerCode;
@ApiModelProperty(value = "所属省")
private String province;
@ApiModelProperty(value = "所属省代码")
private String provinceCode;
@ApiModelProperty(value = "所属地市")
private String city;
@ApiModelProperty(value = "所属地市代码")
private String cityCode;
@ApiModelProperty(value = "所属区县")
private String district;
@ApiModelProperty(value = "所属区代码")
private String districtCode;
@ApiModelProperty(value = "所属区代码")
private String regionCode;
@ApiModelProperty(value = "安装地址")
private String address;
......
......@@ -37,20 +37,14 @@ public class MaintenanceUnit extends BaseEntity {
@ApiModelProperty(value = "省份")
private String province;
@ApiModelProperty(value = "省份代码")
private String provinceCode;
@ApiModelProperty(value = "地市")
private String city;
@ApiModelProperty(value = "地市代码")
private String cityCode;
@ApiModelProperty(value = "区县")
private String district;
@ApiModelProperty(value = "区代码")
private String districtCode;
@ApiModelProperty(value = "区代码")
private String regionCode;
@ApiModelProperty(value = "地址(详细地址,包括道路、门牌号码)")
private String address;
......
......@@ -34,20 +34,14 @@ public class RescueStation extends BaseEntity {
@ApiModelProperty(value = "省份")
private String province;
@ApiModelProperty(value = "省份代码")
private String provinceCode;
@ApiModelProperty(value = "地市")
private String city;
@ApiModelProperty(value = "地市代码")
private String cityCode;
@ApiModelProperty(value = "区县")
private String district;
@ApiModelProperty(value = "区代码")
private String districtCode;
@ApiModelProperty(value = "区代码")
private String regionCode;
@ApiModelProperty(value = "地址(详细地址,包括道路、门牌号码)")
private String address;
......
......@@ -43,20 +43,14 @@ public class UseUnit extends BaseEntity {
@ApiModelProperty(value = "省份")
private String province;
@ApiModelProperty(value = "省份代码")
private String provinceCode;
@ApiModelProperty(value = "地市")
private String city;
@ApiModelProperty(value = "地市代码")
private String cityCode;
@ApiModelProperty(value = "区县")
private String district;
@ApiModelProperty(value = "区代码")
private String districtCode;
@ApiModelProperty(value = "区代码")
private String regionCode;
@ApiModelProperty(value = "地址")
private String address;
......
......@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
import java.util.Date;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
......@@ -17,7 +18,7 @@ import lombok.experimental.Accessors;
@Accessors(chain = true)
@TableName("tcb_elevator")
@ApiModel(value = "ElevatorVo", description = "ElevatorVo")
public class ElevatorVo {
public class ElevatorVo extends BaseEntity {
private static final long serialVersionUID = 1L;
......@@ -26,25 +27,19 @@ public class ElevatorVo {
private Integer rescueCode;
@ApiModelProperty(value = "设备注册代码")
private String registorCode;
private String registerCode;
@ApiModelProperty(value = "所属省")
private String province;
@ApiModelProperty(value = "所属省代码")
private String provinceCode;
@ApiModelProperty(value = "所属地市")
private String city;
@ApiModelProperty(value = "所属地市代码")
private String cityCode;
@ApiModelProperty(value = "所属区县")
private String district;
@ApiModelProperty(value = "所属区代码")
private String districtCode;
@ApiModelProperty(value = "所属区代码")
private String regionCode;
@ApiModelProperty(value = "安装地址")
private String address;
......
......@@ -22,7 +22,7 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@Accessors(chain = true)
@TableName("cb_maintenance_unit")
@ApiModel(value="MaintenanceUnitVo", description="")
public class MaintenanceUnitVo{
public class MaintenanceUnitVo extends BaseEntity {
private static final long serialVersionUID = 1L;
......@@ -36,20 +36,14 @@ public class MaintenanceUnitVo{
@ApiModelProperty(value = "省份")
private String province;
@ApiModelProperty(value = "省份代码")
private String provinceCode;
@ApiModelProperty(value = "地市")
private String city;
@ApiModelProperty(value = "地市代码")
private String cityCode;
@ApiModelProperty(value = "区县")
private String district;
@ApiModelProperty(value = "区代码")
private String districtCode;
@ApiModelProperty(value = "区代码")
private String regionCode;
@ApiModelProperty(value = "地址(详细地址,包括道路、门牌号码)")
private String address;
......
......@@ -22,7 +22,7 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@Accessors(chain = true)
@TableName("tcb_rescue_station")
@ApiModel(value="RescueStationVo", description="")
public class RescueStationVo{
public class RescueStationVo extends BaseEntity{
private static final long serialVersionUID = 1L;
......@@ -33,20 +33,14 @@ public class RescueStationVo{
@ApiModelProperty(value = "省份")
private String province;
@ApiModelProperty(value = "省份代码")
private String provinceCode;
@ApiModelProperty(value = "地市")
private String city;
@ApiModelProperty(value = "地市代码")
private String cityCode;
@ApiModelProperty(value = "区县")
private String district;
@ApiModelProperty(value = "区代码")
private String districtCode;
@ApiModelProperty(value = "区代码")
private String regionCode;
@ApiModelProperty(value = "地址(详细地址,包括道路、门牌号码)")
private String address;
......
......@@ -22,7 +22,7 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@Accessors(chain = true)
@TableName("tcb_use_unit")
@ApiModel(value="UseUnitVo", description="")
public class UseUnitVo{
public class UseUnitVo extends BaseEntity{
private static final long serialVersionUID = 1L;
......@@ -42,20 +42,14 @@ public class UseUnitVo{
@ApiModelProperty(value = "省份")
private String province;
@ApiModelProperty(value = "省份代码")
private String provinceCode;
@ApiModelProperty(value = "地市")
private String city;
@ApiModelProperty(value = "地市代码")
private String cityCode;
@ApiModelProperty(value = "区县")
private String district;
@ApiModelProperty(value = "区代码")
private String districtCode;
@ApiModelProperty(value = "区代码")
private String regionCode;
@ApiModelProperty(value = "地址")
private String address;
......
package com.yeejoin.amos.boot.module.tzs.biz.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.biz.common.controller.BaseController;
import com.yeejoin.amos.boot.biz.common.feign.AmosFeignService;
import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
import com.yeejoin.amos.boot.module.tzs.api.entity.UseUnit;
import com.yeejoin.amos.boot.module.tzs.api.service.EquipFeignService;
import com.yeejoin.amos.boot.module.tzs.api.service.IUseUnitService;
import com.yeejoin.amos.boot.module.tzs.api.vo.UseUnitVo;
import com.yeejoin.amos.boot.module.tzs.biz.utils.BeanDtoVoUtils;
import org.springframework.web.bind.annotation.RequestMapping;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
import org.springframework.web.bind.annotation.RestController;
import com.yeejoin.amos.boot.biz.common.controller.BaseController;
import com.yeejoin.amos.boot.module.tzs.api.service.IUseUnitService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import org.springframework.beans.factory.annotation.Autowired;
import javax.servlet.http.HttpServletRequest;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.module.tzs.api.entity.UseUnit;
import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
import org.typroject.tyboot.core.foundation.enumeration.UserType;
import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import org.typroject.tyboot.core.restful.utils.ResponseHelper;
import org.typroject.tyboot.core.restful.utils.ResponseModel;
import javax.servlet.http.HttpServletRequest;
import java.util.Arrays;
......@@ -46,6 +46,9 @@ public class UseUnitController extends BaseController {
@Autowired
EquipFeignService equipFeignService;
@Autowired
AmosFeignService amosFeignService;
/**
* 新增使用单位
*
......@@ -112,6 +115,24 @@ public class UseUnitController extends BaseController {
return useUnitVo;
}
/**
* 获取平台字典
*
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/dict/{dictCode}", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "获取平台字典", notes = "获取平台字典")
public ResponseModel<Object> getDict(HttpServletRequest request,
@PathVariable(value = "dictCode") String dictCode) {
ResponseModel<Object> result = new ResponseModel<>();
try {
result = ResponseHelper.buildResponse(amosFeignService.listDictionaryByDictCode(dictCode));
} catch (Exception e) {
e.printStackTrace();
}
return result;
}
/**
* 列表分页查询
......
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