主机同步接口代码修改提交

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/domain/north/MediatorNorthBaseStatistics.java

@@ -39,11 +39,11 @@ public class MediatorNorthBaseStatistics implements Serializable {
 
     @ApiModelProperty(value = "接收数量")
     @TableField("receive_count")
-    private Long receiveCount;
+    private Long receiveCount=0L;
 
     @ApiModelProperty(value = "入库数量")
     @TableField("save_count")
-    private Long saveCount;
+    private Long saveCount=0L;
 
 
 }

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/dto/device/DeviceDto.java

@@ -1,6 +1,7 @@
 package com.xunmei.system.api.dto.device;
 
 import com.xunmei.system.api.domain.SysOrg;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -46,4 +47,10 @@ public class DeviceDto {
     private SysOrg org;
     private String channelCode;
     private String channelName;
+    @ApiModelProperty("摄像机标识（设备类型为1时，该字段必填）")
+    private String cameraCode;
+    @ApiModelProperty("摄像机登录用户名（设备类型为1时，该字段必填）")
+    private String cameraUserName;
+    @ApiModelProperty("摄像机登录密码（设备类型为1时，该字段必填）")
+    private String cameraPassword;
 }

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/SocMediatorApplication.java

@@ -5,6 +5,7 @@ import com.xunmei.common.security.annotation.EnableSocFeignClients;
 import com.xunmei.common.swagger.annotation.EnableCustomSwagger2;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
 import org.springframework.scheduling.annotation.EnableAsync;
 
 /**
@@ -12,7 +13,7 @@ import org.springframework.scheduling.annotation.EnableAsync;
  * 
  * @author xunmei
  */
-
+@RefreshScope
 @EnableAsync
 @EnableCustomConfig
 @EnableCustomSwagger2

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/service/EquipmentSyncService.java

@@ -322,6 +322,11 @@ public class EquipmentSyncService {
         device.setOrgId(datum.getOrg().getId());
         device.setOrgName(datum.getOrg().getName());
         device.setOrgPath(datum.getOrg().getPath());
+        device.setProducer(datum.getProducer());
+        device.setCameraUserName(datum.getCameraUserName());
+        device.setCameraPassword(datum.getCameraPassword());
+        device.setEquipmentAddr(datum.getEquipmentAddr());
+        device.setCameraCode(datum.getCameraCode());
         device.setDeleted(0);
         device.setSource(1);
         String categoryCode = null;
@@ -451,10 +456,10 @@ public class EquipmentSyncService {
         for (int i = 1; i <= totalPage; i++) {
             String ak = guid + "_" + i;
             Object obj = this.redisTemplate.opsForValue().get(ak);
-            DeviceReceivePageDto page = JSON.parseObject((String) obj, DeviceReceivePageDto.class);
-            pages.add(page);
-            this.redisUtil.removeByKey(ak);
-        }
+                DeviceReceivePageDto page = JSON.parseObject((String) obj, DeviceReceivePageDto.class);
+                pages.add(page);
+                this.redisUtil.removeByKey(ak);
+            }
 
         return pages;
     }

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/SocSystemApplication.java

@@ -5,6 +5,7 @@ import com.xunmei.common.security.annotation.EnableSocFeignClients;
 import com.xunmei.common.swagger.annotation.EnableCustomSwagger2;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
 import org.springframework.scheduling.annotation.EnableAsync;
 
 import java.text.SimpleDateFormat;
@@ -15,7 +16,7 @@ import java.util.Calendar;
  * 
  * @author xunmei
  */
-
+@RefreshScope
 @EnableAsync
 @EnableCustomConfig
 @EnableCustomSwagger2

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/SysDeptController.java

@@ -493,7 +493,7 @@ public class SysDeptController extends BaseController {
         return orgService.selectDqAndHs();
     }
     @InnerAuth
-    @GetMapping("/dept/findByCode/{guid}")
+    @GetMapping("/findByCode/{guid}")
     SysOrg findByCode(@PathVariable("guid") String guid){
         return orgService.findByCode(guid);
     }