From 2068b4d36fc6d4ec3d9cd235d43c89b06f2f684a Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 27 三月 2025 10:06:23 +0800
Subject: [PATCH] 添加接驳站点管理
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/DeviceSiteService.java | 8 +
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/DeviceSiteController.java | 110 +++++++++++++++
rsf-server/src/main/resources/mapper/manager/DeviceSiteMapper.xml | 5
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/DeviceSiteServiceImpl.java | 12 +
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrController.java | 4
rsf-server/src/main/java/com/vincent/rsf/server/manager/mapper/DeviceSiteMapper.java | 12 +
rsf-server/src/main/java/com/vincent/rsf/server/common/CodeBuilder.java | 6
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/DeviceSite.java | 234 +++++++++++++++++++++++++++++++++
8 files changed, 386 insertions(+), 5 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 286a6b3..21b8076 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,9 +22,9 @@
// generator.username="sa";
// generator.password="Zoneyung@zy56$";
- generator.table="man_loc_area_mat";
- generator.tableDesc="loc areas mats";
- generator.packagePath="com.vincent.rsf.server.test";
+ generator.table="man_device_site";
+ generator.tableDesc="device sites";
+ generator.packagePath="com.vincent.rsf.server.manager";
generator.build();
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/DeviceSiteController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/DeviceSiteController.java
new file mode 100644
index 0000000..b3da571
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/DeviceSiteController.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.DeviceSite;
+import com.vincent.rsf.server.manager.service.DeviceSiteService;
+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 DeviceSiteController extends BaseController {
+
+ @Autowired
+ private DeviceSiteService deviceSiteService;
+
+ @PreAuthorize("hasAuthority('manager:deviceSite:list')")
+ @PostMapping("/deviceSite/page")
+ public R page(@RequestBody Map<String, Object> map) {
+ BaseParam baseParam = buildParam(map, BaseParam.class);
+ PageParam<DeviceSite, BaseParam> pageParam = new PageParam<>(baseParam, DeviceSite.class);
+ return R.ok().add(deviceSiteService.page(pageParam, pageParam.buildWrapper(true)));
+ }
+
+ @PreAuthorize("hasAuthority('manager:deviceSite:list')")
+ @PostMapping("/deviceSite/list")
+ public R list(@RequestBody Map<String, Object> map) {
+ return R.ok().add(deviceSiteService.list());
+ }
+
+ @PreAuthorize("hasAuthority('manager:deviceSite:list')")
+ @PostMapping({"/deviceSite/many/{ids}", "/deviceSites/many/{ids}"})
+ public R many(@PathVariable Long[] ids) {
+ return R.ok().add(deviceSiteService.listByIds(Arrays.asList(ids)));
+ }
+
+ @PreAuthorize("hasAuthority('manager:deviceSite:list')")
+ @GetMapping("/deviceSite/{id}")
+ public R get(@PathVariable("id") Long id) {
+ return R.ok().add(deviceSiteService.getById(id));
+ }
+
+ @PreAuthorize("hasAuthority('manager:deviceSite:save')")
+ @OperationLog("Create device sites")
+ @PostMapping("/deviceSite/save")
+ public R save(@RequestBody DeviceSite deviceSite) {
+ deviceSite.setCreateBy(getLoginUserId());
+ deviceSite.setCreateTime(new Date());
+ deviceSite.setUpdateBy(getLoginUserId());
+ deviceSite.setUpdateTime(new Date());
+ if (!deviceSiteService.save(deviceSite)) {
+ return R.error("Save Fail");
+ }
+ return R.ok("Save Success").add(deviceSite);
+ }
+
+ @PreAuthorize("hasAuthority('manager:deviceSite:update')")
+ @OperationLog("Update device sites")
+ @PostMapping("/deviceSite/update")
+ public R update(@RequestBody DeviceSite deviceSite) {
+ deviceSite.setUpdateBy(getLoginUserId());
+ deviceSite.setUpdateTime(new Date());
+ if (!deviceSiteService.updateById(deviceSite)) {
+ return R.error("Update Fail");
+ }
+ return R.ok("Update Success").add(deviceSite);
+ }
+
+ @PreAuthorize("hasAuthority('manager:deviceSite:remove')")
+ @OperationLog("Delete device sites")
+ @PostMapping("/deviceSite/remove/{ids}")
+ public R remove(@PathVariable Long[] ids) {
+ if (!deviceSiteService.removeByIds(Arrays.asList(ids))) {
+ return R.error("Delete Fail");
+ }
+ return R.ok("Delete Success").add(ids);
+ }
+
+ @PreAuthorize("hasAuthority('manager:deviceSite:list')")
+ @PostMapping("/deviceSite/query")
+ public R query(@RequestParam(required = false) String condition) {
+ List<KeyValVo> vos = new ArrayList<>();
+ LambdaQueryWrapper<DeviceSite> wrapper = new LambdaQueryWrapper<>();
+ if (!Cools.isEmpty(condition)) {
+ wrapper.like(DeviceSite::getName, condition);
+ }
+ deviceSiteService.page(new Page<>(1, 30), wrapper).getRecords().forEach(
+ item -> vos.add(new KeyValVo(item.getId(), item.getName()))
+ );
+ return R.ok().add(vos);
+ }
+
+ @PreAuthorize("hasAuthority('manager:deviceSite:list')")
+ @PostMapping("/deviceSite/export")
+ public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
+ ExcelUtil.build(ExcelUtil.create(deviceSiteService.list(), DeviceSite.class), response);
+ }
+
+}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrController.java
index 0fcbe92..091cf4a 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrController.java
@@ -206,14 +206,14 @@
} else {
matnrs = matnrService.list(new LambdaQueryWrapper<Matnr>().last("limit 1"));
}
- ExcelUtil.build(ExcelUtil.create(null, MatnrsTemplate.class, true), response);
+ ExcelUtil.build(ExcelUtil.create(matnrs, Matnr.class, true), response);
}
@PreAuthorize("hasAuthority('manager:matnr:list')")
@ApiOperation("涓嬭浇鐗╂枡妯℃澘")
@PostMapping("/matnr/template/download")
public void download(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
- ExcelUtil.build(ExcelUtil.create(null, MatnrsTemplate.class, true), response);
+ ExcelUtil.build(ExcelUtil.create(null, MatnrsTemplate.class), response);
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/DeviceSite.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/DeviceSite.java
new file mode 100644
index 0000000..54bb6f8
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/DeviceSite.java
@@ -0,0 +1,234 @@
+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_device_site")
+public class DeviceSite implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * ID
+ */
+ @ApiModelProperty(value= "ID")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 鍏ュ嚭搴撶被鍨�
+ */
+ @ApiModelProperty(value= "鍏ュ嚭搴撶被鍨�")
+ private Integer type;
+
+ /**
+ * 绔欑偣缂栧彿
+ */
+ @ApiModelProperty(value= "绔欑偣缂栧彿")
+ private String site;
+
+ /**
+ * 鍚嶇О
+ */
+ @ApiModelProperty(value= "鍚嶇О")
+ private String name;
+
+ /**
+ * wcs绔欑偣缂栧彿
+ */
+ @ApiModelProperty(value= "wcs绔欑偣缂栧彿")
+ private String wcsCode;
+
+ /**
+ * 绔欑偣鏍囩
+ */
+ @ApiModelProperty(value= "绔欑偣鏍囩")
+ private String label;
+
+ /**
+ * 璁惧绫诲瀷
+ */
+ @ApiModelProperty(value= "璁惧绫诲瀷")
+ private String device;
+
+ /**
+ * 璁惧缂栧彿
+ */
+ @ApiModelProperty(value= "璁惧缂栧彿")
+ private String deviceCode;
+
+ /**
+ * 璁惧绔欑偣
+ */
+ @ApiModelProperty(value= "璁惧绔欑偣")
+ private String deviceSite;
+
+ /**
+ * 鐘舵�� 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 DeviceSite() {}
+
+ public DeviceSite(Integer type,String site,String name,String wcsCode,String label,String device,String deviceCode,String deviceSite,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
+ this.type = type;
+ this.site = site;
+ this.name = name;
+ this.wcsCode = wcsCode;
+ this.label = label;
+ this.device = device;
+ this.deviceCode = deviceCode;
+ this.deviceSite = deviceSite;
+ this.status = status;
+ this.deleted = deleted;
+ this.tenantId = tenantId;
+ this.createBy = createBy;
+ this.createTime = createTime;
+ this.updateBy = updateBy;
+ this.updateTime = updateTime;
+ this.memo = memo;
+ }
+
+// DeviceSite deviceSite = new DeviceSite(
+// null, // 鍏ュ嚭搴撶被鍨�
+// null, // 绔欑偣缂栧彿
+// null, // 鍚嶇О
+// null, // wcs绔欑偣缂栧彿
+// null, // 绔欑偣鏍囩
+// null, // 璁惧绫诲瀷
+// null, // 璁惧缂栧彿
+// null, // 璁惧绔欑偣
+// 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/DeviceSiteMapper.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/mapper/DeviceSiteMapper.java
new file mode 100644
index 0000000..9444623
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/mapper/DeviceSiteMapper.java
@@ -0,0 +1,12 @@
+package com.vincent.rsf.server.manager.mapper;
+
+import com.vincent.rsf.server.manager.entity.DeviceSite;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface DeviceSiteMapper extends BaseMapper<DeviceSite> {
+
+}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/DeviceSiteService.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/DeviceSiteService.java
new file mode 100644
index 0000000..9bf943c
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/DeviceSiteService.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.DeviceSite;
+
+public interface DeviceSiteService extends IService<DeviceSite> {
+
+}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/DeviceSiteServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/DeviceSiteServiceImpl.java
new file mode 100644
index 0000000..e19660b
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/DeviceSiteServiceImpl.java
@@ -0,0 +1,12 @@
+package com.vincent.rsf.server.manager.service.impl;
+
+import com.vincent.rsf.server.manager.mapper.DeviceSiteMapper;
+import com.vincent.rsf.server.manager.entity.DeviceSite;
+import com.vincent.rsf.server.manager.service.DeviceSiteService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service("deviceSiteService")
+public class DeviceSiteServiceImpl extends ServiceImpl<DeviceSiteMapper, DeviceSite> implements DeviceSiteService {
+
+}
diff --git a/rsf-server/src/main/resources/mapper/manager/DeviceSiteMapper.xml b/rsf-server/src/main/resources/mapper/manager/DeviceSiteMapper.xml
new file mode 100644
index 0000000..d6ed72e
--- /dev/null
+++ b/rsf-server/src/main/resources/mapper/manager/DeviceSiteMapper.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.DeviceSiteMapper">
+
+</mapper>
--
Gitblit v1.9.1