diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionStatus/controller/WorkorderPermissionStatusController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionStatus/controller/WorkorderPermissionStatusController.java new file mode 100644 index 0000000..a7e3613 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionStatus/controller/WorkorderPermissionStatusController.java @@ -0,0 +1,171 @@ +package org.jeecg.modules.workorderPermissionStatus.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.workorderPermissionStatus.entity.WorkorderPermissionStatus; +import org.jeecg.modules.workorderPermissionStatus.service.IWorkorderPermissionStatusService; + +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-01-06 + * @Version: V1.0 + */ +@Api(tags="工单状态权限配置表") +@RestController +@RequestMapping("/workorderPermissionStatus/workorderPermissionStatus") +@Slf4j +public class WorkorderPermissionStatusController extends JeecgController { + @Autowired + private IWorkorderPermissionStatusService workorderPermissionStatusService; + + /** + * 分页列表查询 + * + * @param workorderPermissionStatus + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "工单状态权限配置表-分页列表查询") + @ApiOperation(value="工单状态权限配置表-分页列表查询", notes="工单状态权限配置表-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(WorkorderPermissionStatus workorderPermissionStatus, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(workorderPermissionStatus, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = workorderPermissionStatusService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param workorderPermissionStatus + * @return + */ + @AutoLog(value = "工单状态权限配置表-添加") + @ApiOperation(value="工单状态权限配置表-添加", notes="工单状态权限配置表-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody WorkorderPermissionStatus workorderPermissionStatus) { + workorderPermissionStatusService.save(workorderPermissionStatus); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param workorderPermissionStatus + * @return + */ + @AutoLog(value = "工单状态权限配置表-编辑") + @ApiOperation(value="工单状态权限配置表-编辑", notes="工单状态权限配置表-编辑") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody WorkorderPermissionStatus workorderPermissionStatus) { + workorderPermissionStatusService.updateById(workorderPermissionStatus); + 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) { + workorderPermissionStatusService.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.workorderPermissionStatusService.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) { + WorkorderPermissionStatus workorderPermissionStatus = workorderPermissionStatusService.getById(id); + if(workorderPermissionStatus==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(workorderPermissionStatus); + } + + /** + * 导出excel + * + * @param request + * @param workorderPermissionStatus + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, WorkorderPermissionStatus workorderPermissionStatus) { + return super.exportXls(request, workorderPermissionStatus, WorkorderPermissionStatus.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, WorkorderPermissionStatus.class); + } + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionStatus/entity/WorkorderPermissionStatus.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionStatus/entity/WorkorderPermissionStatus.java new file mode 100644 index 0000000..34f4ee4 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionStatus/entity/WorkorderPermissionStatus.java @@ -0,0 +1,65 @@ +package org.jeecg.modules.workorderPermissionStatus.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.TableField; +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-01-06 + * @Version: V1.0 + */ +@Data +@TableName("workorder_permission_status") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="workorder_permission_status对象", description="工单状态权限配置表") +public class WorkorderPermissionStatus 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; + /**关联角色id*/ + @Excel(name = "关联角色id", width = 15, dictTable = "workorder_role", dicText = "name", dicCode = "id") + @Dict(dictTable = "workorder_role", dicText = "name", dicCode = "id") + @ApiModelProperty(value = "关联角色id") + private java.lang.String roleId; + /**关联工单状态id*/ + @Excel(name = "关联工单状态id", width = 15, dictTable = "workorder_status", dicText = "name", dicCode = "id") + @Dict(dictTable = "workorder_status", dicText = "name", dicCode = "id") + @ApiModelProperty(value = "关联工单状态id") + private java.lang.String statusId; + + //状态名称 + @TableField(exist = false) + private java.lang.String statusId_dictText; +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionStatus/mapper/WorkorderPermissionStatusMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionStatus/mapper/WorkorderPermissionStatusMapper.java new file mode 100644 index 0000000..033e586 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionStatus/mapper/WorkorderPermissionStatusMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.workorderPermissionStatus.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.workorderPermissionStatus.entity.WorkorderPermissionStatus; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 工单状态权限配置表 + * @Author: jeecg-boot + * @Date: 2025-01-06 + * @Version: V1.0 + */ +public interface WorkorderPermissionStatusMapper extends BaseMapper { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionStatus/mapper/xml/WorkorderPermissionStatusMapper.xml b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionStatus/mapper/xml/WorkorderPermissionStatusMapper.xml new file mode 100644 index 0000000..98eec47 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionStatus/mapper/xml/WorkorderPermissionStatusMapper.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/workorderPermissionStatus/service/IWorkorderPermissionStatusService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionStatus/service/IWorkorderPermissionStatusService.java new file mode 100644 index 0000000..1904e41 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionStatus/service/IWorkorderPermissionStatusService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.workorderPermissionStatus.service; + +import org.jeecg.modules.workorderPermissionStatus.entity.WorkorderPermissionStatus; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 工单状态权限配置表 + * @Author: jeecg-boot + * @Date: 2025-01-06 + * @Version: V1.0 + */ +public interface IWorkorderPermissionStatusService extends IService { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionStatus/service/impl/WorkorderPermissionStatusServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionStatus/service/impl/WorkorderPermissionStatusServiceImpl.java new file mode 100644 index 0000000..6db4b0f --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionStatus/service/impl/WorkorderPermissionStatusServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.workorderPermissionStatus.service.impl; + +import org.jeecg.modules.workorderPermissionStatus.entity.WorkorderPermissionStatus; +import org.jeecg.modules.workorderPermissionStatus.mapper.WorkorderPermissionStatusMapper; +import org.jeecg.modules.workorderPermissionStatus.service.IWorkorderPermissionStatusService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 工单状态权限配置表 + * @Author: jeecg-boot + * @Date: 2025-01-06 + * @Version: V1.0 + */ +@Service +public class WorkorderPermissionStatusServiceImpl extends ServiceImpl implements IWorkorderPermissionStatusService { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionStatus/vue/WorkorderPermissionStatusList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionStatus/vue/WorkorderPermissionStatusList.vue new file mode 100644 index 0000000..85528a0 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionStatus/vue/WorkorderPermissionStatusList.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/workorderPermissionStatus/vue/modules/WorkorderPermissionStatusForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionStatus/vue/modules/WorkorderPermissionStatusForm.vue new file mode 100644 index 0000000..7974a31 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionStatus/vue/modules/WorkorderPermissionStatusForm.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/workorderPermissionStatus/vue/modules/WorkorderPermissionStatusModal.Style#Drawer.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionStatus/vue/modules/WorkorderPermissionStatusModal.Style#Drawer.vue new file mode 100644 index 0000000..490136e --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionStatus/vue/modules/WorkorderPermissionStatusModal.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/workorderPermissionStatus/vue/modules/WorkorderPermissionStatusModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionStatus/vue/modules/WorkorderPermissionStatusModal.vue new file mode 100644 index 0000000..bb1b779 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionStatus/vue/modules/WorkorderPermissionStatusModal.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/workorderPermissionStatus/vue3/WorkorderPermissionStatus.api.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionStatus/vue3/WorkorderPermissionStatus.api.ts new file mode 100644 index 0000000..bcfbc73 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionStatus/vue3/WorkorderPermissionStatus.api.ts @@ -0,0 +1,61 @@ +import {defHttp} from '/@/utils/http/axios'; +import {Modal} from 'ant-design-vue'; + +enum Api { + list = '/workorderPermissionStatus/workorderPermissionStatus/list', + save='/workorderPermissionStatus/workorderPermissionStatus/add', + edit='/workorderPermissionStatus/workorderPermissionStatus/edit', + deleteOne = '/workorderPermissionStatus/workorderPermissionStatus/delete', + deleteBatch = '/workorderPermissionStatus/workorderPermissionStatus/deleteBatch', + importExcel = '/workorderPermissionStatus/workorderPermissionStatus/importExcel', + exportXls = '/workorderPermissionStatus/workorderPermissionStatus/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/workorderPermissionStatus/vue3/WorkorderPermissionStatus.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionStatus/vue3/WorkorderPermissionStatus.data.ts new file mode 100644 index 0000000..37d65e0 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionStatus/vue3/WorkorderPermissionStatus.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: '关联角色id', + align:"center", + dataIndex: 'roleId_dictText' + }, + { + title: '关联工单状态id', + align:"center", + dataIndex: 'statusId_dictText' + }, +]; +//查询数据 +export const searchFormSchema: FormSchema[] = [ +]; +//表单数据 +export const formSchema: FormSchema[] = [ + { + label: '关联角色id', + field: 'roleId', + component: 'JDictSelectTag', + componentProps:{ + dictCode:"workorder_role,name,id" + }, + }, + { + label: '关联工单状态id', + field: 'statusId', + component: 'JDictSelectTag', + componentProps:{ + dictCode:"workorder_status,name,id" + }, + }, +]; diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionStatus/vue3/WorkorderPermissionStatusList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionStatus/vue3/WorkorderPermissionStatusList.vue new file mode 100644 index 0000000..16d0a89 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionStatus/vue3/WorkorderPermissionStatusList.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/workorderPermissionStatus/vue3/components/WorkorderPermissionStatusModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionStatus/vue3/components/WorkorderPermissionStatusModal.vue new file mode 100644 index 0000000..8cd4e43 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionStatus/vue3/components/WorkorderPermissionStatusModal.vue @@ -0,0 +1,58 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/TemplateServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/TemplateServiceImpl.java index e1e2288..9cf3b68 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/TemplateServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/TemplateServiceImpl.java @@ -560,7 +560,8 @@ public class TemplateServiceImpl implements TemplateService { public Result updateGeneralStepOne(WorkorderGeneralStepone generalStepone, String token) { try{ //判断是否有工序操作权限 - boolean permission = judgePermissionGeneral(token, generalStepone.getStepId()); + //boolean permission = judgePermissionGeneral(token, generalStepone.getStepId());去掉权限细分判断 + boolean permission = judgePermissionTemplate(token); if(!permission){ return Result.error("没有该工序的操作权限"); } @@ -583,7 +584,8 @@ public class TemplateServiceImpl implements TemplateService { public Result updateGeneralStepTwo(WorkorderGeneralSteptwo generalSteptwo, String token) { try{ //判断是否有工序操作权限 - boolean permission = judgePermissionGeneral(token, generalSteptwo.getStepId()); + //boolean permission = judgePermissionGeneral(token, generalSteptwo.getStepId());//去掉权限细分判断 + boolean permission = judgePermissionTemplate(token); if(!permission){ return Result.error("没有该工序的操作权限"); } @@ -605,6 +607,7 @@ public class TemplateServiceImpl implements TemplateService { public Result updateGeneralStepThree(WorkorderGeneralStepthree generalStepthree, String token) { try{ //判断是否有工序操作权限 + //boolean permission = judgePermissionGeneral(token, generalStepthree.getStepId());//去掉权限细分判断 boolean permission = judgePermissionGeneral(token, generalStepthree.getStepId()); if(!permission){ return Result.error("没有该工序的操作权限"); @@ -627,7 +630,8 @@ public class TemplateServiceImpl implements TemplateService { public Result updateGeneralStepFour(WorkorderGeneralStepfour generalStepfour, String token) { try{ //判断是否有工序操作权限 - boolean permission = judgePermissionGeneral(token, generalStepfour.getStepId()); + //boolean permission = judgePermissionGeneral(token, generalStepfour.getStepId());//去掉权限细分判断 + boolean permission = judgePermissionTemplate(token); if(!permission){ return Result.error("没有该工序的操作权限"); } @@ -649,7 +653,8 @@ public class TemplateServiceImpl implements TemplateService { public Result updateParamStepOne(WorkorderParamStepone paramStepone, String token) { try{ //判断是否有工序操作权限 - boolean permission = judgePermissionParam(token, paramStepone.getProcessId()); + //boolean permission = judgePermissionParam(token, paramStepone.getProcessId());去掉权限细分判断 + boolean permission = judgePermissionTemplate(token); if(!permission){ return Result.error("没有该工序的操作权限"); } @@ -671,7 +676,8 @@ public class TemplateServiceImpl implements TemplateService { public Result updateParamStepTwo(WorkorderParamSteptwo paramSteptwo, String token) { try{ //判断是否有工序操作权限 - boolean permission = judgePermissionParam(token, paramSteptwo.getProcessId()); + //boolean permission = judgePermissionParam(token, paramSteptwo.getProcessId());//去掉权限细分判断 + boolean permission = judgePermissionTemplate(token); if(!permission){ return Result.error("没有该工序的操作权限"); } @@ -693,7 +699,8 @@ public class TemplateServiceImpl implements TemplateService { public Result updateParamStepThree(WorkorderParamStepthree paramStepthree, String token) { try{ //判断是否有工序操作权限 - boolean permission = judgePermissionParam(token, paramStepthree.getProcessId()); + //boolean permission = judgePermissionParam(token, paramStepthree.getProcessId());//去掉权限细分判断 + boolean permission = judgePermissionTemplate(token); if(!permission){ return Result.error("没有该工序的操作权限"); } @@ -715,7 +722,8 @@ public class TemplateServiceImpl implements TemplateService { public Result updateParamStepFour(WorkorderParamStepfour paramStepfour, String token) { try{ //判断是否有工序操作权限 - boolean permission = judgePermissionParam(token, paramStepfour.getProcessId()); + //boolean permission = judgePermissionParam(token, paramStepfour.getProcessId());//去掉权限细分 + boolean permission = judgePermissionTemplate(token); if(!permission){ return Result.error("没有该工序的操作权限"); } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/UserServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/UserServiceImpl.java index 9151852..cf4f244 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/UserServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/UserServiceImpl.java @@ -6,16 +6,21 @@ import org.apache.commons.lang.StringUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.modules.apiBean.PageBean; import org.jeecg.modules.apiService.UserService; +import org.jeecg.modules.workorderBanner.entity.WorkorderBanner; import org.jeecg.modules.workorderPermission.entity.WorkorderPermission; import org.jeecg.modules.workorderPermission.service.IWorkorderPermissionService; import org.jeecg.modules.workorderPermissionRole.entity.WorkorderPermissionRole; import org.jeecg.modules.workorderPermissionRole.service.IWorkorderPermissionRoleService; +import org.jeecg.modules.workorderPermissionStatus.entity.WorkorderPermissionStatus; +import org.jeecg.modules.workorderPermissionStatus.service.IWorkorderPermissionStatusService; import org.jeecg.modules.workorderPermissionTemplate.entity.WorkorderPermissionTemplate; import org.jeecg.modules.workorderPermissionTemplate.service.IWorkorderPermissionTemplateService; import org.jeecg.modules.workorderPermissionUser.entity.WorkorderPermissionUser; import org.jeecg.modules.workorderPermissionUser.service.IWorkorderPermissionUserService; import org.jeecg.modules.workorderRole.entity.WorkorderRole; import org.jeecg.modules.workorderRole.service.IWorkorderRoleService; +import org.jeecg.modules.workorderStatus.entity.WorkorderStatus; +import org.jeecg.modules.workorderStatus.service.IWorkorderStatusService; import org.jeecg.modules.workorderUser.entity.WorkorderUser; import org.jeecg.modules.workorderUser.service.IWorkorderUserService; import org.springframework.stereotype.Service; @@ -41,6 +46,14 @@ public class UserServiceImpl implements UserService { @Resource private IWorkorderPermissionUserService workorderPermissionUserService; + //工单状态信息 + @Resource + private IWorkorderStatusService workorderStatusService; + + //工单状态权限信息 + @Resource + private IWorkorderPermissionStatusService workorderPermissionStatusService; + // //权限信息 // @Resource // private IWorkorderPermissionService workorderPermissionService; @@ -91,7 +104,6 @@ public class UserServiceImpl implements UserService { }else { //非本人查询是否有查看权限 permission = judgePermissionTemplate(token); - map.put("permission", permission); } if(!permission){ return Result.error("没有查看权限"); @@ -110,12 +122,29 @@ public class UserServiceImpl implements UserService { .eq(WorkorderRole::getId, user.getRoleId()) .one(); user.setRoleName(role.getName()); - map.put("role", role); - return Result.OK("用户信息详情", user); + //查看用户可修改的工单状态 + List permissionStatusList = workorderPermissionStatusService + .lambdaQuery() + .eq(WorkorderPermissionStatus::getRoleId, role.getId()) + .list(); + List statusList = workorderStatusService + .lambdaQuery() + .list(); + for (WorkorderPermissionStatus permissionStatus : permissionStatusList) { + for (WorkorderStatus status : statusList) { + if(permissionStatus.getStatusId().equals(status.getId())){ + permissionStatus.setStatusId_dictText(status.getName()); + } + } + } + + map.put("permissionStatusList", permissionStatusList); + + return Result.OK("用户信息详情", map); }catch (Exception e){ e.printStackTrace(); - return Result.error("用户信息详情获取失败", user); + return Result.error("用户信息详情获取失败", map); } } @@ -125,13 +154,12 @@ public class UserServiceImpl implements UserService { public Result login(String userName, String password) { //返回信息 String message = "登录失败"; - //返回数据 Map map = new HashMap<>(); - WorkorderUser user = null; + try{ //查询用户信息详情 - user = workorderUserService + WorkorderUser user = workorderUserService .lambdaQuery() .eq(WorkorderUser::getName, userName) .eq(WorkorderUser::getPassword, password) @@ -145,19 +173,51 @@ public class UserServiceImpl implements UserService { .eq(WorkorderRole::getId, user.getRoleId()) .one(); user.setRoleName(role.getName()); - map.put("role", role); - //获取用户是否具有修改其他用户的权限 - boolean permission = judgePermissionTemplate(user.getId()); - map.put("permission", permission); +// //查看用户可修改的工单状态 +// Page page = new Page(1, 1000);;//分页信息 +// Page permissionStatusList = workorderPermissionStatusService +// .lambdaQuery() +// .eq(WorkorderPermissionStatus::getRoleId, role.getId()) +// .page(page); +// map.put("permissionStatusList", permissionStatusList); +// +// //分页 +// Page page = new Page(1, 1000); +// LambdaQueryChainWrapper query = workorderPermissionStatusService +// .lambdaQuery(); +// +// //组装查询条件 +// query.eq(WorkorderPermissionStatus::getRoleId, role.getId()); +// +// //获取工单状态列表 +// Page permissionStatusList = query.page(page); + + //查看用户可修改的工单状态 + List permissionStatusList = workorderPermissionStatusService + .lambdaQuery() + .eq(WorkorderPermissionStatus::getRoleId, role.getId()) + .list(); + List statusList = workorderStatusService + .lambdaQuery() + .list(); + for (WorkorderPermissionStatus permissionStatus : permissionStatusList) { + for (WorkorderStatus status : statusList) { + if(permissionStatus.getStatusId().equals(status.getId())){ + permissionStatus.setStatusId_dictText(status.getName()); + } + } + } + map.put("permissionStatusList", permissionStatusList); + - return Result.OK("用户登录成功", user); + return Result.OK("用户登录成功", map); }else { - return Result.error("该用户不存在", user); + return Result.error("该用户不存在", map); } }catch (Exception e){ e.printStackTrace(); - return Result.error("登录失败", user); + return Result.error("登录失败", map); } }