Merge remote-tracking branch 'origin/master'

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

pom.xml

@@ -120,12 +120,12 @@
         <dependency>
             <groupId>org.apache.poi</groupId>
             <artifactId>poi</artifactId>
-            <version>3.17</version>
+            <version>5.0.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.poi</groupId>
             <artifactId>poi-ooxml</artifactId>
-            <version>3.17</version>
+            <version>5.0.0</version>
         </dependency>
 
         <!-- Swagger2 Document -->
@@ -257,7 +257,7 @@
         <dependency>
             <groupId>cn.hutool</groupId>
             <artifactId>hutool-all</artifactId>
-            <version>5.6.0</version>
+            <version>5.6.2</version>
         </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>

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

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

src/main/java/cn/wisenergy/chnmuseum/party/common/log/OperType.java

@@ -10,7 +10,7 @@ public enum OperType {
     ADD(2,"新增"),
     UPDATE(3,"修改"),
     DELETE(4,"删除"),
-    UNABLE(5,"启用"),
+    ENABLE(5,"启用"),
     DISABLE(6,"禁用"),
     IMPORT(7,"导入"),
     LOGIN(8,"登录");

src/main/java/cn/wisenergy/chnmuseum/party/common/util/ImportExcelUtil.java

 package cn.wisenergy.chnmuseum.party.common.util;
 
-
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 
 import java.io.InputStream;
@@ -27,10 +23,10 @@ public class ImportExcelUtil {
         }
     }
 
