From 4eb5d44418c179f5ac087ce13311741ebad7e19b Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 24 三月 2025 10:19:24 +0800
Subject: [PATCH] #新增 1. 新增逻辑分区主子表
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocAreaMat.java | 217 +++++++++++++++++++++++++++++++
rsf-server/src/main/resources/mapper/test/LocAreaMatMapper.xml | 5
rsf-server/src/main/resources/mapper/manager/LocAreaMatMapper.xml | 5
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocAreaMatServiceImpl.java | 12 +
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/LocAreaMatService.java | 8 +
rsf-server/src/main/java/com/vincent/rsf/server/manager/mapper/LocAreaMatMapper.java | 12 +
rsf-server/src/main/java/locAreaMat.sql | 23 +++
rsf-server/src/main/java/com/vincent/rsf/server/common/CodeBuilder.java | 4
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocAreaMatController.java | 112 ++++++++++++++++
rsf-server/src/main/resources/application-dev.yml | 8
10 files changed, 400 insertions(+), 6 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 15ec114..286a6b3 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_mat_rela";
- generator.tableDesc="loc areas mats rela";
+ generator.table="man_loc_area_mat";
+ generator.tableDesc="loc areas mats";
generator.packagePath="com.vincent.rsf.server.test";
generator.build();
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocAreaMatController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocAreaMatController.java
new file mode 100644
index 0000000..817f37d
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocAreaMatController.java
@@ -0,0 +1,112 @@
+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.LocAreaMat;
+import com.vincent.rsf.server.manager.service.LocAreaMatService;
+import com.vincent.rsf.server.system.controller.BaseController;
+import io.swagger.annotations.Api;
+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.*;
+
+@Api(tags = "閫昏緫鍒嗗尯")
+@RestController
+public class LocAreaMatController extends BaseController {
+
+ @Autowired
+ private LocAreaMatService locAreaMatService;
+
+ @PreAuthorize("hasAuthority('manager:locAreaMat:list')")
+ @PostMapping("/locAreaMat/page")
+ public R page(@RequestBody Map<String, Object> map) {
+ BaseParam baseParam = buildParam(map, BaseParam.class);
+ PageParam<LocAreaMat, BaseParam> pageParam = new PageParam<>(baseParam, LocAreaMat.class);
+ return R.ok().add(locAreaMatService.page(pageParam, pageParam.buildWrapper(true)));
+ }
+
+ @PreAuthorize("hasAuthority('manager:locAreaMat:list')")
+ @PostMapping("/locAreaMat/list")
+ public R list(@RequestBody Map<String, Object> map) {
+ return R.ok().add(locAreaMatService.list());
+ }
+
+ @PreAuthorize("hasAuthority('manager:locAreaMat:list')")
+ @PostMapping({"/locAreaMat/many/{ids}", "/locAreaMats/many/{ids}"})
+ public R many(@PathVariable Long[] ids) {
+ return R.ok().add(locAreaMatService.listByIds(Arrays.asList(ids)));
+ }
+
+ @PreAuthorize("hasAuthority('manager:locAreaMat:list')")
+ @GetMapping("/locAreaMat/{id}")
+ public R get(@PathVariable("id") Long id) {
+ return R.ok().add(locAreaMatService.getById(id));
+ }
+
+ @PreAuthorize("hasAuthority('manager:locAreaMat:save')")
+ @OperationLog("Create loc areas mats")
+ @PostMapping("/locAreaMat/save")
+ public R save(@RequestBody LocAreaMat locAreaMat) {
+ locAreaMat.setCreateBy(getLoginUserId());
+ locAreaMat.setCreateTime(new Date());
+ locAreaMat.setUpdateBy(getLoginUserId());
+ locAreaMat.setUpdateTime(new Date());
+ if (!locAreaMatService.save(locAreaMat)) {
+ return R.error("Save Fail");
+ }
+ return R.ok("Save Success").add(locAreaMat);
+ }
+
+ @PreAuthorize("hasAuthority('manager:locAreaMat:update')")
+ @OperationLog("Update loc areas mats")
+ @PostMapping("/locAreaMat/update")
+ public R update(@RequestBody LocAreaMat locAreaMat) {
+ locAreaMat.setUpdateBy(getLoginUserId());
+ locAreaMat.setUpdateTime(new Date());
+ if (!locAreaMatService.updateById(locAreaMat)) {
+ return R.error("Update Fail");
+ }
+ return R.ok("Update Success").add(locAreaMat);
+ }
+
+ @PreAuthorize("hasAuthority('manager:locAreaMat:remove')")
+ @OperationLog("Delete loc areas mats")
+ @PostMapping("/locAreaMat/remove/{ids}")
+ public R remove(@PathVariable Long[] ids) {
+ if (!locAreaMatService.removeByIds(Arrays.asList(ids))) {
+ return R.error("Delete Fail");
+ }
+ return R.ok("Delete Success").add(ids);
+ }
+
+ @PreAuthorize("hasAuthority('manager:locAreaMat:list')")
+ @PostMapping("/locAreaMat/query")
+ public R query(@RequestParam(required = false) String condition) {
+ List<KeyValVo> vos = new ArrayList<>();
+ LambdaQueryWrapper<LocAreaMat> wrapper = new LambdaQueryWrapper<>();
+ if (!Cools.isEmpty(condition)) {
+ wrapper.like(LocAreaMat::getId, condition);
+ }
+ locAreaMatService.page(new Page<>(1, 30), wrapper).getRecords().forEach(
+ item -> vos.add(new KeyValVo(item.getId(), item.getId()))
+ );
+ return R.ok().add(vos);
+ }
+
+ @PreAuthorize("hasAuthority('manager:locAreaMat:list')")
+ @PostMapping("/locAreaMat/export")
+ public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
+ ExcelUtil.build(ExcelUtil.create(locAreaMatService.list(), LocAreaMat.class), response);
+ }
+
+}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocAreaMat.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocAreaMat.java
new file mode 100644
index 0000000..50ba83d
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocAreaMat.java
@@ -0,0 +1,217 @@
+package com.vincent.rsf.server.manager.entity;
+
+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 com.vincent.rsf.framework.common.Cools;
+import com.vincent.rsf.framework.common.SpringUtils;
+import com.vincent.rsf.server.manager.service.WarehouseAreasService;
+import com.vincent.rsf.server.manager.service.WarehouseService;
+import com.vincent.rsf.server.system.entity.User;
+import com.vincent.rsf.server.system.service.UserService;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+@Data
+@TableName("man_loc_area_mat")
+public class LocAreaMat implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * ID
+ */
+ @ApiModelProperty(value= "ID")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 閫昏緫缂栧彿
+ */
+ @ApiModelProperty(value= "閫昏緫缂栧彿")
+ private String code;
+
+ /**
+ * 浠撳簱ID(*)
+ */
+ @ApiModelProperty(value= "浠撳簱ID(*)")
+ private Long warehouseId;
+
+ /**
+ * 搴撳尯ID(*)
+ */
+ @ApiModelProperty(value= "搴撳尯ID(*)")
+ private Long areaId;
+
+ /**
+ * 閫昏緫鎻忚堪
+ */
+ @ApiModelProperty(value= "閫昏緫鎻忚堪")
+ private String depict;
+
+ /**
+ * 鐘舵�� 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 LocAreaMat() {}
+
+ public LocAreaMat(String code, Long warehouseId, Long areaId, String depict, Integer status, Integer deleted, Integer tenantId, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo) {
+ this.code = code;
+ this.warehouseId = warehouseId;
+ this.areaId = areaId;
+ this.depict = depict;
+ this.status = status;
+ this.deleted = deleted;
+ this.tenantId = tenantId;
+ this.createBy = createBy;
+ this.createTime = createTime;
+ this.updateBy = updateBy;
+ this.updateTime = updateTime;
+ this.memo = memo;
+ }
+
+// LocAreaMat locAreaMat = new LocAreaMat(
+// null, // 閫昏緫缂栧彿
+// null, // 浠撳簱ID(*)
+// null, // 搴撳尯ID(*)
+// null, // 閫昏緫鎻忚堪
+// null, // 鐘舵�乕闈炵┖]
+// null, // 鏄惁鍒犻櫎[闈炵┖]
+// null, // 绉熸埛
+// null, // 娣诲姞浜哄憳
+// null, // 娣诲姞鏃堕棿[闈炵┖]
+// null, // 淇敼浜哄憳
+// null, // 淇敼鏃堕棿[闈炵┖]
+// null // 澶囨敞
+// );
+
+ public String getWarehouseId$(){
+ WarehouseService service = SpringUtils.getBean(WarehouseService.class);
+ Warehouse warehouse = service.getById(this.warehouseId);
+ if (!Cools.isEmpty(warehouse)){
+ return String.valueOf(warehouse.getName());
+ }
+ return null;
+ }
+
+ public String getAreaId$(){
+ WarehouseAreasService service = SpringUtils.getBean(WarehouseAreasService.class);
+ WarehouseAreas warehouseArea = service.getById(this.areaId);
+ if (!Cools.isEmpty(warehouseArea)){
+ return String.valueOf(warehouseArea.getName());
+ }
+ return 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/LocAreaMatMapper.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/mapper/LocAreaMatMapper.java
new file mode 100644
index 0000000..983e57f
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/mapper/LocAreaMatMapper.java
@@ -0,0 +1,12 @@
+package com.vincent.rsf.server.manager.mapper;
+
+import com.vincent.rsf.server.manager.entity.LocAreaMat;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface LocAreaMatMapper extends BaseMapper<LocAreaMat> {
+
+}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/LocAreaMatService.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/LocAreaMatService.java
new file mode 100644
index 0000000..1c502ef
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/LocAreaMatService.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.LocAreaMat;
+
+public interface LocAreaMatService extends IService<LocAreaMat> {
+
+}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocAreaMatServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocAreaMatServiceImpl.java
new file mode 100644
index 0000000..bf38451
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocAreaMatServiceImpl.java
@@ -0,0 +1,12 @@
+package com.vincent.rsf.server.manager.service.impl;
+
+import com.vincent.rsf.server.manager.mapper.LocAreaMatMapper;
+import com.vincent.rsf.server.manager.entity.LocAreaMat;
+import com.vincent.rsf.server.manager.service.LocAreaMatService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service("locAreaMatService")
+public class LocAreaMatServiceImpl extends ServiceImpl<LocAreaMatMapper, LocAreaMat> implements LocAreaMatService {
+
+}
diff --git a/rsf-server/src/main/java/locAreaMat.sql b/rsf-server/src/main/java/locAreaMat.sql
new file mode 100644
index 0000000..90977b6
--- /dev/null
+++ b/rsf-server/src/main/java/locAreaMat.sql
@@ -0,0 +1,23 @@
+-- save locAreaMat record
+-- mysql
+insert into `sys_menu` ( `name`, `parent_id`, `route`, `component`, `type`, `sort`, `tenant_id`, `status`) values ( 'menu.locAreaMat', '0', '/test/locAreaMat', 'locAreaMat', '0' , '0', '1' , '1');
+
+insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `tenant_id`, `status`) values ( 'Query loc areas mats', '195', '1', 'test:locAreaMat:list', '0', '1', '1');
+insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `tenant_id`, `status`) values ( 'Create loc areas mats', '195', '1', 'test:locAreaMat:save', '1', '1', '1');
+insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `tenant_id`, `status`) values ( 'Update loc areas mats', '195', '1', 'test:locAreaMat:update', '2', '1', '1');
+insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `tenant_id`, `status`) values ( 'Delete loc areas mats', '195', '1', 'test:locAreaMat:remove', '3', '1', '1');
+
+-- locale menu name
+locAreaMat: 'LocAreaMat',
+
+-- locale field
+locAreaMat: {
+ code: "code",
+ depict: "depict",
+},
+
+-- ResourceContent
+import locAreaMat from './locAreaMat';
+
+case 'locAreaMat':
+ return locAreaMat;
diff --git a/rsf-server/src/main/resources/application-dev.yml b/rsf-server/src/main/resources/application-dev.yml
index ce13aca..3f84f94 100644
--- a/rsf-server/src/main/resources/application-dev.yml
+++ b/rsf-server/src/main/resources/application-dev.yml
@@ -12,10 +12,10 @@
matching-strategy: ANT_PATH_MATCHER
datasource:
driver-class-name: com.mysql.jdbc.Driver
-# url: jdbc:mysql://192.168.4.24:3306/rsf?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
-# username: root
- url: jdbc:mysql://47.76.147.249:3306/rsf?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
- username: rsf
+ url: jdbc:mysql://192.168.4.24:3306/rsf?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+ username: root
+# url: jdbc:mysql://47.76.147.249:3306/rsf?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+# username: rsf
password: 34821015
type: com.alibaba.druid.pool.DruidDataSource
druid:
diff --git a/rsf-server/src/main/resources/mapper/manager/LocAreaMatMapper.xml b/rsf-server/src/main/resources/mapper/manager/LocAreaMatMapper.xml
new file mode 100644
index 0000000..2751811
--- /dev/null
+++ b/rsf-server/src/main/resources/mapper/manager/LocAreaMatMapper.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.LocAreaMatMapper">
+
+</mapper>
diff --git a/rsf-server/src/main/resources/mapper/test/LocAreaMatMapper.xml b/rsf-server/src/main/resources/mapper/test/LocAreaMatMapper.xml
new file mode 100644
index 0000000..086c947
--- /dev/null
+++ b/rsf-server/src/main/resources/mapper/test/LocAreaMatMapper.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.test.mapper.LocAreaMatMapper">
+
+</mapper>
--
Gitblit v1.9.1