代码初始优化

ruoyi-admin/src/main/java/com/ruoyi/asset/controller/TbAssetInformationController.java

@@ -1,8 +1,15 @@
 package com.ruoyi.asset.controller;
 
+import java.util.ArrayList;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
+import cn.hutool.core.util.StrUtil;
+import com.ruoyi.asset.domain.TbLocation;
+import com.ruoyi.common.core.domain.entity.SysDept;
+import com.ruoyi.ptxlib.domain.PTXLabelCode;
+import com.ruoyi.ptxlib.domain.PTXLabelInfo;
+import com.ruoyi.ptxlib.domain.PTXLabelText;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -72,6 +79,69 @@ public class TbAssetInformationController extends BaseController
         return success(tbAssetInformationService.selectTbAssetInformationById(id));
     }
 
+    public AjaxResult print(TbAssetInformation tbAssetInformation) {
+        List<TbAssetInformation> tbAssetInformationList = tbAssetInformationService.selectInfoList(tbAssetInformation);
+        List<PTXLabelInfo> ptxLabelInfos = new ArrayList<>();
+
+//        for (TbAssetInformation assetInformation : tbAssetInformationList) {
+//            PTXLabelInfo labelInfo = new PTXLabelInfo();
+//            // 连接打印机
+//            labelInfo.setConnectType(0);
+//            labelInfo.setPrinterName("USB");
+//            // 字体加粗
+//            labelInfo.setIsBold(true);
+//
+//            String assetNumber = assetInformation.getNumber();
+//            String locationNumber = assetInformation.getLocationNumber();
+//            TbLocation tbLocation = locationService.selectTbLocationByNumber(locationNumber);
+//            String locationName = tbLocation.getName();
+//            String assetName = assetInformation.getName();
+//            String department = assetInformation.getDepartment();
+//            long deptId = Long.parseLong(department);
+//            SysDept sysDept = sysDeptService.selectDeptById(deptId);
+//            String deptName = sysDept.getDeptName();
+//            String assetModel = assetInformation.getSpecificationsModel();
+//            if (StrUtil.isBlank(assetModel)) {
+//                assetModel = "无";
+//            }
+//
+//            // 写入epc
+//            labelInfo.setEpc(assetNumber);
+//
+//            // 定义标题
+//            PTXLabelText title = new PTXLabelText(1, 80, 140, 60, 15, 15, "固定资产标识卡");
+//            // 定义资产编号
+//            PTXLabelText number = new PTXLabelText(1, 80, 10, 145, 10, 10, "资产编号：" + assetNumber);
+//            // 定义资产名称
+//            PTXLabelText name = new PTXLabelText(1, 80, 10, 205, 10, 10, "资产名称：" + assetName);
+//            // 定义存放地点
+//            PTXLabelText location = new PTXLabelText(1, 80, 450, 205, 10, 10, "存放地点：" + locationName);
+//            // 定义使用部门
+//            PTXLabelText dept = new PTXLabelText(1, 80, 10, 265, 10, 10, "使用部门：" + deptName);
+//            // 定义规格型号
+//            PTXLabelText model = new PTXLabelText(1, 80, 450, 265, 10, 10, "规格型号：" + assetModel);
+//            // 定义存放地点二维码
+//            PTXLabelCode code = new PTXLabelCode(2, 80, 140, 355, 10, locationNumber);
+//
+//            List<PTXLabelText> ptxLabelTexts = new ArrayList<>();
+//            ptxLabelTexts.add(title);
+//            ptxLabelTexts.add(number);
+//            ptxLabelTexts.add(name);
+//            ptxLabelTexts.add(location);
+//            ptxLabelTexts.add(dept);
+//            ptxLabelTexts.add(model);
+//
+//            List<PTXLabelCode> ptxLabelCodes = new ArrayList<>();
+//            ptxLabelCodes.add(code);
+//
+//            labelInfo.setPtxLabelTexts(ptxLabelTexts);
+//            labelInfo.setPtxLabelCodes(ptxLabelCodes);
+//
+//            ptxService.printLabel(labelInfo);
+//        }
+        return null;
+    }
+
     /**
      * 新增资产信息
      */

ruoyi-admin/src/main/java/com/ruoyi/asset/domain/TbAssetInformation.java

@@ -43,7 +43,7 @@ public class TbAssetInformation extends BaseEntity
     private String number;
 
     /** 图片路径 */
-    //@Excel(name = "图片路径")
+//    @Excel(name = "图片路径")
     private String imageUrl;
 
     /** 资产分类编号 */
@@ -51,15 +51,15 @@ public class TbAssetInformation extends BaseEntity
     private String categoryNumber;
 
     /** 规格型号 */
-    //@Excel(name = "规格型号")
+    @Excel(name = "规格型号")
     private String specificationsModel;
 
     /** ABC分类 */
-    //@Excel(name = "ABC分类")
+    @Excel(name = "ABC分类")
     private String abcCategory;
 
     /** 管理状态，0：闲置 */
