Merge remote-tracking branch 'origin/develop' into develop

lzbi-module/src/main/java/com/lzbi/asset/service/DcBaseAssetInfoService.java

@@ -5,8 +5,10 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.lzbi.asset.domain.DcBaseAssetInfo;
 import com.lzbi.asset.mapper.DcBaseAssetInfoMapper;
 import com.lzbi.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.HashMap;
 import java.util.List;
 
 /**
@@ -19,6 +21,8 @@ import java.util.List;
 public class DcBaseAssetInfoService extends ServiceImpl<DcBaseAssetInfoMapper, DcBaseAssetInfo> implements IService<DcBaseAssetInfo>
 {
 
+    @Autowired
+    private DcBaseAssetInfoMapper dcBaseAssetInfoMapper;
     /**
      * 查询资产信息
      * 
@@ -27,7 +31,7 @@ public class DcBaseAssetInfoService extends ServiceImpl<DcBaseAssetInfoMapper, D
      */
     public DcBaseAssetInfo selectDcBaseAssetInfoById(Long id)
     {
-        return baseMapper.selectDcBaseAssetInfoById(id);
+        return dcBaseAssetInfoMapper.selectDcBaseAssetInfoById(id);
     }
 
     /**
@@ -38,7 +42,7 @@ public class DcBaseAssetInfoService extends ServiceImpl<DcBaseAssetInfoMapper, D
      */
     public List<DcBaseAssetInfo> selectDcBaseAssetInfoList(DcBaseAssetInfo dcBaseAssetInfo)
     {
-        return baseMapper.selectDcBaseAssetInfoList(dcBaseAssetInfo);
+        return dcBaseAssetInfoMapper.selectDcBaseAssetInfoList(dcBaseAssetInfo);
     }
 
     /**
@@ -51,7 +55,7 @@ public class DcBaseAssetInfoService extends ServiceImpl<DcBaseAssetInfoMapper, D
     public int insertDcBaseAssetInfo(DcBaseAssetInfo dcBaseAssetInfo)
     {
         dcBaseAssetInfo.setCreatedTime(DateUtils.getNowDate());
-        return baseMapper.insertDcBaseAssetInfo(dcBaseAssetInfo);
+        return dcBaseAssetInfoMapper.insertDcBaseAssetInfo(dcBaseAssetInfo);
     }
 
     /**
@@ -64,7 +68,7 @@ public class DcBaseAssetInfoService extends ServiceImpl<DcBaseAssetInfoMapper, D
     public int updateDcBaseAssetInfo(DcBaseAssetInfo dcBaseAssetInfo)
     {
         dcBaseAssetInfo.setUpdatedTime(DateUtils.getNowDate());
-        return baseMapper.updateDcBaseAssetInfo(dcBaseAssetInfo);
+        return dcBaseAssetInfoMapper.updateDcBaseAssetInfo(dcBaseAssetInfo);
     }
 
     /**
@@ -76,7 +80,7 @@ public class DcBaseAssetInfoService extends ServiceImpl<DcBaseAssetInfoMapper, D
 
     public int deleteDcBaseAssetInfoByIds(Long[] ids)
     {
-        return baseMapper.deleteDcBaseAssetInfoByIds(ids);
+        return dcBaseAssetInfoMapper.deleteDcBaseAssetInfoByIds(ids);
     }
 
     /**
@@ -88,12 +92,16 @@ public class DcBaseAssetInfoService extends ServiceImpl<DcBaseAssetInfoMapper, D
 
     public int deleteDcBaseAssetInfoById(Long id)
     {
-        return baseMapper.deleteDcBaseAssetInfoById(id);
+        return dcBaseAssetInfoMapper.deleteDcBaseAssetInfoById(id);
     }
 
 
     public DcBaseAssetInfo selectDcBaseAssetInfoByCode(String  assetCode) {
-        return baseMapper.selectDcBaseAssetInfoByCode(assetCode);
+        return dcBaseAssetInfoMapper.selectDcBaseAssetInfoByCode(assetCode);
+    }
+
+    public HashMap<String,String> selectDcBaseAssetInfoMap(){
+        return dcBaseAssetInfoMapper.selectDcBaseAssetInfoMap();
     }
 
 

lzbi-module/src/main/java/com/lzbi/asset/service/IDcBaseAssetInfoService.java

@@ -1,65 +0,0 @@
-package com.lzbi.asset.service;
-
-
-import com.lzbi.asset.domain.DcBaseAssetInfo;
-
-import java.util.HashMap;
-import java.util.List;
-
-/**
- * 资产信息Service接口
- *
- * @author Lu.JL
- * @date 2023-11-27
- */
-public interface IDcBaseAssetInfoService {
-    /**
-     * 查询资产信息
-     *
-     * @param id 资产信息主键
-     * @return 资产信息
-     */
-    public DcBaseAssetInfo selectDcBaseAssetInfoById(Long id);
-    public DcBaseAssetInfo selectDcBaseAssetInfoByCode(String assetCode);
-    //add by zhousq 2023-12-12 获取资产信息Map映射便于存储查询
-    public HashMap<String,String> selectDcBaseAssetInfoMap();
-    /**
-     * 查询资产信息列表
-     *
-     * @param dcBaseAssetInfo 资产信息
-     * @return 资产信息集合
-     */
-    public List<DcBaseAssetInfo> selectDcBaseAssetInfoList(DcBaseAssetInfo dcBaseAssetInfo);
-
-    /**
-     * 新增资产信息
-     *
-     * @param dcBaseAssetInfo 资产信息
-     * @return 结果
-     */
-    public int insertDcBaseAssetInfo(DcBaseAssetInfo dcBaseAssetInfo);
-
-    /**
-     * 修改资产信息
-     *
-     * @param dcBaseAssetInfo 资产信息
-     * @return 结果
-     */
-    public int updateDcBaseAssetInfo(DcBaseAssetInfo dcBaseAssetInfo);
-
-    /**
-     * 批量删除资产信息
-     *
-     * @param ids 需要删除的资产信息主键集合
-     * @return 结果
-     */
-    public int deleteDcBaseAssetInfoByIds(Long[] ids);
-
-    /**
-     * 删除资产信息信息
-     *
-     * @param id 资产信息主键
-     * @return 结果
-     */
-    public int deleteDcBaseAssetInfoById(Long id);
-}

