From 10df3eebf12aa53fe2f66af2dc75fcd0ef12251c Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 13 三月 2024 09:21:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ycl-pojo/src/main/java/com/ycl/platform/domain/entity/YwPoint.java              |    6 +++
 document/副本1020自贡市局运维考核平台.xlsx                                                  |    0 
 ycl-server/src/main/java/com/ycl/platform/service/ITMonitorService.java         |    3 +
 ycl-pojo/src/main/java/com/ycl/platform/domain/entity/TMonitor.java             |   11 +++++
 ycl-server/src/main/java/com/ycl/platform/mapper/TMonitorMapper.java            |    3 +
 ycl-pojo/src/main/java/com/ycl/platform/domain/vo/YwPointVO.java                |    5 ++
 ycl-server/src/main/java/com/ycl/platform/controller/TMonitorController.java    |    7 ++-
 ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java  |   20 +++++++---
 ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml                    |   13 +++++-
 ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java |    3 +
 10 files changed, 56 insertions(+), 15 deletions(-)

diff --git "a/document/\345\211\257\346\234\2541020\350\207\252\350\264\241\345\270\202\345\261\200\350\277\220\347\273\264\350\200\203\346\240\270\345\271\263\345\217\260.xlsx" "b/document/\345\211\257\346\234\2541020\350\207\252\350\264\241\345\270\202\345\261\200\350\277\220\347\273\264\350\200\203\346\240\270\345\271\263\345\217\260.xlsx"
index daf2c57..38de50c 100644
--- "a/document/\345\211\257\346\234\2541020\350\207\252\350\264\241\345\270\202\345\261\200\350\277\220\347\273\264\350\200\203\346\240\270\345\271\263\345\217\260.xlsx"
+++ "b/document/\345\211\257\346\234\2541020\350\207\252\350\264\241\345\270\202\345\261\200\350\277\220\347\273\264\350\200\203\346\240\270\345\271\263\345\217\260.xlsx"
Binary files differ
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/TMonitor.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/TMonitor.java
index b60c3a5..f441a3d 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/TMonitor.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/TMonitor.java
@@ -154,6 +154,16 @@
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date recoveryTime;
 
+    private Long deptId;
+
+    public Long getDeptId() {
+        return deptId;
+    }
+
+    public void setDeptId(Long deptId) {
+        this.deptId = deptId;
+    }
+
     public Long getDefaultOrder() {
         return defaultOrder;
     }
@@ -506,6 +516,7 @@
                 ", defaultOrder=" + defaultOrder +
                 ", recovery=" + recovery +
                 ", recoveryTime=" + recoveryTime +
+                ", deptId=" + deptId +
                 '}';
     }
 }
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/YwPoint.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/YwPoint.java
index 39f9865..46aba3e 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/YwPoint.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/YwPoint.java
@@ -47,6 +47,12 @@
     @ApiModelProperty("澶囨敞")
     @TableField("remark")
     private String remark;
+    @ApiModelProperty("杩愮淮绫诲瀷")
+    @TableField("category")
+    private Short category;
+    @ApiModelProperty("涓婃姤閮ㄩ棬")
+    @TableField("dept_id")
+    private Long deptId;
 
     @TableField("point_detail")
     private String pointDetail;
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/YwPointVO.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/YwPointVO.java
index c7aa164..9632866 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/YwPointVO.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/YwPointVO.java
@@ -1,5 +1,6 @@
 package com.ycl.platform.domain.vo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.ycl.platform.base.AbsVo;
 import com.ycl.platform.domain.entity.YwPoint;
 
@@ -35,12 +36,16 @@
     private Integer unitId;
     private String unitName;
 
+    private String unitName;
     /** 杩愮淮鐘舵�� */
     private String status;
 
     /** 澶囨敞 */
     private String remark;
 
