重构

src/main/java/com/xkrs/controller/QcItemController.java

@@ -1,9 +1,9 @@
 package com.xkrs.controller;
 
-import com.xkrs.newpro.model.qo.QcItemQoDelete;
-import com.xkrs.newpro.model.qo.QcItemQoInsert;
-import com.xkrs.newpro.model.qo.QcItemQoUpdate;
-import com.xkrs.newpro.service.QcItemService;
+import com.xkrs.model.qo.QcItemQoDelete;
+import com.xkrs.model.qo.QcItemQoInsert;
+import com.xkrs.model.qo.QcItemQoUpdate;
+import com.xkrs.service.QcItemService;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;

src/main/java/com/xkrs/controller/QcSourceController.java

@@ -1,8 +1,8 @@
 package com.xkrs.controller;
 
-import com.xkrs.newpro.model.qo.QcSourceQoDelete;
-import com.xkrs.newpro.model.qo.QcSourceQoInsert;
-import com.xkrs.newpro.service.QcSourceService;
+import com.xkrs.model.qo.QcSourceQoDelete;
+import com.xkrs.model.qo.QcSourceQoInsert;
+import com.xkrs.service.QcSourceService;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 

src/main/java/com/xkrs/controller/QcSpecController.java

@@ -1,9 +1,9 @@
 package com.xkrs.controller;
 
-import com.xkrs.newpro.model.qo.QcSpecQoDelete;
-import com.xkrs.newpro.model.qo.QcSpecQoInsert;
-import com.xkrs.newpro.model.qo.QcSpecQoUpdate;
-import com.xkrs.newpro.service.QcSpecService;
+import com.xkrs.model.qo.QcSpecQoDelete;
+import com.xkrs.model.qo.QcSpecQoInsert;
+import com.xkrs.model.qo.QcSpecQoUpdate;
+import com.xkrs.service.QcSpecService;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;

src/main/java/com/xkrs/dao/QcItemDao.java

@@ -1,6 +1,6 @@
 package com.xkrs.dao;
 
-import com.xkrs.newpro.model.entity.QcItemEntity;
+import com.xkrs.model.entity.QcItemEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Modifying;

src/main/java/com/xkrs/dao/QcSourceDao.java

@@ -1,6 +1,6 @@
 package com.xkrs.dao;
 
-import com.xkrs.newpro.model.entity.QcSourceEntity;
+import com.xkrs.model.entity.QcSourceEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Query;

src/main/java/com/xkrs/dao/QcSpecDao.java

@@ -1,6 +1,6 @@
 package com.xkrs.dao;
 
-import com.xkrs.newpro.model.entity.QcSpecEntity;
+import com.xkrs.model.entity.QcSpecEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Modifying;

src/main/java/com/xkrs/model/entity/QcItemEntity.java

@@ -1,4 +1,4 @@
-package com.xkrs.newpro.model.entity;
+package com.xkrs.model.entity;
 
 import javax.persistence.*;
 

src/main/java/com/xkrs/model/entity/QcSourceEntity.java

@@ -1,4 +1,4 @@
-package com.xkrs.newpro.model.entity;
+package com.xkrs.model.entity;
 
 import javax.persistence.*;
 

src/main/java/com/xkrs/model/entity/QcSpecEntity.java

@@ -1,4 +1,4 @@
-package com.xkrs.newpro.model.entity;
+package com.xkrs.model.entity;
 
 import javax.persistence.*;
 

src/main/java/com/xkrs/model/qo/FileQo.java

@@ -1,6 +1,6 @@
 package com.xkrs.model.qo;
 
-import com.xkrs.model.validation.FileQoInsert;
+import com.xkrs.model.va.FileQoInsert;
 
 import javax.validation.constraints.NotBlank;
 

src/main/java/com/xkrs/model/qo/QcItemQoDelete.java

