ke
2024-12-05 87e524604a801de51cf277535e26988ce3d2ce53
白蚁新模块。图片上传接口。更新12-5 15:00
6 files modified
1 files added
82 ■■■■■ changed files
skjcmanager/skjcmanager-service/skjcmanager-by/src/main/java/cn/gistack/by/nettyUpload/HttpUploadFileHandler.java 29 ●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-by/src/main/java/cn/gistack/by/picUpload/entity/XfByPic.java 2 ●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-by/src/main/java/cn/gistack/by/picUpload/entity/XfBySnRelation.java 22 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-by/src/main/java/cn/gistack/by/picUpload/mapper/BaiyiPicMapper.java 3 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-by/src/main/java/cn/gistack/by/picUpload/mapper/BaiyiPicMapper.xml 17 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-by/src/main/java/cn/gistack/by/picUpload/service/BaiyiPicService.java 3 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-by/src/main/java/cn/gistack/by/picUpload/service/impl/BaiyiPicServiceImpl.java 6 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-by/src/main/java/cn/gistack/by/nettyUpload/HttpUploadFileHandler.java
@@ -8,6 +8,7 @@
import cn.gistack.by.nettyUpload.utils.ExceptionUtils;
import cn.gistack.by.picUpload.entity.BaiyiPicEntity;
import cn.gistack.by.picUpload.entity.XfByPic;
import cn.gistack.by.picUpload.entity.XfBySnRelation;
import cn.gistack.by.picUpload.service.BaiyiPicService;
import cn.gistack.resource.feign.IOssClient;
import cn.hutool.core.date.DateUtil;
@@ -27,6 +28,7 @@
import java.net.URISyntaxException;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.springframework.mock.web.MockMultipartFile;
@@ -61,6 +63,11 @@
     * 没有Authorization验证
     */
    private static final String UPLOAD_FILE_URL_OLD = "/termite/termiteDataupOld";
    /**
     * * 旧设备sn码和物联网关系表
     * * 没有Authorization验证
     */
    private static final String UPLOAD_FILE_OLD_RELATION = "/termite/termiteRelation";
    private NettyHttpConfig nettyHttpConfig;
