submit

run-prod.sh

@@ -1,42 +1,3 @@
-#!/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
 # 定义应用组名
 group_admin_name='zhongzheng'

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/mapper/GoodsMapper.java

@@ -80,4 +80,7 @@ public interface GoodsMapper extends BaseMapper<Goods> {
     void updateHandoutsId(@Param("goodsId") Long goodsId,@Param("tenantId") Long tenantId,@Param("handoutsId") Long handoutsId);
 
     String getGoodsBusinessName(Long goodsId);
+
+    @InterceptorIgnore(tenantLine = "true")
+    Long getNewHandoutsId(@Param("handoutsName") String handoutsName,@Param("encoder") String encoder,@Param("newTenantId") Long newTenantId);
 }

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

@@ -1519,11 +1519,12 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
                 }
 
                 //讲义
-      /*          if (ObjectUtil.isNotNull(goods.getHandoutsId())){
+                if (ObjectUtil.isNotNull(goods.getHandoutsId())){
                     CourseHandouts courseHandouts = iCourseHandoutsService.getById(goods.getHandoutsId());
                     if (ObjectUtil.isNotNull(courseHandouts)){
                         Long oid = courseHandouts.getHandoutsId();
-                        Long newId = getNewIdByTenant(oid, GoodsCopyEnum.COURSE_HANDOUTS.getType(),newTenantId);
+//                        Long newId = getNewIdByTenant(oid, GoodsCopyEnum.COURSE_HANDOUTS.getType(),newTenantId);
+                        Long newId = baseMapper.getNewHandoutsId(courseHandouts.getHandoutsName(),courseHandouts.getEncoder(),newTenantId);
                         if (ObjectUtil.isNull(newId)){
                             //讲义业务层次
                             List<CourseHandoutsBusiness> handoutsBusinessList = iCourseHandoutsBusinessService
@@ -1561,7 +1562,7 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
                             handleCourseFile(courseFileList,newId,newTenantId);
                         }
                     }
-                }*/
+                }
 
                 //科目ID，拼接
                 if (StringUtils.isNotBlank(goods.getSubjectIds())){

zhongzheng-system/src/main/resources/mapper/modules/goods/GoodsMapper.xml

@@ -956,4 +956,8 @@
             g.goods_id = #{goodsId}
     </select>
 
+    <select id="getNewHandoutsId" parameterType="map" resultType="java.lang.Long">
+        SELECT handouts_id FROM course_handouts WHERE INSTR(handouts_name,#{handoutsName}) AND encoder = #{encoder} AND tenant_id = #{newTenantId}
+    </select>
+
 </mapper>