+    private Short category;
+
+    private String deptName;
     private String pointDetail;
 
     public static YwPointVO getVoByEntity(@NonNull YwPoint entity, YwPointVO vo) {
diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/TMonitorController.java b/ycl-server/src/main/java/com/ycl/platform/controller/TMonitorController.java
index 2ef9630..7591d6e 100644
--- a/ycl-server/src/main/java/com/ycl/platform/controller/TMonitorController.java
+++ b/ycl-server/src/main/java/com/ycl/platform/controller/TMonitorController.java
@@ -2,6 +2,7 @@
 
 import annotation.Log;
 import com.ycl.platform.domain.entity.TMonitor;
+import com.ycl.platform.domain.vo.TMonitorVO;
 import com.ycl.platform.service.ITMonitorService;
 import com.ycl.system.AjaxResult;
 import com.ycl.system.controller.BaseController;
@@ -36,7 +37,7 @@
     public TableDataInfo list(TMonitor tMonitor)
     {
         startPage();
-        List<TMonitor> list = tMonitorService.selectTMonitorList(tMonitor);
+        List<TMonitorVO> list = tMonitorService.selectTMonitorList(tMonitor);
         return getDataTable(list);
     }
 
@@ -48,8 +49,8 @@
     @PostMapping("/export")
     public void export(HttpServletResponse response, TMonitor tMonitor)
     {
-        List<TMonitor> list = tMonitorService.selectTMonitorList(tMonitor);
-        ExcelUtil<TMonitor> util = new ExcelUtil<TMonitor>(TMonitor.class);
+        List<TMonitorVO> list = tMonitorService.selectTMonitorList(tMonitor);
+        ExcelUtil<TMonitorVO> util = new ExcelUtil<TMonitorVO>(TMonitorVO.class);
         util.exportExcel(response, list, "璁惧璧勪骇鏁版嵁");
     }
 
diff --git a/ycl-server/src/main/java/com/ycl/platform/mapper/TMonitorMapper.java b/ycl-server/src/main/java/com/ycl/platform/mapper/TMonitorMapper.java
index 29c56ee..6b1267f 100644
--- a/ycl-server/src/main/java/com/ycl/platform/mapper/TMonitorMapper.java
+++ b/ycl-server/src/main/java/com/ycl/platform/mapper/TMonitorMapper.java
@@ -1,6 +1,7 @@
 package com.ycl.platform.mapper;
 
 import com.ycl.platform.domain.entity.TMonitor;
+import com.ycl.platform.domain.vo.TMonitorVO;
 
 import java.util.List;
 
@@ -26,7 +27,7 @@
      * @param tMonitor 璁惧璧勪骇
      * @return 璁惧璧勪骇闆嗗悎
      */
-    public List<TMonitor> selectTMonitorList(TMonitor tMonitor);
+    public List<TMonitorVO> selectTMonitorList(TMonitor tMonitor);
 
     /**
      * 鏂板璁惧璧勪骇
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/ITMonitorService.java b/ycl-server/src/main/java/com/ycl/platform/service/ITMonitorService.java
index 2e56ddf..b0e9f5b 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/ITMonitorService.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/ITMonitorService.java
@@ -1,6 +1,7 @@
 package com.ycl.platform.service;
 
 import com.ycl.platform.domain.entity.TMonitor;
+import com.ycl.platform.domain.vo.TMonitorVO;
 
 import java.util.List;
 
@@ -26,7 +27,7 @@
      * @param tMonitor 璁惧璧勪骇
      * @return 璁惧璧勪骇闆嗗悎
      */
-    public List<TMonitor> selectTMonitorList(TMonitor tMonitor);
+    public List<TMonitorVO> selectTMonitorList(TMonitor tMonitor);
 
     /**
      * 鏂板璁惧璧勪骇
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java
index da2d159..b4af1c9 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java
@@ -1,6 +1,7 @@
 package com.ycl.platform.service.impl;
 
 import com.ycl.platform.domain.entity.TMonitor;
+import com.ycl.platform.domain.vo.TMonitorVO;
 import com.ycl.platform.mapper.TMonitorMapper;
 import com.ycl.platform.service.ITMonitorService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -39,7 +40,7 @@
      * @return 璁惧璧勪骇
      */
     @Override
-    public List<TMonitor> selectTMonitorList(TMonitor tMonitor)
+    public List<TMonitorVO> selectTMonitorList(TMonitor tMonitor)
     {
         return tMonitorMapper.selectTMonitorList(tMonitor);
     }
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java
index 811d071..adaec69 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java
@@ -5,6 +5,7 @@
 import com.ycl.platform.mapper.YwPointMapper;
 import com.ycl.platform.mapper.YwUnitMapper;
 import com.ycl.platform.service.YwPointService;
+import com.ycl.platform.service.YwUnitService;
 import com.ycl.system.Result;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ycl.platform.domain.form.YwPointForm;
@@ -12,8 +13,13 @@
 import com.ycl.platform.domain.query.YwPointQuery;
 import java.util.List;
 
+import com.ycl.system.entity.SysDept;
+import com.ycl.system.service.ISysDeptService;
+import org.apache.commons.lang3.StringUtils;
+
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.ycl.system.page.PageUtil;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.beans.BeanUtils;
@@ -37,6 +43,10 @@
 public class YwPointServiceImpl extends ServiceImpl<YwPointMapper, YwPoint> implements YwPointService {
 
     private final YwPointMapper ywPointMapper;
+    @Autowired
+    private ISysDeptService deptService;
+    @Autowired
+    private YwUnitService unitService;
     private final YwUnitMapper ywUnitMapper;
 
     /**
@@ -125,14 +135,12 @@
 
         List<YwPointVO> vos = page.getRecords().stream()
                 .map(
-                        entity -> {
-                            YwPointVO vo = YwPointVO.getVoByEntity(entity, null);
-                            YwUnit unit = ywUnitMapper.selectById(vo.getUnitId());
-                            vo.setUnitName(unit.getUnitName());
-                            return vo;
-                        }
+                        entity -> YwPointVO.getVoByEntity(entity, null)
+                                .setDeptName(deptService.selectDeptById(entity.getDeptId()).getDeptName())
+                                .setUnitName(unitService.getById(entity.getUnitId()).getUnitName())
                 )
                 .collect(Collectors.toList());
+
         return Result.ok().data(vos).total(page.getTotal());
     }
 
diff --git a/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
index 269e060..9fe7ef1 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
@@ -40,14 +40,17 @@
         <result property="defaultOrder"    column="default_order"    />
         <result property="recovery"    column="recovery"    />
         <result property="recoveryTime"    column="recovery_time"    />
+        <result property="deptId"    column="dept_id"    />
     </resultMap>
 
     <sql id="selectTMonitorVo">
-        select id, serial_number, name, site_type, mac_addr, ip, camera_fun_type, longitude, latitude, camera_capture_area, on_state, civil_code, integrated_device, camera_brand, address, net_working, public_security, installed_time, management_unit, mu_contact_info, storage_days, monitor_azimuth, scene_photo_addr, model, site_vulgo, camera_type, camera_light_type, encoded_format, camera_dept, hybm, lxbm, reason, default_order,recovery,recovery_time from t_monitor
+        select id, serial_number, name, site_type, mac_addr, ip, camera_fun_type, longitude, latitude, camera_capture_area, on_state, civil_code, integrated_device, camera_brand, address, net_working, public_security, installed_time, management_unit, mu_contact_info, storage_days, monitor_azimuth, scene_photo_addr, model, site_vulgo, camera_type, camera_light_type, encoded_format, camera_dept, hybm, lxbm, reason, default_order,recovery,recovery_time,dept_id from t_monitor
     </sql>
 
-    <select id="selectTMonitorList" parameterType="com.ycl.platform.domain.entity.TMonitor" resultMap="TMonitorResult">
-        <include refid="selectTMonitorVo"/>
+    <select id="selectTMonitorList" resultType="com.ycl.platform.domain.vo.TMonitorVO">
+        select id, serial_number, name, site_type, mac_addr, ip, camera_fun_type, longitude, latitude, camera_capture_area, on_state, civil_code, integrated_device, camera_brand, address, net_working, public_security, installed_time, management_unit, mu_contact_info, storage_days
+        , monitor_azimuth, scene_photo_addr, model, site_vulgo, camera_type, camera_light_type, encoded_format, camera_dept, hybm, lxbm, reason, default_order,recovery,recovery_time,sd.dept_name from t_monitor m
+        left join sys_dept sd on m.dept_id = sd.dept_id
         <where>
             <if test="serialNumber != null  and serialNumber != ''"> and serial_number = #{serialNumber}</if>
             <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
@@ -83,6 +86,7 @@
             <if test="defaultOrder != null "> and default_order = #{defaultOrder}</if>
             <if test="recovery != null "> and recovery = #{recovery}</if>
             <if test="recoveryTime != null "> and recovery_time = #{recoveryTime}</if>
+            <if test="deptId != null "> and dept_id = #{deptId}</if>
         </where>
     </select>
 
@@ -128,6 +132,7 @@
             <if test="defaultOrder != null">default_order,</if>
             <if test="recovery != null">recovery,</if>
             <if test="recoveryTime != null">recovery_time,</if>
+            <if test="deptId != null">dept_id,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="serialNumber != null and serialNumber != ''">#{serialNumber},</if>
@@ -164,6 +169,7 @@
             <if test="defaultOrder != null">#{defaultOrder},</if>
             <if test="recovery != null">#{recovery},</if>
             <if test="recoveryTime != null">#{recoveryTime},</if>
+            <if test="deptId != null">#{deptId},</if>
          </trim>
     </insert>
 
@@ -204,6 +210,7 @@
             <if test="defaultOrder != null">default_order = #{defaultOrder},</if>
             <if test="recovery != null">recovery = #{defaultOrder},</if>
             <if test="recoveryTime != null">recovery_time = #{recoveryTime},</if>
+            <if test="deptId != null">dept_id = #{deptId},</if>
         </trim>
         where id = #{id}
     </update>

--
Gitblit v1.8.0