Gaokun Wang 4 сар өмнө
parent
commit
7502ec5a5c

+ 23 - 29
als-modules/agile-assurance/src/main/java/org/eco/als/controller/CommunicationController.java

@@ -1,36 +1,35 @@
 package org.eco.als.controller;
 
-import jakarta.servlet.http.HttpServletRequest;
-import lombok.RequiredArgsConstructor;
-import jakarta.servlet.http.HttpServletResponse;
-import cn.hutool.core.collection.CollUtil;
 import cn.dev33.satoken.annotation.SaCheckPermission;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.validation.annotation.Validated;
+import cn.hutool.core.collection.CollUtil;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
+import org.eco.als.domain.bo.CommunicationBo;
+import org.eco.als.domain.vo.CommunicationImportVo;
+import org.eco.als.domain.vo.CommunicationVo;
+import org.eco.als.service.ICommunicationService;
 import org.eco.common.core.core.domain.CommonResult;
+import org.eco.common.core.core.domain.model.LoginUser;
+import org.eco.common.core.core.page.PageResult;
+import org.eco.common.excel.utils.ExcelUtil;
 import org.eco.common.log.annotation.Log;
 import org.eco.common.log.enums.BusinessType;
 import org.eco.common.security.utils.LoginHelper;
-import org.eco.common.core.core.domain.model.LoginUser;
 import org.eco.common.web.annotation.RepeatSubmit;
-import org.eco.common.excel.utils.ExcelUtil;
 import org.eco.common.web.core.BaseController;
-import jakarta.annotation.Resource;
-import org.eco.als.domain.vo.CommunicationImportVo;
-import org.eco.als.domain.vo.CommunicationVo;
-import org.eco.als.domain.bo.CommunicationBo;
-import org.eco.als.service.ICommunicationService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
-import org.eco.common.core.core.page.PageResult;
 
-import java.util.List;
 import java.util.ArrayList;
+import java.util.List;
 
 /**
  * 通讯管理Controller
  *
  * @author wgk
- * @date 2024-12-14
+ * @date 2024-12-17
  */
 @Validated
 @RequiredArgsConstructor
