添加 区域-租户-资产 下拉选接口

src/main/java/com/ebei/device/asset/weixin/contorller/AssetTenantUserController.java

@@ -10,7 +10,9 @@ import io.swagger.annotations.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+import sun.util.resources.ga.LocaleNames_ga;
 
+import java.util.List;
 import java.util.Map;
 
 
@@ -81,6 +83,25 @@ public class AssetTenantUserController {
 
     }
 
+    @ApiOperation(value = "根据区域id获取租户下拉选", notes = "根据区域id获取租户下拉选")
+    @ApiImplicitParam(name = "areaId", value = "区域id", required = true, dataType = "Long", paramType = "path")
+    @GetMapping("/getAssetTenantSelectData/{areaId}")
+    public ResponseEx<Object> getAssetTenantSelectData(@PathVariable Long areaId) {
+        List<Map<String,Object>> tenantData =  assetTenantUserService.getAssetTenantSelectData(areaId);
+        return ResponseEx.createSuccess(tenantData);
+
+    }
+
+    @ApiOperation(value = "根据区域id 和租户id 获取资产下拉选", notes = "根据区域id 和租户id 获取资产下拉选")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "areaId", value = "区域id", required = false, dataType = "Long", paramType = "quary"),
+            @ApiImplicitParam(name = "snycId", value = "同步租户id", required = true, dataType = "Long", paramType = "quary")
+    })
+    @GetMapping("/getAssetSelectData")
+    public ResponseEx<Object> getAssetSelectData(@RequestParam(required = false) Long areaId,@RequestParam(required = true) Long snycId) {
+        List<Map<String,Object>> assetData =  assetTenantUserService.getAssetSelectData(areaId,snycId);
+        return ResponseEx.createSuccess(assetData);
+    }
 
 }
 

src/main/java/com/ebei/device/asset/weixin/mapper/AssetUserMapper.java

@@ -5,6 +5,9 @@ import com.baomidou.mybatisplus.mapper.BaseMapper;
 import com.ebei.device.asset.weixin.model.entity.AssetUser;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * 资产管护租户账号与资产关联关系
  * @Description : AssetUserMapper
@@ -12,4 +15,19 @@ import org.springframework.stereotype.Repository;
 @Repository
 public interface AssetUserMapper extends BaseMapper<AssetUser> {
 
+    /**
+     * @description :根据区域id 获取租户下拉选
+     *
+     * @date : 2021-04-15 13:50
+     * @param areaId
+     * @return : java.util.List<java.util.Map<java.lang.String,java.lang.Object>>
+    */
+    List<Map<String, Object>> getAssetTenantSelectData(Long areaId);
+    /**
+     * @description :根据区域id 和租户id 获取资产下拉选
+     * @date : 2021-04-15 13:46
+     * @param areaId
+     * @return : java.util.List<java.util.Map<java.lang.String,java.lang.Object>>
+     */
+    List<Map<String, Object>> getAssetSelectData(Long areaId, Long snycId);
 }

src/main/java/com/ebei/device/asset/weixin/service/AssetTenantUserService.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.plugins.Page;
 import com.baomidou.mybatisplus.service.IService;
 import com.ebei.device.asset.weixin.model.entity.AssetTenantUser;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -49,4 +50,18 @@ public interface AssetTenantUserService extends IService<AssetTenantUser> {
      */
     void deleteAssetTenantUser(Long userId);
 
+    /**
+     * @description :通过区域id 获取租户下拉选数据
+     * @date : 2021-04-15 13:46
+     * @param areaId
+     * @return : java.util.List<java.util.Map<java.lang.String,java.lang.Object>>
+    */
+    List<Map<String, Object>> getAssetTenantSelectData(Long areaId);
+    /**
+     * @description :根据区域id 和租户id 获取资产下拉选
+     * @date : 2021-04-15 13:46
+     * @param areaId
+     * @return : java.util.List<java.util.Map<java.lang.String,java.lang.Object>>
+     */
+    List<Map<String, Object>> getAssetSelectData(Long areaId,Long tenantId);
 }

