From 6edf3dea83cfe9bc176e8e8db868fc96bd76c78c Mon Sep 17 00:00:00 2001 From: wangh <123456> Date: Mon, 29 Jan 2024 13:29:03 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20=E5=BA=9F=E5=93=81?= =?UTF-8?q?=E5=85=A5=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/api/controller/ApiController.java | 71 +++++++++- .../java/com/ruoyi/api/mapper/ApiMapper.java | 14 ++ .../ruoyi/api/service/impl/ApiService.java | 25 ++++ .../src/main/resources/mapper/ApiMapper.xml | 60 +++++++++ .../controller/BaseAreaUserController.java | 127 ++++++++++++++++++ .../RecordInvalidatedController.java | 127 ++++++++++++++++++ .../com/ruoyi/manage/domain/BaseAreaUser.java | 67 +++++++++ .../com/ruoyi/manage/domain/LedgerRfid.java | 22 ++- .../manage/domain/RecordInvalidated.java | 53 ++++++++ .../manage/mapper/BaseAreaUserMapper.java | 66 +++++++++ .../mapper/RecordInvalidatedMapper.java | 62 +++++++++ .../manage/service/IBaseAreaUserService.java | 61 +++++++++ .../service/IRecordInvalidatedService.java | 61 +++++++++ .../service/impl/BaseAreaUserServiceImpl.java | 97 +++++++++++++ .../impl/RecordInvalidatedServiceImpl.java | 92 +++++++++++++ .../create_menu_sql/base_area_userMenu.sql | 22 +++ .../record_invalidatedMenu.sql | 22 +++ .../mapper/manage/BaseAreaUserMapper.xml | 73 ++++++++++ .../mapper/manage/LedgerRfidMapper.xml | 4 +- .../mapper/manage/RecordInvalidatedMapper.xml | 69 ++++++++++ .../templates/manage/base_area_user/add.html | 41 ++++++ .../manage/base_area_user/base_area_user.html | 117 ++++++++++++++++ .../templates/manage/base_area_user/edit.html | 42 ++++++ .../manage/record_invalidated/add.html | 31 +++++ .../manage/record_invalidated/edit.html | 32 +++++ .../record_invalidated.html | 104 ++++++++++++++ 26 files changed, 1553 insertions(+), 9 deletions(-) create mode 100644 ruoyi-manage/src/main/java/com/ruoyi/manage/controller/BaseAreaUserController.java create mode 100644 ruoyi-manage/src/main/java/com/ruoyi/manage/controller/RecordInvalidatedController.java create mode 100644 ruoyi-manage/src/main/java/com/ruoyi/manage/domain/BaseAreaUser.java create mode 100644 ruoyi-manage/src/main/java/com/ruoyi/manage/domain/RecordInvalidated.java create mode 100644 ruoyi-manage/src/main/java/com/ruoyi/manage/mapper/BaseAreaUserMapper.java create mode 100644 ruoyi-manage/src/main/java/com/ruoyi/manage/mapper/RecordInvalidatedMapper.java create mode 100644 ruoyi-manage/src/main/java/com/ruoyi/manage/service/IBaseAreaUserService.java create mode 100644 ruoyi-manage/src/main/java/com/ruoyi/manage/service/IRecordInvalidatedService.java create mode 100644 ruoyi-manage/src/main/java/com/ruoyi/manage/service/impl/BaseAreaUserServiceImpl.java create mode 100644 ruoyi-manage/src/main/java/com/ruoyi/manage/service/impl/RecordInvalidatedServiceImpl.java create mode 100644 ruoyi-manage/src/main/resources/create_menu_sql/base_area_userMenu.sql create mode 100644 ruoyi-manage/src/main/resources/create_menu_sql/record_invalidatedMenu.sql create mode 100644 ruoyi-manage/src/main/resources/mapper/manage/BaseAreaUserMapper.xml create mode 100644 ruoyi-manage/src/main/resources/mapper/manage/RecordInvalidatedMapper.xml create mode 100644 ruoyi-manage/src/main/resources/templates/manage/base_area_user/add.html create mode 100644 ruoyi-manage/src/main/resources/templates/manage/base_area_user/base_area_user.html create mode 100644 ruoyi-manage/src/main/resources/templates/manage/base_area_user/edit.html create mode 100644 ruoyi-manage/src/main/resources/templates/manage/record_invalidated/add.html create mode 100644 ruoyi-manage/src/main/resources/templates/manage/record_invalidated/edit.html create mode 100644 ruoyi-manage/src/main/resources/templates/manage/record_invalidated/record_invalidated.html diff --git a/ruoyi-api/src/main/java/com/ruoyi/api/controller/ApiController.java b/ruoyi-api/src/main/java/com/ruoyi/api/controller/ApiController.java index 136cf6b..4765308 100644 --- a/ruoyi-api/src/main/java/com/ruoyi/api/controller/ApiController.java +++ b/ruoyi-api/src/main/java/com/ruoyi/api/controller/ApiController.java @@ -10,11 +10,10 @@ import com.ruoyi.common.core.domain.AjaxResult; import static com.ruoyi.common.core.domain.AjaxResult.*; import com.ruoyi.common.utils.DateUtils; -import com.ruoyi.manage.domain.BaseLocation; -import com.ruoyi.manage.domain.BaseManufacturer; -import com.ruoyi.manage.domain.RecordStoreCheck; +import com.ruoyi.manage.domain.*; import com.ruoyi.manage.service.IBaseLocationService; import com.ruoyi.manage.service.IBaseManufacturerService; +import com.ruoyi.manage.service.IRecordInvalidatedService; import com.ruoyi.manage.service.IRecordStoreCheckService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; @@ -24,6 +23,7 @@ import org.springframework.web.bind.annotation.*; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Optional; /** @@ -95,19 +95,76 @@ public class ApiController { @Transactional @PostMapping("/storecheck/submit") - public AjaxResult storeCheckSubmit(String json , String user) { + public AjaxResult storeCheckSubmit(String json, String user) { try { - List list= JSONObject.parseArray(json,StockDto.class); + List list = JSONObject.parseArray(json, StockDto.class); RecordStoreCheck recordStoreCheck = new RecordStoreCheck(); recordStoreCheck.setCheckNumber(list.size()); recordStoreCheck.setCheckTime(DateUtils.getNowDate()); recordStoreCheck.setCheckUser(user); int key = checkService.insertRecordStoreCheck(recordStoreCheck); - apiService.insertCheckInfo(list,recordStoreCheck.getCheckId()); + apiService.insertCheckInfo(list, recordStoreCheck.getCheckId()); return success(); - }catch (Exception e){ + } catch (Exception e) { return error("数据异常,请求失败"); } } + + + @PostMapping("/bf/select") + public AjaxResult bfSelect(String epc) { + LedgerRfid ledgerRfid = apiService.bfSelect(epc); + if (ledgerRfid == null) { + return error("RFID 扫描不正确"); + } + return success(ledgerRfid); + } + + @Autowired + private IRecordInvalidatedService recordInvalidatedService; + + @PostMapping("/bf/submit") + public AjaxResult bfSubmit(String epc, String user, String remark) { + //插入记录 + RecordInvalidated recordInvalidated = new RecordInvalidated(); + recordInvalidated.setEpc(epc); + recordInvalidated.setCreateBy(user); + recordInvalidated.setRemark(remark); + recordInvalidatedService.insertRecordInvalidated(recordInvalidated); + //修改台账 + apiService.updataLedgerForBf(epc, "2"); + return success(); + } + + @PostMapping("/xj/select") + public AjaxResult xjSelect(String user) { + List list = apiService.xjSelect(user); + if (list == null) { + return error("没有维护巡检区域"); + } + return success(list); + } + + + @PostMapping("/fpin/select") + public AjaxResult fpInSelect(String epc) { + LedgerRfid ledgerRfid = apiService.fpInSelect(epc); + if (ledgerRfid == null) { + return error("RFID 扫描不正确"); + } + BaseLocation baseLocation = new BaseLocation(); + baseLocation.setStoteTag(1L); + baseLocation.setIsEnable("Y"); + List baseLocationList = baseLocationService.selectBaseLocationList(baseLocation); + ledgerRfid.setBaseLocationList(baseLocationList); + return success(ledgerRfid); + } + + @PostMapping("/fpin/submit") + public AjaxResult fpInSubmit(String epc,String localtionCode,String user,String bf,String subCode) { + int i=apiService.fpInSubmit(epc,localtionCode,user,bf,subCode); + apiService.updataLedgerIn(epc,subCode); + return success(); + } } diff --git a/ruoyi-api/src/main/java/com/ruoyi/api/mapper/ApiMapper.java b/ruoyi-api/src/main/java/com/ruoyi/api/mapper/ApiMapper.java index 1e76f87..afa0c4a 100644 --- a/ruoyi-api/src/main/java/com/ruoyi/api/mapper/ApiMapper.java +++ b/ruoyi-api/src/main/java/com/ruoyi/api/mapper/ApiMapper.java @@ -3,6 +3,7 @@ package com.ruoyi.api.mapper; import com.ruoyi.api.domain.InStoreDto; import com.ruoyi.api.domain.OutStoreDto; import com.ruoyi.api.domain.StockDto; +import com.ruoyi.manage.domain.LedgerRfid; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; @@ -25,4 +26,17 @@ public interface ApiMapper { List storeCheckSelect(); void insertCheckInfo(@Param("list") List list, @Param("id") Long checkId); + + List xjSelect(String user); + + LedgerRfid bfSelect(String epc); + + void updataLedgerForBf(@Param("epc") String epc, @Param("state") String state); + + LedgerRfid fpInSelect(String epc); + + int fpInSubmit(@Param("epc") String epc, @Param("localtionCode") String localtionCode, + @Param("user") String user, @Param("bf") String bf, @Param("subCode") String subCode); + + void updataLedgerIn(@Param("epc") String epc,@Param("code") String locationCode); } diff --git a/ruoyi-api/src/main/java/com/ruoyi/api/service/impl/ApiService.java b/ruoyi-api/src/main/java/com/ruoyi/api/service/impl/ApiService.java index 176a52c..f17b075 100644 --- a/ruoyi-api/src/main/java/com/ruoyi/api/service/impl/ApiService.java +++ b/ruoyi-api/src/main/java/com/ruoyi/api/service/impl/ApiService.java @@ -4,6 +4,7 @@ import com.ruoyi.api.domain.InStoreDto; import com.ruoyi.api.domain.OutStoreDto; import com.ruoyi.api.domain.StockDto; import com.ruoyi.api.mapper.ApiMapper; +import com.ruoyi.manage.domain.LedgerRfid; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -41,4 +42,28 @@ public class ApiService { public void insertCheckInfo(List list, Long checkId) { mapper.insertCheckInfo(list,checkId); } + + public List xjSelect(String user) { + return mapper.xjSelect(user); + } + + public LedgerRfid bfSelect(String epc) { + return mapper.bfSelect(epc); + } + + public void updataLedgerForBf(String epc, String state) { + mapper.updataLedgerForBf(epc,state); + } + + public LedgerRfid fpInSelect(String epc) { + return mapper.fpInSelect(epc); + } + + public int fpInSubmit(String epc, String localtionCode, String user, String bf, String subCode) { + return mapper.fpInSubmit(epc,localtionCode,user,bf,subCode); + } + + public void updataLedgerIn(String epc, String locationCode) { + mapper.updataLedgerIn(epc,locationCode); + } } diff --git a/ruoyi-api/src/main/resources/mapper/ApiMapper.xml b/ruoyi-api/src/main/resources/mapper/ApiMapper.xml index 36ba6c3..44400ee 100644 --- a/ruoyi-api/src/main/resources/mapper/ApiMapper.xml +++ b/ruoyi-api/src/main/resources/mapper/ApiMapper.xml @@ -57,4 +57,64 @@ (#{id}, #{item.epcCode},#{item.locationCode},#{item.state}) + + + + + + UPDATE bg_wheel_chocks.ledger_rfid + SET is_scrap = #{state}, + update_time=now() + WHERE rifd_code =#{epc} + + + + + INSERT INTO record_waste_in (epc, location_code, bf_time, in_code, create_by) + VALUES (#{epc}, #{localtionCode},#{bf},#{subCode},#{user}); + + + + UPDATE ledger_rfid + SET location_type = '1', + location_code = #{code}, + update_time = now() + WHERE rifd_code =#{epc} + \ No newline at end of file diff --git a/ruoyi-manage/src/main/java/com/ruoyi/manage/controller/BaseAreaUserController.java b/ruoyi-manage/src/main/java/com/ruoyi/manage/controller/BaseAreaUserController.java new file mode 100644 index 0000000..8afecd2 --- /dev/null +++ b/ruoyi-manage/src/main/java/com/ruoyi/manage/controller/BaseAreaUserController.java @@ -0,0 +1,127 @@ +package com.ruoyi.manage.controller; + +import java.util.List; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +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.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.manage.domain.BaseAreaUser; +import com.ruoyi.manage.service.IBaseAreaUserService; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 机场区域用户绑定Controller + * + * @author wangh + * @date 2024-01-25 + */ +@Controller +@RequestMapping("/manage/base_area_user") +public class BaseAreaUserController extends BaseController +{ + private String prefix = "manage/base_area_user"; + + @Autowired + private IBaseAreaUserService baseAreaUserService; + + @RequiresPermissions("manage:base_area_user:view") + @GetMapping() + public String base_area_user() + { + return prefix + "/base_area_user"; + } + + /** + * 查询机场区域用户绑定列表 + */ + @RequiresPermissions("manage:base_area_user:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(BaseAreaUser baseAreaUser) + { + startPage(); + List list = baseAreaUserService.selectBaseAreaUserList(baseAreaUser); + return getDataTable(list); + } + + /** + * 导出机场区域用户绑定列表 + */ + @RequiresPermissions("manage:base_area_user:export") + @Log(title = "机场区域用户绑定", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(BaseAreaUser baseAreaUser) + { + List list = baseAreaUserService.selectBaseAreaUserList(baseAreaUser); + ExcelUtil util = new ExcelUtil(BaseAreaUser.class); + return util.exportExcel(list, "机场区域用户绑定数据"); + } + + /** + * 新增机场区域用户绑定 + */ + @GetMapping("/add") + public String add() + { + return prefix + "/add"; + } + + /** + * 新增保存机场区域用户绑定 + */ + @RequiresPermissions("manage:base_area_user:add") + @Log(title = "机场区域用户绑定", businessType = BusinessType.INSERT) + @PostMapping("/add") + @ResponseBody + public AjaxResult addSave(BaseAreaUser baseAreaUser) + { + return toAjax(baseAreaUserService.insertBaseAreaUser(baseAreaUser)); + } + + /** + * 修改机场区域用户绑定 + */ + @RequiresPermissions("manage:base_area_user:edit") + @GetMapping("/edit/{objid}") + public String edit(@PathVariable("objid") Long objid, ModelMap mmap) + { + BaseAreaUser baseAreaUser = baseAreaUserService.selectBaseAreaUserByObjid(objid); + mmap.put("baseAreaUser", baseAreaUser); + return prefix + "/edit"; + } + + /** + * 修改保存机场区域用户绑定 + */ + @RequiresPermissions("manage:base_area_user:edit") + @Log(title = "机场区域用户绑定", businessType = BusinessType.UPDATE) + @PostMapping("/edit") + @ResponseBody + public AjaxResult editSave(BaseAreaUser baseAreaUser) + { + return toAjax(baseAreaUserService.updateBaseAreaUser(baseAreaUser)); + } + + /** + * 删除机场区域用户绑定 + */ + @RequiresPermissions("manage:base_area_user:remove") + @Log(title = "机场区域用户绑定", businessType = BusinessType.DELETE) + @PostMapping( "/remove") + @ResponseBody + public AjaxResult remove(String ids) + { + return toAjax(baseAreaUserService.deleteBaseAreaUserByObjids(ids)); + } +} diff --git a/ruoyi-manage/src/main/java/com/ruoyi/manage/controller/RecordInvalidatedController.java b/ruoyi-manage/src/main/java/com/ruoyi/manage/controller/RecordInvalidatedController.java new file mode 100644 index 0000000..696a2f0 --- /dev/null +++ b/ruoyi-manage/src/main/java/com/ruoyi/manage/controller/RecordInvalidatedController.java @@ -0,0 +1,127 @@ +package com.ruoyi.manage.controller; + +import java.util.List; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +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.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.manage.domain.RecordInvalidated; +import com.ruoyi.manage.service.IRecordInvalidatedService; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 轮挡报废记录Controller + * + * @author wangh + * @date 2024-01-26 + */ +@Controller +@RequestMapping("/manage/record_invalidated") +public class RecordInvalidatedController extends BaseController +{ + private String prefix = "manage/record_invalidated"; + + @Autowired + private IRecordInvalidatedService recordInvalidatedService; + + @RequiresPermissions("manage:record_invalidated:view") + @GetMapping() + public String record_invalidated() + { + return prefix + "/record_invalidated"; + } + + /** + * 查询轮挡报废记录列表 + */ + @RequiresPermissions("manage:record_invalidated:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(RecordInvalidated recordInvalidated) + { + startPage(); + List list = recordInvalidatedService.selectRecordInvalidatedList(recordInvalidated); + return getDataTable(list); + } + + /** + * 导出轮挡报废记录列表 + */ + @RequiresPermissions("manage:record_invalidated:export") + @Log(title = "轮挡报废记录", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(RecordInvalidated recordInvalidated) + { + List list = recordInvalidatedService.selectRecordInvalidatedList(recordInvalidated); + ExcelUtil util = new ExcelUtil(RecordInvalidated.class); + return util.exportExcel(list, "轮挡报废记录数据"); + } + + /** + * 新增轮挡报废记录 + */ + @GetMapping("/add") + public String add() + { + return prefix + "/add"; + } + + /** + * 新增保存轮挡报废记录 + */ + @RequiresPermissions("manage:record_invalidated:add") + @Log(title = "轮挡报废记录", businessType = BusinessType.INSERT) + @PostMapping("/add") + @ResponseBody + public AjaxResult addSave(RecordInvalidated recordInvalidated) + { + return toAjax(recordInvalidatedService.insertRecordInvalidated(recordInvalidated)); + } + + /** + * 修改轮挡报废记录 + */ + @RequiresPermissions("manage:record_invalidated:edit") + @GetMapping("/edit/{objid}") + public String edit(@PathVariable("objid") Long objid, ModelMap mmap) + { + RecordInvalidated recordInvalidated = recordInvalidatedService.selectRecordInvalidatedByObjid(objid); + mmap.put("recordInvalidated", recordInvalidated); + return prefix + "/edit"; + } + + /** + * 修改保存轮挡报废记录 + */ + @RequiresPermissions("manage:record_invalidated:edit") + @Log(title = "轮挡报废记录", businessType = BusinessType.UPDATE) + @PostMapping("/edit") + @ResponseBody + public AjaxResult editSave(RecordInvalidated recordInvalidated) + { + return toAjax(recordInvalidatedService.updateRecordInvalidated(recordInvalidated)); + } + + /** + * 删除轮挡报废记录 + */ + @RequiresPermissions("manage:record_invalidated:remove") + @Log(title = "轮挡报废记录", businessType = BusinessType.DELETE) + @PostMapping( "/remove") + @ResponseBody + public AjaxResult remove(String ids) + { + return toAjax(recordInvalidatedService.deleteRecordInvalidatedByObjids(ids)); + } +} diff --git a/ruoyi-manage/src/main/java/com/ruoyi/manage/domain/BaseAreaUser.java b/ruoyi-manage/src/main/java/com/ruoyi/manage/domain/BaseAreaUser.java new file mode 100644 index 0000000..93d23c7 --- /dev/null +++ b/ruoyi-manage/src/main/java/com/ruoyi/manage/domain/BaseAreaUser.java @@ -0,0 +1,67 @@ +package com.ruoyi.manage.domain; + +import com.ruoyi.common.core.domain.entity.SysUser; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 机场区域用户绑定对象 base_area_user + * + * @author wangh + * @date 2024-01-25 + */ +public class BaseAreaUser extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 主键 */ + private Long objid; + + /** 账号名称 */ + @Excel(name = "账号名称") + private String userId; + + /** 区域id */ + @Excel(name = "区域id") + private Long areaId; + private SysUser sysUser; + private BaseStore baseStore; + public void setObjid(Long objid) + { + this.objid = objid; + } + + public Long getObjid() + { + return objid; + } + public void setUserId(String userId) + { + this.userId = userId; + } + + public String getUserId() + { + return userId; + } + public void setAreaId(Long areaId) + { + this.areaId = areaId; + } + + public Long getAreaId() + { + return areaId; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("objid", getObjid()) + .append("userId", getUserId()) + .append("areaId", getAreaId()) + .toString(); + } +} diff --git a/ruoyi-manage/src/main/java/com/ruoyi/manage/domain/LedgerRfid.java b/ruoyi-manage/src/main/java/com/ruoyi/manage/domain/LedgerRfid.java index da49fe2..a3173b4 100644 --- a/ruoyi-manage/src/main/java/com/ruoyi/manage/domain/LedgerRfid.java +++ b/ruoyi-manage/src/main/java/com/ruoyi/manage/domain/LedgerRfid.java @@ -6,6 +6,8 @@ import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseEntity; +import java.util.List; + /** * 轮挡台账对象 ledger_rfid * @@ -51,12 +53,21 @@ public class LedgerRfid extends BaseEntity { */ @Excel(name = "位置编码") private String locationCode; - + private List baseLocationList; /** * 是否报废 */ @Excel(name = "轮挡状态", readConverterExp = "1=正常,2=报废,3=报废处理") private String isScrap; + private String dictLabel; + + public String getDictLabel() { + return dictLabel; + } + + public void setDictLabel(String dictLabel) { + this.dictLabel = dictLabel; + } public void setObjid(Long objid) { this.objid = objid; @@ -114,6 +125,15 @@ public class LedgerRfid extends BaseEntity { return isScrap; } + + public List getBaseLocationList() { + return baseLocationList; + } + + public void setBaseLocationList(List baseLocationList) { + this.baseLocationList = baseLocationList; + } + @Override public String toString() { return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE).append("objid", getObjid()).append("manufacturerId", getManufacturerId()).append("rifdCode", getRifdCode()).append("batchCode", getBatchCode()).append("locationType", getLocationType()).append("locationCode", getLocationCode()).append("isScrap", getIsScrap()).append("updateTime", getUpdateTime()).toString(); diff --git a/ruoyi-manage/src/main/java/com/ruoyi/manage/domain/RecordInvalidated.java b/ruoyi-manage/src/main/java/com/ruoyi/manage/domain/RecordInvalidated.java new file mode 100644 index 0000000..a5676ad --- /dev/null +++ b/ruoyi-manage/src/main/java/com/ruoyi/manage/domain/RecordInvalidated.java @@ -0,0 +1,53 @@ +package com.ruoyi.manage.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 轮挡报废记录对象 record_invalidated + * + * @author wangh + * @date 2024-01-26 + */ +public class RecordInvalidated extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 主键 */ + private Long objid; + + /** RFID */ + @Excel(name = "RFID") + private String epc; + + public void setObjid(Long objid) + { + this.objid = objid; + } + + public Long getObjid() + { + return objid; + } + public void setEpc(String epc) + { + this.epc = epc; + } + + public String getEpc() + { + return epc; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("objid", getObjid()) + .append("epc", getEpc()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .toString(); + } +} diff --git a/ruoyi-manage/src/main/java/com/ruoyi/manage/mapper/BaseAreaUserMapper.java b/ruoyi-manage/src/main/java/com/ruoyi/manage/mapper/BaseAreaUserMapper.java new file mode 100644 index 0000000..eedb3ae --- /dev/null +++ b/ruoyi-manage/src/main/java/com/ruoyi/manage/mapper/BaseAreaUserMapper.java @@ -0,0 +1,66 @@ +package com.ruoyi.manage.mapper; + +import java.util.List; + +import com.ruoyi.common.core.domain.entity.SysUser; +import com.ruoyi.manage.domain.BaseAreaUser; +import org.springframework.stereotype.Repository; +/** + * 机场区域用户绑定Mapper接口 + * + * @author wangh + * @date 2024-01-25 + */ +@Repository +public interface BaseAreaUserMapper +{ + /** + * 查询机场区域用户绑定 + * + * @param objid 机场区域用户绑定主键 + * @return 机场区域用户绑定 + */ + public BaseAreaUser selectBaseAreaUserByObjid(Long objid); + + /** + * 查询机场区域用户绑定列表 + * + * @param baseAreaUser 机场区域用户绑定 + * @return 机场区域用户绑定集合 + */ + public List selectBaseAreaUserList(BaseAreaUser baseAreaUser); + + /** + * 新增机场区域用户绑定 + * + * @param baseAreaUser 机场区域用户绑定 + * @return 结果 + */ + public int insertBaseAreaUser(BaseAreaUser baseAreaUser); + + /** + * 修改机场区域用户绑定 + * + * @param baseAreaUser 机场区域用户绑定 + * @return 结果 + */ + public int updateBaseAreaUser(BaseAreaUser baseAreaUser); + + /** + * 删除机场区域用户绑定 + * + * @param objid 机场区域用户绑定主键 + * @return 结果 + */ + public int deleteBaseAreaUserByObjid(Long objid); + + /** + * 批量删除机场区域用户绑定 + * + * @param objids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteBaseAreaUserByObjids(String[] objids); + + List selectSysUser(); +} diff --git a/ruoyi-manage/src/main/java/com/ruoyi/manage/mapper/RecordInvalidatedMapper.java b/ruoyi-manage/src/main/java/com/ruoyi/manage/mapper/RecordInvalidatedMapper.java new file mode 100644 index 0000000..0b1f8b3 --- /dev/null +++ b/ruoyi-manage/src/main/java/com/ruoyi/manage/mapper/RecordInvalidatedMapper.java @@ -0,0 +1,62 @@ +package com.ruoyi.manage.mapper; + +import java.util.List; +import com.ruoyi.manage.domain.RecordInvalidated; +import org.springframework.stereotype.Repository; +/** + * 轮挡报废记录Mapper接口 + * + * @author wangh + * @date 2024-01-26 + */ +@Repository +public interface RecordInvalidatedMapper +{ + /** + * 查询轮挡报废记录 + * + * @param objid 轮挡报废记录主键 + * @return 轮挡报废记录 + */ + public RecordInvalidated selectRecordInvalidatedByObjid(Long objid); + + /** + * 查询轮挡报废记录列表 + * + * @param recordInvalidated 轮挡报废记录 + * @return 轮挡报废记录集合 + */ + public List selectRecordInvalidatedList(RecordInvalidated recordInvalidated); + + /** + * 新增轮挡报废记录 + * + * @param recordInvalidated 轮挡报废记录 + * @return 结果 + */ + public int insertRecordInvalidated(RecordInvalidated recordInvalidated); + + /** + * 修改轮挡报废记录 + * + * @param recordInvalidated 轮挡报废记录 + * @return 结果 + */ + public int updateRecordInvalidated(RecordInvalidated recordInvalidated); + + /** + * 删除轮挡报废记录 + * + * @param objid 轮挡报废记录主键 + * @return 结果 + */ + public int deleteRecordInvalidatedByObjid(Long objid); + + /** + * 批量删除轮挡报废记录 + * + * @param objids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteRecordInvalidatedByObjids(String[] objids); +} diff --git a/ruoyi-manage/src/main/java/com/ruoyi/manage/service/IBaseAreaUserService.java b/ruoyi-manage/src/main/java/com/ruoyi/manage/service/IBaseAreaUserService.java new file mode 100644 index 0000000..d5d6412 --- /dev/null +++ b/ruoyi-manage/src/main/java/com/ruoyi/manage/service/IBaseAreaUserService.java @@ -0,0 +1,61 @@ +package com.ruoyi.manage.service; + +import java.util.List; +import com.ruoyi.manage.domain.BaseAreaUser; + +/** + * 机场区域用户绑定Service接口 + * + * @author wangh + * @date 2024-01-25 + */ +public interface IBaseAreaUserService +{ + /** + * 查询机场区域用户绑定 + * + * @param objid 机场区域用户绑定主键 + * @return 机场区域用户绑定 + */ + public BaseAreaUser selectBaseAreaUserByObjid(Long objid); + + /** + * 查询机场区域用户绑定列表 + * + * @param baseAreaUser 机场区域用户绑定 + * @return 机场区域用户绑定集合 + */ + public List selectBaseAreaUserList(BaseAreaUser baseAreaUser); + + /** + * 新增机场区域用户绑定 + * + * @param baseAreaUser 机场区域用户绑定 + * @return 结果 + */ + public int insertBaseAreaUser(BaseAreaUser baseAreaUser); + + /** + * 修改机场区域用户绑定 + * + * @param baseAreaUser 机场区域用户绑定 + * @return 结果 + */ + public int updateBaseAreaUser(BaseAreaUser baseAreaUser); + + /** + * 批量删除机场区域用户绑定 + * + * @param objids 需要删除的机场区域用户绑定主键集合 + * @return 结果 + */ + public int deleteBaseAreaUserByObjids(String objids); + + /** + * 删除机场区域用户绑定信息 + * + * @param objid 机场区域用户绑定主键 + * @return 结果 + */ + public int deleteBaseAreaUserByObjid(Long objid); +} diff --git a/ruoyi-manage/src/main/java/com/ruoyi/manage/service/IRecordInvalidatedService.java b/ruoyi-manage/src/main/java/com/ruoyi/manage/service/IRecordInvalidatedService.java new file mode 100644 index 0000000..81af1c4 --- /dev/null +++ b/ruoyi-manage/src/main/java/com/ruoyi/manage/service/IRecordInvalidatedService.java @@ -0,0 +1,61 @@ +package com.ruoyi.manage.service; + +import java.util.List; +import com.ruoyi.manage.domain.RecordInvalidated; + +/** + * 轮挡报废记录Service接口 + * + * @author wangh + * @date 2024-01-26 + */ +public interface IRecordInvalidatedService +{ + /** + * 查询轮挡报废记录 + * + * @param objid 轮挡报废记录主键 + * @return 轮挡报废记录 + */ + public RecordInvalidated selectRecordInvalidatedByObjid(Long objid); + + /** + * 查询轮挡报废记录列表 + * + * @param recordInvalidated 轮挡报废记录 + * @return 轮挡报废记录集合 + */ + public List selectRecordInvalidatedList(RecordInvalidated recordInvalidated); + + /** + * 新增轮挡报废记录 + * + * @param recordInvalidated 轮挡报废记录 + * @return 结果 + */ + public int insertRecordInvalidated(RecordInvalidated recordInvalidated); + + /** + * 修改轮挡报废记录 + * + * @param recordInvalidated 轮挡报废记录 + * @return 结果 + */ + public int updateRecordInvalidated(RecordInvalidated recordInvalidated); + + /** + * 批量删除轮挡报废记录 + * + * @param objids 需要删除的轮挡报废记录主键集合 + * @return 结果 + */ + public int deleteRecordInvalidatedByObjids(String objids); + + /** + * 删除轮挡报废记录信息 + * + * @param objid 轮挡报废记录主键 + * @return 结果 + */ + public int deleteRecordInvalidatedByObjid(Long objid); +} diff --git a/ruoyi-manage/src/main/java/com/ruoyi/manage/service/impl/BaseAreaUserServiceImpl.java b/ruoyi-manage/src/main/java/com/ruoyi/manage/service/impl/BaseAreaUserServiceImpl.java new file mode 100644 index 0000000..324f064 --- /dev/null +++ b/ruoyi-manage/src/main/java/com/ruoyi/manage/service/impl/BaseAreaUserServiceImpl.java @@ -0,0 +1,97 @@ +package com.ruoyi.manage.service.impl; + +import java.util.List; + + +import com.ruoyi.common.core.domain.entity.SysUser; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.manage.mapper.BaseAreaUserMapper; +import com.ruoyi.manage.domain.BaseAreaUser; +import com.ruoyi.manage.service.IBaseAreaUserService; +import com.ruoyi.common.core.text.Convert; + +/** + * 机场区域用户绑定Service业务层处理 + * + * @author wangh + * @date 2024-01-25 + */ +@Service("baseAreaUserServiceImpl") +public class BaseAreaUserServiceImpl implements IBaseAreaUserService { + @Autowired + private BaseAreaUserMapper baseAreaUserMapper; + + /** + * 查询机场区域用户绑定 + * + * @param objid 机场区域用户绑定主键 + * @return 机场区域用户绑定 + */ + @Override + public BaseAreaUser selectBaseAreaUserByObjid(Long objid) { + return baseAreaUserMapper.selectBaseAreaUserByObjid(objid); + } + + /** + * 查询机场区域用户绑定列表 + * + * @param baseAreaUser 机场区域用户绑定 + * @return 机场区域用户绑定 + */ + @Override + public List selectBaseAreaUserList(BaseAreaUser baseAreaUser) { + return baseAreaUserMapper.selectBaseAreaUserList(baseAreaUser); + } + + /** + * 新增机场区域用户绑定 + * + * @param baseAreaUser 机场区域用户绑定 + * @return 结果 + */ + @Override + public int insertBaseAreaUser(BaseAreaUser baseAreaUser) { + + + + return baseAreaUserMapper.insertBaseAreaUser(baseAreaUser); + } + + /** + * 修改机场区域用户绑定 + * + * @param baseAreaUser 机场区域用户绑定 + * @return 结果 + */ + @Override + public int updateBaseAreaUser(BaseAreaUser baseAreaUser) { + return baseAreaUserMapper.updateBaseAreaUser(baseAreaUser); + } + + /** + * 批量删除机场区域用户绑定 + * + * @param objids 需要删除的机场区域用户绑定主键 + * @return 结果 + */ + @Override + public int deleteBaseAreaUserByObjids(String objids) { + return baseAreaUserMapper.deleteBaseAreaUserByObjids(Convert.toStrArray(objids)); + } + + /** + * 删除机场区域用户绑定信息 + * + * @param objid 机场区域用户绑定主键 + * @return 结果 + */ + @Override + public int deleteBaseAreaUserByObjid(Long objid) { + return baseAreaUserMapper.deleteBaseAreaUserByObjid(objid); + } + + public List selectSysUser(){ + return baseAreaUserMapper.selectSysUser(); + } +} diff --git a/ruoyi-manage/src/main/java/com/ruoyi/manage/service/impl/RecordInvalidatedServiceImpl.java b/ruoyi-manage/src/main/java/com/ruoyi/manage/service/impl/RecordInvalidatedServiceImpl.java new file mode 100644 index 0000000..9bbcb1a --- /dev/null +++ b/ruoyi-manage/src/main/java/com/ruoyi/manage/service/impl/RecordInvalidatedServiceImpl.java @@ -0,0 +1,92 @@ +package com.ruoyi.manage.service.impl; + +import java.util.List; + + +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.common.utils.ShiroUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.manage.mapper.RecordInvalidatedMapper; +import com.ruoyi.manage.domain.RecordInvalidated; +import com.ruoyi.manage.service.IRecordInvalidatedService; +import com.ruoyi.common.core.text.Convert; + +/** + * 轮挡报废记录Service业务层处理 + * + * @author wangh + * @date 2024-01-26 + */ +@Service +public class RecordInvalidatedServiceImpl implements IRecordInvalidatedService { + @Autowired + private RecordInvalidatedMapper recordInvalidatedMapper; + + /** + * 查询轮挡报废记录 + * + * @param objid 轮挡报废记录主键 + * @return 轮挡报废记录 + */ + @Override + public RecordInvalidated selectRecordInvalidatedByObjid(Long objid) { + return recordInvalidatedMapper.selectRecordInvalidatedByObjid(objid); + } + + /** + * 查询轮挡报废记录列表 + * + * @param recordInvalidated 轮挡报废记录 + * @return 轮挡报废记录 + */ + @Override + public List selectRecordInvalidatedList(RecordInvalidated recordInvalidated) { + return recordInvalidatedMapper.selectRecordInvalidatedList(recordInvalidated); + } + + /** + * 新增轮挡报废记录 + * + * @param recordInvalidated 轮挡报废记录 + * @return 结果 + */ + @Override + public int insertRecordInvalidated(RecordInvalidated recordInvalidated) { + recordInvalidated.setCreateTime(DateUtils.getNowDate()); + return recordInvalidatedMapper.insertRecordInvalidated(recordInvalidated); + } + + /** + * 修改轮挡报废记录 + * + * @param recordInvalidated 轮挡报废记录 + * @return 结果 + */ + @Override + public int updateRecordInvalidated(RecordInvalidated recordInvalidated) { + return recordInvalidatedMapper.updateRecordInvalidated(recordInvalidated); + } + + /** + * 批量删除轮挡报废记录 + * + * @param objids 需要删除的轮挡报废记录主键 + * @return 结果 + */ + @Override + public int deleteRecordInvalidatedByObjids(String objids) { + return recordInvalidatedMapper.deleteRecordInvalidatedByObjids(Convert.toStrArray(objids)); + } + + /** + * 删除轮挡报废记录信息 + * + * @param objid 轮挡报废记录主键 + * @return 结果 + */ + @Override + public int deleteRecordInvalidatedByObjid(Long objid) { + return recordInvalidatedMapper.deleteRecordInvalidatedByObjid(objid); + } +} diff --git a/ruoyi-manage/src/main/resources/create_menu_sql/base_area_userMenu.sql b/ruoyi-manage/src/main/resources/create_menu_sql/base_area_userMenu.sql new file mode 100644 index 0000000..7a34c9a --- /dev/null +++ b/ruoyi-manage/src/main/resources/create_menu_sql/base_area_userMenu.sql @@ -0,0 +1,22 @@ +-- 菜单 SQL +insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values('机场区域用户绑定', '4', '5', '/manage/base_area_user', 'C', '0', 'manage:base_area_user:view', '#', 'admin', sysdate(), '', null, '机场区域用户绑定菜单'); + +-- 按钮父菜单ID +SELECT @parentId := LAST_INSERT_ID(); + +-- 按钮 SQL +insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values('机场区域用户绑定查询', @parentId, '1', '#', 'F', '0', 'manage:base_area_user:list', '#', 'admin', sysdate(), '', null, ''); + +insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values('机场区域用户绑定新增', @parentId, '2', '#', 'F', '0', 'manage:base_area_user:add', '#', 'admin', sysdate(), '', null, ''); + +insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values('机场区域用户绑定修改', @parentId, '3', '#', 'F', '0', 'manage:base_area_user:edit', '#', 'admin', sysdate(), '', null, ''); + +insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values('机场区域用户绑定删除', @parentId, '4', '#', 'F', '0', 'manage:base_area_user:remove', '#', 'admin', sysdate(), '', null, ''); + +insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values('机场区域用户绑定导出', @parentId, '5', '#', 'F', '0', 'manage:base_area_user:export', '#', 'admin', sysdate(), '', null, ''); diff --git a/ruoyi-manage/src/main/resources/create_menu_sql/record_invalidatedMenu.sql b/ruoyi-manage/src/main/resources/create_menu_sql/record_invalidatedMenu.sql new file mode 100644 index 0000000..e3b7727 --- /dev/null +++ b/ruoyi-manage/src/main/resources/create_menu_sql/record_invalidatedMenu.sql @@ -0,0 +1,22 @@ +-- 菜单 SQL +insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values('轮挡报废记录', '2026', '5', '/manage/record_invalidated', 'C', '0', 'manage:record_invalidated:view', '#', 'admin', sysdate(), '', null, '轮挡报废记录菜单'); + +-- 按钮父菜单ID +SELECT @parentId := LAST_INSERT_ID(); + +-- 按钮 SQL +insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values('轮挡报废记录查询', @parentId, '1', '#', 'F', '0', 'manage:record_invalidated:list', '#', 'admin', sysdate(), '', null, ''); + +insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values('轮挡报废记录新增', @parentId, '2', '#', 'F', '0', 'manage:record_invalidated:add', '#', 'admin', sysdate(), '', null, ''); + +insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values('轮挡报废记录修改', @parentId, '3', '#', 'F', '0', 'manage:record_invalidated:edit', '#', 'admin', sysdate(), '', null, ''); + +insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values('轮挡报废记录删除', @parentId, '4', '#', 'F', '0', 'manage:record_invalidated:remove', '#', 'admin', sysdate(), '', null, ''); + +insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values('轮挡报废记录导出', @parentId, '5', '#', 'F', '0', 'manage:record_invalidated:export', '#', 'admin', sysdate(), '', null, ''); diff --git a/ruoyi-manage/src/main/resources/mapper/manage/BaseAreaUserMapper.xml b/ruoyi-manage/src/main/resources/mapper/manage/BaseAreaUserMapper.xml new file mode 100644 index 0000000..777564f --- /dev/null +++ b/ruoyi-manage/src/main/resources/mapper/manage/BaseAreaUserMapper.xml @@ -0,0 +1,73 @@ + + + + + + + + + + + + + + select objid, bau.user_id, area_id, su.login_name, su.user_name ,bs.store_name + from base_area_user bau + left join sys_user su on bau.user_id = su.user_id + left join base_store bs on bs.store_id = area_id + + + + + + + + insert into base_area_user + + user_id, + area_id, + + + #{userId}, + #{areaId}, + + + + + update base_area_user + + user_id = #{userId}, + area_id = #{areaId}, + + where objid = #{objid} + + + + delete from base_area_user where objid = #{objid} + + + + delete from base_area_user where objid in + + #{objid} + + + + + + \ No newline at end of file diff --git a/ruoyi-manage/src/main/resources/mapper/manage/LedgerRfidMapper.xml b/ruoyi-manage/src/main/resources/mapper/manage/LedgerRfidMapper.xml index 83ad051..81c6fa4 100644 --- a/ruoyi-manage/src/main/resources/mapper/manage/LedgerRfidMapper.xml +++ b/ruoyi-manage/src/main/resources/mapper/manage/LedgerRfidMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -13,6 +13,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + diff --git a/ruoyi-manage/src/main/resources/mapper/manage/RecordInvalidatedMapper.xml b/ruoyi-manage/src/main/resources/mapper/manage/RecordInvalidatedMapper.xml new file mode 100644 index 0000000..c0b6f95 --- /dev/null +++ b/ruoyi-manage/src/main/resources/mapper/manage/RecordInvalidatedMapper.xml @@ -0,0 +1,69 @@ + + + + + + + + + + + + + select objid, epc, create_by, create_time from record_invalidated + + + + + + + + insert into record_invalidated + + epc, + create_by, + create_time, + remark, + + + #{epc}, + #{createBy}, + #{createTime}, + #{remark }, + + + + + update record_invalidated + + epc = #{epc}, + create_by = #{createBy}, + create_time = #{createTime}, + + where objid = #{objid} + + + + delete from record_invalidated where objid = #{objid} + + + + delete from record_invalidated where objid in + + #{objid} + + + + \ No newline at end of file diff --git a/ruoyi-manage/src/main/resources/templates/manage/base_area_user/add.html b/ruoyi-manage/src/main/resources/templates/manage/base_area_user/add.html new file mode 100644 index 0000000..83c4b81 --- /dev/null +++ b/ruoyi-manage/src/main/resources/templates/manage/base_area_user/add.html @@ -0,0 +1,41 @@ + + + + + + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-manage/src/main/resources/templates/manage/base_area_user/base_area_user.html b/ruoyi-manage/src/main/resources/templates/manage/base_area_user/base_area_user.html new file mode 100644 index 0000000..d990001 --- /dev/null +++ b/ruoyi-manage/src/main/resources/templates/manage/base_area_user/base_area_user.html @@ -0,0 +1,117 @@ + + + + + + +
+
+
+
+
+
    +
  • + + +
    • +
  • + + +
    • +
  • +  搜索 +  重置 +
    • +
+
+
+
+ + +
+
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-manage/src/main/resources/templates/manage/base_area_user/edit.html b/ruoyi-manage/src/main/resources/templates/manage/base_area_user/edit.html new file mode 100644 index 0000000..2b2c9c8 --- /dev/null +++ b/ruoyi-manage/src/main/resources/templates/manage/base_area_user/edit.html @@ -0,0 +1,42 @@ + + + + + + +
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-manage/src/main/resources/templates/manage/record_invalidated/add.html b/ruoyi-manage/src/main/resources/templates/manage/record_invalidated/add.html new file mode 100644 index 0000000..393e61f --- /dev/null +++ b/ruoyi-manage/src/main/resources/templates/manage/record_invalidated/add.html @@ -0,0 +1,31 @@ + + + + + + +
+
+
+ +
+ +
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-manage/src/main/resources/templates/manage/record_invalidated/edit.html b/ruoyi-manage/src/main/resources/templates/manage/record_invalidated/edit.html new file mode 100644 index 0000000..2ae2e49 --- /dev/null +++ b/ruoyi-manage/src/main/resources/templates/manage/record_invalidated/edit.html @@ -0,0 +1,32 @@ + + + + + + +
+
+ +
+ +
+ +
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-manage/src/main/resources/templates/manage/record_invalidated/record_invalidated.html b/ruoyi-manage/src/main/resources/templates/manage/record_invalidated/record_invalidated.html new file mode 100644 index 0000000..5a41a00 --- /dev/null +++ b/ruoyi-manage/src/main/resources/templates/manage/record_invalidated/record_invalidated.html @@ -0,0 +1,104 @@ + + + + + + +
+
+
+
+
+
    +
  • + + +
    • +
  • + + +
    • +
  • + + + - + +
    • +
  • +  搜索 +  重置 +
    • +
+
+
+
+ + +
+
+
+
+
+ + + + \ No newline at end of file