@@ -40,17 +39,12 @@ public class CommunicationController extends BaseController {
     @Resource
     private ICommunicationService communicationService;
 
-/**
- * 查询通讯管理列表
- */
-@SaCheckPermission("als:communication:list")
-@GetMapping("/list")
-    public CommonResult<PageResult<CommunicationVo>> list(CommunicationBo communicationBo, HttpServletRequest request) {
-    String param = request.getParameter("queryParam");
-    if (param!=null && !param.isEmpty() ){
-        communicationBo.setName(param);
-        communicationBo.setId((long) Integer.parseInt(param));
-    }
+    /**
+     * 查询通讯管理列表
+     */
+    @SaCheckPermission("als:communication:list")
+    @GetMapping("/list")
+    public CommonResult<PageResult<CommunicationVo>> list(CommunicationBo communicationBo) {
         return CommonResult.success(communicationService.selectPage(communicationBo));
     }
 
@@ -66,7 +60,7 @@ public class CommunicationController extends BaseController {
         if (CollUtil.isEmpty(list)) {
             return CommonResult.fail("导出列表为空");
         }
-            communicationService.asyncExport(list, "通讯管理", loginUser);
+        communicationService.asyncExport(list, "通讯管理", loginUser);
         return CommonResult.success();
     }
 
@@ -84,7 +78,7 @@ public class CommunicationController extends BaseController {
     @PostMapping("/importData")
     public CommonResult<Void> importData(MultipartFile file, boolean updateSupport) {
         LoginUser loginUser = LoginHelper.getLoginUser();
-            communicationService.asyncImportData(file, updateSupport, loginUser);
+        communicationService.asyncImportData(file, updateSupport, loginUser);
         return CommonResult.success();
     }
 

+ 40 - 16
als-modules/agile-assurance/src/main/java/org/eco/als/domain/Communication.java

@@ -5,58 +5,82 @@ import com.mybatisflex.annotation.Id;
 import com.mybatisflex.annotation.Table;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.eco.common.orm.core.domain.BaseEntity;
 
 import java.io.Serial;
-import org.eco.common.orm.core.domain.BaseEntity;
 
 /**
  * 通讯管理对象 als_communication_t
  *
  * @author wgk
- * @date 2024-12-14
+ * @date 2024-12-17
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Table(value = "als_communication_t")
 public class Communication extends BaseEntity {
-@Serial
-private static final long serialVersionUID = 1L;
+    @Serial
+    private static final long serialVersionUID = 1L;
 
-    /** 编号 */
+    /**
+     * 编号
+     */
     @Id
     private Long id;
 
-    /** 名称 */
+    /**
+     * 名称
+     */
     private String name;
 
-    /** IP地址 */
+    /**
+     * IP地址
+     */
     private String ipAddress;
 
-    /** 网段 */
+    /**
+     * 网段
+     */
     private String networkSegment;
 
-    /** 子网掩码 */
+    /**
+     * 子网掩码
+     */
     private String subnetMask;
 
-    /** DNS */
+    /**
+     * DNS
+     */
     private String dns;
 
-    /** 网关 */
+    /**
+     * 网关
+     */
     private String gateway;
 
-    /** http */
+    /**
+     * http
+     */
     private String http;
 
-    /** 端口号 */
+    /**
+     * 端口号
+     */
     private String port;
 
-    /** 用户名 */
+    /**
+     * 用户名
+     */
     private String userName;
 
-    /** 密码 */
+    /**
+     * 密码
+     */
     private String password;
 
-    /** 删除标识(1删除 0未删除) */
+    /**
+     * 删除标识(1删除 0未删除)
+     */
     @Column(isLogicDelete = true)
     private Integer delFlag;
 

+ 3 - 15
als-modules/agile-assurance/src/main/java/org/eco/als/domain/bo/CommunicationBo.java

@@ -1,86 +1,74 @@
 package org.eco.als.domain.bo;
 
-import org.eco.als.domain.Communication;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import jakarta.validation.constraints.*;
+import org.eco.als.domain.Communication;
 import org.eco.common.orm.core.domain.BaseEntity;
 
 /**
  * 通讯管理业务对象 als_communication_t
  *
  * @author wgk
- * @date 2024-12-14
+ * @date 2024-12-17
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
 @AutoMapper(target = Communication.class, reverseConvertGenerate = false)
-public class CommunicationBo extends BaseEntity{
+public class CommunicationBo extends BaseEntity {
     /**
      * 编号
      */
-    @NotNull(message = "编号不能为空")
     private Long id;
 
     /**
      * 名称
      */
-    @NotBlank(message = "名称不能为空")
     private String name;
 
     /**
      * IP地址
      */
-    @NotBlank(message = "IP地址不能为空")
     private String ipAddress;
 
     /**
      * 网段
      */
-    @NotBlank(message = "网段不能为空")
     private String networkSegment;
 
     /**
      * 子网掩码
      */
-    @NotBlank(message = "子网掩码不能为空")
     private String subnetMask;
 
     /**
      * DNS
      */
-    @NotBlank(message = "DNS不能为空")
     private String dns;
 
     /**
      * 网关
      */
-    @NotBlank(message = "网关不能为空")
     private String gateway;
 
     /**
      * http
      */
-    @NotBlank(message = "http不能为空")
     private String http;
 
     /**
      * 端口号
      */
-    @NotBlank(message = "端口号不能为空")
     private String port;
 
     /**
      * 用户名
      */
-    @NotBlank(message = "用户名不能为空")
     private String userName;
 
     /**
      * 密码
      */
-    @NotBlank(message = "密码不能为空")
     private String password;
 
 

+ 68 - 47
als-modules/agile-assurance/src/main/java/org/eco/als/domain/vo/CommunicationImportVo.java

@@ -2,18 +2,17 @@ package org.eco.als.domain.vo;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
-import org.eco.common.excel.annotation.ExcelDictFormat;
-import org.eco.common.excel.convert.ExcelDictConvert;
 import lombok.Data;
+import lombok.NoArgsConstructor;
+
 import java.io.Serial;
 import java.io.Serializable;
-import lombok.NoArgsConstructor;
 
 /**
  * 通讯管理导入视图对象 als_communication_t
  *
  * @author wgk
- * @date 2024-12-14
+ * @date 2024-12-17
  */
 
 @Data
@@ -25,49 +24,71 @@ public class CommunicationImportVo implements Serializable {
     private static final long serialVersionUID = 1L;
 
 
-                /** 名称 */
-                    @ExcelProperty(value = "名称")
-                private String name;
-
-                /** IP地址 */
-                    @ExcelProperty(value = "IP地址")
-                private String ipAddress;
-
-                /** 网段 */
-                    @ExcelProperty(value = "网段")
-                private String networkSegment;
-
-                /** 子网掩码 */
-                    @ExcelProperty(value = "子网掩码")
-                private String subnetMask;
-
-                /** DNS */
-                    @ExcelProperty(value = "DNS")
-                private String dns;
-
-                /** 网关 */
-                    @ExcelProperty(value = "网关")
-                private String gateway;
-
-                /** http */
-                    @ExcelProperty(value = "http")
-                private String http;
-
-                /** 端口号 */
-                    @ExcelProperty(value = "端口号")
-                private String port;
-
-                /** 用户名 */
-                    @ExcelProperty(value = "用户名")
-                private String userName;
-
-                /** 密码 */
-                    @ExcelProperty(value = "密码")
-                private String password;
-
-                /** 删除标识(1删除 0未删除) */
-                    @ExcelProperty(value = "删除标识(1删除 0未删除)")
-                    private Integer delFlag;
+    /**
+     * 名称
+     */
+    @ExcelProperty(value = "名称")
+    private String name;
+
+    /**
+     * IP地址
+     */
+    @ExcelProperty(value = "IP地址")
+    private String ipAddress;
+
+    /**
+     * 网段
+     */
+    @ExcelProperty(value = "网段")
+    private String networkSegment;
+
+    /**
+     * 子网掩码
+     */
+    @ExcelProperty(value = "子网掩码")
+    private String subnetMask;
+
+    /**
+     * DNS
+     */
+    @ExcelProperty(value = "DNS")
+    private String dns;
+
+    /**
+     * 网关
+     */
+    @ExcelProperty(value = "网关")
+    private String gateway;
+
+    /**
+     * http
+     */
+    @ExcelProperty(value = "http")
+    private String http;
+
+    /**
+     * 端口号
+     */
+    @ExcelProperty(value = "端口号")
+    private String port;
+
+    /**
+     * 用户名
+     */
+    @ExcelProperty(value = "用户名")
+    private String userName;
+
+    /**
+     * 密码
+     */
+    @ExcelProperty(value = "密码")
+    private String password;
+
+    /**
+     * 删除标识(1删除 0未删除)
+     */
+    @ExcelProperty(value = "删除标识(1删除 0未删除)")
+    private Integer delFlag;
 
 
 }

+ 43 - 20
als-modules/agile-assurance/src/main/java/org/eco/als/domain/vo/CommunicationVo.java

@@ -1,24 +1,23 @@
 package org.eco.als.domain.vo;
 
-import org.eco.als.domain.Communication;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
-import org.eco.common.excel.annotation.ExcelDictFormat;
-import org.eco.common.excel.convert.ExcelDictConvert;
-import com.eco.common.mapper.constant.MapperConstant;
 import com.eco.common.mapper.annotation.FieldMapper;
+import com.eco.common.mapper.constant.MapperConstant;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.eco.als.domain.Communication;
+import org.eco.common.orm.core.domain.BaseEntity;
+
 import java.io.Serial;
 import java.io.Serializable;
-import org.eco.common.orm.core.domain.BaseEntity;
 
 /**
  * 通讯管理视图对象 als_communication_t
  *
  * @author wgk
- * @date 2024-12-14
+ * @date 2024-12-17
  */
 @Data
 @ExcelIgnoreUnannotated
@@ -26,54 +25,78 @@ import org.eco.common.orm.core.domain.BaseEntity;
 @AutoMapper(target = Communication.class)
 public class CommunicationVo extends BaseEntity implements Serializable {
 
-@Serial
-private static final long serialVersionUID = 1L;
+    @Serial
+    private static final long serialVersionUID = 1L;
 
-    /** 编号 */
+    /**
+     * 编号
+     */
     @ExcelProperty(value = "编号")
     private Long id;
 
-    /** 名称 */
+    /**
+     * 名称
+     */
     @ExcelProperty(value = "名称")
     private String name;
 
-    /** IP地址 */
+    /**
+     * IP地址
+     */
     @ExcelProperty(value = "IP地址")
     private String ipAddress;
 
-    /** 网段 */
+    /**
+     * 网段
+     */
     @ExcelProperty(value = "网段")
     private String networkSegment;
 
-    /** 子网掩码 */
+    /**
+     * 子网掩码
+     */
     @ExcelProperty(value = "子网掩码")
     private String subnetMask;
 
-    /** DNS */
+    /**
+     * DNS
+     */
     @ExcelProperty(value = "DNS")
     private String dns;
 
-    /** 网关 */
+    /**
+     * 网关
+     */
     @ExcelProperty(value = "网关")
     private String gateway;
 
-    /** http */
+    /**
+     * http
+     */
     @ExcelProperty(value = "http")
     private String http;
 
-    /** 端口号 */
+    /**
+     * 端口号
+     */
     @ExcelProperty(value = "端口号")
     private String port;
 
-    /** 用户名 */
+    /**
+     * 用户名
+     */
     @ExcelProperty(value = "用户名")
     private String userName;
 
-    /** 密码 */
+    /**
+     * 密码
+     */
     @ExcelProperty(value = "密码")
     private String password;
 
-    /** 删除标识(1删除 0未删除) */
+    /**
+     * 删除标识(1删除 0未删除)
+     */
     @ExcelProperty(value = "删除标识(1删除 0未删除)")
     private Integer delFlag;
 

+ 7 - 7
als-modules/agile-assurance/src/main/java/org/eco/als/listener/CommunicationImportListener.java

@@ -4,18 +4,17 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.excel.context.AnalysisContext;
 import com.alibaba.excel.event.AnalysisEventListener;
-import org.eco.common.core.exception.BusinessException;
+import lombok.extern.slf4j.Slf4j;
+import org.eco.als.domain.bo.CommunicationBo;
+import org.eco.als.domain.vo.CommunicationImportVo;
+import org.eco.als.domain.vo.CommunicationVo;
+import org.eco.als.service.ICommunicationService;
+import org.eco.common.core.core.domain.model.LoginUser;
 import org.eco.common.core.utils.SpringUtils;
 import org.eco.common.core.utils.ValidatorUtils;
 import org.eco.common.excel.core.ExcelListener;
 import org.eco.common.excel.core.ExcelResult;
 import org.eco.common.excel.entity.ExcelResultRes;
-import org.eco.common.core.core.domain.model.LoginUser;
-import org.eco.als.domain.bo.CommunicationBo;
-import org.eco.als.domain.vo.CommunicationImportVo;
-import org.eco.als.domain.vo.CommunicationVo;
-import org.eco.als.service.ICommunicationService;
-import lombok.extern.slf4j.Slf4j;
 
 import java.util.List;
 
@@ -84,6 +83,7 @@ public class CommunicationImportListener extends AnalysisEventListener<Communica
             log.error(msg, e);
         }
     }
+
     private void setBo(CommunicationBo communicationBo) {
         communicationBo.setVersion(0);
         communicationBo.setCreateBy(loginUser.getUserId());

+ 1 - 4
als-modules/agile-assurance/src/main/java/org/eco/als/mapper/CommunicationMapper.java

@@ -4,16 +4,13 @@ import com.mybatisflex.core.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.eco.als.domain.Communication;
 
-import java.util.List;
-
 /**
  * 通讯管理Mapper接口
  *
  * @author wgk
- * @date 2024-12-14
+ * @date 2024-12-17
  */
 @Mapper
 public interface CommunicationMapper extends BaseMapper<Communication> {
 
-    int del(List<Long> ids);
 }

+ 8 - 6
als-modules/agile-assurance/src/main/java/org/eco/als/service/ICommunicationService.java

@@ -1,20 +1,21 @@
 package org.eco.als.service;
 
-import java.util.List;
-import org.eco.common.core.core.domain.model.LoginUser;
 import org.eco.als.domain.Communication;
-import org.eco.als.domain.vo.CommunicationVo;
 import org.eco.als.domain.bo.CommunicationBo;
+import org.eco.als.domain.vo.CommunicationVo;
+import org.eco.common.core.core.domain.model.LoginUser;
+import org.eco.common.core.core.page.PageResult;
 import org.eco.common.orm.core.service.IBaseService;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.web.multipart.MultipartFile;
-import org.eco.common.core.core.page.PageResult;
+
+import java.util.List;
 
 /**
  * 通讯管理Service接口
  *
  * @author wgk
- * @date 2024-12-14
+ * @date 2024-12-17
  */
 public interface ICommunicationService extends IBaseService<Communication> {
     /**
@@ -23,7 +24,8 @@ public interface ICommunicationService extends IBaseService<Communication> {
      * @param id 通讯管理主键
      * @return 通讯管理
      */
-        CommunicationVo selectById(Long id);
+    CommunicationVo selectById(Long id);
+
     /**
      * 查询通讯管理列表
      *

+ 35 - 38
als-modules/agile-assurance/src/main/java/org/eco/als/service/impl/CommunicationServiceImpl.java

@@ -1,42 +1,40 @@
 package org.eco.als.service.impl;
 
-import java.util.Arrays;
-import java.util.List;
-
 import cn.hutool.core.util.ObjectUtil;
 import com.mybatisflex.core.paginate.Page;
 import com.mybatisflex.core.query.QueryWrapper;
+import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
+import org.eco.als.domain.Communication;
+import org.eco.als.domain.bo.CommunicationBo;
+import org.eco.als.domain.vo.CommunicationImportVo;
+import org.eco.als.domain.vo.CommunicationVo;
+import org.eco.als.listener.CommunicationImportListener;
+import org.eco.als.mapper.CommunicationMapper;
+import org.eco.als.service.ICommunicationService;
 import org.eco.common.core.core.domain.model.LoginUser;
+import org.eco.common.core.core.page.PageResult;
+import org.eco.common.core.utils.MapstructUtils;
 import org.eco.common.excel.entity.ExcelResultRes;
 import org.eco.common.excel.service.IExcelService;
-import org.eco.common.core.utils.bean.BeanUtils;
-import org.eco.common.core.utils.MapstructUtils;
-import org.eco.system.service.IImportExportService;
-import org.eco.common.core.utils.StringUtils;
-import org.eco.system.domain.bo.ImportExportBo;
 import org.eco.common.orm.core.page.PageQuery;
-import org.eco.common.core.core.page.PageResult;
 import org.eco.common.orm.core.service.impl.BaseServiceImpl;
-import jakarta.annotation.Resource;
+import org.eco.system.service.IImportExportService;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
+
 import java.io.IOException;
-import org.eco.als.mapper.CommunicationMapper;
-import org.eco.als.domain.Communication;
-import org.eco.als.domain.bo.CommunicationBo;
-import org.eco.als.domain.vo.CommunicationVo;
-import org.eco.als.domain.vo.CommunicationImportVo;
-import org.eco.als.listener.CommunicationImportListener;
-import org.eco.als.service.ICommunicationService;
+import java.util.Arrays;
+import java.util.List;
+
 import static org.eco.als.domain.table.CommunicationTableDef.COMMUNICATION;
 
 /**
  * 通讯管理Service业务层处理
  *
  * @author wgk
- * @date 2024-12-14
+ * @date 2024-12-17
  */
 @Service
 @Slf4j
@@ -58,25 +56,25 @@ public class CommunicationServiceImpl extends BaseServiceImpl<CommunicationMappe
     private QueryWrapper buildQueryWrapper(CommunicationBo communicationBo) {
         QueryWrapper queryWrapper = super.buildBaseQueryWrapper();
         queryWrapper.and(COMMUNICATION.NAME.like
-        (communicationBo.getName()));
+            (communicationBo.getName()));
         queryWrapper.and(COMMUNICATION.IP_ADDRESS.eq
-        (communicationBo.getIpAddress()));
+            (communicationBo.getIpAddress()));
         queryWrapper.and(COMMUNICATION.NETWORK_SEGMENT.eq
-        (communicationBo.getNetworkSegment()));
+            (communicationBo.getNetworkSegment()));
         queryWrapper.and(COMMUNICATION.SUBNET_MASK.eq
-        (communicationBo.getSubnetMask()));
+            (communicationBo.getSubnetMask()));
         queryWrapper.and(COMMUNICATION.DNS.eq
-        (communicationBo.getDns()));
+            (communicationBo.getDns()));
         queryWrapper.and(COMMUNICATION.GATEWAY.eq
-        (communicationBo.getGateway()));
+            (communicationBo.getGateway()));
         queryWrapper.and(COMMUNICATION.HTTP.eq
-        (communicationBo.getHttp()));
+            (communicationBo.getHttp()));
         queryWrapper.and(COMMUNICATION.PORT.eq
-        (communicationBo.getPort()));
+            (communicationBo.getPort()));
         queryWrapper.and(COMMUNICATION.USER_NAME.like
-        (communicationBo.getUserName()));
+            (communicationBo.getUserName()));
         queryWrapper.and(COMMUNICATION.PASSWORD.eq
-        (communicationBo.getPassword()));
+            (communicationBo.getPassword()));
 
         return queryWrapper;
     }
