Merge branch 'master' of http://gitlab.scsmile.cn/zxf/device-new-platform

common-lib/src/main/java/com/mortals/xhx/feign/IInfoPublishDeviceFeign.java

+package com.mortals.xhx.feign;
+
+import com.mortals.framework.common.Rest;
+import com.mortals.xhx.common.pdu.DeviceReq;
+import feign.hystrix.FallbackFactory;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * 设备 Feign接口
+ *
+ * @author zxfei
+ * @date 2023-02-25
+ */
+@FeignClient(name = "info-publish-manager", path = "/infopublish", fallbackFactory = InfoDeviceFeignFallbackFactory.class)
+public interface IInfoPublishDeviceFeign extends IFeign {
+
+
+    /**
+     * 设备回调
+     *
+     * @param deviceReq
+     * @return
+     */
+    @PostMapping(value = "/api/device/callback")
+    Rest<String> deviceCall(@RequestBody DeviceReq deviceReq);
+
+}
+
+
+@Slf4j
+@Component
+class InfoDeviceFeignFallbackFactory implements FallbackFactory<IInfoPublishDeviceFeign> {
+    @Override
+    public IInfoPublishDeviceFeign create(Throwable t) {
+        return new IInfoPublishDeviceFeign() {
+
+            @Override
+            public Rest<String> deviceCall(DeviceReq deviceReq) {
+                return Rest.fail();
+            }
+        };
+    }
+}
+
+
+
+
+
+
+
+

device-manager-ui/admin/src/views/alarm/config/list.vue

@@ -28,9 +28,9 @@ export default {
       this.$refs.drawerform.edit(row);
     },
     /** 重写查看方法 */
