wzl 8 ヶ月 前
コミット
e90bc5a957

+ 1 - 0
.gitignore

@@ -1,2 +1,3 @@
 .idea
 target\
+target/

+ 0 - 1
src/main/java/com/dskj/znzn/transData/common/conf/RedisConfigurer.java

@@ -3,7 +3,6 @@ package com.dskj.znzn.transData.common.conf;
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.PropertyAccessor;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.jsontype.impl.LaissezFaireSubTypeValidator;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.cache.CacheManager;
 import org.springframework.cache.annotation.CachingConfigurer;

+ 0 - 2
src/main/java/com/dskj/znzn/transData/common/filter/AppInterceptor.java

@@ -7,7 +7,6 @@ import com.dskj.znzn.transData.common.ThreadLocalUser;
 import com.dskj.znzn.transData.common.annotaions.NeedLogin;
 import com.dskj.znzn.transData.common.annotaions.NoRepeat;
 import com.dskj.znzn.transData.common.base.CurrentUser;
-import com.dskj.znzn.transData.common.exception.BusinessException;
 import com.dskj.znzn.transData.common.exception.UserNotLoginExeption;
 import com.dskj.znzn.transData.common.service.RedisService;
 import com.dskj.znzn.transData.common.utils.IpUtils;
@@ -24,7 +23,6 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.lang.reflect.Method;
-import java.util.Date;
 import java.util.Enumeration;
 import java.util.UUID;
 

+ 0 - 6
src/main/java/com/dskj/znzn/transData/generate/CodeGenerateMain.java

@@ -9,16 +9,10 @@ import com.baomidou.mybatisplus.generator.engine.VelocityTemplateEngine;
 
 import java.io.File;
 import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
 import java.sql.Types;
-import java.util.Arrays;
 import java.util.Collections;
-import java.util.List;
-import java.util.Locale;
 
 import static com.baomidou.mybatisplus.core.enums.SqlLike.RIGHT;
-import static java.nio.file.StandardOpenOption.CREATE_NEW;
 
 /**
  * @author 魏志亮

+ 4 - 10
src/main/java/com/dskj/znzn/transData/web/WaveData/controller/WaveDataController.java

@@ -7,18 +7,12 @@ import com.dskj.znzn.transData.web.WaveData.indata.GetMesureDataInData;
 import com.dskj.znzn.transData.web.WaveData.service.IWaveDataService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-
-import java.util.List;
-import javax.validation.Valid;
-
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-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 org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
 
 @RestController
 @RequestMapping({"/waveData"})

+ 1 - 1
src/main/java/com/dskj/znzn/transData/web/WaveData/indata/GetMesureDataInData.java

@@ -5,9 +5,9 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
+import java.util.List;
 
 @ApiModel
 @Data

+ 2 - 1
src/main/java/com/dskj/znzn/transData/web/WaveData/mapper/WaveDataMapper.java

@@ -2,9 +2,10 @@ package com.dskj.znzn.transData.web.WaveData.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.dskj.znzn.transData.web.WaveData.entity.WaveData;
-import java.util.List;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 @Mapper
 public interface WaveDataMapper extends BaseMapper<WaveData> {
 

+ 1 - 0
src/main/java/com/dskj/znzn/transData/web/WaveData/service/IWaveDataService.java

@@ -3,6 +3,7 @@ package com.dskj.znzn.transData.web.WaveData.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.dskj.znzn.transData.web.WaveData.entity.WaveData;
 import com.dskj.znzn.transData.web.WaveData.indata.GetMesureDataInData;
+
 import java.util.List;
 
 public interface IWaveDataService extends IService<WaveData> {

+ 2 - 3
src/main/java/com/dskj/znzn/transData/web/WaveData/service/impl/WaveDataServiceImpl.java

@@ -7,13 +7,12 @@ import com.dskj.znzn.transData.web.WaveData.entity.WaveData;
 import com.dskj.znzn.transData.web.WaveData.indata.GetMesureDataInData;
 import com.dskj.znzn.transData.web.WaveData.mapper.WaveDataMapper;
 import com.dskj.znzn.transData.web.WaveData.service.IWaveDataService;
-
-import java.util.List;
-
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 @Service
 @RequiredArgsConstructor(onConstructor = @__({@Autowired}))
 public class WaveDataServiceImpl extends ServiceImpl<WaveDataMapper, WaveData> implements IWaveDataService {

+ 4 - 1
src/main/java/com/dskj/znzn/transData/web/transConf/controller/TransConfController.java

@@ -13,7 +13,10 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
-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.validation.Valid;
 import java.util.List;

+ 2 - 3
src/main/java/com/dskj/znzn/transData/web/transConf/entity/TransConf.java

@@ -4,14 +4,13 @@ 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 java.io.Serializable;
-
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.io.Serializable;
+
 /**
  * <p>
  *

+ 0 - 2
src/main/java/com/dskj/znzn/transData/web/transConf/indata/InsertOrUpdateInData.java

@@ -1,13 +1,11 @@
 package com.dskj.znzn.transData.web.transConf.indata;
 
 import com.dskj.znzn.transData.web.transConf.entity.TransConf;
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
 
 @ApiModel
 @Data

+ 1 - 1
src/main/java/com/dskj/znzn/transData/web/transConf/mapper/TransConfMapper.java

@@ -1,7 +1,7 @@
 package com.dskj.znzn.transData.web.transConf.mapper;
 
-import com.dskj.znzn.transData.web.transConf.entity.TransConf;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.dskj.znzn.transData.web.transConf.entity.TransConf;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

+ 1 - 1
src/main/java/com/dskj/znzn/transData/web/transConf/service/ITransConfService.java

@@ -1,9 +1,9 @@
 package com.dskj.znzn.transData.web.transConf.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.dskj.znzn.transData.common.base.PageInfo;
 import com.dskj.znzn.transData.common.base.PageR;
 import com.dskj.znzn.transData.web.transConf.entity.TransConf;
-import com.baomidou.mybatisplus.extension.service.IService;
 import com.dskj.znzn.transData.web.transConf.indata.InsertOrUpdateInData;
 import com.dskj.znzn.transData.web.transConf.outdata.TransConfForPlt;