From 5a2502a39f0313ba496051d083a747541cf15899 Mon Sep 17 00:00:00 2001
From: limingyu <limingyu203@163.com>
Date: Tue, 7 May 2024 13:41:36 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E7=82=B9=E5=B7=A5=E7=A8=8B=E5=9C=B0?=
 =?UTF-8?q?=E5=9B=BE=E8=A7=86=E9=A2=91=E7=82=B9=E4=BD=8D=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=98=AF=E5=90=A6=E5=9C=A8=E7=BA=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../keyProjects/OutSourcedController.java     | 20 +++++++++++++++++++
 .../dsno2/keyProjects/OutSourcedMapper.java   |  1 +
 .../keyProjects/OutSourcedService.java        |  1 +
 .../impl/OutSourcedServiceImpl.java           |  5 +++++
 .../datasource/map/MapKeyProjectMapper.xml    |  4 +++-
 .../dsno2/keyProjects/OutSourcedMapper.xml    | 11 ++++++++++
 6 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/zcloud/controller/keyProjects/OutSourcedController.java b/src/main/java/com/zcloud/controller/keyProjects/OutSourcedController.java
index 28789e86..c104c99f 100644
--- a/src/main/java/com/zcloud/controller/keyProjects/OutSourcedController.java
+++ b/src/main/java/com/zcloud/controller/keyProjects/OutSourcedController.java
@@ -522,6 +522,26 @@ public class OutSourcedController extends BaseController {
         return map;
     }
 
+    /**
+     * 列表
+     *
+     * @param page
+     * @throws Exception
+     */
+    @RequestMapping(value = "/listForCount")
+    @ResponseBody
+    public Object listForCount() throws Exception {
+        Map<String, Object> map = new HashMap<String, Object>();
+        String errInfo = "success";
+        PageData pd = new PageData();
+        pd = this.getPageData();
+        List<PageData> varList = outsourcedService.listForCount(pd);    //列出OutSourced列表
+
+        map.put("varList", varList);
+        map.put("result", errInfo);
+        return map;
+    }
+
     /**
      * 去修改页面获取数据
      *
diff --git a/src/main/java/com/zcloud/mapper/dsno2/keyProjects/OutSourcedMapper.java b/src/main/java/com/zcloud/mapper/dsno2/keyProjects/OutSourcedMapper.java
index 931dc169..063dfe83 100644
--- a/src/main/java/com/zcloud/mapper/dsno2/keyProjects/OutSourcedMapper.java
+++ b/src/main/java/com/zcloud/mapper/dsno2/keyProjects/OutSourcedMapper.java
@@ -90,5 +90,6 @@ public interface OutSourcedMapper{
 	List<PageData> outSouceslistPage(Page page);
 
 
+	List<PageData> listForCount(PageData pd);
 }
 
diff --git a/src/main/java/com/zcloud/service/keyProjects/OutSourcedService.java b/src/main/java/com/zcloud/service/keyProjects/OutSourcedService.java
index e575f688..663b85fb 100644
--- a/src/main/java/com/zcloud/service/keyProjects/OutSourcedService.java
+++ b/src/main/java/com/zcloud/service/keyProjects/OutSourcedService.java
@@ -92,5 +92,6 @@ public interface OutSourcedService{
 	public List<PageData> outSouceslistPage(Page page)throws Exception;
 
 
+	List<PageData> listForCount(PageData pd);
 }
 
diff --git a/src/main/java/com/zcloud/service/keyProjects/impl/OutSourcedServiceImpl.java b/src/main/java/com/zcloud/service/keyProjects/impl/OutSourcedServiceImpl.java
index a4e51674..9516a978 100644
--- a/src/main/java/com/zcloud/service/keyProjects/impl/OutSourcedServiceImpl.java
+++ b/src/main/java/com/zcloud/service/keyProjects/impl/OutSourcedServiceImpl.java
@@ -116,5 +116,10 @@ public class OutSourcedServiceImpl implements OutSourcedService {
 	public List<PageData> outSouceslistPage(Page page) throws Exception {
 		return outsourcedMapper.outSouceslistPage(page);
 	}
+
+	@Override
+	public List<PageData> listForCount(PageData pd) {
+		return outsourcedMapper.listForCount(pd);
+	}
 }
 
diff --git a/src/main/resources/mybatis/datasource/map/MapKeyProjectMapper.xml b/src/main/resources/mybatis/datasource/map/MapKeyProjectMapper.xml
index d1b0af87..f266ca86 100644
--- a/src/main/resources/mybatis/datasource/map/MapKeyProjectMapper.xml
+++ b/src/main/resources/mybatis/datasource/map/MapKeyProjectMapper.xml
@@ -164,13 +164,15 @@
 		f.LONGITUDE,
 		o.OUTSOURCED_NAME,
 		c.CORP_NAME,
-		pv.INDEXCODE
+		pv.INDEXCODE,
+		if(vr.ONLINE_STATUS is null,'未上线',if(vr.ONLINE_STATUS = '1','离线','在线')) ONLINE_STATUS
 		from
 		`qa-gwj-regulatory`.BUS_VIDEOMANAGER f
 		LEFT JOIN `qa-gwj-regulatory`.bus_outsourced o on o.OUTSOURCED_ID = f.OUTSOURCED_ID
 		LEFT JOIN `qa-gwj-prevention`.vi_user_all u on o.CREATOR = u.USER_ID
 		LEFT JOIN `qa-gwj-prevention`.bus_corp_info c on u.CORPINFO_ID=c.CORPINFO_ID
 		left join `qa-gwj-regulatory`.bus_platformvideomanagement pv on pv.PLATFORMVIDEOMANAGEMENT_ID = f.PLATFORMVIDEOMANAGEMENT_ID
+		left join `qa-gwj-regulatory`.bus_video_resources vr on vr.VIDEO_RESOURCES_ID = f.VIDEO_RESOURCES_ID and vr.ISDELETE = '0'
 		where
 		f.VIDEOMANAGER_ID = #{id}
 	</select>
diff --git a/src/main/resources/mybatis/dsno2/keyProjects/OutSourcedMapper.xml b/src/main/resources/mybatis/dsno2/keyProjects/OutSourcedMapper.xml
index 56e96123..557ab56c 100644
--- a/src/main/resources/mybatis/dsno2/keyProjects/OutSourcedMapper.xml
+++ b/src/main/resources/mybatis/dsno2/keyProjects/OutSourcedMapper.xml
@@ -917,4 +917,15 @@
 		f.STATE,
 		f.OPERATTIME DESC
 	</select>
+
+	<select id="listForCount" resultType="com.zcloud.entity.PageData">
+		select <include refid="Field"></include>
+		from <include refid="tableName"></include> f
+		LEFT JOIN `qa-gwj-prevention`.vi_user_all vua on f.CREATOR = vua.USER_ID
+		LEFT JOIN `qa-gwj-regulatory`.vi_all_corp vac on vua.CORPINFO_ID = vac.CORPINFO_ID
+		where f.ISDELETE = '0'
+		<if test="CORPINFO_ID != null and CORPINFO_ID != ''">
+			and vac.CORPINFO_ID = #{CORPINFO_ID}
+		</if>
+	</select>
 </mapper>