修改路径

securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/dto/AreaDto.java

@@ -18,6 +18,10 @@ public class AreaDto {
      * 工程类型
      */
     private String proType;
+    /**
+     * 区域id
+     */
+    private String areaId;
 
 
 

securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/system/dto/SelectDto.java

@@ -23,4 +23,8 @@ public class SelectDto {
 
     @ApiModelProperty(value = "gtId")
     private String gtId;
+    @ApiModelProperty(value = "orgId")
+    private String orgId;
+    @ApiModelProperty(value = "cityName")
+    private String cityName;
 }

securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/controller/TbAreaController.java

@@ -14,9 +14,7 @@ import com.securitycontrol.entity.background.vo.DeviceVo;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
 import java.util.ArrayList;
@@ -26,6 +24,8 @@ import java.util.List;
  * 区域管理接口
  * @author 黑子
  */
+@RestController
+@RequestMapping("/back/area/")
 @Slf4j
 public class TbAreaController  extends BaseController {
 
@@ -77,7 +77,7 @@ public class TbAreaController  extends BaseController {
      */
     @PostMapping("deleteArea")
     @Log(title = "修改区域", menu = "基础管理->区域管理", grade = OperationType.QUERY_BUSINESS, details = "删除区域", type = "业务日志")
-    public Result<String> deleteArea(@RequestBody @Valid AreaVo dto) {
+    public Result<String> deleteArea(@RequestBody @Valid AreaDto dto) {
         return service.deleteArea(dto);
     }
 

securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/mapper/TbAreaMapper.java

@@ -2,6 +2,7 @@ package com.securitycontrol.background.mapper;
 
 import com.securitycontrol.entity.background.dto.AreaDto;
 import com.securitycontrol.entity.background.vo.AreaVo;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -42,8 +43,8 @@ public interface TbAreaMapper {
 
     /**
      * 删除区域
-     * @param dto
+     * @param id
      * @return
      */
-    int deleteArea(AreaVo dto);
+    int deleteArea(@Param("areaId") String id);
 }

securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/TbAreaService.java

@@ -39,5 +39,5 @@ public interface TbAreaService {
      * @param dto
      * @return
      */
-    Result<String> deleteArea(AreaVo dto);
+    Result<String> deleteArea(AreaDto dto);
 }

securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/TbAreaServiceImpl.java

@@ -86,7 +86,7 @@ public class TbAreaServiceImpl  implements TbAreaService {
      * @return
      */
     @Override
-    public Result<String> deleteArea(AreaVo dto) {
+    public Result<String> deleteArea(AreaDto dto) {
             try{
                 if(StringHelper.isEmpty(dto.getAreaId())){
                     return Result.fail("修改失败,条件不能为空!");
@@ -95,7 +95,7 @@ public class TbAreaServiceImpl  implements TbAreaService {
                 List<String> list= Arrays.asList(ids.split("@"));
                 AtomicBoolean isDel= new AtomicBoolean(true);
                 list.forEach(id->{
-                    int num=mapper.deleteArea(dto);
+                    int num=mapper.deleteArea(id);
                     if (num!=SystemGlobal.SUCCESS_NUM){
                         isDel.set(false);
                     }
@@ -104,7 +104,7 @@ public class TbAreaServiceImpl  implements TbAreaService {
                 if(isDel.get()){
                     return Result.ok("删除成功","删除成功");
                 }
-                  return Result.fail("删除失败,请联系管理员!");
+                  return Result.fail("删除失败,数据不存在!");
             }catch (Exception e){
                 log.error(e.toString(),e);
                 return Result.fail("系统升级中,请稍后重试!");

securitycontrol-model/securitycontrol-background/src/main/resources/mapper/TbAreaMapper.xml

@@ -20,7 +20,7 @@
             #{areaId},#{areaName},#{bidCode},#{remarks},#{areaCode},now(),#{gtId},0)
     </insert>
     <update id="updateData">
-        update  tb_area set area_name=#{areaName},bid_code=#{bidCode},remarks=#{remarks},gt_id=#{gtId}
+        update  tb_area set area_name=#{areaName},bid_code=#{bidCode},remarks=#{remarks},gt_id=#{gtId},
                 area_code=#{areaCode},update_time=now()
                 where  area_id=#{areaId}
     </update>
@@ -32,9 +32,9 @@
         select  area_id,area_name,pro.bid_code, remarks,area_code,pro.pro_name,
                   area.create_time,area.update_time, area.gt_id,gt.gt_name
             from tb_area area
-            left join tb_project pro  on pro.bid_code=area.bid_code
+            left join tb_project pro  on pro.bid_code=area.bid_code and pro.del_flag=0
-            LEFT JOIN t_pro_gt gt on area.gt_id=gt.gt_id
+            LEFT JOIN t_pro_gt gt on area.gt_id=gt.gt_id and  gt.del_flag=0
-            where area.del_flag=0  and pro.del_flag=0 and  gt.del_flag=0
+            where area.del_flag=0
     </select>
     <select id="getProjectTypeByBidCode" resultType="java.lang.String">
         select pro_type

securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/SelectMapper.xml

@@ -111,15 +111,15 @@
     </select>
     <!--工程下拉选-->
     <select id="getProList" resultType="com.securitycontrol.entity.system.vo.SelectVo">
-        select  pro.bid_code,pro.pro_name
+        select  pro.bid_code bidCode,pro.pro_name name
                 from  tb_project pro
                 LEFT JOIN sys_build sb on sb.org_id=pro.org
                 where  pro.del_flag =0
                 <if test="proType!=null and proType!=''">
                     and  pro.pro_type=#{proType}
                 </if>
-                <if test="org!=null and org!=''">
+                <if test="orgId!=null and orgId!=''">
-                    and  pro.org=#{org}
+                    and  pro.org=#{orgId}
                 </if>
                 <if test="cityName!=null and cityName!=''">
                     and  sb.city_name=#{cityName}