Skip to content

Administrator / framework-tools

Go to a project
Commit cbc83f9e by henry
Options

代码规范整理

1 parent bd67fb12
Inline Side-by-side
Showing with 29 additions and 239 deletions
arch-base/pom.xml
...@@ -34,8 +34,9 @@ ...@@ -34,8 +34,9 @@
<artifactId>hutool-all</artifactId> <artifactId>hutool-all</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.baomidou</groupId> <groupId>org.projectlombok</groupId>
<artifactId>mybatis-plus-extension</artifactId> <artifactId>lombok</artifactId>
<scope>provided</scope>
</dependency> </dependency>
</dependencies> </dependencies>
......
arch-base/src/main/java/org/arch/modules/archoverall/dto/ArchiElePropertyDTO.java
package org.arch.modules.archoverall.dto; package org.arch.modules.archoverall.dto;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
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;
...@@ -24,13 +20,11 @@ import java.util.Date; ...@@ -24,13 +20,11 @@ import java.util.Date;
@Data @Data
@EqualsAndHashCode(callSuper = false) @EqualsAndHashCode(callSuper = false)
@Accessors(chain = true) @Accessors(chain = true)
@TableName("archi_ele_property")
@ApiModel(value="ArchiEleProperty", description="元模型字典中间表") @ApiModel(value="ArchiEleProperty", description="元模型字典中间表")
public class ArchiElePropertyDTO implements Serializable{ public class ArchiElePropertyDTO implements Serializable{
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "主键") @ApiModelProperty(value = "主键")
@TableId(value = "property_id", type = IdType.AUTO)
private Long propertyId; private Long propertyId;
@ApiModelProperty(value = "架构元素或元素关系或架构视图 ID") @ApiModelProperty(value = "架构元素或元素关系或架构视图 ID")
...@@ -95,14 +89,12 @@ public class ArchiElePropertyDTO implements Serializable{ ...@@ -95,14 +89,12 @@ public class ArchiElePropertyDTO implements Serializable{
@ApiModelProperty(value = "字典版本") @ApiModelProperty(value = "字典版本")
@TableField (exist = false)
private String version; private String version;
@ApiModelProperty(value = "字典表id") @ApiModelProperty(value = "字典表id")
private Long dicyId; private Long dicyId;
@ApiModelProperty(value = "字典状态 0:已停用 1:已发布 2:暂存") @ApiModelProperty(value = "字典状态 0:已停用 1:已发布 2:暂存")
@TableField (exist = false)
private Integer state; private Integer state;
public static final String PROPERTYID = "propertyId"; public static final String PROPERTYID = "propertyId";
......
arch-base/src/main/java/org/arch/modules/archoverall/dto/ArchiElementDTO.java
package org.arch.modules.archoverall.dto; package org.arch.modules.archoverall.dto;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
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;
...@@ -19,7 +17,6 @@ public class ArchiElementDTO extends BasePageEntity { ...@@ -19,7 +17,6 @@ public class ArchiElementDTO extends BasePageEntity {
private Integer total; private Integer total;
@ApiModelProperty(value = "主键") @ApiModelProperty(value = "主键")
@TableId("element_id")
private String elementId; private String elementId;
@ApiModelProperty(value = "元素名称") @ApiModelProperty(value = "元素名称")
...@@ -50,6 +47,5 @@ public class ArchiElementDTO extends BasePageEntity { ...@@ -50,6 +47,5 @@ public class ArchiElementDTO extends BasePageEntity {
private Integer scope; private Integer scope;
@ApiModelProperty(value = "适用范围集合") @ApiModelProperty(value = "适用范围集合")
@TableField(exist = false)
private List<Long> scopeList; private List<Long> scopeList;
} }
arch-base/src/main/java/org/arch/modules/base/pojo/SysEventLog.java deleted 100644 → 0
package org.arch.modules.base.pojo;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
/**
* 系统操作日志(SysEventLog)实体类
*
* @author makejava
* @since 2024-01-25 09:50:17
*/
@Data
@NoArgsConstructor
@AllArgsConstructor
@Accessors(chain = true)
@TableName("sys_event_log")
@ApiModel(value = "sysEventLog对象", description = "系统日志对象")
public class SysEventLog {
/**
* 主键ID
*/
@ApiModelProperty(value = "主键ID")
// @TableId(value = "log_id", type = IdType.AUTO)
private String logId;
/**
* 用户iscID
*/
@ApiModelProperty(value = "用户iscID")
private String userId;
/**
* 用户名
*/
@ApiModelProperty(value = "用户名")
private String username;
/**
* ip地址
*/
@ApiModelProperty(value = "ip地址")
private String ipAddr;
/**
* 创建时间
*/
@ApiModelProperty(value = "创建时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
/**
* 事件类型
*/
@ApiModelProperty(value = "事件类型 0 其他 1 新增 2 修改 3 删除 4 查询 5 授权 6 导出 7 导入 8 登录 9退出")
private String eventType;
@ApiModelProperty(value = "模块名称")
@TableField(exist = false)
private String moduleName;
/**
* 事件内容
*/
@ApiModelProperty(value = "事件内容 1 日志统计 2 日志数据")
private String eventContent;
/**
* 日志类型
*/
@ApiModelProperty(value = "日志类型 0 系统日志 1 业务日志")
private String logType;
/**
* 日志级别
*/
@ApiModelProperty(value = "日志级别 0 低 1 中 2 高")
private String logLev;
/**
* 是否为异常 0 否 1 是
*/
@ApiModelProperty(value = "是否为异常 0 否 1 是")
private Integer isWarn;
/**
* 是否成功 0 失败 1 成功
*/
@ApiModelProperty(value = "是否成功 0 失败 1 成功")
private String result;
/**
* 账号
*/
@ApiModelProperty(value = "账号")
private String userCode;
/**
* 菜单ID
*/
@ApiModelProperty(value = "菜单ID")
private String menuId;
/**
* 菜单全路径
*/
@ApiModelProperty(value = "菜单全路径")
private String menuUri;
/**
* 是否已读
*/
@ApiModelProperty(value = "是否已读")
private Integer isRead;
/**
* 请求时间
*/
@ApiModelProperty(value = "请求时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date requestTime;
/**
* 请求参数
*/
@ApiModelProperty(value = "请求参数")
private String requestParams;
@ApiModelProperty(value = "请求路径")
@TableField(exist = false)
private String operUrl;
@ApiModelProperty(value = "错误信息")
@TableField(exist = false)
private String errorMsg;
@ApiModelProperty(value = "请求方式")
@TableField(exist = false)
private String requestMethod;
@ApiModelProperty(value = "响应结果")
@TableField(exist = false)
private String jsonResult;
@ApiModelProperty(value = "接口方法")
@TableField(exist = false)
private String method;
@ApiModelProperty(value = "接口响应时间")
private Long costTime;
@ApiModelProperty(value = "查询条件时间")
@TableField(exist = false)
private String time;
public static final String LOG_ID = "log_id";
public static final String USER_ID = "user_id";
public static final String USER_NAME = "username";
public static final String IP_ADDR = "ip_addr";
public static final String CREATE_TIME = "create_time";
public static final String ENENT_TYPE = "event_type";
public static final String EVENT_CONTENT = "event_content";
public static final String LOG_TYPE = "log_type";
public static final String LOG_LEV = "log_lev";
public static final String IS_WARN = "is_warn";
public static final String RESULT = "result";
public static final String USER_CODE = "user_code";
public static final String MENU_ID = "menu_id";
public static final String MENU_URI = "menu_uri";
public static final String IS_READ = "is_read";
public static final String REQUEST_TIME = "request_time";
public static final String REQUEST_PARAMS = "request_params";
}
arch-overall/pom.xml
...@@ -33,22 +33,23 @@ ...@@ -33,22 +33,23 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.github.yulichang</groupId> <groupId>com.github.yulichang</groupId>
<artifactId>mybatis-plus-join-core</artifactId> <artifactId>mybatis-plus-join-boot-starter</artifactId>
<version>1.4.11</version>
<scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.baomidou</groupId> <groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-boot-starter</artifactId> <artifactId>mybatis-plus-boot-starter</artifactId>
<version>${mybatis-plus-boot-starter.version}</version>
</dependency> </dependency>
<!-- mybatis-plus-extension --> <!-- mybatis-plus-extension -->
<dependency> <dependency>
<groupId>com.baomidou</groupId> <groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-extension</artifactId> <artifactId>mybatis-plus-extension</artifactId>
<version>${mybatis-plus-boot-starter.version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.arch</groupId>
<artifactId>mybatis</artifactId>
<version>1.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
</dependencies> </dependencies>
</project> </project>
\ No newline at end of file
arch-overall/src/main/java/org/arch/modules/design/controller/ArchiElementController.java
...@@ -7,7 +7,7 @@ import lombok.RequiredArgsConstructor; ...@@ -7,7 +7,7 @@ import lombok.RequiredArgsConstructor;
import org.arch.Result; import org.arch.Result;
import org.arch.modules.archoverall.dto.BatchUpdateDTO; import org.arch.modules.archoverall.dto.BatchUpdateDTO;
import org.arch.modules.archoverall.dto.ArchiElementDTO; import org.arch.modules.archoverall.dto.ArchiElementDTO;
import org.arch.modules.design.pojo.ArchiElement; import org.arch.modules.design.entity.ArchiElement;
import org.arch.modules.design.service.ArchiElementService; import org.arch.modules.design.service.ArchiElementService;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
......
arch-overall/src/main/java/org/arch/modules/design/pojo/ArchiEleProperty.java → arch-overall/src/main/java/org/arch/modules/design/entity/ArchiEleProperty.java
package org.arch.modules.design.pojo; package org.arch.modules.design.entity;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
......
arch-overall/src/main/java/org/arch/modules/design/pojo/ArchiElement.java → arch-overall/src/main/java/org/arch/modules/design/entity/ArchiElement.java
package org.arch.modules.design.pojo; package org.arch.modules.design.entity;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
...@@ -8,7 +8,7 @@ import io.swagger.annotations.ApiModelProperty; ...@@ -8,7 +8,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 org.arch.modules.base.dto.BaseEntity; import org.arch.common.entity.BaseEntity;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.List; import java.util.List;
......
arch-overall/src/main/java/org/arch/modules/design/mapper/ArchiElePropertyMapper.java
package org.arch.modules.design.mapper; package org.arch.modules.design.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param; import org.arch.modules.design.entity.ArchiEleProperty;
import org.arch.modules.design.pojo.ArchiEleProperty;
import java.util.List;
public interface ArchiElePropertyMapper extends BaseMapper<ArchiEleProperty> { public interface ArchiElePropertyMapper extends BaseMapper<ArchiEleProperty> {
......
arch-overall/src/main/java/org/arch/modules/design/mapper/ArchiElementMapper.java
...@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; ...@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.yulichang.base.MPJBaseMapper; import com.github.yulichang.base.MPJBaseMapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import org.arch.modules.archoverall.dto.ArchiElementDTO; import org.arch.modules.archoverall.dto.ArchiElementDTO;
import org.arch.modules.design.pojo.ArchiElement; import org.arch.modules.design.entity.ArchiElement;
import java.util.List; import java.util.List;
......
arch-overall/src/main/java/org/arch/modules/design/service/ArchiElementService.java
...@@ -4,8 +4,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage; ...@@ -4,8 +4,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import org.arch.modules.archoverall.dto.BatchUpdateDTO; import org.arch.modules.archoverall.dto.BatchUpdateDTO;
import org.arch.modules.archoverall.dto.ArchiElementDTO; import org.arch.modules.archoverall.dto.ArchiElementDTO;
import org.arch.modules.design.pojo.ArchiEleProperty; import org.arch.modules.design.entity.ArchiEleProperty;
import org.arch.modules.design.pojo.ArchiElement; import org.arch.modules.design.entity.ArchiElement;
import java.util.List; import java.util.List;
......
arch-overall/src/main/java/org/arch/modules/design/service/impl/ArchiElementImpl.java
...@@ -13,8 +13,8 @@ import com.github.xiaoymin.knife4j.core.util.StrUtil; ...@@ -13,8 +13,8 @@ import com.github.xiaoymin.knife4j.core.util.StrUtil;
import org.arch.modules.archoverall.dto.BatchUpdateDTO; import org.arch.modules.archoverall.dto.BatchUpdateDTO;
import org.arch.modules.archoverall.dto.ArchiElementDTO; import org.arch.modules.archoverall.dto.ArchiElementDTO;
import org.arch.modules.design.mapper.ArchiElePropertyMapper; import org.arch.modules.design.mapper.ArchiElePropertyMapper;
import org.arch.modules.design.pojo.ArchiEleProperty; import org.arch.modules.design.entity.ArchiEleProperty;
import org.arch.modules.design.pojo.ArchiElement; import org.arch.modules.design.entity.ArchiElement;
import org.arch.modules.design.service.ArchiElementService; import org.arch.modules.design.service.ArchiElementService;
import org.arch.modules.design.mapper.ArchiElementMapper; import org.arch.modules.design.mapper.ArchiElementMapper;
import org.arch.utils.VersionUtil; import org.arch.utils.VersionUtil;
......
arch-overall/src/main/resources/mapper/modules/asset/ArchiElementMapper.xml
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.arch.modules.design.mapper.ArchiElementMapper"> <mapper namespace="org.arch.modules.design.mapper.ArchiElementMapper">
<resultMap id="BaseResultMap" type="org.arch.modules.design.pojo.ArchiElement"> <resultMap id="BaseResultMap" type="org.arch.modules.design.entity.ArchiElement">
<result column="element_id" property="elementId"/> <result column="element_id" property="elementId"/>
<result column="element_code" property="elementCode"/> <result column="element_code" property="elementCode"/>
<result column="element_name" property="elementName"/> <result column="element_name" property="elementName"/>
...@@ -24,12 +24,12 @@ ...@@ -24,12 +24,12 @@
<result column="archi_belong_code" property="archiBelongCode"/> <result column="archi_belong_code" property="archiBelongCode"/>
</resultMap> </resultMap>
<select id="initVersion" resultType="org.arch.modules.design.pojo.ArchiElement"> <select id="initVersion" resultType="org.arch.modules.design.entity.ArchiElement">
SELECT CONCAT(DATE_FORMAT(NOW(), '%Y%m%d'), '-V', YEAR(NOW()) - 2023 - 1, '.', DATE_FORMAT(NOW(), '%m'), '.0') AS version; SELECT CONCAT(DATE_FORMAT(NOW(), '%Y%m%d'), '-V', YEAR(NOW()) - 2023 - 1, '.', DATE_FORMAT(NOW(), '%m'), '.0') AS version;
</select> </select>
<!--元素列表--> <!--元素列表-->
<select id="gtArchiElement" resultType="org.arch.modules.design.pojo.ArchiElement"> <select id="gtArchiElement" resultType="org.arch.modules.design.entity.ArchiElement">
select se.*, select se.*,
gm.graph_name as iconName, gm.graph_name as iconName,
gm.icon gm.icon
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
</select> </select>
<!--根据元素名称查询元素--> <!--根据元素名称查询元素-->
<select id="gtArcEleByName" resultType="org.arch.modules.design.pojo.ArchiElement"> <select id="gtArcEleByName" resultType="org.arch.modules.design.entity.ArchiElement">
select se.element_id, select se.element_id,
se.element_name, se.element_name,
se.archi_belong_id, se.archi_belong_id,
...@@ -73,7 +73,7 @@ ...@@ -73,7 +73,7 @@
order by se.create_time desc order by se.create_time desc
</select> </select>
<select id="gtEleList" resultType="org.arch.modules.design.pojo.ArchiElement"> <select id="gtEleList" resultType="org.arch.modules.design.entity.ArchiElement">
select se.*, select se.*,
gm.graph_name as iconName, gm.graph_name as iconName,
gm.icon gm.icon
...@@ -118,7 +118,7 @@ ...@@ -118,7 +118,7 @@
order by se.create_time desc order by se.create_time desc
</select> </select>
<select id="maxVer" resultType="org.arch.modules.design.pojo.ArchiElement"> <select id="maxVer" resultType="org.arch.modules.design.entity.ArchiElement">
SELECT a.version SELECT a.version
FROM archi_element a FROM archi_element a
<where> <where>
......
arch-base/src/main/java/org/arch/modules/base/dto/BaseEntity.java → clouds/mybatis/src/main/java/org/arch/common/entity/BaseEntity.java
package org.arch.modules.base.dto; package org.arch.common.entity;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.OrderBy;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
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 org.springframework.format.annotation.DateTimeFormat; import org.springframework.format.annotation.DateTimeFormat;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import java.util.Date; import java.util.Date;
/** /**
* @author makejava * @author makejava
*/ */
@EqualsAndHashCode(callSuper = true)
@Data @Data
@ApiModel("BaseEntityDO对象") @ApiModel("BaseEntityDO对象")
public abstract class BaseEntity extends Model { public abstract class BaseEntity extends Model {
@ApiModelProperty(value = "逻辑删除标记（0：显示；1：隐藏）") @ApiModelProperty(value = "逻辑删除标记（0：显示；1：隐藏）")
@TableLogic
private Integer delFlag = 0; private Integer delFlag = 0;
@ApiModelProperty(value = "创建日期") @ApiModelProperty(value = "创建日期")
@DateTimeFormat(pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd")
@TableField(fill = FieldFill.INSERT)
@OrderBy
private Date createTime; private Date createTime;
@ApiModelProperty(value = "创建人") @ApiModelProperty(value = "创建人")
...@@ -39,7 +30,6 @@ public abstract class BaseEntity extends Model { ...@@ -39,7 +30,6 @@ public abstract class BaseEntity extends Model {
@ApiModelProperty(value = "最后一次修改时间") @ApiModelProperty(value = "最后一次修改时间")
@DateTimeFormat(pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd")
@TableField(fill = FieldFill.INSERT_UPDATE)
private Date lastUpdateTime; private Date lastUpdateTime;
@ApiModelProperty(value = "最后一次修改人") @ApiModelProperty(value = "最后一次修改人")
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!