编辑应用管理新参数

admin-core/src/main/resources/static/plugins/layui/layui.js

@@ -7603,7 +7603,7 @@ layui.define(["layer", "form"], function (t) {
         o = "layui-show", r = "layui-disabled", c = function () {
             var t = this;
             t.index = 0, t.config = {
-                tool: ["strong", "italic", "underline", "del", "|", "left", "center", "right", "|", "link", "unlink", "face", "image"],
+                tool: ["strong", "italic", "underline", "del", "|", "left", "center", "right", "|", "link", "unlink", "face", "image","table"],
                 hideTool: [],
                 height: 280
             }

web/src/main/java/com/ibeetl/jlw/entity/ResourcesApplication.java

@@ -87,6 +87,46 @@ public class ResourcesApplication extends BaseEntity{
 
     private String thumbnailUrl;
 
+    //适用专业
+    private String applyMajor;
+    //适用课程
+    private String applyCourse;
+    //可开展实验项目
+    private String carryOutProject;
+    private String carryOutProjectOriginal;
+
+    public String getCarryOutProjectOriginal() {
+        return carryOutProjectOriginal;
+    }
+
+    public void setCarryOutProjectOriginal(String carryOutProjectOriginal) {
+        this.carryOutProjectOriginal = carryOutProjectOriginal;
+    }
+
+    public String getApplyMajor() {
+        return applyMajor;
+    }
+
+    public void setApplyMajor(String applyMajor) {
+        this.applyMajor = applyMajor;
+    }
+
+    public String getApplyCourse() {
+        return applyCourse;
+    }
+
+    public void setApplyCourse(String applyCourse) {
+        this.applyCourse = applyCourse;
+    }
+
+    public String getCarryOutProject() {
+        return carryOutProject;
+    }
+
+    public void setCarryOutProject(String carryOutProject) {
+        this.carryOutProject = carryOutProject;
+    }
+
     /**
      * 新增时间
      */

web/src/main/java/com/ibeetl/jlw/web/IndexController.java

@@ -697,7 +697,7 @@ public class IndexController {
 //									//断token的尾巴
 //									if(StringUtils.isNotBlank(token)){
 //										if(token.split("\\.").length > 3){
-//											String loginTime = token.split("\\.")[3];
+//								!			String loginTime = token.split("\\.")[3];
 //											token = token.replace("."+loginTime,"");
 //										}
 //									}
@@ -873,10 +873,11 @@ public class IndexController {
 					});
 
 					// isBG 是否大后台
-					return JsonResult.success(MapUtil.builder().put("isBG", false)
+					JsonResult<Map<Object, Object>> success = JsonResult.success(MapUtil.builder().put("isBG", false)
 							.put("loginTime", loginTime)
 							.put("token_key", createTokenKey(user))
 							.build());
+					return success;
 				}
 			} break;
 			
@@ -1002,7 +1003,8 @@ public class IndexController {
 				createSessionByUserId();
 				if(ApplicationRunnerController.isOnline){
 					String tsUrl = SpringUtil.getBean(Environment.class).getProperty("student.teacher.url");
-					response.sendRedirect(tsUrl + (tsUrl.endsWith("/") ? "" : "/") + "Home" + roleTagCopy);
+//					response.sendRedirect(tsUrl + (tsUrl.endsWith("/") ? "" : "/") + "Home" + roleTagCopy);
+					response.sendRedirect(tsUrl + (tsUrl.endsWith("/") ? "" : "/") + "MyApps" + roleTagCopy);
 				}else {
 					response.sendRedirect("http://localhost:8080/home" + roleTagCopy);
 				}
@@ -1011,7 +1013,9 @@ public class IndexController {
 			else{
 				request.getRequestDispatcher("/pc/index.do" + roleTagCopy).forward(request, response);
 			}
-		}catch (Exception e) { }
+		}catch (Exception e) {
+			e.printStackTrace();
+		}
 	}
 
 	//跳转到电脑端首页

web/src/main/java/com/ibeetl/jlw/web/api/IndexBaseController.java

@@ -11,6 +11,7 @@ import com.ibeetl.admin.core.entity.CoreUser;
 import com.ibeetl.admin.core.service.CoreUserService;
 import com.ibeetl.admin.core.web.JsonResult;
 import com.ibeetl.admin.core.web.query.PageParam;
+import com.ibeetl.jlw.entity.ResourcesApplication;
 import com.ibeetl.jlw.entity.Student;
 import com.ibeetl.jlw.entity.Teacher;
 import com.ibeetl.jlw.entity.UniversitiesColleges;
@@ -83,7 +84,8 @@ public class IndexBaseController {
         if (teacher != null) {
             resourcesApplicationQuery.setTeacherId(teacher.getTeacherId());
         }
-        return JsonResult.success(resourcesApplicationService.queryMyApplicationByConditionQuery(pageQuery));
+        PageQuery<ResourcesApplication> resourcesApplicationPageQuery = resourcesApplicationService.queryMyApplicationByConditionQuery(pageQuery);
+        return JsonResult.success(resourcesApplicationPageQuery);
     }
 
     /**

web/src/main/java/com/ibeetl/jlw/web/query/ResourcesApplicationQuery.java

@@ -60,6 +60,17 @@ public class ResourcesApplicationQuery extends PageParam {
     @ApiModelProperty("应用详细介绍（原始数据）")
     private String applicationInfoOriginal;
 
+    @Query(name = "适用专业",display = false)
+    private String applyMajor;
+    @Query(name = "适用课程",display = false)
+    private String applyCourse;
+    @Query(name = "可开展实验项目",display = false)
+    private String carryOutProject;
+    @Query(name = "可开展实验项目原始数据",display = false)
+    private String carryOutProjectOriginal;
+
+
+
     private String courseInfoIds;
 
     /**
@@ -92,6 +103,54 @@ public class ResourcesApplicationQuery extends PageParam {
     @ApiModelProperty("是否显示key")
     private boolean showKey;
 
+    public String getCarryOutProjectOriginal() {
+        return carryOutProjectOriginal;
+    }
+
+    public void setCarryOutProjectOriginal(String carryOutProjectOriginal) {
+        this.carryOutProjectOriginal = carryOutProjectOriginal;
+    }
+
+    public Boolean getTeacher() {
+        return isTeacher;
+    }
+
+    public void setTeacher(Boolean teacher) {
+        isTeacher = teacher;
+    }
+
+    public boolean isShowKey() {
+        return showKey;
+    }
+
+    public void setShowKey(boolean showKey) {
+        this.showKey = showKey;
+    }
+
+    public String getApplyMajor() {
+        return applyMajor;
+    }
+
+    public void setApplyMajor(String applyMajor) {
+        this.applyMajor = applyMajor;
+    }
+
+    public String getApplyCourse() {
+        return applyCourse;
+    }
+
+    public void setApplyCourse(String applyCourse) {
+        this.applyCourse = applyCourse;
+    }
+
+    public String getCarryOutProject() {
+        return carryOutProject;
+    }
+
+    public void setCarryOutProject(String carryOutProject) {
+        this.carryOutProject = carryOutProject;
+    }
+
     public Long getResourcesApplicationId(){
         return  resourcesApplicationId;
     }
@@ -216,6 +275,10 @@ public class ResourcesApplicationQuery extends PageParam {
         pojo.setApplicationIntroductionOriginal(this.getApplicationIntroductionOriginal());
         pojo.setApplicationInfoOriginal(this.getApplicationInfoOriginal());
         pojo.setLinkSecretKey(this.getLinkSecretKey());
+        pojo.setApplyMajor(this.getApplyMajor());
+        pojo.setApplyCourse(this.getApplyCourse());
+        pojo.setCarryOutProject(this.getCarryOutProject());
+        pojo.setCarryOutProjectOriginal(this.getCarryOutProjectOriginal());
         return pojo;
      }
 

web/src/main/resources/static/js/jlw/resourcesApplication/add.js

@@ -3,7 +3,7 @@ layui.define([ 'form', 'laydate', 'table','upload','layedit','resourcesApplicati
     var upload = layui.upload;
     var layedit = layui.layedit;
     var resourcesApplicationApi = layui.resourcesApplicationApi;
-
+    var editor = Lib.editorMd("test-editor");
     layedit.set({ //富文本上传图片
         uploadImage: {
             url: Common.ctxPath + "/jlw/file/update.do",
@@ -12,6 +12,7 @@ layui.define([ 'form', 'laydate', 'table','upload','layedit','resourcesApplicati
     });
     var one = layedit.build('applicationIntroduction'); //建立编辑器
     var two = layedit.build('applicationInfo'); //建立编辑器
+    var three = layedit.build('carryOutProject'); //建立编辑器
 
     var resourcesApplicationId = $("input[name='resourcesApplicationId']").val();
     if(!$.isEmpty(resourcesApplicationId)){
@@ -19,6 +20,7 @@ layui.define([ 'form', 'laydate', 'table','upload','layedit','resourcesApplicati
         if(ret.code == 0){
             layedit.setContent(one,Lib.repLaceltgt(ret.data.applicationIntroduction),false);
             layedit.setContent(two,Lib.repLaceltgt(ret.data.applicationInfo),false);
+            layedit.setContent(three,Lib.repLaceltgt(ret.data.carryOutProject),false);
         }else {
             layer.msg(ret.msg, {
                 offset: ['50%'],
@@ -123,6 +125,7 @@ layui.define([ 'form', 'laydate', 'table','upload','layedit','resourcesApplicati
 
     var view = {
         init:function(){
+            // debugger
             Lib.initGenrealForm($("#addForm"),form);
             this.initSubmit();
         },
@@ -140,8 +143,13 @@ layui.define([ 'form', 'laydate', 'table','upload','layedit','resourcesApplicati
                     applicationExperimentalCourse:$("input[name='applicationExperimentalCourse']").val(),
                     applicationUserManual:$("input[name='applicationUserManual']").val(),
                     applicationInstallationPackage:$("input[name='applicationInstallationPackage']").val(),
+                    applyMajor:$("input[name='applyMajor']").val(),
+                    applyCourse:$("input[name='applyCourse']").val(),
+                    carryOutProject:   editor.getPreviewedHTML(),//可开展实验项目源码
+                    carryOutProjectOriginal:Lib.repLaceString(editor.getMarkdown()),//可开展实验项目 html
                     applicationIntroduction:layedit.getContent(one),//应用简介 html
                     applicationInfo:layedit.getContent(two),//详细介绍 html
+                    applicationInfo:layedit.getContent(two),//详细介绍 html
                 },url = "/jlw/resourcesApplication/add.json";
                 if($.isEmpty(param.applicationName)){
                     layer.msg("请输入应用名称！", {

web/src/main/resources/static/js/jlw/resourcesCompetition/index.js

@@ -132,7 +132,7 @@ layui.define(['form', 'laydate', 'table'], function (exports) {
 
     //上下架
     function upDrown(status,ids){
-        layer.confirm('是否下架该编程竞赛案例？', function (index) {
+        layer.confirm('是否下架该编程竞赛案例？'    , function (index) {
             var ret = Common.postAjax("/jlw/resourcesCompetition/edit.json", {resourcesCompetitionId: ids,resourcesCompetitionStatus:status});
             layer.msg(ret.code == 0 ? "操作成功！" : ret.msg, {
                 offset: ['50%'],

web/src/main/resources/templates/jlw/resourcesApplication/add.html

@@ -1,7 +1,10 @@
 <!--# layout("/common/layout.html",{"jsBase":"/js/jlw/resourcesApplication/"}){ -->
 <link rel="stylesheet" type="text/css" href="${ctxPath}/css/plugin.css?v=${jsVer}" media="all"/>
-<link rel="stylesheet" href="${ctxPath}/plugins/editorMd/css/editormd.css" />
 <script src="${ctxPath}/plugins/editorMd/editormd.min.js"></script>
+<link rel="stylesheet" type="text/css" href="${ctxPath}/css/plugin.css?v=${jsVer}" media="all"/>
+<link rel="stylesheet" href="${ctxPath}/plugins/editorMd/css/editormd.css"/>
+<link rel="stylesheet" href="${ctxPath}/plugins/highlight/styles/a11y-light.min.css" />
+<script type="text/javascript" src="${ctxPath}/plugins/highlight/highlight.min.js?v=${jsVer}"></script>
 <form class="layui-form" id="addForm">
     <layui:submitButtons id="addButton" buttonType="" />
     <input type="hidden" name="resourcesApplicationId" value="${resourcesApplication.resourcesApplicationId}" />
@@ -163,6 +166,38 @@
             </div>
         </div>
     </div>
+    <div class="layui-row">
+        <div class="layui-form-item">
+            <div class="layui-inline">
+                <label class="layui-form-label">适用专业：</label>
+                <div class="layui-input-inline">
+                    <input type="text" name="applyMajor" value="${resourcesApplication.applyMajor}" class="layui-input" >
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="layui-row">
+        <div class="layui-form-item">
+            <div class="layui-inline">
+                <label class="layui-form-label">适用课程：</label>
+                <div class="layui-input-inline">
+                    <input type="text" name="applyCourse" value="${resourcesApplication.applyCourse}" class="layui-input" >
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="layui-row">
+        <div class="layui-form-item">
+            <label class="layui-form-label">可开展实验项目：</label>
+            <div class="layui-input-block" style="margin-left:180px;">
+                <div id="test-editor">
+                    ${resourcesApplication.carryOutProjectOriginal}
+                    <!--					resourcesCompetitionContent-->
+                    <textarea style="display:none;">${resourcesApplication.carryOutProjectOriginal}</textarea>
+                </div>
+            </div>
+        </div>
+    </div>
 </form>
 <!--#} -->
 <script>
@@ -202,13 +237,13 @@ layui.use(['add','form'], function(){
     var levelRelationMap = {
         1:{name:"国内外宏观经济运行与金融监管平台",child:[{name:"中央银行、财政部、其他政府机构"},{name:"证监会、银保监会、行业协会"},{name:"国外经济、国外政局"}]},
         2:{name:"金融产品设计",child:[{name:"风险管理"},{name:"征信评级"},{name:"估值定价"},{name:"期权建模"},{name:"仿真预测"},{name:"资产证券化"}]},
-        3:{name:"金融产品发行市场",child:[{name:"承销/挂牌"},{name:"并购重组"},{name:"私募"},{name:"PE/VC"}]},
+        3:{name:"金融产品发行市场",child:[{name:"承销/挂牌"},{name:"并购重组"},{name:"私募"},{name:"投资银行"}]},
-        4:{name:"金融产品流通市场",child:[{name:"证券交易"},{name:"融资融券"},{name:"数据资讯"},{name:"研究咨询"},{name:"登记清算"},{name:"财富管理"}]},
+        4:{name:"金融产品流通市场",child:[{name:"证券交易"},{name:"融资融券"},{name:"数据资讯"},{name:"研究咨询"},{name:"登记清算"},{name:"智能理财"}]},
         5:{name:"金融市场参与主体",child:[{name:"证券/期货/基金/信托/资管公司"},{name:"外汇"},{name:"商业银行/政策性银行/信用合作社机构"},{name:"保险公司"},{name:"P2P网络借贷公司"}, {name:"众筹公司"},{name:"第三方支付公司"},{name:"征信评级机构"},{name:"供应链金融服务公司"},{name:"金融科技服务公司"}]},
         6:{name:"大数据技术",child:[{name:"文本挖掘"},{name:"大数据基础"},{name:"分析挖掘"},{name:"可视化BI"},{name:"大数据ETL"},{name:"金融大数据"},{name:"商务大数据"},{name:"用户画像"}]},
         7:{name:"人工智能技术",child:[{name:"机器学习"},{name:"AI基础"},{name:"数字营销"},{name:"智能交易"},{name:"AIGC大模型"},{name:"数字贸易"},{name:"智能风控"},{name:"智能投顾"}]},
         8:{name:"云计算技术",child:[{name:"云主机"},{name:"云储存"},{name:"云数据库"},{name:"容器服务"},{name:"金融SaaS应用"},{name:"公有云"},{name:"私有云"}]},
-        9:{name:"区块链技术",child:[{name:"区块链技术"},{name:"数字资产"},{name:"数字发票"},{name:"数字人民币"},{name:"数字票据"},{name:"供应链金融"},{name:"支付清算"},{name:"......"}]}
+        9:{name:"区块链技术",child:[{name:"区块链技术"},{name:"数字资产"},{name:"数字发票"},{name:"数字人民币"},{name:"数字票据"},{name:"数字供应链"},{name:"支付清算"}]}
     }
 
     $.each(levelRelationMap,function (key,value){

web/src/main/resources/templates/jlw/resourcesCompetition/add.html

@@ -84,9 +84,8 @@
             <label class="layui-form-label">案例介绍：</label>
             <div class="layui-input-block">
                 <div id="test-editor">
-                    <!--					resourcesCompetitionContent-->
+                    <!--resourcesCompetitionContent-->
-                    <textarea
+                    <textarea style="display:none;">${resourcesCompetition.resourcesCompetitionContentOriginal}</textarea>
-                            style="display:none;">${resourcesCompetition.resourcesCompetitionContentOriginal}</textarea>
                 </div>
             </div>
         </div>