merge

run-prod.sh

@@ -1,36 +1,5 @@
 #!/usr/bin/env bash
-# 定义应用组名
-group_name='zhongzheng'
-# 定义应用名称
-app_name='zhongzheng-saas-api'
-# 定义应用版本
-app_version='1.0-SNAPSHOT'
-# 定义应用环境
-profile_active='prod'
-echo '----copy jar----'
-docker stop ${app_name}
-echo '----stop container----'
-docker rm ${app_name}
-echo '----rm container----'
-docker rmi ${group_name}/${app_name}:${app_version}
-echo '----rm image----'
-# 打包编译docker镜像
-docker build -f /mydata/maven/build/Dockerfile -t ${group_name}/${app_name}:${app_version} .
-echo '----build image----'
-docker run -p 5055:5055 --name ${app_name} \
---restart=always \
--e 'spring.profiles.active'=${profile_active} \
--e TZ="Asia/Shanghai" \
--m 10240m \
---cpus=3 \
---log-opt max-size=50m \
---log-opt max-file=3 \
--v /etc/localtime:/etc/localtime \
--v /usr/share/fonts:/usr/share/fonts \
--v /data/logs/prod_api:/logs \
--v /mydata/app/${app_name}/logs:/var/logs \
--d ${group_name}/${app_name}:${app_version}
-echo '----start container----'
+
 
 echo "开始等待20秒..."
 # 1-10秒内随机
@@ -77,37 +46,6 @@ echo "开始等待20秒..."
 sleep 5
 echo "等待后继续"
 
-#!/usr/bin/env bash
-# 定义应用组名
-group_admin_name='zhongzheng'
-# 定义应用名称
-app_admin_name='zhongzheng-saas-admin-top'
-# 定义应用版本
-app_admin_version='1.0-SNAPSHOT'
-# 定义应用环境
-profile_active='prod'
-echo '----copy jar admin top----'
-docker stop ${app_admin_name}
-echo '----stop container admin top----'
-docker rm ${app_admin_name}
-echo '----rm container admin top----'
-docker rmi ${group_admin_name}/${app_admin_name}:${app_admin_version}
-echo '----rm image admin top----'
-# 打包编译docker镜像
-docker build -f /mydata/maven/build/Dockerfile-saas -t ${group_admin_name}/${app_admin_name}:${app_admin_version} .
-echo '----build image admin top----'
-docker run \
--p 7077:7077 \
---name ${app_admin_name} \
---restart=always \
---log-opt max-size=50m \
---log-opt max-file=3 \
--e 'spring.profiles.active'=${profile_active} \
--e TZ="Asia/Shanghai" \
--v /etc/localtime:/etc/localtime \
--v /usr/share/fonts:/usr/share/fonts \
--v /data/logs/prod_admin_top:/logs \
--v /mydata/app/${app_admin_name}/logs:/var/logs \
--v /data/nginx/conf.d:/data/nginx/conf.d \
--d ${group_admin_name}/${app_admin_name}:${app_admin_version}
-echo '----start container admin top----'
+
+
+

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

@@ -170,3 +170,5 @@ oldSys:
 
 invoice:
     host: https://ptapi.gdzzkj.net/sys/common/openMplatform/log
+
+liveHost: https://sso.xyyxt.net

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

@@ -261,7 +261,7 @@ tencent:
 
 aliyun:
   sms:
-    signName: 祥粤学校
+    signName: 中正教育
     registerTemplateCode: SMS_228670004
     loginTemplateCode: SMS_228670005
     forgetTemplateCode: SMS_228685033

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

