初始化项目

ema-admin/src/main/java/com/ema/admin/modules/assets/controller/AssetStatusHistoryController.java

@@ -11,6 +11,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.beans.factory.annotation.Autowired;
 import com.ema.admin.modules.assets.entity.AssetStatusHistory;
 import com.ema.admin.modules.assets.service.AssetStatusHistoryService;
+import com.ema.admin.modules.assets.vo.AssetStatusHistoryQueryVo;
 import org.springframework.web.bind.annotation.RestController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -102,4 +103,16 @@ public class AssetStatusHistoryController {
         return assetStatusHistoryService.getById(id);
     }
 
+    /**
+     * 分页查询。
+     *
+     * @param queryVo 查询条件
+     * @return 分页结果
+     */
+    @PostMapping("page")
+    @ApiOperation("分页查询")
+    public Page<AssetStatusHistory> page(@RequestBody @ApiParam("查询条件") AssetStatusHistoryQueryVo queryVo) {
+        return assetStatusHistoryService.page(queryVo);
+    }
+
 }

ema-admin/src/main/java/com/ema/admin/modules/assets/service/AssetStatusHistoryService.java

@@ -1,7 +1,9 @@
 package com.ema.admin.modules.assets.service;
 
+import com.mybatisflex.core.paginate.Page;
 import com.mybatisflex.core.service.IService;
 import com.ema.admin.modules.assets.entity.AssetStatusHistory;
+import com.ema.admin.modules.assets.vo.AssetStatusHistoryQueryVo;
 import java.util.List;
 
 /**
@@ -20,4 +22,12 @@ public interface AssetStatusHistoryService extends IService<AssetStatusHistory>
      */
     List<AssetStatusHistory> listByAssetId(String assetId);
 
+    /**
+     * 分页查询
+     *
+     * @param queryVo 查询条件
+     * @return 分页结果
+     */
+    Page<AssetStatusHistory> page(AssetStatusHistoryQueryVo queryVo);
+
 }

ema-admin/src/main/java/com/ema/admin/modules/assets/service/impl/AssetStatusHistoryServiceImpl.java

@@ -1,10 +1,12 @@
 package com.ema.admin.modules.assets.service.impl;
 
+import com.mybatisflex.core.paginate.Page;
 import com.mybatisflex.core.query.QueryWrapper;
 import com.mybatisflex.spring.service.impl.ServiceImpl;
 import com.ema.admin.modules.assets.entity.AssetStatusHistory;
 import com.ema.admin.modules.assets.mapper.AssetStatusHistoryMapper;
 import com.ema.admin.modules.assets.service.AssetStatusHistoryService;
+import com.ema.admin.modules.assets.vo.AssetStatusHistoryQueryVo;
 import org.springframework.stereotype.Service;
 import java.util.List;
 
@@ -24,4 +26,29 @@ public class AssetStatusHistoryServiceImpl extends ServiceImpl<AssetStatusHistor
                 .orderBy(AssetStatusHistory::getOperatorDate, false);
         return list(queryWrapper);
     }
+
+    @Override
+    public Page<AssetStatusHistory> page(AssetStatusHistoryQueryVo queryVo) {
+        QueryWrapper queryWrapper = QueryWrapper.create();
+        
+        if (queryVo.getAssetId() != null && !queryVo.getAssetId().isEmpty()) {
+            queryWrapper.eq(AssetStatusHistory::getAssetId, queryVo.getAssetId());
+        }
+        if (queryVo.getUseStatus() != null && !queryVo.getUseStatus().isEmpty()) {
+            queryWrapper.eq(AssetStatusHistory::getUseStatus, queryVo.getUseStatus());
+        }
+        if (queryVo.getUseDept() != null && !queryVo.getUseDept().isEmpty()) {
+            queryWrapper.like(AssetStatusHistory::getUseDept, queryVo.getUseDept());
+        }
+        if (queryVo.getUseUser() != null && !queryVo.getUseUser().isEmpty()) {
+            queryWrapper.like(AssetStatusHistory::getUseUser, queryVo.getUseUser());
+        }
+        
+        queryWrapper.orderBy(AssetStatusHistory::getOperatorDate, false);
+        
+        int pageNumber = queryVo.getPageNumber() != null ? queryVo.getPageNumber() : 1;
+        int pageSize = queryVo.getPageSize() != null ? queryVo.getPageSize() : 10;
+        
+        return paginate(pageNumber, pageSize, queryWrapper);
+    }
 }

