Merge branch 'master' into lcy

# Conflicts:
#	.run/ruoyi-monitor-admin.run.xml
#	.run/ruoyi-xxl-job-admin.run.xml

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

@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="ruoyi-monitor-admin" type="docker-deploy" factoryName="dockerfile" server-name="lb-szzs">
+  <configuration default="false" name="ruoyi-monitor-admin" type="docker-deploy" factoryName="dockerfile" server-name="szzs">
     <deployment type="dockerfile">
       <settings>
         <option name="imageTag" value="ruoyi/ruoyi-monitor-admin:4.8.0" />
@@ -26,4 +26,4 @@
     </deployment>
     <method v="2" />
   </configuration>
-</component>
+</component>

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

@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="ruoyi-xxl-job-admin" type="docker-deploy" factoryName="dockerfile" server-name="lb-szzs">
+  <configuration default="false" name="ruoyi-xxl-job-admin" type="docker-deploy" factoryName="dockerfile" server-name="szzs">
     <deployment type="dockerfile">
       <settings>
         <option name="imageTag" value="ruoyi/ruoyi-xxl-job-admin:4.8.0" />
@@ -26,4 +26,4 @@
     </deployment>
     <method v="2" />
   </configuration>
-</component>
+</component>

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;
@@ -223,4 +225,30 @@ public class EquipmentController {
         }
         return R.ok(list);
     }
+
+    /**
+     * 改变设备状态（休眠）
+     * @return
+     */
+    @SaCheckPermission("szzs:equipment:query")
+    @GetMapping("/equipmentOnStatedormancy")
+    public R equipmentOnStatedormancy(@NotBlank @RequestParam("equipmentCode") String equipmentCode){
+        String s = equipmentService.equipmentOnStatedormancy(equipmentCode);
+        return R.ok(s);
+    }
+
+    /**
+     * 改变设备状态（唤醒）
+     * @return
+     */
+    @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/entity/bo/EquipmentBo.java

@@ -45,5 +45,6 @@ public class EquipmentBo {
         this.enterTime = equipment.getEnterTime();
         this.updateTime = equipment.getUpdateTime();
         this.deleted = equipment.getDeleted();
+        this.addrCodeInfo = equipment.getAddrCodeInfo();
     }
 }

ruoyi-demo/src/main/java/com/ruoyi/demo/service/EquipmentService.java

@@ -40,4 +40,8 @@ public interface EquipmentService {
     void deleteStoreEquipment(String[] equipmentIds);
 
     void deleteEquipmentPlan(String[] planItemIds);
+
+    String equipmentOnStatedormancy(String equipmentCode);
+
+    String equipmentOnStateWakeup(String equipmentCode);
 }

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

