bug处理

This commit is contained in:
578646533@qq.com 2024-11-13 18:00:34 +08:00
parent 2893c25caf
commit c84aea4b0f
26 changed files with 86 additions and 115 deletions

View File

@ -3,9 +3,11 @@ package com.electromagnetic.industry.software.data.manage.controller.user;
import com.electromagnetic.industry.software.data.manage.facade.user.UserFacade;
import com.electromagnetic.industry.software.data.manage.request.user.UserRequest;
import electromagnetic.data.framework.share.model.BaseResult;
import electromagnetic.data.framework.share.model.ElectromagneticResult;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;

View File

@ -7,7 +7,6 @@ import com.github.pagehelper.PageInfo;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
/**
* 分页综合返回

View File

@ -3,7 +3,6 @@ package com.electromagnetic.industry.software.data.manage.domain.boardservice.in
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
@Data
public class EDDataParams implements Serializable {

View File

@ -4,14 +4,9 @@
package com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.repository;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.EDDataInfo;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.IndicatorCard;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.IndicatorCardExtend;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.parames.EDDataParams;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.parames.IndicatorCardParams;
import com.github.pagehelper.PageInfo;
import java.util.List;
/**
* @author
* @version $Id: EDDataRepos.java, v 0.1 2024-07-29 19:02

View File

@ -1,15 +1,8 @@
package com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.service;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.EDDataInfo;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.IndicatorCard;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.EDDataPage;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.parames.EDDataParams;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.parames.IndicatorCardParams;
import com.electromagnetic.industry.software.data.manage.request.indicator.EDDataRequest;
import electromagnetic.data.framework.share.model.ElectromagneticResult;
import electromagnetic.data.framework.share.model.ElectromagneticResultUtil;
import java.util.List;
public interface EDDataService {

View File

@ -3,28 +3,18 @@
*/
package com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.service.impl;
import com.electromagnetic.industry.software.data.manage.common.ElectromagneticErrorEnum;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.enums.EffectFlagEnum;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.enums.IndicatorCardHomeDisplayEnum;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.enums.IndicatorCardStatusEnum;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.EDDataInfo;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.IndicatorCard;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.EDDataPage;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.parames.EDDataParams;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.repository.EDDataRepository;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.service.EDDataService;
import com.github.pagehelper.PageInfo;
import electromagnetic.data.framework.share.enums.ElectromagneticSceneIncidentEnum;
import electromagnetic.data.framework.share.exception.ElectromagneticBizRuntimeException;
import electromagnetic.data.framework.share.exception.LoggerConstant;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
/**
* @author

View File

@ -10,18 +10,17 @@ import electromagnetic.data.framework.share.util.Functions;
import electromagnetic.data.framework.share.util.Results;
import electromagnetic.data.framework.share.validation.ValidationResult;
import electromagnetic.data.framework.share.validation.ValidationTool;
import electromagnetic.data.framework.share.util.*;
import org.hibernate.validator.HibernateValidator;
import org.hibernate.validator.HibernateValidatorConfiguration;
import org.springframework.beans.factory.InitializingBean;
import javax.validation.ConstraintViolation;
import javax.validation.Validation;
import javax.validation.Validator;
import javax.validation.ValidatorFactory;
import java.util.Set;
import java.util.function.BiFunction;
import java.util.function.Consumer;
import javax.validation.Validator;
/**
* 默认的验证工具实现支持函数化的编程方式

View File

@ -3,9 +3,9 @@
*/
package electromagnetic.data.framework.share.config;
import electromagnetic.data.framework.share.util.DefaultSimpleValidationTool;
import electromagnetic.data.framework.share.validation.SimpleValidationTool;
import electromagnetic.data.framework.share.validation.ValidationTool;
import electromagnetic.data.framework.share.util.DefaultSimpleValidationTool;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;

View File

@ -8,11 +8,11 @@ import electromagnetic.data.framework.share.enums.ElectromagneticCommonErrorEnum
import electromagnetic.data.framework.share.enums.ElectromagneticSceneIncidentEnum;
import electromagnetic.data.framework.share.exception.BizRuntimeException;
import electromagnetic.data.framework.share.exception.ElectromagneticBizRuntimeException;
import electromagnetic.data.framework.share.exception.IllegalParameterException;
import electromagnetic.data.framework.share.model.ElectromagneticPaginationResult;
import electromagnetic.data.framework.share.model.ElectromagneticResult;
import electromagnetic.data.framework.share.model.PageModel;
import electromagnetic.data.framework.share.result.CallbackResult;
import electromagnetic.data.framework.share.exception.IllegalParameterException;
import javax.xml.bind.ValidationException;
import java.util.Optional;