lzbi-module/src/main/java/com/lzbi/asset/service/impl/DcBaseAssetInfoServiceImpl.java

@@ -1,95 +0,0 @@
-package com.lzbi.asset.service.impl;
-
-import java.util.HashMap;
-import java.util.List;
-
-import com.lzbi.asset.domain.DcBaseAssetInfo;
-import com.lzbi.asset.mapper.DcBaseAssetInfoMapper;
-import com.lzbi.asset.service.IDcBaseAssetInfoService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-/**
- * 资产信息Service业务层处理
- *
- * @author Lu.JL
- * @date 2023-11-27
- */
-@Service
-public class DcBaseAssetInfoServiceImpl implements IDcBaseAssetInfoService {
-    @Autowired
-    private DcBaseAssetInfoMapper dcBaseAssetInfoMapper;
-
-    /**
-     * 查询资产信息
-     *
-     * @param id 资产信息主键
-     * @return 资产信息
-     */
-    @Override
-    public DcBaseAssetInfo selectDcBaseAssetInfoById(Long id) {
-        return dcBaseAssetInfoMapper.selectDcBaseAssetInfoById(id);
-    }
-    @Override
-    public DcBaseAssetInfo selectDcBaseAssetInfoByCode(String  assetCode) {
-        return dcBaseAssetInfoMapper.selectDcBaseAssetInfoByCode(assetCode);
-    }
-    @Override
-    public HashMap<String,String> selectDcBaseAssetInfoMap(){
-        return dcBaseAssetInfoMapper.selectDcBaseAssetInfoMap();
-    }
-    /**
-     * 查询资产信息列表
-     *
-     * @param dcBaseAssetInfo 资产信息
-     * @return 资产信息
-     */
-    @Override
-    public List<DcBaseAssetInfo> selectDcBaseAssetInfoList(DcBaseAssetInfo dcBaseAssetInfo) {
-        return dcBaseAssetInfoMapper.selectDcBaseAssetInfoList(dcBaseAssetInfo);
-    }
-
-    /**
-     * 新增资产信息
-     *
-     * @param dcBaseAssetInfo 资产信息
-     * @return 结果
-     */
-    @Override
-    public int insertDcBaseAssetInfo(DcBaseAssetInfo dcBaseAssetInfo) {
-        return dcBaseAssetInfoMapper.insertDcBaseAssetInfo(dcBaseAssetInfo);
-    }
-
-    /**
-     * 修改资产信息
-     *
-     * @param dcBaseAssetInfo 资产信息
-     * @return 结果
-     */
-    @Override
-    public int updateDcBaseAssetInfo(DcBaseAssetInfo dcBaseAssetInfo) {
-        return dcBaseAssetInfoMapper.updateDcBaseAssetInfo(dcBaseAssetInfo);
-    }
-
-    /**
-     * 批量删除资产信息
-     *
-     * @param ids 需要删除的资产信息主键
-     * @return 结果
-     */
-    @Override
-    public int deleteDcBaseAssetInfoByIds(Long[] ids) {
-        return dcBaseAssetInfoMapper.deleteDcBaseAssetInfoByIds(ids);
-    }
-
-    /**
-     * 删除资产信息信息
-     *
-     * @param id 资产信息主键
-     * @return 结果
-     */
-    @Override
-    public int deleteDcBaseAssetInfoById(Long id) {
-        return dcBaseAssetInfoMapper.deleteDcBaseAssetInfoById(id);
-    }
-}