fix 用户导入

zhongzheng-admin/src/main/java/com/zhongzheng/controller/common/CommonController.java

@@ -5,16 +5,24 @@ import com.zhongzheng.common.config.RuoYiConfig;
 import com.zhongzheng.common.constant.Constants;
 import com.zhongzheng.common.core.domain.AjaxResult;
 import com.zhongzheng.common.core.domain.model.LoginBody;
+import com.zhongzheng.common.utils.ServletUtils;
 import com.zhongzheng.common.utils.ToolsUtils;
 import com.zhongzheng.common.utils.file.FileUploadUtils;
 import com.zhongzheng.common.utils.file.FileUtils;
+import com.zhongzheng.common.utils.poi.ExcelUtil;
 import com.zhongzheng.framework.config.ServerConfig;
 import com.zhongzheng.modules.course.vo.CourseMenuVo;
 import com.zhongzheng.modules.goods.bo.GoodsQueryBo;
 import com.zhongzheng.modules.goods.service.IGoodsService;
 import com.zhongzheng.modules.goods.vo.GoodsJzsVo;
+import com.zhongzheng.modules.grade.bo.RollBackPeriodBo;
+import com.zhongzheng.modules.grade.bo.UserPeriodEditBo;
+import com.zhongzheng.modules.grade.service.IUserPeriodService;
+import com.zhongzheng.modules.grade.vo.ClassPeriodStudentExportAllVo;
+import com.zhongzheng.modules.grade.vo.SyncGoodsExport;
 import com.zhongzheng.modules.order.bo.OrderAddBo;
 import com.zhongzheng.modules.system.service.ISysUserService;
+import com.zhongzheng.modules.user.vo.UserExportVo;
 import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -46,6 +54,8 @@ public class CommonController
 
     @Autowired
     private IGoodsService iGoodsService;
+    @Autowired
+    private IUserPeriodService iUserPeriodService;
 
     /**
      * 通用下载请求
@@ -53,6 +63,7 @@ public class CommonController
      * @param fileName 文件名称
      * @param delete 是否删除
      */
+    @ApiOperation("通用下载请求")
     @GetMapping("common/download")
     public void fileDownload(String fileName, Boolean delete, HttpServletResponse response, HttpServletRequest request)
     {
@@ -135,11 +146,38 @@ public class CommonController
 
     @ApiOperation("获取继教二建的商品结构列表")
     @GetMapping("common/jzs/goodsList")
-    public AjaxResult<List<GoodsJzsVo>> goodsList()
+    public AjaxResult<GoodsJzsVo> goodsList()
     {
-
         GoodsQueryBo queryBo = new GoodsQueryBo();
-        List<GoodsJzsVo> goodsJzsVoList = iGoodsService.selectRjJzsList(queryBo);
-        return AjaxResult.success(goodsJzsVoList);
+        List<SyncGoodsExport> goodsJzsVoList = iGoodsService.selectRjJzsList(queryBo);
+        ExcelUtil<SyncGoodsExport> util = new ExcelUtil<SyncGoodsExport>(SyncGoodsExport.class);
+  //      ExcelUtil<SyncGoodsExport> util = new ExcelUtil<>(SyncGoodsExport.class);
+        return util.exportEasyExcel(util.exportEasyData(goodsJzsVoList), "继建商品");
+    }
+
+
+
+    @ApiOperation("测试列表")
+    @GetMapping("common/jzs/test")
+    public AjaxResult<Void> testList()
+    {
+
+        UserPeriodEditBo queryBo = new UserPeriodEditBo();
+        queryBo.setGoodsId(911L);
+        queryBo.setGradeId(792L);
+        queryBo.setUserId(114L);
+        iUserPeriodService.syncStudyLogToOld(queryBo);
+        return AjaxResult.success();
+    }
+
+    @ApiOperation("旧系统打回重审")
+    @PostMapping("common/rollback/period")
+    public AjaxResult<Void> rollbackPeriod(@RequestBody RollBackPeriodBo bo)
+    {
+        String sign = bo.getStamp().toString()+"pubilc2022";
+        if(!bo.getSign().equals(ToolsUtils.EncoderByMd5(sign))){
+            return AjaxResult.error("签名错误");
+        }
+        return AjaxResult.success();
     }
 }

zhongzheng-admin/src/main/resources/application-dev.yml

@@ -133,7 +133,7 @@ liveGotoURL: http://120.79.166.78:19014/
 enCodeVersion: develop
 
 oldStudySys:
