合并物防建设信息

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/SysBankPhysicalDefenseConstructionController.java

@@ -1,95 +0,0 @@
-package com.xunmei.system.controller;
-
-import java.util.List;
-import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.xunmei.common.log.annotation.Log;
-import com.xunmei.common.log.enums.BusinessType;
-import com.xunmei.common.security.annotation.RequiresPermissions;
-import com.xunmei.system.domain.SysBankPhysicalDefenseConstruction;
-import com.xunmei.system.service.ISysBankPhysicalDefenseConstructionService;
-import com.xunmei.common.core.web.controller.BaseController;
-import com.xunmei.common.core.web.domain.AjaxResult;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.xunmei.common.core.web.page.TableDataInfo;
-
-/**
- * 银行物防建设Controller
- *
- * @author xunmei
- * @date 2023-08-16
- */
-@Api(tags = {"SysBankPhysicalDefenseConstruction" })
-@RestController
-@RequestMapping("/BankPhysicalDefenseConstruction")
-public class SysBankPhysicalDefenseConstructionController extends BaseController {
-    @Autowired
-    private ISysBankPhysicalDefenseConstructionService sysBankPhysicalDefenseConstructionService;
-
-/**
- * 查询银行物防建设列表
- */
-@ApiOperation(value = "查询SysBankPhysicalDefenseConstruction列表")
-@RequiresPermissions("system:construction:list")
-@GetMapping("/list")
-    public TableDataInfo list(SysBankPhysicalDefenseConstruction sysBankPhysicalDefenseConstruction) {
-
-        return sysBankPhysicalDefenseConstructionService.selectPage( sysBankPhysicalDefenseConstruction);
-    }
-
-                                                
-    /**
-     * 获取银行物防建设详细信息
-     */
-    @ApiOperation(value = "获取SysBankPhysicalDefenseConstruction详细信息")
-    @RequiresPermissions("system:construction:query")
-    @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id) {
-        return success(sysBankPhysicalDefenseConstructionService.selectSysBankPhysicalDefenseConstructionById(id));
-    }
-
-    /**
-     * 新增银行物防建设
-     */
-    @ApiOperation(value = "新增SysBankPhysicalDefenseConstruction")
-    @RequiresPermissions("system:construction:add")
-    @Log(title = "银行物防建设" , businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody SysBankPhysicalDefenseConstruction sysBankPhysicalDefenseConstruction) {
-        return toAjax(sysBankPhysicalDefenseConstructionService.insertSysBankPhysicalDefenseConstruction(sysBankPhysicalDefenseConstruction));
-    }
-
-    /**
-     * 修改银行物防建设
-     */
-    @ApiOperation(value = "修改SysBankPhysicalDefenseConstruction")
-    @RequiresPermissions("system:construction:edit")
-    @Log(title = "银行物防建设" , businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody SysBankPhysicalDefenseConstruction sysBankPhysicalDefenseConstruction) {
-        return toAjax(sysBankPhysicalDefenseConstructionService.updateSysBankPhysicalDefenseConstruction(sysBankPhysicalDefenseConstruction));
-    }
-
-    /**
-     * 删除银行物防建设
-     */
-    @ApiOperation(value = "删除SysBankPhysicalDefenseConstruction")
-    @RequiresPermissions("system:construction:remove")
-    @Log(title = "银行物防建设" , businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids) {
-        return toAjax(sysBankPhysicalDefenseConstructionService.deleteSysBankPhysicalDefenseConstructionByIds(ids));
-    }
-}

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/SysOrgPhysicalDefenseConstructionController.java → soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/SysPhysicalDefenseConstructionController.java

@@ -1,9 +1,5 @@
 package com.xunmei.system.controller;
 
-import java.util.List;
-import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -16,13 +12,12 @@ import org.springframework.web.bind.annotation.RestController;
 import com.xunmei.common.log.annotation.Log;
 import com.xunmei.common.log.enums.BusinessType;
 import com.xunmei.common.security.annotation.RequiresPermissions;
-import com.xunmei.system.domain.SysOrgPhysicalDefenseConstruction;
-import com.xunmei.system.service.ISysOrgPhysicalDefenseConstructionService;
+import com.xunmei.system.domain.SysPhysicalDefenseConstruction;
+import com.xunmei.system.service.ISysPhysicalDefenseConstructionService;
 import com.xunmei.common.core.web.controller.BaseController;
 import com.xunmei.common.core.web.domain.AjaxResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.xunmei.common.core.web.page.TableDataInfo;
 
 /**
@@ -31,65 +26,65 @@ import com.xunmei.common.core.web.page.TableDataInfo;
  * @author xunmei
  * @date 2023-08-16
  */
-@Api(tags = {"SysOrgPhysicalDefenseConstruction"})
+@Api(tags = {"SysPhysicalDefenseConstruction"})
 @RestController
