Merge remote-tracking branch 'origin/feature/1.0.0' into feature/1.0.0

abi-cloud-qr-platform-common/src/main/java/com/abi/task/common/tablestore/common/TableStoreReq.java

@@ -133,7 +133,7 @@ public class TableStoreReq<T extends TableStoreEntity> {
      * @param fieldValue
      * @return
      */
-    public TableStoreReq<T> equal(Object fieldValue){
+    public TableStoreReq<T> eq(Object fieldValue){
         this.setFieldValue(fieldValue);
         return this;
     }

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/impl/FactoryServiceImpl.java

@@ -86,36 +86,36 @@ public class FactoryServiceImpl implements FactoryService {
         }
 
         //1-声明对象
-        BaseFactory dept = null;
+        BaseFactory factory = null;
         if (req.getId() != null) {
-            dept = baseFactoryMapper.selectById(req.getId());
-            AssertUtil.isNull(dept, "供应商不存在");
+            factory = baseFactoryMapper.selectById(req.getId());
+            AssertUtil.isNull(factory, "供应商不存在");
         } else {
-            dept = new BaseFactory();
+            factory = new BaseFactory();
         }
 
         //2-放入数据
-        dept.setFactoryCode(req.getFactoryCode());
-        dept.setFactoryName(req.getFactoryName());
-        dept.setFactoryType(req.getFactoryType());
-        dept.setDescription(req.getDescription());
+        factory.setFactoryCode(req.getFactoryCode());
+        factory.setFactoryName(req.getFactoryName());
+        factory.setFactoryType(req.getFactoryType());
+        factory.setDescription(req.getDescription());
         if (FactoryTypeEnum.COVER.is(req.getFactoryType())) {
-            dept.setKeymanName(req.getKeymanName());
-            dept.setKeymanMobile(req.getKeymanMobile());
-            dept.setEmail(req.getEmail());
-            dept.setMaxFileCount(req.getMaxFileCount());
-            dept.setFactoryLevel(req.getFactoryLevel());
-            dept.setProvince(req.getProvince());
-            dept.setCity(req.getCity());
-            dept.setDistrict(req.getDistrict());
-            dept.setAddress(req.getAddress());
+            factory.setKeymanName(req.getKeymanName());
+            factory.setKeymanMobile(req.getKeymanMobile());
+            factory.setEmail(req.getEmail());
+            factory.setMaxFileCount(req.getMaxFileCount());
+            factory.setFactoryLevel(req.getFactoryLevel());
+            factory.setProvince(req.getProvince());
+            factory.setCity(req.getCity());
+            factory.setDistrict(req.getDistrict());
+            factory.setAddress(req.getAddress());
         }
 
         //3-新增or修改
         if (req.getId() != null) {
-            baseFactoryMapper.updateById(dept);
+            baseFactoryMapper.updateById(factory);
         } else {
-            baseFactoryMapper.insert(dept);
+            baseFactoryMapper.insert(factory);
         }
 
     }

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/impl/UserManagerServiceImpl.java

@@ -1,6 +1,5 @@
 package com.abi.qms.platform.service.impl;
 
-import cn.hutool.core.util.ObjectUtil;
 import com.abi.qms.platform.dao.entity.BaseFactory;
 import com.abi.qms.platform.dao.entity.UserInfo;
 import com.abi.qms.platform.dao.entity.UserMappingInfoRole;

abi-cloud-qr-platform-server/src/test/java/com/abi/qms/platform/TableStorePlusTest.java

@@ -2,7 +2,6 @@ package com.abi.qms.platform;
 
 import com.abi.qms.platform.dao.tablestore.entity.QrCode;
 import com.abi.task.common.tablestore.TableStorePlusUtils;
-import com.abi.task.common.tablestore.common.TableStoreEntity;
 import com.abi.task.common.tablestore.common.TableStoreReq;
 import com.abi.task.common.tablestore.common.TableStoreRes;
 import com.abi.task.common.tablestore.entity.DemoEntity;
@@ -72,7 +71,7 @@ public class TableStorePlusTest {
     @Test
     public void queryRowsEqual(){
         TableStoreReq<QrCode> req = TableStoreReq.build(QrCode.class,"packageId")
-                .equal("1")
+                .eq("1")
                 .page(1,3)
                 .isNeedTotalCount();