优化

platform-rest/src/main/java/com/platform/rest/controller/check/CheckJobController.java

@@ -64,7 +64,7 @@ public class CheckJobController {
    */
   @SysLog("修改点检任务")
   @PutMapping("/{id}")
-  @PreAuthorize("@pms.hasPermission('check-spot-jobs-edit') or @pms.hasPermission('check-polling-jobs-del')")
+  @PreAuthorize("@pms.hasPermission('check-spot-jobs-edit') or @pms.hasPermission('check-polling-jobs-edit')")
   public R update(@PathVariable("id") String id, @Validated({UpdateGroup.class}) @RequestBody CheckJobDTO checkJobDTO) {
       checkJobService.modModelByDTO(checkJobDTO);
       return new R<>();
@@ -156,7 +156,7 @@ public class CheckJobController {
    */
   @SysLog("执行点检任务")
   @PutMapping("/execute")
-  @PreAuthorize("@pms.hasPermission('check-spot-jobs-execute') or @pms.hasPermission('check-polling-jobs-execute')")
+  @PreAuthorize("@pms.hasPermission('check-spot-jobs-edit') or @pms.hasPermission('check-polling-jobs-edit')")
   public R executeJob(@Validated({UpdateGroup.class}) @RequestBody CheckJobDTO checkJobDTO) {
     checkJobService.executeJob(checkJobDTO.getId());
     return new R<>();
@@ -170,7 +170,7 @@ public class CheckJobController {
    */
   @SysLog("完成点检任务")
   @PutMapping("/finish")
-  @PreAuthorize("@pms.hasPermission('check-spot-jobs-finish') or @pms.hasPermission('check-polling-jobs-finish')")
+  @PreAuthorize("@pms.hasPermission('check-spot-jobs-edit') or @pms.hasPermission('check-polling-jobs-edit')")
   public R finishJob(@Validated({UpdateGroup.class}) @RequestBody CheckJobDTO checkJobDTO) {
     checkJobService.finishJob(checkJobDTO);
     return new R<>();

platform-rest/src/main/java/com/platform/rest/controller/check/CheckStandardController.java

@@ -64,7 +64,7 @@ public class CheckStandardController {
    */
   @SysLog("新增点检标准")
   @PostMapping
-  @PreAuthorize("@pms.hasPermission('check-spot-standards-add') or @pms.hasPermission('check-polling-standards-add')")
+  @PreAuthorize("@pms.hasPermission('check-spot-standards-add') or @pms.hasPermission('check-spot-standards-add')")
   public R save(@Validated({AddGroup.class}) @RequestBody CheckStandardDTO checkStandardDTO) {
       return new R<>(checkStandardService.saveModelByDTO(checkStandardDTO));
   }
@@ -127,7 +127,7 @@ public class CheckStandardController {
    */
   @SysLog("删除点检标准")
   @DeleteMapping("/{id}")
-  @PreAuthorize("@pms.hasPermission('check-spot-standards-del') or @pms.hasPermission('check-polling-standards-del')")
+  @PreAuthorize("@pms.hasPermission('check-spot-standards-del') or @pms.hasPermission('check-spot-standards-del')")
   public R removeById(@PathVariable String id){
     checkStandardService.deleteByPrimaryKey(id);
     return new R<>();
@@ -141,7 +141,7 @@ public class CheckStandardController {
      */
     @SysLog("批量删除点检标准")
     @DeleteMapping("")
-    @PreAuthorize("@pms.hasPermission('check-spot-standards-del') or @pms.hasPermission('check-polling-standards-del')")
+    @PreAuthorize("@pms.hasPermission('check-spot-standards-del')")
     public R removeIds(@RequestBody List<String> ids){
         checkStandardService.batchDelete(ids);
         return new R<>();
@@ -179,7 +179,7 @@ public class CheckStandardController {
      */
   @GetMapping("/export")
   @SysLog("点检标准导出")
-  @PreAuthorize("@pms.hasPermission('check-spot-standards-export') or @pms.hasPermission('check-polling-standards-export')")
+  @PreAuthorize("@pms.hasPermission('check-spot-standards-export') or @pms.hasPermission('check-spot-standards-export')")
   public void export(HttpServletResponse response, CheckStandardDTO checkStandardDTO) {
     List<CheckStandard> list = checkStandardService.getModelListByDTO(checkStandardDTO);
     ExcelUtil.exportResponseDict(response, ExportCheckStandardVO.class, BeanConverterUtil.copyListProperties(list, ExportCheckStandardVO.class), "点检标准");

platform-service/src/main/java/com/platform/service/check/impl/CheckJobServiceImpl.java

@@ -543,6 +543,7 @@ public class CheckJobServiceImpl extends BaseServiceImpl<CheckJobMapper, CheckJo
      * @param dto
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void finishJob(CheckJobDTO dto) {
         LocalDateTime now = LocalDateTime.now();
         CheckJob checkJob = mapper.selectByPrimaryKey(dto.getId());

platform-service/src/main/java/com/platform/service/sb/impl/SbInfoServiceImpl.java

@@ -940,6 +940,7 @@ public class SbInfoServiceImpl extends BaseServiceImpl<SbInfoMapper, SbInfo, SbI
             if (!CollectionUtils.isEmpty(items)) {
                 List<SbInfoVO> addItems = new ArrayList<SbInfoVO>();
                 List<SysUser> users = sysUserMapper.selectAll();
+                List<FirmProducer> producerList = firmProducerMapper.selectAll();
                 LocalDateTime now = LocalDateTime.now();
                 for (SbInfoVO item : items) {
                     item.setUseArea(useArea);
@@ -999,6 +1000,18 @@ public class SbInfoServiceImpl extends BaseServiceImpl<SbInfoMapper, SbInfo, SbI
                     if(!find){
                         throw new BusinessException("找不到设备类型，请先添加：" + item.getTypeName());
                     }
+
+                    boolean findProdcuer = false;
+                    for (FirmProducer producer : producerList) {
+                        if(producer.getName().equals(item.getProducerId())){
+                            item.setProducerId(producer.getId());
+                            findProdcuer = true;
+                            break;
+                        }
+                    }
+                    if(!findProdcuer){
+                        throw new BusinessException("找不到生产商，请先添加：" + item.getProducerId());
+                    }
                     addItems.add(item);
                 }
                 if(!CollectionUtils.isEmpty(addItems)){