Merge remote-tracking branch 'origin/master'

src/main/java/com/bonus/digitalSignage/basic/controller/TbProjectController.java

@@ -103,8 +103,8 @@ public class TbProjectController {
     @LogAnnotation(operModul = "线路工程管理-导出", operation = "导出", operDesc = "系统级事件",operType="导出")
     public void tbProjectExport(HttpServletResponse response, EncryptedReq<TbProjectVo> data) {
 
-        List<TbProjectVo> safetyMeasuresList = tbProjectService.tbProjectExport(data.getData());
+        List<TbProjectVo> tbProjectList = tbProjectService.tbProjectExport(data.getData());
         ExcelUtil<TbProjectVo> util = new ExcelUtil<TbProjectVo>(TbProjectVo.class);
-        util.exportExcel(response, safetyMeasuresList, "线路工程管理");
+        util.exportExcel(response, tbProjectList, "线路工程管理");
     }
 }

src/main/java/com/bonus/digitalSignage/basic/controller/TbTowerController.java

@@ -6,6 +6,7 @@ import com.bonus.digitalSignage.basic.service.TbTowerService;
 import com.bonus.digitalSignage.basic.vo.TbProjectVo;
 import com.bonus.digitalSignage.basic.vo.TbTowerVo;
 import com.bonus.digitalSignage.system.vo.EncryptedReq;
+import com.bonus.digitalSignage.utils.ExcelUtil;
 import com.bonus.digitalSignage.utils.ServerResponse;
 import com.github.pagehelper.PageHelper;
 import lombok.extern.slf4j.Slf4j;
@@ -14,6 +15,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 /**
  * 杆塔管理
@@ -65,4 +68,42 @@ public class TbTowerController {
         return tbTowerService.addTbTower(dto.getData());
     }
 
+    /**
+     * 杆塔管理-修改
+     * @param dto
+     * @return
+     */
+    @PostMapping(value = "updateTbTower")
+    @DecryptAndVerify(decryptedClass = TbTowerVo.class)//加解密统一管理
+    @LogAnnotation(operModul = "杆塔管理-修改", operation = "修改", operDesc = "系统级事件",operType="查询")
+    public ServerResponse updateTbTower(EncryptedReq<TbTowerVo> dto) {
+        return tbTowerService.updateTbTower(dto.getData());
+    }
+
+    /**
+     * 杆塔管理-删除
+     * @param dto
+     * @return
+     */
+    @PostMapping(value = "delTbTower")
+    @DecryptAndVerify(decryptedClass = TbTowerVo.class)//加解密统一管理
+    @LogAnnotation(operModul = "杆塔管理-删除", operation = "删除", operDesc = "系统级事件",operType="查询")
+    public ServerResponse delTbTower(EncryptedReq<TbTowerVo> dto) {
+        return tbTowerService.delTbTower(dto.getData());
+    }
+
+    /**
+     *杆塔管理导出
+     * @param data
+     * @return
+     */
+    @PostMapping(value = "/tbTowerExport")
+    @DecryptAndVerify(decryptedClass = TbTowerVo.class)
+    @LogAnnotation(operModul = "杆塔管理-导出", operation = "导出", operDesc = "系统级事件",operType="导出")
+    public void tbTowerExport(HttpServletResponse response, EncryptedReq<TbTowerVo> data) {
+
+        List<TbTowerVo> tbTowerVoList = tbTowerService.tbProjectExport(data.getData());
+        ExcelUtil<TbTowerVo> util = new ExcelUtil<TbTowerVo>(TbTowerVo.class);
+        util.exportExcel(response, tbTowerVoList, "杆塔管理");
+    }
 }

src/main/java/com/bonus/digitalSignage/basic/dao/TbTowerMapper.java

@@ -12,4 +12,8 @@ public interface TbTowerMapper {
     void addTbTower(TbTowerVo data);
 
     TbTowerVo getTbTowerBySort(TbTowerVo data);
+
+    void updateTbTower(TbTowerVo data);
+
+    void delTbTower(TbTowerVo data);
 }

src/main/java/com/bonus/digitalSignage/basic/service/TbTowerService.java

@@ -3,6 +3,8 @@ package com.bonus.digitalSignage.basic.service;
 import com.bonus.digitalSignage.basic.vo.TbTowerVo;
 import com.bonus.digitalSignage.utils.ServerResponse;
 
+import java.util.List;
+
 public interface TbTowerService {
     /**
      * 杆塔管理-查询列表
@@ -24,4 +26,25 @@ public interface TbTowerService {
      * @return
      */
     ServerResponse addTbTower(TbTowerVo data);
+
+    /**
+     * 杆塔管理-修改
+     * @param data
+     * @return
+     */
+    ServerResponse updateTbTower(TbTowerVo data);
+
+    /**
+     * 杆塔管理-删除
+     * @param data
+     * @return
+     */
+    ServerResponse delTbTower(TbTowerVo data);
+
+    /**
+     *杆塔管理导出
+     * @param data
+     * @return
+     */
+    List<TbTowerVo> tbProjectExport(TbTowerVo data);
 }

src/main/java/com/bonus/digitalSignage/basic/service/impl/TbTowerServiceImpl.java

@@ -97,4 +97,57 @@ public class TbTowerServiceImpl implements TbTowerService {
             return ServerResponse.createErroe("杆塔管理-新增失败");
         }
     }
