Merge branch 'master' of http://111.203.232.171:8888/lee/chnmuseum-party into master

src/main/java/cn/wisenergy/chnmuseum/party/mapper/AuditMapper.java

 package cn.wisenergy.chnmuseum.party.mapper;
 
+import cn.wisenergy.chnmuseum.party.model.TUser;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import cn.wisenergy.chnmuseum.party.model.Audit;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -18,5 +19,5 @@ import java.util.List;
  */
 public interface AuditMapper extends BaseMapper<Audit> {
 
-    List<Audit> getUserList(Page<Audit> page, @Param("name") String name, @Param("status") String status);
+    List<Audit> getUserList(Page<Audit> page, @Param("user") TUser user);
 }

src/main/java/cn/wisenergy/chnmuseum/party/mapper/TBoxOperationMapper.java

@@ -18,7 +18,7 @@ import java.util.List;
  */
 public interface TBoxOperationMapper extends BaseMapper<TBoxOperation> {
 
-    List<TBoxOperation> getList(@Param("status") String status);
+    List<TBoxOperation> getList(@Param("status") String status,@Param("areaId") String areaId);
 
     List<TBoxOperation> selectBoxPage(Page<TBoxOperation> page,@Param("user") TUser user);
 }

src/main/java/cn/wisenergy/chnmuseum/party/service/AuditService.java

 package cn.wisenergy.chnmuseum.party.service;
 
 import cn.wisenergy.chnmuseum.party.model.Audit;
+import cn.wisenergy.chnmuseum.party.model.TUser;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -14,5 +15,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface AuditService extends IService<Audit> {
 
-    Page<Audit> getUserList(Page<Audit> page, String name, String status);
+    Page<Audit> getUserList(Page<Audit> page,TUser user);
 }

src/main/java/cn/wisenergy/chnmuseum/party/service/TBoxOperationService.java

@@ -17,7 +17,7 @@ import java.util.List;
  */
 public interface TBoxOperationService extends IService<TBoxOperation> {
 
-    List<TBoxOperation> getList(String status);
+    List<TBoxOperation> getList(String status,String areaId);
 
     Page<TBoxOperation> selectBoxPage(Page<TBoxOperation> page, TUser user);
 }

src/main/java/cn/wisenergy/chnmuseum/party/service/impl/AuditServiceImpl.java

@@ -2,6 +2,7 @@ package cn.wisenergy.chnmuseum.party.service.impl;
 
 import cn.wisenergy.chnmuseum.party.model.Audit;
 import cn.wisenergy.chnmuseum.party.mapper.AuditMapper;
+import cn.wisenergy.chnmuseum.party.model.TUser;
 import cn.wisenergy.chnmuseum.party.service.AuditService;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -29,7 +30,7 @@ public class AuditServiceImpl extends ServiceImpl<AuditMapper, Audit> implements
     private AuditMapper auditMapper;
 
     @Override
-    public Page<Audit> getUserList(Page<Audit> page, String name, String status) {
-        return page.setRecords(auditMapper.getUserList(page,name,status));
+    public Page<Audit> getUserList(Page<Audit> page, TUser user) {
+        return page.setRecords(auditMapper.getUserList(page,user));
     }
 }

src/main/java/cn/wisenergy/chnmuseum/party/service/impl/TBoxOperationServiceImpl.java

@@ -30,12 +30,18 @@ public class TBoxOperationServiceImpl extends ServiceImpl<TBoxOperationMapper, T
     private TBoxOperationMapper tBoxOperationMapper;
 
     @Override
-    public List<TBoxOperation> getList(String status) {
-        return tBoxOperationMapper.getList(status);
+    public List<TBoxOperation> getList(String status, String areaId) {
+        return tBoxOperationMapper.getList(status, areaId);
     }
 
     @Override
     public Page<TBoxOperation> selectBoxPage(Page<TBoxOperation> page, TUser user) {
-        return page.setRecords(tBoxOperationMapper.selectBoxPage(page,user));
+        return page.setRecords(tBoxOperationMapper.selectBoxPage(page, user));
+    }
+
+
+    public static void main(String[] args) {
+        System.out.println("110101".substring(0, 2));
     }
 }
+

src/main/java/cn/wisenergy/chnmuseum/party/service/impl/TOrganServiceImpl.java