-    syncPath: http://gdxypx.xy.com/System/PostUserStudyRecords
+    syncPath: http://gdxypx.xy.com/System/BussinessApi/PostUserStudyRecords
 
 officialPush:
     infoPath: http://jypt-dev.gdcic.net/organjxjy/ShangBaoMingdan

zhongzheng-admin/src/main/resources/application-pre.yml

@@ -133,7 +133,7 @@ liveGotoURL: http://120.79.166.78:19010/
 enCodeVersion: trial
 
 oldStudySys:
-    syncPath: http://test.jqbao.net/System/PostUserStudyRecords
+    syncPath: http://test.jqbao.net/System/BussinessApi/PostUserStudyRecords
 
 officialPush:
     infoPath: http://jypt-dev.gdcic.net/organjxjy/ShangBaoMingdan

zhongzheng-admin/src/main/resources/application-prod.yml

@@ -133,7 +133,7 @@ liveGotoURL: https://web.xyyxt.net/
 enCodeVersion: release
 
 oldStudySys:
-    syncPath: https://www.xyyxt.net/System/PostUserStudyRecords
+    syncPath: https://www.xyyxt.net/System/BussinessApi/PostUserStudyRecords
 
 officialPush:
     infoPath: http://jypt-dev.gdcic.net/organjxjy/ShangBaoMingdan

zhongzheng-framework/src/main/java/com/zhongzheng/framework/config/SecurityConfig.java

@@ -123,7 +123,8 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                 .antMatchers("/refreshToken/**").anonymous()
                 .antMatchers("/v1/test/**").anonymous()
                 .antMatchers("/profile/**").anonymous()
-                .antMatchers("/common/jzs/goodsList").anonymous()
+                .antMatchers("/common/jzs/**").anonymous()
+                .antMatchers("/common/rollback/period").anonymous()
                 .antMatchers("/common/download**").anonymous()
                 .antMatchers("/common/download/resource**").anonymous()
                 .antMatchers("/swagger-ui.html").anonymous()

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/service/IGoodsService.java

@@ -10,6 +10,7 @@ import com.zhongzheng.modules.goods.domain.Goods;
 import com.zhongzheng.modules.goods.vo.GoodsSpecTemplateVo;
 import com.zhongzheng.modules.goods.vo.GoodsJzsVo;
 import com.zhongzheng.modules.goods.vo.GoodsVo;
+import com.zhongzheng.modules.grade.vo.SyncGoodsExport;
 
 import java.util.Collection;
 import java.util.List;
@@ -88,5 +89,5 @@ public interface IGoodsService extends IService<Goods> {
 
 	boolean updateSpecTemplate(GoodsSpecTempEditBo bo);
 
-	List<GoodsJzsVo> selectRjJzsList(GoodsQueryBo bo);
+	List<SyncGoodsExport> selectRjJzsList(GoodsQueryBo bo);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/service/impl/GoodsServiceImpl.java

@@ -28,6 +28,7 @@ import com.zhongzheng.modules.goods.mapper.GoodsMapper;
 import com.zhongzheng.modules.goods.service.*;
 import com.zhongzheng.modules.goods.vo.*;
 import com.zhongzheng.modules.grade.vo.ClassGradeVo;
+import com.zhongzheng.modules.grade.vo.SyncGoodsExport;
 import com.zhongzheng.modules.order.domain.OrderGoods;
 import com.zhongzheng.modules.order.service.IOrderGoodsService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -625,7 +626,7 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
     }
 
     @Override
