修改bug:20231202

.run/ruoyi-monitor-admin.run.xml

@@ -8,7 +8,7 @@
           <list>
             <DockerEnvVarImpl>
               <option name="name" value="TZ" />
-              <option name="value" value="Shanghai" />
+              <option name="value" value="Asia/ShangHai" />
             </DockerEnvVarImpl>
           </list>
         </option>

.run/ruoyi-xxl-job-admin.run.xml

@@ -8,7 +8,7 @@
           <list>
             <DockerEnvVarImpl>
               <option name="name" value="TZ" />
-              <option name="value" value="Shanghai" />
+              <option name="value" value="Asia/ShangHai" />
             </DockerEnvVarImpl>
           </list>
         </option>

ruoyi-demo/src/main/java/com/ruoyi/demo/controller/EquipmentController.java

@@ -19,6 +19,7 @@ import com.ruoyi.demo.entity.vo.PlanItemVo;
 import com.ruoyi.demo.enums.EquipmentOnStateEnum;
 import com.ruoyi.demo.enums.EquipmentStateEnum;
 import com.ruoyi.demo.service.EquipmentService;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -31,6 +32,7 @@ import java.util.List;
 
 @RequestMapping("/equimpent")
 @RestController
+@Slf4j
 public class EquipmentController {
     @Autowired
     EquipmentService equipmentService;
@@ -239,10 +241,14 @@ public class EquipmentController {
      * 改变设备状态（唤醒）
      * @return
      */
-    @SaCheckPermission("szzs:equipment:query")
-    @GetMapping ("/equipmentOnStateWakeup")
-    public R equipmentOnStateWakeup(@NotBlank @RequestParam("equipmentCode") String equipmentCode){
-        String s = equipmentService.equipmentOnStateWakeup(equipmentCode);
+    @GetMapping ("/equipmentOnStateChange")
+    public R equipmentOnStateChange(@NotBlank @RequestParam("equipmentCode1") String equipmentCode,@NotBlank @RequestParam("change")String change){
+        String s = null;
+        if (change.equals("true")){
+            s = equipmentService.equipmentOnStateWakeup(equipmentCode);
+        }else if(change.equals("false")){
+            s = equipmentService.equipmentOnStatedormancy(equipmentCode);
+        }
         return R.ok(s);
     }
 }

ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/EquipmentServiceImpl.java

@@ -19,6 +19,7 @@ import com.ruoyi.demo.mapper.*;
 import com.ruoyi.demo.service.EquipmentService;
 import com.ruoyi.demo.utils.InitMapUtil;
 import com.ruoyi.demo.utils.MtStarUtil;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Service;
@@ -32,6 +33,7 @@ import java.util.stream.Collectors;
 
 @Service
 @Transactional
+@Slf4j
 public class EquipmentServiceImpl implements EquipmentService {
     @Autowired
     EquipmentMapper equipmentMapper;

ruoyi-demo/src/main/java/com/ruoyi/demo/utils/MtStarUtil.java

@@ -6,6 +6,7 @@ import cn.hutool.http.HttpUtil;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
 import com.ruoyi.demo.config.MtStarProperties;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -14,6 +15,7 @@ import java.util.HashMap;
 import java.util.List;
 
 @Component
+@Slf4j
 public class MtStarUtil {
     @Autowired
     MtStarProperties mtStarProperties;
@@ -48,6 +50,7 @@ public class MtStarUtil {
 
             }
         }catch (Exception e){
+            log.error(e.getMessage());
             return "error";
         }
         return "error";
@@ -76,6 +79,7 @@ public class MtStarUtil {
             if (0 == obj.get("retCode", Integer.class))
                 return "success";
         }catch (Exception e){
+            log.error(e.getMessage());
             return "error";
         }
         return "error";