mcj:表加上前缀

src/main/java/com/zjty/inspect/controller/InspectController.java

 package com.zjty.inspect.controller;
 
 import com.alibaba.fastjson.JSON;
-import com.zjty.inspect.aop.AuthAnnotation;
 import com.zjty.inspect.dao.ConfigParamDao;
-import com.zjty.inspect.dao.ExcelDataDao;
-import com.zjty.inspect.dao.TechnologyDao;
 import com.zjty.inspect.entity.*;
 import com.zjty.inspect.enums.LanguageEnum;
-import com.zjty.inspect.enums.OtherApiEnum;
 import com.zjty.inspect.service.*;
 import com.zjty.inspect.utils.*;
-import freemarker.template.TemplateException;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.io.FileUtils;
-import org.apache.tomcat.util.http.fileupload.disk.DiskFileItem;
-import org.aspectj.lang.annotation.Around;
-import org.eclipse.jgit.api.errors.GitAPIException;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.io.Resource;
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.client.RestTemplate;
 import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.commons.CommonsMultipartFile;
 
 import java.io.*;
 import java.io.File;

src/main/java/com/zjty/inspect/dao/ExcelDataDao.java

-package com.zjty.inspect.dao;
-
-import com.zjty.inspect.entity.ExcelDataEntity;
-import com.zjty.inspect.entity.ExcelEntity;
-import org.springframework.data.jpa.repository.JpaRepository;
-
-public interface ExcelDataDao extends JpaRepository<ExcelEntity,String> {
-    ExcelEntity findByEvaluationIdEquals(String id);
-}

src/main/java/com/zjty/inspect/entity/Category.java

@@ -8,10 +8,13 @@ import lombok.NoArgsConstructor;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Id;
+import javax.persistence.Table;
+
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
 @Entity
+@Table(name = "master_category")
 @ApiModel(value = "类型")
 public class Category {
     @Id

src/main/java/com/zjty/inspect/entity/CoefficientModel.java

@@ -6,13 +6,14 @@ import lombok.Data;
 
 import javax.persistence.Entity;
 import javax.persistence.Id;
+import javax.persistence.Table;
 
 /**
  * 系数计算
  *
  * @author Mcj
  */
-
+@Table(name = "master_coefficient_model")
 @Entity
 @Data
 @ApiModel(value = "系数计算")

src/main/java/com/zjty/inspect/entity/Config.java

@@ -9,11 +9,13 @@ import lombok.NoArgsConstructor;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Id;
+import javax.persistence.Table;
 
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
 @Entity
+@Table(name = "master_config")
 @ApiModel(value = "配置")
 public class Config {
     @Id

src/main/java/com/zjty/inspect/entity/Evaluation.java

@@ -13,10 +13,12 @@ import org.springframework.data.annotation.LastModifiedDate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Id;
+import javax.persistence.Table;
 import java.sql.Timestamp;
 import java.util.Date;
 
 @Entity
+@Table(name = "master_evaluation")
 @NoArgsConstructor
 @AllArgsConstructor
 @Data

src/main/java/com/zjty/inspect/entity/ExcelEntity.java

-package com.zjty.inspect.entity;
-
-import lombok.Data;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-
-/**
- * @author Mcj
- * @date 2020-04-11 15:13
- */
-@Data
-@Entity
-public class ExcelEntity {
-    @Id
-    private String id;
-
-    private String evaluationId;
-
-    @Column(columnDefinition = "TEXT")
-    private String jsonData;
-}

src/main/java/com/zjty/inspect/entity/Report.java

@@ -14,6 +14,7 @@ import java.sql.Timestamp;
  * 报告
  * @author mcj
  */
+@Table(name = "master_report")
 @Entity
 @Data
 @NoArgsConstructor

src/main/java/com/zjty/inspect/entity/Rule.java

@@ -22,6 +22,7 @@ import java.util.Date;
 @NoArgsConstructor
 @AllArgsConstructor
 @Entity
+@Table(name = "master_rule")
 @ApiModel(value = "规则类")
 public class Rule {
 

src/main/java/com/zjty/inspect/entity/RuleCollection.java

@@ -9,13 +9,14 @@ import org.springframework.data.annotation.LastModifiedDate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Id;
+import javax.persistence.Table;
 import java.util.Date;
 
 /**
  * @author Mcj
  * @date 2020-02-27 14:42
  */
-
+@Table(name = "master_rule_connection")
 @Data
 @Entity
 @ApiModel(value = "规则类")

src/main/java/com/zjty/inspect/entity/Technology.java

@@ -9,6 +9,7 @@ import org.hibernate.annotations.GenerationTime;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Id;
+import javax.persistence.Table;
 import java.sql.Timestamp;
 
 /**
@@ -16,7 +17,7 @@ import java.sql.Timestamp;
  * @author Mcj
  * @date 2020-02-26 14:18
  */
-
+@Table(name = "master_technology")
 @Entity
 @Data
 @ApiModel(description = "关键技术类")

src/main/java/com/zjty/inspect/service/EvaluationService.java

 package com.zjty.inspect.service;
 
 import com.zjty.inspect.entity.Evaluation;
-import com.zjty.inspect.entity.ExcelEntity;
-import com.zjty.inspect.entity.Rule;
 import org.springframework.data.domain.Page;
 
-import java.util.List;
 import java.util.Map;
 
 public interface EvaluationService {
@@ -16,6 +13,4 @@ public interface EvaluationService {
     Page<Evaluation> findSearch(Map searchMap, int page, int size);
     Evaluation findById(String id);
     Evaluation findByName(String name);
-
-    ExcelEntity findExcelEntityById(String id);
 }

src/main/java/com/zjty/inspect/service/impl/EvaluationServiceImpl.java

 package com.zjty.inspect.service.impl;
 
 import com.zjty.inspect.dao.EvaluationDao;
-import com.zjty.inspect.dao.ExcelDataDao;
 import com.zjty.inspect.entity.Evaluation;
-import com.zjty.inspect.entity.ExcelEntity;
-import com.zjty.inspect.entity.Rule;
 import com.zjty.inspect.service.EvaluationService;
-import com.zjty.inspect.utils.TimeUtil;
 import com.zjty.inspect.utils.UUIDUtil;
 import io.netty.util.internal.StringUtil;
 import lombok.extern.slf4j.Slf4j;
@@ -35,8 +31,6 @@ public class EvaluationServiceImpl implements EvaluationService {
     @Autowired
     private EvaluationDao evaluationDao;
 
-    @Autowired
-    private ExcelDataDao excelDataDao;
     @Override
     public Evaluation save(Evaluation evaluation) {
         log.info("evaluation:{}",evaluation);
@@ -103,11 +97,6 @@ public class EvaluationServiceImpl implements EvaluationService {
         return null;
     }
 
-    @Override
-    public ExcelEntity findExcelEntityById(String id) {
-        return excelDataDao.findByEvaluationIdEquals(id);
-    }
-
     /**
      * 动态条件构建
      *

src/main/resources/application-dev.properties

@@ -51,6 +51,7 @@ spring.jackson.time-zone=GMT
 
 # mysql\u6570\u636E\u5E93\u914D\u7F6E
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
+
 #spring.datasource.url=jdbc:mysql://192.168.1.249:3306/bservice?useSSL=false&serverTimezone=UTC&autoReconnect=true&characterEncoding=utf-8
 spring.datasource.url=jdbc:mysql://localhost:3306/adaptation?useSSL=false&serverTimezone=UTC&autoReconnect=true&characterEncoding=utf-8
 #spring.datasource.url=jdbc:mysql://120.55.57.35:3306/adaptation?characterEncoding=utf-8