From ed73b0fbf05a479bb8c44d6f93245c57211dbdc3 Mon Sep 17 00:00:00 2001
From: hecan <1718492867@qq.com>
Date: Wed, 29 May 2024 17:21:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A1=A3=E6=A1=88=E5=AF=B9=E7=85=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../generalData/dao/IGeneralDataDao.java      |  8 ++--
 .../dao/impl/GeneralDataDaoImpl.java          |  8 ++--
 .../generalData/entity/GeneralDataEntity.java |  2 +-
 .../service/IGeneralDataService.java          | 10 ++---
 .../service/impl/GeneralDataServiceImpl.java  | 38 +++++++++----------
 5 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/service/src/main/java/com/hzya/frame/sysnew/generalData/dao/IGeneralDataDao.java b/service/src/main/java/com/hzya/frame/sysnew/generalData/dao/IGeneralDataDao.java
index ec391b3a..e7f315c1 100644
--- a/service/src/main/java/com/hzya/frame/sysnew/generalData/dao/IGeneralDataDao.java
+++ b/service/src/main/java/com/hzya/frame/sysnew/generalData/dao/IGeneralDataDao.java
@@ -9,7 +9,7 @@ public interface IGeneralDataDao extends IBaseDao<GeneralDataEntity, String> {
 
     /**
      *
-     * @content 新增通用数据
+     * @content 新增档案对照
      * @Param
      * @Return
      * @Author hecan
@@ -19,7 +19,7 @@ public interface IGeneralDataDao extends IBaseDao<GeneralDataEntity, String> {
 
     /**
      *
-     * @content 查询通用数据
+     * @content 查询档案对照
      * @Param
      * @Return
      * @Author hecan
@@ -29,7 +29,7 @@ public interface IGeneralDataDao extends IBaseDao<GeneralDataEntity, String> {
 
     /**
      *
-     * @content 编辑通用数据
+     * @content 编辑档案对照
      * @Param
      * @Return
      * @Author hecan
@@ -39,7 +39,7 @@ public interface IGeneralDataDao extends IBaseDao<GeneralDataEntity, String> {
 
     /**
      *
-     * @content 删除通用数据
+     * @content 删除档案对照
      * @Param
      * @Return
      * @Author hecan
diff --git a/service/src/main/java/com/hzya/frame/sysnew/generalData/dao/impl/GeneralDataDaoImpl.java b/service/src/main/java/com/hzya/frame/sysnew/generalData/dao/impl/GeneralDataDaoImpl.java
index b94f80c0..914dacca 100644
--- a/service/src/main/java/com/hzya/frame/sysnew/generalData/dao/impl/GeneralDataDaoImpl.java
+++ b/service/src/main/java/com/hzya/frame/sysnew/generalData/dao/impl/GeneralDataDaoImpl.java
@@ -10,28 +10,28 @@ import java.util.List;
 
 @Repository(value = "generalDataDaoImpl")
 public class GeneralDataDaoImpl  extends MybatisGenericDao<GeneralDataEntity, String> implements IGeneralDataDao {
-   //新增通用数据
+   //新增档案对照
     @Override
     public GeneralDataEntity saveGeneralDataByType(GeneralDataEntity generalDataEntity) {
         generalDataEntity = super.save(getSqlIdPrifx() + "saveGeneralDataByType", generalDataEntity);
         return generalDataEntity;
     }
 
-    //查询通用数据
+    //查询档案对照
     @Override
     public List<GeneralDataEntity> queryGeneralData(GeneralDataEntity generalDataEntity) {
         List<GeneralDataEntity> query = super.query(getSqlIdPrifx() + "queryGeneralData", generalDataEntity);
         return query;
     }
 
-    //编辑通用数据
+    //编辑档案对照
     @Override
     public Integer updateGeneralDataByType(GeneralDataEntity generalDataEntity) {
         int update = super.update(getSqlIdPrifx() + "updateGeneralDataByType", generalDataEntity);
         return update;
     }
 
-    //删除通用数据
+    //删除档案对照
     @Override
     public Integer deleteGeneralDataByType(GeneralDataEntity generalDataEntity) {
         int update = super.update(getSqlIdPrifx() + "deleteGeneralDataByType", generalDataEntity);
diff --git a/service/src/main/java/com/hzya/frame/sysnew/generalData/entity/GeneralDataEntity.java b/service/src/main/java/com/hzya/frame/sysnew/generalData/entity/GeneralDataEntity.java
index 5aef2e9f..ac9bc603 100644
--- a/service/src/main/java/com/hzya/frame/sysnew/generalData/entity/GeneralDataEntity.java
+++ b/service/src/main/java/com/hzya/frame/sysnew/generalData/entity/GeneralDataEntity.java
@@ -4,7 +4,7 @@ import com.hzya.frame.web.entity.BaseEntity;
 
 /**
  * 
- * @content 通用数据接口实体类
+ * @content 档案对照实体类
  * @Param 
  * @Return 
  * @Author hecan 
diff --git a/service/src/main/java/com/hzya/frame/sysnew/generalData/service/IGeneralDataService.java b/service/src/main/java/com/hzya/frame/sysnew/generalData/service/IGeneralDataService.java
index df8dbd47..105511f6 100644
--- a/service/src/main/java/com/hzya/frame/sysnew/generalData/service/IGeneralDataService.java
+++ b/service/src/main/java/com/hzya/frame/sysnew/generalData/service/IGeneralDataService.java
@@ -9,7 +9,7 @@ public interface IGeneralDataService extends IBaseService<GeneralDataEntity, Str
     
     /**
      * 
-     * @content 新增通用数据
+     * @content 新增档案对照
      * @Param 
      * @Return 
      * @Author hecan 
@@ -19,7 +19,7 @@ public interface IGeneralDataService extends IBaseService<GeneralDataEntity, Str
 
     /**
      *
-     * @content 查询通用数据
+     * @content 查询档案对照
      * @Param
      * @Return
      * @Author hecan
@@ -29,7 +29,7 @@ public interface IGeneralDataService extends IBaseService<GeneralDataEntity, Str
 
     /**
      *
-     * @content 编辑通用数据
+     * @content 编辑档案对照
      * @Param
      * @Return
      * @Author hecan
@@ -39,7 +39,7 @@ public interface IGeneralDataService extends IBaseService<GeneralDataEntity, Str
 
     /**
      *
-     * @content 删除通用数据
+     * @content 删除档案对照
      * @Param
      * @Return
      * @Author hecan
@@ -49,7 +49,7 @@ public interface IGeneralDataService extends IBaseService<GeneralDataEntity, Str
 
     /**
      *
-     * @content 查询单个通用数据
+     * @content 查询单个档案对照
      * @Param
      * @Return
      * @Author hecan
diff --git a/service/src/main/java/com/hzya/frame/sysnew/generalData/service/impl/GeneralDataServiceImpl.java b/service/src/main/java/com/hzya/frame/sysnew/generalData/service/impl/GeneralDataServiceImpl.java
index 72a1778a..16095bc6 100644
--- a/service/src/main/java/com/hzya/frame/sysnew/generalData/service/impl/GeneralDataServiceImpl.java
+++ b/service/src/main/java/com/hzya/frame/sysnew/generalData/service/impl/GeneralDataServiceImpl.java
@@ -27,7 +27,7 @@ public class GeneralDataServiceImpl extends BaseService<GeneralDataEntity, Strin
         this.dao = dao;
     }
 
-    //新增通用数据
+    //新增档案对照
     @Override
     public JsonResultEntity saveEntity(JSONObject json) {
         JSONObject jsonObject = json.getJSONObject("jsonStr");
@@ -35,7 +35,7 @@ public class GeneralDataServiceImpl extends BaseService<GeneralDataEntity, Strin
             return BaseResult.getFailureMessageEntity("数据为空，请先传递数据");
         }
         if(!checkStr(jsonObject.getString("archivesType"))){
-            return BaseResult.getFailureMessageEntity("通用数据类型为空");
+            return BaseResult.getFailureMessageEntity("档案对照类型为空");
         }
         if(!checkStr(jsonObject.getString("leftCode"))){
             return BaseResult.getFailureMessageEntity("左编码为空");
@@ -103,12 +103,12 @@ public class GeneralDataServiceImpl extends BaseService<GeneralDataEntity, Strin
             GeneralDataEntity generalDataEntitySave = generalDataDao.saveGeneralDataByType(generalDataEntity);
             return BaseResult.getSuccessMessageEntity("新增成功",generalDataEntitySave);
         }catch (Exception e){
-            logger.info("通用数据新增错误:{}",e.getMessage());
-            return BaseResult.getFailureMessageEntity("新增失败",e.getMessage());
+            logger.info("档案对照新增错误:{}",e.getMessage());
+            return BaseResult.getFailureMessageEntity("新增失败");
         }
     }
 
-    //查询通用数据
+    //查询档案对照
     @Override
     public JsonResultEntity queryEntityPage(JSONObject json) {
         JSONObject jsonObject = json.getJSONObject("jsonStr");
@@ -116,7 +116,7 @@ public class GeneralDataServiceImpl extends BaseService<GeneralDataEntity, Strin
             return BaseResult.getFailureMessageEntity("数据为空，请先传递数据");
         }
         if(!checkStr(jsonObject.getString("archivesType"))){
-            return BaseResult.getFailureMessageEntity("通用数据类型为空");
+            return BaseResult.getFailureMessageEntity("档案对照类型为空");
         }
         /*if(!checkStr(jsonObject.getString("leftCode"))){
             return BaseResult.getFailureMessageEntity("左编码为空");
@@ -134,12 +134,12 @@ public class GeneralDataServiceImpl extends BaseService<GeneralDataEntity, Strin
             PageInfo pageInfo=new PageInfo(generalDataEntities);
             return BaseResult.getSuccessMessageEntity("查询成功",pageInfo);
         }catch (Exception e){
-            logger.info("通用数据查询错误：{}",e.getMessage());
-            return BaseResult.getFailureMessageEntity("查询失败",e.getMessage());
+            logger.info("档案对照查询错误：{}",e.getMessage());
+            return BaseResult.getFailureMessageEntity("查询失败");
         }
     }
 
-    //编辑通用数据
+    //编辑档案对照
     @Override
     public JsonResultEntity updateEntity(JSONObject json) {
         JSONObject jsonObject = json.getJSONObject("jsonStr");
@@ -150,7 +150,7 @@ public class GeneralDataServiceImpl extends BaseService<GeneralDataEntity, Strin
             return BaseResult.getFailureMessageEntity("id为空");
         }
         if(!checkStr(jsonObject.getString("archivesType"))){
-            return BaseResult.getFailureMessageEntity("通用数据类型为空");
+            return BaseResult.getFailureMessageEntity("档案对照类型为空");
         }
         /*if(!checkStr(jsonObject.getString("leftCode"))){
             return BaseResult.getFailureMessageEntity("左编码为空");
@@ -173,12 +173,12 @@ public class GeneralDataServiceImpl extends BaseService<GeneralDataEntity, Strin
             generalDataDao.updateGeneralDataByType(generalDataEntity);
             return BaseResult.getSuccessMessageEntity("编辑成功");
         }catch (Exception e){
-            logger.info("通用数据编辑失败:{}",e.getMessage());
-            return BaseResult.getFailureMessageEntity("编辑失败",e.getMessage());
+            logger.info("档案对照编辑失败:{}",e.getMessage());
+            return BaseResult.getFailureMessageEntity("编辑失败");
         }
     }
 
-    //删除通用数据
+    //删除档案对照
     @Override
     public JsonResultEntity deleteEntity(JSONObject json) {
         JSONObject jsonObject = json.getJSONObject("jsonStr");
@@ -189,7 +189,7 @@ public class GeneralDataServiceImpl extends BaseService<GeneralDataEntity, Strin
             return BaseResult.getFailureMessageEntity("id为空");
         }
         if(!checkStr(jsonObject.getString("archivesType"))){
-            return BaseResult.getFailureMessageEntity("通用数据类型为空");
+            return BaseResult.getFailureMessageEntity("档案对照类型为空");
         }
         /*if(!checkStr(jsonObject.getString("leftCode"))){
             return BaseResult.getFailureMessageEntity("左编码为空");
@@ -214,12 +214,12 @@ public class GeneralDataServiceImpl extends BaseService<GeneralDataEntity, Strin
            generalDataDao.deleteGeneralDataByType(generalDataEntity);
             return BaseResult.getSuccessMessageEntity("删除成功");
         }catch (Exception e){
-            logger.info("通用数据删除失败:{}",e.getMessage());
-            return BaseResult.getFailureMessageEntity("删除失败",e.getMessage());
+            logger.info("档案对照删除失败:{}",e.getMessage());
+            return BaseResult.getFailureMessageEntity("删除失败");
         }
     }
 
-    //查询单个通用数据对象
+    //查询单个档案对照对象
     @Override
     public JsonResultEntity getEntity(JSONObject json) {
         JSONObject jsonObject = json.getJSONObject("jsonStr");
@@ -234,8 +234,8 @@ public class GeneralDataServiceImpl extends BaseService<GeneralDataEntity, Strin
             GeneralDataEntity generalDataEntityOne = generalDataDao.queryOne(generalDataEntity);
             return BaseResult.getSuccessMessageEntity("查询单个成功",generalDataEntityOne);
         }catch (Exception e){
-            logger.info("查询单个通用数据错误:{}",e.getMessage());
-            return BaseResult.getSuccessMessageEntity("查询单个失败",e.getMessage());
+            logger.info("查询单个档案对照错误:{}",e.getMessage());
+            return BaseResult.getSuccessMessageEntity("查询单个失败");
         }
     }
 }