MERGE

run-prod.sh

@@ -1,3 +1,41 @@
+#!/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秒内随机
+sleep 5
+echo "等待后继续"
 
 #!/usr/bin/env bash
 # 定义应用组名
@@ -33,3 +71,46 @@ docker run \
 -v /data/nginx/conf.d:/data/nginx/conf.d \
 -d ${group_admin_name}/${app_admin_name}:${app_admin_version}
 echo '----start container admin----'
+
+echo "开始等待20秒..."
+# 1-10秒内随机
+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-framework/src/main/java/com/zhongzheng/framework/web/service/UserServiceImpl.java

@@ -1493,7 +1493,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         }
         if (!SecurityUtils.matchesPassword(password,user.getPassword()))
         {
-            iUserLoginErrorService.saveErrorLog(bo.getAccount());
+//            iUserLoginErrorService.saveErrorLog(bo.getAccount());
             throw new BaseException("登录信息错误");
         }
         Long tenantId = user.getTenantId();

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CourseBusinessAddBo.java

@@ -83,4 +83,6 @@ public class CourseBusinessAddBo {
     private Integer periodType;
     @ApiModelProperty("学时审核层级：1初审，2初审和复审")
     private Integer periodNumber;
+    @ApiModelProperty("学时审核标签：1开启 2关闭")
+    private Integer periodCheckSign;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CourseBusinessEditBo.java

@@ -94,4 +94,6 @@ public class CourseBusinessEditBo {
     private Integer periodType;
     @ApiModelProperty("学时审核层级：1初审，2初审和复审")
     private Integer periodNumber;
+    @ApiModelProperty("学时审核标签：1开启 2关闭")
+    private Integer periodCheckSign;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/domain/CourseBusiness.java

@@ -72,6 +72,8 @@ private static final long serialVersionUID=1L;
     private Integer periodType;
     /** 学时审核层级：1初审，2初审和复审 */
     private Integer periodNumber;
+    /** 学时审核标签：1开启 2关闭 */
+    private Integer periodCheckSign;
     private Long tenantId;
 
     @TableField(exist = false)

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

@@ -749,6 +749,11 @@ public class CourseServiceImpl extends ServiceImpl<CourseMapper, Course> impleme
                         goodsUserVo.setUserProfile(1);
                     }
                 }
+
+                //继续课程显示班级名称
+                if (fullName.contains("继续教育")){
+                    goodsUserVo.setGoodsName(classGradeVo.getClassName());
+                }
             }
 
             goodsUserVo.setGradeId(classGradeVo.getGradeId());

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

@@ -130,4 +130,6 @@ public class CourseBusinessVo {
 	private Integer periodNumber;
 	@ApiModelProperty("专题页ID")
 	private Long topicId;
+	@ApiModelProperty("学时审核标签：1开启 2关闭")
+	private Integer periodCheckSign;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/mapper/ClassGradeUserMapper.java

@@ -116,4 +116,7 @@ public interface ClassGradeUserMapper extends BaseMapper<ClassGradeUser> {
 
     @InterceptorIgnore(tenantLine = "true")
     ClassGradeUser selectUserNoTenant(ClassGradeUserQueryBo bo);
+
+    List<Long> getFinishRequiredCourse(ClassGradeUserQueryBo bo);
+
 }

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

@@ -3729,13 +3729,19 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
                 UserStudyTimeVo timeVo = JSONArray.parseObject(jsonObject1.get("data").toString(), UserStudyTimeVo.class);
                 if (ObjectUtils.isNotNull(timeVo) && ObjectUtils.isNotNull(timeVo.getStudyStartTime()) && timeVo.getStudyFlag()){
                     //旧系统正在学习中
-                    return 1L;
+                    throw new CustomException("请把旧云学堂课程学习完成，再学习另一个课程");
                 }
             } catch (Exception e) {
-                throw new CustomException("旧系统二建继续校验接口请求失败"+e.getMessage());
+                throw new CustomException(e.getMessage());
             }
         }
-        return baseMapper.checkFinishRequiredCourse(bo);
+        Long aLong = baseMapper.checkFinishRequiredCourse(bo);
+        if (aLong > 0){
+            List<Long> goodsIds = baseMapper.getFinishRequiredCourse(bo);
+            Goods goods = iGoodsService.getById(goodsIds.get(0));
+            throw new CustomException("请按顺序学习，把【"+goods.getGoodsName()+"】学习完成，再学习另一个课程");
+        }
+        return 0L;
     }
 
     @Override

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/bo/CompanyOrderInvoiceBo.java

