diff --git a/src/main/java/com/bonus/imgTool/basic/controller/ProcessController.java b/src/main/java/com/bonus/imgTool/basic/controller/ProcessController.java index 35a2107..8284ae8 100644 --- a/src/main/java/com/bonus/imgTool/basic/controller/ProcessController.java +++ b/src/main/java/com/bonus/imgTool/basic/controller/ProcessController.java @@ -113,7 +113,7 @@ public class ProcessController { @DeleteMapping(value = "delProcessById") @DecryptAndVerify(decryptedClass = ProcessDto.class)//加解密统一管理 @LogAnnotation(operModul = "工序管理", operation = "删除工序", operDesc = "系统级事件",operType="删除") -// @PreAuthorize("@pms.hasPermission('sys:process:update')" ) +// @PreAuthorize("@pms.hasPermission('sys:process:del')" ) public ServerResponse delProcessById(EncryptedReq data) { try { ProcessDto bean = data.getData(); diff --git a/src/main/java/com/bonus/imgTool/imgUpload/controller/QualityInspectionController.java b/src/main/java/com/bonus/imgTool/imgUpload/controller/QualityInspectionController.java new file mode 100644 index 0000000..f4cf9aa --- /dev/null +++ b/src/main/java/com/bonus/imgTool/imgUpload/controller/QualityInspectionController.java @@ -0,0 +1,102 @@ +package com.bonus.imgTool.imgUpload.controller; + +import com.bonus.imgTool.annotation.DecryptAndVerify; +import com.bonus.imgTool.annotation.LogAnnotation; +import com.bonus.imgTool.imgUpload.service.QualityInspectionService; +import com.bonus.imgTool.imgUpload.service.SafetyViolationService; +import com.bonus.imgTool.imgUpload.vo.SafetyViolationVo; +import com.bonus.imgTool.imgUpload.vo.dto.SafetyViolationDto; +import com.bonus.imgTool.system.vo.EncryptedReq; +import com.bonus.imgTool.utils.ServerResponse; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.List; + +/** + * @author fly + */ +@RestController +@RequestMapping("/imgUpload/qualityInspection/") +@Slf4j +public class QualityInspectionController { + + @Resource + private QualityInspectionService service; + + @GetMapping(value = "getList") + @DecryptAndVerify(decryptedClass = SafetyViolationDto.class)//加解密统一管理 + @LogAnnotation(operModul = "安全违章", operation = "查询列表", operDesc = "系统级事件",operType="查询") +// @PreAuthorize("@pms.hasPermission('sys:qualityInspection:query')" ) + public ServerResponse getList(EncryptedReq data) { + PageHelper.startPage(data.getData().getPage(), data.getData().getLimit()); + try { + List list = service.getList(data.getData()); + PageInfo pageInfo = new PageInfo<>(list); + return ServerResponse.createSuccessPage(pageInfo,data.getData().getPage(),data.getData().getLimit()); + }catch (Exception e){ + log.error(e.toString(),e); + } + return ServerResponse.createErrorPage(data.getData().getPage(),data.getData().getLimit()); + } + + @PostMapping(value = "insertQualityInspection") + @DecryptAndVerify(decryptedClass = SafetyViolationDto.class)//加解密统一管理 + @LogAnnotation(operModul = "安全违章", operation = "新增数据", operDesc = "系统级事件",operType="新增") +// @PreAuthorize("@pms.hasPermission('sys:qualityInspection:add')" ) + public ServerResponse insertQualityInspection(EncryptedReq data) { + try { + SafetyViolationDto bean = data.getData(); + return service.insertQualityInspection(bean); + }catch (Exception e){ + log.error(e.toString(),e); + } + return ServerResponse.createErroe("操作失败"); + } + + @GetMapping(value = "getQualityInspectionById") + @DecryptAndVerify(decryptedClass = SafetyViolationDto.class)//加解密统一管理 + @LogAnnotation(operModul = "安全违章", operation = "查询单个数据", operDesc = "系统级事件",operType="查询") +// @PreAuthorize("@pms.hasPermission('sys:qualityInspection:query')" ) + public ServerResponse getQualityInspectionById(EncryptedReq data) { + try { + SafetyViolationVo safetyViolation = service.getQualityInspectionById(data.getData().getId()); + return ServerResponse.createSuccess(safetyViolation); + }catch (Exception e){ + log.error(e.toString(),e); + } + return ServerResponse.createErroe("操作失败"); + } + + @PostMapping(value = "updateQualityInspectionById") + @DecryptAndVerify(decryptedClass = SafetyViolationDto.class)//加解密统一管理 + @LogAnnotation(operModul = "安全违章", operation = "修改单个数据", operDesc = "系统级事件",operType="修改") +// @PreAuthorize("@pms.hasPermission('sys:qualityInspection:update')" ) + public ServerResponse updateQualityInspectionById(EncryptedReq data) { + try { + SafetyViolationDto bean = data.getData(); + return service.updateQualityInspectionById(bean); + }catch (Exception e){ + log.error(e.toString(),e); + } + return ServerResponse.createErroe("操作失败"); + } + + @DeleteMapping(value = "delQualityInspectionById") + @DecryptAndVerify(decryptedClass = SafetyViolationDto.class)//加解密统一管理 + @LogAnnotation(operModul = "安全违章", operation = "删除违章", operDesc = "系统级事件",operType="删除") +// @PreAuthorize("@pms.hasPermission('sys:qualityInspection:del')" ) + public ServerResponse delQualityInspectionById(EncryptedReq data) { + try { + SafetyViolationDto bean = data.getData(); + return service.delQualityInspectionById(bean); + }catch (Exception e){ + log.error(e.toString(),e); + } + return ServerResponse.createErroe("操作失败"); + } + +} diff --git a/src/main/java/com/bonus/imgTool/imgUpload/controller/SafetyViolationController.java b/src/main/java/com/bonus/imgTool/imgUpload/controller/SafetyViolationController.java index 94929dd..e67705d 100644 --- a/src/main/java/com/bonus/imgTool/imgUpload/controller/SafetyViolationController.java +++ b/src/main/java/com/bonus/imgTool/imgUpload/controller/SafetyViolationController.java @@ -13,10 +13,7 @@ import com.bonus.imgTool.utils.ServerResponse; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import lombok.extern.slf4j.Slf4j; -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 org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import java.util.ArrayList; @@ -52,7 +49,7 @@ public class SafetyViolationController { @PostMapping(value = "insertSafetyViolation") @DecryptAndVerify(decryptedClass = SafetyViolationDto.class)//加解密统一管理 @LogAnnotation(operModul = "安全违章", operation = "新增数据", operDesc = "系统级事件",operType="新增") -// @PreAuthorize("@pms.hasPermission('sys:safetyViolation:query')" ) +// @PreAuthorize("@pms.hasPermission('sys:safetyViolation:add')" ) public ServerResponse insertSafetyViolation(EncryptedReq data) { try { SafetyViolationDto bean = data.getData(); @@ -80,7 +77,7 @@ public class SafetyViolationController { @PostMapping(value = "updateSafetyViolationById") @DecryptAndVerify(decryptedClass = SafetyViolationDto.class)//加解密统一管理 @LogAnnotation(operModul = "安全违章", operation = "修改单个数据", operDesc = "系统级事件",operType="修改") -// @PreAuthorize("@pms.hasPermission('sys:safetyViolation:query')" ) +// @PreAuthorize("@pms.hasPermission('sys:safetyViolation:update')" ) public ServerResponse updateSafetyViolationById(EncryptedReq data) { try { SafetyViolationDto bean = data.getData(); @@ -91,4 +88,18 @@ public class SafetyViolationController { return ServerResponse.createErroe("操作失败"); } + @DeleteMapping(value = "delSafetyViolationById") + @DecryptAndVerify(decryptedClass = SafetyViolationDto.class)//加解密统一管理 + @LogAnnotation(operModul = "安全违章", operation = "删除违章", operDesc = "系统级事件",operType="删除") +// @PreAuthorize("@pms.hasPermission('sys:safetyViolation:del')" ) + public ServerResponse delSafetyViolationById(EncryptedReq data) { + try { + SafetyViolationDto bean = data.getData(); + return service.delSafetyViolationById(bean); + }catch (Exception e){ + log.error(e.toString(),e); + } + return ServerResponse.createErroe("操作失败"); + } + } diff --git a/src/main/java/com/bonus/imgTool/imgUpload/dao/QualityInspectionDao.java b/src/main/java/com/bonus/imgTool/imgUpload/dao/QualityInspectionDao.java new file mode 100644 index 0000000..de71ded --- /dev/null +++ b/src/main/java/com/bonus/imgTool/imgUpload/dao/QualityInspectionDao.java @@ -0,0 +1,22 @@ +package com.bonus.imgTool.imgUpload.dao; + +import com.bonus.imgTool.imgUpload.vo.SafetyViolationVo; +import com.bonus.imgTool.imgUpload.vo.dto.SafetyViolationDto; +import com.bonus.imgTool.system.vo.dto.FileStorageDto; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +public interface QualityInspectionDao { + + List getList(SafetyViolationDto data); + + int insertQualityInspection(SafetyViolationDto bean); + + SafetyViolationVo getQualityInspectionById(Long id); + + int updateQualityInspectionById(SafetyViolationDto bean); + + int delQualityInspectionById(SafetyViolationDto bean); +} diff --git a/src/main/java/com/bonus/imgTool/imgUpload/dao/SafetyViolationDao.java b/src/main/java/com/bonus/imgTool/imgUpload/dao/SafetyViolationDao.java index dece2de..0e04091 100644 --- a/src/main/java/com/bonus/imgTool/imgUpload/dao/SafetyViolationDao.java +++ b/src/main/java/com/bonus/imgTool/imgUpload/dao/SafetyViolationDao.java @@ -24,4 +24,8 @@ public interface SafetyViolationDao { int updateSafetyViolationById(SafetyViolationDto bean); int delImgPhoto(List delFileList); + + int delImgPhotoBySourceId(FileStorageDto file); + + int delSafetyViolationById(SafetyViolationDto bean); } diff --git a/src/main/java/com/bonus/imgTool/imgUpload/service/QualityInspectionService.java b/src/main/java/com/bonus/imgTool/imgUpload/service/QualityInspectionService.java new file mode 100644 index 0000000..a570a8a --- /dev/null +++ b/src/main/java/com/bonus/imgTool/imgUpload/service/QualityInspectionService.java @@ -0,0 +1,22 @@ +package com.bonus.imgTool.imgUpload.service; + + + +import com.bonus.imgTool.imgUpload.vo.SafetyViolationVo; +import com.bonus.imgTool.imgUpload.vo.dto.SafetyViolationDto; +import com.bonus.imgTool.utils.ServerResponse; + +import java.util.List; + +public interface QualityInspectionService { + + List getList(SafetyViolationDto data); + + ServerResponse insertQualityInspection(SafetyViolationDto bean); + + SafetyViolationVo getQualityInspectionById(Long id); + + ServerResponse updateQualityInspectionById(SafetyViolationDto bean); + + ServerResponse delQualityInspectionById(SafetyViolationDto bean); +} diff --git a/src/main/java/com/bonus/imgTool/imgUpload/service/SafetyViolationService.java b/src/main/java/com/bonus/imgTool/imgUpload/service/SafetyViolationService.java index fc1880d..9652c74 100644 --- a/src/main/java/com/bonus/imgTool/imgUpload/service/SafetyViolationService.java +++ b/src/main/java/com/bonus/imgTool/imgUpload/service/SafetyViolationService.java @@ -18,4 +18,6 @@ public interface SafetyViolationService { SafetyViolationVo getSafetyViolationById(Long id); ServerResponse updateSafetyViolationById(SafetyViolationDto bean); + + ServerResponse delSafetyViolationById(SafetyViolationDto bean); } diff --git a/src/main/java/com/bonus/imgTool/imgUpload/service/impl/QualityInspectionServiceImpl.java b/src/main/java/com/bonus/imgTool/imgUpload/service/impl/QualityInspectionServiceImpl.java new file mode 100644 index 0000000..671de7e --- /dev/null +++ b/src/main/java/com/bonus/imgTool/imgUpload/service/impl/QualityInspectionServiceImpl.java @@ -0,0 +1,147 @@ +package com.bonus.imgTool.imgUpload.service.impl; + +import com.bonus.imgTool.backstage.entity.ComprehensiveQueryVo; +import com.bonus.imgTool.backstage.service.SynthesisQueryService; +import com.bonus.imgTool.imgUpload.dao.QualityInspectionDao; +import com.bonus.imgTool.imgUpload.dao.SafetyViolationDao; +import com.bonus.imgTool.imgUpload.service.QualityInspectionService; +import com.bonus.imgTool.imgUpload.service.SafetyViolationService; +import com.bonus.imgTool.imgUpload.vo.SafetyViolationVo; +import com.bonus.imgTool.imgUpload.vo.dto.SafetyViolationDto; +import com.bonus.imgTool.system.vo.LoginUser; +import com.bonus.imgTool.system.vo.dto.FileStorageDto; +import com.bonus.imgTool.utils.ServerResponse; +import com.bonus.imgTool.utils.UserUtil; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.util.List; + + +@Service +public class QualityInspectionServiceImpl implements QualityInspectionService { + + private static final Logger log = LoggerFactory.getLogger("SafetyViolationServiceImpl"); + + @Resource + private QualityInspectionDao dao; + + @Resource + private SafetyViolationDao safetyViolationDao; + + @Resource + private SynthesisQueryService synthesisQueryService; + + @Override + public List getList(SafetyViolationDto data) { + return dao.getList(data); + } + + @Override + @Transactional + public ServerResponse insertQualityInspection(SafetyViolationDto bean) { + LoginUser loginUser = UserUtil.getLoginUser(); + bean.setCreateUserId(loginUser.getId()); + bean.setCreateUserName(loginUser.getUsername()); + //基础数据存入库 + int i = dao.insertQualityInspection(bean); + if (i > 0) { + List fileList = bean.getFileList(); + //照片入库 + if (fileList != null && !fileList.isEmpty()) { + fileList.forEach(item -> { + item.setSourceId(bean.getId()); + item.setCreateUser(bean.getCreateUserId()); + item.setCreateUserName(bean.getCreateUserName()); + }); + int j = safetyViolationDao.insertImgPhoto(bean.getFileList()); + } + //存入总库 TODO + ComprehensiveQueryVo comprehensiveQueryVo = new ComprehensiveQueryVo(); + BeanUtils.copyProperties(bean,comprehensiveQueryVo); + synthesisQueryService.addComprehensiveQuery(comprehensiveQueryVo); + return ServerResponse.createSuccess("新增成功"); + } + return ServerResponse.createErroe("新增失败"); + } + + @Override + public SafetyViolationVo getQualityInspectionById(Long id) { + SafetyViolationVo bean = dao.getQualityInspectionById(id); + if(bean != null){ + //照片查询 + FileStorageDto fileStorageDto = new FileStorageDto(); + fileStorageDto.setSourceId(id); + fileStorageDto.setSourceType("3"); + bean.setVioPhotoList(safetyViolationDao.getImgPhotoList(fileStorageDto)); + fileStorageDto.setSourceType("4"); + bean.setRectPhotoList(safetyViolationDao.getImgPhotoList(fileStorageDto)); + } + return bean; + } + + @Override + public ServerResponse updateQualityInspectionById(SafetyViolationDto bean) { + LoginUser loginUser = UserUtil.getLoginUser(); + bean.setUpdateUserId(loginUser.getId()); + bean.setUpdateUserName(loginUser.getUsername()); + int num = dao.updateQualityInspectionById(bean); + if (num > 0) { + List fileList = bean.getFileList(); + List delFileList = bean.getDelFileList(); + + //照片入库 + if (fileList != null && !fileList.isEmpty()) { + fileList.forEach(item -> { + item.setSourceId(bean.getId()); + item.setCreateUser(bean.getUpdateUserId()); + item.setCreateUserName(bean.getUpdateUserName()); + }); + int j = safetyViolationDao.insertImgPhoto(bean.getFileList()); + } + //照片删除 + if (delFileList != null && !delFileList.isEmpty()) { + delFileList.forEach(item -> { + item.setSourceId(bean.getId()); + item.setCreateUser(bean.getUpdateUserId()); + item.setCreateUserName(bean.getUpdateUserName()); + }); + int j = safetyViolationDao.delImgPhoto(bean.getDelFileList()); + } + //总库修改 TODO + ComprehensiveQueryVo comprehensiveQueryVo = new ComprehensiveQueryVo(); + BeanUtils.copyProperties(bean,comprehensiveQueryVo); + synthesisQueryService.updateComprehensiveQuery(comprehensiveQueryVo); + return ServerResponse.createSuccess("修改成功"); + } else { + + return ServerResponse.createErroe("修改失败"); + } + } + + @Override + public ServerResponse delQualityInspectionById(SafetyViolationDto bean) { + LoginUser loginUser = UserUtil.getLoginUser(); + bean.setUpdateUserId(loginUser.getId()); + bean.setUpdateUserName(loginUser.getUsername()); + int num= dao.delQualityInspectionById(bean); + if(num>0){ + //照片删除 + FileStorageDto file = new FileStorageDto(); + file.setSourceId(bean.getId()); + file.setUploadType("2"); + int j = safetyViolationDao.delImgPhotoBySourceId(file); + //总库删除 TODO + + return ServerResponse.createSuccess("删除成功",num); + }else{ + return ServerResponse.createErroe("删除失败"); + } + } + + +} diff --git a/src/main/java/com/bonus/imgTool/imgUpload/service/impl/SafetyViolationServiceImpl.java b/src/main/java/com/bonus/imgTool/imgUpload/service/impl/SafetyViolationServiceImpl.java index d3ad29e..a5e45d6 100644 --- a/src/main/java/com/bonus/imgTool/imgUpload/service/impl/SafetyViolationServiceImpl.java +++ b/src/main/java/com/bonus/imgTool/imgUpload/service/impl/SafetyViolationServiceImpl.java @@ -1,5 +1,7 @@ package com.bonus.imgTool.imgUpload.service.impl; +import com.bonus.imgTool.backstage.entity.ComprehensiveQueryVo; +import com.bonus.imgTool.backstage.service.SynthesisQueryService; import com.bonus.imgTool.basic.vo.dto.ProDto; import com.bonus.imgTool.imgUpload.dao.SafetyViolationDao; import com.bonus.imgTool.imgUpload.service.SafetyViolationService; @@ -12,6 +14,7 @@ import com.bonus.imgTool.utils.ServerResponse; import com.bonus.imgTool.utils.UserUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -27,6 +30,9 @@ public class SafetyViolationServiceImpl implements SafetyViolationService { @Resource private SafetyViolationDao dao; + @Resource + private SynthesisQueryService synthesisQueryService; + @Override public List getList(SafetyViolationDto data) { return dao.getList(data); @@ -43,7 +49,7 @@ public class SafetyViolationServiceImpl implements SafetyViolationService { if (i > 0) { List fileList = bean.getFileList(); //照片入库 - if (!fileList.isEmpty()) { + if (fileList != null && !fileList.isEmpty()) { fileList.forEach(item -> { item.setSourceId(bean.getId()); item.setCreateUser(bean.getCreateUserId()); @@ -52,7 +58,9 @@ public class SafetyViolationServiceImpl implements SafetyViolationService { int j = dao.insertImgPhoto(bean.getFileList()); } //存入总库 TODO - + ComprehensiveQueryVo comprehensiveQueryVo = new ComprehensiveQueryVo(); + BeanUtils.copyProperties(bean,comprehensiveQueryVo); + synthesisQueryService.addComprehensiveQuery(comprehensiveQueryVo); return ServerResponse.createSuccess("新增成功"); } return ServerResponse.createErroe("新增失败"); @@ -70,7 +78,6 @@ public class SafetyViolationServiceImpl implements SafetyViolationService { fileStorageDto.setSourceType("2"); bean.setRectPhotoList(dao.getImgPhotoList(fileStorageDto)); } - return bean; } @@ -85,7 +92,7 @@ public class SafetyViolationServiceImpl implements SafetyViolationService { List delFileList = bean.getDelFileList(); //照片入库 - if (!fileList.isEmpty()) { + if (fileList != null && !fileList.isEmpty()) { fileList.forEach(item -> { item.setSourceId(bean.getId()); item.setCreateUser(bean.getUpdateUserId()); @@ -97,7 +104,7 @@ public class SafetyViolationServiceImpl implements SafetyViolationService { //照片删除 - if (!delFileList.isEmpty()) { + if (delFileList != null && !delFileList.isEmpty()) { delFileList.forEach(item -> { item.setSourceId(bean.getId()); item.setCreateUser(bean.getUpdateUserId()); @@ -106,7 +113,9 @@ public class SafetyViolationServiceImpl implements SafetyViolationService { int j = dao.delImgPhoto(bean.getDelFileList()); } //总库修改 TODO - + ComprehensiveQueryVo comprehensiveQueryVo = new ComprehensiveQueryVo(); + BeanUtils.copyProperties(bean,comprehensiveQueryVo); + synthesisQueryService.updateComprehensiveQuery(comprehensiveQueryVo); return ServerResponse.createSuccess("修改成功"); } else { @@ -114,5 +123,25 @@ public class SafetyViolationServiceImpl implements SafetyViolationService { } } + @Override + public ServerResponse delSafetyViolationById(SafetyViolationDto bean) { + LoginUser loginUser = UserUtil.getLoginUser(); + bean.setUpdateUserId(loginUser.getId()); + bean.setUpdateUserName(loginUser.getUsername()); + int num= dao.delSafetyViolationById(bean); + if(num>0){ + //照片删除 + FileStorageDto file = new FileStorageDto(); + file.setSourceId(bean.getId()); + file.setUploadType("1"); + int j = dao.delImgPhotoBySourceId(file); + //总库删除 TODO + + return ServerResponse.createSuccess("删除成功",num); + }else{ + return ServerResponse.createErroe("删除失败"); + } + } + } diff --git a/src/main/java/com/bonus/imgTool/imgUpload/vo/SafetyViolationVo.java b/src/main/java/com/bonus/imgTool/imgUpload/vo/SafetyViolationVo.java index 5045733..19c4c6a 100644 --- a/src/main/java/com/bonus/imgTool/imgUpload/vo/SafetyViolationVo.java +++ b/src/main/java/com/bonus/imgTool/imgUpload/vo/SafetyViolationVo.java @@ -42,7 +42,7 @@ public class SafetyViolationVo extends PageEntity { /** * id */ - private long id; + private Long id; /** * 是否可用 1.可用 0.不可用 */ diff --git a/src/main/java/com/bonus/imgTool/imgUpload/vo/dto/SafetyViolationDto.java b/src/main/java/com/bonus/imgTool/imgUpload/vo/dto/SafetyViolationDto.java index d8cd055..bd03fa3 100644 --- a/src/main/java/com/bonus/imgTool/imgUpload/vo/dto/SafetyViolationDto.java +++ b/src/main/java/com/bonus/imgTool/imgUpload/vo/dto/SafetyViolationDto.java @@ -123,5 +123,7 @@ public class SafetyViolationDto extends PageEntity { private String keyWord; + private String proStatus; + } 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 2462581..da160f2 100644 --- a/src/main/java/com/bonus/imgTool/system/controller/SelectController.java +++ b/src/main/java/com/bonus/imgTool/system/controller/SelectController.java @@ -88,6 +88,19 @@ public class SelectController { return ServerResponse.createErroe("操作失败"); } + @GetMapping(value = "getDictSelectByType") + @DecryptAndVerify(decryptedClass = SelectDto.class)//加解密统一管理 + @LogAnnotation(operModul = "字典管理", operation = "查询列表", operDesc = "系统级事件",operType="查询") + public ServerResponse getDictSelectByType(EncryptedReq data) { + try { + List list = service.getDictSelectByType(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) { 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 dcbf011..1267c61 100644 --- a/src/main/java/com/bonus/imgTool/system/dao/SelectDao.java +++ b/src/main/java/com/bonus/imgTool/system/dao/SelectDao.java @@ -42,4 +42,6 @@ public interface SelectDao { * @date 2025/4/3 13:53 */ List getGxsSelect(QueryParamDto dto); + + List getDictSelectByType(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 index cc1bdaf..785a544 100644 --- a/src/main/java/com/bonus/imgTool/system/service/SelectService.java +++ b/src/main/java/com/bonus/imgTool/system/service/SelectService.java @@ -19,6 +19,8 @@ public interface SelectService { List getProjectSelect(SelectDto data); + List getDictSelectByType(SelectDto data); + /** * 工程下拉选-按权限划分 * @param 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 6fefebf..a0a6d3c 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 @@ -91,4 +91,9 @@ public class SelectServiceImpl implements SelectService { return ServerResponse.createErroe("查询失败"); } } + + @Override + public List getDictSelectByType(SelectDto data) { + return dao.getDictSelectByType(data); + } } diff --git a/src/main/resources/mappers/imgUpload/QualityInspectionMapper.xml b/src/main/resources/mappers/imgUpload/QualityInspectionMapper.xml new file mode 100644 index 0000000..a45254d --- /dev/null +++ b/src/main/resources/mappers/imgUpload/QualityInspectionMapper.xml @@ -0,0 +1,189 @@ + + + + + + INSERT INTO tb_quality_inspection + ( + pro_id, + pro_name, + major_id, + major_name, + gx_id, + gx_name, + check_user_name, + check_date, + check_place, + check_desc, + rect_date, + rect_user_name, + rect_time, + rect_desc, + rect_status, + data_source, + create_user_id, + create_user_name, + create_time + )values ( + #{proId}, + #{proName}, + #{majorId}, + #{majorName}, + #{gxId}, + #{gxName}, + #{checkUserName}, + #{vioDate}, + #{vioPlace}, + #{vioDesc}, + #{rectDate}, + #{rectUserName}, + #{rectTime}, + #{rectDesc}, + #{rectStatus}, + #{dataSource}, + #{createUserId}, + #{createUserName}, + #{createTime} + ) + + + + UPDATE tb_quality_inspection + + + pro_id = #{proId}, + + + pro_name = #{proName}, + + + major_id = #{majorId}, + + + major_name = #{majorName}, + + + gx_id = #{gxId}, + + + gx_name = #{gxName}, + + + check_user_name = #{checkUserName}, + + + check_date = #{vioDate}, + + + check_place = #{vioPlace}, + + + check_desc = #{vioDesc}, + + + rect_date = #{rectDate}, + + + rect_user_name = #{rectUserName}, + + + rect_time = #{rectTime}, + + + rect_desc = #{rectDesc}, + + + rect_status = #{rectStatus}, + + + data_source = #{dataSource}, + + + update_user_id = #{updateUserId}, + + + update_user_name = #{updateUserName} + + + where id = #{id} + + + + update tb_quality_inspection set is_active = '0' + WHERE id = #{id} + + + + + + diff --git a/src/main/resources/mappers/imgUpload/SafetyViolationMapper.xml b/src/main/resources/mappers/imgUpload/SafetyViolationMapper.xml index 97e4e1d..24e9838 100644 --- a/src/main/resources/mappers/imgUpload/SafetyViolationMapper.xml +++ b/src/main/resources/mappers/imgUpload/SafetyViolationMapper.xml @@ -142,14 +142,27 @@ where id = #{id} + update sys_file_resource set is_active = '0' - WHERE id IN + WHERE + id IN #{item.id} + + update sys_file_resource set is_active = '0' + WHERE + source_id = #{sourceId} + AND upload_type = #{uploadType} + + + + update tb_safety_violations set is_active = '0' + WHERE id = #{id} + select - t.id, + t.dict_value as id, t.dict_name as name from sys_distinct t where p_id in ( select id from sys_distinct where dict_code = 'profession' - ) + ) and t.del_flag = 0 + +