@@ -89,7 +87,7 @@ public class CommunicationServiceImpl extends BaseServiceImpl<CommunicationMappe
      */
     @Override
     public CommunicationVo selectById(Long id) {
-            return this.getOneAs(query().where(COMMUNICATION.ID.eq(id)), CommunicationVo.class);
+        return this.getOneAs(query().where(COMMUNICATION.ID.eq(id)), CommunicationVo.class);
 
     }
 
@@ -103,7 +101,7 @@ public class CommunicationServiceImpl extends BaseServiceImpl<CommunicationMappe
     @Override
     public List<CommunicationVo> selectList(CommunicationBo communicationBo) {
         QueryWrapper queryWrapper = buildQueryWrapper(communicationBo);
-            return this.listAs(queryWrapper, CommunicationVo.class);
+        return this.listAs(queryWrapper, CommunicationVo.class);
     }
 
     /**
@@ -115,7 +113,7 @@ public class CommunicationServiceImpl extends BaseServiceImpl<CommunicationMappe
     @Override
     public PageResult<CommunicationVo> selectPage(CommunicationBo communicationBo) {
         QueryWrapper queryWrapper = buildQueryWrapper(communicationBo);
-            Page<CommunicationVo> page = this.pageAs(PageQuery.build(), queryWrapper, CommunicationVo.class);
+        Page<CommunicationVo> page = this.pageAs(PageQuery.build(), queryWrapper, CommunicationVo.class);
         return PageResult.build(page);
     }
 
@@ -127,7 +125,7 @@ public class CommunicationServiceImpl extends BaseServiceImpl<CommunicationMappe
      */
     @Override
     public boolean insert(CommunicationBo communicationBo) {
-    Communication communication =MapstructUtils.convert(communicationBo, Communication. class);
+        Communication communication = MapstructUtils.convert(communicationBo, Communication.class);
 
         return this.save(communication);//使用全局配置的雪花算法主键生成器生成ID值
     }