-    // toView(row) {
-    //     this.$refs.dialogform.view(row);
-    // },
+    toView(row) {
+        this.$refs.drawerform.view(row);
+    },
     // 操作菜单状态
     changeStatus(row, column) {
       return (

device-manager-ui/admin/src/views/alarm/config/view.vue

 <template>
-  <layout-view>
-    <el-descriptions
-      :title="title"
-      :column="column"
-      :size="size"
-      :colon="false"
-      border
-    >
-      <template slot="title">
-        <i class="el-icon-tickets"></i>
-        基本详细信息
-      </template>
-      <template slot="extra">
-        <el-button type="primary" class="addclass"  @click="$router.go(-1)" size="small"
-          >返回</el-button
-        >
-      </template>
-      <el-descriptions-item
-        label="产品"
-        label-class-name="labelClass"
-        content-class-name="contentClass"
-      >
-        {{ form.productId }}
-      </el-descriptions-item>
-      <el-descriptions-item
-        label="告警类型"
-        label-class-name="labelClass"
-        content-class-name="contentClass"
-      >
-        {{ util_formatters("alarmType", form.alarmType) }}
-      </el-descriptions-item>
-      <el-descriptions-item
-        label="告警级别,"
-        label-class-name="labelClass"
-        content-class-name="contentClass"
-      >
-        {{ util_formatters("alarmLevel", form.alarmLevel) }}
-      </el-descriptions-item>
-      <el-descriptions-item
-        label="推送方式,"
-        label-class-name="labelClass"
-        content-class-name="contentClass"
-      >
-        {{ util_formatters("alarmPusW1ay", form.alarmPusW1ay) }}
-      </el-descriptions-item>
-      <el-descriptions-item
-        label="是否启用"
-        label-class-name="labelClass"
-        content-class-name="contentClass"
-      >
-        {{ util_formatters("isUse", form.isUse) }}
-      </el-descriptions-item>
-    </el-descriptions>
-  </layout-view>
+
 </template>
 
 <script>
-import view from "@/assets/mixins/view";
+
 export default {
-  mixins: [view],
+
   components: {},
   methods: {},
   data() {
     return {
-      size: "small",
-      column: 2,
-      toString: ["alarmType", "alarmLevel", "alarmPusW1ay", "isUse"],
-      toArrays: [],
-      toDate: [],
+
     };
   },
 };
 </script>
-<style lang="less">
-.labelClass {
-  width: 200px;
-}
-.el-descriptions__body {
-  margin-left: 5px;
-  margin-right: 5px;
-  color: #606266;
-  background-color: #fff;
-}
-.contentClass {
-  width: 600px;
-}
-</style>
\ No newline at end of file

device-manager-ui/admin/src/views/device/module/list.vue

@@ -25,9 +25,9 @@ export default {
       this.$refs.dialogform.edit(row);
     },
     /** 重写查看方法 */
-    // toView(row) {
-    //     this.$refs.dialogform.view(row);
-    // },
+    toView(row) {
+        this.$refs.dialogform.view(row);
+    },
   },
   data() {
     return {
@@ -65,4 +65,4 @@ export default {
     };
   },
 };
-</script>
+</script>
\ No newline at end of file

device-manager-ui/admin/vue.config.js

@@ -20,8 +20,7 @@ module.exports = {
         target: "http://192.168.0.98:11078",
         //target: 'http://127.0.0.1:18222',
         changeOrigin: true,
-        secure: false,
-        cookieDomainRewrite: "plm.testnew.com",
+        secure: false
       },
       "/file": {
         target: "http://192.168.0.98:11078",

device-manager/src/main/java/com/mortals/xhx/base/login/web/LoginController.java

@@ -69,6 +69,7 @@ public class LoginController extends BaseCRUDJsonBodyMappingController<UserServi
         UserPdu userPdu = new UserPdu();
         userPdu.setLoginName(loginName);
         userPdu.setPassword(password);
+        userPdu.setSecurityCode("admin");
         String resp = userFeign.portalLogin(userPdu);
 
         return resp;

device-manager/src/main/java/com/mortals/xhx/busiz/web/DeviceApiController.java

@@ -799,6 +799,7 @@ public class DeviceApiController {
      * @return
      */
     @PostMapping("receive")
+    @UnAuth
     public String receive(HttpServletRequest request, @RequestBody DeviceReq req) {
         log.info("【设备接收】【请求体】-->  " + JSONObject.toJSONString(req));
         ApiResp<String> rsp = new ApiResp<>();

device-manager/src/main/java/com/mortals/xhx/daemon/applicationservice/DeviceSendThirdPartyService.java

@@ -43,7 +43,7 @@ public class DeviceSendThirdPartyService implements IApplicationStartedService {
                 int waitTime = SEND_INTEVEL;
                 while (!stopped) {
                     try {
-                    DeviceReq deviceReq = cacheService.lpop(KEY_DEVICE_THIRDPARTY_QUEUE, DeviceReq.class);
+                    DeviceReq deviceReq = cacheService.blpop(KEY_DEVICE_THIRDPARTY_QUEUE,10, DeviceReq.class);
                     if (!ObjectUtils.isEmpty(deviceReq)) {
                         String phpInUrl = GlobalSysInfo.getParamValue(PARAM_SERVER_PHP_IN_HTTP_URL, "http://172.15.28.116:8090");
                         ApiResp<String> resp = messageService.sendThirdParty(UrlBuilder.of(phpInUrl).addPath(thirdPartyPath).build(), deviceReq);

device-manager/src/main/java/com/mortals/xhx/module/device/model/DeviceAlarmInfoEntity.java

 package com.mortals.xhx.module.device.model;
 
+import com.mortals.framework.annotation.Excel;
 import com.mortals.xhx.module.device.model.vo.DeviceAlarmInfoVo;
 import lombok.Data;
 
@@ -8,7 +9,7 @@ import java.util.Date;
  * 设备告警日志实体对象
  *
  * @author zxfei
- * @date 2023-07-19
+ * @date 2023-12-08
  */
 @Data
 public class DeviceAlarmInfoEntity extends DeviceAlarmInfoVo {
@@ -17,6 +18,7 @@ public class DeviceAlarmInfoEntity extends DeviceAlarmInfoVo {
     /**
      * 告警时间
      */
+    @Excel(name = "告警时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date alarmTime;
     /**
      * 告警设备Id
@@ -25,18 +27,22 @@ public class DeviceAlarmInfoEntity extends DeviceAlarmInfoVo {
     /**
      * 告警类型,(0.离线)
      */
+    @Excel(name = "告警类型,", readConverterExp = "告警类型,(0.离线)")
     private Integer alarmType;
     /**
      * 告警级别(0.危险，1.次要，2.一般)
      */
+    @Excel(name = "告警级别", readConverterExp = "0=危险,1=次要,2=一般")
     private Integer alarmLevel;
     /**
      * 接收人员[设备管理的责任人]
      */
+    @Excel(name = "接收人员[设备管理的责任人]")
     private String alarmReceivePersonnel;
     /**
      * 接收人员电话
      */
+    @Excel(name = "接收人员电话")
     private String receivePersonnelTelephone;
     /**
      * 告警状态,来自工单系统(0.未清除，1.清除未确认，2.清除已确认)
@@ -45,6 +51,7 @@ public class DeviceAlarmInfoEntity extends DeviceAlarmInfoVo {
     /**
      * 告警详细内容
      */
+    @Excel(name = "告警详细内容")
     private String alarmContent;
     /**
      * 站点Id，来源基础服务平台
@@ -53,10 +60,12 @@ public class DeviceAlarmInfoEntity extends DeviceAlarmInfoVo {
     /**
      * 设备编码
      */
+    @Excel(name = "设备编码")
     private String deviceCode;
     /**
      * 设备名称
      */
+    @Excel(name = "设备名称")
     private String deviceName;
     /**
      * 是否推送
@@ -73,6 +82,7 @@ public class DeviceAlarmInfoEntity extends DeviceAlarmInfoVo {
     /**
      * 产品名称
      */
+    @Excel(name = "产品名称")
     private String productName;
     @Override
     public int hashCode() {
@@ -91,35 +101,20 @@ public class DeviceAlarmInfoEntity extends DeviceAlarmInfoVo {
     }
 
     public void initAttrValue(){
-
-        this.alarmTime = null;
-
-        this.alarmDevice = -1L;
-
-        this.alarmType = -1;
-
-        this.alarmLevel = -1;
-
+        this.alarmTime = new Date();
+        this.alarmDevice = null;
+        this.alarmType = 0;
+        this.alarmLevel = 0;
         this.alarmReceivePersonnel = "";
-
         this.receivePersonnelTelephone = "";
-
         this.alarmStatus = 0;
-
         this.alarmContent = "";
-
-        this.siteId = -1L;
-
+        this.siteId = null;
         this.deviceCode = "";
-
         this.deviceName = "";
-
         this.push = 0;
-
-        this.productId = -1L;
-
+        this.productId = null;
         this.productCode = "";
-
         this.productName = "";
     }
 }
\ No newline at end of file

device-manager/src/main/java/com/mortals/xhx/module/device/model/vo/DeviceAlarmInfoVo.java

@@ -17,6 +17,8 @@ import java.util.Map;
 @Data
 public class DeviceAlarmInfoVo extends BaseEntityLong {
 
+    private List <Long> idList;
+
     /**
      * 开始 告警时间
      */

device-manager/src/main/java/com/mortals/xhx/module/device/service/impl/DeviceServiceImpl.java

@@ -23,6 +23,7 @@ import com.mortals.xhx.common.pdu.DeviceReq;
 import com.mortals.xhx.common.pdu.site.SitePdu;
 import com.mortals.xhx.common.utils.BeanUtil;
 import com.mortals.xhx.feign.IFillDeviceFeign;
+import com.mortals.xhx.feign.IInfoPublishDeviceFeign;
 import com.mortals.xhx.feign.IOfficeDeviceFeign;
 import com.mortals.xhx.feign.ISampleDeviceFeign;
 import com.mortals.xhx.feign.site.ISiteFeign;
@@ -92,6 +93,9 @@ public class DeviceServiceImpl extends AbstractCRUDCacheServiceImpl<DeviceDao, D
     @Autowired
     private IFillDeviceFeign fillDeviceFeign;
 
+    @Autowired
+    private IInfoPublishDeviceFeign infoPublishDeviceFeign;
+
     @Value("${thirdPartyPath:/inter/device/deviceIn}")
     private String thirdPartyPath;
 
@@ -391,6 +395,14 @@ public class DeviceServiceImpl extends AbstractCRUDCacheServiceImpl<DeviceDao, D
             Rest<String> sampleRest = sampleDeviceFeign.deviceCall(deviceReq);
             log.info("sample  resp ==>{}", JSON.toJSONString(sampleRest));
         }
+
+        if ("xxgk".equals(platformEntity.getPlatformSn())) {
+            deviceReq.setReceiveMethod(update.getValue());
+            //调用样表系统系统
+            Rest<String> sampleRest = infoPublishDeviceFeign.deviceCall(deviceReq);
+            log.info("info publish  resp ==>{}", JSON.toJSONString(sampleRest));
+        }
+
         if ("tdxt".equals(platformEntity.getPlatformSn())) {
             deviceReq.setReceiveMethod(update.getValue());
             //调用样表系统系统