-    public static List<Map<String,String>> readExcel(String fileName,InputStream is) throws Exception {
+    public static List<Map<String, String>> readExcel(String fileName, InputStream is) throws Exception {
 
         boolean ret = isXls(fileName);
-        Workbook workbook = null;
+        Workbook workbook;
         // 根据文件后缀创建不同的对象
         if (ret) {
             workbook = new HSSFWorkbook(is);
@@ -45,30 +41,28 @@ public class ImportExcelUtil {
         //列数
         int lastCellNum = titleRow.getLastCellNum();
 
-        List<Map<String,String>> list = new ArrayList<>();
+        List<Map<String, String>> list = new ArrayList<>();
 
         for (int i = 1; i <= lastRowNum; i++) {
             ArrayList<String> list1 = new ArrayList<>();
-            HashMap<String,String> map = new HashMap<>();
+            HashMap<String, String> map = new HashMap<>();
             //获取行数据
             Row row = sheet.getRow(i);
             for (int j = 0; j < lastCellNum; j++) {
                 //获取单元格
                 Cell cell = row.getCell(j);
-                if (cell!=null) {
-                    cell.setCellType(Cell.CELL_TYPE_STRING);
+                if (cell != null) {
+                    cell.setCellFormula(CellType.STRING.name());
                     //获取单元格数据
                     list1.add(cell.getStringCellValue());
                     //列名 ：数据
                     map.put(titleRow.getCell(j).getStringCellValue(), cell.getStringCellValue());
-                }else {
-                    continue;
                 }
             }
             list.add(map);
         }
         is.close();
         return list;
-
     }
+
 }
\ No newline at end of file

src/main/java/cn/wisenergy/chnmuseum/party/common/vo/DatumVo.java

+package cn.wisenergy.chnmuseum.party.common.vo;
+
+import lombok.*;
+import lombok.experimental.Accessors;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+public class DatumVo {
+
+    private String fileName;
+
+    private String fileExtName;
+
+    private String fileType;
+
+    private Long fileSize;
+
+    private String fileUrl;
+
+    private String updateTime;
+
+    private String md5;
+
+}

src/main/java/cn/wisenergy/chnmuseum/party/conf/MvcConfiguration.java

@@ -81,7 +81,7 @@ public class MvcConfiguration extends WebMvcConfigurationSupport {
 //        serializeConfig.put(Long.class, ToStringSerializer.instance);
 //        serializeConfig.put(Long.TYPE, ToStringSerializer.instance);
         serializeConfig.setPropertyNamingStrategy(PropertyNamingStrategy.CamelCase);
-        serializeConfig.put(LocalDateTime.class, new MyLocalDateTimeSerializer("yyyy-MM-dd hh:mm:ss"));
+        serializeConfig.put(LocalDateTime.class, new MyLocalDateTimeSerializer("yyyy-MM-dd HH:mm:ss"));
         serializeConfig.put(LocalDate.class, new MyLocalDateSerializer("yyyy-MM-dd"));
         fastJsonConfig.setSerializeConfig(serializeConfig);
 

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

@@ -31,13 +31,28 @@ public interface LearningContentBoardMapper extends BaseMapper<LearningContentBo
     )
     IPage<ExhibitionBoard> selectBoardPageByLearningContentId(Page<?> page, String learningContentId, String nameOrCode);
 
-    @Select("<script>" + "SELECT a.* FROM learning_content_board lcb, learning_content lc, exhibition_board eb, asset a "
+    @Select("<script>"
+            + "SELECT a.* FROM learning_content_board lcb, learning_content lc, exhibition_board eb, asset a "
             + "WHERE lcb.learning_content_id = lc.id "
             + "and lcb.exhibition_board_id = eb.id "
             + "and eb.asset_id = a.id "
-            + "and lc.organ_id = #{organId}"
+            + "and lc.applicable_scope = 'THIS_ORGAN' "
+            + "and lc.organ_code = #{organCode} "
+            + "UNION "
+            + "SELECT a.* FROM learning_content_board lcb, learning_content lc, exhibition_board eb, asset a "
+            + "WHERE lcb.learning_content_id = lc.id "
+            + "and lcb.exhibition_board_id = eb.id "
+            + "and eb.asset_id = a.id "
+            + "and lc.applicable_scope = 'THIS_ORGAN_SUB'"
+            + "and lc.organ_code like CONCAT(#{organCode},'%') "
+            + "UNION "
+            + "SELECT a.* FROM learning_content_board lcb, learning_content lc, exhibition_board eb, asset a "
+            + "WHERE lcb.learning_content_id = lc.id "
+            + "and lcb.exhibition_board_id = eb.id "
+            + "and eb.asset_id = a.id "
+            + "and lc.applicable_scope = 'ALL_PLAT'"
             + "</script>"
     )
-    IPage<Asset> selectAssetPageByOrganId(Page<?> page, String organId);
+    IPage<Asset> selectAssetPageByOrganCode(Page<?> page, String organCode);
 
 }

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

@@ -144,4 +144,8 @@ public class ExhibitionBoard implements Serializable {
     @TableField(exist = false)
     private List<String> materialUrlList;
 
+    @ApiModelProperty("所属学习内容ID")
+    @TableField(exist = false)
+    private String learningContentId;
+
 }

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

@@ -54,9 +54,9 @@ public class LearningContent implements Serializable {
     @NotBlank(message = "适用范围不能为空", groups = {Add.class, Update.class})
     private String applicableScope;
 
-    @ApiModelProperty(value = "机构ID")
-    @TableField("organ_id")
-    private String organId;
+    @ApiModelProperty(value = "机构编码")
+    @TableField("organ_code")
+    private String organCode;
 
     @ApiModelProperty("学习项目ID")
     @TableField("learning_project_id")

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(value = "状态", allowableValues = "启用 UNABLE, 禁用DISABLE")
+    @ApiModelProperty(value = "状态", allowableValues = "启用 ENABLE, 禁用DISABLE")
     @TableField("status")
     private String status;
     

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

@@ -23,6 +23,6 @@ public interface LearningContentBoardService extends IService<LearningContentBoa
 
     IPage<ExhibitionBoard> getBoardPageByLearningContentId(Page<ExhibitionBoard> page, String learningContentId, String nameOrCode);
 
-    IPage<Asset> getAssetPageByOrganId(Page<ExhibitionBoard> page, String organId);
+    IPage<Asset> getAssetPageByOrganCode(Page<ExhibitionBoard> page, String organCode);
 
 }

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

@@ -38,8 +38,8 @@ public class LearningContentBoardServiceImpl extends ServiceImpl<LearningContent
     }
 
     @Override
-    public IPage<Asset> getAssetPageByOrganId(Page<ExhibitionBoard> page, String organId) {
-        return learningContentBoardMapper.selectAssetPageByOrganId(page, organId);
+    public IPage<Asset> getAssetPageByOrganCode(Page<ExhibitionBoard> page, String organCode) {
+        return learningContentBoardMapper.selectAssetPageByOrganCode(page, organCode);
     }
 
 }

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

@@ -99,7 +99,8 @@ public class TBoardStatisticServiceImpl extends ServiceImpl<TBoardStatisticMappe
 
     @Override
     public Page<TDistrictBoardStatistic> getBoardDistrictPageList(Page<TDistrictBoardStatistic> page, TDistrictBoardStatistic district){
-        page.setRecords(boardStatisticMapper.getBoardDistrictPageList(page,district));
+        List<TDistrictBoardStatistic> list = boardStatisticMapper.getBoardDistrictPageList(page, district);
+       page.setRecords(list);
         return page;
     }
 
@@ -128,6 +129,8 @@ public class TBoardStatisticServiceImpl extends ServiceImpl<TBoardStatisticMappe
         QueryWrapper qw = new QueryWrapper();
         qw.eq("type","P");
         List<TArea> provlist = areaService.list(qw);
+        provlist.stream().forEach(l->l.setName(l.getName().replace("省","").replace("市","").
+                replace("自治区","").replace("特别行政区","").replace("壮族","").replace("回族","").replace("维吾尔","")));
         // 遍历省份，统计各省播放量
         TBoardSurvey survey = new TBoardSurvey();
         String dateStr = DateUtil.getCurrentDate("yyyyMM");

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

@@ -46,7 +46,7 @@ public class TUserServiceImpl extends ServiceImpl<TUserMapper, TUser> implements
         List<TUser> list = tUserMapper.getList(page,user);
         for (TUser u : list) {
             if (AuditStatusEnum.REFUSED.name().equals(u.getAuditStatus())||AuditStatusEnum.APPROVED_FINAL.name().equals(u.getAuditStatus())){
-                if (AuditOperationEnum.UNABLE.name().equals(u.getStatus())){
+                if (AuditOperationEnum.ENABLE.name().equals(u.getStatus())){
                     u.setStatusName("活跃");
                 }else {
                     u.setStatusName("禁用");

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

@@ -88,32 +88,41 @@ public class AuditController extends BaseController {
     @ApiOperation(value = "修改禁用审核信息", notes = "修改禁用审核信息")
     public Map<String, Object> updateAudit(@RequestBody @Validated(value = {Update.class}) Audit audit) {
         boolean flag;
-        if (AuditStatusEnum.APPROVED_FINAL.name().equals(audit.getStatus()) && AuditStatusEnum.TBC.name().equals(audit.getLevel())) {
-            audit.setLevel(AuditStatusEnum.TBCA.name());
-            audit.setStatus(AuditStatusEnum.TBCA.name());
-        }
+        //如果层级是初审，设置初审时间
         if (AuditStatusEnum.TBC.name().equals(audit.getLevel())) {
             audit.setFirstTime(LocalDateTime.now());
+            //如果审核状态不是驳回，清空驳回原因
             if (!AuditStatusEnum.REFUSED.name().equals(audit.getStatus())) {
                 audit.setFirstRemarks("");
             }
-        } else {
+        }else{
+            //如果层级是复审，设置复审时间
             audit.setSecondTime(LocalDateTime.now());
+            //如果审核状态不是驳回，清空驳回原因
             if (!AuditStatusEnum.REFUSED.name().equals(audit.getStatus())) {
                 audit.setSecondRemarks("");
             }
         }
+        //如果当前审核状态为通过，并且审核层级为初审
+        if (AuditStatusEnum.APPROVED_FINAL.name().equals(audit.getStatus()) && AuditStatusEnum.TBC.name().equals(audit.getLevel())) {
+            //初审通过，提交复审，设置层级为复审
+            audit.setLevel(AuditStatusEnum.TBCA.name());
+            audit.setStatus(AuditStatusEnum.TBCA.name());
+        }
         try {
+            //如果类型是用户禁用审核
             if (AuditTypeEnum.ACCOUNT.name().equals(audit.getType())) {
-                Audit audit1 = auditService.getById(audit.getId());
-                TUser user = new TUser();
-                user.setId(audit1.getRefItemId());
+                //设置用户原始数据状态
+                TUser user = userService.getById(audit.getRefItemId());
+                //无论初审复审，及时更新审核状态
                 user.setAuditStatus(audit.getStatus());
-                if (AuditStatusEnum.APPROVED_FINAL.name().equals(audit.getStatus())) {
+                //如果复审通过，真正禁用用户
+                if (AuditStatusEnum.APPROVED_FINAL.name().equals(audit.getStatus())&&AuditStatusEnum.TBCA.name().equals(audit.getLevel())) {
                     user.setStatus(AuditOperationEnum.DISABLE.name());
                 }
                 userService.updateById(user);
             }
+            //更新审核数据
             flag = auditService.updateById(audit);
             if (!flag) {
                 return getFailResult();
@@ -185,13 +194,23 @@ public class AuditController extends BaseController {
     @ApiOperation(value = "获取禁用审核详情", notes = "获取禁用审核详情")
     @GetMapping("/getById")
     @RequiresPermissions("/audit/getById")
-    public Map<String, Object> getById(String id) {
+    public Map<String, Object> getById(String id, String type) {
         HashMap<String, Object> resultMap = new HashMap<>();
         try {
-            Audit audit = new Audit();
+            Audit audit = null;
             UpdateWrapper<Audit> wrapper = new UpdateWrapper<>();
+            if (StringUtils.isNotBlank(id)) {
                 wrapper.eq("ref_item_id", id);
-            audit = auditService.getOne(wrapper);
+            }
+            if (StringUtils.isNotBlank(type)) {
+                wrapper.eq("type", type);
+            }
+            wrapper.orderByDesc("create_time");
+            //只获取最新的一条审核数据
+            List<Audit> list = auditService.list(wrapper);
+            if (list.size() > 0) {
+                audit = list.get(0);
+            }
             resultMap.put("resultCode", "200");
             resultMap.put("message", "操作成功");
             resultMap.put("data", audit);

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

@@ -215,9 +215,9 @@ public class BankBranchInfoController extends BaseController {
                 return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(resultMap);
             }
             // 201
-            resultMap.put("status", 201);
+            resultMap.put("status", 200);
             resultMap.put("message", "添加成功");
-            return ResponseEntity.status(HttpStatus.CREATED).body(resultMap);
+            return ResponseEntity.status(HttpStatus.OK).body(resultMap);
         } catch (Exception e) {
             logger.error("添加错误!", e);
         }
@@ -253,7 +253,7 @@ public class BankBranchInfoController extends BaseController {
                 resultMap.put("message", "修改失败");
                 return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(resultMap);
             } else {
-                resultMap.put("status", 201);
+                resultMap.put("status", 200);
                 resultMap.put("message", "修改成功");
                 return ResponseEntity.ok(resultMap);
             }
@@ -343,9 +343,9 @@ public class BankBranchInfoController extends BaseController {
                 return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(resultMap);
             }
             // 201
-            resultMap.put("status", 201);
+            resultMap.put("status", 200);
             resultMap.put("message", "删除成功！");
-            return ResponseEntity.status(HttpStatus.CREATED).body(resultMap);
+            return ResponseEntity.status(HttpStatus.OK).body(resultMap);
         } catch (Exception e) {
             logger.error("服务器错误!", e);
         }
@@ -387,7 +387,7 @@ public class BankBranchInfoController extends BaseController {
             }
             map.put("status", "201");
             map.put("message", "删除成功");
-            return ResponseEntity.status(HttpStatus.CREATED).body(map);
+            return ResponseEntity.status(HttpStatus.OK).body(map);
         } catch (Exception e) {
             logger.error("服务器错误!", e);
         }
@@ -454,7 +454,7 @@ public class BankBranchInfoController extends BaseController {
                 resultMap.put("message", "上传失败");
                 return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(resultMap);
             } else {
-                resultMap.put("status", 201);
+                resultMap.put("status", 200);
                 resultMap.put("message", "上传成功");
                 return ResponseEntity.ok(resultMap);
             }
@@ -486,7 +486,7 @@ public class BankBranchInfoController extends BaseController {
                 resultMap.put("message", "删除底图失败");
                 return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(resultMap);
             } else {
-                resultMap.put("status", 201);
+                resultMap.put("status", 200);
                 resultMap.put("message", "删除底图成功");
                 return ResponseEntity.ok(resultMap);
             }
@@ -514,7 +514,7 @@ public class BankBranchInfoController extends BaseController {
                 resultMap.put("message", "提交失败");
                 return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(resultMap);
             } else {
-                resultMap.put("status", 201);
+                resultMap.put("status", 200);
                 resultMap.put("message", "提交成功");
                 return ResponseEntity.ok(resultMap);
             }
@@ -561,7 +561,7 @@ public class BankBranchInfoController extends BaseController {
             } else {
                 map.put("status", "201");
                 map.put("message", "审核通过成功");
-                return ResponseEntity.status(HttpStatus.CREATED).body(map);
+                return ResponseEntity.status(HttpStatus.OK).body(map);
             }
         } catch (Exception e) {
             logger.error("审核通过失败!", e);
@@ -616,7 +616,7 @@ public class BankBranchInfoController extends BaseController {
             } else {
                 map.put("status", "201");
                 map.put("message", "审核驳回成功");
-                return ResponseEntity.status(HttpStatus.CREATED).body(map);
+                return ResponseEntity.status(HttpStatus.OK).body(map);
             }
         } catch (Exception e) {
             logger.error("审核驳回失败!", e);
@@ -650,7 +650,7 @@ public class BankBranchInfoController extends BaseController {
             }
             map.put("status", "201");
             map.put("message", "申请下线成功");
-            return ResponseEntity.status(HttpStatus.CREATED).body(map);
+            return ResponseEntity.status(HttpStatus.OK).body(map);
         } catch (Exception e) {
             logger.error("申请下线出错!", e);
         }
@@ -684,7 +684,7 @@ public class BankBranchInfoController extends BaseController {
             }
             map.put("status", "201");
             map.put("message", "申请上线成功");
-            return ResponseEntity.status(HttpStatus.CREATED).body(map);
+            return ResponseEntity.status(HttpStatus.OK).body(map);
         } catch (Exception e) {
             logger.error("申请上线出错!", e);
         }
@@ -734,7 +734,7 @@ public class BankBranchInfoController extends BaseController {
             } else {
                 map.put("status", "201");
                 map.put("message", "排序成功");
-                return ResponseEntity.status(HttpStatus.CREATED).body(map);
+                return ResponseEntity.status(HttpStatus.OK).body(map);
             }
         } catch (Exception e) {
             logger.error("排序失败!", e);

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

@@ -7,6 +7,7 @@ import cn.wisenergy.chnmuseum.party.common.mvc.InterfaceException;
 import cn.wisenergy.chnmuseum.party.common.util.TimeUtils;
 import cn.wisenergy.chnmuseum.party.common.validator.groups.Add;
 import cn.wisenergy.chnmuseum.party.common.vo.AudioVo;
+import cn.wisenergy.chnmuseum.party.common.vo.DatumVo;
 import cn.wisenergy.chnmuseum.party.common.vo.GenericPageParam;
 import cn.wisenergy.chnmuseum.party.common.vo.VideoVo;
 import cn.wisenergy.chnmuseum.party.model.*;
@@ -132,7 +133,9 @@ public class ChinaMobileRestApiController extends BaseController {
                 final String organId = tBoxOperation.getOrganId();
                 final TUser tUser = getcurUser();
                 if (tUser != null && organId.equals(tUser.getOrgId())) {
-                    return getResult(tBoxOperation.getPrivateKey());
+                    JSONObject jsonObject = new JSONObject();
+                    jsonObject.put("key", tBoxOperation.getPrivateKey());
+                    return getResult(jsonObject);
                 } else {
                     throw new InterfaceException("400", "您无权获取本单位机顶盒密钥");
                 }
@@ -367,7 +370,7 @@ public class ChinaMobileRestApiController extends BaseController {
     @PostMapping("/exhibitionBoard/getPage")
     @RequiresPermissions("exhibition:board:page")
     @ApiOperation(value = "展板列表查询", notes = "展板列表查询")
-    public Map<String, Object> getExhibitionBoardPageList(@RequestParam(value = "learningContentId", required = false) String learningContentId) {
+    public Map<String, Object> getExhibitionBoardPageList(@RequestParam(value = "learningContentId") String learningContentId) {
         final IPage<ExhibitionBoard> page = this.learningContentBoardService.getBoardPageByLearningContentId(getPage(), learningContentId, null);
         for (ExhibitionBoard exhibitionBoard : page.getRecords()) {
             if (exhibitionBoard.getAssetCopyrightOwnerId() != null) {
@@ -384,6 +387,8 @@ public class ChinaMobileRestApiController extends BaseController {
             final List<VideoVo> videoVoList = JSONObject.parseObject(videoUrl, new TypeReference<List<VideoVo>>() {
             }, Feature.OrderedField);
             exhibitionBoard.setVideoUrlList(videoVoList.stream().map(VideoVo::getFileUrl).collect(Collectors.toList()));
+            exhibitionBoard.setVideoUrl(videoUrl);
+            exhibitionBoard.setLearningContentId(learningContentId);
         }
         return getResult(page);
     }
@@ -452,16 +457,19 @@ public class ChinaMobileRestApiController extends BaseController {
     @ApiImplicitParams(value = {
             @ApiImplicitParam(name = "_index", value = "分页起始偏移量", paramType = "query", dataType = "Integer"),
             @ApiImplicitParam(name = "_size", value = "返回条数", paramType = "query", dataType = "Integer"),
-            @ApiImplicitParam(name = "nameOrCode", value = "名称或编码", paramType = "query", dataType = "String"),
-            @ApiImplicitParam(name = "startDate", value = "创建时间-开始", paramType = "query", dataType = "String"),
-            @ApiImplicitParam(name = "endDate", value = "创建时间-结束", paramType = "query", dataType = "String")
+            @ApiImplicitParam(name = "learningProjectId", value = "学习项目ID", paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "nameOrCode", value = "名称或编码", paramType = "query", dataType = "String")
     })
     @PostMapping("/learningContent/getPage")
     @RequiresPermissions("learning:content:page")
     @ApiOperation(value = "查询学习内容", notes = "查询学习内容")
-    public Map<String, Object> getLearningContentPageList(GenericPageParam genericPageParam) {
+    public Map<String, Object> getLearningContentPageList(GenericPageParam genericPageParam, @RequestParam(value = "learningProjectId", required = false) String learningProjectId) {
         LambdaQueryWrapper<LearningContent> queryWrapper = new LambdaQueryWrapper<>();
         // 对名称或编码模糊查询
+        if (StringUtils.isNotBlank(learningProjectId)) {
+            queryWrapper.eq(LearningContent::getLearningProjectId, learningProjectId);
+        }
+        // 对名称或编码模糊查询
         if (StringUtils.isNotBlank(genericPageParam.getNameOrCode())) {
             queryWrapper.like(LearningContent::getName, genericPageParam.getNameOrCode());
         }
@@ -532,19 +540,18 @@ public class ChinaMobileRestApiController extends BaseController {
     }
 
     @ApiImplicitParams(value = {
-            @ApiImplicitParam(name = "_index", value = "分页起始偏移量", paramType = "query", dataType = "Integer"),
-            @ApiImplicitParam(name = "_size", value = "返回条数", paramType = "query", dataType = "Integer"),
-            @ApiImplicitParam(name = "boardId", value = "名称或编码", paramType = "query", dataType = "String")
+            @ApiImplicitParam(name = "boardId", value = "展板内容ID", paramType = "path", dataType = "String", required = true)
     })
-    @PostMapping("/exhibitionBoard/getRefMaterial")
+    @GetMapping("/exhibitionBoard/getRefMaterial/{boardId}")
     @RequiresPermissions("learning:project:page")
     @ApiOperation(value = "展板参考资料查询", notes = "展板参考资料查询")
-    public Map<String, Object> getBoardRefMaterial(@RequestParam(value = "boardId", required = false) String boardId) {
+    public Map<String, Object> getBoardRefMaterial(@PathVariable(value = "boardId") String boardId) {
         final ExhibitionBoard exhibitionBoard = this.exhibitionBoardService.getById(boardId);
+
         final String refMaterialUrl = exhibitionBoard.getRefMaterialUrl();
-        final List<AudioVo> audioVoList = JSONObject.parseObject(refMaterialUrl, new TypeReference<List<AudioVo>>() {
+        final List<DatumVo> datumVoList = JSONObject.parseObject(refMaterialUrl, new TypeReference<List<DatumVo>>() {
         }, Feature.OrderedField);
-        return getResult(audioVoList);
+        return getResult(datumVoList);
     }
 
     @ApiImplicitParams(value = {
@@ -570,10 +577,13 @@ public class ChinaMobileRestApiController extends BaseController {
     @ApiOperation(value = "获取当前用户可查看的视频信息", notes = "获取当前用户可查看的视频信息")
     public Map<String, Object> getAssetPageByOrganId() {
         final TUser tUser = getcurUser();
-        final String orgId = tUser.getOrgId();
-        IPage<Asset> page = this.learningContentBoardService.getAssetPageByOrganId(getPage(), orgId);
+        if (tUser != null && tUser.getOrgCode() != null) {
+            final String orgCode = tUser.getOrgCode();
+            IPage<Asset> page = this.learningContentBoardService.getAssetPageByOrganCode(getPage(), orgCode);
             return getResult(page);
         }
+        return getFailResult("400", "用户未登录");
+    }
 
     @ApiOperation(value = "app最新版本查询")
     @ApiImplicitParams({

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

@@ -191,9 +191,9 @@ public class DemandInfoController extends BaseController {
                 logger.info(zhCnt);
             }
             // 201
-            resultMap.put("status", 201);
+            resultMap.put("status", 200);
             resultMap.put("message", "提交成功");
-            return ResponseEntity.status(HttpStatus.CREATED).body(resultMap);
+            return ResponseEntity.status(HttpStatus.OK).body(resultMap);
         } catch (Exception e) {
             logger.error("提交错误!", e);
         }
@@ -244,7 +244,7 @@ public class DemandInfoController extends BaseController {
                 resultMap.put("message", "反馈失败");
                 return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(resultMap);
             } else {
-                resultMap.put("status", 201);
+                resultMap.put("status", 200);
                 resultMap.put("message", "反馈成功");
                 return ResponseEntity.ok(resultMap);
             }

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

@@ -227,10 +227,10 @@ public class EmployeeController extends BaseController {
                 return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
                         .body(resultMap);
             }
-            resultMap.put("status", 201);
+            resultMap.put("status", 200);
             resultMap.put("message", "添加成功");
             // 201
-            return ResponseEntity.status(HttpStatus.CREATED).body(resultMap);
+            return ResponseEntity.status(HttpStatus.OK).body(resultMap);
         } catch (Exception e) {
             resultMap.put("status", 500);
             resultMap.put("message", "服务器忙");
@@ -296,9 +296,9 @@ public class EmployeeController extends BaseController {
                 return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(resultMap);
             }
             // 204
-            resultMap.put("status", 201);
+            resultMap.put("status", 200);
             resultMap.put("message", "更新成功");
-            return ResponseEntity.status(HttpStatus.CREATED).body(resultMap);
+            return ResponseEntity.status(HttpStatus.OK).body(resultMap);
         } catch (Exception e) {
             logger.error("更新错误!", e);
         }
@@ -339,9 +339,9 @@ public class EmployeeController extends BaseController {
                 resultMap.put("message", "删除失败");
                 return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(resultMap);
             }
-            resultMap.put("status", 201);
+            resultMap.put("status", 200);
             resultMap.put("message", "删除成功");
-            return ResponseEntity.status(HttpStatus.CREATED).body(resultMap);
+            return ResponseEntity.status(HttpStatus.OK).body(resultMap);
         } catch (Exception e) {
             logger.error("删除用户出错!", e);
         }
@@ -395,13 +395,13 @@ public class EmployeeController extends BaseController {
                 return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(resultMap);
             }
 
-            resultMap.put("status", 201);
+            resultMap.put("status", 200);
             String message = "删除成功";
             if (!"".equals(empId) && flag) {
                 message = "admin不能被删除，其他选中用户删除成功";
             }
             resultMap.put("message", message);
-            return ResponseEntity.status(HttpStatus.CREATED).body(resultMap);
+            return ResponseEntity.status(HttpStatus.OK).body(resultMap);
         } catch (Exception e) {
             logger.error("删除失败!", e);
         }
@@ -437,9 +437,9 @@ public class EmployeeController extends BaseController {
                 resultMap.put("message", "禁用失败");
                 return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(resultMap);
             }
-            resultMap.put("status", 201);
+            resultMap.put("status", 200);
             resultMap.put("message", "禁用成功");
-            return ResponseEntity.status(HttpStatus.CREATED).body(resultMap);
+            return ResponseEntity.status(HttpStatus.OK).body(resultMap);
         } catch (Exception e) {
             logger.error("禁用用户出错!", e);
         }
@@ -485,9 +485,9 @@ public class EmployeeController extends BaseController {
                 resultMap.put("message", "禁用失败");
                 return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(resultMap);
             }
-            resultMap.put("status", 201);
+            resultMap.put("status", 200);
             resultMap.put("message", "禁用成功");
-            return ResponseEntity.status(HttpStatus.CREATED).body(resultMap);
+            return ResponseEntity.status(HttpStatus.OK).body(resultMap);
         } catch (Exception e) {
             logger.error("用户禁用失败!", e);
         }
@@ -522,7 +522,7 @@ public class EmployeeController extends BaseController {
             }
             map.put("status", "201");
             map.put("message", "启用成功");
-            return ResponseEntity.status(HttpStatus.CREATED).body(map);
+            return ResponseEntity.status(HttpStatus.OK).body(map);
         } catch (Exception e) {
             logger.error("用户启用出错!", e);
         }
@@ -562,7 +562,7 @@ public class EmployeeController extends BaseController {
             } else {
                 map.put("status", "201");
                 map.put("message", "批量启动成功");
-                return ResponseEntity.status(HttpStatus.CREATED).body(map);
+                return ResponseEntity.status(HttpStatus.OK).body(map);
             }
         } catch (Exception e) {
             logger.error("批量启动失败!", e);
@@ -636,7 +636,7 @@ public class EmployeeController extends BaseController {
             map.put("status", "201");
             map.put("message", "重置密码成功");
             map.put("password", newPassword);
-            return ResponseEntity.status(HttpStatus.CREATED).body(map);
+            return ResponseEntity.status(HttpStatus.OK).body(map);
         } catch (Exception e) {
             logger.error("重置密码出错!", e);
         }

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

@@ -8,6 +8,7 @@ import cn.wisenergy.chnmuseum.party.common.enums.RESPONSE_CODE_ENUM;
 import cn.wisenergy.chnmuseum.party.common.mvc.InterfaceException;
 import cn.wisenergy.chnmuseum.party.common.vo.BatchUploadResVO;
 import cn.wisenergy.chnmuseum.party.common.vo.ImageUploadResult;
+import cn.wisenergy.chnmuseum.party.web.controller.base.BaseController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -16,17 +17,12 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
 
 /**
  * <p>
@@ -40,12 +36,12 @@ import java.util.Objects;
 @RestController
 @RequestMapping("/file")
 @Api(tags = {"文件上传接口"})
-public class FileUploadController {
+public class FileUploadController extends BaseController {
 
     private static final String[] IMAGE_TYPE = new String[]{"JPG", "JPEG", "PNG", "BMP", "WBMP"};
-    private static final String[] AUDIO_TYPE = new String[]{"MP3", "AAC", "WMA", "WAV", "FLAC", "RM", "OGG"};
+    private static final String[] AUDIO_TYPE = new String[]{"MP3", "AAC", "WMA", "FLAC", "RM", "OGG"};
     private static final String[] VIDEO_TYPE = new String[]{"MP4", "FLV"};
-    private static final String[] DOC_TYPE = new String[]{"PDF", "DOC", "DOCX", "XLS", "XLSX", "PPT", "PPTX"};
+    private static final String[] DOC_TYPE = new String[]{"PDF", "DOC", "DOCX", "PPT", "PPTX", "XLS", "XLSX"};
     private static final String[] DATUM_TYPE = ArrayUtil.addAll(DOC_TYPE, IMAGE_TYPE, VIDEO_TYPE);
 
 //    @RequestMapping(value = "/upload", method = RequestMethod.POST)
@@ -95,7 +91,7 @@ public class FileUploadController {
 //            // 不合法，将磁盘上的文件删除
 //            FastDFSUtils.deletePic(picUrl);
 //        }
-//        return ResponseEntity.status(HttpStatus.CREATED).body(fileUploadResult);
+//        return ResponseEntity.status(HttpStatus.OK).body(fileUploadResult);
 //    }
 
     @ApiImplicitParams({
@@ -103,7 +99,7 @@ public class FileUploadController {
     })
     @PostMapping(value = "/datum/upload", headers = "content-type=multipart/form-data", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
     @ApiOperation(value = "资料上传", notes = "资料上传")
-    public ResponseEntity<BatchUploadResVO> uploadFile(@RequestPart(value = "file", required = false) MultipartFile[] files) throws IOException {
+    public Map<String, Object> uploadFile(@RequestPart(value = "file", required = false) MultipartFile[] files) throws IOException {
         if (files.length == 0) {
             throw new InterfaceException(RESPONSE_CODE_ENUM.SERVER_ERROR.getResultCode(), "没有文件可供上传");
         }
@@ -111,7 +107,7 @@ public class FileUploadController {
         int failureCount = 0;
         List<BatchUploadResVO.HandleResult> handleList = new ArrayList<>();
 
-        List<String> videoUrlList = new ArrayList<>();
+        List<String> datumUrlList = new ArrayList<>();
         for (MultipartFile file : files) {
             // 当前维度表下线结果
             BatchUploadResVO.HandleResult handleResult = new BatchUploadResVO.HandleResult();
@@ -132,10 +128,16 @@ public class FileUploadController {
             handleResult.setHandleResult(HANDLE_STATUS_ENUM.SUCCESS.getName());
             boolean anyMatch = Arrays.stream(DATUM_TYPE).anyMatch(s -> Objects.equals(s, FilenameUtils.getExtension(originalFilename).toUpperCase()));
             if (anyMatch) {
-                String url = FastDFSUtils.uploadFile(file.getInputStream(), file.getSize(), originalFilename);
+                String url;
+                boolean anyVideoMatch = Arrays.stream(VIDEO_TYPE).anyMatch(s -> Objects.equals(s, FilenameUtils.getExtension(originalFilename).toUpperCase()));
+                if (anyVideoMatch) {
+                    url = FastDFSUtils.uploadFile(file.getInputStream(), file.getSize(), originalFilename);
+                } else {
+                    url = FastDFSUtils.uploadFile(file.getInputStream(), file.getSize(), originalFilename);
+                }
                 handleResult.setFileUrl(url);
                 handleResult.setDescription("操作成功");
-                videoUrlList.add(url);
+                datumUrlList.add(url);
                 successCount++;
             } else {
                 handleResult.setFileUrl("");
@@ -151,14 +153,14 @@ public class FileUploadController {
         batchUploadResVO.setSuccessCount(successCount);
         batchUploadResVO.setTotal(files.length);
         batchUploadResVO.setHandleList(handleList);
-        batchUploadResVO.setUrlList(videoUrlList);
-        return ResponseEntity.ok(batchUploadResVO);
+        batchUploadResVO.setUrlList(datumUrlList);
+        return getResult(batchUploadResVO);
     }
 
     @PostMapping(value = "/image/upload", headers = "content-type=multipart/form-data", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
     @RequiresPermissions("image:upload")
     @ApiOperation(value = "单图片上传", notes = "单图片上传")
-    public ResponseEntity<ImageUploadResult> uploadImage(@RequestParam(value = "file") MultipartFile uploadFile) throws Exception {
+    public Map<String, Object> uploadImage(@RequestParam(value = "file") MultipartFile uploadFile) throws Exception {
         if (uploadFile == null || uploadFile.getSize() == 0) {
             throw new InterfaceException(RESPONSE_CODE_ENUM.SERVER_ERROR.getResultCode(), "没有文件可供上传");
         }
@@ -178,14 +180,13 @@ public class FileUploadController {
         imageUploadResult.setFileExtName(extension);
         imageUploadResult.setFileSize(uploadFile.getSize());
         imageUploadResult.setUrl(url);
-        return ResponseEntity.ok(imageUploadResult);
+        return getResult(imageUploadResult);
     }
 
-
     @PostMapping(value = "/upload/allType", headers = "content-type=multipart/form-data", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
     @RequiresPermissions("file:upload:allType")
     @ApiOperation(value = "单文件上传（不限格式）", notes = "单文件上传（不限格式）")
-    public ResponseEntity<ImageUploadResult> uploadAllType(@RequestParam(value = "file") MultipartFile uploadFile) throws Exception {
+    public Map<String, Object> uploadAllType(@RequestParam(value = "file") MultipartFile uploadFile) throws Exception {
         if (uploadFile == null || uploadFile.getSize() == 0) {
             throw new InterfaceException(RESPONSE_CODE_ENUM.SERVER_ERROR.getResultCode(), "没有文件可供上传");
         }
@@ -205,7 +206,7 @@ public class FileUploadController {
         imageUploadResult.setFileExtName(extension);
         imageUploadResult.setFileSize(uploadFile.getSize());
         imageUploadResult.setUrl(url);
-        return ResponseEntity.ok(imageUploadResult);
+        return getResult(imageUploadResult);
     }
 
     @ApiImplicitParams({
@@ -214,7 +215,7 @@ public class FileUploadController {
     @PostMapping(value = "/audio/upload", headers = "content-type=multipart/form-data", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
     @RequiresPermissions("audio:upload")
     @ApiOperation(value = "多音频上传", notes = "多音频上传")
-    public ResponseEntity<BatchUploadResVO> uploadAudio(@RequestPart(value = "file", required = false) MultipartFile[] files) throws IOException {
+    public Map<String, Object> uploadAudio(@RequestPart(value = "file", required = false) MultipartFile[] files) throws IOException {
         if (files == null || files.length == 0) {
             throw new InterfaceException(RESPONSE_CODE_ENUM.SERVER_ERROR.getResultCode(), "没有文件可供上传");
         }
@@ -268,7 +269,7 @@ public class FileUploadController {
         batchUploadResVO.setTotal(files.length);
         batchUploadResVO.setHandleList(handleList);
         batchUploadResVO.setUrlList(videoUrlList);
-        return ResponseEntity.ok(batchUploadResVO);
+        return getResult(batchUploadResVO);
     }
 
     @ApiImplicitParams({
@@ -277,7 +278,7 @@ public class FileUploadController {
     @PostMapping(value = "/video/upload", headers = "content-type=multipart/form-data", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
     @RequiresPermissions("video:upload")
     @ApiOperation(value = "多视频上传", notes = "多视频上传")
-    public ResponseEntity<BatchUploadResVO> uploadVideo(@RequestPart(value = "file", required = true) MultipartFile[] files) throws IOException {
+    public Map<String, Object> uploadVideo(@RequestPart(value = "file", required = true) MultipartFile[] files) throws IOException {
         if (files == null || files.length == 0) {
             throw new InterfaceException(RESPONSE_CODE_ENUM.SERVER_ERROR.getResultCode(), "没有文件可供上传");
         }
@@ -331,7 +332,7 @@ public class FileUploadController {
         batchUploadResVO.setTotal(files.length);
         batchUploadResVO.setHandleList(handleList);
         batchUploadResVO.setUrlList(videoUrlList);
-        return ResponseEntity.ok(batchUploadResVO);
+        return getResult(batchUploadResVO);
     }
 
 }

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

@@ -77,15 +77,14 @@ public class LearningContentController extends BaseController {
     public Map<String, Object> saveLearningContent(@Validated(value = {Add.class}) LearningContent learningContent) {
         final TUser tUser = getcurUser();
         if (tUser != null) {
-            final String orgId = tUser.getOrgId();
-            learningContent.setOrganId(orgId);
+            learningContent.setOrganCode(tUser.getOrgCode());
         }
         learningContent.setAuditStatus(AuditStatusEnum.TBC.name());
         learningContent.setIsPublished(false);
         QueryWrapper<LearningContent> queryWrapper = new QueryWrapper<>();
         queryWrapper.select("max(sortorder) as sortorder");
         LearningContent content = this.learningContentService.getOne(queryWrapper);
-        if (content != null) {
+        if (content != null && content.getSortorder() != null) {
             learningContent.setSortorder(content.getSortorder() + 1);
         } else {
             learningContent.setSortorder(1);
@@ -112,7 +111,7 @@ public class LearningContentController extends BaseController {
             QueryWrapper<LearningContentBoard> learningContentBoardQueryWrapper = new QueryWrapper<>();
             queryWrapper.select("max(sortorder) as sortorder");
             LearningContentBoard one = this.learningContentBoardService.getOne(learningContentBoardQueryWrapper);
-            if (one != null) {
+            if (one != null && one.getSortorder() != null) {
                 learningContentBoard.setSortorder(one.getSortorder() + 1);
             } else {
                 learningContentBoard.setSortorder(1);
@@ -454,5 +453,28 @@ public class LearningContentController extends BaseController {
         return getFailResult();
     }
 
+    @ApiOperation(value = "启用/禁用学习内容", notes = "启用/禁用学习内容")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "标识ID", dataType = "String", paramType = "path"),
+            @ApiImplicitParam(name = "isPublish", value = "是否上架", dataType = "boolean", paramType = "query", allowableValues = "True, False")
+    })
+    @PutMapping("/enable/{id}")
+    @RequiresPermissions("learning:content:enable")
+    public Map<String, Object> enableLearningContent(@PathVariable("id") String id, @RequestParam("isPublish") Boolean isPublish) {
+        final Audit audit = Audit.builder().content("")
+                .isDeleted(false)
+                .refItemId(id)
+                .status(AuditStatusEnum.TBC.name())
+                .level(AuditStatusEnum.TBC.name())
+                .type(AuditTypeEnum.LEARNING_CONTENT.name()).build();
+        if (isPublish) {
+            audit.setOperation(AuditOperationEnum.ENABLE.name());
+        } else {
+            audit.setOperation(AuditOperationEnum.DISABLE.name());
+        }
+        this.auditService.save(audit);
+        return getSuccessResult();
+    }
+
 }
 

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

@@ -132,9 +132,9 @@ public class PermissionController extends BaseController {
                 return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(resultMap);
             }
             // 204
-            resultMap.put("status", 201);
+            resultMap.put("status", 200);
             resultMap.put("message", "添加成功！");
-            return ResponseEntity.status(HttpStatus.CREATED).body(resultMap);
+            return ResponseEntity.status(HttpStatus.OK).body(resultMap);
         } catch (Exception e) {
             logger.error("添加权限错误!", e);
         }
@@ -181,9 +181,9 @@ public class PermissionController extends BaseController {
                 return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(resultMap);
             }
             // 204
-            resultMap.put("status", 201);
+            resultMap.put("status", 200);
             resultMap.put("message", "更新成功！");
-            return ResponseEntity.status(HttpStatus.CREATED).body(resultMap);
+            return ResponseEntity.status(HttpStatus.OK).body(resultMap);
         } catch (Exception e) {
             logger.error("编辑角色错误!", e);
         }
@@ -223,9 +223,9 @@ public class PermissionController extends BaseController {
                 return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(resultMap);
             }
             // 204
-            resultMap.put("status", 201);
+            resultMap.put("status", 200);
             resultMap.put("message", "删除成功！");
-            return ResponseEntity.status(HttpStatus.CREATED).body(resultMap);
+            return ResponseEntity.status(HttpStatus.OK).body(resultMap);
         } catch (Exception e) {
             logger.error("删除权限错误!", e);
         }
@@ -266,9 +266,9 @@ public class PermissionController extends BaseController {
                 return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(resultMap);
             }
             // 204
-            resultMap.put("status", 201);
+            resultMap.put("status", 200);
             resultMap.put("message", "删除成功！");
-            return ResponseEntity.status(HttpStatus.CREATED).body(resultMap);
+            return ResponseEntity.status(HttpStatus.OK).body(resultMap);
         } catch (Exception e) {
             logger.error("删除角色错误!", e);
         }

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

@@ -162,9 +162,9 @@ public class RoleController extends BaseController {
                 return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(resultMap);
             }
             // 204
-            resultMap.put("status", 201);
+            resultMap.put("status", 200);
             resultMap.put("message", "添加成功");
-            return ResponseEntity.status(HttpStatus.CREATED).body(resultMap);
+            return ResponseEntity.status(HttpStatus.OK).body(resultMap);
         } catch (Exception e) {
             logger.error("添加角色错误!", e);
         }
@@ -251,9 +251,9 @@ public class RoleController extends BaseController {
                 return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(resultMap);
             }
             // 204
-            resultMap.put("status", 201);
+            resultMap.put("status", 200);
             resultMap.put("message", "删除成功！");
-            return ResponseEntity.status(HttpStatus.CREATED).body(resultMap);
+            return ResponseEntity.status(HttpStatus.OK).body(resultMap);
         } catch (Exception e) {
             LOGGER.error("删除角色错误!", e);
 
@@ -345,7 +345,7 @@ public class RoleController extends BaseController {
                 } else {
                     resultMap.put("status", 400);
                     resultMap.put("message", "错误请求！");
-                    return ResponseEntity.status(HttpStatus.CREATED).body(resultMap);
+                    return ResponseEntity.status(HttpStatus.OK).body(resultMap);
                 }
                 if (!ret) {
                     // 更新失败, 500
@@ -354,9 +354,9 @@ public class RoleController extends BaseController {
                     return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(resultMap);
                 }
                 // 204
-                resultMap.put("status", 201);
+                resultMap.put("status", 200);
                 resultMap.put("message", "更新成功！");
-                return ResponseEntity.status(HttpStatus.CREATED).body(resultMap);
+                return ResponseEntity.status(HttpStatus.OK).body(resultMap);
             } else {
                 resultMap.put("status", 400);
                 resultMap.put("message", "请选择角色！");
@@ -416,9 +416,9 @@ public class RoleController extends BaseController {
                     }
                 }
                 // 204
-                resultMap.put("status", 201);
+                resultMap.put("status", 200);
                 resultMap.put("message", "更新成功！");
-                return ResponseEntity.status(HttpStatus.CREATED).body(resultMap);
+                return ResponseEntity.status(HttpStatus.OK).body(resultMap);
             } else {
                 resultMap.put("status", 400);
                 resultMap.put("message", "请选择角色！");
@@ -450,7 +450,7 @@ public class RoleController extends BaseController {
             }
             map.put("status", "201");
             map.put("message", "启用成功");
-            return ResponseEntity.status(HttpStatus.CREATED).body(map);
+            return ResponseEntity.status(HttpStatus.OK).body(map);
         } catch (Exception e) {
             logger.error("用户启动出错!", e);
         }
@@ -491,7 +491,7 @@ public class RoleController extends BaseController {
             } else {
                 map.put("status", "201");
                 map.put("message", "批量启动成功");
-                return ResponseEntity.status(HttpStatus.CREATED).body(map);
+                return ResponseEntity.status(HttpStatus.OK).body(map);
             }
         } catch (Exception e) {
             logger.error("批量启动失败!", e);
@@ -525,7 +525,7 @@ public class RoleController extends BaseController {
             }
             map.put("status", "201");
             map.put("message", "禁用成功");
-            return ResponseEntity.status(HttpStatus.CREATED).body(map);
+            return ResponseEntity.status(HttpStatus.OK).body(map);
         } catch (Exception e) {
             logger.error("禁用用户出错!", e);
         }
@@ -566,7 +566,7 @@ public class RoleController extends BaseController {
             } else {
                 map.put("status", "201");
                 map.put("message", "禁用成功");
-                return ResponseEntity.status(HttpStatus.CREATED).body(map);
+                return ResponseEntity.status(HttpStatus.OK).body(map);
             }
         } catch (Exception e) {
             logger.error("用户禁用失败!", e);
@@ -627,13 +627,13 @@ public class RoleController extends BaseController {
                 return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(map);
             }
 
-            map.put("status", 201);
+            map.put("status", 200);
             String message = "删除成功";
             if (!"".equals(selectRoleIds) && flag) {
                 message = "系统默认角色不能被删除，其他选中角色删除成功";
             }
             map.put("message", message);
-            return ResponseEntity.status(HttpStatus.CREATED).body(map);
+            return ResponseEntity.status(HttpStatus.OK).body(map);
         } catch (Exception e) {
             logger.error("角色删除失败!", e);
         }

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

@@ -59,10 +59,13 @@ public class TBoxOperationController extends BaseController {
             user.setOrgId(organId);
         }
         if (StringUtils.isNotBlank(areaId)) {
-            String areaId1 = getAreaId(areaId);
-            user.setAreaId(areaId1);
+            user.setAreaId(areaId);
         }
         //设置数据权限
+        if (StringUtils.isNotBlank(user1.getAreaId())) {
+            String areaId1 = getAreaId(user1.getAreaId());
+            user.setAreaName(getAreaId(areaId1));
+        }
         user.setOrgCode(user1.getOrgCode());
         try {
             Page<TBoxOperation> page = tBoxOperationService.selectBoxPage(getPage(), user);
@@ -100,7 +103,7 @@ public class TBoxOperationController extends BaseController {
 
     @PutMapping("/update")
     @RequiresPermissions("/boxOperation/update")
-    @ApiOperation(value = "修改机顶盒运维信息信息", notes = "修改机顶盒运维信息信息")
+    @ApiOperation(value = "修改机顶盒运维信息", notes = "修改机顶盒运维信息")
     public Map<String, Object> updateTBoxOperation(TBoxOperation tBoxOperation) {
         try {
             if (tBoxOperation != null && StringUtils.isNotBlank(tBoxOperation.getMac())) {
@@ -182,7 +185,7 @@ public class TBoxOperationController extends BaseController {
         }
         if (StringUtils.isNotBlank(user.getAreaId())) {
             //设置数据权限
-            tBoxOperation.setAreaId(getAreaId(user.getAreaId()));
+            tBoxOperation.setAreaName(getAreaId(user.getAreaId()));
         }
         Page<TBoxOperation> page = null;
         try {

src/main/java/cn/wisenergy/chnmuseum/party/web/controller/base/BaseController.java

@@ -9,7 +9,6 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.serializer.SimplePropertyPreFilter;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.apache.catalina.User;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -17,7 +16,7 @@ import org.slf4j.LoggerFactory;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.io.Serializable;
-import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -63,7 +62,7 @@ public class BaseController implements Serializable {
      * @return map
      */
     protected Map<String, Object> getResult(Object obj) {
-        Map<String, Object> map = new HashMap<>();
+        Map<String, Object> map = new LinkedHashMap<>();
         map.put(RESULT_INFO_ENUM.RESULT_CODE.getKey(), RESPONSE_CODE_ENUM.REQUEST_SUCCESS.getResultCode());
         map.put(RESULT_INFO_ENUM.RESULT_MSG.getKey(), RESPONSE_CODE_ENUM.REQUEST_SUCCESS.getMessage());
         map.put(RESULT_INFO_ENUM.RESULT_BODY.getKey(), obj);
@@ -76,7 +75,7 @@ public class BaseController implements Serializable {
      * @return map
      */
     protected Map<String, Object> getSuccessResult() {
-        Map<String, Object> map = new HashMap<>();
+        Map<String, Object> map = new LinkedHashMap<>();
         map.put(RESULT_INFO_ENUM.RESULT_CODE.getKey(), RESPONSE_CODE_ENUM.REQUEST_SUCCESS.getResultCode());
         map.put(RESULT_INFO_ENUM.RESULT_MSG.getKey(), RESPONSE_CODE_ENUM.REQUEST_SUCCESS.getMessage());
         map.put(RESULT_INFO_ENUM.RESULT_BODY.getKey(),"");
@@ -91,7 +90,7 @@ public class BaseController implements Serializable {
      * @return map
      */
     protected Map<String, Object> getFailResult(String code, String msg) {
-        Map<String, Object> map = new HashMap<>();
+        Map<String, Object> map = new LinkedHashMap<>();
         map.put(RESULT_INFO_ENUM.RESULT_CODE.getKey(), code);
         map.put(RESULT_INFO_ENUM.RESULT_MSG.getKey(), msg);
         return map;
@@ -104,7 +103,7 @@ public class BaseController implements Serializable {
      * @return map
      */
     protected Map<String, Object> getFailResult(RESPONSE_CODE_ENUM responseCodeEnum) {
-        Map<String, Object> map = new HashMap<>();
+        Map<String, Object> map = new LinkedHashMap<>();
         map.put(RESULT_INFO_ENUM.RESULT_CODE.getKey(), responseCodeEnum.getResultCode());
         map.put(RESULT_INFO_ENUM.RESULT_MSG.getKey(), responseCodeEnum.getMessage());
         return map;
@@ -116,7 +115,7 @@ public class BaseController implements Serializable {
      * @return map
      */
     protected Map<String, Object> getFailResult() {
-        Map<String, Object> map = new HashMap<>();
+        Map<String, Object> map = new LinkedHashMap<>();
         map.put(RESULT_INFO_ENUM.RESULT_CODE.getKey(), RESPONSE_CODE_ENUM.SERVER_ERROR.getResultCode());
         map.put(RESULT_INFO_ENUM.RESULT_MSG.getKey(), RESPONSE_CODE_ENUM.SERVER_ERROR.getMessage());
         return map;
@@ -128,7 +127,7 @@ public class BaseController implements Serializable {
      * @return map
      */
     protected Map<String, Object> getFailResult(String msg) {
-        Map<String, Object> map = new HashMap<>();
+        Map<String, Object> map = new LinkedHashMap<>();
         map.put(RESULT_INFO_ENUM.RESULT_CODE.getKey(), RESPONSE_CODE_ENUM.SERVER_ERROR.getResultCode());
         map.put(RESULT_INFO_ENUM.RESULT_MSG.getKey(), msg);
         return map;

src/main/resources/mapper/LearningContentMapper.xml

@@ -8,7 +8,7 @@
         <result column="name" property="name"/>
         <result column="cover" property="cover"/>
         <result column="applicable_scope" property="applicableScope"/>
-        <result column="organ_id" property="organId"/>
+        <result column="organ_code" property="organCode"/>
         <result column="learning_project_id" property="learningProjectId"/>
         <result column="audit_status" property="auditStatus"/>
         <result column="is_published" property="isPublished"/>
@@ -20,7 +20,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, name, cover, applicable_scope, organ_id, learning_project_id, audit_status, is_published, is_deleted, sortorder, create_time, update_time
+        id, name, cover, applicable_scope, organ_code, learning_project_id, audit_status, is_published, is_deleted, sortorder, create_time, update_time
     </sql>
 
 </mapper>

src/main/resources/mapper/TBoxOperationMapper.xml

@@ -51,6 +51,9 @@ left join t_organ r on r.id = b.organ_id
         <if test="user.orgCode != null and user.orgCode != '' ">
             and o.code LIKE concat(#{user.orgCode}, '%')
         </if>
+        <if test="user.areaName != null and user.areaName != '' ">
+            and b.area_id LIKE concat(#{user.areaName}, '%')
+        </if>
         and u.is_deleted = false
         and u.type = 3
         order by b.create_time desc
@@ -68,7 +71,10 @@ left join t_organ r on r.id = b.organ_id
             and b.status =#{tBoxOperation.status}
         </if>
         <if test="tBoxOperation.areaId != null and tBoxOperation.areaId != '' ">
-            and r.area_id like concat(#{tBoxOperation.areaId}, '%')
+            and b.area_id = #{tBoxOperation.areaId}
+        </if>
+        <if test="tBoxOperation.areaName != null and tBoxOperation.areaName != '' ">
+            and b.area_id LIKE concat(#{tBoxOperation.areaName}, '%')
         </if>
     </select>