-@RequestMapping("/OrgPhysicalDefenseConstruction")
-public class SysOrgPhysicalDefenseConstructionController extends BaseController {
+@RequestMapping("/PhysicalDefenseConstruction")
+public class SysPhysicalDefenseConstructionController extends BaseController {
     @Autowired
-    private ISysOrgPhysicalDefenseConstructionService sysOrgPhysicalDefenseConstructionService;
+    private ISysPhysicalDefenseConstructionService sysPhysicalDefenseConstructionService;
 
     /**
      * 查询机构物防建设列表
      */
-    @ApiOperation(value = "查询SysOrgPhysicalDefenseConstruction列表")
+    @ApiOperation(value = "查询SysPhysicalDefenseConstruction列表")
     @RequiresPermissions("system:construction:list")
     @GetMapping("/list")
-    public TableDataInfo list(SysOrgPhysicalDefenseConstruction sysOrgPhysicalDefenseConstruction) {
+    public TableDataInfo list(SysPhysicalDefenseConstruction sysPhysicalDefenseConstruction) {
 
-        return sysOrgPhysicalDefenseConstructionService.selectPage(sysOrgPhysicalDefenseConstruction);
+        return sysPhysicalDefenseConstructionService.selectPage(sysPhysicalDefenseConstruction);
     }
 
 
     /**
      * 获取机构物防建设详细信息
      */
-    @ApiOperation(value = "获取SysOrgPhysicalDefenseConstruction详细信息")
+    @ApiOperation(value = "获取SysPhysicalDefenseConstruction详细信息")
     @RequiresPermissions("system:construction:query")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
-        return success(sysOrgPhysicalDefenseConstructionService.selectSysOrgPhysicalDefenseConstructionById(id));
+        return success(sysPhysicalDefenseConstructionService.selectSysPhysicalDefenseConstructionById(id));
     }
 
     /**
      * 新增机构物防建设
      */
-    @ApiOperation(value = "新增SysOrgPhysicalDefenseConstruction")
+    @ApiOperation(value = "新增SysPhysicalDefenseConstruction")
     @RequiresPermissions("system:construction:add")
     @Log(title = "机构物防建设", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody SysOrgPhysicalDefenseConstruction sysOrgPhysicalDefenseConstruction) {
-        return toAjax(sysOrgPhysicalDefenseConstructionService.insertSysOrgPhysicalDefenseConstruction(sysOrgPhysicalDefenseConstruction));
+    public AjaxResult add(@RequestBody SysPhysicalDefenseConstruction sysPhysicalDefenseConstruction) {
+        return toAjax(sysPhysicalDefenseConstructionService.insertSysPhysicalDefenseConstruction(sysPhysicalDefenseConstruction));
     }
 
     /**
      * 修改机构物防建设
      */
-    @ApiOperation(value = "修改SysOrgPhysicalDefenseConstruction")
+    @ApiOperation(value = "修改SysPhysicalDefenseConstruction")
     @RequiresPermissions("system:construction:edit")
     @Log(title = "机构物防建设", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody SysOrgPhysicalDefenseConstruction sysOrgPhysicalDefenseConstruction) {
-        return toAjax(sysOrgPhysicalDefenseConstructionService.updateSysOrgPhysicalDefenseConstruction(sysOrgPhysicalDefenseConstruction));
+    public AjaxResult edit(@RequestBody SysPhysicalDefenseConstruction sysPhysicalDefenseConstruction) {
+        return toAjax(sysPhysicalDefenseConstructionService.updateSysPhysicalDefenseConstruction(sysPhysicalDefenseConstruction));
     }
 
     /**
      * 删除机构物防建设
      */
-    @ApiOperation(value = "删除SysOrgPhysicalDefenseConstruction")
+    @ApiOperation(value = "删除SysPhysicalDefenseConstruction")
     @RequiresPermissions("system:construction:remove")
     @Log(title = "机构物防建设", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids) {
-        return toAjax(sysOrgPhysicalDefenseConstructionService.deleteSysOrgPhysicalDefenseConstructionByIds(ids));
+        return toAjax(sysPhysicalDefenseConstructionService.deleteSysPhysicalDefenseConstructionByIds(ids));
     }
 }

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/domain/SysBankPhysicalDefenseConstruction.java

@@ -1,102 +0,0 @@
-package com.xunmei.system.domain;
-
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import com.xunmei.common.core.web.domain.BaseEntity;
-
-/**
- * 银行物防建设对象 sys_bank_physical_defense_construction
- *
- * @author xunmei
- * @date 2023-08-16
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("sys_bank_physical_defense_construction")
-@ApiModel(value = "SysBankPhysicalDefenseConstruction对象" , description = "银行物防建设")
-public class SysBankPhysicalDefenseConstruction extends BaseEntity
-        {
-private static final long serialVersionUID=1L;
-
-    /** $column.columnComment */
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long id;
-
-    /** 标准 */
-            @ApiModelProperty(value = "标准")
-    private String standard;
-
-    /** 达标日期 */
-            @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-            @ApiModelProperty(value = "达标日期")
-    private Date dateOfCompliance;
-
-    /** 是否证书佐证 */
-            @ApiModelProperty(value = "是否证书佐证")
-    private Long certificateEvidence;
-
-    /** 证书 */
-            @ApiModelProperty(value = "证书")
-    private String certificate;
-
-    /** 佐证 */
-            @ApiModelProperty(value = "佐证")
-    private String evidence;
-
-    /** 机构id */
-            @ApiModelProperty(value = "机构id")
-    private Long orgId;
-
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        
-@Override
-public String toString(){
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-
-
-                .append("id" ,getId())
-
-
-                .append("standard" ,getStandard())
-
-
-                .append("dateOfCompliance" ,getDateOfCompliance())
-
-
-                .append("certificateEvidence" ,getCertificateEvidence())
-
-
-                .append("certificate" ,getCertificate())
-
-
-                .append("evidence" ,getEvidence())
-
-
-                .append("createTime" ,getCreateTime())
-
-
-                .append("updateTime" ,getUpdateTime())
-
-
-                .append("createBy" ,getCreateBy())
-
-
-                .append("updateBy" ,getUpdateBy())
-
-
-                .append("orgId" ,getOrgId())
-        .toString();
-        }
-        }

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/domain/SysOrgPhysicalDefenseConstruction.java → soc-modules/soc-modules-system/src/main/java/com/xunmei/system/domain/SysPhysicalDefenseConstruction.java

@@ -27,8 +27,8 @@ import com.xunmei.common.core.web.domain.BaseEntity;
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
 @TableName("sys_org_physical_defense_construction")
-@ApiModel(value = "SysOrgPhysicalDefenseConstruction对象", description = "机构物防建设")
-public class SysOrgPhysicalDefenseConstruction extends BaseEntity {
+@ApiModel(value = "SysOrgPhysicalDefenseConstruction对象" , description = "机构物防建设")
+public class SysPhysicalDefenseConstruction extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
     /**
@@ -46,7 +46,7 @@ public class SysOrgPhysicalDefenseConstruction extends BaseEntity {
     /**
      * 达标日期
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
     @ApiModelProperty(value = "达标日期")
     private Date dateOfCompliance;
 
@@ -61,6 +61,8 @@ public class SysOrgPhysicalDefenseConstruction extends BaseEntity {
      */
     @ApiModelProperty(value = "证书")
     private String certificate;
+    @ApiModelProperty(value = "物防建设类型:1:机构2:业务库3:在行4:离行")
+    private Long type;
 
     /**
      * 佐证
@@ -80,37 +82,37 @@ public class SysOrgPhysicalDefenseConstruction extends BaseEntity {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
 
 
-                .append("id", getId())
+                .append("id" , getId())
 
 
-                .append("standard", getStandard())
+                .append("standard" , getStandard())
 
 
-                .append("dateOfCompliance", getDateOfCompliance())
+                .append("dateOfCompliance" , getDateOfCompliance())
 
 
-                .append("certificateEvidence", getCertificateEvidence())
+                .append("certificateEvidence" , getCertificateEvidence())
 
 
-                .append("certificate", getCertificate())
+                .append("certificate" , getCertificate())
 
 
-                .append("evidence", getEvidence())
+                .append("evidence" , getEvidence())
 
 
-                .append("createTime", getCreateTime())
+                .append("createTime" , getCreateTime())
 
 
-                .append("updateTime", getUpdateTime())
+                .append("updateTime" , getUpdateTime())
 
 
-                .append("createBy", getCreateBy())
+                .append("createBy" , getCreateBy())
 
 
-                .append("updateBy", getUpdateBy())
+                .append("updateBy" , getUpdateBy())
 
 
-                .append("orgId", getOrgId())
+                .append("orgId" , getOrgId())
                 .toString();
     }
 }

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/mapper/SysBankPhysicalDefenseConstructionMapper.java

@@ -1,62 +0,0 @@
-package com.xunmei.system.mapper;
-
-import java.util.List;
-
-import com.xunmei.system.domain.SysBankPhysicalDefenseConstruction;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * 银行物防建设Mapper接口
- *
- * @author xunmei
- * @date 2023-08-16
- */
-public interface SysBankPhysicalDefenseConstructionMapper extends BaseMapper<SysBankPhysicalDefenseConstruction> {
-    /**
-     * 查询银行物防建设
-     *
-     * @param id 银行物防建设主键
-     * @return 银行物防建设
-     */
-    public SysBankPhysicalDefenseConstruction selectSysBankPhysicalDefenseConstructionById(Long id);
-
-    /**
-     * 查询银行物防建设列表
-     *
-     * @param sysBankPhysicalDefenseConstruction 银行物防建设
-     * @return 银行物防建设集合
-     */
-    public List<SysBankPhysicalDefenseConstruction> selectSysBankPhysicalDefenseConstructionList(SysBankPhysicalDefenseConstruction sysBankPhysicalDefenseConstruction);
-
-    /**
-     * 新增银行物防建设
-     *
-     * @param sysBankPhysicalDefenseConstruction 银行物防建设
-     * @return 结果
-     */
-    public int insertSysBankPhysicalDefenseConstruction(SysBankPhysicalDefenseConstruction sysBankPhysicalDefenseConstruction);
-
-    /**
-     * 修改银行物防建设
-     *
-     * @param sysBankPhysicalDefenseConstruction 银行物防建设
-     * @return 结果
-     */
-    public int updateSysBankPhysicalDefenseConstruction(SysBankPhysicalDefenseConstruction sysBankPhysicalDefenseConstruction);
-
-    /**
-     * 删除银行物防建设
-     *
-     * @param id 银行物防建设主键
-     * @return 结果
-     */
-    public int deleteSysBankPhysicalDefenseConstructionById(Long id);
-
-    /**
-     * 批量删除银行物防建设
-     *
-     * @param ids 需要删除的数据主键集合
-     * @return 结果
-     */
-    public int deleteSysBankPhysicalDefenseConstructionByIds(Long[] ids);
-}

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/mapper/SysOrgPhysicalDefenseConstructionMapper.java → soc-modules/soc-modules-system/src/main/java/com/xunmei/system/mapper/SysPhysicalDefenseConstructionMapper.java

@@ -2,7 +2,7 @@ package com.xunmei.system.mapper;
 
 import java.util.List;
 
-import com.xunmei.system.domain.SysOrgPhysicalDefenseConstruction;
+import com.xunmei.system.domain.SysPhysicalDefenseConstruction;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
@@ -11,38 +11,38 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author xunmei
  * @date 2023-08-16
  */
-public interface SysOrgPhysicalDefenseConstructionMapper extends BaseMapper<SysOrgPhysicalDefenseConstruction> {
+public interface SysPhysicalDefenseConstructionMapper extends BaseMapper<SysPhysicalDefenseConstruction> {
     /**
      * 查询机构物防建设
      *
      * @param id 机构物防建设主键
      * @return 机构物防建设
      */
-    public SysOrgPhysicalDefenseConstruction selectSysOrgPhysicalDefenseConstructionById(Long id);
+    public SysPhysicalDefenseConstruction selectSysOrgPhysicalDefenseConstructionById(Long id);
 
     /**
      * 查询机构物防建设列表
      *
-     * @param sysOrgPhysicalDefenseConstruction 机构物防建设
+     * @param sysPhysicalDefenseConstruction 机构物防建设
      * @return 机构物防建设集合
      */
-    public List<SysOrgPhysicalDefenseConstruction> selectSysOrgPhysicalDefenseConstructionList(SysOrgPhysicalDefenseConstruction sysOrgPhysicalDefenseConstruction);
+    public List<SysPhysicalDefenseConstruction> selectSysOrgPhysicalDefenseConstructionList(SysPhysicalDefenseConstruction sysPhysicalDefenseConstruction);
 
     /**
      * 新增机构物防建设
      *
-     * @param sysOrgPhysicalDefenseConstruction 机构物防建设
+     * @param sysPhysicalDefenseConstruction 机构物防建设
      * @return 结果
      */
-    public int insertSysOrgPhysicalDefenseConstruction(SysOrgPhysicalDefenseConstruction sysOrgPhysicalDefenseConstruction);
+    public int insertSysOrgPhysicalDefenseConstruction(SysPhysicalDefenseConstruction sysPhysicalDefenseConstruction);
 
     /**
      * 修改机构物防建设
      *
-     * @param sysOrgPhysicalDefenseConstruction 机构物防建设
+     * @param sysPhysicalDefenseConstruction 机构物防建设
      * @return 结果
      */
-    public int updateSysOrgPhysicalDefenseConstruction(SysOrgPhysicalDefenseConstruction sysOrgPhysicalDefenseConstruction);
+    public int updateSysOrgPhysicalDefenseConstruction(SysPhysicalDefenseConstruction sysPhysicalDefenseConstruction);
 
     /**
      * 删除机构物防建设

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/ISysBankPhysicalDefenseConstructionService.java

@@ -1,72 +0,0 @@
-package com.xunmei.system.service;
-
-import java.util.List;
-
-import com.xunmei.system.domain.SysBankPhysicalDefenseConstruction;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.xunmei.common.core.web.page.TableDataInfo;
-
-/**
- * 银行物防建设Service接口
- *
- * @author xunmei
- * @date 2023-08-16
- */
-public interface ISysBankPhysicalDefenseConstructionService extends IService<SysBankPhysicalDefenseConstruction> {
-    /**
-     * 查询银行物防建设
-     *
-     * @param id 银行物防建设主键
-     * @return 银行物防建设
-     */
-    public SysBankPhysicalDefenseConstruction selectSysBankPhysicalDefenseConstructionById(Long id);
-
-    /**
-     * 查询银行物防建设列表
-     *
-     * @param sysBankPhysicalDefenseConstruction 银行物防建设
-     * @return 银行物防建设集合
-     */
-    public List<SysBankPhysicalDefenseConstruction> selectSysBankPhysicalDefenseConstructionList(SysBankPhysicalDefenseConstruction sysBankPhysicalDefenseConstruction);
-
-    /**
-     * 新增银行物防建设
-     *
-     * @param sysBankPhysicalDefenseConstruction 银行物防建设
-     * @return 结果
-     */
-    public int insertSysBankPhysicalDefenseConstruction(SysBankPhysicalDefenseConstruction sysBankPhysicalDefenseConstruction);
-
-    /**
-     * 修改银行物防建设
-     *
-     * @param sysBankPhysicalDefenseConstruction 银行物防建设
-     * @return 结果
-     */
-    public int updateSysBankPhysicalDefenseConstruction(SysBankPhysicalDefenseConstruction sysBankPhysicalDefenseConstruction);
-
-    /**
-     * 批量删除银行物防建设
-     *
-     * @param ids 需要删除的银行物防建设主键集合
-     * @return 结果
-     */
-    public int deleteSysBankPhysicalDefenseConstructionByIds(Long[] ids);
-
-    /**
-     * 删除银行物防建设信息
-     *
-     * @param id 银行物防建设主键
-     * @return 结果
-     */
-    public int deleteSysBankPhysicalDefenseConstructionById(Long id);
-
-    /**
-     * 查询银行物防建设分页数据
-     *
-     * @param sysBankPhysicalDefenseConstruction 查询条件对象
-     * @return Page
-     */
-    public TableDataInfo selectPage(SysBankPhysicalDefenseConstruction sysBankPhysicalDefenseConstruction);
-}

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/ISysOrgPhysicalDefenseConstructionService.java

@@ -1,72 +0,0 @@
-package com.xunmei.system.service;
-
-import java.util.List;
-
-import com.xunmei.system.domain.SysOrgPhysicalDefenseConstruction;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.xunmei.common.core.web.page.TableDataInfo;
-
-/**
- * 机构物防建设Service接口
- *
- * @author xunmei
- * @date 2023-08-16
- */
-public interface ISysOrgPhysicalDefenseConstructionService extends IService<SysOrgPhysicalDefenseConstruction> {
-    /**
-     * 查询机构物防建设
-     *
-     * @param id 机构物防建设主键
-     * @return 机构物防建设
-     */
-    public SysOrgPhysicalDefenseConstruction selectSysOrgPhysicalDefenseConstructionById(Long id);
-
-    /**
-     * 查询机构物防建设列表
-     *
-     * @param sysOrgPhysicalDefenseConstruction 机构物防建设
-     * @return 机构物防建设集合
-     */
-    public List<SysOrgPhysicalDefenseConstruction> selectSysOrgPhysicalDefenseConstructionList(SysOrgPhysicalDefenseConstruction sysOrgPhysicalDefenseConstruction);
-
-    /**
-     * 新增机构物防建设
-     *
-     * @param sysOrgPhysicalDefenseConstruction 机构物防建设
-     * @return 结果
-     */
-    public int insertSysOrgPhysicalDefenseConstruction(SysOrgPhysicalDefenseConstruction sysOrgPhysicalDefenseConstruction);
-
-    /**
-     * 修改机构物防建设
-     *
-     * @param sysOrgPhysicalDefenseConstruction 机构物防建设
-     * @return 结果
-     */
-    public int updateSysOrgPhysicalDefenseConstruction(SysOrgPhysicalDefenseConstruction sysOrgPhysicalDefenseConstruction);
-
-    /**
-     * 批量删除机构物防建设
-     *
-     * @param ids 需要删除的机构物防建设主键集合
-     * @return 结果
-     */
-    public int deleteSysOrgPhysicalDefenseConstructionByIds(Long[] ids);
-
-    /**
-     * 删除机构物防建设信息
-     *
-     * @param id 机构物防建设主键
-     * @return 结果
-     */
-    public int deleteSysOrgPhysicalDefenseConstructionById(Long id);
-
-    /**
-     * 查询机构物防建设分页数据
-     *
-     * @param sysOrgPhysicalDefenseConstruction 查询条件对象
-     * @return Page
-     */
-    public TableDataInfo selectPage(SysOrgPhysicalDefenseConstruction sysOrgPhysicalDefenseConstruction);
-}

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/ISysPhysicalDefenseConstructionService.java

@@ -0,0 +1,71 @@
+package com.xunmei.system.service;
+
+import java.util.List;
+
+import com.xunmei.system.domain.SysPhysicalDefenseConstruction;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.xunmei.common.core.web.page.TableDataInfo;
+
+/**
+ * 机构物防建设Service接口
+ *
+ * @author xunmei
+ * @date 2023-08-16
+ */
+public interface ISysPhysicalDefenseConstructionService extends IService<SysPhysicalDefenseConstruction> {
+    /**
+     * 查询机构物防建设
+     *
+     * @param id 机构物防建设主键
+     * @return 机构物防建设
+     */
+    public SysPhysicalDefenseConstruction selectSysPhysicalDefenseConstructionById(Long id);
+
+    /**
+     * 查询机构物防建设列表
+     *
+     * @param sysPhysicalDefenseConstruction 机构物防建设
+     * @return 机构物防建设集合
+     */
+    public List<SysPhysicalDefenseConstruction> selectSysPhysicalDefenseConstructionList(SysPhysicalDefenseConstruction sysPhysicalDefenseConstruction);
+
+    /**
+     * 新增机构物防建设
+     *
+     * @param sysPhysicalDefenseConstruction 机构物防建设
+     * @return 结果
+     */
+    public int insertSysPhysicalDefenseConstruction(SysPhysicalDefenseConstruction sysPhysicalDefenseConstruction);
+
+    /**
+     * 修改机构物防建设
+     *
+     * @param sysPhysicalDefenseConstruction 机构物防建设
+     * @return 结果
+     */
+    public int updateSysPhysicalDefenseConstruction(SysPhysicalDefenseConstruction sysPhysicalDefenseConstruction);
+
+    /**
+     * 批量删除机构物防建设
+     *
+     * @param ids 需要删除的机构物防建设主键集合
+     * @return 结果
+     */
+    public int deleteSysPhysicalDefenseConstructionByIds(Long[] ids);
+
+    /**
+     * 删除机构物防建设信息
+     *
+     * @param id 机构物防建设主键
+     * @return 结果
+     */
+    public int deleteSysPhysicalDefenseConstructionById(Long id);
+
+    /**
+     * 查询机构物防建设分页数据
+     *
+     * @param sysPhysicalDefenseConstruction 查询条件对象
+     * @return Page
+     */
+    public TableDataInfo selectPage(SysPhysicalDefenseConstruction sysPhysicalDefenseConstruction);
+}

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/SysBankPhysicalDefenseConstructionServiceImpl.java

@@ -1,143 +0,0 @@
-package com.xunmei.system.service.impl;
-
-import java.util.List;
-        import com.xunmei.common.core.utils.DateUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.xunmei.system.service.ISysOrgService;
-import java.util.Arrays;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.xunmei.common.core.web.page.TableDataInfo;
-import com.xunmei.system.mapper.SysBankPhysicalDefenseConstructionMapper;
-import com.xunmei.system.domain.SysBankPhysicalDefenseConstruction;
-import com.xunmei.system.service.ISysBankPhysicalDefenseConstructionService;
-
-/**
- * 银行物防建设Service业务层处理
- *
- * @author xunmei
- * @date 2023-08-16
- */
-@Service
-public class SysBankPhysicalDefenseConstructionServiceImpl extends ServiceImpl<SysBankPhysicalDefenseConstructionMapper, SysBankPhysicalDefenseConstruction> implements ISysBankPhysicalDefenseConstructionService {
-    @Autowired
-    private SysBankPhysicalDefenseConstructionMapper sysBankPhysicalDefenseConstructionMapper;
-    @Autowired
-    private ISysOrgService orgService;
-
-    @Override
-    public TableDataInfo selectPage(SysBankPhysicalDefenseConstruction sysBankPhysicalDefenseConstruction) {
-
-
-
-
-        //未删除
-//        sysBankPhysicalDefenseConstruction.setDeleted(0L);
-        Page<SysBankPhysicalDefenseConstruction> page;
-        //分页
-        if (sysBankPhysicalDefenseConstruction.getPageNum()!=null&&sysBankPhysicalDefenseConstruction.getPageSize()!=null)
-        {
-            page = new Page<>(sysBankPhysicalDefenseConstruction.getPageNum(), sysBankPhysicalDefenseConstruction.getPageSize());
-        }else{
-            page = new Page<>();
-        }
-        //查询条件
-        QueryWrapper<SysBankPhysicalDefenseConstruction> query = new QueryWrapper<>(sysBankPhysicalDefenseConstruction);
-        //下穿
-        if (sysBankPhysicalDefenseConstruction.getCheckSub()){
-            List<Long> ids = orgService.selectCheckSubOrgIdList(sysBankPhysicalDefenseConstruction.getOrgId());
-            //清空前端传递的org_id
-            sysBankPhysicalDefenseConstruction.setOrgId(null);
-            //添加in条件
-            query.in("org_id",ids);
-        }
-        //时间范围查询
-        if (sysBankPhysicalDefenseConstruction.getParams().get("beginTime")!=null&&sysBankPhysicalDefenseConstruction.getParams().get("endTime")!=null){
-            query.between("create_time", sysBankPhysicalDefenseConstruction.getParams().get("beginTime"), sysBankPhysicalDefenseConstruction.getParams().get("endTime"));
-        }
-        //获取数据
-        page = sysBankPhysicalDefenseConstructionMapper.selectPage(page, query);
-        //抓换为TableDataInfo适配前端
-        TableDataInfo tableDataInfo = new TableDataInfo();
-        tableDataInfo.setMsg("操作成功");
-        tableDataInfo.setCode(200);
-        tableDataInfo.setTotal(page.getTotal());
-        tableDataInfo.setRows(page.getRecords());
-        return tableDataInfo;
-
-
-
-
-    }
-
-
-    /**
-     * 查询银行物防建设
-     *
-     * @param id 银行物防建设主键
-     * @return 银行物防建设
-     */
-    @Override
-    public SysBankPhysicalDefenseConstruction selectSysBankPhysicalDefenseConstructionById(Long id) {
-        return sysBankPhysicalDefenseConstructionMapper.selectById(id);
-    }
-
-    /**
-     * 查询银行物防建设列表
-     *
-     * @param sysBankPhysicalDefenseConstruction 银行物防建设
-     * @return 银行物防建设
-     */
-    @Override
-    public List<SysBankPhysicalDefenseConstruction> selectSysBankPhysicalDefenseConstructionList(SysBankPhysicalDefenseConstruction sysBankPhysicalDefenseConstruction) {
-        return sysBankPhysicalDefenseConstructionMapper.selectList(new QueryWrapper<>(sysBankPhysicalDefenseConstruction));
-    }
-
-    /**
-     * 新增银行物防建设
-     *
-     * @param sysBankPhysicalDefenseConstruction 银行物防建设
-     * @return 结果
-     */
-    @Override
-    public int insertSysBankPhysicalDefenseConstruction(SysBankPhysicalDefenseConstruction sysBankPhysicalDefenseConstruction) {
-                sysBankPhysicalDefenseConstruction.setCreateTime(DateUtils.getNowDate());
-            return sysBankPhysicalDefenseConstructionMapper.insert(sysBankPhysicalDefenseConstruction);
-    }
-
-    /**
-     * 修改银行物防建设
-     *
-     * @param sysBankPhysicalDefenseConstruction 银行物防建设
-     * @return 结果
-     */
-    @Override
-    public int updateSysBankPhysicalDefenseConstruction(SysBankPhysicalDefenseConstruction sysBankPhysicalDefenseConstruction) {
-                sysBankPhysicalDefenseConstruction.setUpdateTime(DateUtils.getNowDate());
-        return sysBankPhysicalDefenseConstructionMapper.updateById(sysBankPhysicalDefenseConstruction);
-    }
-
-    /**
-     * 批量删除银行物防建设
-     *
-     * @param ids 需要删除的银行物防建设主键
-     * @return 结果
-     */
-    @Override
-    public int deleteSysBankPhysicalDefenseConstructionByIds(Long[] ids) {
-        return sysBankPhysicalDefenseConstructionMapper.deleteBatchIds(Arrays.asList((ids)));
-    }
-
-    /**
-     * 删除银行物防建设信息
-     *
-     * @param id 银行物防建设主键
-     * @return 结果
-     */
-    @Override
-    public int deleteSysBankPhysicalDefenseConstructionById(Long id) {
-        return sysBankPhysicalDefenseConstructionMapper.deleteById(id);
-    }
-}

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/SysOrgPhysicalDefenseConstructionServiceImpl.java

@@ -1,141 +0,0 @@
-package com.xunmei.system.service.impl;
-
-import java.util.List;
-
-import com.xunmei.common.core.utils.DateUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.xunmei.system.service.ISysOrgService;
-
-import java.util.Arrays;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.xunmei.common.core.web.page.TableDataInfo;
-import com.xunmei.system.mapper.SysOrgPhysicalDefenseConstructionMapper;
-import com.xunmei.system.domain.SysOrgPhysicalDefenseConstruction;
-import com.xunmei.system.service.ISysOrgPhysicalDefenseConstructionService;
-
-/**
- * 机构物防建设Service业务层处理
- *
- * @author xunmei
- * @date 2023-08-16
- */
-@Service
-public class SysOrgPhysicalDefenseConstructionServiceImpl extends ServiceImpl<SysOrgPhysicalDefenseConstructionMapper, SysOrgPhysicalDefenseConstruction> implements ISysOrgPhysicalDefenseConstructionService {
-    @Autowired
-    private SysOrgPhysicalDefenseConstructionMapper sysOrgPhysicalDefenseConstructionMapper;
-    @Autowired
-    private ISysOrgService orgService;
-
-    @Override
-    public TableDataInfo selectPage(SysOrgPhysicalDefenseConstruction sysOrgPhysicalDefenseConstruction) {
-
-
-        //未删除
-//        sysOrgPhysicalDefenseConstruction.setDeleted(0L);
-        Page<SysOrgPhysicalDefenseConstruction> page;
-        //分页
-        if (sysOrgPhysicalDefenseConstruction.getPageNum() != null && sysOrgPhysicalDefenseConstruction.getPageSize() != null) {
-            page = new Page<>(sysOrgPhysicalDefenseConstruction.getPageNum(), sysOrgPhysicalDefenseConstruction.getPageSize());
-        } else {
-            page = new Page<>();
-        }
-        //查询条件
-        QueryWrapper<SysOrgPhysicalDefenseConstruction> query = new QueryWrapper<>(sysOrgPhysicalDefenseConstruction);
-        //下穿
-        if (sysOrgPhysicalDefenseConstruction.getCheckSub()) {
-            List<Long> ids = orgService.selectCheckSubOrgIdList(sysOrgPhysicalDefenseConstruction.getOrgId());
-            //清空前端传递的org_id
-            sysOrgPhysicalDefenseConstruction.setOrgId(null);
-            //添加in条件
-            query.in("org_id", ids);
-        }
-        //时间范围查询
-        if (sysOrgPhysicalDefenseConstruction.getParams().get("beginTime") != null && sysOrgPhysicalDefenseConstruction.getParams().get("endTime") != null) {
-            query.between("create_time", sysOrgPhysicalDefenseConstruction.getParams().get("beginTime"), sysOrgPhysicalDefenseConstruction.getParams().get("endTime"));
-        }
-        //获取数据
-        page = sysOrgPhysicalDefenseConstructionMapper.selectPage(page, query);
-        //抓换为TableDataInfo适配前端
-        TableDataInfo tableDataInfo = new TableDataInfo();
-        tableDataInfo.setMsg("操作成功");
-        tableDataInfo.setCode(200);
-        tableDataInfo.setTotal(page.getTotal());
-        tableDataInfo.setRows(page.getRecords());
-        return tableDataInfo;
-
-
-    }
-
-
-    /**
-     * 查询机构物防建设
-     *
-     * @param id 机构物防建设主键
-     * @return 机构物防建设
-     */
-    @Override
-    public SysOrgPhysicalDefenseConstruction selectSysOrgPhysicalDefenseConstructionById(Long id) {
-        return sysOrgPhysicalDefenseConstructionMapper.selectById(id);
-    }
-
-    /**
-     * 查询机构物防建设列表
-     *
-     * @param sysOrgPhysicalDefenseConstruction 机构物防建设
-     * @return 机构物防建设
-     */
-    @Override
-    public List<SysOrgPhysicalDefenseConstruction> selectSysOrgPhysicalDefenseConstructionList(SysOrgPhysicalDefenseConstruction sysOrgPhysicalDefenseConstruction) {
-        return sysOrgPhysicalDefenseConstructionMapper.selectList(new QueryWrapper<>(sysOrgPhysicalDefenseConstruction));
-    }
-
-    /**
-     * 新增机构物防建设
-     *
-     * @param sysOrgPhysicalDefenseConstruction 机构物防建设
-     * @return 结果
-     */
-    @Override
-    public int insertSysOrgPhysicalDefenseConstruction(SysOrgPhysicalDefenseConstruction sysOrgPhysicalDefenseConstruction) {
-        sysOrgPhysicalDefenseConstruction.setCreateTime(DateUtils.getNowDate());
-        return sysOrgPhysicalDefenseConstructionMapper.insert(sysOrgPhysicalDefenseConstruction);
-    }
-
-    /**
-     * 修改机构物防建设
-     *
-     * @param sysOrgPhysicalDefenseConstruction 机构物防建设
-     * @return 结果
-     */
-    @Override
-    public int updateSysOrgPhysicalDefenseConstruction(SysOrgPhysicalDefenseConstruction sysOrgPhysicalDefenseConstruction) {
-        sysOrgPhysicalDefenseConstruction.setUpdateTime(DateUtils.getNowDate());
-        return sysOrgPhysicalDefenseConstructionMapper.updateById(sysOrgPhysicalDefenseConstruction);
-    }
-
-    /**
-     * 批量删除机构物防建设
-     *
-     * @param ids 需要删除的机构物防建设主键
-     * @return 结果
-     */
-    @Override
-    public int deleteSysOrgPhysicalDefenseConstructionByIds(Long[] ids) {
-        return sysOrgPhysicalDefenseConstructionMapper.deleteBatchIds(Arrays.asList((ids)));
-    }
-
-    /**
-     * 删除机构物防建设信息
-     *
-     * @param id 机构物防建设主键
-     * @return 结果
-     */
-    @Override
-    public int deleteSysOrgPhysicalDefenseConstructionById(Long id) {
-        return sysOrgPhysicalDefenseConstructionMapper.deleteById(id);
-    }
-}

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/SysPhysicalDefenseConstructionServiceImpl.java

@@ -0,0 +1,141 @@
+package com.xunmei.system.service.impl;
+
+import java.util.List;
+
+import com.xunmei.common.core.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.xunmei.system.service.ISysOrgService;
+
+import java.util.Arrays;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.xunmei.common.core.web.page.TableDataInfo;
+import com.xunmei.system.mapper.SysPhysicalDefenseConstructionMapper;
+import com.xunmei.system.domain.SysPhysicalDefenseConstruction;
+import com.xunmei.system.service.ISysPhysicalDefenseConstructionService;
+
+/**
+ * 机构物防建设Service业务层处理
+ *
+ * @author xunmei
+ * @date 2023-08-16
+ */
+@Service
+public class SysPhysicalDefenseConstructionServiceImpl extends ServiceImpl<SysPhysicalDefenseConstructionMapper, SysPhysicalDefenseConstruction> implements ISysPhysicalDefenseConstructionService {
+    @Autowired
+    private SysPhysicalDefenseConstructionMapper sysPhysicalDefenseConstructionMapper;
+    @Autowired
+    private ISysOrgService orgService;
+
+    @Override
+    public TableDataInfo selectPage(SysPhysicalDefenseConstruction sysPhysicalDefenseConstruction) {
+
+
+        //未删除
+//        sysPhysicalDefenseConstruction.setDeleted(0L);
+        Page<SysPhysicalDefenseConstruction> page;
+        //分页
+        if (sysPhysicalDefenseConstruction.getPageNum() != null && sysPhysicalDefenseConstruction.getPageSize() != null) {
+            page = new Page<>(sysPhysicalDefenseConstruction.getPageNum(), sysPhysicalDefenseConstruction.getPageSize());
+        } else {
+            page = new Page<>();
+        }
+        //查询条件
+        QueryWrapper<SysPhysicalDefenseConstruction> query = new QueryWrapper<>(sysPhysicalDefenseConstruction);
+        //下穿
+        if (sysPhysicalDefenseConstruction.getCheckSub()) {
+            List<Long> ids = orgService.selectCheckSubOrgIdList(sysPhysicalDefenseConstruction.getOrgId());
+            //清空前端传递的org_id
+            sysPhysicalDefenseConstruction.setOrgId(null);
+            //添加in条件
+            query.in("org_id", ids);
+        }
+        //时间范围查询
+        if (sysPhysicalDefenseConstruction.getParams().get("beginTime") != null && sysPhysicalDefenseConstruction.getParams().get("endTime") != null) {
+            query.between("create_time", sysPhysicalDefenseConstruction.getParams().get("beginTime"), sysPhysicalDefenseConstruction.getParams().get("endTime"));
+        }
+        //获取数据
+        page = sysPhysicalDefenseConstructionMapper.selectPage(page, query);
+        //抓换为TableDataInfo适配前端
+        TableDataInfo tableDataInfo = new TableDataInfo();
+        tableDataInfo.setMsg("操作成功");
+        tableDataInfo.setCode(200);
+        tableDataInfo.setTotal(page.getTotal());
+        tableDataInfo.setRows(page.getRecords());
+        return tableDataInfo;
+
+
+    }
+
+
+    /**
+     * 查询机构物防建设
+     *
+     * @param id 机构物防建设主键
+     * @return 机构物防建设
+     */
+    @Override
+    public SysPhysicalDefenseConstruction selectSysPhysicalDefenseConstructionById(Long id) {
+        return sysPhysicalDefenseConstructionMapper.selectById(id);
+    }
+
+    /**
+     * 查询机构物防建设列表
+     *
+     * @param sysPhysicalDefenseConstruction 机构物防建设
+     * @return 机构物防建设
+     */
+    @Override
+    public List<SysPhysicalDefenseConstruction> selectSysPhysicalDefenseConstructionList(SysPhysicalDefenseConstruction sysPhysicalDefenseConstruction) {
+        return sysPhysicalDefenseConstructionMapper.selectList(new QueryWrapper<>(sysPhysicalDefenseConstruction));
+    }
+
+    /**
+     * 新增机构物防建设
+     *
+     * @param sysPhysicalDefenseConstruction 机构物防建设
+     * @return 结果
+     */
+    @Override
+    public int insertSysPhysicalDefenseConstruction(SysPhysicalDefenseConstruction sysPhysicalDefenseConstruction) {
+        sysPhysicalDefenseConstruction.setCreateTime(DateUtils.getNowDate());
+        return sysPhysicalDefenseConstructionMapper.insert(sysPhysicalDefenseConstruction);
+    }
+
+    /**
+     * 修改机构物防建设
+     *
+     * @param sysPhysicalDefenseConstruction 机构物防建设
+     * @return 结果
+     */
+    @Override
+    public int updateSysPhysicalDefenseConstruction(SysPhysicalDefenseConstruction sysPhysicalDefenseConstruction) {
+        sysPhysicalDefenseConstruction.setUpdateTime(DateUtils.getNowDate());
+        return sysPhysicalDefenseConstructionMapper.updateById(sysPhysicalDefenseConstruction);
+    }
+
+    /**
+     * 批量删除机构物防建设
+     *
+     * @param ids 需要删除的机构物防建设主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSysPhysicalDefenseConstructionByIds(Long[] ids) {
+        return sysPhysicalDefenseConstructionMapper.deleteBatchIds(Arrays.asList((ids)));
+    }
+
+    /**
+     * 删除机构物防建设信息
+     *
+     * @param id 机构物防建设主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSysPhysicalDefenseConstructionById(Long id) {
+        return sysPhysicalDefenseConstructionMapper.deleteById(id);
+    }
+}

soc-modules/soc-modules-system/src/main/resources/mapper/system/SysBankPhysicalDefenseConstructionMapper.xml

@@ -1,157 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xunmei.system.mapper.SysBankPhysicalDefenseConstructionMapper">
-
-    <resultMap type="com.xunmei.system.domain.SysBankPhysicalDefenseConstruction" id="SysBankPhysicalDefenseConstructionResult">
-                <result property="id" column="id"/>
-                <result property="standard" column="standard"/>
-                <result property="dateOfCompliance" column="date_of_compliance"/>
-                <result property="certificateEvidence" column="certificate_evidence"/>
-                <result property="certificate" column="certificate"/>
-                <result property="evidence" column="evidence"/>
-                <result property="createTime" column="create_time"/>
-                <result property="updateTime" column="update_time"/>
-                <result property="createBy" column="create_by"/>
-                <result property="updateBy" column="update_by"/>
-                <result property="orgId" column="org_id"/>
-    </resultMap>
-
-    <sql id="selectSysBankPhysicalDefenseConstructionVo">
-        select id, standard, date_of_compliance, certificate_evidence, certificate, evidence, create_time, update_time, create_by, update_by, org_id
-        from sys_bank_physical_defense_construction
-    </sql>
-
-    <select id="selectSysBankPhysicalDefenseConstructionList" parameterType="com.xunmei.system.domain.SysBankPhysicalDefenseConstruction"
-            resultMap="SysBankPhysicalDefenseConstructionResult">
-        <include refid="selectSysBankPhysicalDefenseConstructionVo"/>
-        <where>
-                        <if test="standard != null  and standard != ''">
-                            and standard = #{standard}
-                        </if>
-                        <if test="dateOfCompliance != null ">
-                            and date_of_compliance = #{dateOfCompliance}
-                        </if>
-                        <if test="certificateEvidence != null ">
-                            and certificate_evidence = #{certificateEvidence}
-                        </if>
-                        <if test="certificate != null  and certificate != ''">
-                            and certificate = #{certificate}
-                        </if>
-                        <if test="evidence != null  and evidence != ''">
-                            and evidence = #{evidence}
-                        </if>
-                        <if test="orgId != null ">
-                            and org_id = #{orgId}
-                        </if>
-        </where>
-    </select>
-
-    <select id="selectSysBankPhysicalDefenseConstructionById" parameterType="Long"
-            resultMap="SysBankPhysicalDefenseConstructionResult">
-            <include refid="selectSysBankPhysicalDefenseConstructionVo"/>
-            where id = #{id}
-    </select>
-
-    <insert id="insertSysBankPhysicalDefenseConstruction" parameterType="com.xunmei.system.domain.SysBankPhysicalDefenseConstruction">
-        insert into sys_bank_physical_defense_construction
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-                    <if test="id != null">id,
-                    </if>
-                    <if test="standard != null">standard,
-                    </if>
-                    <if test="dateOfCompliance != null">date_of_compliance,
-                    </if>
-                    <if test="certificateEvidence != null">certificate_evidence,
-                    </if>
-                    <if test="certificate != null">certificate,
-                    </if>
-                    <if test="evidence != null">evidence,
-                    </if>
-                    <if test="createTime != null">create_time,
-                    </if>
-                    <if test="updateTime != null">update_time,
-                    </if>
-                    <if test="createBy != null">create_by,
-                    </if>
-                    <if test="updateBy != null">update_by,
-                    </if>
-                    <if test="orgId != null">org_id,
-                    </if>
-        </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-                    <if test="id != null">#{id},
-                    </if>
-                    <if test="standard != null">#{standard},
-                    </if>
-                    <if test="dateOfCompliance != null">#{dateOfCompliance},
-                    </if>
-                    <if test="certificateEvidence != null">#{certificateEvidence},
-                    </if>
-                    <if test="certificate != null">#{certificate},
-                    </if>
-                    <if test="evidence != null">#{evidence},
-                    </if>
-                    <if test="createTime != null">#{createTime},
-                    </if>
-                    <if test="updateTime != null">#{updateTime},
-                    </if>
-                    <if test="createBy != null">#{createBy},
-                    </if>
-                    <if test="updateBy != null">#{updateBy},
-                    </if>
-                    <if test="orgId != null">#{orgId},
-                    </if>
-        </trim>
-    </insert>
-
-    <update id="updateSysBankPhysicalDefenseConstruction" parameterType="com.xunmei.system.domain.SysBankPhysicalDefenseConstruction">
-        update sys_bank_physical_defense_construction
-        <trim prefix="SET" suffixOverrides=",">
-                    <if test="standard != null">standard =
-                        #{standard},
-                    </if>
-                    <if test="dateOfCompliance != null">date_of_compliance =
-                        #{dateOfCompliance},
-                    </if>
-                    <if test="certificateEvidence != null">certificate_evidence =
-                        #{certificateEvidence},
-                    </if>
-                    <if test="certificate != null">certificate =
-                        #{certificate},
-                    </if>
-                    <if test="evidence != null">evidence =
-                        #{evidence},
-                    </if>
-                    <if test="createTime != null">create_time =
-                        #{createTime},
-                    </if>
-                    <if test="updateTime != null">update_time =
-                        #{updateTime},
-                    </if>
-                    <if test="createBy != null">create_by =
-                        #{createBy},
-                    </if>
-                    <if test="updateBy != null">update_by =
-                        #{updateBy},
-                    </if>
-                    <if test="orgId != null">org_id =
-                        #{orgId},
-                    </if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deleteSysBankPhysicalDefenseConstructionById" parameterType="Long">
-        delete
-        from sys_bank_physical_defense_construction where id = #{id}
-    </delete>
-
-    <delete id="deleteSysBankPhysicalDefenseConstructionByIds" parameterType="String">
-        delete from sys_bank_physical_defense_construction where id in
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-</mapper>

soc-modules/soc-modules-system/src/main/resources/mapper/system/SysOrgPhysicalDefenseConstructionMapper.xml → soc-modules/soc-modules-system/src/main/resources/mapper/system/SysPhysicalDefenseConstructionMapper.xml

@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xunmei.system.mapper.SysOrgPhysicalDefenseConstructionMapper">
+<mapper namespace="com.xunmei.system.mapper.SysPhysicalDefenseConstructionMapper">
 
-    <resultMap type="com.xunmei.system.domain.SysOrgPhysicalDefenseConstruction" id="SysOrgPhysicalDefenseConstructionResult">
+    <resultMap type="com.xunmei.system.domain.SysPhysicalDefenseConstruction" id="SysOrgPhysicalDefenseConstructionResult">
                 <result property="id" column="id"/>
                 <result property="standard" column="standard"/>
                 <result property="dateOfCompliance" column="date_of_compliance"/>
@@ -23,7 +23,7 @@
         from sys_org_physical_defense_construction
     </sql>
 
-    <select id="selectSysOrgPhysicalDefenseConstructionList" parameterType="com.xunmei.system.domain.SysOrgPhysicalDefenseConstruction"
+    <select id="selectSysOrgPhysicalDefenseConstructionList" parameterType="com.xunmei.system.domain.SysPhysicalDefenseConstruction"
             resultMap="SysOrgPhysicalDefenseConstructionResult">
         <include refid="selectSysOrgPhysicalDefenseConstructionVo"/>
         <where>
@@ -54,7 +54,7 @@
             where id = #{id}
     </select>
 
-    <insert id="insertSysOrgPhysicalDefenseConstruction" parameterType="com.xunmei.system.domain.SysOrgPhysicalDefenseConstruction">
+    <insert id="insertSysOrgPhysicalDefenseConstruction" parameterType="com.xunmei.system.domain.SysPhysicalDefenseConstruction">
         insert into sys_org_physical_defense_construction
         <trim prefix="(" suffix=")" suffixOverrides=",">
                     <if test="id != null">id,
@@ -106,7 +106,7 @@
         </trim>
     </insert>
 
-    <update id="updateSysOrgPhysicalDefenseConstruction" parameterType="com.xunmei.system.domain.SysOrgPhysicalDefenseConstruction">
+    <update id="updateSysOrgPhysicalDefenseConstruction" parameterType="com.xunmei.system.domain.SysPhysicalDefenseConstruction">
         update sys_org_physical_defense_construction
         <trim prefix="SET" suffixOverrides=",">
                     <if test="standard != null">standard =