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

src/main/java/cn/wisenergy/chnmuseum/party/common/enums/AuditOperationEnum.java

@@ -8,7 +8,8 @@ public enum AuditOperationEnum {
     ADD(1, "新增"),
     EDIT(2, "修改"),
     REMOVE(3, "下架"),
-    DISABLE(4, "禁用");
+    DISABLE(4, "禁用"),
+    UNABLE(5, "启用");
 
     // 错误编码
     private Integer code;

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();
+    List<TBoxOperation> getList(@Param("status") String status);
 
     List<TBoxOperation> selectBoxPage(Page<TBoxOperation> page,@Param("user") TUser user);
 }

src/main/java/cn/wisenergy/chnmuseum/party/model/Audit.java

@@ -56,7 +56,7 @@ public class Audit implements Serializable {
     @NotBlank(message = "提交人员不能为空", groups = {Add.class, Update.class})
     private String userId;
 
-    @ApiModelProperty("0,看板；1 视频；2 学习内容；3 账号禁用")
+    @ApiModelProperty(value = "审核内容", allowableValues = "视频内容 ASSET, 展板内容 EXHIBITION_BOARD, 学习内容 LEARNING_CONTENT, 账户 ACCOUNT")
     @TableField("type")
     @NotBlank(message = "0,看板；1 视频；2 学习内容；3 账号禁用不能为空", groups = {Add.class, Update.class})
     private String type;
@@ -65,7 +65,7 @@ public class Audit implements Serializable {
     @TableField("operation")
     private String operation;
 
-    @ApiModelProperty("审核状态")
+    @ApiModelProperty(value = "审核状态", allowableValues = "待初审 TBC, 驳回 REFUSED,待复审 TBCA, 通过APPROVED_FINAL")
     @TableField("status")
     private String status;
 
@@ -86,6 +86,10 @@ public class Audit implements Serializable {
     @TableField("remarks")
     private String remarks;
 
+    @ApiModelProperty(value = "审核层级", allowableValues = "初审 TBC,复审 TBCA")
+    @TableField("level")
+    private String level;
+
     @ApiModelProperty("机构名")
     @TableField(exist = false)
     private String orgName;

src/main/java/cn/wisenergy/chnmuseum/party/model/TUser.java

@@ -89,7 +89,7 @@ public class TUser implements Serializable {
     @TableField("exired_date")
     private LocalDate exiredDate;
     
-    @ApiModelProperty("状态 1.启用 2.禁用")
+    @ApiModelProperty(value = "状态", allowableValues = "启用 UNABLE, 禁用DISABLE")
     @TableField("status")
     private String status;
     
@@ -121,7 +121,7 @@ public class TUser implements Serializable {
     @TableField("type")
     private String type;
 
-    @ApiModelProperty("审核状态 1.待初审 2.已驳回 3.待复审  4.通过 ")
+    @ApiModelProperty(value = "审核状态", allowableValues = "待初审 TBC, 驳回 REFUSED,待复审 TBCA, 通过APPROVED_FINAL")
     @TableField("audit_status")
     private String auditStatus;
 

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();
+    List<TBoxOperation> getList(String status);
 
     Page<TBoxOperation> selectBoxPage(Page<TBoxOperation> page, TUser user);
 }

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

@@ -30,8 +30,8 @@ public class TBoxOperationServiceImpl extends ServiceImpl<TBoxOperationMapper, T
     private TBoxOperationMapper tBoxOperationMapper;
 
     @Override
-    public List<TBoxOperation> getList() {
-        return tBoxOperationMapper.getList();
+    public List<TBoxOperation> getList(String status) {
+        return tBoxOperationMapper.getList(status);
     }
 
     @Override

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

@@ -89,7 +89,6 @@ public class TOrganServiceImpl extends ServiceImpl<TOrganMapper, TOrgan> impleme
             String organCode = getOrganCode(organ.getParentId());
             organ.setCode(organCode);
             organ.setAreaId(area.get(map.get("区域")));
-            organ.setIcon(map.get("icon"));
             organ.setRemarks(map.get("备注"));
             organ.setIsDeleted(false);
             organ.setCreateTime(DateUtil80.getDateTimeOfTimestamp(System.currentTimeMillis()));

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

 package cn.wisenergy.chnmuseum.party.web.controller;
 
+import cn.wisenergy.chnmuseum.party.common.enums.AuditOperationEnum;
 import cn.wisenergy.chnmuseum.party.common.enums.AuditStatusEnum;
+import cn.wisenergy.chnmuseum.party.common.enums.AuditTypeEnum;
 import cn.wisenergy.chnmuseum.party.common.validator.groups.Update;
 import cn.wisenergy.chnmuseum.party.common.vo.GenericPageParam;
 import cn.wisenergy.chnmuseum.party.model.Audit;
+import cn.wisenergy.chnmuseum.party.model.TUser;
 import cn.wisenergy.chnmuseum.party.service.AuditService;
 import cn.wisenergy.chnmuseum.party.service.impl.TUserServiceImpl;
 import cn.wisenergy.chnmuseum.party.web.controller.base.BaseController;
@@ -47,6 +50,8 @@ public class AuditController extends BaseController {
     @RequiresPermissions("/audit/getUserList")
     @ApiOperation(value = "获取用户禁用审核列表", notes = "获取用户禁用审核列表")
     @ApiImplicitParams(value = {
+            @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 = "1待初审 2 驳回 3 待复审 4通过", paramType = "query", dataType = "String")
     })
@@ -66,29 +71,31 @@ public class AuditController extends BaseController {
     @ApiOperation(value = "修改禁用审核信息", notes = "修改禁用审核信息")
     public Map<String, Object> updateAudit(@Validated(value = {Update.class}) Audit audit) {
         boolean flag;
-        //todo 禁止使用整形值标识状态值，应使用enum来标识
-//        if (audit.getStatus() != 2){
-//            audit.setRemarks("");
-//        }
-//        try {
-//            if (audit.getType() == 3) {
-//                Audit audit1 = auditService.getById(audit.getId());
-//                TUser user = new TUser();
-//                user.setId(audit1.getRefItemId());
-//                user.setAuditStatus(audit.getStatus());
-//                if (audit.getStatus()==4) {
-//                    user.setStatus("2");
-//                }
-//                userService.updateById(user);
-//            }
-//            flag = auditService.updateById(audit);
-//            if (!flag) {
-//                return getFailResult();
-//            }
-//            return getSuccessResult();
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//        }
+        if (!AuditStatusEnum.TBCA.name().equals(audit.getStatus())){
+            audit.setLevel(AuditStatusEnum.TBCA.name());
+        }
+        if (!AuditStatusEnum.REFUSED.name().equals(audit.getStatus())){
+            audit.setRemarks("");
+        }
+        try {
+            if (AuditTypeEnum.ACCOUNT.name().equals(audit.getType())) {
+                Audit audit1 = auditService.getById(audit.getId());
+                TUser user = new TUser();
+                user.setId(audit1.getRefItemId());
+                user.setAuditStatus(audit.getStatus());
+                if (AuditStatusEnum.APPROVED_FINAL.name().equals(audit.getStatus())) {
+                    user.setStatus(AuditOperationEnum.DISABLE.name());
+                }
+                userService.updateById(user);
+            }
+            flag = auditService.updateById(audit);
+            if (!flag) {
+                return getFailResult();
+            }
+            return getSuccessResult();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
         return getFailResult();
     }
 

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

@@ -66,6 +66,7 @@ public class TBoxOperationController extends BaseController {
     @RequiresPermissions("/boxOperation/selectPageList")
     @ApiOperation(value = "获取机顶盒基础信息分页列表", notes = "获取机顶盒基础信息分页列表")
     public Map<String, Object> selectPageList(String organId,String areaId) {
+        TUser user1 = getcurUser();
         TUser user = new TUser();
         if (StringUtils.isNotBlank(organId)) {
             user.setOrgId(organId);
@@ -73,6 +74,7 @@ public class TBoxOperationController extends BaseController {
         if (StringUtils.isNotBlank(areaId)) {
             user.setAreaId(areaId);
         }
+        user.setOrgCode(user1.getOrgCode());
         Page<TBoxOperation> page = null;
         try {
             page = tBoxOperationService.selectBoxPage(getPage(), user);
@@ -149,10 +151,10 @@ public class TBoxOperationController extends BaseController {
     @GetMapping("/getList")
     @RequiresPermissions("/boxOperation/getList")
     @ApiOperation(value = "获取机顶盒运维信息全部列表(无分页)", notes = "获取机顶盒运维信息全部列表(无分页)")
-    public Map<String, Object> getTBoxOperationList() {
+    public Map<String, Object> getTBoxOperationList(String status) {
         List<TBoxOperation> tBoxOperationList = null;
         try {
-            tBoxOperationList = tBoxOperationService.getList();
+            tBoxOperationList = tBoxOperationService.getList(status);
             return getResult(tBoxOperationList);
         } catch (Exception e) {
             e.printStackTrace();

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

@@ -108,7 +108,7 @@ public class TUserController extends BaseController {
             user.setAreaId(areaId);
         }
         if (StringUtils.isNotBlank(status)) {
-            if ("1".equals(status) || "2".equals(status)) {
+            if (AuditOperationEnum.UNABLE.name().equals(status)||AuditOperationEnum.DISABLE.name().equals(status)) {
                 user.setStatus(status);
             } else {
                 user.setAuditStatus(status);
@@ -143,7 +143,7 @@ public class TUserController extends BaseController {
                 user.setAuditStatus(auditStatus);
             }
             if (StringUtils.isNotBlank(status)) {
-                if ("1".equals(status) || "2".equals(status)) {
+                if (AuditOperationEnum.UNABLE.name().equals(status)||AuditOperationEnum.DISABLE.name().equals(status)) {
                     user.setStatus(status);
                 } else {
                     user.setAuditStatus(status);
@@ -395,9 +395,8 @@ public class TUserController extends BaseController {
             TUser entity = new TUser();
             entity.setId(userId);
             //提交禁用审核，没有真正禁用
-            entity.setAuditStatus("1");
-            Integer code = AuditStatusEnum.TBC.getCode();
-            entity.setAuditStatus(code.toString());
+            String code = AuditStatusEnum.TBC.name();
+            entity.setAuditStatus(code);
             entity.setUpdateTime(DateUtil80.getDateTimeOfTimestamp(System.currentTimeMillis()));
 
             //添加到审核记录表
@@ -411,6 +410,7 @@ public class TUserController extends BaseController {
             audit.setOperation(AuditOperationEnum.DISABLE.name());
             audit.setStatus(AuditStatusEnum.TBC.name());
             audit.setIsDeleted(false);
+            audit.setLevel(AuditStatusEnum.TBC.name());
             audit.setCreateTime(LocalDateTime.now());
             auditService.save(audit);
 
@@ -434,35 +434,35 @@ public class TUserController extends BaseController {
         }
         return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(null);
     }
-
-    @PutMapping("/updateAuditStatus")
-    @RequiresPermissions("/user/updateAuditStatus")
-    @ApiOperation(value = "更新用户审核状态", notes = "更新用户审核状态")
-    @ApiImplicitParams(value = {
-            @ApiImplicitParam(name = "id", value = "标识ID", dataType = "String", paramType = "path"),
-            @ApiImplicitParam(name = "status", value = "状态", paramType = "query", dataType = "String")
-    })
-    @MethodLog(operModule = OperModule.USER, operType = OperType.UPDATE)
-    public Map<String, Object> updateStatus(@NotNull(message = "机构用户不能为空") @PathVariable("id") String id, @RequestParam("status") AuditStatusEnum status) {
-        boolean flag = false;
-        try {
-            TUser user = new TUser();
-            user.setId(id);
-            user.setAuditStatus(status.getCode().toString());
-            //当禁用审核通过后，真正禁用
-            if ("4".equals(status.getCode().toString())) {
-                user.setStatus("2");
-            }
-            flag = userService.updateById(user);
-            if (!flag) {
-                return getFailResult();
-            }
-            return getSuccessResult();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return getFailResult();
-    }
+//
+//    @PutMapping("/updateAuditStatus")
+//    @RequiresPermissions("/user/updateAuditStatus")
+//    @ApiOperation(value = "更新用户审核状态", notes = "更新用户审核状态")
+//    @ApiImplicitParams(value = {
+//            @ApiImplicitParam(name = "id", value = "标识ID", dataType = "String", paramType = "path"),
+//            @ApiImplicitParam(name = "status", value = "状态", paramType = "query", dataType = "String")
+//    })
+//    @MethodLog(operModule = OperModule.USER, operType = OperType.UPDATE)
+//    public Map<String, Object> updateStatus(@NotNull(message = "机构用户不能为空") @PathVariable("id") String id, @RequestParam("status") AuditStatusEnum status) {
+//        boolean flag = false;
+//        try {
+//            TUser user = new TUser();
+//            user.setId(id);
+//            user.setAuditStatus(status.getCode().toString());
+//            //当禁用审核通过后，真正禁用
+//            if ("4".equals(status.getCode().toString())) {
+//                user.setStatus("2");
+//            }
+//            flag = userService.updateById(user);
+//            if (!flag) {
+//                return getFailResult();
+//            }
+//            return getSuccessResult();
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+//        return getFailResult();
+//    }
 
     @OperationLog("启用成员")
     @ApiOperation(value = "启用")
@@ -475,7 +475,7 @@ public class TUserController extends BaseController {
 
             TUser entity = new TUser();
             entity.setId(userId);
-            entity.setStatus("1");
+            entity.setStatus(AuditOperationEnum.UNABLE.name());
             entity.setUpdateTime(DateUtil80.getDateTimeOfTimestamp(System.currentTimeMillis()));
             boolean ret = this.userService.updateById(entity);
             if (!ret) {

src/main/resources/mapper/TBoxOperationMapper.xml

@@ -24,6 +24,10 @@
        SELECT b.*,r.`name` organ_name
 FROM t_box_operation b
 left join t_organ r on r.id = b.organ_id
+        where 1=1
+        <if test="status!= null and status != '' ">
+            and b.status =#{status}
+        </if>
     </select>
 
     <select id="selectBoxPage" resultMap="BaseResultMap">
@@ -39,6 +43,9 @@ 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 != '' ">
+            and o.code LIKE concat(#{user.orgCode}, '%')
+        </if>
         and u.is_deleted = false
         and u.type = 3
         order by b.create_time desc

src/main/resources/mapper/TUserMapper.xml

@@ -73,7 +73,7 @@
             and u.status = #{user.status}
         </if>
         <if test=" user.auditStatus != null and user.auditStatus != '' ">
-            and (u.audit_status = "1" or u.audit_status = "3")
+            and u.audit_status LIKE "TBC%"
         </if>
         <if test=" user.type != null and user.type != '' ">
             and u.type = #{user.type}
@@ -113,7 +113,7 @@
         <if test=" user.orgId != null and user.orgId != '' ">
             and u.org_id = #{user.orgId}
         </if>
-        <if test=" user.orgCode != null and user.orgCode != '' ">
+        <if test="user.orgCode != null and user.orgCode != '' ">
             and o.code LIKE concat(#{user.orgCode}, '%')
         </if>
         <if test=" user.areaId != null and user.areaId != '' ">