@@ -139,12 +137,11 @@ public class CommunicationServiceImpl extends BaseServiceImpl<CommunicationMappe
      * @return 结果:true 操作成功,false 操作失败
      */
     @Override
-    public boolean insertWithPk(CommunicationBo communicationBo)
-    {
+    public boolean insertWithPk(CommunicationBo communicationBo) {
         Communication communication = MapstructUtils.convert(communicationBo, Communication.class);
 
 
-            return communicationMapper.insertWithPk(communication) > 0;//前台传来主键值
+        return communicationMapper.insertWithPk(communication) > 0;//前台传来主键值
     }
 
     /**
@@ -155,10 +152,10 @@ public class CommunicationServiceImpl extends BaseServiceImpl<CommunicationMappe
      */
     @Override
     public boolean update(CommunicationBo communicationBo) {
-        Communication communication =MapstructUtils.convert(communicationBo, Communication. class);
-        if (ObjectUtil.isNotNull(communication) && ObjectUtil.isNotNull(communication.getId())){
+        Communication communication = MapstructUtils.convert(communicationBo, Communication.class);
+        if (ObjectUtil.isNotNull(communication) && ObjectUtil.isNotNull(communication.getId())) {
             boolean updated = this.updateById(communication);
-                return updated;
+            return updated;
         }
         return false;
     }

+ 0 - 8
als-modules/agile-assurance/src/main/resources/mapper/als/CommunicationMapper.xml

@@ -4,12 +4,4 @@
     "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.eco.als.mapper.CommunicationMapper">
 
-    <delete id="del" parameterType="java.util.List">
-        UPDATE 'als_communication_t'
-        SET del_flag = 1
-        WHERE id IN
-        <foreach collection="list" item="id" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
 </mapper>