@@ -121,19 +128,31 @@
            baiyiPicService.inserXfOldPicUrl(xfByPic);
        }else if(UPLOAD_DATA_URL.equals(urlyz)) { //传数据
        }else if(UPLOAD_FILE_OLD_RELATION.equals(urlyz)) { //传sn和rtu编码关系接口
            HttpPostMultipartRequestDecoder test = new HttpPostMultipartRequestDecoder(fullRequest);
            List<InterfaceHttpData> bodyHttpDatas = test.getBodyHttpDatas();
            String  sn = "";
            for (InterfaceHttpData item : bodyHttpDatas ) {
                if (  item instanceof Attribute){
                } else if (item instanceof FileUpload) {
                    System.out.println("Attribute:::"+item.getName());
                    Attribute attribute = (Attribute) item;
                    String value = attribute.getValue();
                    switch (attribute.getName()) {
                        case "sn":
                            sn = value;
                            break;
                    }
                }
            }
            // 查询sn对应的
            XfBySnRelation xfBySnRelation = baiyiPicService.selectMnnoBySn(sn);
            HashMap<String, Object> objectObjectHashMap = new HashMap<>();
            objectObjectHashMap.put("mn_no", xfBySnRelation.getWlwRtu());
            objectObjectHashMap.put("order", xfBySnRelation.getWlwOrder());
            HttpResponseUtils.sendResponseJson2(ctx, HttpResponseStatus.OK, "查询成功",objectObjectHashMap);
            return ;
        } else {
            HttpResponseUtils.sendResponseJson2(ctx, HttpResponseStatus.BAD_REQUEST, "验证失败",null);
            return ;
skjcmanager/skjcmanager-service/skjcmanager-by/src/main/java/cn/gistack/by/picUpload/entity/XfByPic.java
@@ -17,7 +17,7 @@
    @ApiModelProperty("白蚁设备安装的点位顺序")
    private String order;
    @ApiModelProperty("白蚁设备编号顺序")
    private String sn;
    private String ap;
skjcmanager/skjcmanager-service/skjcmanager-by/src/main/java/cn/gistack/by/picUpload/entity/XfBySnRelation.java
New file
@@ -0,0 +1,22 @@
package cn.gistack.by.picUpload.entity;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
@Data
public class XfBySnRelation {
    private String id;
    private String sn;
    private String ap;
    private String wlwRtu;
    private String wlwOrder;
    private String wlwDeviseId;
    private String wlwDeviseName;
    private String wlwSkCode;
    private String wlwSkName;
}
skjcmanager/skjcmanager-service/skjcmanager-by/src/main/java/cn/gistack/by/picUpload/mapper/BaiyiPicMapper.java
@@ -2,6 +2,7 @@
import cn.gistack.by.picUpload.entity.BaiyiPicEntity;
import cn.gistack.by.picUpload.entity.XfByPic;
import cn.gistack.by.picUpload.entity.XfBySnRelation;
import org.apache.ibatis.annotations.Param;
public interface BaiyiPicMapper {
@@ -12,4 +13,6 @@
    void inserXfPicUrl(@Param("item") XfByPic entity);
    void inserXfOldPicUrl(@Param("item") XfByPic entity);
    XfBySnRelation selectMnnoBySn(@Param("sn")String sn);
}
skjcmanager/skjcmanager-service/skjcmanager-by/src/main/java/cn/gistack/by/picUpload/mapper/BaiyiPicMapper.xml
@@ -41,4 +41,21 @@
            )
    </insert>
    <select id="selectMnnoBySn" resultType="XfBySnRelation">
        select
            "id" AS "id",
            "sn" AS "sn",
            "ap" AS "ap",
            "wlw_rtu" AS "wlwRtu",
            "wlw_order" AS "wlwOrder",
            "wlw_devise_id" AS "wlwDeviseId",
            "wlw_devise_name" AS "wlwDeviseName",
            "wlw_sk_code" AS "wlwSkCode",
            "wlw_sk_name" AS "wlwSkName"
        from
            SJZT_ODS."water_data_termites_relation"
        where
            "sn" = #{sn}
    </select>
</mapper>
skjcmanager/skjcmanager-service/skjcmanager-by/src/main/java/cn/gistack/by/picUpload/service/BaiyiPicService.java
@@ -3,6 +3,7 @@
import cn.gistack.by.picUpload.entity.BaiyiPicEntity;
import cn.gistack.by.picUpload.entity.XfByPic;
import cn.gistack.by.picUpload.entity.XfBySnRelation;
public interface BaiyiPicService {
    void inserpicData(BaiyiPicEntity entity);
@@ -10,4 +11,6 @@
    void inserXfPicUrl(XfByPic entity);
    void inserXfOldPicUrl(XfByPic entity);
    XfBySnRelation selectMnnoBySn(String sn);
}
skjcmanager/skjcmanager-service/skjcmanager-by/src/main/java/cn/gistack/by/picUpload/service/impl/BaiyiPicServiceImpl.java
@@ -2,6 +2,7 @@
import cn.gistack.by.picUpload.entity.BaiyiPicEntity;
import cn.gistack.by.picUpload.entity.XfByPic;
import cn.gistack.by.picUpload.entity.XfBySnRelation;
import cn.gistack.by.picUpload.mapper.BaiyiPicMapper;
import cn.gistack.by.picUpload.service.BaiyiPicService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -27,4 +28,9 @@
    public void inserXfOldPicUrl(XfByPic entity) {
        baiyiPicMapper.inserXfOldPicUrl(entity);
    }
    @Override
    public XfBySnRelation selectMnnoBySn(String sn) {
        return baiyiPicMapper.selectMnnoBySn(sn);
    }
}