ema-admin/src/main/java/com/ema/admin/modules/assets/vo/AssetStatusHistoryQueryVo.java

@@ -0,0 +1,38 @@
+package com.ema.admin.modules.assets.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 资产状态历史查询条件VO
+ *
+ * @author LIJIAN
+ * @since 2026-05-13
+ */
+@Data
+@ApiModel("资产状态历史查询参数")
+public class AssetStatusHistoryQueryVo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("资产ID")
+    private String assetId;
+
+    @ApiModelProperty("使用状态")
+    private String useStatus;
+
+    @ApiModelProperty("使用部门")
+    private String useDept;
+
+    @ApiModelProperty("使用人")
+    private String useUser;
+
+    @ApiModelProperty("页码")
+    private Integer pageNumber = 1;
+
+    @ApiModelProperty("每页条数")
+    private Integer pageSize = 10;
+}

ema-admin/src/main/resources/web/js/config.js

@@ -115,6 +115,16 @@ var Config = {
             update: '/assetsInfo/update',
             remove: '/assetsInfo/remove',
             getInfo: '/assetsInfo/getInfo'
+        },
+
+        // 资产状态历史
+        assetStatusHistory: {
+            list: '/assetStatusHistory/list',
+            page: '/assetStatusHistory/page',
+            save: '/assetStatusHistory/save',
+            update: '/assetStatusHistory/update',
+            remove: '/assetStatusHistory/remove',
+            getInfo: '/assetStatusHistory/getInfo'
         }
     },
 

ema-admin/src/main/resources/web/pages/assets/asset_status_history_form.html