-    public List<GoodsJzsVo> selectRjJzsList(GoodsQueryBo bo) {
+    public List<SyncGoodsExport> selectRjJzsList(GoodsQueryBo bo) {
         CourseEducationType educationType = iCourseEducationTypeService.getOne(new LambdaQueryWrapper<CourseEducationType>().eq(CourseEducationType::getStatus, 1).eq(CourseEducationType::getEducationName,"继续教育").last("limit 1"));
         CourseProjectType projectType = iCourseProjectTypeService.getOne(new LambdaQueryWrapper<CourseProjectType>().eq(CourseProjectType::getStatus, 1).eq(CourseProjectType::getEducationId,educationType.getId()).eq(CourseProjectType::getProjectName,"建造师").last("limit 1"));
         CourseBusiness business = iCourseBusinessService.getOne(new LambdaQueryWrapper<CourseBusiness>().eq(CourseBusiness::getStatus, 1).eq(CourseBusiness::getProjectId,projectType.getId()).eq(CourseBusiness::getBusinessName,"二级").last("limit 1"));
@@ -637,6 +638,9 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
         List<GoodsVo> goodsVoList = queryList(goodsQueryBo);
         List<GoodsJzsVo> jzsVoList = new ArrayList<>();
         for(GoodsVo goodsVo : goodsVoList){
+            if(goodsVo.getGoodsId()!=911L){
+                continue;
+            }
             GoodsJzsVo jzsVo = new GoodsJzsVo();
             jzsVo.setGoodsId(goodsVo.getGoodsId());
             jzsVo.setGoodsName(goodsVo.getGoodsName());
@@ -680,7 +684,25 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
             jzsVo.setChapterList(jzsChapterVoList);
             jzsVoList.add(jzsVo);
         }
-        return jzsVoList;
+        System.out.println(jzsVoList);
+        List<SyncGoodsExport> exportList = new ArrayList<>();
+        for(GoodsJzsVo jzsVo : jzsVoList){
+            for(GoodsJzsChapterVo chapterVo : jzsVo.getChapterList()){
+                for(GoodsJzsSectionVo sectionVo : chapterVo.getSectionList()){
+                    SyncGoodsExport goodsExport = new SyncGoodsExport();
+                    goodsExport.setGoodsId(jzsVo.getGoodsId());
+                    goodsExport.setGoodsName(jzsVo.getGoodsName());
+                    goodsExport.setSubjectName(jzsVo.getSubjectName());
+                    goodsExport.setChapterId(chapterVo.getChapterId());
+                    goodsExport.setChapterName(chapterVo.getChapterName());
+                    goodsExport.setSectionId(sectionVo.getSectionId());
+                    goodsExport.setSectionName(sectionVo.getSectionName());
+                    goodsExport.setSectionUrl(sectionVo.getSectionUrl());
+                    exportList.add(goodsExport);
+                }
+            }
+        }
+        return exportList;
     }
 
     /**

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/bo/RollBackPeriodBo.java

@@ -0,0 +1,22 @@
+package com.zhongzheng.modules.grade.bo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+@Data
+public class RollBackPeriodBo {
+
+    @ApiModelProperty("订单商品ID")
+    @NotBlank(message = "订单商品ID不能为空")
+    private Long orderGoodsId;
+
+    @ApiModelProperty("当前时间戳")
+    @NotBlank(message = "当前时间戳不能为空")
+    private Long stamp;
+
+    @ApiModelProperty("签名")
+    @NotBlank(message = "签名不能为空")
+    private Long sign;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/vo/SyncGoodsExport.java

@@ -0,0 +1,44 @@
+package com.zhongzheng.modules.grade.vo;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class SyncGoodsExport {
+    private static final long serialVersionUID = 1L;
+
+    @Excel(name = "课程ID")
+    @ApiModelProperty("课程ID")
+    private Long goodsId;
+
+    @Excel(name = "课程名称")
+    @ApiModelProperty("课程名称")
+    private String goodsName;
+
+    @Excel(name = "章节ID")
+    @ApiModelProperty("章节ID")
+    private Long chapterId;
+
+    @Excel(name = "章节名称")
+    @ApiModelProperty("章节名称")
+    private String chapterName;
+
+    @Excel(name = "视频ID")
+    @ApiModelProperty("视频ID")
+    private Long sectionId;
+
+    @Excel(name = "视频名称")
+    @ApiModelProperty("视频名称")
+    private String sectionName;
+
+    @Excel(name = "视频key")
+    @ApiModelProperty("视频key")
+    private String sectionUrl;
+
+    @Excel(name = "专业")
+    @ApiModelProperty("专业")
+    private String subjectName;
+}

zhongzheng-system/src/main/resources/mapper/modules/grade/UserPeriodStatusMapper.xml

@@ -40,12 +40,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectPeriodStatus" parameterType="com.zhongzheng.modules.grade.bo.UserPeriodQueryBo" resultMap="UserPeriodStatusVo">
         SELECT
         ups.*,
-        (select realname from `user` u where up.user_id = u.user_id) as  realname,
+        (select realname from `user` u where up.user_id = u.user_id) as  realname
         <if test="examId != null ">
-            (SELECT exam_name FROM exam e where e.exam_id= up.exam_id) as type_name
+            ,(SELECT exam_name FROM exam e where e.exam_id= up.exam_id) as type_name
         </if>
         <if test="sectionId != null ">
-            (SELECT name FROM course_section cs where up.section_id= cs.section_id)  as type_name,
+            ,(SELECT name FROM course_section cs where up.section_id= cs.section_id)  as type_name,
             (SELECT duration_time FROM course_section cs where up.section_id= cs.section_id)  as duration_time
         </if>