+
+    /**
+     * 杆塔管理-修改
+     * @param data
+     * @return
+     */
+    @Override
+    public ServerResponse updateTbTower(TbTowerVo data) {
+        try {
+            //判断经纬度是否合法
+            if(!StrUtil.isValidLongitude(Double.parseDouble(data.getLon())) || !StrUtil.isValidLatitude(Double.parseDouble(data.getLat()))){
+                return ServerResponse.createErroe("请输入正确经纬度");
+            }
+            TbTowerVo tbTower = tbTowerMapper.getTbTowerById(data);
+            if (StringUtils.isNotNull(tbTower) && data.getId()!=tbTower.getId()){
+                return ServerResponse.createErroe("排序已存在");
+            }
+            //判断新增塔杆的坐标系   1.WGS-84地心坐标系  2.2000国家大地坐标系
+            if ("1".equals(data.getUploadType())){
+                double[] bd09 =CoordinateConverter.wgs84ToBd09(Double.parseDouble(data.getLat()),Double.parseDouble(data.getLon()));
+                data.setBaiduLat(String.valueOf(bd09[0]));
+                data.setBaiduLon(String.valueOf(bd09[1]));
+            }else {
+                double[] bd09 =CoordinateConverter.cgcs2000ToBd09(Double.parseDouble(data.getLat()),Double.parseDouble(data.getLon()));
+                data.setBaiduLat(String.valueOf(bd09[0]));
+                data.setBaiduLon(String.valueOf(bd09[1]));
+            }
+            Long userId = UserUtil.getLoginUser().getId();
+            data.setUpdateUserId(userId);
+            tbTowerMapper.updateTbTower(data);
+            return ServerResponse.createSuccess("杆塔管理-修改成功");
+        } catch (Exception e) {
+            log.error(e.toString(), e);
+            return ServerResponse.createErroe("杆塔管理-修改失败");
+        }
+    }
+
+    @Override
+    public ServerResponse delTbTower(TbTowerVo data) {
+        try {
+            tbTowerMapper.delTbTower(data);
+            return ServerResponse.createSuccess("杆塔管理-删除失败");
+        } catch (Exception e) {
+            log.error(e.toString(), e);
+            return ServerResponse.createErroe("杆塔管理-删除失败");
+        }
+    }
+
+    @Override
+    public List<TbTowerVo> tbProjectExport(TbTowerVo data) {
+        List<TbTowerVo> tbTowerVoList = tbTowerMapper.getTbProjectList(data);
+        return tbTowerVoList;
+    }
 }

src/main/resources/mappers/basic/TbProjectMapper.xml

@@ -84,13 +84,13 @@
     <select id="getTbProjectById" resultType="com.bonus.digitalSignage.basic.vo.TbProjectVo">
         select tp.id as id,tp.pro_name as proName,tp.voltage_level as voltageLevel,tp.line_length as lineLength,
                tp.plan_start_time as planStartTime,tp.plan_end_time as planEndTime,tp.lon as lon,tp.lat as lat,
-               tp.address as address,B.pro_status as pro_status
+               tp.address as address,tp.pro_status as pro_status
         from tb_project tp where id = #{id}
     </select>
     <select id="getTbProjectByProName" resultType="com.bonus.digitalSignage.basic.vo.TbProjectVo">
         select tp.id as id,tp.pro_name as proName,tp.voltage_level as voltageLevel,tp.line_length as lineLength,
                tp.plan_start_time as planStartTime,tp.plan_end_time as planEndTime,tp.lon as lon,tp.lat as lat,
-               tp.address as address,B.pro_status as pro_status
+               tp.address as address,tp.pro_status as pro_status
         from tb_project tp where pro_name = #{proName} and is_active ='1'
     </select>
 </mapper>

src/main/resources/mappers/basic/TbTowerMapper.xml

@@ -33,11 +33,31 @@
             1
         </trim>
     </insert>
+    <update id="updateTbTower">
+        update tb_tower
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="towerName != null">tower_name = #{towerName},</if>
+            <if test="lon != null">lon = #{lon},</if>
+            <if test="lat != null">lat = #{lat},</if>
+            <if test="baiduLon != null">baidu_lon = #{baiduLon},</if>
+            <if test="baiduLat != null">baidu_lat = #{baiduLat},</if>
+            <if test="sort != null">sort = #{sort},</if>
+            <if test="centralMeridian != null">central_meridian = #{centralMeridian},</if>
+            <if test="uploadType != null">upload_type = #{uploadType},</if>
+            <if test="updateUserId != null">update_user_id = #{updateUserId},</if>
+            update_time = now()
+        </trim>
+        where id = #{id}
+    </update>
+    <delete id="delTbTower">
+        update tb_tower set is_actvice = '0' where id=#{id}
+    </delete>
 
     <select id="getTbProjectList" resultType="com.bonus.digitalSignage.basic.vo.TbTowerVo">
         select id as id,pro_id as proId,tower_name as towerName,lon as lon,lat as lat,
                baidu_lon as baiduLon,baidu_lat as baiduLat,sort as sort,central_meridian as centralMeridian
             from tb_tower where pro_id = #{proId} and is_actvice = '1'
+        <if test="towerName != '' and towerName != null">and tower_name  like concat('%', #{towerName}, '%')</if>
     </select>
     <select id="getTbTowerById" resultType="com.bonus.digitalSignage.basic.vo.TbTowerVo">
         select id as id,pro_id as proId,tower_name as towerName,lon as lon,lat as lat,