Merge remote-tracking branch 'origin/master'

ws

2023-09-20 6ad5ee724102a7cc115a4024c00e23b40b87072c

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1311.java

 src/main/java/com/fzzy/api/entity/Api1111.java

@@ -67,6 +67,18 @@
    @Column(name = "spjklx", length = 1)
    private String spjklx;

    @PropertyDef(label = "视频点位类型" )
    @Column(name = "spdwlx", length = 2)
    private String spdwlx;

    @PropertyDef(label = "仓房代码" )
    @Column(name = "cfdm", length = 25)
    private String cfdm;

    @PropertyDef(label = "廒间代码" )
    @Column(name = "ajdm", length = 28)
    private String ajdm;

    @PropertyDef(label = "海康设备唯一标识" )
    @Column(name = "hkCameraIndexCode", length = 36)
    private String hkCameraIndexCode;

 src/main/java/com/fzzy/api/view/Api1108.view.xml

@@ -5,6 +5,10 @@
  <Model>
    <DataType name="dtMain">
      <Property name="creationType">com.fzzy.api.entity.Api1108</Property>
      <PropertyDef name="id">
        <Property></Property>
        <Property name="label">主键id</Property>
      </PropertyDef>
      <PropertyDef name="bizId">
        <Property></Property>
        <Property name="label">业务id</Property>

 src/main/java/com/fzzy/api/view/Api1111.view.xml

@@ -63,6 +63,18 @@
        <Property></Property>
        <Property name="label">视频监控类型</Property>
      </PropertyDef>
      <PropertyDef name="spdwlx">
          <Property></Property>
          <Property name="label">视频点位类型</Property>
      </PropertyDef>
      <PropertyDef name="cfdm">
          <Property></Property>
          <Property name="label">仓房代码</Property>
      </PropertyDef>
      <PropertyDef name="ajdm">
          <Property></Property>
          <Property name="label">廒间代码</Property>
      </PropertyDef>
      <PropertyDef name="syncTime">
        <Property name="dataType">Date</Property>
        <Property name="label">同步时间</Property>

 src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1311.java

@@ -13,10 +13,8 @@
import com.fzzy.push.sh2023.SH2023Constant;
import com.fzzy.push.sh2023.dto.SH2023Api1311;
import lombok.extern.slf4j.Slf4j;
import org.aspectj.weaver.ConcreteTypeMunger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

import java.util.Date;
import java.util.List;

@@ -32,8 +30,6 @@
    private ApiLogRep apiLogRep;
    @Autowired
    private Fzzy40Sync1311Rep fzzy40Sync1311Rep;
    @Autowired
    private ApiCommonService commonService;
    @Autowired
    private ApiInfoDataRep apiInfoDataRep;


 src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync2101.java

@@ -14,15 +14,12 @@
import com.fzzy.api.view.repository.ApiLogRep;
import com.fzzy.async.fzzy40.entity.Fz40InoutRecord;
import com.fzzy.async.fzzy40.repository.Fzzy40Sync1202Rep;
import com.fzzy.async.fzzy40.repository.Fzzy40SyncDepotConfRep;
import com.fzzy.async.fzzy40.repository.Fzzy40SyncDepotRep;
import com.fzzy.push.sh2023.SH2023Constant;
import com.fzzy.push.sh2023.dto.SH2023Api2101;
import com.fzzy.push.sh2023.dto.ShAreaBjw;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

import java.util.Date;
import java.util.List;


 src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java

@@ -341,7 +341,7 @@
            GD2022ResponseDto responseDto = GD2022HttpClientUtil.postUploadData(url, authToken, api1109.getWjdz());
            System.out.println((String) responseDto.getData());
            //设置上传文件id
//            api1109.setFileStorageId((String) responseDto.getData());
            api1109.setFileStorageId((String) responseDto.getData());
            return JSON.toJSONString(api1109);
        }else if (Constant.API_CODE_1111.equals(inteId)) {
            Gd2022Api1111 api1111 = new Gd2022Api1111();

 src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1111.java

@@ -49,6 +49,15 @@
    @PropertyDef(label = "操作标志" )
    private String czbz;

    @PropertyDef(label = "视频点位类型" )
    private String spdwlx;

    @PropertyDef(label = "仓房代码" )
    private String cfdm;

    @PropertyDef(label = "廒间代码" )
    private String ajdm;

    @PropertyDef(label = "最后更新时间" )
    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
    private Date zhgxsj;

 src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java

@@ -259,8 +259,6 @@
     * @throws Exception
     */
    private String getJsonData(String inteId, Object data, String code) {


        //具体根据接口进行封装
        if (SH2023Constant.SH_2023_API_CODE_1101.equals(inteId)) {
            SH2023Api1101 api1101;