@@ -1,4 +1,4 @@
-package com.xkrs.newpro.model.qo;
+package com.xkrs.model.qo;
 
 /**
  * 删除检验项目接收类

src/main/java/com/xkrs/model/qo/QcItemQoInsert.java

@@ -1,4 +1,4 @@
-package com.xkrs.newpro.model.qo;
+package com.xkrs.model.qo;
 
 /**
  * 新增检验项目接收类

src/main/java/com/xkrs/model/qo/QcItemQoUpdate.java

@@ -1,4 +1,4 @@
-package com.xkrs.newpro.model.qo;
+package com.xkrs.model.qo;
 
 /**
  * 更新检验项目接收类

src/main/java/com/xkrs/model/qo/QcSourceQoDelete.java

@@ -1,4 +1,4 @@
-package com.xkrs.newpro.model.qo;
+package com.xkrs.model.qo;
 
 /**
  * 删除检验数据接收类

src/main/java/com/xkrs/model/qo/QcSourceQoInsert.java

@@ -1,4 +1,4 @@
-package com.xkrs.newpro.model.qo;
+package com.xkrs.model.qo;
 
 /**
  * 新增检验数据接收类

src/main/java/com/xkrs/model/qo/QcSpecQoDelete.java

@@ -1,4 +1,4 @@
-package com.xkrs.newpro.model.qo;
+package com.xkrs.model.qo;
 
 /**
  * 删除检验规格接收类

src/main/java/com/xkrs/model/qo/QcSpecQoInsert.java

@@ -1,4 +1,4 @@
-package com.xkrs.newpro.model.qo;
+package com.xkrs.model.qo;
 
 /**
  * 新增检验规格接收类

src/main/java/com/xkrs/model/qo/QcSpecQoUpdate.java

@@ -1,4 +1,4 @@
-package com.xkrs.newpro.model.qo;
+package com.xkrs.model.qo;
 
 /**
  * 更新检验规格接收类

src/main/java/com/xkrs/model/va/FileQoInsert.java

@@ -1,4 +1,4 @@
-package com.xkrs.model.validation;
+package com.xkrs.model.va;
 
 /**
  * @Author: XinYi Song

src/main/java/com/xkrs/model/va/QcItemQoDeleteVa.java

@@ -1,4 +1,4 @@
-package com.xkrs.newpro.model.va;
+package com.xkrs.model.va;
 
 public interface QcItemQoDeleteVa {
 }

src/main/java/com/xkrs/model/va/QcItemQoInsertVa.java

@@ -1,4 +1,4 @@
-package com.xkrs.newpro.model.va;
+package com.xkrs.model.va;
 
 public interface QcItemQoInsertVa {
 }

src/main/java/com/xkrs/model/va/QcItemQoQueryVa.java

@@ -1,4 +1,4 @@
-package com.xkrs.newpro.model.va;
+package com.xkrs.model.va;
 
 public interface QcItemQoQueryVa {
 }

src/main/java/com/xkrs/model/va/QcItemQoUpdateVa.java

@@ -1,4 +1,4 @@
-package com.xkrs.newpro.model.va;
+package com.xkrs.model.va;
 
 public interface QcItemQoUpdateVa {
 }

src/main/java/com/xkrs/model/va/QcSourceQoDeleteVa.java

@@ -1,4 +1,4 @@
-package com.xkrs.newpro.model.va;
+package com.xkrs.model.va;
 
 public interface QcSourceQoDeleteVa {
 }

src/main/java/com/xkrs/model/va/QcSourceQoInsertVa.java

@@ -1,4 +1,4 @@
-package com.xkrs.newpro.model.va;
+package com.xkrs.model.va;
 
 public interface QcSourceQoInsertVa {
 }

src/main/java/com/xkrs/model/va/QcSourceQoQueryVa.java

@@ -1,4 +1,4 @@
-package com.xkrs.newpro.model.va;
+package com.xkrs.model.va;
 
 public interface QcSourceQoQueryVa {
 }

src/main/java/com/xkrs/model/va/QcSpecQoDeleteVa.java

@@ -1,4 +1,4 @@
-package com.xkrs.newpro.model.va;
+package com.xkrs.model.va;
 
 public interface QcSpecQoDeleteVa {
 }

src/main/java/com/xkrs/model/va/QcSpecQoInsertVa.java

@@ -1,4 +1,4 @@
-package com.xkrs.newpro.model.va;
+package com.xkrs.model.va;
 
 public interface QcSpecQoInsertVa {
 }

src/main/java/com/xkrs/model/va/QcSpecQoQueryVa.java

@@ -1,4 +1,4 @@
-package com.xkrs.newpro.model.va;
+package com.xkrs.model.va;
 
 public interface QcSpecQoQueryVa {
 }

src/main/java/com/xkrs/model/va/QcSpecQoUpdateVa.java

@@ -1,4 +1,4 @@
-package com.xkrs.newpro.model.va;
+package com.xkrs.model.va;
 
 public interface QcSpecQoUpdateVa {
 }

src/main/java/com/xkrs/service/QcItemService.java

@@ -1,8 +1,8 @@
-package com.xkrs.newpro.service;
+package com.xkrs.service;
 
-import com.xkrs.newpro.model.qo.QcItemQoDelete;
-import com.xkrs.newpro.model.qo.QcItemQoInsert;
-import com.xkrs.newpro.model.qo.QcItemQoUpdate;
+import com.xkrs.model.qo.QcItemQoDelete;
+import com.xkrs.model.qo.QcItemQoInsert;
+import com.xkrs.model.qo.QcItemQoUpdate;
 
 public interface QcItemService {
 

src/main/java/com/xkrs/service/QcSourceService.java

@@ -1,7 +1,7 @@
-package com.xkrs.newpro.service;
+package com.xkrs.service;
 
-import com.xkrs.newpro.model.qo.QcSourceQoDelete;
-import com.xkrs.newpro.model.qo.QcSourceQoInsert;
+import com.xkrs.model.qo.QcSourceQoDelete;
+import com.xkrs.model.qo.QcSourceQoInsert;
 import org.springframework.web.multipart.MultipartFile;
 
 public interface QcSourceService {

src/main/java/com/xkrs/service/QcSpecService.java

@@ -1,8 +1,8 @@
-package com.xkrs.newpro.service;
+package com.xkrs.service;
 
-import com.xkrs.newpro.model.qo.QcSpecQoDelete;
-import com.xkrs.newpro.model.qo.QcSpecQoInsert;
-import com.xkrs.newpro.model.qo.QcSpecQoUpdate;
+import com.xkrs.model.qo.QcSpecQoDelete;
+import com.xkrs.model.qo.QcSpecQoInsert;
+import com.xkrs.model.qo.QcSpecQoUpdate;
 
 public interface QcSpecService {
 

src/main/java/com/xkrs/service/impl/QcItemServiceImpl.java

@@ -1,14 +1,14 @@
-package com.xkrs.newpro.service.impl;
+package com.xkrs.service.impl;
 
 import com.xkrs.encapsulation.PromptMessageEnum;
 import com.xkrs.dao.QcItemDao;
-import com.xkrs.newpro.model.entity.QcItemEntity;
-import com.xkrs.newpro.model.qo.QcItemQoDelete;
-import com.xkrs.newpro.model.qo.QcItemQoInsert;
-import com.xkrs.newpro.model.qo.QcItemQoUpdate;
-import com.xkrs.newpro.service.QcItemService;
-import com.xkrs.newpro.utils.LocalDateUtils;
-import com.xkrs.newpro.utils.LocalStringUtils;
+import com.xkrs.model.entity.QcItemEntity;
+import com.xkrs.model.qo.QcItemQoDelete;
+import com.xkrs.model.qo.QcItemQoInsert;
+import com.xkrs.model.qo.QcItemQoUpdate;
+import com.xkrs.service.QcItemService;
+import com.xkrs.util.LocalDateUtils;
+import com.xkrs.util.LocalStringUtils;
 import org.springframework.context.i18n.LocaleContextHolder;
 import org.springframework.stereotype.Service;
 

src/main/java/com/xkrs/service/impl/QcSourceServiceImpl.java

@@ -1,16 +1,16 @@
-package com.xkrs.newpro.service.impl;
+package com.xkrs.service.impl;
 
 import com.xkrs.encapsulation.PromptMessageEnum;
 import com.xkrs.dao.QcItemDao;
 import com.xkrs.dao.QcSourceDao;
-import com.xkrs.newpro.model.entity.QcItemEntity;
-import com.xkrs.newpro.model.entity.QcSourceEntity;
-import com.xkrs.newpro.model.qo.QcSourceQoDelete;
-import com.xkrs.newpro.model.qo.QcSourceQoInsert;
-import com.xkrs.newpro.service.QcSourceService;
-import com.xkrs.newpro.utils.Constant;
-import com.xkrs.newpro.utils.LocalDateUtils;
-import com.xkrs.newpro.utils.LocalStringUtils;
+import com.xkrs.model.entity.QcItemEntity;
+import com.xkrs.model.entity.QcSourceEntity;
+import com.xkrs.model.qo.QcSourceQoDelete;
+import com.xkrs.model.qo.QcSourceQoInsert;
+import com.xkrs.service.QcSourceService;
+import com.xkrs.util.Constant;
+import com.xkrs.util.LocalDateUtils;
+import com.xkrs.util.LocalStringUtils;
 import com.xkrs.util.ExcelUploadUtil;
 import org.springframework.context.i18n.LocaleContextHolder;
 import org.springframework.stereotype.Service;

src/main/java/com/xkrs/service/impl/QcSpecServiceImpl.java

@@ -1,16 +1,16 @@
-package com.xkrs.newpro.service.impl;
+package com.xkrs.service.impl;
 
 import com.xkrs.encapsulation.PromptMessageEnum;
 import com.xkrs.dao.QcItemDao;
 import com.xkrs.dao.QcSpecDao;
-import com.xkrs.newpro.model.entity.QcItemEntity;
-import com.xkrs.newpro.model.entity.QcSpecEntity;
-import com.xkrs.newpro.model.qo.QcSpecQoDelete;
-import com.xkrs.newpro.model.qo.QcSpecQoInsert;
-import com.xkrs.newpro.model.qo.QcSpecQoUpdate;
-import com.xkrs.newpro.service.QcSpecService;
-import com.xkrs.newpro.utils.LocalDateUtils;
-import com.xkrs.newpro.utils.LocalStringUtils;
+import com.xkrs.model.entity.QcItemEntity;
+import com.xkrs.model.entity.QcSpecEntity;
+import com.xkrs.model.qo.QcSpecQoDelete;
+import com.xkrs.model.qo.QcSpecQoInsert;
+import com.xkrs.model.qo.QcSpecQoUpdate;
+import com.xkrs.service.QcSpecService;
+import com.xkrs.util.LocalDateUtils;
+import com.xkrs.util.LocalStringUtils;
 import org.springframework.context.i18n.LocaleContextHolder;
 import org.springframework.stereotype.Service;
 

src/main/java/com/xkrs/util/Constant.java

@@ -1,4 +1,4 @@
-package com.xkrs.newpro.utils;
+package com.xkrs.util;
 
 public interface Constant {
 

src/main/java/com/xkrs/util/LocalDateUtils.java

@@ -1,4 +1,4 @@
-package com.xkrs.newpro.utils;
+package com.xkrs.util;
 
 import java.util.Date;
 

src/main/java/com/xkrs/util/LocalStringUtils.java

@@ -1,4 +1,4 @@
-package com.xkrs.newpro.utils;
+package com.xkrs.util;
 
 public class LocalStringUtils {