Commit b545e6d1 by henry

修改配置文件

1 parent 106ee2ab
Showing with 43 additions and 37 deletions
......@@ -9,4 +9,9 @@
## arch-base 基础服务-包括工具类-及对象实体
## vo(View Object):视图对象,用于展示层
## dto(Data Transfer Object):数据传输对象
## pojo(Persistent Object):持久化对象
\ No newline at end of file
## pojo(Persistent Object):持久化对象
# 方便统一加密,所有请求均用POST请求
```
参数统一在BODY中传递
```
\ No newline at end of file
......@@ -3,7 +3,7 @@ package org.arch.config;
import com.alibaba.cloud.commons.lang.StringUtils;
import net.minidev.json.JSONObject;
import org.arch.service.RedisService;
import org.arch.overall.service.RedisService;
import org.arch.util.JwtUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
......
package org.arch.service;
package org.arch.overall.service;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
......
package org.arch;
package org.arch.overall;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
......
package org.arch.controller;
package org.arch.overall.controller;
import io.swagger.annotations.Api;
......@@ -10,8 +10,8 @@ import org.arch.log.logenum.LogOperTypeEnum;
import org.arch.log.logenum.LogTypeEnum;
import org.arch.modules.archoverall.dto.ArchiElementDTO;
import org.arch.modules.archoverall.dto.BatchUpdateDTO;
import org.arch.entity.ArchiElement;
import org.arch.service.ArchiElementService;
import org.arch.overall.entity.ArchiElement;
import org.arch.overall.service.ArchiElementService;
import org.springframework.web.bind.annotation.*;
@Api(tags = {"元素管理"})
......
package org.arch.entity;
package org.arch.overall.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
......
package org.arch.entity;
package org.arch.overall.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
......
package org.arch.mapper;
package org.arch.overall.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.arch.entity.ArchiEleProperty;
import org.arch.overall.entity.ArchiEleProperty;
public interface ArchiElePropertyMapper extends BaseMapper<ArchiEleProperty> {
......
package org.arch.mapper;
package org.arch.overall.mapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.yulichang.base.MPJBaseMapper;
import org.apache.ibatis.annotations.Param;
import org.arch.modules.archoverall.dto.ArchiElementDTO;
import org.arch.entity.ArchiElement;
import org.arch.overall.entity.ArchiElement;
import java.util.List;
public interface ArchiElementMapper extends MPJBaseMapper<ArchiElement> {
......
package org.arch.mapper;
package org.arch.overall.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
......
package org.arch.service;
package org.arch.overall.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import org.arch.modules.archoverall.dto.ArchiElementDTO;
import org.arch.modules.archoverall.dto.BatchUpdateDTO;
import org.arch.entity.ArchiEleProperty;
import org.arch.entity.ArchiElement;
import org.arch.overall.entity.ArchiEleProperty;
import org.arch.overall.entity.ArchiElement;
import java.util.List;
......
package org.arch.service.impl;
package org.arch.overall.service.impl;
import cn.hutool.core.lang.UUID;
......@@ -10,13 +10,13 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.PageDTO;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.xiaoymin.knife4j.core.util.StrUtil;
import org.arch.entity.ArchiEleProperty;
import org.arch.entity.ArchiElement;
import org.arch.mapper.ArchiElePropertyMapper;
import org.arch.mapper.ArchiElementMapper;
import org.arch.overall.entity.ArchiEleProperty;
import org.arch.overall.entity.ArchiElement;
import org.arch.overall.mapper.ArchiElePropertyMapper;
import org.arch.overall.mapper.ArchiElementMapper;
import org.arch.modules.archoverall.dto.ArchiElementDTO;
import org.arch.modules.archoverall.dto.BatchUpdateDTO;
import org.arch.service.ArchiElementService;
import org.arch.overall.service.ArchiElementService;
import org.arch.utils.VersionUtil;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
......
<?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">
<mapper namespace="org.arch.mapper.ArchiElementMapper">
<resultMap id="BaseResultMap" type="org.arch.entity.ArchiElement">
<mapper namespace="org.arch.overall.mapper.ArchiElementMapper">
<resultMap id="BaseResultMap" type="org.arch.overall.entity.ArchiElement">
<result column="element_id" property="elementId"/>
<result column="element_code" property="elementCode"/>
<result column="element_name" property="elementName"/>
......@@ -24,12 +24,12 @@
<result column="archi_belong_code" property="archiBelongCode"/>
</resultMap>
<select id="initVersion" resultType="org.arch.entity.ArchiElement">
<select id="initVersion" resultType="org.arch.overall.entity.ArchiElement">
SELECT CONCAT(DATE_FORMAT(NOW(), '%Y%m%d'), '-V', YEAR(NOW()) - 2023 - 1, '.', DATE_FORMAT(NOW(), '%m'), '.0') AS version;
</select>
<!--元素列表-->
<select id="gtArchiElement" resultType="org.arch.entity.ArchiElement">
<select id="gtArchiElement" resultType="org.arch.overall.entity.ArchiElement">
select se.*,
gm.graph_name as iconName,
gm.icon
......@@ -54,7 +54,7 @@
</select>
<!--根据元素名称查询元素-->
<select id="gtArcEleByName" resultType="org.arch.entity.ArchiElement">
<select id="gtArcEleByName" resultType="org.arch.overall.entity.ArchiElement">
select se.element_id,
se.element_name,
se.archi_belong_id,
......@@ -73,7 +73,7 @@
order by se.create_time desc
</select>
<select id="gtEleList" resultType="org.arch.entity.ArchiElement">
<select id="gtEleList" resultType="org.arch.overall.entity.ArchiElement">
select se.*,
gm.graph_name as iconName,
gm.icon
......@@ -118,7 +118,7 @@
order by se.create_time desc
</select>
<select id="maxVer" resultType="org.arch.entity.ArchiElement">
<select id="maxVer" resultType="org.arch.overall.entity.ArchiElement">
SELECT a.version
FROM archi_element a
<where>
......@@ -169,7 +169,7 @@
<!--获取最新版本-->
<select id="getVersion" resultType="java.lang.String">
set @i := (<include refid="org.arch.mapper.VersionInitMapper.versionInit"/>);
set @i := (<include refid="org.arch.overall.mapper.VersionInitMapper.versionInit"/>);
select ifnull(version, @i) from archi_element where element_id = #{elementId} for update
</select>
</mapper>
\ No newline at end of file
<?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">
<mapper namespace="org.arch.mapper.VersionInitMapper">
<mapper namespace="org.arch.overall.mapper.VersionInitMapper">
<sql id="versionInit">
SELECT CONCAT(DATE_FORMAT(NOW(), '%Y%m%d'), '-V', YEAR(NOW()) - 2023, '.', DATE_FORMAT(NOW(), '%m'), '.0') AS version
</sql>
......
......@@ -931,7 +931,7 @@ org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating
at org.springframework.boot.SpringApplication.run(SpringApplication.java:302)
at org.springframework.boot.SpringApplication.run(SpringApplication.java:1303)
at org.springframework.boot.SpringApplication.run(SpringApplication.java:1292)
at org.arch.ArchOverallApp.main(ArchOverallApp.java:11)
at org.arch.overall.ArchOverallApp.main(ArchOverallApp.java:11)
Caused by: org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'archiElementImpl': Injection of resource dependencies failed; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'archiElementMapper' defined in file [E:\gw_space\arch\arch-overall\target\classes\org\arch\mapper\ArchiElementMapper.class]: Unsatisfied dependency expressed through bean property 'sqlSessionFactory'; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'sqlSessionFactory' defined in class path resource [com/baomidou/mybatisplus/autoconfigure/MybatisPlusAutoConfiguration.class]: Bean instantiation via factory method failed; nested exception is org.springframework.beans.BeanInstantiationException: Failed to instantiate [org.apache.ibatis.session.SqlSessionFactory]: Factory method 'sqlSessionFactory' threw exception; nested exception is java.io.IOException: Failed to parse mapping resource: 'file [E:\gw_space\arch\arch-overall\target\classes\mapper\ArchiElementMapper.xml]'
at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.postProcessProperties(CommonAnnotationBeanPostProcessor.java:332)
at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1431)
......@@ -1039,7 +1039,7 @@ org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating
at org.springframework.boot.SpringApplication.run(SpringApplication.java:302)
at org.springframework.boot.SpringApplication.run(SpringApplication.java:1303)
at org.springframework.boot.SpringApplication.run(SpringApplication.java:1292)
at org.arch.ArchOverallApp.main(ArchOverallApp.java:11)
at org.arch.overall.ArchOverallApp.main(ArchOverallApp.java:11)
Caused by: org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'archiElementImpl': Injection of resource dependencies failed; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'archiElementMapper' defined in file [E:\gw_space\arch\arch-overall\target\classes\org\arch\mapper\ArchiElementMapper.class]: Unsatisfied dependency expressed through bean property 'sqlSessionFactory'; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'sqlSessionFactory' defined in class path resource [com/baomidou/mybatisplus/autoconfigure/MybatisPlusAutoConfiguration.class]: Bean instantiation via factory method failed; nested exception is org.springframework.beans.BeanInstantiationException: Failed to instantiate [org.apache.ibatis.session.SqlSessionFactory]: Factory method 'sqlSessionFactory' threw exception; nested exception is java.io.IOException: Failed to parse mapping resource: 'file [E:\gw_space\arch\arch-overall\target\classes\mapper\ArchiElementMapper.xml]'
at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.postProcessProperties(CommonAnnotationBeanPostProcessor.java:332)
at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1431)
......@@ -1147,7 +1147,7 @@ org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating
at org.springframework.boot.SpringApplication.run(SpringApplication.java:302)
at org.springframework.boot.SpringApplication.run(SpringApplication.java:1303)
at org.springframework.boot.SpringApplication.run(SpringApplication.java:1292)
at org.arch.ArchOverallApp.main(ArchOverallApp.java:11)
at org.arch.overall.ArchOverallApp.main(ArchOverallApp.java:11)
Caused by: org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'archiElementImpl': Injection of resource dependencies failed; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'archiElementMapper' defined in file [E:\gw_space\arch\arch-overall\target\classes\org\arch\mapper\ArchiElementMapper.class]: Unsatisfied dependency expressed through bean property 'sqlSessionFactory'; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'sqlSessionFactory' defined in class path resource [com/baomidou/mybatisplus/autoconfigure/MybatisPlusAutoConfiguration.class]: Bean instantiation via factory method failed; nested exception is org.springframework.beans.BeanInstantiationException: Failed to instantiate [org.apache.ibatis.session.SqlSessionFactory]: Factory method 'sqlSessionFactory' threw exception; nested exception is java.io.IOException: Failed to parse mapping resource: 'file [E:\gw_space\arch\arch-overall\target\classes\mapper\ArchiElementMapper.xml]'
at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.postProcessProperties(CommonAnnotationBeanPostProcessor.java:332)
at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1431)
......@@ -1255,7 +1255,7 @@ org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating
at org.springframework.boot.SpringApplication.run(SpringApplication.java:302)
at org.springframework.boot.SpringApplication.run(SpringApplication.java:1303)
at org.springframework.boot.SpringApplication.run(SpringApplication.java:1292)
at org.arch.ArchOverallApp.main(ArchOverallApp.java:11)
at org.arch.overall.ArchOverallApp.main(ArchOverallApp.java:11)
Caused by: org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'archiElementImpl': Injection of resource dependencies failed; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'archiElementMapper' defined in file [E:\gw_space\arch\arch-overall\target\classes\org\arch\mapper\ArchiElementMapper.class]: Unsatisfied dependency expressed through bean property 'sqlSessionFactory'; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'sqlSessionFactory' defined in class path resource [com/baomidou/mybatisplus/autoconfigure/MybatisPlusAutoConfiguration.class]: Bean instantiation via factory method failed; nested exception is org.springframework.beans.BeanInstantiationException: Failed to instantiate [org.apache.ibatis.session.SqlSessionFactory]: Factory method 'sqlSessionFactory' threw exception; nested exception is java.io.IOException: Failed to parse mapping resource: 'file [E:\gw_space\arch\arch-overall\target\classes\mapper\ArchiElementMapper.xml]'
at org.springframework.context.annotation.CommonAnnotationBeanPostProcessor.postProcessProperties(CommonAnnotationBeanPostProcessor.java:332)
at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1431)
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!