萤石云

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/other/domain/OthYs7Device.java

@@ -101,6 +101,11 @@ public class OthYs7Device implements Serializable {
      */
     private Integer videoEncrypted;
 
+    /**
+     * 设备详情
+     */
+    private String detail;
+
     /**
      * 备注
      */

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/other/domain/dto/ys7device/OthYs7DeviceUpdateReq.java

@@ -35,6 +35,11 @@ public class OthYs7DeviceUpdateReq implements Serializable {
      */
     private String deviceVersion;
 
+    /**
+     * 设备详情
+     */
+    private String detail;
+
     /**
      * 备注
      */

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/other/domain/vo/ys7device/OthYs7DeviceVo.java

@@ -87,6 +87,11 @@ public class OthYs7DeviceVo implements Serializable {
     @ExcelProperty(value = "视频加密(0关闭 1开启)")
     private Integer videoEncrypted;
 
+    /**
+     * 设备详情
+     */
+    private String detail;
+
     /**
      * 备注
      */

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/other/service/impl/OthYs7DeviceServiceImpl.java

@@ -14,7 +14,6 @@ import org.dromara.common.core.utils.ObjectUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
-import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.manager.ys7manager.Ys7Constant;
 import org.dromara.manager.ys7manager.Ys7Manager;
 import org.dromara.manager.ys7manager.enums.DeviceOnOffLineEnum;

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/progress/service/impl/PgsProgressPlanDetailServiceImpl.java

@@ -166,7 +166,7 @@ public class PgsProgressPlanDetailServiceImpl extends ServiceImpl<PgsProgressPla
         }
         // 判断当前详情是否已提交
         if (progressPlanDetail.getStatus().equals("3")) {
-            throw new ServiceException("当前详情已在施工产值中提交，无法提交", HttpStatus.BAD_REQUEST);
+            throw new ServiceException("当前详情已在施工产值中审核完成，无法提交", HttpStatus.BAD_REQUEST);
         }
         Long progressPlanId = progressPlanDetail.getProgressPlanId();
         PgsProgressPlan progressPlan = progressPlanService.getById(progressPlanId);