@@ -59,8 +59,6 @@ public class TOrganServiceImpl extends ServiceImpl<TOrganMapper, TOrgan> impleme
     @Override
     public boolean batchUpload(List excelList) {
         boolean flag =false;
-        List<TOrgan> list = new ArrayList<>();
-
         List<TOrgan> list1 = list();
         HashMap<String, TOrgan> map1 = new HashMap<>();
         list1.stream().forEach(o-> map1.put(o.getName(),o));

src/main/java/cn/wisenergy/chnmuseum/party/web/controller/AuditController.java

@@ -53,12 +53,26 @@ public class AuditController extends BaseController {
             @ApiImplicitParam(name = "_index", value = "分页起始偏移量", paramType = "query", dataType = "Integer"),
             @ApiImplicitParam(name = "_size", value = "返回条数", paramType = "query", dataType = "Integer"),
             @ApiImplicitParam(name = "name", value = "账号名称或提交人", paramType = "query", dataType = "String"),
-            @ApiImplicitParam(name = "status", value = "待初审 TBC, 驳回 REFUSED,待复审 TBCA, 通过APPROVED_FINAL", paramType = "query", dataType = "String")
+            @ApiImplicitParam(name = "name", value = "账号名称或提交人", paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "status", value = "待初审 TBC, 驳回 REFUSED,待复审 TBCA, 通过APPROVED_FINAL", paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "level", value = "初审 TBC,复审 TBCA", paramType = "query", dataType = "String")
     })
