diff --git a/admin-hanhai-vue/.env.development b/admin-hanhai-vue/.env.development index 1897f47..a3e7f2a 100644 --- a/admin-hanhai-vue/.env.development +++ b/admin-hanhai-vue/.env.development @@ -1,5 +1,6 @@ NODE_ENV=development -VUE_APP_API_BASE_URL=http://localhost:8000/exhibit-admin/ +VUE_APP_API_BASE_URL=https://exhibit.augcl.com/exhibit-admin/ +//VUE_APP_API_BASE_URL=http://localhost:8000/exhibit-admin/ VUE_APP_CAS_BASE_URL=http://cas.example.org:8443/cas VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview diff --git a/admin-hanhai-vue/.env.production b/admin-hanhai-vue/.env.production index 476e70f..35f8ece 100644 --- a/admin-hanhai-vue/.env.production +++ b/admin-hanhai-vue/.env.production @@ -1,4 +1,5 @@ NODE_ENV=production -VUE_APP_API_BASE_URL=http://localhost:8000/exhibit-admin/ +VUE_APP_API_BASE_URL=https://exhibit.augcl.com/exhibit-admin/ +//VUE_APP_API_BASE_URL=http://localhost:8000/exhibit-admin/ VUE_APP_CAS_BASE_URL=http://localhost:8888/cas VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitDepartmentPermission/controller/ExhibitDepartmentPermissionController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitDepartmentPermission/controller/ExhibitDepartmentPermissionController.java new file mode 100644 index 0000000..b6339f6 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitDepartmentPermission/controller/ExhibitDepartmentPermissionController.java @@ -0,0 +1,171 @@ +package org.jeecg.modules.exhibitDepartmentPermission.controller; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.common.util.oConvertUtils; +import org.jeecg.modules.exhibitDepartmentPermission.entity.ExhibitDepartmentPermission; +import org.jeecg.modules.exhibitDepartmentPermission.service.IExhibitDepartmentPermissionService; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; + +import org.jeecgframework.poi.excel.ExcelImportUtil; +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.entity.ImportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; +import org.jeecg.common.system.base.controller.JeecgController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; +import org.springframework.web.servlet.ModelAndView; +import com.alibaba.fastjson.JSON; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.jeecg.common.aspect.annotation.AutoLog; + + /** + * @Description: 部门权限信息表 + * @Author: jeecg-boot + * @Date: 2025-09-15 + * @Version: V1.0 + */ +@Api(tags="部门权限信息表") +@RestController +@RequestMapping("/exhibitDepartmentPermission/exhibitDepartmentPermission") +@Slf4j +public class ExhibitDepartmentPermissionController extends JeecgController { + @Autowired + private IExhibitDepartmentPermissionService exhibitDepartmentPermissionService; + + /** + * 分页列表查询 + * + * @param exhibitDepartmentPermission + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "部门权限信息表-分页列表查询") + @ApiOperation(value="部门权限信息表-分页列表查询", notes="部门权限信息表-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(ExhibitDepartmentPermission exhibitDepartmentPermission, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(exhibitDepartmentPermission, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = exhibitDepartmentPermissionService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param exhibitDepartmentPermission + * @return + */ + @AutoLog(value = "部门权限信息表-添加") + @ApiOperation(value="部门权限信息表-添加", notes="部门权限信息表-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody ExhibitDepartmentPermission exhibitDepartmentPermission) { + exhibitDepartmentPermissionService.save(exhibitDepartmentPermission); + return Result.OK("添加成功!"); + } + + /** + * 编辑 + * + * @param exhibitDepartmentPermission + * @return + */ + @AutoLog(value = "部门权限信息表-编辑") + @ApiOperation(value="部门权限信息表-编辑", notes="部门权限信息表-编辑") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody ExhibitDepartmentPermission exhibitDepartmentPermission) { + exhibitDepartmentPermissionService.updateById(exhibitDepartmentPermission); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "部门权限信息表-通过id删除") + @ApiOperation(value="部门权限信息表-通过id删除", notes="部门权限信息表-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + exhibitDepartmentPermissionService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "部门权限信息表-批量删除") + @ApiOperation(value="部门权限信息表-批量删除", notes="部门权限信息表-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.exhibitDepartmentPermissionService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + //@AutoLog(value = "部门权限信息表-通过id查询") + @ApiOperation(value="部门权限信息表-通过id查询", notes="部门权限信息表-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + ExhibitDepartmentPermission exhibitDepartmentPermission = exhibitDepartmentPermissionService.getById(id); + if(exhibitDepartmentPermission==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(exhibitDepartmentPermission); + } + + /** + * 导出excel + * + * @param request + * @param exhibitDepartmentPermission + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, ExhibitDepartmentPermission exhibitDepartmentPermission) { + return super.exportXls(request, exhibitDepartmentPermission, ExhibitDepartmentPermission.class, "部门权限信息表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, ExhibitDepartmentPermission.class); + } + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitDepartmentPermission/entity/ExhibitDepartmentPermission.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitDepartmentPermission/entity/ExhibitDepartmentPermission.java new file mode 100644 index 0000000..2dffd9b --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitDepartmentPermission/entity/ExhibitDepartmentPermission.java @@ -0,0 +1,60 @@ +package org.jeecg.modules.exhibitDepartmentPermission.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.util.Date; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.jeecg.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: 部门权限信息表 + * @Author: jeecg-boot + * @Date: 2025-09-15 + * @Version: V1.0 + */ +@Data +@TableName("exhibit_department_permission") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="exhibit_department_permission对象", description="部门权限信息表") +public class ExhibitDepartmentPermission implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private java.lang.String id; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + /**创建日期*/ + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + /**更新日期*/ + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + /**关联部门*/ + @Excel(name = "关联部门", width = 15, dictTable = "exhibit_department", dicText = "title", dicCode = "id") + @Dict(dictTable = "exhibit_department", dicText = "title", dicCode = "id") + @ApiModelProperty(value = "关联部门") + private java.lang.String departmentId; + /**关联权限*/ + @Excel(name = "关联权限", width = 15, dictTable = "exhibit_permission", dicText = "title", dicCode = "id") + @Dict(dictTable = "exhibit_permission", dicText = "title", dicCode = "id") + @ApiModelProperty(value = "关联权限") + private java.lang.String permissionId; +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitDepartmentPermission/mapper/ExhibitDepartmentPermissionMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitDepartmentPermission/mapper/ExhibitDepartmentPermissionMapper.java new file mode 100644 index 0000000..7bcb432 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitDepartmentPermission/mapper/ExhibitDepartmentPermissionMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.exhibitDepartmentPermission.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.exhibitDepartmentPermission.entity.ExhibitDepartmentPermission; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 部门权限信息表 + * @Author: jeecg-boot + * @Date: 2025-09-15 + * @Version: V1.0 + */ +public interface ExhibitDepartmentPermissionMapper extends BaseMapper { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitDepartmentPermission/mapper/xml/ExhibitDepartmentPermissionMapper.xml b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitDepartmentPermission/mapper/xml/ExhibitDepartmentPermissionMapper.xml new file mode 100644 index 0000000..fa535f4 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitDepartmentPermission/mapper/xml/ExhibitDepartmentPermissionMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitDepartmentPermission/service/IExhibitDepartmentPermissionService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitDepartmentPermission/service/IExhibitDepartmentPermissionService.java new file mode 100644 index 0000000..06ab735 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitDepartmentPermission/service/IExhibitDepartmentPermissionService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.exhibitDepartmentPermission.service; + +import org.jeecg.modules.exhibitDepartmentPermission.entity.ExhibitDepartmentPermission; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 部门权限信息表 + * @Author: jeecg-boot + * @Date: 2025-09-15 + * @Version: V1.0 + */ +public interface IExhibitDepartmentPermissionService extends IService { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitDepartmentPermission/service/impl/ExhibitDepartmentPermissionServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitDepartmentPermission/service/impl/ExhibitDepartmentPermissionServiceImpl.java new file mode 100644 index 0000000..d9d16b1 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitDepartmentPermission/service/impl/ExhibitDepartmentPermissionServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.exhibitDepartmentPermission.service.impl; + +import org.jeecg.modules.exhibitDepartmentPermission.entity.ExhibitDepartmentPermission; +import org.jeecg.modules.exhibitDepartmentPermission.mapper.ExhibitDepartmentPermissionMapper; +import org.jeecg.modules.exhibitDepartmentPermission.service.IExhibitDepartmentPermissionService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 部门权限信息表 + * @Author: jeecg-boot + * @Date: 2025-09-15 + * @Version: V1.0 + */ +@Service +public class ExhibitDepartmentPermissionServiceImpl extends ServiceImpl implements IExhibitDepartmentPermissionService { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitDepartmentPermission/vue/ExhibitDepartmentPermissionList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitDepartmentPermission/vue/ExhibitDepartmentPermissionList.vue new file mode 100644 index 0000000..baf6000 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitDepartmentPermission/vue/ExhibitDepartmentPermissionList.vue @@ -0,0 +1,178 @@ + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitDepartmentPermission/vue/modules/ExhibitDepartmentPermissionForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitDepartmentPermission/vue/modules/ExhibitDepartmentPermissionForm.vue new file mode 100644 index 0000000..6daba0c --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitDepartmentPermission/vue/modules/ExhibitDepartmentPermissionForm.vue @@ -0,0 +1,109 @@ + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitDepartmentPermission/vue/modules/ExhibitDepartmentPermissionModal.Style#Drawer.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitDepartmentPermission/vue/modules/ExhibitDepartmentPermissionModal.Style#Drawer.vue new file mode 100644 index 0000000..323b49f --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitDepartmentPermission/vue/modules/ExhibitDepartmentPermissionModal.Style#Drawer.vue @@ -0,0 +1,84 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitDepartmentPermission/vue/modules/ExhibitDepartmentPermissionModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitDepartmentPermission/vue/modules/ExhibitDepartmentPermissionModal.vue new file mode 100644 index 0000000..ae1c90e --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitDepartmentPermission/vue/modules/ExhibitDepartmentPermissionModal.vue @@ -0,0 +1,60 @@ + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitDepartmentPermission/vue3/ExhibitDepartmentPermission.api.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitDepartmentPermission/vue3/ExhibitDepartmentPermission.api.ts new file mode 100644 index 0000000..749e074 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitDepartmentPermission/vue3/ExhibitDepartmentPermission.api.ts @@ -0,0 +1,61 @@ +import {defHttp} from '/@/utils/http/axios'; +import {Modal} from 'ant-design-vue'; + +enum Api { + list = '/exhibitDepartmentPermission/exhibitDepartmentPermission/list', + save='/exhibitDepartmentPermission/exhibitDepartmentPermission/add', + edit='/exhibitDepartmentPermission/exhibitDepartmentPermission/edit', + deleteOne = '/exhibitDepartmentPermission/exhibitDepartmentPermission/delete', + deleteBatch = '/exhibitDepartmentPermission/exhibitDepartmentPermission/deleteBatch', + importExcel = '/exhibitDepartmentPermission/exhibitDepartmentPermission/importExcel', + exportXls = '/exhibitDepartmentPermission/exhibitDepartmentPermission/exportXls', +} +/** + * 导出api + * @param params + */ +export const getExportUrl = Api.exportXls; +/** + * 导入api + */ +export const getImportUrl = Api.importExcel; +/** + * 列表接口 + * @param params + */ +export const list = (params) => + defHttp.get({url: Api.list, params}); + +/** + * 删除单个 + */ +export const deleteOne = (params,handleSuccess) => { + return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => { + handleSuccess(); + }); +} +/** + * 批量删除 + * @param params + */ +export const batchDelete = (params, handleSuccess) => { + Modal.confirm({ + title: '确认删除', + content: '是否删除选中数据', + okText: '确认', + cancelText: '取消', + onOk: () => { + return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => { + handleSuccess(); + }); + } + }); +} +/** + * 保存或者更新 + * @param params + */ +export const saveOrUpdate = (params, isUpdate) => { + let url = isUpdate ? Api.edit : Api.save; + return defHttp.post({url: url, params}); +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitDepartmentPermission/vue3/ExhibitDepartmentPermission.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitDepartmentPermission/vue3/ExhibitDepartmentPermission.data.ts new file mode 100644 index 0000000..c363775 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitDepartmentPermission/vue3/ExhibitDepartmentPermission.data.ts @@ -0,0 +1,39 @@ +import {BasicColumn} from '/@/components/Table'; +import {FormSchema} from '/@/components/Table'; +import { rules} from '/@/utils/helper/validator'; +import { render } from '/@/utils/common/renderUtils'; +//列表数据 +export const columns: BasicColumn[] = [ + { + title: '关联部门', + align:"center", + dataIndex: 'departmentId_dictText' + }, + { + title: '关联权限', + align:"center", + dataIndex: 'permissionId_dictText' + }, +]; +//查询数据 +export const searchFormSchema: FormSchema[] = [ +]; +//表单数据 +export const formSchema: FormSchema[] = [ + { + label: '关联部门', + field: 'departmentId', + component: 'JDictSelectTag', + componentProps:{ + dictCode:"exhibit_department,title,id" + }, + }, + { + label: '关联权限', + field: 'permissionId', + component: 'JMultiSelectTag',//TODO 暂无该组件 + componentProps:{ + dictCode:"exhibit_permission,title,id" + }, + }, +]; diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitDepartmentPermission/vue3/ExhibitDepartmentPermissionList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitDepartmentPermission/vue3/ExhibitDepartmentPermissionList.vue new file mode 100644 index 0000000..1e662ab --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitDepartmentPermission/vue3/ExhibitDepartmentPermissionList.vue @@ -0,0 +1,162 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitDepartmentPermission/vue3/components/ExhibitDepartmentPermissionModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitDepartmentPermission/vue3/components/ExhibitDepartmentPermissionModal.vue new file mode 100644 index 0000000..11d508f --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitDepartmentPermission/vue3/components/ExhibitDepartmentPermissionModal.vue @@ -0,0 +1,58 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMaintenance/controller/ExhibitMaintenanceController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMaintenance/controller/ExhibitMaintenanceController.java index 367069d..d481704 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMaintenance/controller/ExhibitMaintenanceController.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMaintenance/controller/ExhibitMaintenanceController.java @@ -45,7 +45,7 @@ import org.jeecg.common.aspect.annotation.AutoLog; /** * @Description: 保养信息记录表 * @Author: jeecg-boot - * @Date: 2025-08-28 + * @Date: 2025-09-15 * @Version: V1.0 */ @Api(tags="保养信息记录表") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMaintenance/entity/ExhibitMaintenance.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMaintenance/entity/ExhibitMaintenance.java index 482d336..4465d3c 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMaintenance/entity/ExhibitMaintenance.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMaintenance/entity/ExhibitMaintenance.java @@ -11,7 +11,6 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; -import org.jeecg.modules.exhibitRepair.entity.ExhibitRepairExpense; import org.springframework.format.annotation.DateTimeFormat; import org.jeecgframework.poi.excel.annotation.Excel; import org.jeecg.common.aspect.annotation.Dict; @@ -21,7 +20,7 @@ import io.swagger.annotations.ApiModelProperty; /** * @Description: 保养信息记录表 * @Author: jeecg-boot - * @Date: 2025-08-28 + * @Date: 2025-09-15 * @Version: V1.0 */ @ApiModel(value="exhibit_maintenance对象", description="保养信息记录表") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMaintenance/entity/ExhibitMaintenanceExpense.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMaintenance/entity/ExhibitMaintenanceExpense.java index ff62b9b..d9d76b6 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMaintenance/entity/ExhibitMaintenanceExpense.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMaintenance/entity/ExhibitMaintenanceExpense.java @@ -16,7 +16,7 @@ import java.io.UnsupportedEncodingException; /** * @Description: 保养费用明细记录表 * @Author: jeecg-boot - * @Date: 2025-08-28 + * @Date: 2025-09-15 * @Version: V1.0 */ @ApiModel(value="exhibit_maintenance_expense对象", description="保养费用明细记录表") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMaintenance/mapper/ExhibitMaintenanceExpenseMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMaintenance/mapper/ExhibitMaintenanceExpenseMapper.java index 11e6253..c65eefa 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMaintenance/mapper/ExhibitMaintenanceExpenseMapper.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMaintenance/mapper/ExhibitMaintenanceExpenseMapper.java @@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Param; /** * @Description: 保养费用明细记录表 * @Author: jeecg-boot - * @Date: 2025-08-28 + * @Date: 2025-09-15 * @Version: V1.0 */ public interface ExhibitMaintenanceExpenseMapper extends BaseMapper { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMaintenance/mapper/ExhibitMaintenanceMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMaintenance/mapper/ExhibitMaintenanceMapper.java index 9af591f..98a0726 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMaintenance/mapper/ExhibitMaintenanceMapper.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMaintenance/mapper/ExhibitMaintenanceMapper.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @Description: 保养信息记录表 * @Author: jeecg-boot - * @Date: 2025-08-28 + * @Date: 2025-09-15 * @Version: V1.0 */ public interface ExhibitMaintenanceMapper extends BaseMapper { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMaintenance/service/IExhibitMaintenanceExpenseService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMaintenance/service/IExhibitMaintenanceExpenseService.java index 0ead34f..fa70960 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMaintenance/service/IExhibitMaintenanceExpenseService.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMaintenance/service/IExhibitMaintenanceExpenseService.java @@ -7,7 +7,7 @@ import java.util.List; /** * @Description: 保养费用明细记录表 * @Author: jeecg-boot - * @Date: 2025-08-28 + * @Date: 2025-09-15 * @Version: V1.0 */ public interface IExhibitMaintenanceExpenseService extends IService { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMaintenance/service/IExhibitMaintenanceService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMaintenance/service/IExhibitMaintenanceService.java index 3bcc7b3..dd7f75a 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMaintenance/service/IExhibitMaintenanceService.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMaintenance/service/IExhibitMaintenanceService.java @@ -10,7 +10,7 @@ import java.util.List; /** * @Description: 保养信息记录表 * @Author: jeecg-boot - * @Date: 2025-08-28 + * @Date: 2025-09-15 * @Version: V1.0 */ public interface IExhibitMaintenanceService extends IService { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMaintenance/service/impl/ExhibitMaintenanceExpenseServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMaintenance/service/impl/ExhibitMaintenanceExpenseServiceImpl.java index ea874f1..706ecca 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMaintenance/service/impl/ExhibitMaintenanceExpenseServiceImpl.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMaintenance/service/impl/ExhibitMaintenanceExpenseServiceImpl.java @@ -11,7 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired; /** * @Description: 保养费用明细记录表 * @Author: jeecg-boot - * @Date: 2025-08-28 + * @Date: 2025-09-15 * @Version: V1.0 */ @Service diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMaintenance/service/impl/ExhibitMaintenanceServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMaintenance/service/impl/ExhibitMaintenanceServiceImpl.java index 9b5c51e..dacf6c9 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMaintenance/service/impl/ExhibitMaintenanceServiceImpl.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMaintenance/service/impl/ExhibitMaintenanceServiceImpl.java @@ -16,7 +16,7 @@ import java.util.Collection; /** * @Description: 保养信息记录表 * @Author: jeecg-boot - * @Date: 2025-08-28 + * @Date: 2025-09-15 * @Version: V1.0 */ @Service diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMaintenance/vo/ExhibitMaintenancePage.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMaintenance/vo/ExhibitMaintenancePage.java index 3b890c4..9e94e89 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMaintenance/vo/ExhibitMaintenancePage.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMaintenance/vo/ExhibitMaintenancePage.java @@ -17,7 +17,7 @@ import io.swagger.annotations.ApiModelProperty; /** * @Description: 保养信息记录表 * @Author: jeecg-boot - * @Date: 2025-08-28 + * @Date: 2025-09-15 * @Version: V1.0 */ @Data diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMaintenance/vue/ExhibitMaintenanceList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMaintenance/vue/ExhibitMaintenanceList.vue index e8d0e8f..2be1589 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMaintenance/vue/ExhibitMaintenanceList.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMaintenance/vue/ExhibitMaintenanceList.vue @@ -221,18 +221,18 @@ }, getSuperFieldList(){ let fieldList=[]; - fieldList.push({type:'date',value:'maintenanceDate',text:'保养日期'}) - fieldList.push({type:'string',value:'maintenanceName',text:'保养人',dictCode:''}) - fieldList.push({type:'Text',value:'stateFrontText',text:'保养前状态_文字',dictCode:''}) - fieldList.push({type:'Text',value:'stateFrontImage',text:'保养前状态_图片',dictCode:''}) - fieldList.push({type:'Text',value:'stateBackText',text:'保养后状态_文字',dictCode:''}) - fieldList.push({type:'Text',value:'stateBackImage',text:'保养后状态_图片',dictCode:''}) - fieldList.push({type:'string',value:'isExpend',text:'是否产生费用',dictCode:'is_true'}) - fieldList.push({type:'BigDecimal',value:'amount',text:'费用金额',dictCode:''}) - fieldList.push({type:'Text',value:'remarkText',text:'保养备注_文字',dictCode:''}) - fieldList.push({type:'Text',value:'remarkImage',text:'保养备注_图片',dictCode:''}) - fieldList.push({type:'Text',value:'remark',text:'备注',dictCode:''}) - fieldList.push({type:'sel_search',value:'showpieceId',text:'关联展品id',dictTable:"exhibit_showpiece", dictText:'title', dictCode:'id'}) + fieldList.push({type:'date',value:'maintenanceDate',text:'保养日期'}) + fieldList.push({type:'string',value:'maintenanceName',text:'保养人',dictCode:''}) + fieldList.push({type:'Text',value:'stateFrontText',text:'保养前状态_文字',dictCode:''}) + fieldList.push({type:'Text',value:'stateFrontImage',text:'保养前状态_图片',dictCode:''}) + fieldList.push({type:'Text',value:'stateBackText',text:'保养后状态_文字',dictCode:''}) + fieldList.push({type:'Text',value:'stateBackImage',text:'保养后状态_图片',dictCode:''}) + fieldList.push({type:'string',value:'isExpend',text:'是否产生费用',dictCode:'is_true'}) + fieldList.push({type:'BigDecimal',value:'amount',text:'费用金额',dictCode:''}) + fieldList.push({type:'Text',value:'remarkText',text:'保养备注_文字',dictCode:''}) + fieldList.push({type:'Text',value:'remarkImage',text:'保养备注_图片',dictCode:''}) + fieldList.push({type:'Text',value:'remark',text:'备注',dictCode:''}) + fieldList.push({type:'sel_search',value:'showpieceId',text:'关联展品id',dictTable:"exhibit_showpiece", dictText:'title', dictCode:'id'}) this.superFieldList = fieldList } } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMaintenance/vue/modules/ExhibitMaintenanceForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMaintenance/vue/modules/ExhibitMaintenanceForm.vue index bcea179..8fe50ac 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMaintenance/vue/modules/ExhibitMaintenanceForm.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMaintenance/vue/modules/ExhibitMaintenanceForm.vue @@ -61,7 +61,7 @@ - + @@ -70,7 +70,8 @@ - + :toolbar="true" + /> @@ -88,14 +90,17 @@ + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMaintenance/vue3/components/ExhibitMaintenanceModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMaintenance/vue3/components/ExhibitMaintenanceModal.vue new file mode 100644 index 0000000..e6b9ea1 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMaintenance/vue3/components/ExhibitMaintenanceModal.vue @@ -0,0 +1,103 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitPermission/controller/ExhibitPermissionController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitPermission/controller/ExhibitPermissionController.java new file mode 100644 index 0000000..7a55bca --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitPermission/controller/ExhibitPermissionController.java @@ -0,0 +1,171 @@ +package org.jeecg.modules.exhibitPermission.controller; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.common.util.oConvertUtils; +import org.jeecg.modules.exhibitPermission.entity.ExhibitPermission; +import org.jeecg.modules.exhibitPermission.service.IExhibitPermissionService; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; + +import org.jeecgframework.poi.excel.ExcelImportUtil; +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.entity.ImportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; +import org.jeecg.common.system.base.controller.JeecgController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; +import org.springframework.web.servlet.ModelAndView; +import com.alibaba.fastjson.JSON; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.jeecg.common.aspect.annotation.AutoLog; + + /** + * @Description: 权限信息表 + * @Author: jeecg-boot + * @Date: 2025-09-15 + * @Version: V1.0 + */ +@Api(tags="权限信息表") +@RestController +@RequestMapping("/exhibitPermission/exhibitPermission") +@Slf4j +public class ExhibitPermissionController extends JeecgController { + @Autowired + private IExhibitPermissionService exhibitPermissionService; + + /** + * 分页列表查询 + * + * @param exhibitPermission + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "权限信息表-分页列表查询") + @ApiOperation(value="权限信息表-分页列表查询", notes="权限信息表-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(ExhibitPermission exhibitPermission, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(exhibitPermission, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = exhibitPermissionService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param exhibitPermission + * @return + */ + @AutoLog(value = "权限信息表-添加") + @ApiOperation(value="权限信息表-添加", notes="权限信息表-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody ExhibitPermission exhibitPermission) { + exhibitPermissionService.save(exhibitPermission); + return Result.OK("添加成功!"); + } + + /** + * 编辑 + * + * @param exhibitPermission + * @return + */ + @AutoLog(value = "权限信息表-编辑") + @ApiOperation(value="权限信息表-编辑", notes="权限信息表-编辑") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody ExhibitPermission exhibitPermission) { + exhibitPermissionService.updateById(exhibitPermission); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "权限信息表-通过id删除") + @ApiOperation(value="权限信息表-通过id删除", notes="权限信息表-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + exhibitPermissionService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "权限信息表-批量删除") + @ApiOperation(value="权限信息表-批量删除", notes="权限信息表-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.exhibitPermissionService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + //@AutoLog(value = "权限信息表-通过id查询") + @ApiOperation(value="权限信息表-通过id查询", notes="权限信息表-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + ExhibitPermission exhibitPermission = exhibitPermissionService.getById(id); + if(exhibitPermission==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(exhibitPermission); + } + + /** + * 导出excel + * + * @param request + * @param exhibitPermission + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, ExhibitPermission exhibitPermission) { + return super.exportXls(request, exhibitPermission, ExhibitPermission.class, "权限信息表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, ExhibitPermission.class); + } + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitPermission/entity/ExhibitPermission.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitPermission/entity/ExhibitPermission.java new file mode 100644 index 0000000..7c31ab9 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitPermission/entity/ExhibitPermission.java @@ -0,0 +1,58 @@ +package org.jeecg.modules.exhibitPermission.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.util.Date; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.jeecg.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: 权限信息表 + * @Author: jeecg-boot + * @Date: 2025-09-15 + * @Version: V1.0 + */ +@Data +@TableName("exhibit_permission") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="exhibit_permission对象", description="权限信息表") +public class ExhibitPermission implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private java.lang.String id; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + /**创建日期*/ + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + /**更新日期*/ + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + /**权限名称*/ + @Excel(name = "权限名称", width = 15) + @ApiModelProperty(value = "权限名称") + private java.lang.String title; + /**权限编码*/ + @Excel(name = "权限编码", width = 15) + @ApiModelProperty(value = "权限编码") + private java.lang.Integer code; +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitPermission/mapper/ExhibitPermissionMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitPermission/mapper/ExhibitPermissionMapper.java new file mode 100644 index 0000000..3534a81 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitPermission/mapper/ExhibitPermissionMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.exhibitPermission.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.exhibitPermission.entity.ExhibitPermission; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 权限信息表 + * @Author: jeecg-boot + * @Date: 2025-09-15 + * @Version: V1.0 + */ +public interface ExhibitPermissionMapper extends BaseMapper { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitPermission/mapper/xml/ExhibitPermissionMapper.xml b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitPermission/mapper/xml/ExhibitPermissionMapper.xml new file mode 100644 index 0000000..bbc2035 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitPermission/mapper/xml/ExhibitPermissionMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitPermission/service/IExhibitPermissionService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitPermission/service/IExhibitPermissionService.java new file mode 100644 index 0000000..7969ea9 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitPermission/service/IExhibitPermissionService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.exhibitPermission.service; + +import org.jeecg.modules.exhibitPermission.entity.ExhibitPermission; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 权限信息表 + * @Author: jeecg-boot + * @Date: 2025-09-15 + * @Version: V1.0 + */ +public interface IExhibitPermissionService extends IService { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitPermission/service/impl/ExhibitPermissionServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitPermission/service/impl/ExhibitPermissionServiceImpl.java new file mode 100644 index 0000000..e128943 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitPermission/service/impl/ExhibitPermissionServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.exhibitPermission.service.impl; + +import org.jeecg.modules.exhibitPermission.entity.ExhibitPermission; +import org.jeecg.modules.exhibitPermission.mapper.ExhibitPermissionMapper; +import org.jeecg.modules.exhibitPermission.service.IExhibitPermissionService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 权限信息表 + * @Author: jeecg-boot + * @Date: 2025-09-15 + * @Version: V1.0 + */ +@Service +public class ExhibitPermissionServiceImpl extends ServiceImpl implements IExhibitPermissionService { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitPermission/vue/ExhibitPermissionList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitPermission/vue/ExhibitPermissionList.vue new file mode 100644 index 0000000..f9ff8b6 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitPermission/vue/ExhibitPermissionList.vue @@ -0,0 +1,177 @@ + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitPermission/vue/modules/ExhibitPermissionForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitPermission/vue/modules/ExhibitPermissionForm.vue new file mode 100644 index 0000000..d41953c --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitPermission/vue/modules/ExhibitPermissionForm.vue @@ -0,0 +1,109 @@ + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitPermission/vue/modules/ExhibitPermissionModal.Style#Drawer.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitPermission/vue/modules/ExhibitPermissionModal.Style#Drawer.vue new file mode 100644 index 0000000..de8bc1d --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitPermission/vue/modules/ExhibitPermissionModal.Style#Drawer.vue @@ -0,0 +1,84 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitPermission/vue/modules/ExhibitPermissionModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitPermission/vue/modules/ExhibitPermissionModal.vue new file mode 100644 index 0000000..5d9628e --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitPermission/vue/modules/ExhibitPermissionModal.vue @@ -0,0 +1,60 @@ + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitPermission/vue3/ExhibitPermission.api.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitPermission/vue3/ExhibitPermission.api.ts new file mode 100644 index 0000000..3fc50f4 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitPermission/vue3/ExhibitPermission.api.ts @@ -0,0 +1,61 @@ +import {defHttp} from '/@/utils/http/axios'; +import {Modal} from 'ant-design-vue'; + +enum Api { + list = '/exhibitPermission/exhibitPermission/list', + save='/exhibitPermission/exhibitPermission/add', + edit='/exhibitPermission/exhibitPermission/edit', + deleteOne = '/exhibitPermission/exhibitPermission/delete', + deleteBatch = '/exhibitPermission/exhibitPermission/deleteBatch', + importExcel = '/exhibitPermission/exhibitPermission/importExcel', + exportXls = '/exhibitPermission/exhibitPermission/exportXls', +} +/** + * 导出api + * @param params + */ +export const getExportUrl = Api.exportXls; +/** + * 导入api + */ +export const getImportUrl = Api.importExcel; +/** + * 列表接口 + * @param params + */ +export const list = (params) => + defHttp.get({url: Api.list, params}); + +/** + * 删除单个 + */ +export const deleteOne = (params,handleSuccess) => { + return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => { + handleSuccess(); + }); +} +/** + * 批量删除 + * @param params + */ +export const batchDelete = (params, handleSuccess) => { + Modal.confirm({ + title: '确认删除', + content: '是否删除选中数据', + okText: '确认', + cancelText: '取消', + onOk: () => { + return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => { + handleSuccess(); + }); + } + }); +} +/** + * 保存或者更新 + * @param params + */ +export const saveOrUpdate = (params, isUpdate) => { + let url = isUpdate ? Api.edit : Api.save; + return defHttp.post({url: url, params}); +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitPermission/vue3/ExhibitPermission.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitPermission/vue3/ExhibitPermission.data.ts new file mode 100644 index 0000000..d88159f --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitPermission/vue3/ExhibitPermission.data.ts @@ -0,0 +1,33 @@ +import {BasicColumn} from '/@/components/Table'; +import {FormSchema} from '/@/components/Table'; +import { rules} from '/@/utils/helper/validator'; +import { render } from '/@/utils/common/renderUtils'; +//列表数据 +export const columns: BasicColumn[] = [ + { + title: '权限名称', + align:"center", + dataIndex: 'title' + }, + { + title: '权限编码', + align:"center", + dataIndex: 'code' + }, +]; +//查询数据 +export const searchFormSchema: FormSchema[] = [ +]; +//表单数据 +export const formSchema: FormSchema[] = [ + { + label: '权限名称', + field: 'title', + component: 'Input', + }, + { + label: '权限编码', + field: 'code', + component: 'InputNumber', + }, +]; diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitPermission/vue3/ExhibitPermissionList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitPermission/vue3/ExhibitPermissionList.vue new file mode 100644 index 0000000..4b3c1e1 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitPermission/vue3/ExhibitPermissionList.vue @@ -0,0 +1,162 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitPermission/vue3/components/ExhibitPermissionModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitPermission/vue3/components/ExhibitPermissionModal.vue new file mode 100644 index 0000000..8c75775 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitPermission/vue3/components/ExhibitPermissionModal.vue @@ -0,0 +1,58 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitRepair/controller/ExhibitRepairController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitRepair/controller/ExhibitRepairController.java index 18fef52..3865093 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitRepair/controller/ExhibitRepairController.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitRepair/controller/ExhibitRepairController.java @@ -45,7 +45,7 @@ import org.jeecg.common.aspect.annotation.AutoLog; /** * @Description: 维修信息记录表 * @Author: jeecg-boot - * @Date: 2025-08-28 + * @Date: 2025-09-15 * @Version: V1.0 */ @Api(tags="维修信息记录表") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitRepair/entity/ExhibitRepair.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitRepair/entity/ExhibitRepair.java index e43c304..8242344 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitRepair/entity/ExhibitRepair.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitRepair/entity/ExhibitRepair.java @@ -20,7 +20,7 @@ import io.swagger.annotations.ApiModelProperty; /** * @Description: 维修信息记录表 * @Author: jeecg-boot - * @Date: 2025-08-28 + * @Date: 2025-09-15 * @Version: V1.0 */ @ApiModel(value="exhibit_repair对象", description="维修信息记录表") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitRepair/entity/ExhibitRepairExpense.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitRepair/entity/ExhibitRepairExpense.java index b7fdff7..2b572a3 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitRepair/entity/ExhibitRepairExpense.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitRepair/entity/ExhibitRepairExpense.java @@ -16,7 +16,7 @@ import java.io.UnsupportedEncodingException; /** * @Description: 维修费用明细记录表 * @Author: jeecg-boot - * @Date: 2025-08-28 + * @Date: 2025-09-15 * @Version: V1.0 */ @ApiModel(value="exhibit_repair_expense对象", description="维修费用明细记录表") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitRepair/mapper/ExhibitRepairExpenseMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitRepair/mapper/ExhibitRepairExpenseMapper.java index cbddd63..4bd1411 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitRepair/mapper/ExhibitRepairExpenseMapper.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitRepair/mapper/ExhibitRepairExpenseMapper.java @@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Param; /** * @Description: 维修费用明细记录表 * @Author: jeecg-boot - * @Date: 2025-08-28 + * @Date: 2025-09-15 * @Version: V1.0 */ public interface ExhibitRepairExpenseMapper extends BaseMapper { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitRepair/mapper/ExhibitRepairMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitRepair/mapper/ExhibitRepairMapper.java index 881ce97..2644d99 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitRepair/mapper/ExhibitRepairMapper.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitRepair/mapper/ExhibitRepairMapper.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @Description: 维修信息记录表 * @Author: jeecg-boot - * @Date: 2025-08-28 + * @Date: 2025-09-15 * @Version: V1.0 */ public interface ExhibitRepairMapper extends BaseMapper { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitRepair/service/IExhibitRepairExpenseService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitRepair/service/IExhibitRepairExpenseService.java index a500560..d37b360 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitRepair/service/IExhibitRepairExpenseService.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitRepair/service/IExhibitRepairExpenseService.java @@ -7,7 +7,7 @@ import java.util.List; /** * @Description: 维修费用明细记录表 * @Author: jeecg-boot - * @Date: 2025-08-28 + * @Date: 2025-09-15 * @Version: V1.0 */ public interface IExhibitRepairExpenseService extends IService { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitRepair/service/IExhibitRepairService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitRepair/service/IExhibitRepairService.java index 722effe..e1b9b2e 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitRepair/service/IExhibitRepairService.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitRepair/service/IExhibitRepairService.java @@ -10,7 +10,7 @@ import java.util.List; /** * @Description: 维修信息记录表 * @Author: jeecg-boot - * @Date: 2025-08-28 + * @Date: 2025-09-15 * @Version: V1.0 */ public interface IExhibitRepairService extends IService { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitRepair/service/impl/ExhibitRepairExpenseServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitRepair/service/impl/ExhibitRepairExpenseServiceImpl.java index a196965..47f8d22 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitRepair/service/impl/ExhibitRepairExpenseServiceImpl.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitRepair/service/impl/ExhibitRepairExpenseServiceImpl.java @@ -11,7 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired; /** * @Description: 维修费用明细记录表 * @Author: jeecg-boot - * @Date: 2025-08-28 + * @Date: 2025-09-15 * @Version: V1.0 */ @Service diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitRepair/service/impl/ExhibitRepairServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitRepair/service/impl/ExhibitRepairServiceImpl.java index de5d270..851f305 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitRepair/service/impl/ExhibitRepairServiceImpl.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitRepair/service/impl/ExhibitRepairServiceImpl.java @@ -16,7 +16,7 @@ import java.util.Collection; /** * @Description: 维修信息记录表 * @Author: jeecg-boot - * @Date: 2025-08-28 + * @Date: 2025-09-15 * @Version: V1.0 */ @Service diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitRepair/vo/ExhibitRepairPage.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitRepair/vo/ExhibitRepairPage.java index 62684d6..d8be318 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitRepair/vo/ExhibitRepairPage.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitRepair/vo/ExhibitRepairPage.java @@ -17,7 +17,7 @@ import io.swagger.annotations.ApiModelProperty; /** * @Description: 维修信息记录表 * @Author: jeecg-boot - * @Date: 2025-08-28 + * @Date: 2025-09-15 * @Version: V1.0 */ @Data diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitRepair/vue/ExhibitRepairList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitRepair/vue/ExhibitRepairList.vue index c7a7a36..da85a84 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitRepair/vue/ExhibitRepairList.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitRepair/vue/ExhibitRepairList.vue @@ -209,16 +209,16 @@ }, getSuperFieldList(){ let fieldList=[]; - fieldList.push({type:'date',value:'repairDate',text:'维修日期'}) - fieldList.push({type:'string',value:'repairName',text:'维修人',dictCode:''}) - fieldList.push({type:'string',value:'phone',text:'联系方式',dictCode:''}) - fieldList.push({type:'Text',value:'content',text:'处理内容',dictCode:''}) - fieldList.push({type:'Text',value:'image',text:'图片',dictCode:''}) - fieldList.push({type:'string',value:'isExpend',text:'是否产生费用',dictCode:'is_true'}) - fieldList.push({type:'BigDecimal',value:'amount',text:'费用金额',dictCode:''}) - fieldList.push({type:'string',value:'isFix',text:'问题是否解决',dictCode:'is_true'}) - fieldList.push({type:'Text',value:'remark',text:'备注',dictCode:''}) - fieldList.push({type:'sel_search',value:'showpieceId',text:'关联展品id',dictTable:"exhibit_showpiece", dictText:'title', dictCode:'id'}) + fieldList.push({type:'date',value:'repairDate',text:'维修日期'}) + fieldList.push({type:'string',value:'repairName',text:'维修人',dictCode:''}) + fieldList.push({type:'string',value:'phone',text:'联系方式',dictCode:''}) + fieldList.push({type:'Text',value:'content',text:'处理内容',dictCode:''}) + fieldList.push({type:'Text',value:'image',text:'图片',dictCode:''}) + fieldList.push({type:'string',value:'isExpend',text:'是否产生费用',dictCode:'is_true'}) + fieldList.push({type:'BigDecimal',value:'amount',text:'费用金额',dictCode:''}) + fieldList.push({type:'string',value:'isFix',text:'问题是否解决',dictCode:'is_true'}) + fieldList.push({type:'Text',value:'remark',text:'备注',dictCode:''}) + fieldList.push({type:'sel_search',value:'showpieceId',text:'关联展品id',dictTable:"exhibit_showpiece", dictText:'title', dictCode:'id'}) this.superFieldList = fieldList } } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitRepair/vue/modules/ExhibitRepairForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitRepair/vue/modules/ExhibitRepairForm.vue index 5eb9ec0..1217195 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitRepair/vue/modules/ExhibitRepairForm.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitRepair/vue/modules/ExhibitRepairForm.vue @@ -51,7 +51,7 @@ - + @@ -60,7 +60,8 @@ - + :toolbar="true" + /> @@ -78,14 +80,17 @@ + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitRepair/vue3/components/ExhibitRepairModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitRepair/vue3/components/ExhibitRepairModal.vue new file mode 100644 index 0000000..fee2042 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitRepair/vue3/components/ExhibitRepairModal.vue @@ -0,0 +1,103 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/ShowpieceServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/ShowpieceServiceImpl.java index 9706879..ec31e15 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/ShowpieceServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/ShowpieceServiceImpl.java @@ -9,6 +9,8 @@ import org.jeecg.common.api.vo.Result; import org.jeecg.config.shiro.ShiroRealm; import org.jeecg.modules.api.bean.PageBean; import org.jeecg.modules.api.service.ShowpieceService; +import org.jeecg.modules.exhibitDepartmentPermission.entity.ExhibitDepartmentPermission; +import org.jeecg.modules.exhibitDepartmentPermission.service.IExhibitDepartmentPermissionService; import org.jeecg.modules.exhibitMaintenance.entity.ExhibitMaintenance; import org.jeecg.modules.exhibitMaintenance.entity.ExhibitMaintenanceExpense; import org.jeecg.modules.exhibitMaintenance.service.IExhibitMaintenanceExpenseService; @@ -58,6 +60,9 @@ public class ShowpieceServiceImpl implements ShowpieceService { //保养记录费用信息 @Resource private IExhibitMaintenanceExpenseService exhibitMaintenanceExpenseService; + //部门权限信息 + @Resource + private IExhibitDepartmentPermissionService exhibitDepartmentPermissionService; /******************************************************************************************************************/ //展品-查看展品信息列表 @@ -200,7 +205,17 @@ public class ShowpieceServiceImpl implements ShowpieceService { return Result.error("用户审核未通过"); } - //2、新增报修单 + //2、校验权限信息 + String departmentId = hanHaiMember.getDepartment(); + ExhibitDepartmentPermission permission = exhibitDepartmentPermissionService + .lambdaQuery() + .eq(ExhibitDepartmentPermission::getDepartmentId, departmentId) + .one(); + if(!permission.getPermissionId().contains("1")){ + return Result.error("用户没有操作权限"); + } + + //3、新增报修单 exhibitMalfunction.setMalfunctionName(hanHaiMember.getId()); boolean result = exhibitMalfunctionService.save(exhibitMalfunction); @@ -237,7 +252,23 @@ public class ShowpieceServiceImpl implements ShowpieceService { return Result.error("用户审核未通过"); } - //2、修改报修单 + //2、校验权限信息 + String departmentId = hanHaiMember.getDepartment(); + ExhibitDepartmentPermission permission = exhibitDepartmentPermissionService + .lambdaQuery() + .eq(ExhibitDepartmentPermission::getDepartmentId, departmentId) + .one(); + if(!permission.getPermissionId().contains("1")){ + return Result.error("用户没有操作权限"); + } + + //3、修改报修单 + ExhibitMalfunction malfunction = exhibitMalfunctionService.getById(exhibitMalfunction.getId()); + if(!permission.getPermissionId().contains("0")){ + if(!hanHaiMember.getId().equals(malfunction.getMalfunctionName())){ + return Result.error("该记录不属于用户,不能修改"); + } + } boolean result = exhibitMalfunctionService.updateById(exhibitMalfunction); if(result){ @@ -358,12 +389,22 @@ public class ShowpieceServiceImpl implements ShowpieceService { return Result.error("用户审核未通过"); } - //2、新增维修记录 + //2、校验权限信息 + String departmentId = hanHaiMember.getDepartment(); + ExhibitDepartmentPermission permission = exhibitDepartmentPermissionService + .lambdaQuery() + .eq(ExhibitDepartmentPermission::getDepartmentId, departmentId) + .one(); + if(!permission.getPermissionId().contains("3")){ + return Result.error("用户没有操作权限"); + } + + //3、新增维修记录 String id = IdWorker.getIdStr();//生成维修单id exhibitRepair.setId(id); boolean result1 = exhibitRepairService.save(exhibitRepair); - //3、新增费用明细 + //4、新增费用明细 List list = new ArrayList<>(); boolean result2 = true; if(StringUtils.isNotEmpty(exhibitRepair.getExpenseList())){ @@ -385,7 +426,7 @@ public class ShowpieceServiceImpl implements ShowpieceService { result2 = exhibitRepairExpenseService.saveBatch(list); } - //4、判断维修记录是否新增成功 + //5、判断维修记录是否新增成功 if(result1 && result2){ log.info("维修记录新增成功"); return Result.OK("维修记录新增成功"); @@ -419,20 +460,31 @@ public class ShowpieceServiceImpl implements ShowpieceService { return Result.error("用户审核未通过"); } - //2、修改维修记录 + //2、校验权限信息 + String departmentId = hanHaiMember.getDepartment(); + ExhibitDepartmentPermission permission = exhibitDepartmentPermissionService + .lambdaQuery() + .eq(ExhibitDepartmentPermission::getDepartmentId, departmentId) + .one(); + if(!permission.getPermissionId().contains("3")){ + return Result.error("用户没有操作权限"); + } + + //3、修改维修记录 boolean result1 = false; String id = exhibitRepair.getId(); if(StringUtils.isEmpty(id)){ return Result.error("维修记录id为空,请传入维修记录id"); } ExhibitRepair repair = exhibitRepairService.getById(id); + if(null != repair){ result1 = exhibitRepairService.updateById(exhibitRepair); } - //3、新增费用明细 + //4、新增费用明细 - //3.1删除原有的费用明细 + //4.1删除原有的费用明细 List remove = exhibitRepairExpenseService.lambdaQuery().eq(ExhibitRepairExpense::getRepairId, id).list(); List removeIds = new ArrayList<>(); for (ExhibitRepairExpense exhibitRepairExpense : remove) { @@ -440,7 +492,7 @@ public class ShowpieceServiceImpl implements ShowpieceService { } exhibitRepairExpenseService.removeByIds(removeIds); - //3.2 新增新的费用明细 + //4.2 新增新的费用明细 List list = new ArrayList<>(); boolean result2 = false; if(StringUtils.isNotEmpty(exhibitRepair.getExpenseList())){ @@ -464,7 +516,7 @@ public class ShowpieceServiceImpl implements ShowpieceService { result2 = true; } - //4、判断维修记录是否修改成功 + //5、判断维修记录是否修改成功 if(result1 && result2){ log.info("维修记录修改成功"); return Result.OK("维修记录修改成功"); @@ -583,6 +635,16 @@ public class ShowpieceServiceImpl implements ShowpieceService { return Result.error("用户审核未通过"); } + //2、校验权限信息 + String departmentId = hanHaiMember.getDepartment(); + ExhibitDepartmentPermission permission = exhibitDepartmentPermissionService + .lambdaQuery() + .eq(ExhibitDepartmentPermission::getDepartmentId, departmentId) + .one(); + if(!permission.getPermissionId().contains("2")){ + return Result.error("用户没有操作权限"); + } + //2、新增维修记录 String id = IdWorker.getIdStr();//生成保养单id exhibitMaintenance.setId(id); @@ -655,6 +717,16 @@ public class ShowpieceServiceImpl implements ShowpieceService { return Result.error("用户审核未通过"); } + //2、校验权限信息 + String departmentId = hanHaiMember.getDepartment(); + ExhibitDepartmentPermission permission = exhibitDepartmentPermissionService + .lambdaQuery() + .eq(ExhibitDepartmentPermission::getDepartmentId, departmentId) + .one(); + if(!permission.getPermissionId().contains("2")){ + return Result.error("用户没有操作权限"); + } + //2、修改维修记录 boolean result1 = false; String id = exhibitMaintenance.getId(); diff --git a/jeecg-boot-module-system/src/main/resources/application-dev.yml b/jeecg-boot-module-system/src/main/resources/application-dev.yml index 81caee1..d529746 100644 --- a/jeecg-boot-module-system/src/main/resources/application-dev.yml +++ b/jeecg-boot-module-system/src/main/resources/application-dev.yml @@ -192,11 +192,11 @@ jeecg : excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/** #阿里云oss存储和大鱼短信秘钥配置 oss: - accessKey: LTAI5tPfZo39q2r9Sr5mW84u - secretKey: XxExGallsV4O9nERHpVsQg2XtPCU7r - endpoint: oss-cn-guangzhou.aliyuncs.com - bucketName: augcl - staticDomain: https://img.augcl.com + accessKey: LTAI5tQSs47izVy8DLVdwUU9 + secretKey: qHI7C3PaXYZySr84HTToviC71AYlFq + endpoint: oss-cn-shenzhen.aliyuncs.com + bucketName: hanhaiimage + staticDomain: https://image.hhlm1688.com/ # ElasticSearch 6设置 elasticsearch: cluster-name: jeecg-ES