Merge remote-tracking branch 'origin/master'

cloud-model/src/main/java/com/hssx/cloudmodel/controller/MouldEquipmentController.java

@@ -35,7 +35,7 @@ public class MouldEquipmentController {
      * 添加/修改模具设备
      * 添加参数：equipmentName 设备名称，useLife 使用年限， equipmentNo 设备编号 ，
      * belongCompanyId 所属公司id ，equipmentName 设备名称
-     * 修改时需多传的参数 id 设备id ，isUse 是否启用 0-不启用 1-启用
+     * 修改时需多传的参数 id 设备id
      * @return
      */
     @ApiOperation("添加/修改模具设备")
@@ -50,5 +50,21 @@ public class MouldEquipmentController {
         return msg;
     }
 
+    /**
+     * 启用设备
+     * 传参 id 设备id ，isUse 启用传 1
+     * @return
+     */
+    @ApiOperation("启用设备")
+    @RequestMapping("/use")
+    @ResponseBody
+    public HttpRespMsg use(MouldEquipment mouldEquipment,String token) {
+        HttpRespMsg msg = new HttpRespMsg();
+        QueryWrapper<User> qw = new QueryWrapper<>();
+        qw.eq("head_imgurl",token);
+        User user = userService.getOne(qw);
+        msg = mouldEquipmentService.isUse(mouldEquipment,user);
+        return msg;
+    }
 }
 

cloud-model/src/main/java/com/hssx/cloudmodel/service/MouldEquipmentService.java

@@ -16,4 +16,6 @@ import com.hssx.cloudmodel.util.HttpRespMsg;
 public interface MouldEquipmentService extends IService<MouldEquipment> {
 
     HttpRespMsg addAndUpdateMouldEquipment(MouldEquipment mouldEquipment, User user);
+
+    HttpRespMsg isUse(MouldEquipment mouldEquipment, User user);
 }

cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/MouldEquipmentServiceImpl.java

@@ -33,7 +33,20 @@ public class MouldEquipmentServiceImpl extends ServiceImpl<MouldEquipmentMapper,
                 mouldEquipmentMapper.updateById(mouldEquipment);
             }
         }else{
-            msg.setError("对不起，您不是管理员，不具备设备创建的权限");
+            msg.setError("对不起，您不是管理员，不具备设备创建或修改的权限");
+        }
+        return msg;
+    }
+
+    @Override
+    public HttpRespMsg isUse(MouldEquipment mouldEquipment, User user) {
+        HttpRespMsg msg = new HttpRespMsg();
+        //判断是不是超级管理员，是才可操作
+        if(user.getParentId() == 0){
+                //修改设备
+                mouldEquipmentMapper.updateById(mouldEquipment);
+        }else{
+            msg.setError("对不起，您不是管理员，不具备启用设备的权限");
         }
         return msg;
     }