-    //@Excel(name = "管理状态，0：闲置")
+    @Excel(name = "管理状态，0：闲置")
     private Long manageStatus;
 
     /** 使用部门 */
@@ -71,7 +71,7 @@ public class TbAssetInformation extends BaseEntity
     private String department;
 
     /** 责任人 */
-    //@Excel(name = "责任人")
+    @Excel(name = "责任人")
     private String responsiblePerson;
 
     /** 所在位置编号 */
@@ -79,79 +79,79 @@ public class TbAssetInformation extends BaseEntity
     private String locationNumber;
 
     /** 资产性质 */
-    //@Excel(name = "资产性质")
+    @Excel(name = "资产性质")
     private String property;
 
     /** 购置日期 */
     @JsonFormat(pattern = "yyyy-MM-dd")
-    //@Excel(name = "购置日期", width = 30, dateFormat = "yyyy-MM-dd")
+    @Excel(name = "购置日期", width = 40, dateFormat = "yyyy-MM-dd")
     private Date purchaseDate;
 
     /** 启用日期 */
     @JsonFormat(pattern = "yyyy-MM-dd")
-    //@Excel(name = "启用日期", width = 30, dateFormat = "yyyy-MM-dd")
+    @Excel(name = "启用日期", width = 40, dateFormat = "yyyy-MM-dd")
     private Date commissioningDate;
 
     /** 原值（元） */
-    //@Excel(name = "原值", readConverterExp = "元=")
+    @Excel(name = "原值", readConverterExp = "元=")
     private Double originalValue;
 
     /** 使用年限 */
-   // @Excel(name = "使用年限")
+    @Excel(name = "使用年限")
     private Long durableYears;
 
     /** 净值（元） */
-    //@Excel(name = "净值", readConverterExp = "元=")
+    @Excel(name = "净值", readConverterExp = "元=")
     private Double netValue;
 
     /** 残值（元） */
-   // @Excel(name = "残值", readConverterExp = "元=")
+    @Excel(name = "残值", readConverterExp = "元=")
     private Double residualValue;
 
     /** 累计折旧（元） */
-   // @Excel(name = "累计折旧", readConverterExp = "元=")
+    @Excel(name = "累计折旧", readConverterExp = "元=")
     private Double accumulatedDepreciation;
 
     /** 最近折旧日期 */
     @JsonFormat(pattern = "yyyy-MM-dd")
-    //@Excel(name = "最近折旧日期", width = 30, dateFormat = "yyyy-MM-dd")
+    @Excel(name = "最近折旧日期", width = 40, dateFormat = "yyyy-MM-dd")
     private Date lastDepreciationDate;
 
     /** 折旧方式，0：其他 */
-    //@Excel(name = "折旧方式，0：其他")
+    @Excel(name = "折旧方式，0：其他", width = 26)
     private Long depreciationMethod;
 
     /** 合同编号 */
-    //@Excel(name = "合同编号")
+    @Excel(name = "合同编号")
     private String contractNumber;
 
     /** 出厂编号 */
-   // @Excel(name = "出厂编号")
+    @Excel(name = "出厂编号")
     private String factoryNumber;
 
     /** 制造商 */
-    //@Excel(name = "制造商")
+    @Excel(name = "制造商")
     private String manufacturer;
 
     /** 供应商 */
-   // @Excel(name = "供应商")
+    @Excel(name = "供应商")
     private String supplier;
 
     /** 资产用途 */
-   // @Excel(name = "资产用途")
+    @Excel(name = "资产用途")
     private String purpose;
 
     /** 维保到期日期 */
     @JsonFormat(pattern = "yyyy-MM-dd")
-   // @Excel(name = "维保到期日期", width = 30, dateFormat = "yyyy-MM-dd")
+    @Excel(name = "维保到期日期", width = 40, dateFormat = "yyyy-MM-dd")
     private Date maintenanceDate;
 
     /** 维修电话 */
-   // @Excel(name = "维修电话")
+    @Excel(name = "维修电话")
     private String maintenanceTel;
 
     /** 维修人员 */
-   // @Excel(name = "维修人员")
+    @Excel(name = "维修人员")
     private String maintenanceUser;
 
     /** 所属公司 */
@@ -159,15 +159,15 @@ public class TbAssetInformation extends BaseEntity
     private String corporation;
 
     /** 记录状态，0：未提交，1：已提交 */
-   // @Excel(name = "记录状态，0：未提交，1：已提交")
+    @Excel(name = "记录状态，0：未提交，1：已提交", width = 30)
     private Long recordStatus;
 
-    /** 预留字段a */
-  //  @Excel(name = "是否白名单")
+    /** 是否白名单 */
+    @Excel(name = "是否白名单，Y：是，N：否", width = 30)
     private String isWhitelist;
 
     /** 预留字段b */
-   // @Excel(name = "预留字段b")
+//    @Excel(name = "预留字段b")
     private String reservedColumnB;
 
     /** 预留字段c */

