luoluo
/
ry_zhky
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

检查，资产，文件

Browse Source
master
20918 11 months ago
parent a080905ada
commit 088b964aaa
14 changed files with 59 additions and 55 deletions
Show Stats Download Patch File Download Diff File

39
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TdPropertyInfoController.java
Unescape View File

@ -28,15 +28,15 @@ import com.ruoyi.common.core.page.TableDataInfo;
* @date 2024-04-29 * @date 2024-04-29
*/ */
@Controller @Controller
@RequestMapping("/system/propertyinfo") @RequestMapping("/system/property/data")
public class TdPropertyInfoController extends BaseController public class TdPropertyInfoController extends BaseController
{ {
private String prefix = "system/propertyinfo"; private String prefix = "system/property/data";
@Autowired @Autowired
private ITdPropertyInfoService tdPropertyInfoService; private ITdPropertyInfoService tdPropertyInfoService;
@RequiresPermissions("system:propertyinfo:view") @RequiresPermissions("system:property:view")
@GetMapping() @GetMapping()
public String propertyinfo() public String propertyinfo()
{ {
@ -46,20 +46,21 @@ public class TdPropertyInfoController extends BaseController
/** /**
* 查询资产管理列表 * 查询资产管理列表
*/ */
@RequiresPermissions("system:propertyinfo:list") @RequiresPermissions("system:property:list")
@PostMapping("/list") @GetMapping("/list/{useId}")
@ResponseBody //@ResponseBody
public TableDataInfo list(TdPropertyInfo tdPropertyInfo) public TableDataInfo list(@PathVariable("useId") String useId, TdPropertyInfo tdPropertyInfo)
{ {
startPage(); startPage();
List<TdPropertyInfo> list = tdPropertyInfoService.selectTdPropertyInfoList(tdPropertyInfo); List<TdPropertyInfo> tdPropertyInfos = tdPropertyInfoService.selectTdPropertyInfoByUseId(useId);
return getDataTable(list); //List<TdPropertyInfo> list = tdPropertyInfoService.selectTdPropertyInfoList(tdPropertyInfo);
return getDataTable(tdPropertyInfos);
} }
/** /**
* 导出资产管理列表 * 导出资产管理列表
*/ */
@RequiresPermissions("system:propertyinfo:export") @RequiresPermissions("system:property:export")
@Log(title = "资产管理", businessType = BusinessType.EXPORT) @Log(title = "资产管理", businessType = BusinessType.EXPORT)
@PostMapping("/export") @PostMapping("/export")
@ResponseBody @ResponseBody
@ -73,17 +74,17 @@ public class TdPropertyInfoController extends BaseController
/** /**
* 新增资产管理 * 新增资产管理
*/ */
@GetMapping("/add") @GetMapping("/add/{useId}")
public String add() public String add(@PathVariable("useId") String useId, ModelMap mmap)
{ {
mmap.put("useId", useId);
return prefix + "/add"; return prefix + "/add";
} }
/** /**
* 新增保存资产管理 * 新增保存资产管理
*/ */
@RequiresPermissions("system:propertyinfo:add") @RequiresPermissions("system:property:add")
@Log(title = "资产管理", businessType = BusinessType.INSERT) @Log(title = "资产管理", businessType = BusinessType.INSERT)
@PostMapping("/add") @PostMapping("/add")
@ResponseBody @ResponseBody
@ -96,7 +97,7 @@ public class TdPropertyInfoController extends BaseController
/** /**
* 修改资产管理 * 修改资产管理
*/ */
@RequiresPermissions("system:propertyinfo:edit") @RequiresPermissions("system:property:edit")
@GetMapping("/edit/{id}") @GetMapping("/edit/{id}")
public String edit(@PathVariable("id") String id, ModelMap mmap) public String edit(@PathVariable("id") String id, ModelMap mmap)
{ {
@ -108,7 +109,7 @@ public class TdPropertyInfoController extends BaseController
/** /**
* 修改保存资产管理 * 修改保存资产管理
*/ */
@RequiresPermissions("system:propertyinfo:edit") @RequiresPermissions("system:property:edit")
@Log(title = "资产管理", businessType = BusinessType.UPDATE) @Log(title = "资产管理", businessType = BusinessType.UPDATE)
@PostMapping("/edit") @PostMapping("/edit")
@ResponseBody @ResponseBody
@ -120,7 +121,7 @@ public class TdPropertyInfoController extends BaseController
/** /**
* 删除资产管理 * 删除资产管理
*/ */
@RequiresPermissions("system:propertyinfo:remove") @RequiresPermissions("system:property:remove")
@Log(title = "资产管理", businessType = BusinessType.DELETE) @Log(title = "资产管理", businessType = BusinessType.DELETE)
@PostMapping( "/remove") @PostMapping( "/remove")
@ResponseBody @ResponseBody
@ -129,9 +130,5 @@ public class TdPropertyInfoController extends BaseController
return toAjax(tdPropertyInfoService.deleteTdPropertyInfoByIds(ids)); return toAjax(tdPropertyInfoService.deleteTdPropertyInfoByIds(ids));
} }
/**
* 添加设备信息
*/
} }

16
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TdPropertyManagerController.java
Unescape View File

@ -34,7 +34,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
@RequestMapping("/system/property") @RequestMapping("/system/property")
public class TdPropertyManagerController extends BaseController public class TdPropertyManagerController extends BaseController
{ {
private String prefix = "system/property"; private String prefix = "system/property/property";
@Autowired @Autowired
private ITdPropertyManagerService tdPropertyManagerService; private ITdPropertyManagerService tdPropertyManagerService;
@ -136,15 +136,13 @@ public class TdPropertyManagerController extends BaseController
/** /**
* 添加资产条目 * 添加资产条目
*/ */
@RequiresPermissions("system:property:addproperty") @RequiresPermissions("system:property:list")
@GetMapping("/propertyinfo/{useId}") @GetMapping("/detail/{useId}")
public String addproperty(@PathVariable("useId") String useId,ModelMap mmap) public String detail(@PathVariable("useId") String useId, ModelMap mmap)
{ {
List<TdPropertyInfo> tdPropertyInfos = tdPropertyInfoService.listByIds(Collections.singleton(useId)); mmap.put("useId",useId);
mmap.put("tdPropertyInfos", tdPropertyInfos); // mmap.put("property", tdPropertyInfoService.selectTdPropertyInfoByUseId(useId));
return prefix + "/propertyinfo"; return "system/property/data/propertyinfo";
} }
} }

4
ruoyi-admin/src/main/resources/templates/system/checkresult/docheck.html
Unescape View File

@ -277,14 +277,14 @@
<th:block th:include="include :: footer" /> <th:block th:include="include :: footer" />
<th:block th:include="include :: datetimepicker-js" /> <th:block th:include="include :: datetimepicker-js" />
<script th:inline="javascript"> <script th:inline="javascript">
var prefix = ctx + "system/check"; var prefix = ctx + "system/checkresult";
$("#form-check-edit").validate({ $("#form-check-edit").validate({
focusCleanup: true focusCleanup: true
}); });
function submitHandler() { function submitHandler() {
if ($.validate.form()) { if ($.validate.form()) {
$.operate.save(prefix + "/edit", $('#form-check-edit').serialize()); $.operate.save(prefix + "/checkresult", $('#form-check-edit').serialize());
} }
} }

4
ruoyi-admin/src/main/resources/templates/system/propertyinfo/add.html → ruoyi-admin/src/main/resources/templates/system/property/data/add.html
Unescape View File

@ -193,14 +193,14 @@
<th:block th:include="include :: footer" /> <th:block th:include="include :: footer" />
<th:block th:include="include :: datetimepicker-js" /> <th:block th:include="include :: datetimepicker-js" />
<script th:inline="javascript"> <script th:inline="javascript">
var prefix = ctx + "system/propertyinfo" var prefix = ctx + "system/property/data"
$("#form-propertyinfo-add").validate({ $("#form-propertyinfo-add").validate({
focusCleanup: true focusCleanup: true
}); });
function submitHandler() { function submitHandler() {
if ($.validate.form()) { if ($.validate.form()) {
$.operate.save(prefix + "/add", $('#form-propertyinfo-add').serialize()); $.operate.save(prefix + "/add/{usrId}", $('#form-propertyinfo-add').serialize());
} }
} }

2
ruoyi-admin/src/main/resources/templates/system/propertyinfo/edit.html → ruoyi-admin/src/main/resources/templates/system/property/data/edit.html
Unescape View File

@ -187,7 +187,7 @@
<th:block th:include="include :: footer" /> <th:block th:include="include :: footer" />
<th:block th:include="include :: datetimepicker-js" /> <th:block th:include="include :: datetimepicker-js" />
<script th:inline="javascript"> <script th:inline="javascript">
var prefix = ctx + "system/propertyinfo"; var prefix = ctx + "system/property/data";
$("#form-propertyinfo-edit").validate({ $("#form-propertyinfo-edit").validate({
focusCleanup: true focusCleanup: true
}); });

14
ruoyi-admin/src/main/resources/templates/system/propertyinfo/propertyinfo.html → ruoyi-admin/src/main/resources/templates/system/property/data/propertyinfo.html
Unescape View File

@ -51,8 +51,8 @@
<a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:propertyinfo:export"> <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:propertyinfo:export">
<i class="fa fa-download"></i> 导出 <i class="fa fa-download"></i> 导出
</a> </a>
<a class="btn btn-primary" href="/system/property"> <a class="btn btn-danger" onclick="closeItem()">
<i class="fa fa-backward"></i> 返回 <i class="fa fa-reply-all"></i> 关闭
</a> </a>
</div> </div>
<div class="col-sm-12 select-table table-striped"> <div class="col-sm-12 select-table table-striped">
@ -62,20 +62,20 @@
</div> </div>
<th:block th:include="include :: footer" /> <th:block th:include="include :: footer" />
<script th:inline="javascript"> <script th:inline="javascript">
var editFlag = [[${@permission.hasPermi('system:propertyinfo:edit')}]]; var editFlag = [[${@permission.hasPermi('system:data:edit')}]];
var removeFlag = [[${@permission.hasPermi('system:propertyinfo:remove')}]]; var removeFlag = [[${@permission.hasPermi('system:data:remove')}]];
var propertyNetstyleDatas = [[${@dict.getType('sys_file_miji')}]]; var propertyNetstyleDatas = [[${@dict.getType('sys_file_miji')}]];
var propertyTypeDatas = [[${@dict.getType('sys_sm_property')}]]; var propertyTypeDatas = [[${@dict.getType('sys_sm_property')}]];
var propertyMijiDatas = [[${@dict.getType('sys_file_miji')}]]; var propertyMijiDatas = [[${@dict.getType('sys_file_miji')}]];
var isCurcialDatas = [[${@dict.getType('sys_yes_no')}]]; var isCurcialDatas = [[${@dict.getType('sys_yes_no')}]];
var isSoftwareDatas = [[${@dict.getType('sys_yes_no')}]]; var isSoftwareDatas = [[${@dict.getType('sys_yes_no')}]];
var shemichengduDatas = [[${@dict.getType('sys_user_shemi')}]]; var shemichengduDatas = [[${@dict.getType('sys_user_shemi')}]];
var prefix = ctx + "system/propertyinfo"; var prefix = ctx + "system/property/data";
$(function() { $(function() {
var options = { var options = {
url: prefix + "/list", url: prefix + "/list/{useId}",
createUrl: prefix + "/add", createUrl: prefix + "/add/{useId}",
updateUrl: prefix + "/edit/{id}", updateUrl: prefix + "/edit/{id}",
removeUrl: prefix + "/remove", removeUrl: prefix + "/remove",
exportUrl: prefix + "/export", exportUrl: prefix + "/export",

0
ruoyi-admin/src/main/resources/templates/system/property/add.html → ruoyi-admin/src/main/resources/templates/system/property/property/add.html
Unescape View File

0
ruoyi-admin/src/main/resources/templates/system/property/edit.html → ruoyi-admin/src/main/resources/templates/system/property/property/edit.html
Unescape View File

10
ruoyi-admin/src/main/resources/templates/system/property/property.html → ruoyi-admin/src/main/resources/templates/system/property/property/property.html
Unescape View File

@ -54,7 +54,7 @@
<script th:inline="javascript"> <script th:inline="javascript">
var editFlag = [[${@permission.hasPermi('system:property:edit')}]]; var editFlag = [[${@permission.hasPermi('system:property:edit')}]];
var removeFlag = [[${@permission.hasPermi('system:property:remove')}]]; var removeFlag = [[${@permission.hasPermi('system:property:remove')}]];
var addPropertyinfoFlag = [[${@permission.hasPermi('system:property:addproperty')}]]; var listFlag = [[${@permission.hasPermi('system:property:list')}]];
var prefix = ctx + "system/property"; var prefix = ctx + "system/property";
$(function() { $(function() {
@ -64,7 +64,6 @@
updateUrl: prefix + "/edit/{id}", updateUrl: prefix + "/edit/{id}",
removeUrl: prefix + "/remove", removeUrl: prefix + "/remove",
exportUrl: prefix + "/export", exportUrl: prefix + "/export",
//addUrl: prefix + "/propertyinfo/{useId}",
modalName: "资产登记", modalName: "资产登记",
columns: [{ columns: [{
checkbox: true checkbox: true
@ -103,7 +102,7 @@
formatter: function(value, row, index) { formatter: function(value, row, index) {
var actions = []; var actions = [];
actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.useId + '\')"><i class="fa fa-edit"></i>编辑</a> '); actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.useId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
actions.push('<a class="btn btn-success btn-xs ' + addPropertyinfoFlag + '" href= "/system/propertyinfo" "><i class="fa fa-plus"></i>添加</a> '); actions.push('<a class="btn btn-info btn-xs ' + listFlag + '" href="javascript:void(0)" onclick="detail(\'' + row.useId + '\')"><i class="fa fa-list-ul"></i>列表</a> ');
actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.useId + '\')"><i class="fa fa-remove"></i>删除</a>'); actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.useId + '\')"><i class="fa fa-remove"></i>删除</a>');
return actions.join(''); return actions.join('');
} }
@ -111,6 +110,11 @@
}; };
$.table.init(options); $.table.init(options);
}); });
/*资产列表-详细*/
function detail(useId) {
var url = prefix + '/detail/' + useId;
$.modal.openTab("资产列表数据", url);
}
</script> </script>
</body> </body>
</html> </html>

10
ruoyi-admin/src/main/resources/templates/system/property/propertyentry/addproperty.html
Unescape View File

@ -1,10 +0,0 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>Title</title>
</head>
<body>
</body>
</html>

2
ruoyi-system/src/main/java/com/ruoyi/system/mapper/TdPropertyInfoMapper.java
Unescape View File

@ -21,6 +21,8 @@ public interface TdPropertyInfoMapper extends BaseMapper<TdPropertyInfo>
*/ */
public TdPropertyInfo selectTdPropertyInfoById(String id); public TdPropertyInfo selectTdPropertyInfoById(String id);
public List<TdPropertyInfo> selectTdPropertyInfoByUseId(String id);
/** /**
* 查询资产管理列表 * 查询资产管理列表
* *

2
ruoyi-system/src/main/java/com/ruoyi/system/service/ITdPropertyInfoService.java
Unescape View File

@ -20,6 +20,8 @@ public interface ITdPropertyInfoService extends IService<TdPropertyInfo>
* @return 资产管理 * @return 资产管理
*/ */
public TdPropertyInfo selectTdPropertyInfoById(String id); public TdPropertyInfo selectTdPropertyInfoById(String id);
public List<TdPropertyInfo> selectTdPropertyInfoByUseId(String id);
/** /**
* 查询资产管理列表 * 查询资产管理列表

6
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TdPropertyInfoServiceImpl.java
Unescape View File

@ -34,6 +34,12 @@ public class TdPropertyInfoServiceImpl extends ServiceImpl<TdPropertyInfoMapper,
return tdPropertyInfoMapper.selectTdPropertyInfoById(id); return tdPropertyInfoMapper.selectTdPropertyInfoById(id);
} }
@Override
public List<TdPropertyInfo> selectTdPropertyInfoByUseId(String id)
{
return tdPropertyInfoMapper.selectTdPropertyInfoByUseId(id);
}
/** /**
* 查询资产管理列表 * 查询资产管理列表
* *

5
ruoyi-system/src/main/resources/mapper/system/TdPropertyInfoMapper.xml
Unescape View File

@ -75,6 +75,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<include refid="selectTdPropertyInfoVo"/> <include refid="selectTdPropertyInfoVo"/>
where id = #{id} where id = #{id}
</select> </select>
<select id="selectTdPropertyInfoByUseId" parameterType="String" resultMap="TdPropertyInfoResult">
<include refid="selectTdPropertyInfoVo"/>
where use_id = #{useId}
</select>
<insert id="insertTdPropertyInfo" parameterType="TdPropertyInfo"> <insert id="insertTdPropertyInfo" parameterType="TdPropertyInfo">
insert into td_property_info insert into td_property_info

Write Preview
Loading…
Cancel
Save