修改区域nfc

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/RemoteRoleService.java

@@ -23,9 +23,12 @@ public interface RemoteRoleService {
     @GetMapping("/role/getRoleById")
     SysRole getRoleById(@RequestParam("id") Long id, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 
+    @GetMapping(value = "/role/selectRoleNameByUserId")
+    String selectRoleNameByUserId(@RequestParam("userId") Long userId, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
     @GetMapping("/role/getNames")
     List<IdNameVo> getNames(@RequestBody RoleConditionEto condition);
 
     @GetMapping("/role/selectUserByRoleNameAndOrgId")
-    List<SysUser> selectUserByRoleNameAndOrgId(@RequestParam(value = "roleName") String roleName,@RequestParam(value = "orgId")  Long orgId, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+    List<SysUser> selectUserByRoleNameAndOrgId(@RequestParam(value = "roleName") String roleName, @RequestParam(value = "orgId") Long orgId, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 }

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/factory/RemoteRoleFallbackFactory.java

@@ -34,6 +34,11 @@ public class RemoteRoleFallbackFactory implements FallbackFactory<RemoteRoleServ
             }
 
             @Override
+            public String selectRoleNameByUserId(Long userId, String source) {
+                return null;
+            }
+
+            @Override
             public List<IdNameVo> getNames(RoleConditionEto condition) {
                 return null;
             }

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

@@ -1,13 +1,17 @@
 package com.xunmei.core.access.controller;
 
+import com.xunmei.common.core.constant.SecurityConstants;
+import com.xunmei.common.core.utils.StringUtils;
 import com.xunmei.common.core.web.controller.BaseController;
 import com.xunmei.common.core.web.domain.AjaxResult;
 import com.xunmei.common.core.web.page.TableDataInfo;
 import com.xunmei.common.log.annotation.Log;
 import com.xunmei.common.log.enums.BusinessType;
 import com.xunmei.common.security.annotation.RequiresPermissions;
+import com.xunmei.common.security.utils.SecurityUtils;
 import com.xunmei.core.access.domain.TMonitoringRetrievalPlan;
 import com.xunmei.core.access.service.ITMonitoringRetrievalPlanService;
+import com.xunmei.system.api.RemoteRoleService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -25,6 +29,8 @@ import org.springframework.web.bind.annotation.*;
 public class TMonitoringRetrievalPlanController extends BaseController {
     @Autowired
     private ITMonitoringRetrievalPlanService tMonitoringRetrievalPlanService;
+    @Autowired
+    private RemoteRoleService remoteRoleService;
 
     /**
      * 查询监控调阅计划列表
@@ -32,8 +38,30 @@ public class TMonitoringRetrievalPlanController extends BaseController {
     @ApiOperation(value = "查询TMonitoringRetrievalPlan列表")
     @RequiresPermissions("core:accessPlan:list")
     @GetMapping("/list")
-    public TableDataInfo<TMonitoringRetrievalPlan> list(TMonitoringRetrievalPlan tMonitoringRetrievalPlan) {
-        return tMonitoringRetrievalPlanService.selectPage(tMonitoringRetrievalPlan);
+    public AjaxResult list(TMonitoringRetrievalPlan tMonitoringRetrievalPlan) {
+        AjaxResult ajax = AjaxResult.success();
+        TableDataInfo<TMonitoringRetrievalPlan> tMonitoringRetrievalPlanTableDataInfo = tMonitoringRetrievalPlanService.selectPage(tMonitoringRetrievalPlan);
+        ajax.put("data", tMonitoringRetrievalPlanTableDataInfo);
+        boolean admin = false;
+        String s = remoteRoleService.selectRoleNameByUserId(SecurityUtils.getUserId(), SecurityConstants.INNER);
+        if (StringUtils.isNotEmpty(s)) {
+            int i = s.indexOf(",");
+            if (i >= 0) {
+                String[] split = s.split(",");
+                for (int l = 0; l < split.length; l++) {
+                    if (split[l].equals("省联社安全保卫管理人员") || split[l].equals("超级管理员") || split[l].equals("行社安全保卫管理人员")) {
+                        admin = true;
+                        break;
+                    }
+                }
+            } else if (s.equals("省联社安全保卫管理人员") || s.equals("超级管理员") || s.equals("行社安全保卫管理人员")) {
+                admin = true;
+            }
+        }else if (SecurityUtils.getUserId()==1){
+            admin = true;
+        }
+        ajax.put("check", admin);
+        return ajax;
     }
 
     /**

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/service/impl/TMonitoringRetrievalPlanServiceImpl.java

@@ -84,7 +84,6 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
 
         QueryWrapper<TMonitoringRetrievalPlan> query = new QueryWrapper<>(tMonitoringRetrievalPlan);
         //下穿
-        List<SysOrg> data = remoteOrgService.selectSysOrgByParentId(MINUS_ONE.longValue(), SecurityConstants.INNER);
         if (null == tMonitoringRetrievalPlan.getOrgId()) {
             tMonitoringRetrievalPlan.setOrgId(SecurityUtils.getLoginUser().getOrgId());
         }

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

@@ -39,8 +39,6 @@ public class SysAreaCheckController extends BaseController {
     @Autowired
     private ISysAreaCheckService sysAreaCheckService;
     @Autowired
-    private ISysNfcBindService sysNfcBindService;
-    @Autowired
     private ISysAreaService sysAreaService;
     /**
      * 查询区域采集点列表
@@ -113,4 +111,13 @@ public class SysAreaCheckController extends BaseController {
         ajax.put(AjaxResult.DATA_TAG, sysAreaChecks);
         return ajax;
     }
+    @ApiOperation(value = "获取SysNfcBind通过机构id")
+    @RequiresPermissions("system:bind:query")
+    @GetMapping(value = "/getAreaCheckInfoByOrg/{orgId}")
+    public AjaxResult getAreaCheckInfoByOrg(@PathVariable(value = "orgId", required = false) Long orgId) {
+        AjaxResult ajax = AjaxResult.success();
+        List<SysAreaCheck> sysAreaChecks = sysAreaCheckService.selectByOrgId(orgId);
+        ajax.put(AjaxResult.DATA_TAG, sysAreaChecks);
+        return ajax;
+    }
 }

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

@@ -142,6 +142,7 @@ public class SysRoleController extends BaseController {
     public AjaxResult optionselect() {
         return success(roleService.selectRoleAll());
     }
+
     @RequiresPermissions("system:role:query")
     @GetMapping("/allRole")
     public AjaxResult allRole() {
@@ -165,6 +166,7 @@ public class SysRoleController extends BaseController {
         return userService.selectUnallocatedList(user);
     }
 */
+
     /**
      * 取消授权用户
      */
@@ -223,10 +225,22 @@ public class SysRoleController extends BaseController {
         return roleService.getById(id);
     }
 
+    /**
+     * 根据用户查询角色
+     *
+     * @param userId
+     * @return
+     */
+    @InnerAuth
+    @GetMapping(value = "/selectRoleNameByUserId")
+    public String selectRoleNameByUserId(Long userId) {
+        return roleService.selectRoleNameByUserId(userId);
+    }
+
     @RequiresPermissions("system:role:query")
     @ApiOperation(value = "根据机构类型查询角色")
     @GetMapping(value = "/getRoleByType/{type}")
-    public List<SysRole> getRoleByType(@PathVariable(value = "type", required = false)String type) {
+    public List<SysRole> getRoleByType(@PathVariable(value = "type", required = false) String type) {
         return roleService.getRoleByType(type);
     }
 
@@ -238,17 +252,17 @@ public class SysRoleController extends BaseController {
     }
 
     @GetMapping("/getnamesbyorgid/{orgId}")
-    public AjaxResult  getNamesByOrgId(@PathVariable Long orgId) {
-        return success(roleService.getNamesByOrgId(orgId)) ;
+    public AjaxResult getNamesByOrgId(@PathVariable Long orgId) {
+        return success(roleService.getNamesByOrgId(orgId));
     }
 
     @GetMapping("/selectUserByRoleNameAndOrgId")
-    public List<SysUser> selectUserByRoleNameAndOrgId(@RequestParam(value = "roleName") String roleName,@RequestParam(value = "orgId")  Long orgId) {
-        return roleService.selectUserByRoleNameAndOrgId(roleName,orgId);
+    public List<SysUser> selectUserByRoleNameAndOrgId(@RequestParam(value = "roleName") String roleName, @RequestParam(value = "orgId") Long orgId) {
+        return roleService.selectUserByRoleNameAndOrgId(roleName, orgId);
     }
 
     @GetMapping("/getRoles")
-    public List<SysRole> getRoles(){
-        return  roleService.getRoles();
+    public List<SysRole> getRoles() {
+        return roleService.getRoles();
     }
 }

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

@@ -44,9 +44,9 @@ private String orgPath;
     /**
      * 区域id
      */
-    @ApiModelProperty(value = "区域id")
+  /*  @ApiModelProperty(value = "区域id")
     @JsonSerialize(using = ToStringSerializer.class)
-    private Long areaId;
+    private Long areaId;*/
 
     /**
      * 机构id
@@ -78,7 +78,6 @@ private String orgPath;
                 .append("checkName", getCheckName())
 
 
-                .append("areaId", getAreaId())
 
 
                 .append("orgId", getOrgId())

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

@@ -57,6 +57,8 @@ public class SysNfcBind extends BaseEntity {
      */
     @ApiModelProperty(value = "标签编号")
     private String code;
+    @ApiModelProperty(value = "标签名称")
+    private String labelName;
 
     /**
      * 最后修改人id
@@ -112,7 +114,7 @@ public class SysNfcBind extends BaseEntity {
 
 
                 .append("code", getCode())
-
+                .append("labelName", getLabelName())
 
                 .append("createTime", getCreateTime())
 

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

@@ -78,4 +78,5 @@ public interface ISysAreaCheckService extends IService<SysAreaCheck> {
      * @return
      */
     List<SysAreaCheck> selectByAreaId(Long areaId);
+    List<SysAreaCheck>selectByOrgId(Long orgId);
 }

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

@@ -66,12 +66,20 @@ public class SysAreaCheckServiceImpl extends ServiceImpl<SysAreaCheckMapper, Sys
     @Override
     public List<SysAreaCheck> selectByAreaId(Long areaId) {
         SysAreaCheck areaCheck = new SysAreaCheck();
-        areaCheck.setAreaId(areaId);
+      //  areaCheck.setAreaId(areaId);
         areaCheck.setDelFlag("0");
         //查询机构名称
         return baseMapper.selectSysAreaCheckList(areaCheck);
     }
 
+    @Override
+    public List<SysAreaCheck> selectByOrgId(Long orgId) {
+        SysAreaCheck areaCheck = new SysAreaCheck();
+        areaCheck.setDelFlag("0");
+        areaCheck.setOrgId(orgId);
+        return baseMapper.selectSysAreaCheckList(areaCheck);
+    }
+
 
     /**
      * 查询区域采集点
@@ -106,7 +114,6 @@ public class SysAreaCheckServiceImpl extends ServiceImpl<SysAreaCheckMapper, Sys
     public int insertSysAreaCheck(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);
         Long aLong = baseMapper.selectCount(queryWrapper);
@@ -133,7 +140,7 @@ public class SysAreaCheckServiceImpl extends ServiceImpl<SysAreaCheckMapper, Sys
     public int updateSysAreaCheck(SysAreaCheck sysAreaCheck) {
         QueryWrapper queryWrapper = new QueryWrapper();
         queryWrapper.eq("check_name", sysAreaCheck.getCheckName());
-        queryWrapper.eq("area_id", sysAreaCheck.getAreaId());
+      //  queryWrapper.eq("area_id", sysAreaCheck.getAreaId());
         queryWrapper.eq("org_id", sysAreaCheck.getOrgId());
         queryWrapper.eq("del_flag", 0);
         SysAreaCheck sysAreaCheck1 = baseMapper.selectOne(queryWrapper);

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

@@ -72,15 +72,6 @@ public class SysNfcBindServiceImpl extends ServiceImpl<SysNfcBindMapper, SysNfcB
         }
         sysNfcBind.setOrgPath(org.getPath());
 
-        //下穿
-//        if (sysNfcBind.getCheckSub()) {
-//            List<Long> ids = orgService.selectCheckSubOrgIdList(sysNfcBind.getOrgId());
-//            //清空前端传递的org_id
-//            sysNfcBind.setOrgId(null);
-//            //添加in条件
-//            query.in("org_id", ids);
-//        }
-
         //获取数据
         page = sysNfcBindMapper.selectNFCPage(page, sysNfcBind);
         return TableDataInfo.build(page);

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

@@ -7,7 +7,7 @@
     <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="areaId" column="area_id"/>-->
         <result property="orgId" column="org_id"/>
         <result property="createTime" column="create_time"/>
         <result property="updateTime" column="update_time"/>
@@ -20,7 +20,7 @@
     <sql id="selectSysAreaCheckVo">
         select id,
                check_name,
-               area_id,
+               /*area_id,*/
                org_id,
                create_time,
                update_time,
@@ -38,9 +38,9 @@
             <if test="checkName != null  and checkName != ''">
                 and check_name like concat('%', #{checkName}, '%')
             </if>
-            <if test="areaId != null ">
+        <!--    <if test="areaId != null ">
                 and area_id = #{areaId}
-            </if>
+            </if>-->
             <if test="orgId != null ">
                 and org_id = #{orgId}
             </if>
@@ -62,7 +62,7 @@
         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_area sa ON sa.id = sac.area_id*/
                  LEFT JOIN sys_org so ON so.id = sac.org_id
         WHERE sac.id = #{id}
 
@@ -70,20 +70,20 @@
     <select id="selectSysAreaVO" resultType="com.xunmei.system.domain.vo.SysAreaCheckVO">
         SELECT
         sac.*,
-        sa.`name` AS areaName,
+      /*  sa.`name` AS areaName,*/
         so.short_name AS orgName
         FROM
         sys_area_check sac
-        LEFT JOIN sys_area sa ON sa.id = sac.area_id
+       /* 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
        and sac.del_flag='0'
         <if test="sysAreaCheck.checkName !=null">
             and check_name like concat('%', #{sysAreaCheck.checkName}, '%')
         </if>
-        <if test="sysAreaCheck.areaId !=null">
+  <!--      <if test="sysAreaCheck.areaId !=null">
             and area_id=#{sysAreaCheck.areaId}
-        </if>
+        </if>-->
         <if test="sysAreaCheck.orgId !=null">
             and org_id=#{sysAreaCheck.orgId}
         </if>
@@ -99,8 +99,8 @@
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="checkName != null">check_name,
             </if>
-            <if test="areaId != null">area_id,
-            </if>
+    <!--        <if test="areaId != null">area_id,
+            </if>-->
             <if test="orgId != null">org_id,
             </if>
             <if test="createTime != null">create_time,
@@ -119,8 +119,8 @@
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="checkName != null">#{checkName},
             </if>
-            <if test="areaId != null">#{areaId},
-            </if>
+          <!--  <if test="areaId != null">#{areaId},
+            </if>-->
             <if test="orgId != null">#{orgId},
             </if>
             <if test="createTime != null">#{createTime},
@@ -144,9 +144,9 @@
             <if test="checkName != null">check_name =
                 #{checkName},
             </if>
-            <if test="areaId != null">area_id =
+    <!--        <if test="areaId != null">area_id =
                 #{areaId},
-            </if>
+            </if>-->
             <if test="orgId != null">org_id =
                 #{orgId},
             </if>

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

@@ -78,27 +78,28 @@
     </select>
     <select id="selectNFCPage" resultType="com.xunmei.system.domain.SysNfcBind">
         SELECT
-            a.id,
-            a.area_id,
-            a.area_name,
-            a.ENABLE,
-            a.del_flag,
-            a.CODE,
-            a.update_id,
-            a.org_id,
-            a.org_name,
-            a.org_path,
-            a.collection_area_name,
-            a.check_id,
-            a.create_by,
-            a.create_time,
-            a.update_by,
-            a.update_time
-            FROM
-                sys_nfc_bind  a
-                LEFT JOIN sys_org b on a.org_id = b.id
-            WHERE
-                del_flag = 0
+        a.id,
+        a.area_id,
+        a.area_name,
+        a.enable,
+        a.del_flag,
+        a.code,
+        a.label_name,
+        a.update_id,
+        a.org_id,
+        a.org_name,
+        a.org_path,
+        a.collection_area_name,
+        a.check_id,
+        a.create_by,
+        a.create_time,
+        a.update_by,
+        a.update_time
+        FROM
+        sys_nfc_bind a
+        LEFT JOIN sys_org b on a.org_id = b.id
+        WHERE
+        del_flag = 0
         <choose>
             <when test="info.checkSub">
                 AND b.path like concat('%', #{info.orgPath}, '%')
@@ -116,6 +117,9 @@
         <if test="info.enable != null  and info.enable != ''">
             and a.enable = #{info.enable}
         </if>
+        <if test="info.labelName !=null and info.labelName !=''">
+            and a.label_name=#{info.labelName}
+        </if>
         order by a.org_id,a.area_id,code
     </select>
 
@@ -219,7 +223,7 @@
                 #{checkId},
             </if>
             <if test="delFlag !=null">
-              del_flag= #{delFlag}
+                del_flag= #{delFlag}
             </if>
         </trim>
         where id = #{id}