@@ -0,0 +1,149 @@
+<!DOCTYPE html>
+<html lang="zh-CN">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>资产状态历史表单</title>
+    <link rel="stylesheet" href="../../lib/layui/css/layui.css">
+    <style>
+        body { padding: 20px; }
+        .required { color: #ff5722; }
+        .layui-form-label { width: 120px; }
+        .layui-input-block { margin-left: 150px; }
+    </style>
+</head>
+<body>
+    <form class="layui-form" lay-filter="historyForm" id="historyForm">
+        <input type="hidden" name="id" id="historyId">
+        <input type="hidden" name="assetId" id="assetId">
+        
+        <div class="layui-form-item">
+            <label class="layui-form-label"><span class="required">*</span>使用公司</label>
+            <div class="layui-input-block">
+                <input type="text" name="useCompany" lay-verify="required" placeholder="请输入使用公司" class="layui-input" style="width: 300px;">
+            </div>
+        </div>
+        
+        <div class="layui-form-item">
+            <label class="layui-form-label"><span class="required">*</span>使用部门</label>
+            <div class="layui-input-block">
+                <input type="text" name="useDept" lay-verify="required" placeholder="请输入使用部门" class="layui-input" style="width: 300px;">
+            </div>
+        </div>
+        
+        <div class="layui-form-item">
+            <label class="layui-form-label"><span class="required">*</span>使用人</label>
+            <div class="layui-input-block">
+                <input type="text" name="useUser" lay-verify="required" placeholder="请输入使用人" class="layui-input" style="width: 200px;">
+            </div>
+        </div>
+        
+        <div class="layui-form-item">
+            <label class="layui-form-label"><span class="required">*</span>使用状态</label>
+            <div class="layui-input-block">
+                <select name="useStatus" lay-verify="required" class="layui-select" style="width: 200px;">
+                    <option value="">请选择使用状态</option>
+                    <option value="在库">在库</option>
+                    <option value="正常使用">正常使用</option>
+                    <option value="已转移">已转移</option>
+                    <option value="报废中">报废中</option>
+                    <option value="维修中">维修中</option>
+                </select>
+            </div>
+        </div>
+        
+        <div class="layui-form-item">
+            <label class="layui-form-label">当前位置</label>
+            <div class="layui-input-block">
+                <input type="text" name="curLocation" placeholder="请输入当前位置" class="layui-input" style="width: 300px;">
+            </div>
+        </div>
+        
+        <div class="layui-form-item">
+            <label class="layui-form-label">生效开始日期</label>
+            <div class="layui-input-block">
+                <input type="text" name="startDate" id="startDate" placeholder="yyyy-MM-dd" class="layui-input" style="width: 200px;">
+            </div>
+        </div>
+        
+        <div class="layui-form-item">
+            <label class="layui-form-label">生效结束日期</label>
+            <div class="layui-input-block">
+                <input type="text" name="endDate" id="endDate" placeholder="yyyy-MM-dd" class="layui-input" style="width: 200px;">
+            </div>
+        </div>
+        
+        <div class="layui-form-item">
+            <label class="layui-form-label">操作人</label>
+            <div class="layui-input-block">
+                <input type="text" name="operatorName" placeholder="请输入操作人" class="layui-input" style="width: 200px;">
+            </div>
+        </div>
+        
+        <div class="layui-form-item">
+            <label class="layui-form-label">协管员</label>
+            <div class="layui-input-block">
+                <input type="text" name="assistantName" placeholder="请输入协管员" class="layui-input" style="width: 200px;">
+            </div>
+        </div>
+        
+        <div class="layui-form-item">
+            <label class="layui-form-label">备注</label>
+            <div class="layui-input-block">
+                <textarea name="remark" placeholder="请输入备注" class="layui-textarea" style="width: 350px; height: 80px;"></textarea>
+            </div>
+        </div>
+        
+        <div class="layui-form-item">
+            <div class="layui-input-block">
+                <button type="submit" class="layui-btn" lay-submit lay-filter="submitForm">提交</button>
+            </div>
+        </div>
+    </form>
+    
+    <script src="../../lib/jquery.min.js"></script>
+    <script src="../../lib/layui/layui.js"></script>
+    <script src="../../js/config.js"></script>
+    <script src="../../js/common.js"></script>
+    <script>
+        layui.use(['form', 'laydate'], function() {
+            var form = layui.form;
+            var laydate = layui.laydate;
+            
+            var id = Common.getQueryString('id');
+            var assetId = Common.getQueryString('assetId') || '';
+            var isEdit = !!id;
+            
+            // 初始化日期选择器
+            laydate.render({ elem: '#startDate', format: 'yyyy-MM-dd' });
+            laydate.render({ elem: '#endDate', format: 'yyyy-MM-dd' });
+            
+            $('#assetId').val(assetId);
+            
+            if (isEdit) {
+                Common.get(Config.api.assetStatusHistory.getInfo + '/' + id, function(res) {
+                    if (res.code === 200) {
+                        form.val('historyForm', res.data);
+                    }
+                });
+            }
+            
+            form.on('submit(submitForm)', function(data) {
+                Common.ajax({
+                    url: isEdit ? Config.api.assetStatusHistory.update : Config.api.assetStatusHistory.save,
+                    type: isEdit ? 'PUT' : 'POST',
+                    data: data.field,
+                    success: function(res) {
+                        Common.success(isEdit ? '修改成功' : '添加成功', function() {
+                            var index = parent.layer.getFrameIndex(window.name);
+                            parent.layer.close(index);
+                            parent.layui.table.reload('tableList');
+                        });
+                    }
+                });
+                return false;
+            });
+        });
+    </script>
+</body>
+</html>

ema-admin/src/main/resources/web/pages/assets/asset_status_history_list.html

@@ -0,0 +1,154 @@
+<!DOCTYPE html>
+<html lang="zh-CN">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>资产状态历史</title>
+    <link rel="stylesheet" href="../../lib/layui/css/layui.css">
+    <style>
+        body { padding: 15px; }
+        .search-form { margin-bottom: 15px; padding: 15px; background: #fff; border-radius: 4px; }
+        .table-toolbar { margin-bottom: 10px; }
+    </style>
+</head>
+<body>
+    <div class="search-form">
+        <form class="layui-form layui-form-pane" lay-filter="searchForm">
+            <div class="layui-form-item">
+                <div class="layui-inline">
+                    <label class="layui-form-label">使用状态</label>
+                    <div class="layui-input-inline">
+                        <select name="useStatus" class="layui-select">
+                            <option value="">全部</option>
+                            <option value="在库">在库</option>
+                            <option value="正常使用">正常使用</option>
+                            <option value="已转移">已转移</option>
+                            <option value="报废中">报废中</option>
+                            <option value="维修中">维修中</option>
+                        </select>
+                    </div>
+                </div>
+                <div class="layui-inline">
+                    <label class="layui-form-label">使用部门</label>
+                    <div class="layui-input-inline">
+                        <input type="text" name="useDept" placeholder="请输入使用部门" class="layui-input">
+                    </div>
+                </div>
+                <div class="layui-inline">
+                    <label class="layui-form-label">使用人</label>
+                    <div class="layui-input-inline">
+                        <input type="text" name="useUser" placeholder="请输入使用人" class="layui-input">
+                    </div>
+                </div>
+                <div class="layui-inline">
+                    <button type="button" class="layui-btn" id="btnSearch"><i class="layui-icon layui-icon-search"></i> 搜索</button>
+                    <button type="reset" class="layui-btn layui-btn-primary">重置</button>
+                </div>
+            </div>
+        </form>
+    </div>
+    
+    <div class="table-toolbar">
+        <button class="layui-btn layui-btn-sm" id="btnAdd"><i class="layui-icon layui-icon-add-1"></i> 添加</button>
+    </div>
+    
+    <table id="tableList" lay-filter="tableList"></table>
+    
+    <script type="text/html" id="toolbar">
+        <a class="layui-btn layui-btn-xs" lay-event="edit"><i class="layui-icon layui-icon-edit"></i> 编辑</a>
+        <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del"><i class="layui-icon layui-icon-delete"></i> 删除</a>
+    </script>
+    
+    <script type="text/html" id="useStatusTpl">
+        {{# if(d.useStatus === '在库') { }}
+            <span class="layui-badge layui-bg-gray">在库</span>
+        {{# } else if(d.useStatus === '正常使用') { }}
+            <span class="layui-badge layui-bg-green">正常使用</span>
+        {{# } else if(d.useStatus === '已转移') { }}
+            <span class="layui-badge layui-bg-blue">已转移</span>
+        {{# } else if(d.useStatus === '报废中') { }}
+            <span class="layui-badge layui-bg-orange">报废中</span>
+        {{# } else if(d.useStatus === '维修中') { }}
+            <span class="layui-badge layui-bg-yellow">维修中</span>
+        {{# } else { }}
+            <span class="layui-badge layui-bg-cyan">{{d.useStatus}}</span>
+        {{# } }}
+    </script>
+    
+    <script type="text/html" id="currentTpl">
+        <span>{{d.useCompany}} / {{d.useDept}} / {{d.useUser}}</span>
+    </script>
+    
+    <script src="../../lib/jquery.min.js"></script>
+    <script src="../../lib/layui/layui.js"></script>
+    <script src="../../js/config.js"></script>
+    <script src="../../js/common.js"></script>
+    <script>
+        layui.use(['table', 'layer', 'form'], function() {
+            var table = layui.table;
+            var layer = layui.layer;
+            var form = layui.form;
+            
+            var assetId = Common.getQueryString('assetId') || '';
+            
+            var tableIns = TableRender.init({
+                elem: '#tableList',
+                url: Config.api.assetStatusHistory.page,
+                where: { assetId: assetId },
+                cols: [[
+                    { type: 'checkbox', fixed: 'left' },
+                    { field: 'useCompany', title: '使用公司', width: 150 },
+                    { field: 'useDept', title: '使用部门', width: 120 },
+                    { field: 'useUser', title: '使用人', width: 100 },
+                    { field: 'useStatus', title: '使用状态', width: 110, templet: '#useStatusTpl' },
+                    { field: 'curLocation', title: '当前位置', width: 150 },
+                    { field: 'startDate', title: '生效开始日期', width: 130, templet: function(d) { return d.startDate || '-'; } },
+                    { field: 'endDate', title: '生效结束日期', width: 130, templet: function(d) { return d.endDate || '-'; } },
+                    { field: 'operatorName', title: '操作人', width: 100 },
+                    { field: 'operatorDate', title: '操作时间', width: 170, templet: function(d) { return d.operatorDate ? Common.formatDate(d.operatorDate) : '-'; } },
+                    { field: 'remark', title: '备注' },
+                    { fixed: 'right', title: '操作', width: 150, align: 'center', toolbar: '#toolbar' }
+                ]]
+            });
+            
+            $('#btnSearch').click(function() {
+                var data = form.val('searchForm');
+                data.assetId = assetId;
+                table.reload('tableList', {
+                    where: data,
+                    page: { curr: 1 }
+                });
+            });
+            
+            $('#btnAdd').click(function() {
+                Common.open({
+                    title: '添加资产状态历史',
+                    area: ['650px', '550px'],
+                    content: 'asset_status_history_form.html?assetId=' + assetId
+                });
+            });
+            
+            table.on('tool(tableList)', function(obj) {
+                var data = obj.data;
+                var event = obj.event;
+                
+                if (event === 'edit') {
+                    Common.open({
+                        title: '编辑资产状态历史',
+                        area: ['650px', '550px'],
+                        content: 'asset_status_history_form.html?assetId=' + assetId + '&id=' + data.id
+                    });
+                } else if (event === 'del') {
+                    Common.confirm('确定要删除该状态历史记录吗？', function() {
+                        Common.del(Config.api.assetStatusHistory.remove + '/' + data.id, function(res) {
+                            Common.success('删除成功', function() {
+                                obj.del();
+                            });
+                        });
+                    });
+                }
+            });
+        });
+    </script>
+</body>
+</html>

ema-admin/src/main/resources/web/pages/assets/assets_list.html

@@ -64,6 +64,7 @@
     <table id="tableList" lay-filter="tableList"></table>
     
     <script type="text/html" id="toolbar">
+        <a class="layui-btn layui-btn-xs" lay-event="history"><i class="layui-icon layui-icon-time"></i> 状态历史</a>
         <a class="layui-btn layui-btn-xs" lay-event="edit"><i class="layui-icon layui-icon-edit"></i> 编辑</a>
         <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del"><i class="layui-icon layui-icon-delete"></i> 删除</a>
     </script>
@@ -108,7 +109,7 @@
                     { field: 'invstkStatus', title: '盘点状态', width: 100, templet: '#invstkStatusTpl' },
                     { field: 'lastInvstkTime', title: '最后盘点时间', width: 170, templet: function(d) { return d.lastInvstkTime ? Common.formatDate(d.lastInvstkTime) : '-'; } },
                     { field: 'createTime', title: '创建时间', width: 170, templet: function(d) { return Common.formatDate(d.createTime); } },
-                    { fixed: 'right', title: '操作', width: 200, align: 'center', toolbar: '#toolbar' }
+                    { fixed: 'right', title: '操作', width: 280, align: 'center', toolbar: '#toolbar' }
                 ]]
             });
             
@@ -131,7 +132,9 @@
                 var data = obj.data;
                 var event = obj.event;
                 
-                if (event === 'edit') {
+                if (event === 'history') {
+                    parent.openTab('assets/asset_status_history_list.html?assetId=' + data.id + '&assetCode=' + data.assetCode, '状态历史-' + data.assetCode, 'asset_history_' + data.id);
+                } else if (event === 'edit') {
                     Common.open({
                         title: '编辑资产',
                         area: ['650px', '550px'],

src/main/java/com/ema/admin/modules/assets/controller/AssetStatusHistoryController.java

@@ -1,105 +0,0 @@
-package com.ema.admin.modules.assets.controller;
-
-import com.mybatisflex.core.paginate.Page;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.beans.factory.annotation.Autowired;
-import com.ema.admin.modules.assets.entity.AssetStatusHistory;
-import com.ema.admin.modules.assets.service.AssetStatusHistoryService;
-import org.springframework.web.bind.annotation.RestController;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import java.util.List;
-
-/**
- *  控制层。
- *
- * @author LIJIAN
- * @since 2026-05-13
- */
-@RestController
-@Api("接口")
-@RequestMapping("/assetStatusHistory")
-public class AssetStatusHistoryController {
-
-    @Autowired
-    private AssetStatusHistoryService assetStatusHistoryService;
-
-    /**
-     * 添加。
-     *
-     * @param assetStatusHistory 
-     * @return {@code true} 添加成功，{@code false} 添加失败
-     */
-    @PostMapping("save")
-    @ApiOperation("保存")
-    public boolean save(@RequestBody @ApiParam("") AssetStatusHistory assetStatusHistory) {
-        return assetStatusHistoryService.save(assetStatusHistory);
-    }
-
-    /**
-     * 根据主键删除。
-     *
-     * @param id 主键
-     * @return {@code true} 删除成功，{@code false} 删除失败
-     */
-    @DeleteMapping("remove/{id}")
-    @ApiOperation("根据主键")
-    public boolean remove(@PathVariable @ApiParam("主键") String id) {
-        return assetStatusHistoryService.removeById(id);
-    }
-
-    /**
-     * 根据主键更新。
-     *
-     * @param assetStatusHistory 
-     * @return {@code true} 更新成功，{@code false} 更新失败
-     */
-    @PutMapping("update")
-    @ApiOperation("根据主键更新")
-    public boolean update(@RequestBody @ApiParam("主键") AssetStatusHistory assetStatusHistory) {
-        return assetStatusHistoryService.updateById(assetStatusHistory);
-    }
-
-    /**
-     * 查询所有。
-     *
-     * @return 所有数据
-     */
-    @GetMapping("list")
-    @ApiOperation("查询所有")
-    public List<AssetStatusHistory> list() {
-        return assetStatusHistoryService.list();
-    }
-
-    /**
-     * 根据主键获取详细信息。
-     *
-     * @param id 主键
-     * @return 详情
-     */
-    @GetMapping("getInfo/{id}")
-    @ApiOperation("根据主键获取")
-    public AssetStatusHistory getInfo(@PathVariable @ApiParam("主键") String id) {
-        return assetStatusHistoryService.getById(id);
-    }
-
-    /**
-     * 分页查询。
-     *
-     * @param page 分页对象
-     * @return 分页对象
-     */
-    @GetMapping("page")
-    @ApiOperation("分页查询")
-    public Page<AssetStatusHistory> page(@ApiParam("分页信息") Page<AssetStatusHistory> page) {
-        return assetStatusHistoryService.page(page);
-    }
-
-}

src/main/java/com/ema/admin/modules/assets/controller/AssetsInfoController.java

@@ -1,105 +0,0 @@
-package com.ema.admin.modules.assets.controller;
-
-import com.mybatisflex.core.paginate.Page;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.beans.factory.annotation.Autowired;
-import com.ema.admin.modules.assets.entity.AssetsInfo;
-import com.ema.admin.modules.assets.service.AssetsInfoService;
-import org.springframework.web.bind.annotation.RestController;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import java.util.List;
-
-/**
- *  控制层。
- *
- * @author LIJIAN
- * @since 2026-05-13
- */
-@RestController
-@Api("接口")
-@RequestMapping("/assetsInfo")
-public class AssetsInfoController {
-
-    @Autowired
-    private AssetsInfoService assetsInfoService;
-
-    /**
-     * 添加。
-     *
-     * @param assetsInfo 
-     * @return {@code true} 添加成功，{@code false} 添加失败
-     */
-    @PostMapping("save")
-    @ApiOperation("保存")
-    public boolean save(@RequestBody @ApiParam("") AssetsInfo assetsInfo) {
-        return assetsInfoService.save(assetsInfo);
-    }
-
-    /**
-     * 根据主键删除。
-     *
-     * @param id 主键
-     * @return {@code true} 删除成功，{@code false} 删除失败
-     */
-    @DeleteMapping("remove/{id}")
-    @ApiOperation("根据主键")
-    public boolean remove(@PathVariable @ApiParam("主键") String id) {
-        return assetsInfoService.removeById(id);
-    }
-
-    /**
-     * 根据主键更新。
-     *
-     * @param assetsInfo 
-     * @return {@code true} 更新成功，{@code false} 更新失败
-     */
-    @PutMapping("update")
-    @ApiOperation("根据主键更新")
-    public boolean update(@RequestBody @ApiParam("主键") AssetsInfo assetsInfo) {
-        return assetsInfoService.updateById(assetsInfo);
-    }
-
-    /**
-     * 查询所有。
-     *
-     * @return 所有数据
-     */
-    @GetMapping("list")
-    @ApiOperation("查询所有")
-    public List<AssetsInfo> list() {
-        return assetsInfoService.list();
-    }
-
-    /**
-     * 根据主键获取详细信息。
-     *
-     * @param id 主键
-     * @return 详情
-     */
-    @GetMapping("getInfo/{id}")
-    @ApiOperation("根据主键获取")
-    public AssetsInfo getInfo(@PathVariable @ApiParam("主键") String id) {
-        return assetsInfoService.getById(id);
-    }
-
-    /**
-     * 分页查询。
-     *
-     * @param page 分页对象
-     * @return 分页对象
-     */
-    @GetMapping("page")
-    @ApiOperation("分页查询")
-    public Page<AssetsInfo> page(@ApiParam("分页信息") Page<AssetsInfo> page) {
-        return assetsInfoService.page(page);
-    }
-
-}

src/main/java/com/ema/admin/modules/assets/entity/AssetStatusHistory.java

@@ -1,116 +0,0 @@
-package com.ema.admin.modules.assets.entity;
-
-import com.ema.common.domain.base.BaseEntity;
-import com.mybatisflex.annotation.Id;
-import com.mybatisflex.annotation.KeyType;
-import com.mybatisflex.annotation.Table;
-import java.io.Serializable;
-import java.sql.Date;
-import java.time.LocalDateTime;
-
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.EqualsAndHashCode;
-
-/**
- *  实体类。
- *
- * @author LIJIAN
- * @since 2026-05-13
- */
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-@EqualsAndHashCode(callSuper = true)
-@ApiModel("")
-@Table("asset_status_history")
-public class AssetStatusHistory extends BaseEntity implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @Id(keyType = KeyType.Generator, value = "snowFlakeId")
-    @ApiModelProperty("主键")
-    private String id;
-
-    /**
-     * 资产信息id
-     */
-    @ApiModelProperty("资产信息id")
-    private String assetId;
-
-    /**
-     * 使用公司
-     */
-    @ApiModelProperty("使用公司")
-    private String useCompany;
-
-    /**
-     * 使用部门
-     */
-    @ApiModelProperty("使用部门")
-    private String useDept;
-
-    /**
-     * 使用人
-     */
-    @ApiModelProperty("使用人")
-    private String useUser;
-
-    /**
-     * 使用状态 在库、正常使用、已转移、报废中、维修中等
-     */
-    @ApiModelProperty("使用状态 在库、正常使用、已转移、报废中、维修中等")
-    private String useStatus;
-
-    /**
-     * 当前位置
-     */
-    @ApiModelProperty("当前位置")
-    private String curLocation;
-
-    /**
-     * 生效开始日期
-     */
-    @ApiModelProperty("生效开始日期")
-    private Date startDate;
-
-    /**
-     * 生效结束日期(当前有效为4712-12-31)
-     */
-    @ApiModelProperty("生效结束日期(当前有效为4712-12-31)")
-    private Date endDate;
-
-    /**
-     * 操作人
-     */
-    @ApiModelProperty("操作人")
-    private String operatorName;
-
-    /**
-     * 操作时间
-     */
-    @ApiModelProperty("操作时间")
-    private LocalDateTime operatorDate;
-
-    /**
-     * 协管员
-     */
-    @ApiModelProperty("协管员")
-    private String assistantName;
-
-    /**
-     * 备注
-     */
-    @ApiModelProperty("备注")
-    private String remark;
-
-}

src/main/java/com/ema/admin/modules/assets/entity/AssetsInfo.java

@@ -1,129 +0,0 @@
-package com.ema.admin.modules.assets.entity;
-
-import com.ema.common.domain.base.BaseEntity;
-import com.mybatisflex.annotation.Id;
-import com.mybatisflex.annotation.KeyType;
-import com.mybatisflex.annotation.Table;
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.sql.Date;
-import java.time.LocalDateTime;
-
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.EqualsAndHashCode;
-
-/**
- *  实体类。
- *
- * @author LIJIAN
- * @since 2026-05-13
- */
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-@EqualsAndHashCode(callSuper = true)
-@ApiModel("")
-@Table("assets_info")
-public class AssetsInfo extends BaseEntity implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @Id(keyType = KeyType.Generator, value = "snowFlakeId")
-    @ApiModelProperty("主键")
-    private String id;
-
-    /**
-     * 资产管理部门
-     */
-    @ApiModelProperty("资产管理部门")
-    private String deptName;
-
-    /**
-     * 资产编码
-     */
-    @ApiModelProperty("资产编码")
-    private String assetCode;
-
-    /**
-     * 资产类型
-     */
-    @ApiModelProperty("资产类型")
-    private String assetType;
-
-    /**
-     * 品牌
-     */
-    @ApiModelProperty("品牌")
-    private String brand;
-
-    /**
-     * 型号
-     */
-    @ApiModelProperty("型号")
-    private String model;
-
-    /**
-     * 购买日期
-     */
-    @ApiModelProperty("购买日期")
-    private Date purchaseDate;
-
-    /**
-     * 采购价值（元）
-     */
-    @ApiModelProperty("采购价值（元）")
-    private BigDecimal purchaseValue;
-
-    /**
-     * 盘点状态
-     */
-    @ApiModelProperty("盘点状态")
-    private String invstkStatus;
-
-    /**
-     * 最后一次盘点时间
-     */
-    @ApiModelProperty("最后一次盘点时间")
-    private LocalDateTime lastInvstkTime;
-
-    /**
-     * 扩展字段1
-     */
-    @ApiModelProperty("扩展字段1")
-    private String attribute1;
-
-    /**
-     * 扩展字段2
-     */
-    @ApiModelProperty("扩展字段2")
-    private String attribute2;
-
-    /**
-     * 扩展字段3
-     */
-    @ApiModelProperty("扩展字段3")
-    private String attribute3;
-
-    /**
-     * 扩展字段4
-     */
-    @ApiModelProperty("扩展字段4")
-    private String attribute4;
-
-    /**
-     * 备注
-     */
-    @ApiModelProperty("备注")
-    private String remark;
-
-}

src/main/java/com/ema/admin/modules/assets/mapper/AssetStatusHistoryMapper.java

@@ -1,14 +0,0 @@
-package com.ema.admin.modules.assets.mapper;
-
-import com.mybatisflex.core.BaseMapper;
-import com.ema.admin.modules.assets.entity.AssetStatusHistory;
-
-/**
- *  映射层。
- *
- * @author LIJIAN
- * @since 2026-05-13
- */
-public interface AssetStatusHistoryMapper extends BaseMapper<AssetStatusHistory> {
-
-}

src/main/java/com/ema/admin/modules/assets/mapper/AssetsInfoMapper.java

@@ -1,14 +0,0 @@
-package com.ema.admin.modules.assets.mapper;
-
-import com.mybatisflex.core.BaseMapper;
-import com.ema.admin.modules.assets.entity.AssetsInfo;
-
-/**
- *  映射层。
- *
- * @author LIJIAN
- * @since 2026-05-13
- */
-public interface AssetsInfoMapper extends BaseMapper<AssetsInfo> {
-
-}

src/main/java/com/ema/admin/modules/assets/service/AssetStatusHistoryService.java

@@ -1,14 +0,0 @@
-package com.ema.admin.modules.assets.service;
-
-import com.mybatisflex.core.service.IService;
-import com.ema.admin.modules.assets.entity.AssetStatusHistory;
-
-/**
- *  服务层。
- *
- * @author LIJIAN
- * @since 2026-05-13
- */
-public interface AssetStatusHistoryService extends IService<AssetStatusHistory> {
-
-}

src/main/java/com/ema/admin/modules/assets/service/AssetsInfoService.java

@@ -1,14 +0,0 @@
-package com.ema.admin.modules.assets.service;
-
-import com.mybatisflex.core.service.IService;
-import com.ema.admin.modules.assets.entity.AssetsInfo;
-
-/**
- *  服务层。
- *
- * @author LIJIAN
- * @since 2026-05-13
- */
-public interface AssetsInfoService extends IService<AssetsInfo> {
-
-}

src/main/java/com/ema/admin/modules/assets/service/impl/AssetStatusHistoryServiceImpl.java

@@ -1,18 +0,0 @@
-package com.ema.admin.modules.assets.service.impl;
-
-import com.mybatisflex.spring.service.impl.ServiceImpl;
-import com.ema.admin.modules.assets.entity.AssetStatusHistory;
-import com.ema.admin.modules.assets.mapper.AssetStatusHistoryMapper;
-import com.ema.admin.modules.assets.service.AssetStatusHistoryService;
-import org.springframework.stereotype.Service;
-
-/**
- *  服务层实现。
- *
- * @author LIJIAN
- * @since 2026-05-13
- */
-@Service
-public class AssetStatusHistoryServiceImpl extends ServiceImpl<AssetStatusHistoryMapper, AssetStatusHistory>  implements AssetStatusHistoryService{
-
-}

src/main/java/com/ema/admin/modules/assets/service/impl/AssetsInfoServiceImpl.java

@@ -1,18 +0,0 @@
-package com.ema.admin.modules.assets.service.impl;
-
-import com.mybatisflex.spring.service.impl.ServiceImpl;
-import com.ema.admin.modules.assets.entity.AssetsInfo;
-import com.ema.admin.modules.assets.mapper.AssetsInfoMapper;
-import com.ema.admin.modules.assets.service.AssetsInfoService;
-import org.springframework.stereotype.Service;
-
-/**
- *  服务层实现。
- *
- * @author LIJIAN
- * @since 2026-05-13
- */
-@Service
-public class AssetsInfoServiceImpl extends ServiceImpl<AssetsInfoMapper, AssetsInfo>  implements AssetsInfoService{
-
-}

src/main/resources/mapper/AssetStatusHistoryMapper.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ema.admin.modules.assets.mapper.AssetStatusHistoryMapper">
-
-</mapper>

src/main/resources/mapper/AssetsInfoMapper.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ema.admin.modules.assets.mapper.AssetsInfoMapper">
-
-</mapper>