Commit f16d0b49 authored by zhangyingbin's avatar zhangyingbin

修改模块中类的位置

parent f34403cc
package com.yeejoin.amos.api.common.restful.utils;
import org.springframework.http.HttpStatus;
public class ResponseHelper
{
public static <T> ResponseModel<T> buildResponse(T t) {
ResponseModel<T> response = new ResponseModel<>();
response.setResult(t);
response.setMessage("ok");
response.setStatus(HttpStatus.OK.value());
return response;
}
}
package com.yeejoin.amos.api.common.restful.utils;
import java.io.Serializable;
/**
*
* <pre>
* 返回封装对象
* </pre>
*
* @author gwb
* @version $Id: CommonResponse.java, v 0.1 2021年9月28日 下午4:37:40 gwb Exp $
*/
public class ResponseModel<T> implements Serializable {
/**
* <pre>
*
* </pre>
*/
private static final long serialVersionUID = 2969089929549147825L;
/**
* 响应数据
*/
private T result ;
/**
* 状态码
*/
private int status;
/**
* 提示信息
*/
private String message = "";
public ResponseModel(){
}
public T getResult()
{
return result;
}
public void setResult(T result)
{
this.result = result;
}
public int getStatus()
{
return status;
}
public void setStatus(int status)
{
this.status = status;
}
public String getMessage()
{
return message;
}
public void setMessage(String message)
{
this.message = message;
}
@Override
public String toString()
{
return "CommonResponse [status=" + status + ", result=" + result + ", message=" + message + "]";
}
}
package com.yeejoin.amos.api.aop; package com.yeejoin.amos.api.openapi.aop;
import com.yeejoin.amos.component.feign.config.TokenOperation; import com.yeejoin.amos.component.feign.config.TokenOperation;
import org.aspectj.lang.JoinPoint; import org.aspectj.lang.JoinPoint;
...@@ -16,9 +16,10 @@ import org.typroject.tyboot.core.auth.exception.AuthException; ...@@ -16,9 +16,10 @@ import org.typroject.tyboot.core.auth.exception.AuthException;
import org.typroject.tyboot.core.foundation.context.RequestContext; import org.typroject.tyboot.core.foundation.context.RequestContext;
import org.typroject.tyboot.core.foundation.utils.ValidationUtil; import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
import com.yeejoin.amos.api.openapi.constant.Constant;
import com.yeejoin.amos.api.openapi.face.model.BizTokenModel;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import
@Aspect @Aspect
@Component @Component
...@@ -28,7 +29,7 @@ public class ControllerAop { ...@@ -28,7 +29,7 @@ public class ControllerAop {
@Autowired @Autowired
private RedisTemplate redisTemplate; private RedisTemplate redisTemplate;
@Pointcut("(execution(public * com.yeejoin.amos.api.controller..*(..))) ") @Pointcut("(execution(public * com.yeejoin.amos.api.openapi.controller..*(..))) ")
public void userCache() { public void userCache() {
} }
......
package com.yeejoin.amos.api.constant; package com.yeejoin.amos.api.openapi.constant;
public class Constant { public class Constant {
public static final String TOKEN_PREFIX = "OPENAPI_"; public static final String TOKEN_PREFIX = "OPENAPI_";
......
package com.yeejoin.amos.api.controller; package com.yeejoin.amos.api.openapi.controller;
import com.yeejoin.amos.api.common.restful.utils.ResponseHelper; import com.yeejoin.amos.api.common.restful.utils.ResponseHelper;
import com.yeejoin.amos.api.common.restful.utils.ResponseModel; import com.yeejoin.amos.api.common.restful.utils.ResponseModel;
import com.yeejoin.amos.api.openapi.face.model.ProduceInfoModel;
import com.yeejoin.amos.api.openapi.face.orm.dao.TaAccessConfigMapper;
import com.yeejoin.amos.api.openapi.face.orm.dao.TaLicenseDetailInfoMapper;
import com.yeejoin.amos.api.openapi.face.orm.entity.TaAccessConfig; import com.yeejoin.amos.api.openapi.face.orm.entity.TaAccessConfig;
import com.yeejoin.amos.api.openapi.face.orm.entity.TaLicenseBaseInfo; import com.yeejoin.amos.api.openapi.face.orm.entity.TaLicenseBaseInfo;
import com.yeejoin.amos.api.openapi.face.orm.entity.TaLicenseDetailInfo; import com.yeejoin.amos.api.openapi.face.orm.entity.TaLicenseDetailInfo;
...@@ -22,7 +20,6 @@ import org.typroject.tyboot.component.event.RestEventTrigger; ...@@ -22,7 +20,6 @@ import org.typroject.tyboot.component.event.RestEventTrigger;
import org.typroject.tyboot.core.foundation.enumeration.UserType; import org.typroject.tyboot.core.foundation.enumeration.UserType;
import org.typroject.tyboot.core.restful.doc.TycloudOperation; import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import javax.servlet.http.HttpServletRequest;
import java.util.List; import java.util.List;
@RestController @RestController
......
package com.yeejoin.amos.api.controller.event; package com.yeejoin.amos.api.openapi.controller.event;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import com.yeejoin.amos.api.openapi.constant.Constant; import com.yeejoin.amos.api.openapi.constant.Constant;
......
package com.yeejoin.amos.api.openapi.face.model;
import lombok.Data;
import java.io.Serializable;
@Data
public class BizTokenModel implements Serializable{
/**
*
*/
private static final long serialVersionUID = 1L;
/**
* 登录令牌
*/
private String token;
/**
* 应用编号
*/
private String appKey;
/**
* 客户端标识
*/
private String product;
/**
* 所属机构
*/
private String agencyCode;
/**
* 应用用户票据,唯一标识
*/
private String appId;
/**
* 对接公司编码
*/
private String apiCompanyCode;
}
package com.yeejoin.amos.api.openapi.face.model;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.typroject.tyboot.core.rdbms.model.BaseModel;
/**
*
* <pre>
*
* </pre>
*
* @author gwb
* @version $Id: OpenapiLogModel.java, v 0.1 2021年11月10日 下午5:53:46 gwb Exp $
*/
@EqualsAndHashCode(callSuper = true)
@Data
public class OpenapiLogModel extends BaseModel {
private static final long serialVersionUID = 1L;
private String remoteIp;
private String result;
private String methodName;
private String methodLabel;
private String params;
private String traceId;
private String token;
private String resultStatus;//操作结果状态
private String userRealName;// 操作人真实姓名
private String userName;// 操作人用户名
/**
* 所属项目编号
*/
private String agencyCode;
private String appCode;
/**
* 应用用户票据,唯一标识
*/
private String appId;
}
package com.yeejoin.amos.api.face.model; package com.yeejoin.amos.api.openapi.face.model;
import com.baomidou.mybatisplus.annotation.TableName;
import java.util.Date; import java.util.Date;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import org.typroject.tyboot.core.rdbms.model.BaseModel; import org.typroject.tyboot.core.rdbms.model.BaseModel;
......
package com.yeejoin.amos.api.face.model; package com.yeejoin.amos.api.openapi.face.model;
import java.util.Date; import java.util.Date;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import org.typroject.tyboot.core.rdbms.model.BaseModel; import org.typroject.tyboot.core.rdbms.model.BaseModel;
......
package com.yeejoin.amos.api.face.model; package com.yeejoin.amos.api.openapi.face.model;
import java.util.Date; import java.util.Date;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import org.typroject.tyboot.core.rdbms.model.BaseModel; import org.typroject.tyboot.core.rdbms.model.BaseModel;
......
package com.yeejoin.amos.api.openapi.face.orm.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yeejoin.amos.api.openapi.face.orm.entity.OpenapiLog;
/**
*
* <pre>
* Mapper 接口
* </pre>
*
* @author gwb
* @version $Id: OpenapiLogMapper.java, v 0.1 2021年11月10日 下午5:54:19 gwb Exp $
*/
public interface OpenapiLogMapper extends BaseMapper<OpenapiLog> {
}
\ No newline at end of file
package com.yeejoin.amos.api.face.orm.dao; package com.yeejoin.amos.api.openapi.face.orm.dao;
import com.yeejoin.amos.api.openapi.face.orm.entity.TaAccessConfig; import com.yeejoin.amos.api.openapi.face.orm.entity.TaAccessConfig;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
......
package com.yeejoin.amos.api.face.orm.dao; package com.yeejoin.amos.api.openapi.face.orm.dao;
import com.yeejoin.amos.api.openapi.face.orm.entity.TaLicenseBaseInfo; import com.yeejoin.amos.api.openapi.face.orm.entity.TaLicenseBaseInfo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
......
package com.yeejoin.amos.api.face.orm.dao; package com.yeejoin.amos.api.openapi.face.orm.dao;
import com.yeejoin.amos.api.openapi.face.orm.entity.TaLicenseDetailInfo; import com.yeejoin.amos.api.openapi.face.orm.entity.TaLicenseDetailInfo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
......
package com.yeejoin.amos.api.openapi.face.orm.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
/**
*
* <pre>
*
* </pre>
*
* @author gwb
* @version $Id: OpenapiLog.java, v 0.1 2021年11月10日 下午5:53:15 gwb Exp $
*/
@EqualsAndHashCode(callSuper = true)
@Data
@TableName("iot_openapi_log")
public class OpenapiLog extends BaseEntity {
private static final long serialVersionUID = 7799473276203462503L;
@TableField("REMOTE_IP")
private String remoteIp;
@TableField("RESULT")
private String result;
@TableField("METHOD_NAME")
private String methodName;
@TableField("METHOD_LABEL")
private String methodLabel;
@TableField("PARAMS")
private String params;
@TableField("TRACE_ID")
private String traceId;
@TableField("TOKEN")
private String token;
@TableField("AGENCY_CODE")
private String agencyCode;
@TableField("APP_CODE")
private String appCode;
/**
* 应用用户票据,唯一标识
*/
@TableField("APP_ID")
private String appId;
}
package com.yeejoin.amos.api.face.orm.entity; package com.yeejoin.amos.api.openapi.face.orm.entity;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import java.util.Date;
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 org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity; import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
/** /**
......
package com.yeejoin.amos.api.face.orm.entity; package com.yeejoin.amos.api.openapi.face.orm.entity;
import java.util.Date; import java.util.Date;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
...@@ -6,11 +6,6 @@ import io.swagger.annotations.ApiModelProperty; ...@@ -6,11 +6,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 org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity; import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
/** /**
......
package com.yeejoin.amos.api.face.orm.entity; package com.yeejoin.amos.api.openapi.face.orm.entity;
import java.util.Date; import java.util.Date;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
...@@ -6,11 +6,6 @@ import io.swagger.annotations.ApiModelProperty; ...@@ -6,11 +6,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 org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity; import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
/** /**
......
package com.yeejoin.amos.api.openapi.face.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yeejoin.amos.api.openapi.face.model.OpenapiLogModel;
import com.yeejoin.amos.api.openapi.face.orm.dao.OpenapiLogMapper;
import com.yeejoin.amos.api.openapi.face.orm.entity.OpenapiLog;
import com.yeejoin.amos.component.feign.model.FeignClientResult;
import com.yeejoin.amos.feign.privilege.Privilege;
import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
import org.springframework.stereotype.Component;
import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
import org.typroject.tyboot.core.rdbms.annotation.Condition;
import org.typroject.tyboot.core.rdbms.annotation.Operator;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
*
* <pre>
* 服务类
* </pre>
*
* @author gwb
* @version $Id: OpenapiLogService.java, v 0.1 2021年11月10日 下午5:55:31 gwb Exp $
*/
@Component
public class OpenapiLogService extends BaseService<OpenapiLogModel, OpenapiLog, OpenapiLogMapper> {
private ObjectMapper objectMapper = new ObjectMapper();
/**
* 分页查询
*/
@SuppressWarnings("unchecked")
public Page<OpenapiLogModel> queryForOpenserviceOperateLogPage(Page page, String agencyCode, @Condition(Operator.like) String methodLabel) throws Exception {
Page<OpenapiLogModel> openserviceOperateLogModelPage = this.queryForPage(page, "CREATE_TIME", false,agencyCode, methodLabel);
List<OpenapiLogModel> openserviceOperateLogModelList = openserviceOperateLogModelPage.getRecords();
Map<String, AgencyUserModel> userMap = new HashMap<String, AgencyUserModel>();
for (OpenapiLogModel openserviceOperateLogModel : openserviceOperateLogModelList)
{
//填充操作人信息
AgencyUserModel agencyUserModel = userMap.get(openserviceOperateLogModel.getRecUserId());
if (ValidationUtil.isEmpty(agencyUserModel))
{
openserviceOperateLogModel.setUserName(openserviceOperateLogModel.getRecUserId());
openserviceOperateLogModel.setUserRealName(openserviceOperateLogModel.getRecUserId());
FeignClientResult<AgencyUserModel> responseModel = Privilege.agencyUserClient.queryByUserId(openserviceOperateLogModel.getRecUserId());
AgencyUserModel userModel = responseModel.getResult();
if (!ValidationUtil.isEmpty(userModel))
{
userMap.put(openserviceOperateLogModel.getRecUserId(), userModel);
openserviceOperateLogModel.setUserName(userModel.getUserName());
openserviceOperateLogModel.setUserRealName(userModel.getRealName());
}
}else
{
openserviceOperateLogModel.setUserName(agencyUserModel.getUserName());
openserviceOperateLogModel.setUserRealName(agencyUserModel.getRealName());
}
//填充操作状态
String result = openserviceOperateLogModel.getResult();
Map<String, Object> mapJson = objectMapper.readValue(result,Map.class);
String status = mapJson.get("status").toString();
if (status.equals("200"))
{
openserviceOperateLogModel.setResultStatus("成功");
}else
{
openserviceOperateLogModel.setResultStatus("失败");
}
}
openserviceOperateLogModelPage.setRecords(openserviceOperateLogModelList);
return openserviceOperateLogModelPage;
}
/**
* 列表查询 示例
*/
public List<OpenapiLogModel> queryForOpenserviceOperateLogList(String agencyCode) throws Exception {
return this.queryForList("", false, agencyCode);
}
}
package com.yeejoin.amos.api.face.service; package com.yeejoin.amos.api.openapi.face.service;
import com.yeejoin.amos.api.openapi.face.model.TaAccessConfigModel; import com.yeejoin.amos.api.openapi.face.model.TaAccessConfigModel;
import com.yeejoin.amos.api.openapi.face.orm.dao.TaAccessConfigMapper; import com.yeejoin.amos.api.openapi.face.orm.dao.TaAccessConfigMapper;
...@@ -6,6 +6,7 @@ import com.yeejoin.amos.api.openapi.face.orm.entity.TaAccessConfig; ...@@ -6,6 +6,7 @@ import com.yeejoin.amos.api.openapi.face.orm.entity.TaAccessConfig;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.typroject.tyboot.core.foundation.utils.ValidationUtil; import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import org.typroject.tyboot.core.restful.exception.instance.BadRequest; import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
import java.util.Date; import java.util.Date;
...@@ -18,7 +19,7 @@ import java.util.List; ...@@ -18,7 +19,7 @@ import java.util.List;
* @date 2022-08-17 * @date 2022-08-17
*/ */
@Service @Service
public class TaAccessConfigServiceImpl extends AppBaseService<TaAccessConfigModel, TaAccessConfig, TaAccessConfigMapper> { public class TaAccessConfigServiceImpl extends BaseService<TaAccessConfigModel, TaAccessConfig, TaAccessConfigMapper> {
/** /**
* *
* 新增许可信息-接入配置表 * 新增许可信息-接入配置表
......
package com.yeejoin.amos.api.face.service; package com.yeejoin.amos.api.openapi.face.service;
import com.yeejoin.amos.api.openapi.face.model.TaLicenseBaseInfoModel; import com.yeejoin.amos.api.openapi.face.model.TaLicenseBaseInfoModel;
import com.yeejoin.amos.api.openapi.face.orm.dao.TaLicenseBaseInfoMapper; import com.yeejoin.amos.api.openapi.face.orm.dao.TaLicenseBaseInfoMapper;
...@@ -6,6 +6,7 @@ import com.yeejoin.amos.api.openapi.face.orm.entity.TaLicenseBaseInfo; ...@@ -6,6 +6,7 @@ import com.yeejoin.amos.api.openapi.face.orm.entity.TaLicenseBaseInfo;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.typroject.tyboot.core.foundation.utils.ValidationUtil; import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import org.typroject.tyboot.core.restful.exception.instance.BadRequest; import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
import java.util.Date; import java.util.Date;
...@@ -18,7 +19,7 @@ import java.util.List; ...@@ -18,7 +19,7 @@ import java.util.List;
* @date 2022-08-17 * @date 2022-08-17
*/ */
@Service @Service
public class TaLicenseBaseInfoServiceImpl extends AppBaseService<TaLicenseBaseInfoModel, TaLicenseBaseInfo, TaLicenseBaseInfoMapper> { public class TaLicenseBaseInfoServiceImpl extends BaseService<TaLicenseBaseInfoModel, TaLicenseBaseInfo, TaLicenseBaseInfoMapper> {
/** /**
* *
* 新增许可信息-许可基本信息表 * 新增许可信息-许可基本信息表
......
package com.yeejoin.amos.api.face.service; package com.yeejoin.amos.api.openapi.face.service;
import com.yeejoin.amos.api.openapi.face.model.TaLicenseDetailInfoModel; import com.yeejoin.amos.api.openapi.face.model.TaLicenseDetailInfoModel;
import com.yeejoin.amos.api.openapi.face.orm.dao.TaLicenseDetailInfoMapper; import com.yeejoin.amos.api.openapi.face.orm.dao.TaLicenseDetailInfoMapper;
...@@ -6,6 +6,7 @@ import com.yeejoin.amos.api.openapi.face.orm.entity.TaLicenseDetailInfo; ...@@ -6,6 +6,7 @@ import com.yeejoin.amos.api.openapi.face.orm.entity.TaLicenseDetailInfo;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.typroject.tyboot.core.foundation.utils.ValidationUtil; import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import org.typroject.tyboot.core.restful.exception.instance.BadRequest; import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
import java.util.Date; import java.util.Date;
...@@ -18,7 +19,7 @@ import java.util.List; ...@@ -18,7 +19,7 @@ import java.util.List;
* @date 2022-08-17 * @date 2022-08-17
*/ */
@Service @Service
public class TaLicenseDetailInfoServiceImpl extends AppBaseService<TaLicenseDetailInfoModel, TaLicenseDetailInfo, TaLicenseDetailInfoMapper> { public class TaLicenseDetailInfoServiceImpl extends BaseService<TaLicenseDetailInfoModel, TaLicenseDetailInfo, TaLicenseDetailInfoMapper> {
/** /**
* *
......
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