@@ -48,6 +48,7 @@ public class AppServiceImpl implements AppService {
         //判断是否存在该商户
         QueryWrapper<Commercial> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("commercial_id",appVo.getCommercialId());
+        queryWrapper.eq("state",1);
         Long aLong = commercialMapper.selectCount(queryWrapper);
         if (aLong > 0){
             App app = new App(appVo);
@@ -170,6 +171,7 @@ public class AppServiceImpl implements AppService {
     public List<Commercial> getCommercialList() {
         QueryWrapper<Commercial> queryWrapper = new QueryWrapper<>();
         queryWrapper.select("commercial_id","commercial_name");
+        queryWrapper.eq("state",1);
         List<Commercial> commercials = commercialMapper.selectList(queryWrapper);
         return commercials;
     }

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

@@ -73,7 +73,7 @@ public class CommercialServiceImpl implements CommericalService {
     public HashMap getCommercialList(CommercialVo commercialVo) {
         QueryWrapper<Commercial> queryWrapper = new QueryWrapper<>();
         if(commercialVo.getSearchText() != null && !commercialVo.getSearchText().equals("")){
-            queryWrapper.likeRight("commercial_id",commercialVo.getSearchText());
+            //queryWrapper.likeRight("commercial_id",commercialVo.getSearchText());
             queryWrapper.or().like("commercial_name",commercialVo.getSearchText());
             queryWrapper.or().like("principal_name",commercialVo.getSearchText());
             queryWrapper.or().likeRight("principal_telephone",commercialVo.getSearchText());

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;
@@ -95,25 +97,11 @@ public class EquipmentServiceImpl implements EquipmentService {
     @Override
     public R updateEquipment(EquipmentVo equipmentVo) {
         QueryWrapper<Equipment> queryWrapper = new QueryWrapper<>();
-        queryWrapper.select("equipment_name","equipment_code","addr_info","addr_code","addr_code_info","on_state");
+        queryWrapper.select("equipment_name","equipment_code","addr_info","addr_code","addr_code_info");
         queryWrapper.eq("equipment_id",equipmentVo.getEquipmentId());
         Equipment equipment = equipmentMapper.selectOne(queryWrapper);
 
         if (equipment != null){
-            if (!equipmentVo.getAddrCode().equals(equipment.getAddrCode()))
-                equipmentVo.setAddrCodeInfo(initMapUtil.getInitAddrCodeMap(equipmentVo.getAddrCode()));  //更新地区码映射
-
-            String state = "";
-            if (equipmentVo.getOnState() != equipment.getOnState()){
-                if (equipmentVo.getOnState() == 1){
-                    //唤醒
-                    state = mtStarUtil.wakeup(equipmentVo.getEquipmentCode());
-                }else {
-                    //休眠
-                    state = mtStarUtil.dormancy(equipmentVo.getEquipmentCode());
-                }
-            }
-
             //2.更新时间
             equipmentVo.setUpdateTime(LocalDateTime.now(ZoneId.of("Asia/Shanghai")));
             UpdateWrapper<Equipment> updateWrapper = new UpdateWrapper<>();
@@ -172,7 +160,7 @@ public class EquipmentServiceImpl implements EquipmentService {
                 planPushStatisticsMapper.update(null,updateWrapper5);
             }
 
-            return R.ok("修改成功,"+state);
+            return R.ok("修改成功");
         }else {
             return R.fail("设备不存在");
         }
@@ -391,5 +379,16 @@ public class EquipmentServiceImpl implements EquipmentService {
         planItemMapper.deleteBatchIds(Arrays.asList(planItemIds));
     }
 
+    @Override
+    public String equipmentOnStatedormancy(String equipmentCode) {
+        //调用接口
+        return mtStarUtil.dormancy(equipmentCode);
+    }
+
+    @Override
+    public String equipmentOnStateWakeup(String equipmentCode) {
+        return mtStarUtil.wakeup(equipmentCode);
+    }
+
 
 }

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;
@@ -36,15 +38,20 @@ public class MtStarUtil {
         map.put("startIndex", 0);
         map.put("queryCount", 1);
         map.put("select_name", equipmentCode);
-        String post = HttpUtil.post(mtStarProperties.getUrl() + "dev_get_devs_cmarks", map);
-        JSONObject obj = JSONUtil.parseObj(post);
-        if (obj.get("retCode",Integer.class) == 0){
-            List<String> list = obj.getBeanList("cMarkList", String.class);
-            if (list != null && !list.isEmpty()){
-                JSONObject entries = JSONUtil.parseObj(list.get(0));
-                return entries.get("cMark", String.class);
-            }
+        try {
+            String post = HttpUtil.post(mtStarProperties.getUrl() + "dev_get_devs_cmarks", map);
+            JSONObject obj = JSONUtil.parseObj(post);
+            if (obj.get("retCode",Integer.class) == 0){
+                List<String> list = obj.getBeanList("cMarkList", String.class);
+                if (list != null && !list.isEmpty()){
+                    JSONObject entries = JSONUtil.parseObj(list.get(0));
+                    return entries.get("cMark", String.class);
+                }
 
+            }
+        }catch (Exception e){
+            log.error(e.getMessage());
+            return "error";
         }
         return "error";
     }
@@ -66,10 +73,15 @@ public class MtStarUtil {
         sCmd.put("subcmd", "ctrl_lcd_onoff_ontime");
         map.put("params", sCmd.toString());
         map.put("retry", 0);
-        String post = HttpUtil.post(mtStarProperties.getUrl() + "sendClientParams", map);
-        JSONObject obj = JSONUtil.parseObj(post);
-        if (0 == obj.get("retCode", Integer.class))
-            return "success";
+        try {
+            String post = HttpUtil.post(mtStarProperties.getUrl() + "sendClientParams", map);
+            JSONObject obj = JSONUtil.parseObj(post);
+            if (0 == obj.get("retCode", Integer.class))
+                return "success";
+        }catch (Exception e){
+            log.error(e.getMessage());
+            return "error";
+        }
         return "error";
     }
 

ruoyi-ui/vue.config.js

@@ -35,7 +35,7 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://127.0.0.1:8100`,
+        target: `http://localhost:8100`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: '/szzs'