-    public Map<String, Object> getUserList(String name, String status) {
+    public Map<String, Object> getUserList(String name, String status,String level) {
         Page<Audit> auditList;
         try {
-            auditList = auditService.getUserList(getPage(), name, status);
+            TUser user1 = getcurUser();
+            TUser user = new TUser();
+            if (StringUtils.isNotBlank(name)) {
+                user.setUserName(name);
+            }
+            if (StringUtils.isNotBlank(status)) {
+                user.setStatus(status);
+            }
+            if (StringUtils.isNotBlank(level)) {
+                user.setAuditStatus(level);
+            }
+            user.setOrgCode(user1.getOrgCode());
+            auditList = auditService.getUserList(getPage(),user);
             return getResult(auditList);
         } catch (Exception e) {
             e.printStackTrace();

src/main/java/cn/wisenergy/chnmuseum/party/web/controller/LoginController.java

@@ -126,25 +126,29 @@ public class LoginController {
             //访问一次，计数一次
             ValueOperations<String, String> opsForValue = stringRedisTemplate.opsForValue();
             if ("LOCK".equals(opsForValue.get(SHIRO_IS_LOCK + username))) {
-                resultMap.put("status", 400);
+                resultMap.put("resultCode", "500");
                 resultMap.put("message", "由于密码输入错误次数大于5次，12小时内帐号已禁止登录！请您联系相关管理人员，联系电话：13924551212，邮箱：325346534@zh.com。");
                 return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(resultMap);
             }
 
             user = userService.selectByUsername(username);
             if (user == null) {
-                resultMap.put("status", 500);
+                resultMap.put("resultCode", "500");
                 resultMap.put("message", "用户名或密码不正确！");
                 return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(resultMap);
             }
 
             if ("2".equals(user.getStatus())) {
-                throw new DisabledAccountException("此帐号已禁用，请联系管理员！");
+                resultMap.put("resultCode", "500");
+                resultMap.put("message", "此帐号已禁用，请联系管理员！");
+                return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(resultMap);
             }
 
             if (user.getPermanent()!=null&&!user.getPermanent()) {
                 if (user.getEffectiveDate().isAfter(LocalDate.now())||user.getExiredDate().isBefore(LocalDate.now())) {
-                    throw new DisabledAccountException("此帐号已失效，请联系管理员！");
+                    resultMap.put("resultCode", "500");
+                    resultMap.put("message", "此帐号已失效，请联系管理员！");
+                    return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(resultMap);
                 }
             }
 
@@ -187,11 +191,11 @@ public class LoginController {
                 resultMap.put("user", user);
                 resultMap.put("token", token);
                 resultMap.put("menuList", userMenuPerms);
-                resultMap.put("status", 201);
+                resultMap.put("resultCode", "200");
                 resultMap.put("message", "登录成功");
-                return ResponseEntity.status(HttpStatus.CREATED).body(resultMap);
+                return ResponseEntity.ok(resultMap);
             } catch (Exception e) {
-                resultMap.put("status", 500);
+                resultMap.put("resultCode", "500");
                 resultMap.put("message", e.getMessage());
             }
         }
@@ -206,7 +210,7 @@ public class LoginController {
                 this.stringRedisTemplate.delete(SHIRO_JWT_TOKEN + token);
             }
             JSONObject resultMap = new JSONObject();
-            resultMap.put("resultCode", 200);
+            resultMap.put("resultCode", "200");
             resultMap.put("message", "成功");
             resultMap.put("data", "");
             return ResponseEntity.status(HttpStatus.OK).body(resultMap);

src/main/java/cn/wisenergy/chnmuseum/party/web/controller/TBoxOperationController.java

@@ -72,8 +72,10 @@ public class TBoxOperationController extends BaseController {
             user.setOrgId(organId);
         }
         if (StringUtils.isNotBlank(areaId)) {
-            user.setAreaId(areaId);
+            String areaId1 = getAreaId(areaId);
+            user.setAreaId(areaId1);
         }
+        //设置数据权限
         user.setOrgCode(user1.getOrgCode());
         Page<TBoxOperation> page = null;
         try {
@@ -153,8 +155,11 @@ public class TBoxOperationController extends BaseController {
     @ApiOperation(value = "获取机顶盒运维信息全部列表(无分页)", notes = "获取机顶盒运维信息全部列表(无分页)")
     public Map<String, Object> getTBoxOperationList(String status) {
         List<TBoxOperation> tBoxOperationList = null;
+        TUser user = getcurUser();
+        //设置数据权限
+        String areaId = user.getAreaId();
         try {
-            tBoxOperationList = tBoxOperationService.getList(status);
+            tBoxOperationList = tBoxOperationService.getList(status,areaId);
             return getResult(tBoxOperationList);
         } catch (Exception e) {
             e.printStackTrace();
@@ -173,6 +178,7 @@ public class TBoxOperationController extends BaseController {
     @RequiresPermissions("/boxOperation/getPageList")
     @ApiOperation(value = "获取机顶盒运维信息分页列表", notes = "获取机顶盒运维信息分页列表")
     public Map<String, Object> getTBoxOperationPageList(String organId, Integer status, String areaId) {
+        TUser user = getcurUser();
         UpdateWrapper<TBoxOperation> wrapper = new UpdateWrapper<>();
         if (StringUtils.isNotBlank(organId)) {
             wrapper.eq("organ_id", organId);
@@ -183,6 +189,10 @@ public class TBoxOperationController extends BaseController {
         if (StringUtils.isNotBlank(areaId)) {
             wrapper.eq("area_id", areaId);
         }
+        if (StringUtils.isNotBlank(user.getAreaId())) {
+            //设置数据权限
+            wrapper.likeRight("area_id", getAreaId(user.getAreaId()));
+        }
         wrapper.orderByDesc("create_time");
         Page<TBoxOperation> page = null;
         try {
@@ -208,5 +218,15 @@ public class TBoxOperationController extends BaseController {
         return getFailResult();
     }
 
+    public String getAreaId(String areaId){
+        if ("00".equals(areaId.substring(4))) {
+            areaId = areaId.substring(0, 4);
+        }
+        if ("0000".equals(areaId.substring(2))) {
+            areaId = areaId.substring(0, 2);
+        }
+        return areaId;
+    }
+
 }
 

src/main/java/cn/wisenergy/chnmuseum/party/web/controller/TInteractionController.java

@@ -69,20 +69,25 @@ public class TInteractionController extends BaseController {
         try {
             Map<String, Object> resultMap = new LinkedHashMap<String, Object>();
             if (StringUtils.isBlank(tInteraction.getName())||StringUtils.isBlank(tInteraction.getPassword())) {
-                resultMap.put("code", 400);
+                resultMap.put("code", "400");
                 resultMap.put("msg", "请输入用户名和密码");
                 return resultMap;
             }
             TUser user = userService.selectByUsername(tInteraction.getName());
             if (user == null) {
-                resultMap.put("code", 500);
+                resultMap.put("code", "500");
                 resultMap.put("msg", "用户名错误");
                 return resultMap;
             }
+            if ("2".equals(user.getType())) {
+                resultMap.put("code", "500");
+                resultMap.put("msg", "用户不是单位管理员");
+                return resultMap;
+            }
             byte[] salt = user.getPasswordSalt();
             if (!new String(SHA256PasswordEncryptionService.createPasswordHash(tInteraction.getPassword(), salt))
                     .equals(new String(user.getPasswordHash()))) {
-                resultMap.put("code", 500);
+                resultMap.put("code", "500");
                 resultMap.put("msg", "密码错误");
                 return resultMap;
             }

src/main/java/cn/wisenergy/chnmuseum/party/web/controller/TOrganController.java

@@ -73,6 +73,7 @@ public class TOrganController extends BaseController {
         organ.setCreateTime(DateUtil80.getDateTimeOfTimestamp(System.currentTimeMillis()));
         organ.setUpdateTime(DateUtil80.getDateTimeOfTimestamp(System.currentTimeMillis()));
         String organCode = getOrganCode(organ.getParentId());
+        organ.setLevel(organCode.length()/3);
         organ.setCode(organCode);
         organ.setId(organCode);
         // 保存业务节点信息
@@ -94,16 +95,17 @@ public class TOrganController extends BaseController {
 
         try {
             TOrgan byId = tOrganService.selectById(tOrgan.getId());
-            if (byId.getLevel()!=tOrgan.getLevel()&&byId.getChildren().size()>0){
+            if (!byId.getParentId().equals(tOrgan.getParentId())){
+                tOrgan.setCode(getOrganCode(tOrgan.getParentId()));
+            }
+            if (byId.getLevel()!=tOrgan.getCode().length()/3&&byId.getChildren().size()>0){
                 HashMap<String, Object> map = new HashMap<>();
-                map.put("resultCode", 500);
+                map.put("resultCode", "500");
                 map.put("message", "机构存在下级机构，不能修改机构级别！");
                 map.put("data", "");
                 return map;
             }
-            if (!byId.getParentId().equals(tOrgan.getParentId())){
-                tOrgan.setCode(getOrganCode(tOrgan.getParentId()));
-            }
+
             tOrgan.setUpdateTime(DateUtil80.getDateTimeOfTimestamp(System.currentTimeMillis()));
             boolean flag = false;
             flag = tOrganService.updateById(tOrgan);
@@ -271,15 +273,15 @@ public class TOrganController extends BaseController {
             List excelList = ImportExcelUtil.readExcel(file.getOriginalFilename(), file.getInputStream());
             flag = tOrganService.batchUpload(excelList);
             if (!flag) {
-                resultMap.put("resultCode",500);
+                resultMap.put("resultCode","500");
                 resultMap.put("massage","导入失败!");
                 return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(resultMap);
             }
-            resultMap.put("resultCode",200);
+            resultMap.put("resultCode","200");
             resultMap.put("massage","导入成功!");
             return ResponseEntity.ok(resultMap);
         } catch (Exception e) {
-            resultMap.put("resultCode",500);
+            resultMap.put("resultCode","500");
             resultMap.put("massage","导入失败!");
             return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(resultMap);
         }

src/main/resources/mapper/AuditMapper.xml

@@ -29,11 +29,17 @@
         left join t_organ o on o.id = a.organ_id
         left join t_user u on u.id = a.user_id
         where 1 = 1
-        <if test="name != null and name != ''">
-            and (u.user_name LIKE concat('%', #{name}, '%') or a.audit_content LIKE concat('%', #{name}, '%'))
+        <if test="user.userName != null and user.userName != ''">
+            and (u.user_name LIKE concat('%', #{user.userName}, '%') or a.content LIKE concat('%', #{user.userName}, '%'))
         </if>
-        <if test="status != null and name != ''">
-            and a.status = #{status}
+        <if test="user.status != null and user.status != ''">
+            and a.status = #{user.status}
+        </if>
+        <if test="user.auditStatus != null and user.auditStatus != ''">
+            and a.level = #{user.auditStatus}
+        </if>
+         <if test="user.orgCode != null and user.orgCode != ''">
+            and o.code LIKE concat(#{user.orgCode}, '%')
         </if>
         and a.is_deleted = false
         and a.type = 'ACCOUNT'

src/main/resources/mapper/TBoxOperationMapper.xml

@@ -28,6 +28,9 @@ left join t_organ r on r.id = b.organ_id
         <if test="status!= null and status != '' ">
             and b.status =#{status}
         </if>
+        <if test="areaId!= null and areaId != '' ">
+            and r.area_id like concat(#{areaId}, '%')
+        </if>
     </select>
 
     <select id="selectBoxPage" resultMap="BaseResultMap">
@@ -43,7 +46,7 @@ left join t_organ r on r.id = b.organ_id
         <if test="user.areaId!= null and user.areaId != '' ">
             and b.area_id =#{user.areaId}
         </if>
-        <if test=" ser.orgCode != null and user.orgCode != '' ">
+        <if test="user.orgCode != null and user.orgCode != '' ">
             and o.code LIKE concat(#{user.orgCode}, '%')
         </if>
         and u.is_deleted = false