diff --git a/src/main/java/com/bonus/imgTool/basic/controller/ProcessController.java b/src/main/java/com/bonus/imgTool/basic/controller/ProcessController.java new file mode 100644 index 0000000..0841bc1 --- /dev/null +++ b/src/main/java/com/bonus/imgTool/basic/controller/ProcessController.java @@ -0,0 +1,107 @@ +package com.bonus.imgTool.basic.controller; + +import com.bonus.imgTool.annotation.DecryptAndVerify; +import com.bonus.imgTool.annotation.LogAnnotation; +import com.bonus.imgTool.basic.service.ProcessService; +import com.bonus.imgTool.basic.vo.ProcessVo; +import com.bonus.imgTool.basic.vo.dto.ProcessDto; +import com.bonus.imgTool.system.vo.EncryptedReq; +import com.bonus.imgTool.utils.ServerResponse; +import lombok.extern.slf4j.Slf4j; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.List; + +/** + * @author fly + */ +@RestController +@RequestMapping("/basic/process/") +@Slf4j +public class ProcessController { + + @Resource + private ProcessService service; + + @GetMapping(value = "getProcessList") + @DecryptAndVerify(decryptedClass = ProcessDto.class)//加解密统一管理 + @LogAnnotation(operModul = "工序管理", operation = "查询列表", operDesc = "系统级事件",operType="查询") +// @PreAuthorize("@pms.hasPermission('sys:process:query')" ) + public ServerResponse getProcessList(EncryptedReq data) { + try { + List list = service.getProcessList(data.getData()); + return ServerResponse.createSuccess(list); + }catch (Exception e){ + log.error(e.toString(),e); + } + return ServerResponse.createErroe("操作失败"); + } + + @PostMapping(value = "insertProcess") + @DecryptAndVerify(decryptedClass = ProcessDto.class)//加解密统一管理 + @LogAnnotation(operModul = "工序管理", operation = "新增工序", operDesc = "系统级事件",operType="新增") +// @PreAuthorize("@pms.hasPermission('sys:process:add')" ) + public ServerResponse insertProcess(EncryptedReq data) { + try { + ProcessDto bean = data.getData(); + int i = service.getProcessById(bean); + if (i>0) { + return ServerResponse.createErroe("工序"+bean.getProcessName() + "在"+bean.getProfessionName()+"专业下已存在"); + } + return service.insertProcess(bean); + }catch (Exception e){ + log.error(e.toString(),e); + } + return ServerResponse.createErroe("操作失败"); + } + + + @PostMapping(value = "updateProcess") + @DecryptAndVerify(decryptedClass = ProcessDto.class)//加解密统一管理 + @LogAnnotation(operModul = "工序管理", operation = "修改工序", operDesc = "系统级事件",operType="修改") +// @PreAuthorize("@pms.hasPermission('sys:process:update')" ) + public ServerResponse updateProcess(EncryptedReq data) { + try { + ProcessDto bean = data.getData(); + int i = service.getProcessById(bean); + if (i>0) { + return ServerResponse.createErroe("工序"+bean.getProcessName() + "在"+bean.getProfessionName()+"专业下已存在"); + } + return service.updateProcess(bean); + }catch (Exception e){ + log.error(e.toString(),e); + } + return ServerResponse.createErroe("操作失败"); + } + + @PostMapping(value = "updateProcessStatus") + @DecryptAndVerify(decryptedClass = ProcessDto.class)//加解密统一管理 + @LogAnnotation(operModul = "工序管理", operation = "工序状态", operDesc = "系统级事件",operType="修改") +// @PreAuthorize("@pms.hasPermission('sys:process:update')" ) + public ServerResponse updateProcessStatus(EncryptedReq data) { + try { + ProcessDto bean = data.getData(); + return service.updateProcessStatus(bean); + }catch (Exception e){ + log.error(e.toString(),e); + } + return ServerResponse.createErroe("操作失败"); + } + + @DeleteMapping(value = "delProcessById") + @DecryptAndVerify(decryptedClass = ProcessDto.class)//加解密统一管理 + @LogAnnotation(operModul = "工序管理", operation = "删除工序", operDesc = "系统级事件",operType="删除") +// @PreAuthorize("@pms.hasPermission('sys:process:update')" ) + public ServerResponse delProcessById(EncryptedReq data) { + try { + ProcessDto bean = data.getData(); + return service.delProcessById(bean); + }catch (Exception e){ + log.error(e.toString(),e); + } + return ServerResponse.createErroe("操作失败"); + } + +} diff --git a/src/main/java/com/bonus/imgTool/basic/dao/ProcessDao.java b/src/main/java/com/bonus/imgTool/basic/dao/ProcessDao.java new file mode 100644 index 0000000..24523d5 --- /dev/null +++ b/src/main/java/com/bonus/imgTool/basic/dao/ProcessDao.java @@ -0,0 +1,22 @@ +package com.bonus.imgTool.basic.dao; + +import com.bonus.imgTool.basic.vo.ProcessVo; +import com.bonus.imgTool.basic.vo.dto.ProcessDto; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +public interface ProcessDao { + List getProcessList(ProcessDto data); + + int insertProcess(ProcessDto bean); + + int getProcessById(ProcessDto bean); + + int updateProcess(ProcessDto bean); + + int updateProcessStatus(ProcessDto bean); + + int delProcessById(ProcessDto bean); +} diff --git a/src/main/java/com/bonus/imgTool/basic/service/ProcessService.java b/src/main/java/com/bonus/imgTool/basic/service/ProcessService.java new file mode 100644 index 0000000..76affc4 --- /dev/null +++ b/src/main/java/com/bonus/imgTool/basic/service/ProcessService.java @@ -0,0 +1,23 @@ +package com.bonus.imgTool.basic.service; + + +import com.bonus.imgTool.basic.vo.ProcessVo; +import com.bonus.imgTool.basic.vo.dto.ProcessDto; +import com.bonus.imgTool.utils.ServerResponse; + +import java.util.List; + +public interface ProcessService { + + List getProcessList(ProcessDto data); + + int getProcessById(ProcessDto bean); + + ServerResponse insertProcess(ProcessDto bean); + + ServerResponse updateProcess(ProcessDto bean); + + ServerResponse updateProcessStatus(ProcessDto bean); + + ServerResponse delProcessById(ProcessDto bean); +} diff --git a/src/main/java/com/bonus/imgTool/basic/service/impl/ProcessServiceImpl.java b/src/main/java/com/bonus/imgTool/basic/service/impl/ProcessServiceImpl.java new file mode 100644 index 0000000..983d36a --- /dev/null +++ b/src/main/java/com/bonus/imgTool/basic/service/impl/ProcessServiceImpl.java @@ -0,0 +1,89 @@ +package com.bonus.imgTool.basic.service.impl; + +import com.bonus.imgTool.basic.dao.ProcessDao; +import com.bonus.imgTool.basic.service.ProcessService; +import com.bonus.imgTool.basic.vo.ProcessVo; +import com.bonus.imgTool.basic.vo.dto.ProcessDto; +import com.bonus.imgTool.system.vo.LoginUser; +import com.bonus.imgTool.utils.ServerResponse; +import com.bonus.imgTool.utils.UserUtil; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + + +@Service +public class ProcessServiceImpl implements ProcessService { + + private static final Logger log = LoggerFactory.getLogger("SelectServiceImpl"); + + @Resource + private ProcessDao dao; + + + @Override + public List getProcessList(ProcessDto data) { + return dao.getProcessList(data); + } + + @Override + public int getProcessById(ProcessDto bean) { + return dao.getProcessById(bean); + } + + @Override + public ServerResponse insertProcess(ProcessDto bean) { + + LoginUser loginUser = UserUtil.getLoginUser(); + bean.setCreateUserId(loginUser.getId()); + bean.setCreateUserName(loginUser.getUsername()); + int num= dao.insertProcess(bean); + if(num>0){ + return ServerResponse.createSuccess("新增成功",num); + }else{ + return ServerResponse.createErroe("新增失败"); + } + } + + @Override + public ServerResponse updateProcess(ProcessDto bean) { + LoginUser loginUser = UserUtil.getLoginUser(); + bean.setUpdateUserId(loginUser.getId()); + bean.setUpdateUserName(loginUser.getUsername()); + int num= dao.updateProcess(bean); + if(num>0){ + return ServerResponse.createSuccess("修改成功",num); + }else{ + return ServerResponse.createErroe("修改失败"); + } + } + + @Override + public ServerResponse updateProcessStatus(ProcessDto bean) { + LoginUser loginUser = UserUtil.getLoginUser(); + bean.setUpdateUserId(loginUser.getId()); + bean.setUpdateUserName(loginUser.getUsername()); + int num= dao.updateProcessStatus(bean); + if(num>0){ + return ServerResponse.createSuccess("修改工序状态成功",num); + }else{ + return ServerResponse.createErroe("修改工序状态失败"); + } + } + + @Override + public ServerResponse delProcessById(ProcessDto bean) { + LoginUser loginUser = UserUtil.getLoginUser(); + bean.setUpdateUserId(loginUser.getId()); + bean.setUpdateUserName(loginUser.getUsername()); + int num= dao.delProcessById(bean); + if(num>0){ + return ServerResponse.createSuccess("删除工序成功",num); + }else{ + return ServerResponse.createErroe("删除工序失败"); + } + } +} diff --git a/src/main/java/com/bonus/imgTool/basic/vo/ProcessVo.java b/src/main/java/com/bonus/imgTool/basic/vo/ProcessVo.java new file mode 100644 index 0000000..2f9acbd --- /dev/null +++ b/src/main/java/com/bonus/imgTool/basic/vo/ProcessVo.java @@ -0,0 +1,52 @@ +package com.bonus.imgTool.basic.vo; + +import lombok.Data; + +/** + * @className:SelectDto + * @author:cwchen + * @date:2024-07-19-13:14 + * @version:1.0 + * @description:下拉选-dto + */ +@Data +public class ProcessVo { + + + /** + * 专业id + */ + private Long professionId; + + /** + * 专业名称 + */ + private String professionName; + + /** + * 工序id + */ + private Long processId; + + + /** + * 工序名称 + */ + private String processName; + + /** + * 状态 + */ + private String status; + + /** + * 创建时间 + */ + private String createTime; + + /** + * 关键字 + */ + private String keyWord; + +} diff --git a/src/main/java/com/bonus/imgTool/basic/vo/dto/ProcessDto.java b/src/main/java/com/bonus/imgTool/basic/vo/dto/ProcessDto.java new file mode 100644 index 0000000..9b82736 --- /dev/null +++ b/src/main/java/com/bonus/imgTool/basic/vo/dto/ProcessDto.java @@ -0,0 +1,67 @@ +package com.bonus.imgTool.basic.vo.dto; + +import lombok.Data; + +/** + * @className:SelectDto + * @author:cwchen + * @date:2024-07-19-13:14 + * @version:1.0 + * @description:下拉选-dto + */ +@Data +public class ProcessDto { + + + /** + * 专业id + */ + private Long professionId; + + /** + * 专业名称 + */ + private String professionName; + + /** + * 工序id + */ + private Long processId; + + + /** + * 工序名称 + */ + private String processName; + + /** + * 状态 + */ + private String status; + + /** + * 关键字 + */ + private String keyWord; + + /** + * 创建人 + */ + private Long createUserId; + + /** + * 创建人 + */ + private String createUserName; + + /** + * 修改人 + */ + private Long updateUserId; + + /** + * 修改人 + */ + private String updateUserName; + +} diff --git a/src/main/java/com/bonus/imgTool/system/controller/SelectController.java b/src/main/java/com/bonus/imgTool/system/controller/SelectController.java new file mode 100644 index 0000000..b926442 --- /dev/null +++ b/src/main/java/com/bonus/imgTool/system/controller/SelectController.java @@ -0,0 +1,89 @@ +package com.bonus.imgTool.system.controller; + +import com.bonus.imgTool.annotation.DecryptAndVerify; +import com.bonus.imgTool.annotation.LogAnnotation; +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.EncryptedReq; +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 lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import java.util.List; + +/** + * @author fly + */ +@RestController +@RequestMapping("/sys/select/") +@Slf4j +public class SelectController { + + @Resource + private SelectService service; + + @PostMapping(value = "getDictSelect") + @DecryptAndVerify(decryptedClass = SelectDto.class)//加解密统一管理 + @LogAnnotation(operModul = "字典管理", operation = "查询列表", operDesc = "系统级事件",operType="查询") + public ServerResponse getDictSelect(EncryptedReq data) { + try { + List list = service.getDictSelect(data.getData()); +// List list = Lists.newArrayList(); +// setDictsList(0L, dictsAll, list); + return ServerResponse.createSuccess(list); + }catch (Exception e){ + log.error(e.toString(),e); + } + return ServerResponse.createErroe("操作失败"); + } + + + @GetMapping(value = "getProfessionSelect") + @DecryptAndVerify(decryptedClass = SelectDto.class)//加解密统一管理 + @LogAnnotation(operModul = "专业查询", operation = "下拉框", operDesc = "系统级事件",operType="查询") + public ServerResponse getProfessionSelect(EncryptedReq data) { + try { + List list = service.getProfessionSelect(data.getData()); + return ServerResponse.createSuccess(list); + }catch (Exception e){ + log.error(e.toString(),e); + } + return ServerResponse.createErroe("操作失败"); + } + + @GetMapping(value = "getProcessSelect") + @DecryptAndVerify(decryptedClass = SelectDto.class)//加解密统一管理 + @LogAnnotation(operModul = "工序查询", operation = "下拉框", operDesc = "系统级事件",operType="查询") + public ServerResponse getProcessSelect(EncryptedReq data) { + try { + List list = service.getProcessSelect(data.getData()); + return ServerResponse.createSuccess(list); + }catch (Exception e){ + log.error(e.toString(),e); + } + return ServerResponse.createErroe("操作失败"); + } + + + private void setDictsList(Long pId, List dictsAll, List list) { + for (Dict bean : dictsAll) { + if (bean.getParentId().equals(pId)) { + list.add(bean); + if (dictsAll.stream().filter(p -> p.getParentId().equals(bean.getId())).findAny() != null) { + setDictsList(bean.getId(), dictsAll, list); + } + } + } + } + +} diff --git a/src/main/java/com/bonus/imgTool/system/dao/SelectDao.java b/src/main/java/com/bonus/imgTool/system/dao/SelectDao.java new file mode 100644 index 0000000..98778c6 --- /dev/null +++ b/src/main/java/com/bonus/imgTool/system/dao/SelectDao.java @@ -0,0 +1,17 @@ +package com.bonus.imgTool.system.dao; + +import com.bonus.imgTool.system.vo.SelectVo; +import com.bonus.imgTool.system.vo.dto.SelectDto; +import org.apache.ibatis.annotations.*; + +import java.util.List; +import java.util.Map; + +@Mapper +public interface SelectDao { + List getDictSelect(@Param("bean")SelectDto data); + + List getProfessionSelect(SelectDto data); + + List getProcessSelect(SelectDto data); +} diff --git a/src/main/java/com/bonus/imgTool/system/service/SelectService.java b/src/main/java/com/bonus/imgTool/system/service/SelectService.java new file mode 100644 index 0000000..74f329d --- /dev/null +++ b/src/main/java/com/bonus/imgTool/system/service/SelectService.java @@ -0,0 +1,18 @@ +package com.bonus.imgTool.system.service; + + +import com.bonus.imgTool.system.vo.Dict; +import com.bonus.imgTool.system.vo.SelectVo; +import com.bonus.imgTool.system.vo.dto.SelectDto; +import com.bonus.imgTool.utils.ServerResponse; + +import java.util.List; + +public interface SelectService { + + List getDictSelect(SelectDto data); + + List getProfessionSelect(SelectDto data); + + List getProcessSelect(SelectDto 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 new file mode 100644 index 0000000..777df16 --- /dev/null +++ b/src/main/java/com/bonus/imgTool/system/service/impl/SelectServiceImpl.java @@ -0,0 +1,43 @@ +package com.bonus.imgTool.system.service.impl; + +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.SelectVo; +import com.bonus.imgTool.system.vo.dto.SelectDto; +import com.bonus.imgTool.utils.ServerResponse; +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; + + +@Service +public class SelectServiceImpl implements SelectService { + + private static final Logger log = LoggerFactory.getLogger("SelectServiceImpl"); + + @Resource + private SelectDao dao; + + + @Override + public List getDictSelect(SelectDto data) { + return dao.getDictSelect(data); + } + + @Override + public List getProfessionSelect(SelectDto data) { + return dao.getProfessionSelect(data); + } + + @Override + public List getProcessSelect(SelectDto data) { + return dao.getProcessSelect(data); + } +} diff --git a/src/main/java/com/bonus/imgTool/system/vo/SelectVo.java b/src/main/java/com/bonus/imgTool/system/vo/SelectVo.java new file mode 100644 index 0000000..4ce9fb0 --- /dev/null +++ b/src/main/java/com/bonus/imgTool/system/vo/SelectVo.java @@ -0,0 +1,13 @@ +package com.bonus.imgTool.system.vo; + +import com.bonus.imgTool.base.entity.PageEntity; +import lombok.Data; + +@Data +public class SelectVo extends PageEntity { + + private static final long serialVersionUID = -2431140186410912787L; + private Long id; + private String name; + +} diff --git a/src/main/java/com/bonus/imgTool/system/vo/dto/SelectDto.java b/src/main/java/com/bonus/imgTool/system/vo/dto/SelectDto.java index dc8e533..675c93f 100644 --- a/src/main/java/com/bonus/imgTool/system/vo/dto/SelectDto.java +++ b/src/main/java/com/bonus/imgTool/system/vo/dto/SelectDto.java @@ -12,9 +12,13 @@ import lombok.Data; @Data public class SelectDto { - /** 字段编码*/ - private String code; + private Long id; + private Long pid; + + /** 字段编码*/ + private String code; + } diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 84578e6..27aef5a 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -37,7 +37,7 @@ spring.http.multipart.maxRequestSize=10000Mb token.expire.seconds=7200 #\u6587\u4EF6\u4E0A\u4F20 spring.servlet.multipart.enabled=true -zhly.aq.enable=true +zhly.aq.enable=false #\u6587\u4EF6\u8FC7\u6EE4 zhly.aq.file.suffix=woff,js,css,html,woff2,lang,map,png,jpg #\u9759\u6001\u8D44\u6E90 \u4E0D\u62E6\u622A diff --git a/src/main/resources/mappers/basic/ProcessMapper.xml b/src/main/resources/mappers/basic/ProcessMapper.xml new file mode 100644 index 0000000..7247bdb --- /dev/null +++ b/src/main/resources/mappers/basic/ProcessMapper.xml @@ -0,0 +1,84 @@ + + + + + + + + + + + insert into tb_gx(gx_id,gx_name,major_id,create_user_id,create_user_name) + values(#{processId},#{processName},#{professionId},#{createUserId},#{createUserName}) + + + + update tb_gx + + + gx_name = #{processName}, + + + major_id = #{professionId}, + + update_user_id = #{updateUserId}, + update_user_name = #{updateUserName} + + where gx_id = #{processId} + + + update tb_gx + + + is_use = #{status}, + + update_user_id = #{updateUserId}, + update_user_name = #{updateUserName} + + where gx_id = #{processId} + + + update tb_gx + + is_active= 0, + update_user_id = #{updateUserId}, + update_user_name = #{updateUserName} + + where gx_id = #{processId} + + + + + + + + diff --git a/src/main/resources/mappers/system/SelectMapper.xml b/src/main/resources/mappers/system/SelectMapper.xml new file mode 100644 index 0000000..81d1cb2 --- /dev/null +++ b/src/main/resources/mappers/system/SelectMapper.xml @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + diff --git a/src/main/resources/static/js/select.js b/src/main/resources/static/js/select.js index d8be5f2..2f079b7 100644 --- a/src/main/resources/static/js/select.js +++ b/src/main/resources/static/js/select.js @@ -84,10 +84,10 @@ function getDeviceChildTypeSelect() { } // 字典-下拉选 -function getDistinctSelect() { +function getDistinctSelect(obj) { let data = []; - let url = dataUrl + "/sys/select/getDistinctSelect" - let obj = {} + let url = dataUrl + "/sys/select/getDictSelect" + // let obj = {} let params = { encryptedData: encryptCBC(JSON.stringify(obj)) } diff --git a/src/main/resources/static/js/system/child/distinctForm.js b/src/main/resources/static/js/system/child/distinctForm.js index 00f885d..3becce8 100644 --- a/src/main/resources/static/js/system/child/distinctForm.js +++ b/src/main/resources/static/js/system/child/distinctForm.js @@ -3,7 +3,8 @@ let distinctList = []; function setParams(params) { idParam = JSON.parse(params).id; - distinctList = getDistinctSelect(); + let obj = {pid:0} + distinctList = getDistinctSelect(obj); setSelectValue(distinctList, 'parentId'); layui.use(['form', 'layer'], function () { layer = layui.layer; diff --git a/src/main/resources/static/pages/menu/addMenu.html b/src/main/resources/static/pages/menu/addMenu.html index 3e44226..d4434c8 100644 --- a/src/main/resources/static/pages/menu/addMenu.html +++ b/src/main/resources/static/pages/menu/addMenu.html @@ -12,7 +12,7 @@
- +
@@ -41,7 +41,7 @@
- +
@@ -98,38 +98,31 @@ console.log($("#type").val()) if ($("#type").val() === "1"){ - $("#href").attr("lay-verify", "required"); + $("#href").removeAttr("lay-verify"); document.getElementById("qx").style.display = "none"; }else if ($("#type").val() === "2") { $("#permission").attr("lay-verify", "required"); - document.getElementById("lj").style.display = "none"; - }else { $("#href").removeAttr("lay-verify"); $("#permission").removeAttr("lay-verify"); document.getElementById("qx").style.display = "none"; - document.getElementById("lj").style.display = "none"; } form.on('select(type)', function(data){ - debugger console.log(data.value) if (data.value === "1") { - $("#href").attr("lay-verify", "required"); + $("#href").removeAttr("lay-verify"); $("#permission").removeAttr("lay-verify"); document.getElementById("qx").style.display = "none"; - document.getElementById("lj").style.display = "inline"; } else if (data.value === "2") { $("#href").removeAttr("lay-verify"); $("#permission").attr("lay-verify", "required"); - document.getElementById("lj").style.display = "none"; document.getElementById("qx").style.display = "inline"; } else { $("#href").removeAttr("lay-verify"); $("#permission").removeAttr("lay-verify"); document.getElementById("qx").style.display = "none"; - document.getElementById("lj").style.display = "none"; } });