From 1d55e42154f33a56a0e49fb3a09038f694d6cdfe Mon Sep 17 00:00:00 2001 From: cwchen <1048842385@qq.com> Date: Thu, 3 Apr 2025 14:09:37 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8B=E6=8B=89=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/controller/SelectController.java | 23 +++++++++ .../bonus/imgTool/system/dao/SelectDao.java | 26 ++++++++++ .../imgTool/system/service/SelectService.java | 26 ++++++++++ .../service/impl/SelectServiceImpl.java | 48 ++++++++++++++++++- .../backstage/SynthesisQueryMapper.xml | 2 +- .../resources/mappers/system/SelectMapper.xml | 31 ++++++++++++ src/main/resources/static/js/select.js | 5 +- .../js/synthesisQuery/highSearchForm.js | 10 ++++ .../pages/synthesisQuery/highSearchForm.html | 6 +-- 9 files changed, 170 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/bonus/imgTool/system/controller/SelectController.java b/src/main/java/com/bonus/imgTool/system/controller/SelectController.java index e95fad7..2462581 100644 --- a/src/main/java/com/bonus/imgTool/system/controller/SelectController.java +++ b/src/main/java/com/bonus/imgTool/system/controller/SelectController.java @@ -2,6 +2,7 @@ package com.bonus.imgTool.system.controller; import com.bonus.imgTool.annotation.DecryptAndVerify; import com.bonus.imgTool.annotation.LogAnnotation; +import com.bonus.imgTool.backstage.entity.QueryParamDto; import com.bonus.imgTool.system.service.DictService; import com.bonus.imgTool.system.service.SelectService; import com.bonus.imgTool.system.vo.Dict; @@ -10,6 +11,7 @@ import com.bonus.imgTool.system.vo.SelectVo; import com.bonus.imgTool.system.vo.dto.SelectDto; import com.bonus.imgTool.utils.ServerResponse; import com.google.common.collect.Lists; +import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; @@ -98,4 +100,25 @@ public class SelectController { } } + @ApiOperation("工程下拉选-按权限划分") + @PostMapping(value = "getProsSelect") + @DecryptAndVerify(decryptedClass = QueryParamDto.class)//加解密统一管理 + public ServerResponse getProsSelect(EncryptedReq dto) { + return service.getProsSelect(dto.getData()); + } + + @ApiOperation("专业下拉选") + @PostMapping(value = "getMajorsSelect") + @DecryptAndVerify(decryptedClass = QueryParamDto.class)//加解密统一管理 + public ServerResponse getMajorsSelect(EncryptedReq dto) { + return service.getMajorsSelect(dto.getData()); + } + + @ApiOperation("工序下拉选") + @PostMapping(value = "getGxsSelect") + @DecryptAndVerify(decryptedClass = QueryParamDto.class)//加解密统一管理 + public ServerResponse getGxsSelect(EncryptedReq dto) { + return service.getGxsSelect(dto.getData()); + } + } diff --git a/src/main/java/com/bonus/imgTool/system/dao/SelectDao.java b/src/main/java/com/bonus/imgTool/system/dao/SelectDao.java index 861eb93..dcbf011 100644 --- a/src/main/java/com/bonus/imgTool/system/dao/SelectDao.java +++ b/src/main/java/com/bonus/imgTool/system/dao/SelectDao.java @@ -1,5 +1,6 @@ package com.bonus.imgTool.system.dao; +import com.bonus.imgTool.backstage.entity.QueryParamDto; import com.bonus.imgTool.system.vo.SelectVo; import com.bonus.imgTool.system.vo.dto.SelectDto; import org.apache.ibatis.annotations.*; @@ -16,4 +17,29 @@ public interface SelectDao { List getProcessSelect(SelectDto data); List getProjectSelect(SelectDto data); + + /** + * 工程下拉选-按权限划分 + * @param dto + * @return List + * @author cwchen + * @date 2025/4/3 13:53 + */ + List getProsSelect(QueryParamDto dto); + /** + * 专业下拉选 + * @param dto + * @return List + * @author cwchen + * @date 2025/4/3 13:53 + */ + List getMajorsSelect(QueryParamDto dto); + /** + * 工序下拉选 + * @param dto + * @return List + * @author cwchen + * @date 2025/4/3 13:53 + */ + List getGxsSelect(QueryParamDto dto); } diff --git a/src/main/java/com/bonus/imgTool/system/service/SelectService.java b/src/main/java/com/bonus/imgTool/system/service/SelectService.java index bce3ae9..cc1bdaf 100644 --- a/src/main/java/com/bonus/imgTool/system/service/SelectService.java +++ b/src/main/java/com/bonus/imgTool/system/service/SelectService.java @@ -1,6 +1,7 @@ package com.bonus.imgTool.system.service; +import com.bonus.imgTool.backstage.entity.QueryParamDto; import com.bonus.imgTool.system.vo.Dict; import com.bonus.imgTool.system.vo.SelectVo; import com.bonus.imgTool.system.vo.dto.SelectDto; @@ -17,4 +18,29 @@ public interface SelectService { List getProcessSelect(SelectDto data); List getProjectSelect(SelectDto data); + + /** + * 工程下拉选-按权限划分 + * @param data + * @return ServerResponse + * @author cwchen + * @date 2025/4/3 13:46 + */ + ServerResponse getProsSelect(QueryParamDto data); + /** + * 获取专业下拉选 + * @param data + * @return ServerResponse + * @author cwchen + * @date 2025/4/3 13:46 + */ + ServerResponse getMajorsSelect(QueryParamDto data); + /** + * 获取工序下拉选 + * @param data + * @return ServerResponse + * @author cwchen + * @date 2025/4/3 13:46 + */ + ServerResponse getGxsSelect(QueryParamDto data); } diff --git a/src/main/java/com/bonus/imgTool/system/service/impl/SelectServiceImpl.java b/src/main/java/com/bonus/imgTool/system/service/impl/SelectServiceImpl.java index f936b37..6fefebf 100644 --- a/src/main/java/com/bonus/imgTool/system/service/impl/SelectServiceImpl.java +++ b/src/main/java/com/bonus/imgTool/system/service/impl/SelectServiceImpl.java @@ -1,20 +1,26 @@ package com.bonus.imgTool.system.service.impl; +import com.bonus.imgTool.backstage.entity.QueryParamDto; +import com.bonus.imgTool.backstage.entity.SynthesisQueryVo; import com.bonus.imgTool.system.dao.DictDao; import com.bonus.imgTool.system.dao.SelectDao; import com.bonus.imgTool.system.service.DictService; import com.bonus.imgTool.system.service.SelectService; import com.bonus.imgTool.system.vo.Dict; +import com.bonus.imgTool.system.vo.LoginUser; import com.bonus.imgTool.system.vo.SelectVo; import com.bonus.imgTool.system.vo.dto.SelectDto; import com.bonus.imgTool.utils.ServerResponse; +import com.bonus.imgTool.utils.UserUtil; +import com.bonus.imgTool.webResult.Constants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.annotation.Resource; -import java.util.List; +import java.util.*; +import java.util.stream.Collectors; @Service @@ -45,4 +51,44 @@ public class SelectServiceImpl implements SelectService { public List getProjectSelect(SelectDto data) { return dao.getProjectSelect(data); } + + @Override + public ServerResponse getProsSelect(QueryParamDto dto) { + try { + String roleLevel = Optional.ofNullable(UserUtil.getLoginUser()).map(LoginUser::getRoleLevel).orElse("0"); + String proIds = Optional.ofNullable(UserUtil.getLoginUser()).map(LoginUser::getProIds).orElse("-1"); + if(Objects.equals(roleLevel, Constants.ROLE_LEVEL)){ // 项目部级 + List proList = Arrays.stream(proIds.split(",")).map(String::trim).filter(s -> !s.isEmpty()).map(Long::valueOf).collect(Collectors.toList()); + dto.setProIds(proList); + } + dto.setRoleLevel(roleLevel); + List list = Optional.ofNullable(dao.getProsSelect(dto)).orElseGet(ArrayList::new); + return ServerResponse.createSuccess(list); + } catch (Exception e) { + log.error(e.toString(),e); + return ServerResponse.createErroe("查询失败"); + } + } + + @Override + public ServerResponse getMajorsSelect(QueryParamDto dto) { + try { + List list = Optional.ofNullable(dao.getMajorsSelect(dto)).orElseGet(ArrayList::new); + return ServerResponse.createSuccess(list); + } catch (Exception e) { + log.error(e.toString(),e); + return ServerResponse.createErroe("查询失败"); + } + } + + @Override + public ServerResponse getGxsSelect(QueryParamDto dto) { + try { + List list = Optional.ofNullable(dao.getGxsSelect(dto)).orElseGet(ArrayList::new); + return ServerResponse.createSuccess(list); + } catch (Exception e) { + log.error(e.toString(),e); + return ServerResponse.createErroe("查询失败"); + } + } } diff --git a/src/main/resources/mappers/backstage/SynthesisQueryMapper.xml b/src/main/resources/mappers/backstage/SynthesisQueryMapper.xml index 9f5b869..b6ee585 100644 --- a/src/main/resources/mappers/backstage/SynthesisQueryMapper.xml +++ b/src/main/resources/mappers/backstage/SynthesisQueryMapper.xml @@ -44,7 +44,7 @@ SELECT sd.dict_value,sd.dict_name FROM sys_distinct sd LEFT JOIN sys_distinct sd2 ON sd.p_id = sd2.id - WHERE sd2.dict_code = 'file_source_type' + WHERE sd2.dict_code = 'file_source_type' AND sd.del_flag = 0 ) A ON A.dict_value = sfr.source_type diff --git a/src/main/resources/mappers/system/SelectMapper.xml b/src/main/resources/mappers/system/SelectMapper.xml index 24e39eb..b9813ae 100644 --- a/src/main/resources/mappers/system/SelectMapper.xml +++ b/src/main/resources/mappers/system/SelectMapper.xml @@ -46,6 +46,37 @@ t.name from tb_project t where is_active = 1 + + + + + + diff --git a/src/main/resources/static/js/select.js b/src/main/resources/static/js/select.js index 57f75db..6553186 100644 --- a/src/main/resources/static/js/select.js +++ b/src/main/resources/static/js/select.js @@ -245,6 +245,7 @@ function getProsSelect() { return data; } +/**专业下拉选*/ function getMajorsSelect() { let data = []; let url = dataUrl + "/sys/select/getMajorsSelect" @@ -266,11 +267,11 @@ function getMajorsSelect() { } /**工序下拉选*/ -function getGxsSelect(major) { +function getGxsSelect(majorId) { let data = []; let url = dataUrl + "/sys/select/getGxsSelect" let obj = { - id: major + id: majorId } let params = { encryptedData: encryptCBC(JSON.stringify(obj)) diff --git a/src/main/resources/static/js/synthesisQuery/highSearchForm.js b/src/main/resources/static/js/synthesisQuery/highSearchForm.js index 4726038..9a88822 100644 --- a/src/main/resources/static/js/synthesisQuery/highSearchForm.js +++ b/src/main/resources/static/js/synthesisQuery/highSearchForm.js @@ -12,11 +12,21 @@ function setParams(obj) { type: 'date', range: true }); + let pros = getProsSelect(); + let majors = getMajorsSelect(); + let gxs =getGxsSelect(); + setSelectValueName(pros,'proId','请选择工程'); + setSelectValueName(majors,'majorId','请选择专业'); + setSelectValueName(gxs,'gxId','请选择工序'); form.val('formInfo', highSearchData); $.each(highSearchData.photoType,function(index,item){ $('input[name="photoType"][value='+item+']').prop('checked', true); }) layui.form.render(); + form.on('select(majorId)', function(data){ + let gxs =getGxsSelect(data.value); + setSelectValueName(gxs,'gxId','请选择工序'); + }); }); } diff --git a/src/main/resources/static/pages/synthesisQuery/highSearchForm.html b/src/main/resources/static/pages/synthesisQuery/highSearchForm.html index afc4eae..52a1980 100644 --- a/src/main/resources/static/pages/synthesisQuery/highSearchForm.html +++ b/src/main/resources/static/pages/synthesisQuery/highSearchForm.html @@ -42,7 +42,7 @@
- +
@@ -50,13 +50,13 @@
- +
- +