@@ -586,7 +586,7 @@ public class CommonController extends BaseController {
             byte[] rgbKey = "0ca175b9c0f726a831d895e26933246".substring(0, 8).getBytes("UTF-8");
             String source = "bh="+bo.getBh()+"&idnum="+bo.getIdnum()+"&datetime=20230627";
             System.out.println(source);
-            return AjaxResult.success(ToolsUtils.encryptDesNew(source,"0ca175b9c0f726a831d895e26933246".substring(0, 8)));
+            return AjaxResult.success(ToolsUtils.encryptDesNew(source,bo.getToken().substring(0, 8)));
         }catch (Exception e){
             System.out.println(e.getMessage());
             return null;
@@ -600,7 +600,7 @@ public class CommonController extends BaseController {
         try{
             byte[] Keys = new byte[]{0x22, 0x34, 0x76, 0x58, (byte) 0x90, (byte) 0xAB, (byte) 0xAD, (byte) 0xBF};
             byte[] rgbKey = "01b5d9833987efdff54483cdc9720da6".substring(0, 8).getBytes("UTF-8");
-            System.out.println(ToolsUtils.decryptDesNew(bo.getData(), "01b5d9833987efdff54483cdc9720da6".substring(0, 8)));
+            System.out.println(ToolsUtils.decryptDesNew(bo.getData(), bo.getToken().substring(0, 8)));
             return AjaxResult.success();
         }catch (Exception e){
             System.out.println(e.getMessage());

zhongzheng-admin/src/main/java/com/zhongzheng/controller/course/CourseEducationTypeController.java

@@ -1,35 +1,25 @@
 package com.zhongzheng.controller.course;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Arrays;
-
-import com.zhongzheng.modules.top.goods.bo.TopCourseEducationTypeQueryBo;
-import com.zhongzheng.modules.top.goods.vo.TopCourseEducationTypeVo;
-import lombok.RequiredArgsConstructor;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 import com.zhongzheng.common.annotation.Log;
 import com.zhongzheng.common.core.controller.BaseController;
 import com.zhongzheng.common.core.domain.AjaxResult;
+import com.zhongzheng.common.core.page.TableDataInfo;
 import com.zhongzheng.common.enums.BusinessType;
-import com.zhongzheng.modules.course.vo.CourseEducationTypeVo;
-import com.zhongzheng.modules.course.bo.CourseEducationTypeQueryBo;
 import com.zhongzheng.modules.course.bo.CourseEducationTypeAddBo;
 import com.zhongzheng.modules.course.bo.CourseEducationTypeEditBo;
+import com.zhongzheng.modules.course.bo.CourseEducationTypeQueryBo;
 import com.zhongzheng.modules.course.service.ICourseEducationTypeService;
-import com.zhongzheng.common.utils.poi.ExcelUtil;
-import com.zhongzheng.common.core.page.TableDataInfo;
+import com.zhongzheng.modules.course.vo.CourseEducationTypeVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 
 /**
  * 教育类型Controller

zhongzheng-admin/src/main/java/com/zhongzheng/controller/system/SysUserController.java

@@ -300,9 +300,9 @@ public class SysUserController extends BaseController
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
         SysUser user = userService.selectUserById(loginUser.getUser().getUserId());
         boolean needUpdate = false;
-        if(Validator.isNotEmpty(user.getPwdTime())&&(DateUtils.getNowTime().longValue()-user.getPwdTime().longValue())>90*24*3600){
+       /* if(Validator.isNotEmpty(user.getPwdTime())&&(DateUtils.getNowTime().longValue()-user.getPwdTime().longValue())>90*24*3600){
             needUpdate = true;
-        }
+        }*/
         return AjaxResult.success(needUpdate);
     }
 }

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

@@ -170,3 +170,5 @@ oldSys:
 
 invoice:
     host: https://ptapi.gdzzkj.net/sys/common/openMplatform/log
+
+liveHost: https://sso.xyyxt.net

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

@@ -261,7 +261,7 @@ tencent:
 
 aliyun:
   sms:
-    signName: 中正科技
+    signName: 中正教育
     registerTemplateCode: SMS_228670004
     loginTemplateCode: SMS_228670005
     forgetTemplateCode: SMS_228685033

zhongzheng-api/src/main/java/com/zhongzheng/controller/course/CourseController.java

@@ -1,24 +1,23 @@
 package com.zhongzheng.controller.course;
 
-import com.zhongzheng.common.annotation.Log;
 import com.zhongzheng.common.core.controller.BaseController;
 import com.zhongzheng.common.core.domain.AjaxResult;
 import com.zhongzheng.common.core.page.TableDataInfo;
-import com.zhongzheng.common.enums.BusinessType;
 import com.zhongzheng.common.utils.ServletUtils;
 import com.zhongzheng.framework.web.service.WxTokenService;
 import com.zhongzheng.modules.course.bo.*;
 import com.zhongzheng.modules.course.service.*;
 import com.zhongzheng.modules.course.vo.*;
 import com.zhongzheng.modules.goods.vo.GoodsUserVo;
-import com.zhongzheng.modules.goods.vo.GoodsVo;
 import com.zhongzheng.modules.user.entity.ClientLoginUser;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 

zhongzheng-api/src/main/java/com/zhongzheng/controller/user/UserController.java

@@ -169,9 +169,9 @@ public class UserController extends BaseController {
         ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
         UserVo userVo = iUserService.queryById(loginUser.getUser().getUserId());
         boolean needUpdate = false;
-        if(Validator.isNotEmpty(userVo.getPwdTime())&&(DateUtils.getNowTime().longValue()-userVo.getPwdTime().longValue())>90*24*3600){
+       /* if(Validator.isNotEmpty(userVo.getPwdTime())&&(DateUtils.getNowTime().longValue()-userVo.getPwdTime().longValue())>90*24*3600){
             needUpdate = true;
-        }
+        }*/
         return AjaxResult.success(needUpdate);
     }
 

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

@@ -182,3 +182,5 @@ oldSys:
 
 invoice:
     host: https://ptapi.gdzzkj.net/sys/common/openMplatform/log
+
+liveHost: https://sso.xyyxt.net

zhongzheng-api/src/main/resources/application.yml

@@ -256,7 +256,7 @@ tencent:
 
 aliyun:
   sms:
-    signName: 中正科技
+    signName: 中正教育
     registerTemplateCode: SMS_228670004
     loginTemplateCode: SMS_228670005
     forgetTemplateCode: SMS_228685033

zhongzheng-framework/src/main/java/com/zhongzheng/framework/web/service/UserServiceImpl.java

@@ -1290,7 +1290,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         }
 
         if(Validator.isEmpty(user)){
-            throw new CustomException("请联系管理员！");
+            throw new CustomException("登录错误，请联系管理员！");
         }
         else if (UserStatus.DISABLE.getCode().equals(user.getStatus()))
         {
@@ -1439,7 +1439,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         }
 
         if(Validator.isEmpty(user)){
-            throw new CustomException("账号未注册，请联系管理员！");
+            throw new CustomException("登录错误，请联系管理员！");
         }
         else if (UserStatus.DISABLE.getCode().equals(user.getStatus()))
         {

zhongzheng-framework/src/main/java/com/zhongzheng/framework/web/service/WxTokenService.java

@@ -5,20 +5,13 @@ import cn.hutool.core.util.IdUtil;
 import cn.hutool.http.useragent.UserAgent;
 import cn.hutool.http.useragent.UserAgentUtil;
 import com.zhongzheng.common.constant.Constants;
-import com.zhongzheng.common.core.domain.model.LoginUser;
-import com.zhongzheng.common.exception.BaseException;
-import com.zhongzheng.common.exception.CustomException;
-import com.zhongzheng.common.exception.user.UserPasswordNotMatchException;
-import com.zhongzheng.common.utils.MessageUtils;
-import com.zhongzheng.framework.manager.AsyncManager;
-import com.zhongzheng.framework.manager.factory.AsyncFactory;
-import com.zhongzheng.modules.user.bo.UserLoginKeyAddBo;
-import com.zhongzheng.modules.user.domain.User;
-import com.zhongzheng.modules.user.entity.ClientLoginUser;
 import com.zhongzheng.common.core.redis.RedisCache;
 import com.zhongzheng.common.utils.ServletUtils;
 import com.zhongzheng.common.utils.ip.AddressUtils;
 import com.zhongzheng.common.utils.ip.IpUtils;
+import com.zhongzheng.modules.user.bo.UserLoginKeyAddBo;
+import com.zhongzheng.modules.user.domain.User;
+import com.zhongzheng.modules.user.entity.ClientLoginUser;
 import com.zhongzheng.modules.user.service.IUserLoginKeyService;
 import com.zhongzheng.modules.user.service.IUserService;
 import io.jsonwebtoken.Claims;
@@ -26,18 +19,11 @@ import io.jsonwebtoken.Jwts;
 import io.jsonwebtoken.SignatureAlgorithm;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.security.access.AccessDeniedException;
 import org.springframework.security.authentication.AuthenticationManager;
-import org.springframework.security.authentication.BadCredentialsException;
-import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
-import org.springframework.security.core.Authentication;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
-import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseMenuServiceImpl.java

@@ -30,6 +30,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.text.DecimalFormat;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;
@@ -71,8 +72,13 @@ public class CourseMenuServiceImpl extends ServiceImpl<CourseMenuMapper, CourseM
         list.forEach(courseMenuVo -> {
             if (Validator.isNotNull(courseMenuVo.getDurationTime())) {
                 //设置节时长（分钟）
-                courseMenuVo.setDurationMinTime(Math.ceil(courseMenuVo.getDurationTime()/60.0));
+        //        courseMenuVo.setDurationMinTime(Math.ceil(courseMenuVo.getDurationTime()/60.0));
+                courseMenuVo.setDurationMinTime((int)Math.ceil(courseMenuVo.getDurationTime().intValue()/60));
+                DecimalFormat df=new DecimalFormat("0.0");//设置保留位数
                 //设置学时
+        //        courseMenuVo.setClassHours(Double.valueOf(String.format("%.2f", courseMenuVo.getDurationMinTime()/45.0)));
+//                courseMenuVo.setClassHours(Double.valueOf(df.format(courseMenuVo.getDurationMinTime()/45)));
+
                 courseMenuVo.setClassHours(Double.valueOf(String.format("%.1f", courseMenuVo.getDurationMinTime()/45.0)));
             }
         });

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/vo/CourseMenuVo.java

@@ -55,7 +55,7 @@ public class CourseMenuVo {
 	/** 节时长(分钟) */
 	@Excel(name = "节时长(分钟)")
 	@ApiModelProperty("节时长(分钟)")
-	private Double durationMinTime;
+	private Integer durationMinTime;
 	/** 学时 */
 	@Excel(name = "学时")
 	@ApiModelProperty("学时")

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

@@ -26,4 +26,6 @@ public class ClassGradeDecryptQueryBo extends BaseEntity {
 	private String bh;
 
 	private String idnum;
+
+	private String token;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/impl/ClassGradeUserServiceImpl.java

@@ -584,9 +584,10 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
         if (Validator.isEmpty(userVo.getRealName()) || Validator.isEmpty(userVo.getIdCard()) || Validator.isEmpty(userVo.getTelPhone())) {
             return "用户信息缺失";
         }
-        log.info("报名信息推送OFFICIALPUSH_INFOACCOUNT" + JSON.toJSONString(OFFICIALPUSH_INFOACCOUNT));
-        log.info("报名信息推送OFFICIALPUSH_INFOACCOUNT" + JSON.toJSONString(OFFICIALPUSH_INFOACCOUNT));
-        log.info("班级名称" + userVo.getOfficialName());
+        if(Validator.isNotEmpty(configService.selectConfigByKeyNoCache("office.account"))){
+            OFFICIALPUSH_INFOACCOUNT = configService.selectConfigByKeyNoCache("office.account");
+            OFFICIALPUSH_TOKEN = configService.selectConfigByKeyNoCache("office.token");
+        }
         Map<String, String> params = new HashMap<>();
         params.put("zh", OFFICIALPUSH_INFOACCOUNT);
         params.put("bh", userVo.getOfficialName());
@@ -595,6 +596,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
         params.put("dh", userVo.getTelPhone());
         params.put("bmrq", DateUtils.timestampToDate(bmrq));
         String dataTxt = params.get("zh") + params.get("bh") + params.get("xm") + params.get("sfz") + params.get("dh") + params.get("bmrq");
+        log.info("报名信息推送参数"+ dataTxt);
         String encrypted = dataSign(dataTxt, OFFICIALPUSH_TOKEN);
         params.put("SignMsg", encrypted);
         String respone = "";
@@ -641,7 +643,13 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
     public ClassPeriodStudentVo DecryptOfficialInfo(ClassGradeDecryptQueryBo bo) {
         String pars;
         try {
-            ServletUtils.getRequestAttributes().getResponse().setHeader("TenantId", bo.getTenantId());
+            if(Validator.isNotEmpty(bo.getTenantId())){
+                ServletUtils.getRequestAttributes().getResponse().setHeader("TenantId", bo.getTenantId());
+            }
+            if(Validator.isNotEmpty(configService.selectConfigByKeyNoCache("office.account"))){
+                OFFICIALPUSH_INFOACCOUNT = configService.selectConfigByKeyNoCache("office.account");
+                OFFICIALPUSH_TOKEN = configService.selectConfigByKeyNoCache("office.token");
+            }
             //     data = "DjqbGTiWrtqJvLSKObhAB1F+s1vPmc1XWNagrHjwlK1JiCO1CuicJEcP+MzZoUyiSfDLeV2GZio=";
             //     data ="Z4lUlc48qtBmZcg4tbNmt767KDeYhu6h+Xz8ySE5MqYSy3tF1/m2cTLtAQRlHV9X4JtXoCwapll/IiMVNyrOwsZD9Ujjf682";
             byte[] Keys = new byte[]{0x22, 0x34, 0x76, 0x58, (byte) 0x90, (byte) 0xAB, (byte) 0xAD, (byte) 0xBF};

zhongzheng-system/src/main/java/com/zhongzheng/modules/schedule/service/impl/ScheduleServiceImpl.java

@@ -446,7 +446,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
         if (!CollectionUtils.isEmpty(orderGoodsTwoVo)) {
             for (OrderGoodsVo goodsVo : orderGoodsTwoVo) {
                 ProfileTpVo profileTpVo = iProfileTpService.queryByGoodsId(goodsVo.getGoodsId());
-                if (informRemindVo.getNoteStatus() == 1 && profileTpVo == null) {
+                if (Validator.isNotEmpty(informRemindVo.getNoteStatus())&&informRemindVo.getNoteStatus() == 1 && profileTpVo == null) {
                     InformUserAddBo informUserAddBo = new InformUserAddBo();
                     informUserAddBo.setUserId(goodsVo.getUserId());
                     informUserAddBo.setSendTime(DateUtils.getNowTime());

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

@@ -331,6 +331,28 @@ public class SysWebServiceImpl implements ISysWebService {
         config25.setUpdateBy("admin");
         coll.add(config25);
 
+        SysConfig config26 = new SysConfig();
+        config26.setTenantId(bo.getTenantId());
+        config26.setConfigName("注册中心账号");
+        config26.setConfigKey("office.account");
+        config26.setConfigValue("GDSXY");
+        config26.setConfigType("N");
+        config26.setConfigModule("office");
+        config26.setCreateBy("admin");
+        config26.setUpdateBy("admin");
+        coll.add(config26);
+
+        SysConfig config27 = new SysConfig();
+        config27.setTenantId(bo.getTenantId());
+        config27.setConfigName("注册中心密钥");
+        config27.setConfigKey("office.token");
+        config27.setConfigValue("01b5d9833987efdff54483cdc9720da6");
+        config27.setConfigType("N");
+        config27.setConfigModule("office");
+        config27.setCreateBy("admin");
+        config27.setUpdateBy("admin");
+        coll.add(config27);
+
         configService.saveBatch(coll);
 
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/order/service/impl/TopOrderRecNoteServiceImpl.java

@@ -22,8 +22,8 @@ import com.zhongzheng.modules.top.order.domain.TopOrderRecNote;
 import com.zhongzheng.modules.top.order.mapper.TopOrderRecNoteMapper;
 import com.zhongzheng.modules.top.order.service.ITopOrderRecNoteService;
 import com.zhongzheng.modules.top.order.vo.TopOrderRecNoteVo;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -44,12 +44,12 @@ import java.util.stream.Collectors;
 @Service
 public class TopOrderRecNoteServiceImpl extends ServiceImpl<TopOrderRecNoteMapper, TopOrderRecNote> implements ITopOrderRecNoteService {
 
+    @Value("${oldSys.host}")
+    private String OLD_SYS_HOST;
 
     @Autowired
     private ITopOldOrderService iTopOldOrderService;
 
-    @Value("${oldSys.host}")
-    private String OLD_SYS_HOST;
 
 
     @Override

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/UserConfirmInfoServiceImpl.java

@@ -3,6 +3,10 @@ package com.zhongzheng.modules.user.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.lang.Validator;
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.pagehelper.Page;
 import com.zhongzheng.common.exception.CustomException;
 import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.modules.grade.bo.ClassGradeUserQueryBo;
@@ -13,20 +17,14 @@ import com.zhongzheng.modules.order.vo.OrderGoodsVo;
 import com.zhongzheng.modules.user.bo.UserConfirmInfoAddBo;
 import com.zhongzheng.modules.user.bo.UserConfirmInfoEditBo;
 import com.zhongzheng.modules.user.bo.UserConfirmInfoQueryBo;
-import com.zhongzheng.modules.user.domain.User;
 import com.zhongzheng.modules.user.domain.UserConfirmInfo;
 import com.zhongzheng.modules.user.mapper.UserConfirmInfoMapper;
 import com.zhongzheng.modules.user.service.IUserConfirmInfoService;
 import com.zhongzheng.modules.user.vo.UserConfirmInfoVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.github.pagehelper.Page;
 
 import java.util.Collection;
-import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/UserStudyRecordServiceImpl.java

@@ -322,6 +322,19 @@ public class UserStudyRecordServiceImpl extends ServiceImpl<UserStudyRecordMappe
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Integer insertByAddBo(UserStudyRecordAddBo bo) {
+        //temp start
+        GoodsVo goodsVoTemp = iGoodsService.queryById(bo.getGoodsId());
+        CourseBusinessQueryBo businessQueryBo = new CourseBusinessQueryBo();
+        businessQueryBo.setId(goodsVoTemp.getBusinessId());
+        String fullNameTemp = iCourseBusinessService.queryFullName(businessQueryBo);
+        if(Validator.isNotEmpty(fullNameTemp)){
+            if(fullNameTemp.equals("继续教育二级建造师")||fullNameTemp.equals("继续教育二级造价师")){
+                bo.setErJianErZao(true);
+            }
+        }
+        //temp end
+
+
         CourseSectionVo courseSectionVo =iCourseSectionService.queryById(bo.getSectionId());
         if(Validator.isEmpty(courseSectionVo)){
             throw new CustomException("节数据错误");
@@ -464,7 +477,9 @@ public class UserStudyRecordServiceImpl extends ServiceImpl<UserStudyRecordMappe
             UserStudyRecordVo lastVo = queryLast(queryBo);
             if(Validator.isEmpty(lastVo)||Validator.isNotEmpty(bo.getPhoto())||Validator.isEmpty(lastVo.getVideoCurrentTime())||lastVo.getVideoCurrentTime().longValue()>add.getVideoCurrentTime().longValue()){
                 //如果没有历史数据或者之前播放时长比现在晚，或者携带照片则新增观看记录
-                if(Validator.isNotEmpty(lastVo)&&Validator.isNotEmpty(lastVo.getSectionId())&&Validator.isNotEmpty(bo.getErJianErZao())&&bo.getErJianErZao()&&Validator.isEmpty(bo.getPhoto())&&(lastVo.getVideoCurrentTime().longValue()>add.getVideoCurrentTime().longValue())){
+                if(Validator.isNotEmpty(lastVo)&&Validator.isNotEmpty(lastVo.getSectionId())
+                        &&Validator.isNotEmpty(bo.getErJianErZao())&&bo.getErJianErZao()
+                        &&Validator.isEmpty(bo.getPhoto())&&(lastVo.getVideoCurrentTime().longValue()>add.getVideoCurrentTime().longValue())){
                     if(Validator.isNotEmpty(add.getStatus())&&add.getStatus()==1){
                         this.save(add);
                     }else{

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/vo/UserLoginKeyVo.java

@@ -1,11 +1,9 @@
 package com.zhongzheng.modules.user.vo;
 
 import com.zhongzheng.common.annotation.Excel;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import java.util.Date;