View File

@ -1,8 +1,5 @@
package electromagnetic.data.framework.share.model;
import electromagnetic.data.framework.share.result.Message;
import electromagnetic.data.framework.share.result.Result;
import java.io.Serializable;
public class BaseResult<T> implements Serializable{

View File

@ -3,9 +3,9 @@
*/
package electromagnetic.data.framework.share.util;
import electromagnetic.data.framework.share.exception.IllegalParameterException;
import electromagnetic.data.framework.share.validation.SimpleValidationTool;
import electromagnetic.data.framework.share.validation.ValidationTool;
import electromagnetic.data.framework.share.exception.IllegalParameterException;
/**
* @author wsk

View File

@ -4,10 +4,10 @@
package electromagnetic.data.framework.share.validation.config;
import electromagnetic.data.framework.share.validation.ValidationTool;
import electromagnetic.data.framework.share.config.DefaultValidationTool;
import electromagnetic.data.framework.share.config.ValidationToolAutoConfiguration;
import electromagnetic.data.framework.share.validation.ElectromagneticSimpleValidationTool;
import electromagnetic.data.framework.share.validation.ValidationTool;
import electromagnetic.data.framework.share.validation.impl.ElectromagneticSimpleValidationToolImpl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;

View File

@ -4,9 +4,9 @@
package electromagnetic.data.framework.share.validation.impl;
import electromagnetic.data.framework.share.validation.ValidationTool;
import electromagnetic.data.framework.share.exception.IllegalParameterException;
import electromagnetic.data.framework.share.validation.ElectromagneticSimpleValidationTool;
import electromagnetic.data.framework.share.validation.ValidationTool;
/**
*/

View File

@ -4,9 +4,6 @@ import com.electromagnetic.industry.software.data.manage.request.indicator.EDDat
import com.electromagnetic.industry.software.data.manage.response.indicator.EDDataPageResponse;
import electromagnetic.data.framework.share.model.ElectromagneticResult;
import java.util.List;
import java.util.Map;
public interface EDDataFacade {
/**

View File

@ -4,12 +4,11 @@
package com.electromagnetic.industry.software.data.manage.facade;
import electromagnetic.data.framework.share.model.ElectromagneticResult;
import com.electromagnetic.industry.software.data.manage.request.indicator.IndicatorCardRequest;
import com.electromagnetic.industry.software.data.manage.request.indicator.IndicatorDataRequest;
import com.electromagnetic.industry.software.data.manage.response.indicator.IndicatorCardDetailReponse;
import com.electromagnetic.industry.software.data.manage.response.indicator.IndicatorCardPageResponse;
import electromagnetic.data.framework.share.model.ElectromagneticResult;
import java.util.List;
import java.util.Map;

View File

@ -2,7 +2,6 @@ package com.electromagnetic.industry.software.data.manage.facade.user;
import com.electromagnetic.industry.software.data.manage.request.user.UserRequest;
import electromagnetic.data.framework.share.model.BaseResult;
import electromagnetic.data.framework.share.model.ElectromagneticResult;
public interface UserFacade {

View File

@ -3,8 +3,6 @@ package com.electromagnetic.industry.software.data.manage.request.indicator;
import electromagnetic.data.framework.share.model.BaseRequest;
import lombok.Data;
import java.util.Date;
@Data
public class EDDataRequest extends BaseRequest {

View File

@ -8,7 +8,6 @@ import com.github.pagehelper.PageInfo;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
/**
* @author
@ -20,5 +19,5 @@ public class EDDataPageResponse implements Serializable {
/**
* 指电磁数据-文件信息数据
*/
private PageInfo<EDDataResponse> edDataPage;
private PageInfo<EDDataResponse> edDataInfo;
}

View File

@ -11,7 +11,6 @@ import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.boot.jdbc.DataSourceBuilder;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.io.Resource;
import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
import org.springframework.jdbc.core.JdbcTemplate;

View File

@ -1,11 +1,7 @@
package com.electromagnetic.industry.software.data.manage.repository.dao;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.EDDataInfo;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.IndicatorCard;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.IndicatorCardExtend;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.parames.EDDataParams;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.parames.IndicatorCardParams;
import com.github.pagehelper.PageInfo;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;

View File

@ -4,10 +4,7 @@
package com.electromagnetic.industry.software.data.manage.repository.impl;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.EDDataInfo;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.IndicatorCard;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.IndicatorCardExtend;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.parames.EDDataParams;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.parames.IndicatorCardParams;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.repository.EDDataRepository;
import com.electromagnetic.industry.software.data.manage.repository.dao.EDDataMapper;
import com.github.pagehelper.PageHelper;

View File

@ -0,0 +1,72 @@
<?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="com.electromagnetic.industry.software.data.manage.repository.dao.EDDataMapper">
<resultMap id="BaseResultMap" type="com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.EDDataInfo">
<id column="id" jdbcType="BIGINT" property="id" />
<result column="category_id" jdbcType="VARCHAR" property="categoryId" />
<result column="data_id" jdbcType="VARCHAR" property="dataId" />
<result column="data_no" jdbcType="VARCHAR" property="dataNo" />
<result column="data_name" jdbcType="VARCHAR" property="dataName" />
<result column="data_type" jdbcType="VARCHAR" property="dataType" />
<result column="version" jdbcType="VARCHAR" property="version" />
<result column="content" jdbcType="VARCHAR" property="content" />
<result column="implant_json" jdbcType="VARCHAR" property="implantJson" />
<result column="data_status" jdbcType="VARCHAR" property="dataStatus" />
<result column="creator" jdbcType="VARCHAR" property="creator" />
<result column="creator_name" jdbcType="VARCHAR" property="creatorName" />
<result column="gmt_create" jdbcType="TIMESTAMP" property="gmtCreate" />
<result column="modifier" jdbcType="VARCHAR" property="modifier" />
<result column="modifier_name" jdbcType="VARCHAR" property="modifierName" />
<result column="gmt_modified" jdbcType="TIMESTAMP" property="gmtModified" />
<result column="effect_flag" jdbcType="TINYINT" property="effectFlag" />
</resultMap>
<sql id="Base_Column_list">
id,category_id,data_id,data_no,data_name,data_type,file_type,version,content,
implant_json,data_status,creator,creator_name,gmt_create,modifier,modifier_name,
gmt_modified,effect_flag
</sql>
<insert id="createFolder" parameterType="com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.EDDataInfo">
<selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
SELECT LAST_INSERT_ID()
</selectKey>
insert into ed_data_info (id, category_id,
data_id, data_no, data_name,
data_type, file_type,
version,content, implant_json, data_status,
creator, creator_name, gmt_create,
modifier, modifier_name, gmt_modified,
effect_flag
)
values (#{id,jdbcType=VARCHAR}, #{categoryId,jdbcType=VARCHAR},
#{dataId,jdbcType=VARCHAR}, #{dataNo,jdbcType=VARCHAR}, #{dataName,jdbcType=VARCHAR},
#{dataType,jdbcType=VARCHAR}, #{fileType,jdbcType=VARCHAR},
#{version,jdbcType=VARCHAR},#{content,jdbcType=VARCHAR}, #{implantJson,jdbcType=VARCHAR}, #{dataStatus,jdbcType=VARCHAR},
#{creator,jdbcType=VARCHAR}, #{creatorName,jdbcType=VARCHAR}, now(), #{modifier,jdbcType=VARCHAR},
#{modifierName,jdbcType=VARCHAR},now(),1
)
</insert>
<select id="getDataInfoList" resultMap="BaseResultMap"
parameterType="com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.parames.EDDataParams">
SELECT
<include refid="Base_Column_list"/>
FROM
ed_data_info data
where
effect_flag = 1
<if test="parentId!=null and parentId!=''">
and category_id='${parentId}'
</if>
<if test="keyWord!=null and keyWord!=''">
and data_name LIKE '%${keyWord}%'
</if>
GROUP BY id
order by gmt_modified asc
</select>
</mapper>

View File

@ -1,61 +1,6 @@
<?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="com.electromagnetic.industry.software.data.manage.repository.dao.EDDataMapper">
<insert id="createFolder" parameterType="com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.EDDataInfo">
<selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
SELECT LAST_INSERT_ID()
</selectKey>
insert into ed_data_info (id, category_id,
data_id, data_no, data_name,
data_type, file_type,
version,content, implant_json, data_status,
creator, creator_name, gmt_create,
modifier, modifier_name, gmt_modified,
effect_flag
)
values (#{id,jdbcType=VARCHAR}, #{categoryId,jdbcType=VARCHAR},
#{dataId,jdbcType=VARCHAR}, #{dataNo,jdbcType=VARCHAR}, #{dataName,jdbcType=VARCHAR},
#{dataType,jdbcType=VARCHAR}, #{fileType,jdbcType=VARCHAR},
#{version,jdbcType=VARCHAR},#{content,jdbcType=VARCHAR}, #{implantJson,jdbcType=VARCHAR}, #{dataStatus,jdbcType=VARCHAR},
#{creator,jdbcType=VARCHAR}, #{creatorName,jdbcType=VARCHAR}, now(), #{modifier,jdbcType=VARCHAR},
#{modifierName,jdbcType=VARCHAR},now(),1
)
</insert>
<select id="getDataInfoList" resultMap="EDDataMapper" parameterType="com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.parames.EDDataParams">
SELECT
data.id,
data.category_id,
data.data_id,
data.data_no,
data.data_name,
data.data_type,
data.file_type,
data.version,
data.content,
data.implant_json,
data.data_status,
data.creator, card.creator_name, card.gmt_create, card.modifier,
data.modifier_name,card.gmt_modified,card.effect_flag
FROM
ed_data_info data
<where>
data.effect_flag = 1
<if test="parentId!=null and parentId!=''">
and data.category_id='${parentId}'
</if>
<if test="keyWord!=null and keyWord!=''">
and data.data_name LIKE '%${keyWord}%'
</if>
</where>
GROUP BY data.id
order by data.gmt_modified asc
</select>
</mapper>
<!--
<mapper namespace="com.electromagnetic.industry.software.data.manage.repository.dao.IndicatorCardMapper">
<resultMap id="BaseResultMap" type="com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.IndicatorCard">
<id column="id" jdbcType="BIGINT" property="id" />
@ -252,4 +197,3 @@
</foreach>
</update>
</mapper>
-->

View File

@ -8,10 +8,9 @@ import com.electromagnetic.industry.software.data.manage.facade.EDDataFacade;
import com.electromagnetic.industry.software.data.manage.request.indicator.EDDataRequest;
import com.electromagnetic.industry.software.data.manage.response.indicator.EDDataPageResponse;
import com.electromagnetic.industry.software.data.manage.service.mappers.EDDataMappers;
import com.electromagnetic.industry.software.data.manage.service.mappers.IndicatorCardMappers;
import electromagnetic.data.framework.share.id.IdWorker;
import electromagnetic.data.framework.share.model.ElectromagneticResult;
import electromagnetic.data.framework.share.model.ElectromagneticResultUtil;
import electromagnetic.data.framework.share.id.IdWorker;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;

View File

@ -3,13 +3,13 @@
*/
package com.electromagnetic.industry.software.data.manage.service.facade;
import com.electromagnetic.industry.software.data.manage.facade.IndicatorCardFacade;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.Indicator;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.IndicatorCard;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.IndicatorCardDetial;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.IndicatorCardPage;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.parames.IndicatorCardParams;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.service.IndicatorCardService;
import com.electromagnetic.industry.software.data.manage.facade.IndicatorCardFacade;
import com.electromagnetic.industry.software.data.manage.request.indicator.IndicatorCardRequest;
import com.electromagnetic.industry.software.data.manage.request.indicator.IndicatorDataRequest;
import com.electromagnetic.industry.software.data.manage.response.indicator.IndicatorCardDetailReponse;

View File

@ -8,8 +8,6 @@ import com.electromagnetic.industry.software.data.manage.request.user.UserReques
import org.mapstruct.Mapper;
import org.mapstruct.factory.Mappers;
import java.util.List;
/**
* 用户模型转换
* @author szt