@@ -55,5 +55,7 @@ public class CompanyOrderInvoiceBo implements Serializable {
     /** 经办手机号 */
     @ApiModelProperty("经办手机号")
     private String telphone;
-
+    /** 经办订单 */
+    @ApiModelProperty("经办订单")
+    private String handleOrderSn;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/bo/OrderBusinessConfigAddBo.java

@@ -36,4 +36,7 @@ public class OrderBusinessConfigAddBo {
     /** 班级类型 1基础班 2强化班 3私塾班 */
     @ApiModelProperty("班级类型 1基础班 2强化班 3私塾班")
     private Integer gradeType;
+    /** 上传主图 */
+    @ApiModelProperty("上传主图")
+    private String mainImg;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/bo/OrderBusinessConfigEditBo.java

@@ -39,6 +39,8 @@ public class OrderBusinessConfigEditBo {
     /** 班级类型 1基础班 2强化班 3私塾班 */
     @ApiModelProperty("班级类型 1基础班 2强化班 3私塾班")
     private Integer gradeType;
-
+    /** 上传主图 */
+    @ApiModelProperty("上传主图")
+    private String mainImg;
 
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/bo/OrderBusinessConfigQueryBo.java

@@ -35,7 +35,9 @@ public class OrderBusinessConfigQueryBo extends BaseEntity {
 	/** 排序的方向desc或者asc */
 	@ApiModelProperty(value = "排序的方向", example = "asc,desc")
 	private String isAsc;
-
+	/** 上传主图 */
+	@ApiModelProperty("上传主图")
+	private String mainImg;
 
 	/** 业务层次id */
 	@ApiModelProperty("业务层次ID")

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/domain/OrderBusinessConfig.java

@@ -40,4 +40,6 @@ private static final long serialVersionUID=1L;
     private Integer status;
     /** 班级类型 1基础班 2强化班 3私塾班 */
     private Integer gradeType;
+    /** 主图上传*/
+    private String mainImg;
 }

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

@@ -594,9 +594,6 @@ public class OrderGoodsServiceImpl extends ServiceImpl<OrderGoodsMapper, OrderGo
     public List<OrderGoodsVo> listUserVideoLive(GoodsQueryBo bo) {
         List<OrderGoodsVo> list = this.baseMapper.listUserVideoLive(bo);
         for(OrderGoodsVo goodsVo : list){
-            if(goodsVo.getOrderGoodsId().longValue()==6311L){
-                System.out.println(goodsVo.getOrderGoodsId());
-            }
             String fullName = goodsVo.getEducationName()+goodsVo.getBusinessName()+goodsVo.getProjectName();
             goodsVo.setErJianErZao(false);
             if(Validator.isNotEmpty(fullName)){
@@ -649,6 +646,9 @@ public class OrderGoodsServiceImpl extends ServiceImpl<OrderGoodsMapper, OrderGo
                 if(Validator.isEmpty(classGradeVo)){
                     continue;
                 }
+                if (fullName.contains("继续教育")){
+                    goodsVo.setGoodsName(classGradeVo.getClassName());
+                }
                 goodsVo.setPeriodStatus(classGradeVo.getPeriodStatus());
                 goodsVo.setPeriodPlush(classGradeVo.getPeriodPlush());
                 goodsVo.setGradeStatus(classGradeVo.getStatus());

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/vo/CompanyOrderInvoiceVo.java

@@ -93,4 +93,7 @@ public class CompanyOrderInvoiceVo implements Serializable {
     /** 经办手机号 */
     @ApiModelProperty("经办手机号")
     private String telphone;
+    /** 经办订单 */
+    @ApiModelProperty("经办订单")
+    private String handleOrderSn;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/vo/CompanyStatisticsVo.java

@@ -27,5 +27,8 @@ public class CompanyStatisticsVo implements Serializable {
 
     @ApiModelProperty("待审发票")
     private Integer unApplyNum;
+    /** 经办订单 */
+    @ApiModelProperty("经办订单")
+    private String handleOrderSn;
 
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/vo/OrderBusinessConfigVo.java

@@ -49,4 +49,7 @@ public class OrderBusinessConfigVo {
 	/** 班级类型 1基础班 2强化班 3私塾班 */
 	@ApiModelProperty("班级类型 1基础班 2强化班 3私塾班")
 	private Integer gradeType;
+	/** 上传主图 */
+	@ApiModelProperty("上传主图")
+	private String mainImg;
 }

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

@@ -1777,6 +1777,9 @@ public class UserStudyRecordServiceImpl extends ServiceImpl<UserStudyRecordMappe
             userStudyRecordPhotoAddBo.setPeriodId(periodId);
             userStudyRecordPhotoAddBo.setStatus(1);
             userStudyRecordPhotoAddBo.setUserId(entity.getUserId());
+            if(Validator.isEmpty(bo.getSimilarity())){
+                throw new CustomException("相似度缺失");
+            }
             userStudyRecordPhotoAddBo.setSimilarity(bo.getSimilarity());
             userStudyRecordPhotoService.insertByAddBo(userStudyRecordPhotoAddBo);
         }

zhongzheng-system/src/main/resources/mapper/modules/course/CourseMapper.xml

@@ -896,6 +896,7 @@
             cg.class_start_time,
             cg.class_end_time,
             cg.class_status,
+            cg.class_name,
             cg.status,
             cg.learning_status,
             cgu.period_status,

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

@@ -481,6 +481,7 @@
         GROUP BY c.goods_id ) ge on og.goods_id = ge.goods_id */
         where 1=1
         and cgu.`status` =1
+        and cb.`period_check_sign` = 1
         <if test="periodPlush != null and periodPlush != ''">
             AND cgu.period_plush = #{periodPlush}
         </if>
@@ -1709,6 +1710,32 @@
             )>0
     </select>
 
+    <select id="getFinishRequiredCourse" parameterType="com.zhongzheng.modules.grade.bo.ClassGradeUserQueryBo" resultType="java.lang.Long">
+        SELECT
+            g.goods_id
+        FROM
+            class_grade_user cgu
+                LEFT JOIN order_goods og ON cgu.order_goods_id = og.order_goods_id
+                LEFT JOIN goods g on og.goods_id = g.goods_id
+                LEFT JOIN class_grade cg on cg.grade_id = cgu.grade_id
+        WHERE
+            cgu.user_id = #{userId}
+          AND cgu.period_status = -1
+          AND (unix_timestamp(now())  BETWEEN cg.class_start_time and cg.class_end_time)
+          and g.business_id = #{businessId}
+          and g.goods_id != #{goodsId}
+          AND (
+            SELECT
+            IFNULL( count(*), 0 )
+            FROM
+            user_period up
+            WHERE
+            1 = 1
+          AND up.user_id = cgu.user_id
+          AND up.grade_id = cgu.grade_id
+            )>0
+    </select>
+
     <select id="getSevenPeriodStartTime" parameterType="com.zhongzheng.modules.grade.bo.ClassGradeUserQueryBo" resultType="java.lang.Long">
         SELECT
         p.create_time

zhongzheng-system/src/main/resources/mapper/modules/order/OrderBusinessConfigMapper.xml

@@ -12,6 +12,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime" column="update_time"/>
         <result property="status" column="status"/>
         <result property="gradeType" column="grade_type"/>
+        <result property="mainImg" column="main_img"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.order.vo.OrderBusinessConfigVo" id="OrderBusinessConfigVoResult">
@@ -23,6 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="educationName" column="education_name"/>
         <result property="projectName" column="project_name"/>
         <result property="gradeType" column="grade_type"/>
+        <result property="mainImg" column="main_img"/>
     </resultMap>
 
     <select id="getList" parameterType="com.zhongzheng.modules.order.bo.OrderBusinessConfigQueryBo" resultMap="OrderBusinessConfigVoResult">

zhongzheng-system/src/main/resources/mapper/modules/order/OrderInvoiceMapper.xml

@@ -202,6 +202,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="educationTypeId != null and educationTypeId != ''">
             AND oh.education_type_id = #{educationTypeId}
         </if>
+        <if test="handleOrderSn != null and handleOrderSn != ''">
+            AND oh.handle_order_sn = #{handleOrderSn}
+        </if>
         <if test="businessId != null and businessId != ''">
             AND oh.business_id = #{businessId}
         </if>