From 46d4a8583240cbe3de6f1b4a196dd5d06485398a Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 20 三月 2025 16:02:44 +0800
Subject: [PATCH] #新增 1. 添加库们逻辑分区
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocAreaRelaController.java | 110 ++++++++++++++++++
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/LocAreaRelaService.java | 8 +
rsf-server/src/main/java/locAreaRela.sql | 23 +++
rsf-server/src/main/resources/mapper/manager/LocAreaRelaMapper.xml | 5
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocAreaRelaServiceImpl.java | 12 ++
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocAreaRela.java | 186 +++++++++++++++++++++++++++++++
rsf-server/src/main/java/com/vincent/rsf/server/common/CodeBuilder.java | 4
rsf-server/src/main/java/com/vincent/rsf/server/manager/mapper/LocAreaRelaMapper.java | 12 ++
8 files changed, 358 insertions(+), 2 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/common/CodeBuilder.java b/rsf-server/src/main/java/com/vincent/rsf/server/common/CodeBuilder.java
index 21a08cb..ee4f1a5 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/common/CodeBuilder.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/common/CodeBuilder.java
@@ -22,8 +22,8 @@
// generator.username="sa";
// generator.password="Zoneyung@zy56$";
- generator.table="man_loc_area";
- generator.tableDesc="loc areas";
+ generator.table="man_loc_area_rela";
+ generator.tableDesc="loc areas rela";
generator.packagePath="com.vincent.rsf.server.manager";
generator.build();
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocAreaRelaController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocAreaRelaController.java
new file mode 100644
index 0000000..dd5e155
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocAreaRelaController.java
@@ -0,0 +1,110 @@
+package com.vincent.rsf.server.manager.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.vincent.rsf.framework.common.Cools;
+import com.vincent.rsf.framework.common.R;
+import com.vincent.rsf.server.common.utils.ExcelUtil;
+import com.vincent.rsf.server.common.annotation.OperationLog;
+import com.vincent.rsf.server.common.domain.BaseParam;
+import com.vincent.rsf.server.common.domain.KeyValVo;
+import com.vincent.rsf.server.common.domain.PageParam;
+import com.vincent.rsf.server.manager.entity.LocAreaRela;
+import com.vincent.rsf.server.manager.service.LocAreaRelaService;
+import com.vincent.rsf.server.system.controller.BaseController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.*;
+
+@RestController
+public class LocAreaRelaController extends BaseController {
+
+ @Autowired
+ private LocAreaRelaService locAreaRelaService;
+
+ @PreAuthorize("hasAuthority('manager:locAreaRela:list')")
+ @PostMapping("/locAreaRela/page")
+ public R page(@RequestBody Map<String, Object> map) {
+ BaseParam baseParam = buildParam(map, BaseParam.class);
+ PageParam<LocAreaRela, BaseParam> pageParam = new PageParam<>(baseParam, LocAreaRela.class);
+ return R.ok().add(locAreaRelaService.page(pageParam, pageParam.buildWrapper(true)));
+ }
+
+ @PreAuthorize("hasAuthority('manager:locAreaRela:list')")
+ @PostMapping("/locAreaRela/list")
+ public R list(@RequestBody Map<String, Object> map) {
+ return R.ok().add(locAreaRelaService.list());
+ }
+
+ @PreAuthorize("hasAuthority('manager:locAreaRela:list')")
+ @PostMapping({"/locAreaRela/many/{ids}", "/locAreaRelas/many/{ids}"})
+ public R many(@PathVariable Long[] ids) {
+ return R.ok().add(locAreaRelaService.listByIds(Arrays.asList(ids)));
+ }
+
+ @PreAuthorize("hasAuthority('manager:locAreaRela:list')")
+ @GetMapping("/locAreaRela/{id}")
+ public R get(@PathVariable("id") Long id) {
+ return R.ok().add(locAreaRelaService.getById(id));
+ }
+
+ @PreAuthorize("hasAuthority('manager:locAreaRela:save')")
+ @OperationLog("Create loc areas rela")
+ @PostMapping("/locAreaRela/save")
+ public R save(@RequestBody LocAreaRela locAreaRela) {
+ locAreaRela.setCreateBy(getLoginUserId());
+ locAreaRela.setCreateTime(new Date());
+ locAreaRela.setUpdateBy(getLoginUserId());
+ locAreaRela.setUpdateTime(new Date());
+ if (!locAreaRelaService.save(locAreaRela)) {
+ return R.error("Save Fail");
+ }
+ return R.ok("Save Success").add(locAreaRela);
+ }
+
+ @PreAuthorize("hasAuthority('manager:locAreaRela:update')")
+ @OperationLog("Update loc areas rela")
+ @PostMapping("/locAreaRela/update")
+ public R update(@RequestBody LocAreaRela locAreaRela) {
+ locAreaRela.setUpdateBy(getLoginUserId());
+ locAreaRela.setUpdateTime(new Date());
+ if (!locAreaRelaService.updateById(locAreaRela)) {
+ return R.error("Update Fail");
+ }
+ return R.ok("Update Success").add(locAreaRela);
+ }
+
+ @PreAuthorize("hasAuthority('manager:locAreaRela:remove')")
+ @OperationLog("Delete loc areas rela")
+ @PostMapping("/locAreaRela/remove/{ids}")
+ public R remove(@PathVariable Long[] ids) {
+ if (!locAreaRelaService.removeByIds(Arrays.asList(ids))) {
+ return R.error("Delete Fail");
+ }
+ return R.ok("Delete Success").add(ids);
+ }
+
+ @PreAuthorize("hasAuthority('manager:locAreaRela:list')")
+ @PostMapping("/locAreaRela/query")
+ public R query(@RequestParam(required = false) String condition) {
+ List<KeyValVo> vos = new ArrayList<>();
+ LambdaQueryWrapper<LocAreaRela> wrapper = new LambdaQueryWrapper<>();
+ if (!Cools.isEmpty(condition)) {
+ wrapper.like(LocAreaRela::getLocAreaId, condition);
+ }
+ locAreaRelaService.page(new Page<>(1, 30), wrapper).getRecords().forEach(
+ item -> vos.add(new KeyValVo(item.getId(), item.getLocAreaId()))
+ );
+ return R.ok().add(vos);
+ }
+
+ @PreAuthorize("hasAuthority('manager:locAreaRela:list')")
+ @PostMapping("/locAreaRela/export")
+ public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
+ ExcelUtil.build(ExcelUtil.create(locAreaRelaService.list(), LocAreaRela.class), response);
+ }
+
+}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocAreaRela.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocAreaRela.java
new file mode 100644
index 0000000..4b6490d
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocAreaRela.java
@@ -0,0 +1,186 @@
+package com.vincent.rsf.server.manager.entity;
+
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import com.vincent.rsf.framework.common.Cools;
+import com.vincent.rsf.framework.common.SpringUtils;
+import com.vincent.rsf.server.system.service.UserService;
+import com.vincent.rsf.server.system.entity.User;
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@TableName("man_loc_area_rela")
+public class LocAreaRela implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * ID
+ */
+ @ApiModelProperty(value= "ID")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 鍒嗗尯ID
+ */
+ @ApiModelProperty(value= "鍒嗗尯ID")
+ private Long locAreaId;
+
+ /**
+ * 搴撲綅ID
+ */
+ @ApiModelProperty(value= "搴撲綅ID")
+ private Long locId;
+
+ /**
+ * 鐘舵�� 1: 姝ｅ父 0: 鍐荤粨
+ */
+ @ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 0: 鍐荤粨 ")
+ private Integer status;
+
+ /**
+ * 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
+ */
+ @ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
+ @TableLogic
+ private Integer deleted;
+
+ /**
+ * 绉熸埛
+ */
+ @ApiModelProperty(value= "绉熸埛")
+ private Integer tenantId;
+
+ /**
+ * 娣诲姞浜哄憳
+ */
+ @ApiModelProperty(value= "娣诲姞浜哄憳")
+ private Long createBy;
+
+ /**
+ * 娣诲姞鏃堕棿
+ */
+ @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+
+ /**
+ * 淇敼浜哄憳
+ */
+ @ApiModelProperty(value= "淇敼浜哄憳")
+ private Long updateBy;
+
+ /**
+ * 淇敼鏃堕棿
+ */
+ @ApiModelProperty(value= "淇敼鏃堕棿")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date updateTime;
+
+ /**
+ * 澶囨敞
+ */
+ @ApiModelProperty(value= "澶囨敞")
+ private String memo;
+
+ public LocAreaRela() {}
+
+ public LocAreaRela(Long locAreaId,Long locId,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
+ this.locAreaId = locAreaId;
+ this.locId = locId;
+ this.status = status;
+ this.deleted = deleted;
+ this.tenantId = tenantId;
+ this.createBy = createBy;
+ this.createTime = createTime;
+ this.updateBy = updateBy;
+ this.updateTime = updateTime;
+ this.memo = memo;
+ }
+
+// LocAreaRela locAreaRela = new LocAreaRela(
+// null, // 鍒嗗尯ID
+// null, // 搴撲綅ID
+// null, // 鐘舵�乕闈炵┖]
+// null, // 鏄惁鍒犻櫎[闈炵┖]
+// null, // 绉熸埛
+// null, // 娣诲姞浜哄憳
+// null, // 娣诲姞鏃堕棿[闈炵┖]
+// null, // 淇敼浜哄憳
+// null, // 淇敼鏃堕棿[闈炵┖]
+// null // 澶囨敞
+// );
+
+ public String getStatus$(){
+ if (null == this.status){ return null; }
+ switch (this.status){
+ case 1:
+ return "姝ｅ父";
+ case 0:
+ return "鍐荤粨";
+ default:
+ return String.valueOf(this.status);
+ }
+ }
+
+ public String getCreateBy$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.getById(this.createBy);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getNickname());
+ }
+ return null;
+ }
+
+ public String getCreateTime$(){
+ if (Cools.isEmpty(this.createTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
+ }
+
+ public String getUpdateBy$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.getById(this.updateBy);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getNickname());
+ }
+ return null;
+ }
+
+ public String getUpdateTime$(){
+ if (Cools.isEmpty(this.updateTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
+ }
+
+
+
+ public Boolean getStatusBool(){
+ if (null == this.status){ return null; }
+ switch (this.status){
+ case 1:
+ return true;
+ case 0:
+ return false;
+ default:
+ return null;
+ }
+ }
+
+}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/mapper/LocAreaRelaMapper.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/mapper/LocAreaRelaMapper.java
new file mode 100644
index 0000000..b4e2a8d
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/mapper/LocAreaRelaMapper.java
@@ -0,0 +1,12 @@
+package com.vincent.rsf.server.manager.mapper;
+
+import com.vincent.rsf.server.manager.entity.LocAreaRela;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface LocAreaRelaMapper extends BaseMapper<LocAreaRela> {
+
+}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/LocAreaRelaService.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/LocAreaRelaService.java
new file mode 100644
index 0000000..2f903f1
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/LocAreaRelaService.java
@@ -0,0 +1,8 @@
+package com.vincent.rsf.server.manager.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.vincent.rsf.server.manager.entity.LocAreaRela;
+
+public interface LocAreaRelaService extends IService<LocAreaRela> {
+
+}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocAreaRelaServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocAreaRelaServiceImpl.java
new file mode 100644
index 0000000..7083a9d
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocAreaRelaServiceImpl.java
@@ -0,0 +1,12 @@
+package com.vincent.rsf.server.manager.service.impl;
+
+import com.vincent.rsf.server.manager.mapper.LocAreaRelaMapper;
+import com.vincent.rsf.server.manager.entity.LocAreaRela;
+import com.vincent.rsf.server.manager.service.LocAreaRelaService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service("locAreaRelaService")
+public class LocAreaRelaServiceImpl extends ServiceImpl<LocAreaRelaMapper, LocAreaRela> implements LocAreaRelaService {
+
+}
diff --git a/rsf-server/src/main/java/locAreaRela.sql b/rsf-server/src/main/java/locAreaRela.sql
new file mode 100644
index 0000000..d6eb58e
--- /dev/null
+++ b/rsf-server/src/main/java/locAreaRela.sql
@@ -0,0 +1,23 @@
+-- save locAreaRela record
+-- mysql
+insert into `sys_menu` ( `name`, `parent_id`, `route`, `component`, `type`, `sort`, `tenant_id`, `status`) values ( 'menu.locAreaRela', '0', '/manager/locAreaRela', 'locAreaRela', '0' , '0', '1' , '1');
+
+insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `tenant_id`, `status`) values ( 'Query loc areas rela', '', '1', 'manager:locAreaRela:list', '0', '1', '1');
+insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `tenant_id`, `status`) values ( 'Create loc areas rela', '', '1', 'manager:locAreaRela:save', '1', '1', '1');
+insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `tenant_id`, `status`) values ( 'Update loc areas rela', '', '1', 'manager:locAreaRela:update', '2', '1', '1');
+insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `tenant_id`, `status`) values ( 'Delete loc areas rela', '', '1', 'manager:locAreaRela:remove', '3', '1', '1');
+
+-- locale menu name
+locAreaRela: 'LocAreaRela',
+
+-- locale field
+locAreaRela: {
+ locAreaId: "locAreaId",
+ locId: "locId",
+},
+
+-- ResourceContent
+import locAreaRela from './locAreaRela';
+
+case 'locAreaRela':
+ return locAreaRela;
diff --git a/rsf-server/src/main/resources/mapper/manager/LocAreaRelaMapper.xml b/rsf-server/src/main/resources/mapper/manager/LocAreaRelaMapper.xml
new file mode 100644
index 0000000..a12bad4
--- /dev/null
+++ b/rsf-server/src/main/resources/mapper/manager/LocAreaRelaMapper.xml
@@ -0,0 +1,5 @@
+<?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.vincent.rsf.server.manager.mapper.LocAreaRelaMapper">
+
+</mapper>
--
Gitblit v1.9.1