ruoyi-admin/src/main/java/com/ruoyi/asset/service/ITbAssetInformationService.java

@@ -33,7 +33,7 @@ public interface ITbAssetInformationService
      * @param tbAssetInformation 资产信息
      * @return 资产信息集合
      */
-    public List<TbAssetInformation> selectTbAssetInformationList(TbAssetInformation tbAssetInformation);
+    List<TbAssetInformation> selectTbAssetInformationList(TbAssetInformation tbAssetInformation);
 
     List<TbAssetInformation> selectInfoList(TbAssetInformation tbAssetInformation);
 
@@ -43,7 +43,7 @@ public interface ITbAssetInformationService
      * @param tbAssetInformation 资产信息
      * @return 结果
      */
-    public int insertTbAssetInformation(TbAssetInformation tbAssetInformation);
+    int insertTbAssetInformation(TbAssetInformation tbAssetInformation);
 
     /**
      * 修改资产信息
@@ -51,7 +51,7 @@ public interface ITbAssetInformationService
      * @param tbAssetInformation 资产信息
      * @return 结果
      */
-    public int updateTbAssetInformation(TbAssetInformation tbAssetInformation);
+    int updateTbAssetInformation(TbAssetInformation tbAssetInformation);
 
     /**
      * 批量删除资产信息
@@ -59,7 +59,7 @@ public interface ITbAssetInformationService
      * @param ids 需要删除的资产信息主键集合
      * @return 结果
      */
-    public int deleteTbAssetInformationByIds(Long[] ids);
+    int deleteTbAssetInformationByIds(Long[] ids);
 
     /**
      * 删除资产信息信息

ruoyi-admin/src/main/java/com/ruoyi/asset/service/impl/TbAssetInformationServiceImpl.java

@@ -8,12 +8,17 @@ import java.util.Set;
 import cn.hutool.core.collection.ListUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
+import com.ruoyi.asset.domain.TbLocation;
 import com.ruoyi.asset.mapper.TbLocationMapper;
+import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.bean.BeanValidators;
+import com.ruoyi.ptxlib.domain.PTXLabelCode;
+import com.ruoyi.ptxlib.domain.PTXLabelInfo;
+import com.ruoyi.ptxlib.domain.PTXLabelText;
 import com.ruoyi.utils.RecursionUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.StringRedisTemplate;

ruoyi-admin/src/main/java/com/ruoyi/asset/service/impl/TbLocationServiceImpl.java

@@ -173,10 +173,12 @@ public class TbLocationServiceImpl implements ITbLocationService
         if (flag < 1) {
             return flag;
         }
-        createQrCodeDataByLocation(tbLocation);
 
         String sequence = getSequence(parentId, tbLocation.getId());
         tbLocation.setSequence(sequence);
+
+        createQrCodeDataByLocation(tbLocation);
+
         return tbLocationMapper.updateTbLocation(tbLocation);
     }
 

ruoyi-admin/src/main/resources/application-druid.yml

@@ -6,10 +6,11 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://139.9.50.163:3306/rfid-hotel-manager?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-                #url: jdbc:mysql://127.0.0.1:3306/rfid-hotel-manager?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                #url: jdbc:mysql://139.9.50.163:3306/rfid-hotel-manager?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://127.0.0.1:3306/rfid-hotel-manager?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: root
-                password: ydl@123456
+                password: mysql@123456
+                #password: ydl@123456
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭

ruoyi-admin/src/main/resources/application.yml

@@ -77,13 +77,13 @@ spring:
   # redis 配置
   redis:
     # 地址
-    host: 139.9.50.163
+    host: 127.0.0.1
     # 密码
-    password: foobared
+    password: redis@123456
     # 端口，默认为6379
     port: 6379
     # 数据库索引
-    database: 2
+    database: 1
     # 连接超时时间
     timeout: 10s
     lettuce:

ruoyi-common/src/main/java/com/ruoyi/common/utils/FiledUtils.java

@@ -0,0 +1,35 @@
+package com.ruoyi.common.utils;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+
+/**
+ * 类工具
+ */
+public class FiledUtils {
+    public static Object getFiledValueByName(Object o, String filedName) {
+        try {
+            String firstLetter = filedName.substring(0, 1).toUpperCase();
+            String getter = "get" + firstLetter + filedName.substring(1);
+            Method method = o.getClass().getMethod(getter);
+            return method.invoke(o);
+        } catch (Exception e) {
+            return null;
+        }
+    }
+
+    public static void setFiledValuesByName(Object o, String filedName, Object filedValue) {
+        try {
+            // 获取o类的字节文件对象
+            Class<?> oClass = o.getClass();
+            // 获取该类的成员变量
+            Field field = oClass.getDeclaredField(filedName);
+            // 取消语言访问检查
+            field.setAccessible(true);
+            // 给变量赋值
+            field.set(o, filedValue);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+}