src/main/java/com/ebei/device/asset/weixin/service/impl/AssetTenantUserServiceImpl.java

@@ -167,5 +167,15 @@ public class AssetTenantUserServiceImpl extends ServiceImpl<AssetTenantUserMappe
 
     }
 
+    @Override
+    public List<Map<String, Object>> getAssetTenantSelectData(Long areaId) {
+        return assetUserMapper.getAssetTenantSelectData(areaId);
+    }
+
+    @Override
+    public List<Map<String, Object>> getAssetSelectData(Long areaId,Long snycId) {
+        return assetUserMapper.getAssetSelectData(areaId,snycId);
+    }
+
 
 }

src/main/java/com/ebei/device/asset/weixin/util/FileUploadDownloadUtil.java

@@ -43,25 +43,9 @@ public class FileUploadDownloadUtil {
      * @return
      */
     public static boolean commonFileUpload(String uuid,InputStream file,SimpleDateFormat dateFormat,String filename){
-    	CommProperties commProperties = SpringBeanUtil.getBean(CommProperties.class);
-    	
-    	if(commProperties.getFileServer().contains("huiyun")) {//中通服文件服务器
-    		ByteArrayOutputStream bo = new ByteArrayOutputStream();
-            int bytes = 0;
-            byte[] bufferOut = new byte[1024];
-            try {
-				while ((bytes = file.read(bufferOut)) != -1) {
-					bo.write(bufferOut, 0, bytes);
-				}
-				file.close();
-			} catch (IOException e) {
-				logger.error("上传文件失败:",e);
-				return false;
-			}
-    		return fileUploadZTF(uuid,bo.toByteArray(),dateFormat,filename);
-    	}else {
-    		return fileUpload(uuid,file,dateFormat,filename);
-    	}
+
+        return fileUpload(uuid,file,dateFormat,filename);
+
     }
     /**
     *

src/main/resources/application.yml

@@ -74,6 +74,7 @@ task:
 comm:
 #  rtwg-oa-pdf-url: http://101.200.225.123/device/assetApp/createHardwareWebPDF/
   rtwg-oa-pdf-url: http://172.18.0.78:8089/device/assetApp/createHardwareWebPDF/
+  fileServer: http://172.18.0.23/filemanager/FileUploadAndDownloadServlet
   white-list:
     - /login/*CheckedLoginInfo**
     - /login/clearToken**
@@ -83,4 +84,5 @@ comm:
     - /**swagger-resources/**
     - /**webjars/**
     - /**swagger-ui.html/**
-    - /*App/createHardwareWebPDF/**
+    - /*App/createHardwareWebPDF/**
+    - /*imge/**

src/main/resources/mapper/AssetUserMapper.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ebei.device.asset.weixin.mapper.AssetUserMapper">
+
+
+    <select id="getAssetTenantSelectData" resultType="java.util.Map" parameterType="long">
+        SELECT tat.sync_id as snycId,
+                tat.tenant_name as name
+        from  tbg_asset_tenant tat
+        WHERE tat.sync_id is not  NULL
+        <if test="areaId != null and '' != areaId">
+            AND tat.area_id = #{areaId}
+        </if>
+        GROUP BY tat.sync_id
+    </select>
+    <select id="getAssetSelectData" resultType="java.util.Map">
+        SELECT pt.project_id as assetId,
+               pt.project_name as assetName,
+               tat.tenant_id AS realTenantId
+         FROM project_tab pt
+        JOIN tbg_asset_tenant tat ON pt.project_id = tat.asset_id
+        WHERE pt.state = 1
+        <if test="areaId != null and '' != areaId">
+            AND tat.area_id = #{areaId}
+        </if>
+        <if test="snycId != null and '' != snycId">
+            AND tat.sync_id = #{snycId}
+        </if>
+    </select>
+</mapper>