Merge branch 'V0.0.1' of http://10.87.10.227:4000/jzyd_yyds/soc into V0.0.1

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/controller/CoreMonitoringTaskMonitorInfoController.java

@@ -40,7 +40,7 @@ public class CoreMonitoringTaskMonitorInfoController extends BaseController {
      * 获取调阅任务登记检查情况详细信息
      */
     @ApiOperation(value = "获取CoreMonitoringTaskMonitorInfo详细信息")
-    @RequiresPermissions("system:info:query")
+    @RequiresPermissions("core:info:query")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         //传入监控id，因为一个监控对应一个项目
@@ -51,7 +51,7 @@ public class CoreMonitoringTaskMonitorInfoController extends BaseController {
      * 新增调阅任务登记检查情况
      */
     @ApiOperation(value = "新增CoreMonitoringTaskMonitorInfo")
-    @RequiresPermissions("system:info:add")
+    @RequiresPermissions("core:info:add")
     @Log(title = "调阅任务登记检查情况", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody CoreMonitoringTaskRegistrationMonitorDTO coreMonitoringTaskRegistrationMonitorDTO) {
@@ -62,7 +62,7 @@ public class CoreMonitoringTaskMonitorInfoController extends BaseController {
      * 修改调阅任务登记检查情况
      */
     @ApiOperation(value = "修改CoreMonitoringTaskMonitorInfo")
-    @RequiresPermissions("system:info:edit")
+    @RequiresPermissions("core:info:edit")
     @Log(title = "调阅任务登记检查情况", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody CoreMonitoringTaskRegistrationMonitorDTO coreMonitoringTaskMonitorInfo) {

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/controller/CoreMonitoringTaskRegistrationController.java

@@ -44,7 +44,7 @@ public class CoreMonitoringTaskRegistrationController extends BaseController {
      * 查询【请填写功能名称】列表
      */
     @ApiOperation(value = "查询CoreMonitoringTaskRegistration列表")
-    @RequiresPermissions("system:registration:list")
+    @RequiresPermissions("core:registration:list")
     @GetMapping("/list")
     public AjaxResult list(CoreMonitoringTaskRegistration coreMonitoringTaskRegistration) {
         return success(iCoreMonitoringTaskRegistrationMonitorService.selectCoreMonitoringTaskRegistrationList(coreMonitoringTaskRegistration.getTaskId()));
@@ -54,7 +54,7 @@ public class CoreMonitoringTaskRegistrationController extends BaseController {
      * 获取【请填写功能名称】详细信息
      */
     @ApiOperation(value = "获取CoreMonitoringTaskRegistration详细信息")
-    @RequiresPermissions("system:registration:query")
+    @RequiresPermissions("core:registration:query")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         return success(iCoreMonitoringTaskRegistrationService.selectCoreMonitoringTaskRegistrationById(id));
@@ -64,7 +64,7 @@ public class CoreMonitoringTaskRegistrationController extends BaseController {
      * 新增【调阅任务登记NCF开始】
      */
     @ApiOperation(value = "新增CoreMonitoringTaskRegistration")
-    @RequiresPermissions("system:registration:add")
+    @RequiresPermissions("core:registration:add")
     @Log(title = "【调阅任务登记NCF开始】", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody CoreMonitoringTaskRegistration coreMonitoringTaskRegistration) {
@@ -75,7 +75,7 @@ public class CoreMonitoringTaskRegistrationController extends BaseController {
      * 修改【请填写功能名称】
      */
     @ApiOperation(value = "修改CoreMonitoringTaskRegistration")
-    @RequiresPermissions("system:registration:edit")
+    @RequiresPermissions("core:registration:edit")
     @Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody CoreMonitoringTaskRegistration coreMonitoringTaskRegistration) {

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/controller/CoreMonitoringTaskRegistrationMonitorController.java

@@ -37,7 +37,7 @@ public class CoreMonitoringTaskRegistrationMonitorController extends BaseControl
      * 获取调阅任务登记监控详细信息
      */
     @ApiOperation(value = "获取CoreMonitoringTaskRegistrationMonitor详细信息")
-    @RequiresPermissions("system:monitor:query")
+    @RequiresPermissions("core:monitor:query")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") String id) {
         return success(coreMonitoringTaskRegistrationMonitorService.selectCoreMonitoringTaskRegistrationMonitorById(id));
@@ -47,7 +47,7 @@ public class CoreMonitoringTaskRegistrationMonitorController extends BaseControl
      * 新增调阅任务登记监控
      */
     @ApiOperation(value = "新增CoreMonitoringTaskRegistrationMonitor")
-    @RequiresPermissions("system:monitor:add")
+    @RequiresPermissions("core:monitor:add")
     @Log(title = "调阅任务登记监控" , businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody CoreMonitoringTaskRegistrationMonitor coreMonitoringTaskRegistrationMonitor) {
@@ -58,7 +58,7 @@ public class CoreMonitoringTaskRegistrationMonitorController extends BaseControl
      * 修改调阅任务登记监控
      */
     @ApiOperation(value = "修改CoreMonitoringTaskRegistrationMonitor")
-    @RequiresPermissions("system:monitor:edit")
+    @RequiresPermissions("core:monitor:edit")
     @Log(title = "调阅任务登记监控" , businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody CoreMonitoringTaskRegistrationMonitor coreMonitoringTaskRegistrationMonitor) {

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/vo/CoreMonitoringTaskRegistrationVO.java

@@ -1,5 +1,7 @@
 package com.xunmei.core.access.vo;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.xunmei.core.access.domain.CoreMonitoringTaskRegistration;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -16,6 +18,8 @@ public class CoreMonitoringTaskRegistrationVO extends CoreMonitoringTaskRegistra
     private String taskName;
     @ApiModelProperty(value = "任务状态")
     private String taskStatus;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long orgId;
     @ApiModelProperty(value = "总列表")
     private List<CoreMonitoringTaskRegistrationMonitorVO>coreMonitoringTaskRegistrationMonitorVOList;
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/retrieval/controller/CoreMonitoringRetrievalTaskController.java

@@ -47,6 +47,7 @@ public class CoreMonitoringRetrievalTaskController extends BaseController {
      * 查询监控调阅任务列表app
      */
     @ApiOperation(value = "app查询调阅任务列表")
+    @RequiresPermissions("core:task:list")
     @GetMapping("/selectListApp")
     public TableDataInfo<CoreMonitoringRetrievalTask> selectListApp(CoreMonitoringTaskRegistrationDTO coreMonitoringTaskRegistrationDTO) {
         return coreMonitoringRetrievalTaskService.selectListApp(coreMonitoringTaskRegistrationDTO);

soc-modules/soc-modules-core/src/main/resources/mapper/access/CoreMonitoringTaskRegistrationMonitorMapper.xml

@@ -44,6 +44,7 @@
     </select>
     <select id="selectTaskName" resultType="com.xunmei.core.access.vo.CoreMonitoringTaskRegistrationVO">
         SELECT
+               cmrt.org_id as orgId,
             cmtr.id as id,
             cmrt.task_name as  taskName,
                cmrt.status as  taskStatus,

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

@@ -2,6 +2,8 @@ package com.xunmei.system.controller;
 
 import java.util.List;
 import com.xunmei.system.api.domain.SysArea;
+import com.xunmei.system.domain.vo.SysAreaCheckVO;
+import com.xunmei.system.dto.SysAreaCheckDTO;
 import com.xunmei.system.service.ISysAreaService;
 import com.xunmei.system.service.ISysNfcBindService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -46,7 +48,7 @@ public class SysAreaCheckController extends BaseController {
     @ApiOperation(value = "查询SysAreaCheck列表")
     @RequiresPermissions("system:check:list")
     @GetMapping("/list")
-    public TableDataInfo<SysAreaCheck> list(SysAreaCheck sysAreaCheck) {
+    public TableDataInfo<SysAreaCheckVO> list(SysAreaCheckDTO sysAreaCheck) {
         return sysAreaCheckService.selectPage(sysAreaCheck);
     }
 

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

@@ -56,6 +56,15 @@ public class SysAreaController extends BaseController {
     }
 
     /**
+     * 获取【请填写功能名称】详细信息
+     */
+    @ApiOperation(value = "根据机构获取区域")
+    @RequiresPermissions("system:area:query")
+    @GetMapping("/getAreaByOrg/{orgId}")
+    public AjaxResult getAreaByOrg(@PathVariable("orgId") Long orgId) {
+        return success(sysAreaService.getAreaByOrg(orgId));
+    }
+    /**
      * 新增【请填写功能名称】
      */
     @ApiOperation(value = "新增SysArea")

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

@@ -11,4 +11,5 @@ import lombok.Data;
 public class SysAreaCheckVO extends SysAreaCheck {
     private String areaName;
     private String orgName;
+
 }

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/dto/SysAreaCheckDTO.java

@@ -0,0 +1,49 @@
+package com.xunmei.system.dto;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.xunmei.common.core.web.domain.PageRequest;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author :LuoWei
+ * @date : 2023/9/8
+ */
+@Data
+public class SysAreaCheckDTO extends PageRequest {
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long id;
+
+    /**
+     * 采集点名称
+     */
+    @ApiModelProperty(value = "采集点名称")
+    private String checkName;
+
+    /**
+     * 区域id
+     */
+    @ApiModelProperty(value = "区域id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long areaId;
+
+    /**
+     * 机构id
+     */
+    @ApiModelProperty(value = "机构id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long orgId;
+
+    /**
+     * 修改人id
+     */
+    @ApiModelProperty(value = "修改人id")
+    private String updateId;
+
+    /**
+     * 删除标志（0代表存在 2代表删除）
+     */
+    private String delFlag;
+
+}

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

@@ -1,11 +1,11 @@
 package com.xunmei.system.mapper;
 
 import java.util.List;
-
 import com.xunmei.system.api.domain.SysArea;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 
+
 /**
  * 【请填写功能名称】Mapper接口
  *

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

@@ -2,9 +2,13 @@ package com.xunmei.system.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.xunmei.system.api.domain.SysArea;
 import com.xunmei.system.domain.SysAreaCheck;
 import com.xunmei.system.domain.vo.SysAreaCheckVO;
+import com.xunmei.system.dto.SysAreaCheckDTO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -27,7 +31,13 @@ public interface SysAreaCheckMapper extends BaseMapper<SysAreaCheck> {
      */
      SysAreaCheck selectSysAreaCheckById(Long id);
 
-
+    /**
+     * 采集点列表
+     * @param page
+     * @param sysArea
+     * @return
+     */
+    Page<SysAreaCheckVO> selectSysAreaVO(Page<SysAreaCheckVO> page, @Param("sysAreaCheck") SysAreaCheckDTO sysAreaCheck);
     /**
      * 查询区域采集点列表
      *

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

@@ -31,6 +31,19 @@ public interface SysNfcBindMapper extends BaseMapper<SysNfcBind> {
      List<SysNfcBind> selectSysNfcBindList(SysNfcBind sysNfcBind);
 
     /**
+     * 修改区域名称
+     * @param sysNfcBind
+     * @return
+     */
+    int updateAreaNameByAreaId(SysNfcBind sysNfcBind);
+
+    /**
+     * 修改采集点名称
+     * @param sysNfcBind
+     * @return
+     */
+    int updateAreaCheckNameByCheckId(SysNfcBind sysNfcBind);
+    /**
      * 新增【请填写功能名称】
      *
      * @param sysNfcBind 【请填写功能名称】

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

@@ -6,6 +6,8 @@ import com.xunmei.system.domain.SysAreaCheck;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.xunmei.common.core.web.page.TableDataInfo;
+import com.xunmei.system.domain.vo.SysAreaCheckVO;
+import com.xunmei.system.dto.SysAreaCheckDTO;
 
 /**
  * 区域采集点Service接口
@@ -68,7 +70,7 @@ public interface ISysAreaCheckService extends IService<SysAreaCheck> {
      * @param sysAreaCheck 查询条件对象
      * @return Page
      */
-    TableDataInfo<SysAreaCheck> selectPage(SysAreaCheck sysAreaCheck);
+    TableDataInfo<SysAreaCheckVO> selectPage(SysAreaCheckDTO sysAreaCheck);
 
     /**
      * 根据id获取区域

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

@@ -20,7 +20,7 @@ public interface ISysAreaService extends IService<SysArea> {
      * @return 【区域管理】
      */
     SysArea selectSysAreaById(Long id);
-
+    List<SysArea> getAreaByOrg (Long orgId);
     /**
      * 查询【区域管理】列表
      *

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

@@ -16,6 +16,7 @@ import com.xunmei.system.api.domain.SysOrg;
 import com.xunmei.system.api.vo.SysOrgVO;
 import com.xunmei.system.domain.SysNfcBind;
 import com.xunmei.system.domain.vo.SysAreaCheckVO;
+import com.xunmei.system.dto.SysAreaCheckDTO;
 import com.xunmei.system.mapper.ISysAreaMapper;
 import com.xunmei.system.mapper.SysNfcBindMapper;
 import com.xunmei.system.mapper.SysOrgMapper;
@@ -41,28 +42,15 @@ public class SysAreaCheckServiceImpl extends ServiceImpl<SysAreaCheckMapper, Sys
     @Autowired
     private SysAreaCheckMapper sysAreaCheckMapper;
     @Autowired
-    private ISysOrgService orgService;
-    @Autowired
-    private ISysAreaMapper sysAreaMapper;
-    @Autowired
     private SysOrgMapper sysOrgMapper;
     @Autowired
     private SysNfcBindMapper sysNfcBindMapper;
 
     @Override
-    public TableDataInfo<SysAreaCheck> selectPage(SysAreaCheck sysAreaCheck) {
+    public TableDataInfo<SysAreaCheckVO> selectPage(SysAreaCheckDTO sysAreaCheck) {
         //未删除
         sysAreaCheck.setDelFlag("0");
         Page<SysAreaCheck> page;
-        //分页
-        if (sysAreaCheck.getPageNum() != null && sysAreaCheck.getPageSize() != null) {
-            page = new Page<>(sysAreaCheck.getPageNum(), sysAreaCheck.getPageSize());
-        } else {
-            page = new Page<>();
-        }
-        //查询条件
-        QueryWrapper<SysAreaCheck> query = new QueryWrapper<>(sysAreaCheck);
-        //下穿
         //先全部查出
         sysAreaCheck.setCheckSub(true);
         QueryWrapper queryWrapper = new QueryWrapper();
@@ -71,36 +59,9 @@ public class SysAreaCheckServiceImpl extends ServiceImpl<SysAreaCheckMapper, Sys
         if (null == sysAreaCheck.getOrgId()) {
             sysAreaCheck.setOrgId(sysOrg1.getId());
         }
-    /*    if (sysAreaCheck.getCheckSub()) {
-           // List<Long> ids = orgService.selectCheckSubOrgIdList(sysAreaCheck.getOrgId());
-         //   List<SysOrgVO> cacheList = RedisUtils.getCacheList(CacheConstants.ORG_CACHE_LIST_KEY);
-          //  List<Long> collect = cacheList.stream().map(e -> e.getId()).collect(Collectors.toList());
-            //清空前端传递的org_id
-            sysAreaCheck.setOrgId(null);
-            //添加in条件
-            query.in("org_id", collect);
-        }*/
-        //时间范围查询
-        if (sysAreaCheck.getParams().get("beginTime") != null && sysAreaCheck.getParams().get("endTime") != null) {
-            query.between("create_time", sysAreaCheck.getParams().get("beginTime"), sysAreaCheck.getParams().get("endTime"));
-        }
         //获取数据
-        page = sysAreaCheckMapper.selectPage(page, query);
-
-        List<SysAreaCheckVO> list = new ArrayList<>();
-        List<SysAreaCheck> records = page.getRecords();
-        for (SysAreaCheck s : records) {
-            SysAreaCheckVO sysAreaCheckVO = new SysAreaCheckVO();
-            BeanUtils.copyProperties(s, sysAreaCheckVO);
-            SysArea sysArea = sysAreaMapper.selectSysAreaById(s.getAreaId());
-            SysOrg sysOrg = sysOrgMapper.selectSysOrgById(s.getOrgId());
-            if (null != sysArea) {
-                sysAreaCheckVO.setAreaName(sysArea.getName());
-            }
-            sysAreaCheckVO.setOrgName(sysOrg.getName());
-            list.add(sysAreaCheckVO);
-        }
-        return TableDataInfo.build(page);
+        Page<SysAreaCheckVO> sysAreaCheckVOPage = sysAreaCheckMapper.selectSysAreaVO(sysAreaCheck.getPageRequest(), sysAreaCheck);
+        return TableDataInfo.build(sysAreaCheckVOPage);
 
 
     }
@@ -171,9 +132,22 @@ public class SysAreaCheckServiceImpl extends ServiceImpl<SysAreaCheckMapper, Sys
      */
     @Override
     public int updateSysAreaCheck(SysAreaCheck sysAreaCheck) {
+        QueryWrapper queryWrapper = new QueryWrapper();
+        queryWrapper.eq("check_name", sysAreaCheck.getCheckName());
+        queryWrapper.eq("area_id", sysAreaCheck.getAreaId());
+        queryWrapper.eq("org_id", sysAreaCheck.getOrgId());
+        queryWrapper.eq("del_flag", 0);
+        SysAreaCheck sysAreaCheck1 = baseMapper.selectOne(queryWrapper);
+        if (null != sysAreaCheck1 && sysAreaCheck1.getId() != sysAreaCheck.getId()) {
+            throw new ServiceException("名称不能重复");
+        }
         sysAreaCheck.setUpdateBy(SecurityUtils.getUsername());
         sysAreaCheck.setUpdateTime(DateUtils.getNowDate());
         sysAreaCheck.setUpdateId(SecurityUtils.getUserId().toString());
+        SysNfcBind sysNfcBind = new SysNfcBind();
+        sysNfcBind.setCheckId(sysAreaCheck.getId());
+        sysNfcBind.setCollectionAreaName(sysAreaCheck.getCheckName());
+        sysNfcBindMapper.updateAreaCheckNameByCheckId(sysNfcBind);
         return sysAreaCheckMapper.updateById(sysAreaCheck);
     }
 

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

@@ -1,23 +1,27 @@
 package com.xunmei.system.service.impl;
 
 import java.util.List;
+
 import com.xunmei.common.core.exception.ServiceException;
 import com.xunmei.common.core.utils.DateUtils;
+import com.xunmei.common.core.utils.StringUtils;
 import com.xunmei.common.security.utils.SecurityUtils;
 import com.xunmei.system.api.domain.SysArea;
 import com.xunmei.system.api.domain.SysDictData;
+import com.xunmei.system.api.domain.SysOrg;
 import com.xunmei.system.api.model.LoginUser;
 import com.xunmei.system.domain.SysAreaCheck;
-import com.xunmei.system.mapper.SysAreaCheckMapper;
-import com.xunmei.system.mapper.SysDictDataMapper;
+import com.xunmei.system.domain.SysNfcBind;
+import com.xunmei.system.mapper.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+
 import java.util.stream.Collectors;
+
 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.ISysAreaMapper;
 import com.xunmei.system.service.ISysAreaService;
 
 /**
@@ -35,7 +39,10 @@ public class SysAreaServiceImpl extends ServiceImpl<ISysAreaMapper, SysArea> imp
     private SysDictDataMapper sysDictDataMapper;
     @Autowired
     private SysAreaCheckMapper sysAreaCheckMapper;
-
+    @Autowired
+    private SysNfcBindMapper sysNfcBindMapper;
+@Autowired
+private SysOrgMapper sysOrgMapper;
     @Override
     public TableDataInfo<SysArea> selectPage(SysArea sysArea) {
         //未删除
@@ -50,15 +57,11 @@ public class SysAreaServiceImpl extends ServiceImpl<ISysAreaMapper, SysArea> imp
         //查询条件
         QueryWrapper<SysArea> query = new QueryWrapper<>(sysArea);
         //下穿
-        Boolean checkSub = sysArea.getCheckSub();
- /*       if (checkSub) {
-            List<SysDictData> sysDictData = sysDictDataMapper.selectDictDataByType(sysArea.getOrgType());
-            List<String> ids = sysDictData.stream().map(e -> e.getDictValue()).collect(Collectors.toList());
-            //清空前端传递的org_id
-            sysArea.setOrgType(null);
-            //添加in条件
-            query.in("org_type", ids);
-        }*/
+        String name = sysArea.getName();
+        if (StringUtils.isNotEmpty(name)){
+            sysArea.setName(null);
+            query.like("name",name);
+        }
         //时间范围查询
         if (sysArea.getParams().get("beginTime") != null && sysArea.getParams().get("endTime") != null) {
             query.between("create_time", sysArea.getParams().get("beginTime"), sysArea.getParams().get("endTime"));
@@ -87,6 +90,16 @@ public class SysAreaServiceImpl extends ServiceImpl<ISysAreaMapper, SysArea> imp
         return sysAreaMapper.selectById(id);
     }
 
+    @Override
+    public List<SysArea> getAreaByOrg(Long orgId) {
+        SysOrg sysOrg = sysOrgMapper.selectSysOrgById(orgId);
+        QueryWrapper queryWrapper=new QueryWrapper();
+        queryWrapper.eq("org_type",sysOrg.getType());
+        queryWrapper.eq("del_flag",0);
+        List list = baseMapper.selectList(queryWrapper);
+        return list;
+    }
+
     /**
      * 查询【请填写功能名称】列表
      *
@@ -107,13 +120,13 @@ public class SysAreaServiceImpl extends ServiceImpl<ISysAreaMapper, SysArea> imp
      */
     @Override
     public int insertSysArea(SysArea sysArea) {
-        QueryWrapper queryWrapper=new QueryWrapper();
-        queryWrapper.eq("org_type",sysArea.getOrgType());
-        queryWrapper.eq("name",sysArea.getName());
-        queryWrapper.eq("del_flag",0);
+        QueryWrapper queryWrapper = new QueryWrapper();
+        queryWrapper.eq("org_type", sysArea.getOrgType());
+        queryWrapper.eq("name", sysArea.getName());
+        queryWrapper.eq("del_flag", 0);
         Long aLong = baseMapper.selectCount(queryWrapper);
-        if (aLong>0){
-            throw  new ServiceException("名称不能重复");
+        if (aLong > 0) {
+            throw new ServiceException("名称不能重复");
         }
         sysArea.setCreateTime(DateUtils.getNowDate());
         sysArea.setUpdateTime(DateUtils.getNowDate());
@@ -132,10 +145,22 @@ public class SysAreaServiceImpl extends ServiceImpl<ISysAreaMapper, SysArea> imp
      */
     @Override
     public int updateSysArea(SysArea sysArea) {
+        QueryWrapper queryWrapper = new QueryWrapper();
+        queryWrapper.eq("org_type", sysArea.getOrgType());
+        queryWrapper.eq("name", sysArea.getName());
+        queryWrapper.eq("del_flag", 0);
+        SysArea sysArea1 = baseMapper.selectOne(queryWrapper);
+        if (null!=sysArea1&&sysArea1.getId()!=sysArea.getId()) {
+            throw new ServiceException("名称不能重复");
+        }
         sysArea.setUpdateTime(DateUtils.getNowDate());
         LoginUser loginUser = SecurityUtils.getLoginUser();
         sysArea.setUpdateBy(loginUser.getUsername());
         sysArea.setUpdateId(loginUser.getUserid());
+        SysNfcBind sysNfcBind = new SysNfcBind();
+        sysNfcBind.setAreaId(sysArea.getId());
+        sysNfcBind.setAreaName(sysArea.getName());
+        sysNfcBindMapper.updateAreaNameByAreaId(sysNfcBind);
         return sysAreaMapper.updateById(sysArea);
     }
 

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

@@ -130,7 +130,7 @@ public class SysNfcBindServiceImpl extends ServiceImpl<SysNfcBindMapper, SysNfcB
         queryWrapper.eq("code", sysNfcBind.getCode());
         Long aLong = baseMapper.selectCount(queryWrapper);
         if (aLong > 0) {
-            throw new ServiceException("请勿重复添加");
+            throw new ServiceException("已存在，请勿重复添加");
         }
         sysNfcBind.setUpdateTime(DateUtils.getNowDate());
         sysNfcBind.setCreateTime(DateUtils.getNowDate());
@@ -158,6 +158,16 @@ public class SysNfcBindServiceImpl extends ServiceImpl<SysNfcBindMapper, SysNfcB
      */
     @Override
     public int updateSysNfcBind(SysNfcBind sysNfcBind) {
+        QueryWrapper queryWrapper = new QueryWrapper();
+        queryWrapper.eq("area_id", sysNfcBind.getAreaId());
+        queryWrapper.eq("org_id", sysNfcBind.getOrgId());
+        queryWrapper.eq("check_id", sysNfcBind.getCheckId());
+        queryWrapper.eq("del_flag", 0);
+        queryWrapper.eq("code", sysNfcBind.getCode());
+        SysNfcBind sysNfcBind1 = baseMapper.selectOne(queryWrapper);
+        if (null!=sysNfcBind1&&sysNfcBind1.getId()!=sysNfcBind.getId()) {
+            throw new ServiceException("已存在，请勿重复修改");
+        }
         sysNfcBind.setUpdateTime(DateUtils.getNowDate());
         SysOrg sysOrg = sysOrgService.selectSysOrgById(sysNfcBind.getOrgId());
         if (null != sysOrg) {

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

@@ -5,20 +5,29 @@
 <mapper namespace="com.xunmei.system.mapper.SysAreaCheckMapper">
 
     <resultMap type="com.xunmei.system.domain.SysAreaCheck" id="SysAreaCheckResult">
-                <result property="id" column="id"/>
-                <result property="checkName" column="check_name"/>
-                <result property="areaId" column="area_id"/>
-                <result property="orgId" column="org_id"/>
-                <result property="createTime" column="create_time"/>
-                <result property="updateTime" column="update_time"/>
-                <result property="updateId" column="update_id"/>
-                <result property="createBy" column="create_by"/>
-                <result property="delFlag" column="del_flag"/>
-                <result property="updateBy" column="update_by"/>
+        <result property="id" column="id"/>
+        <result property="checkName" column="check_name"/>
+        <result property="areaId" column="area_id"/>
+        <result property="orgId" column="org_id"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="updateId" column="update_id"/>
+        <result property="createBy" column="create_by"/>
+        <result property="delFlag" column="del_flag"/>
+        <result property="updateBy" column="update_by"/>
     </resultMap>
 
     <sql id="selectSysAreaCheckVo">
-        select id, check_name, area_id, org_id, create_time, update_time, update_id, create_by, del_flag, update_by
+        select id,
+               check_name,
+               area_id,
+               org_id,
+               create_time,
+               update_time,
+               update_id,
+               create_by,
+               del_flag,
+               update_by
         from sys_area_check
     </sql>
 
@@ -26,124 +35,143 @@
             resultMap="SysAreaCheckResult">
         <include refid="selectSysAreaCheckVo"/>
         <where>
-                        <if test="checkName != null  and checkName != ''">
-                            and check_name like concat('%', #{checkName}, '%')
-                        </if>
-                        <if test="areaId != null ">
-                            and area_id = #{areaId}
-                        </if>
-                        <if test="orgId != null ">
-                            and org_id = #{orgId}
-                        </if>
-                        <if test="updateId != null  and updateId != ''">
-                            and update_id = #{updateId}
-                        </if>
-                        <if test="delFlag !=null and delFlag !=''">
-                            and del_flag=#{delFlag}
-                        </if>
+            <if test="checkName != null  and checkName != ''">
+                and check_name like concat('%', #{checkName}, '%')
+            </if>
+            <if test="areaId != null ">
+                and area_id = #{areaId}
+            </if>
+            <if test="orgId != null ">
+                and org_id = #{orgId}
+            </if>
+            <if test="updateId != null  and updateId != ''">
+                and update_id = #{updateId}
+            </if>
+            <if test="delFlag !=null and delFlag !=''">
+                and del_flag=#{delFlag}
+            </if>
         </where>
     </select>
 
     <select id="selectSysAreaCheckById" parameterType="Long"
             resultMap="SysAreaCheckResult">
-            <include refid="selectSysAreaCheckVo"/>
-            where id = #{id}
+        <include refid="selectSysAreaCheckVo"/>
+        where id = #{id}
     </select>
     <select id="selectByPage" resultType="com.xunmei.system.domain.vo.SysAreaCheckVO">
+        SELECT sa.`name` AS areaName,
+               so.`name`
+        FROM sys_area_check sac
+                 LEFT JOIN sys_area sa ON sa.id = sac.area_id
+                 LEFT JOIN sys_org so ON so.id = sac.org_id
+        WHERE sac.id = #{id}
+
+    </select>
+    <select id="selectSysAreaVO" resultType="com.xunmei.system.domain.vo.SysAreaCheckVO">
         SELECT
-            sa.`name` AS areaName,
-            so.`name`
+        sac.*,
+        sa.`name` AS areaName,
+        so.`name` AS orgName
         FROM
-            sys_area_check sac
-                LEFT JOIN sys_area sa ON sa.id = sac.area_id
-                LEFT JOIN sys_org so ON so.id = sac.org_id
-        WHERE
-            sac.id = #{id}
-
+        sys_area_check sac
+        LEFT JOIN sys_area sa ON sa.id = sac.area_id
+        LEFT JOIN sys_org so ON so.id = sac.org_id
+        where 1=1
+        <if test="sysAreaCheck.checkName !=null">
+            and check_name like concat('%', #{sysAreaCheck.checkName}, '%')
+        </if>
+        <if test="sysAreaCheck.areaId !=null">
+            and area_id=#{sysAreaCheck.areaId}
+        </if>
+        <if test="sysAreaCheck.orgId !=null">
+            and org_id=#{sysAreaCheck.orgId}
+        </if>
     </select>
 
 
-    <insert id="insertSysAreaCheck" parameterType="com.xunmei.system.domain.SysAreaCheck"            useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertSysAreaCheck" parameterType="com.xunmei.system.domain.SysAreaCheck" useGeneratedKeys="true"
+            keyProperty="id">
         insert into sys_area_check
         <trim prefix="(" suffix=")" suffixOverrides=",">
-                    <if test="checkName != null">check_name,
-                    </if>
-                    <if test="areaId != null">area_id,
-                    </if>
-                    <if test="orgId != null">org_id,
-                    </if>
-                    <if test="createTime != null">create_time,
-                    </if>
-                    <if test="updateTime != null">update_time,
-                    </if>
-                    <if test="updateId != null">update_id,
-                    </if>
-                    <if test="createBy != null">create_by,
-                    </if>
-                    <if test="delFlag != null">del_flag,
-                    </if>
-                    <if test="updateBy != null">update_by,
-                    </if>
+            <if test="checkName != null">check_name,
+            </if>
+            <if test="areaId != null">area_id,
+            </if>
+            <if test="orgId != null">org_id,
+            </if>
+            <if test="createTime != null">create_time,
+            </if>
+            <if test="updateTime != null">update_time,
+            </if>
+            <if test="updateId != null">update_id,
+            </if>
+            <if test="createBy != null">create_by,
+            </if>
+            <if test="delFlag != null">del_flag,
+            </if>
+            <if test="updateBy != null">update_by,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-                    <if test="checkName != null">#{checkName},
-                    </if>
-                    <if test="areaId != null">#{areaId},
-                    </if>
-                    <if test="orgId != null">#{orgId},
-                    </if>
-                    <if test="createTime != null">#{createTime},
-                    </if>
-                    <if test="updateTime != null">#{updateTime},
-                    </if>
-                    <if test="updateId != null">#{updateId},
-                    </if>
-                    <if test="createBy != null">#{createBy},
-                    </if>
-                    <if test="delFlag != null">#{delFlag},
-                    </if>
-                    <if test="updateBy != null">#{updateBy},
-                    </if>
+            <if test="checkName != null">#{checkName},
+            </if>
+            <if test="areaId != null">#{areaId},
+            </if>
+            <if test="orgId != null">#{orgId},
+            </if>
+            <if test="createTime != null">#{createTime},
+            </if>
+            <if test="updateTime != null">#{updateTime},
+            </if>
+            <if test="updateId != null">#{updateId},
+            </if>
+            <if test="createBy != null">#{createBy},
+            </if>
+            <if test="delFlag != null">#{delFlag},
+            </if>
+            <if test="updateBy != null">#{updateBy},
+            </if>
         </trim>
     </insert>
 
     <update id="updateSysAreaCheck" parameterType="com.xunmei.system.domain.SysAreaCheck">
         update sys_area_check
         <trim prefix="SET" suffixOverrides=",">
-                    <if test="checkName != null">check_name =
-                        #{checkName},
-                    </if>
-                    <if test="areaId != null">area_id =
-                        #{areaId},
-                    </if>
-                    <if test="orgId != null">org_id =
-                        #{orgId},
-                    </if>
-                    <if test="createTime != null">create_time =
-                        #{createTime},
-                    </if>
-                    <if test="updateTime != null">update_time =
-                        #{updateTime},
-                    </if>
-                    <if test="updateId != null">update_id =
-                        #{updateId},
-                    </if>
-                    <if test="createBy != null">create_by =
-                        #{createBy},
-                    </if>
-                    <if test="delFlag != null">del_flag =
-                        #{delFlag},
-                    </if>
-                    <if test="updateBy != null">update_by =
-                        #{updateBy},
-                    </if>
+            <if test="checkName != null">check_name =
+                #{checkName},
+            </if>
+            <if test="areaId != null">area_id =
+                #{areaId},
+            </if>
+            <if test="orgId != null">org_id =
+                #{orgId},
+            </if>
+            <if test="createTime != null">create_time =
+                #{createTime},
+            </if>
+            <if test="updateTime != null">update_time =
+                #{updateTime},
+            </if>
+            <if test="updateId != null">update_id =
+                #{updateId},
+            </if>
+            <if test="createBy != null">create_by =
+                #{createBy},
+            </if>
+            <if test="delFlag != null">del_flag =
+                #{delFlag},
+            </if>
+            <if test="updateBy != null">update_by =
+                #{updateBy},
+            </if>
         </trim>
         where id = #{id}
     </update>
 
     <delete id="deleteSysAreaCheckById" parameterType="Long">
         delete
-        from sys_area_check where id = #{id}
+        from sys_area_check
+        where id = #{id}
     </delete>
 
     <delete id="deleteSysAreaCheckByIds" parameterType="String">

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

@@ -5,23 +5,35 @@
 <mapper namespace="com.xunmei.system.mapper.SysNfcBindMapper">
 
     <resultMap type="com.xunmei.system.domain.SysNfcBind" id="SysNfcBindResult">
-                <result property="id" column="id"/>
-                <result property="areaId" column="area_id"/>
-                <result property="enable" column="enable"/>
-                <result property="code" column="code"/>
-                <result property="createTime" column="create_time"/>
-                <result property="updateId" column="update_id"/>
-                <result property="updateBy" column="update_by"/>
-                <result property="updateTime" column="update_time"/>
-                <result property="orgId" column="org_id"/>
-                <result property="orgName" column="org_name"/>
-                <result property="orgPath" column="org_path"/>
-                <result property="collectionAreaName" column="collection_area_name"/>
-                <result property="checkId" column="check_id"/>
+        <result property="id" column="id"/>
+        <result property="areaId" column="area_id"/>
+        <result property="enable" column="enable"/>
+        <result property="code" column="code"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateId" column="update_id"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="orgId" column="org_id"/>
+        <result property="orgName" column="org_name"/>
+        <result property="orgPath" column="org_path"/>
+        <result property="collectionAreaName" column="collection_area_name"/>
+        <result property="checkId" column="check_id"/>
     </resultMap>
 
     <sql id="selectSysNfcBindVo">
-        select id, area_id, enable, code, create_time, update_id, update_by, update_time, org_id, org_name, org_path, collection_area_name, check_id
+        select id,
+               area_id,
+               enable,
+               code,
+               create_time,
+               update_id,
+               update_by,
+               update_time,
+               org_id,
+               org_name,
+               org_path,
+               collection_area_name,
+               check_id
         from sys_nfc_bind
     </sql>
 
@@ -29,148 +41,160 @@
             resultMap="SysNfcBindResult">
         <include refid="selectSysNfcBindVo"/>
         <where>
-                        <if test="areaId != null ">
-                            and area_id = #{areaId}
-                        </if>
-                        <if test="enable != null ">
-                            and enable = #{enable}
-                        </if>
-                        <if test="code != null  and code != ''">
-                            and code = #{code}
-                        </if>
-                        <if test="updateId != null ">
-                            and update_id = #{updateId}
-                        </if>
-                        <if test="orgId != null ">
-                            and org_id = #{orgId}
-                        </if>
-                        <if test="orgName != null  and orgName != ''">
-                            and org_name like concat('%', #{orgName}, '%')
-                        </if>
-                        <if test="orgPath != null  and orgPath != ''">
-                            and org_path = #{orgPath}
-                        </if>
-                        <if test="collectionAreaName != null  and collectionAreaName != ''">
-                            and collection_area_name like concat('%', #{collectionAreaName}, '%')
-                        </if>
-                        <if test="checkId != null ">
-                            and check_id = #{checkId}
-                        </if>
+            <if test="areaId != null ">
+                and area_id = #{areaId}
+            </if>
+            <if test="enable != null ">
+                and enable = #{enable}
+            </if>
+            <if test="code != null  and code != ''">
+                and code = #{code}
+            </if>
+            <if test="updateId != null ">
+                and update_id = #{updateId}
+            </if>
+            <if test="orgId != null ">
+                and org_id = #{orgId}
+            </if>
+            <if test="orgName != null  and orgName != ''">
+                and org_name like concat('%', #{orgName}, '%')
+            </if>
+            <if test="orgPath != null  and orgPath != ''">
+                and org_path = #{orgPath}
+            </if>
+            <if test="collectionAreaName != null  and collectionAreaName != ''">
+                and collection_area_name like concat('%', #{collectionAreaName}, '%')
+            </if>
+            <if test="checkId != null ">
+                and check_id = #{checkId}
+            </if>
         </where>
     </select>
 
     <select id="selectSysNfcBindById" parameterType="Long"
             resultMap="SysNfcBindResult">
-            <include refid="selectSysNfcBindVo"/>
-            where id = #{id}
+        <include refid="selectSysNfcBindVo"/>
+        where id = #{id}
     </select>
 
     <insert id="insertSysNfcBind" parameterType="com.xunmei.system.domain.SysNfcBind">
         insert into sys_nfc_bind
         <trim prefix="(" suffix=")" suffixOverrides=",">
-                    <if test="id != null">id,
-                    </if>
-                    <if test="areaId != null">area_id,
-                    </if>
-                    <if test="enable != null">enable,
-                    </if>
-                    <if test="code != null">code,
-                    </if>
-                    <if test="createTime != null">create_time,
-                    </if>
-                    <if test="updateId != null">update_id,
-                    </if>
-                    <if test="updateBy != null">update_by,
-                    </if>
-                    <if test="updateTime != null">update_time,
-                    </if>
-                    <if test="orgId != null">org_id,
-                    </if>
-                    <if test="orgName != null">org_name,
-                    </if>
-                    <if test="orgPath != null">org_path,
-                    </if>
-                    <if test="collectionAreaName != null">collection_area_name,
-                    </if>
-                    <if test="checkId != null">check_id,
-                    </if>
+            <if test="id != null">id,
+            </if>
+            <if test="areaId != null">area_id,
+            </if>
+            <if test="enable != null">enable,
+            </if>
+            <if test="code != null">code,
+            </if>
+            <if test="createTime != null">create_time,
+            </if>
+            <if test="updateId != null">update_id,
+            </if>
+            <if test="updateBy != null">update_by,
+            </if>
+            <if test="updateTime != null">update_time,
+            </if>
+            <if test="orgId != null">org_id,
+            </if>
+            <if test="orgName != null">org_name,
+            </if>
+            <if test="orgPath != null">org_path,
+            </if>
+            <if test="collectionAreaName != null">collection_area_name,
+            </if>
+            <if test="checkId != null">check_id,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-                    <if test="id != null">#{id},
-                    </if>
-                    <if test="areaId != null">#{areaId},
-                    </if>
-                    <if test="enable != null">#{enable},
-                    </if>
-                    <if test="code != null">#{code},
-                    </if>
-                    <if test="createTime != null">#{createTime},
-                    </if>
-                    <if test="updateId != null">#{updateId},
-                    </if>
-                    <if test="updateBy != null">#{updateBy},
-                    </if>
-                    <if test="updateTime != null">#{updateTime},
-                    </if>
-                    <if test="orgId != null">#{orgId},
-                    </if>
-                    <if test="orgName != null">#{orgName},
-                    </if>
-                    <if test="orgPath != null">#{orgPath},
-                    </if>
-                    <if test="collectionAreaName != null">#{collectionAreaName},
-                    </if>
-                    <if test="checkId != null">#{checkId},
-                    </if>
+            <if test="id != null">#{id},
+            </if>
+            <if test="areaId != null">#{areaId},
+            </if>
+            <if test="enable != null">#{enable},
+            </if>
+            <if test="code != null">#{code},
+            </if>
+            <if test="createTime != null">#{createTime},
+            </if>
+            <if test="updateId != null">#{updateId},
+            </if>
+            <if test="updateBy != null">#{updateBy},
+            </if>
+            <if test="updateTime != null">#{updateTime},
+            </if>
+            <if test="orgId != null">#{orgId},
+            </if>
+            <if test="orgName != null">#{orgName},
+            </if>
+            <if test="orgPath != null">#{orgPath},
+            </if>
+            <if test="collectionAreaName != null">#{collectionAreaName},
+            </if>
+            <if test="checkId != null">#{checkId},
+            </if>
         </trim>
     </insert>
 
     <update id="updateSysNfcBind" parameterType="com.xunmei.system.domain.SysNfcBind">
         update sys_nfc_bind
         <trim prefix="SET" suffixOverrides=",">
-                    <if test="areaId != null">area_id =
-                        #{areaId},
-                    </if>
-                    <if test="enable != null">enable =
-                        #{enable},
-                    </if>
-                    <if test="code != null">code =
-                        #{code},
-                    </if>
-                    <if test="createTime != null">create_time =
-                        #{createTime},
-                    </if>
-                    <if test="updateId != null">update_id =
-                        #{updateId},
-                    </if>
-                    <if test="updateBy != null">update_by =
-                        #{updateBy},
-                    </if>
-                    <if test="updateTime != null">update_time =
-                        #{updateTime},
-                    </if>
-                    <if test="orgId != null">org_id =
-                        #{orgId},
-                    </if>
-                    <if test="orgName != null">org_name =
-                        #{orgName},
-                    </if>
-                    <if test="orgPath != null">org_path =
-                        #{orgPath},
-                    </if>
-                    <if test="collectionAreaName != null">collection_area_name =
-                        #{collectionAreaName},
-                    </if>
-                    <if test="checkId != null">check_id =
-                        #{checkId},
-                    </if>
+            <if test="areaId != null">area_id =
+                #{areaId},
+            </if>
+            <if test="enable != null">enable =
+                #{enable},
+            </if>
+            <if test="code != null">code =
+                #{code},
+            </if>
+            <if test="createTime != null">create_time =
+                #{createTime},
+            </if>
+            <if test="updateId != null">update_id =
+                #{updateId},
+            </if>
+            <if test="updateBy != null">update_by =
+                #{updateBy},
+            </if>
+            <if test="updateTime != null">update_time =
+                #{updateTime},
+            </if>
+            <if test="orgId != null">org_id =
+                #{orgId},
+            </if>
+            <if test="orgName != null">org_name =
+                #{orgName},
+            </if>
+            <if test="orgPath != null">org_path =
+                #{orgPath},
+            </if>
+            <if test="collectionAreaName != null">collection_area_name =
+                #{collectionAreaName},
+            </if>
+            <if test="checkId != null">check_id =
+                #{checkId},
+            </if>
         </trim>
         where id = #{id}
     </update>
+    <update id="updateAreaNameByAreaId">
+        UPDATE sys_nfc_bind
+        SET area_name = #{areaName}
+        WHERE area_id = #{areaId}
+    </update>
+    <update id="updateAreaCheckNameByCheckId">
+        UPDATE sys_nfc_bind
+        SET collection_area_name = #{collectionAreaName}
+        WHERE check_id = #{checkId}
+    </update>
+
 
     <delete id="deleteSysNfcBindById" parameterType="Long">
         delete
-        from sys_nfc_bind where id = #{id}
+        from sys_nfc_bind
+        where id = #{id}
     </delete>
 
     <delete id="deleteSysNfcBindByIds" parameterType="String">