diff --git a/src/main/java/cn/com/tenlion/systemcard/controller/app/api/cardtemplateuse/CardTemplateUseAppController.java b/src/main/java/cn/com/tenlion/systemcard/controller/app/api/cardtemplateuse/CardTemplateUseAppController.java index f96c118..bf68343 100644 --- a/src/main/java/cn/com/tenlion/systemcard/controller/app/api/cardtemplateuse/CardTemplateUseAppController.java +++ b/src/main/java/cn/com/tenlion/systemcard/controller/app/api/cardtemplateuse/CardTemplateUseAppController.java @@ -158,8 +158,6 @@ public class CardTemplateUseAppController extends DefaultBaseController { try { String userId = securityComponent.getAppTokenUser(token).getId(); params.put("userId", userId); - if(1 == 1) - throw new SearchException("测试"); }catch(Exception e) { throw new SearchException("没有登陆信息"); } diff --git a/src/main/java/cn/com/tenlion/systemcard/pojo/bos/cardtemplate/CardTemplateBO.java b/src/main/java/cn/com/tenlion/systemcard/pojo/bos/cardtemplate/CardTemplateBO.java index 8b5bc64..07aebb2 100644 --- a/src/main/java/cn/com/tenlion/systemcard/pojo/bos/cardtemplate/CardTemplateBO.java +++ b/src/main/java/cn/com/tenlion/systemcard/pojo/bos/cardtemplate/CardTemplateBO.java @@ -1,5 +1,7 @@ package cn.com.tenlion.systemcard.pojo.bos.cardtemplate; +import java.io.Serializable; + /** * * @ClassName: CardTemplateBO diff --git a/src/main/java/cn/com/tenlion/systemcard/pojo/dtos/cardcharge/CardChargeDTO.java b/src/main/java/cn/com/tenlion/systemcard/pojo/dtos/cardcharge/CardChargeDTO.java index 74ee203..8e7ac36 100644 --- a/src/main/java/cn/com/tenlion/systemcard/pojo/dtos/cardcharge/CardChargeDTO.java +++ b/src/main/java/cn/com/tenlion/systemcard/pojo/dtos/cardcharge/CardChargeDTO.java @@ -3,6 +3,8 @@ package cn.com.tenlion.systemcard.pojo.dtos.cardcharge; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import java.io.Serializable; + /** * * @ClassName: CardChargeDTO @@ -12,7 +14,7 @@ import io.swagger.annotations.ApiModelProperty; * @Version: 3.0 **/ @ApiModel -public class CardChargeDTO { +public class CardChargeDTO implements Serializable { @ApiModelProperty(name = "cardChargeId", value = "名片收费记录表") private String cardChargeId; diff --git a/src/main/java/cn/com/tenlion/systemcard/pojo/dtos/cardtemplate/CardTemplateDTO.java b/src/main/java/cn/com/tenlion/systemcard/pojo/dtos/cardtemplate/CardTemplateDTO.java index c6aac79..7a7d089 100644 --- a/src/main/java/cn/com/tenlion/systemcard/pojo/dtos/cardtemplate/CardTemplateDTO.java +++ b/src/main/java/cn/com/tenlion/systemcard/pojo/dtos/cardtemplate/CardTemplateDTO.java @@ -3,6 +3,8 @@ package cn.com.tenlion.systemcard.pojo.dtos.cardtemplate; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import java.io.Serializable; + /** * * @ClassName: CardTemplateDTO @@ -12,7 +14,7 @@ import io.swagger.annotations.ApiModelProperty; * @Version: 3.0 **/ @ApiModel -public class CardTemplateDTO { +public class CardTemplateDTO implements Serializable { @ApiModelProperty(name = "cardTemplateId", value = "模板") private String cardTemplateId; diff --git a/src/main/java/cn/com/tenlion/systemcard/pojo/dtos/cardtemplatedispatch/CardTemplateDispatchDTO.java b/src/main/java/cn/com/tenlion/systemcard/pojo/dtos/cardtemplatedispatch/CardTemplateDispatchDTO.java index 2061c59..55a20be 100644 --- a/src/main/java/cn/com/tenlion/systemcard/pojo/dtos/cardtemplatedispatch/CardTemplateDispatchDTO.java +++ b/src/main/java/cn/com/tenlion/systemcard/pojo/dtos/cardtemplatedispatch/CardTemplateDispatchDTO.java @@ -4,6 +4,8 @@ import cn.com.tenlion.systemcard.pojo.dtos.cardtemplateuse.CardTemplateUseDTO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import java.io.Serializable; + /** * * @ClassName: CardTemplateDispatchDTO @@ -13,7 +15,7 @@ import io.swagger.annotations.ApiModelProperty; * @Version: 3.0 **/ @ApiModel -public class CardTemplateDispatchDTO { +public class CardTemplateDispatchDTO implements Serializable { @ApiModelProperty(name = "cardTemplateDispatchId", value = "名片转发") private String cardTemplateDispatchId; diff --git a/src/main/java/cn/com/tenlion/systemcard/pojo/dtos/cardtemplatescans/CardTemplateScansDTO.java b/src/main/java/cn/com/tenlion/systemcard/pojo/dtos/cardtemplatescans/CardTemplateScansDTO.java index 0f8f9a3..b211130 100644 --- a/src/main/java/cn/com/tenlion/systemcard/pojo/dtos/cardtemplatescans/CardTemplateScansDTO.java +++ b/src/main/java/cn/com/tenlion/systemcard/pojo/dtos/cardtemplatescans/CardTemplateScansDTO.java @@ -4,6 +4,8 @@ import cn.com.tenlion.systemcard.pojo.dtos.cardtemplateuse.CardTemplateUseDTO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import java.io.Serializable; + /** * * @ClassName: CardTemplateScansDTO @@ -13,7 +15,7 @@ import io.swagger.annotations.ApiModelProperty; * @Version: 3.0 **/ @ApiModel -public class CardTemplateScansDTO { +public class CardTemplateScansDTO implements Serializable { @ApiModelProperty(name = "cardTemplateScansId", value = "名片查看") private String cardTemplateScansId; diff --git a/src/main/java/cn/com/tenlion/systemcard/pojo/dtos/cardtemplateuse/CardTemplateUseDTO.java b/src/main/java/cn/com/tenlion/systemcard/pojo/dtos/cardtemplateuse/CardTemplateUseDTO.java index f011a1a..cfd5fde 100644 --- a/src/main/java/cn/com/tenlion/systemcard/pojo/dtos/cardtemplateuse/CardTemplateUseDTO.java +++ b/src/main/java/cn/com/tenlion/systemcard/pojo/dtos/cardtemplateuse/CardTemplateUseDTO.java @@ -4,6 +4,7 @@ import cn.com.tenlion.systemcard.pojo.dtos.cardtemplateusearea.CardTemplateUseAr import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import java.io.Serializable; import java.util.ArrayList; import java.util.List; @@ -16,7 +17,7 @@ import java.util.List; * @Version: 3.0 **/ @ApiModel -public class CardTemplateUseDTO { +public class CardTemplateUseDTO implements Serializable { @ApiModelProperty(name = "cardTemplateUseId", value = "模板使用") private String cardTemplateUseId; diff --git a/src/main/java/cn/com/tenlion/systemcard/pojo/dtos/cardtemplateusearea/CardTemplateUseAreaDTO.java b/src/main/java/cn/com/tenlion/systemcard/pojo/dtos/cardtemplateusearea/CardTemplateUseAreaDTO.java index 11d3014..25ae446 100644 --- a/src/main/java/cn/com/tenlion/systemcard/pojo/dtos/cardtemplateusearea/CardTemplateUseAreaDTO.java +++ b/src/main/java/cn/com/tenlion/systemcard/pojo/dtos/cardtemplateusearea/CardTemplateUseAreaDTO.java @@ -3,6 +3,8 @@ package cn.com.tenlion.systemcard.pojo.dtos.cardtemplateusearea; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import java.io.Serializable; + /** * * @ClassName: CardTemplateUseAreaDTO @@ -12,7 +14,7 @@ import io.swagger.annotations.ApiModelProperty; * @Version: 3.0 **/ @ApiModel -public class CardTemplateUseAreaDTO { +public class CardTemplateUseAreaDTO implements Serializable { @ApiModelProperty(name = "cardTemplateUseAreaId", value = "模板区域使用") private String cardTemplateUseAreaId; diff --git a/src/main/java/cn/com/tenlion/systemcard/pojo/dtos/cardtemplateusebag/CardTemplateUseBagDTO.java b/src/main/java/cn/com/tenlion/systemcard/pojo/dtos/cardtemplateusebag/CardTemplateUseBagDTO.java index 6f3fe50..c0bd113 100644 --- a/src/main/java/cn/com/tenlion/systemcard/pojo/dtos/cardtemplateusebag/CardTemplateUseBagDTO.java +++ b/src/main/java/cn/com/tenlion/systemcard/pojo/dtos/cardtemplateusebag/CardTemplateUseBagDTO.java @@ -4,6 +4,8 @@ import cn.com.tenlion.systemcard.pojo.dtos.cardtemplateuse.CardTemplateUseDTO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import java.io.Serializable; + /** * * @ClassName: CardTemplateUseBagDTO @@ -13,7 +15,7 @@ import io.swagger.annotations.ApiModelProperty; * @Version: 3.0 **/ @ApiModel -public class CardTemplateUseBagDTO { +public class CardTemplateUseBagDTO implements Serializable { @ApiModelProperty(name = "cardTemplateUseBagId", value = "我的卡包") private String cardTemplateUseBagId; diff --git a/src/main/java/cn/com/tenlion/systemcard/pojo/pos/cardtemplate/CardTemplatePO.java b/src/main/java/cn/com/tenlion/systemcard/pojo/pos/cardtemplate/CardTemplatePO.java index 7e98912..9e8a389 100644 --- a/src/main/java/cn/com/tenlion/systemcard/pojo/pos/cardtemplate/CardTemplatePO.java +++ b/src/main/java/cn/com/tenlion/systemcard/pojo/pos/cardtemplate/CardTemplatePO.java @@ -1,5 +1,7 @@ package cn.com.tenlion.systemcard.pojo.pos.cardtemplate; +import java.io.Serializable; + /** * * @ClassName: CardTemplatePO diff --git a/src/main/resources/mybatis/mapper/cardcharge/card-charge-mapper.xml b/src/main/resources/mybatis/mapper/cardcharge/card-charge-mapper.xml index 598d49f..7b3d630 100644 --- a/src/main/resources/mybatis/mapper/cardcharge/card-charge-mapper.xml +++ b/src/main/resources/mybatis/mapper/cardcharge/card-charge-mapper.xml @@ -2,6 +2,8 @@ + + @@ -60,7 +62,7 @@ - SELECT t1.card_charge_price, t1.card_charge_end, @@ -97,7 +99,7 @@ - SELECT t1.card_charge_price, t1.card_charge_end, @@ -129,7 +131,7 @@ - SELECT t1.card_charge_price, t1.card_charge_end, @@ -153,7 +155,7 @@ t1.is_delete = 0 AND t1.card_charge_order_number = #{cardChargeOrderNumber} - + UPDATE e_card_charge SET @@ -165,7 +167,7 @@ - SELECT t1.card_charge_price, t1.card_charge_end, @@ -193,7 +195,7 @@ - SELECT t1.card_charge_price, t1.card_charge_end, @@ -225,7 +227,7 @@ - + INSERT INTO e_card_charge( card_charge_id, card_charge_price, @@ -274,7 +276,7 @@ - + UPDATE e_card_charge SET @@ -289,7 +291,7 @@ - + DELETE FROM e_card_charge WHERE @@ -300,7 +302,7 @@ - + UPDATE e_card_charge SET @@ -345,7 +347,7 @@ - SELECT t1.card_charge_price, t1.card_charge_end, @@ -435,7 +437,7 @@ - SELECT t1.card_charge_id, t1.card_charge_price, diff --git a/src/main/resources/mybatis/mapper/cardtemplate/card-template-mapper.xml b/src/main/resources/mybatis/mapper/cardtemplate/card-template-mapper.xml index 5e2964b..43bbee9 100644 --- a/src/main/resources/mybatis/mapper/cardtemplate/card-template-mapper.xml +++ b/src/main/resources/mybatis/mapper/cardtemplate/card-template-mapper.xml @@ -2,6 +2,8 @@ + + @@ -47,7 +49,7 @@ - + INSERT INTO e_card_template( card_template_id, template_mode, @@ -80,7 +82,7 @@ - + UPDATE e_card_template SET @@ -95,7 +97,7 @@ - + DELETE FROM e_card_template WHERE @@ -106,7 +108,7 @@ - + UPDATE e_card_template SET @@ -135,7 +137,7 @@ - SELECT t1.template_mode, t1.template_type, @@ -208,7 +210,7 @@ - SELECT t1.card_template_id, t1.template_mode, diff --git a/src/main/resources/mybatis/mapper/cardtemplatedispatch/card-template-dispatch-mapper.xml b/src/main/resources/mybatis/mapper/cardtemplatedispatch/card-template-dispatch-mapper.xml index e6ffc29..e2aa89c 100644 --- a/src/main/resources/mybatis/mapper/cardtemplatedispatch/card-template-dispatch-mapper.xml +++ b/src/main/resources/mybatis/mapper/cardtemplatedispatch/card-template-dispatch-mapper.xml @@ -2,6 +2,8 @@ + + @@ -45,7 +47,7 @@ - + INSERT INTO e_card_template_dispatch( card_template_dispatch_id, card_template_use_id, @@ -74,7 +76,7 @@ - + UPDATE e_card_template_dispatch SET @@ -89,7 +91,7 @@ - + DELETE FROM e_card_template_dispatch WHERE @@ -100,7 +102,7 @@ - + UPDATE e_card_template_dispatch SET @@ -127,7 +129,7 @@ - SELECT t1.card_template_dispatch_id, t1.card_template_use_id, @@ -195,7 +197,7 @@ - SELECT temp.* FROM ( SELECT diff --git a/src/main/resources/mybatis/mapper/cardtemplatescans/card-template-scans-mapper.xml b/src/main/resources/mybatis/mapper/cardtemplatescans/card-template-scans-mapper.xml index 27beb31..7813c42 100644 --- a/src/main/resources/mybatis/mapper/cardtemplatescans/card-template-scans-mapper.xml +++ b/src/main/resources/mybatis/mapper/cardtemplatescans/card-template-scans-mapper.xml @@ -2,6 +2,8 @@ + + @@ -42,7 +44,7 @@ - + INSERT INTO e_card_template_scans( card_template_scans_id, card_template_dispatch_id, @@ -69,7 +71,7 @@ - + UPDATE e_card_template_scans SET @@ -84,7 +86,7 @@ - + DELETE FROM e_card_template_scans WHERE @@ -95,7 +97,7 @@ - + UPDATE e_card_template_scans SET @@ -110,7 +112,7 @@ - SELECT t1.card_template_scans_id, t1.card_template_dispatch_id, @@ -183,7 +185,7 @@ - SELECT t1.card_template_scans_id, t1.card_template_dispatch_id, @@ -204,7 +206,7 @@ - SELECT t1.card_template_scans_id, t1.card_template_dispatch_id, diff --git a/src/main/resources/mybatis/mapper/cardtemplateuse/card-template-use-mapper.xml b/src/main/resources/mybatis/mapper/cardtemplateuse/card-template-use-mapper.xml index 43790ea..00cebfb 100644 --- a/src/main/resources/mybatis/mapper/cardtemplateuse/card-template-use-mapper.xml +++ b/src/main/resources/mybatis/mapper/cardtemplateuse/card-template-use-mapper.xml @@ -2,6 +2,8 @@ + + @@ -83,7 +85,7 @@ - + UPDATE e_card_template_use SET @@ -96,7 +98,7 @@ - + UPDATE e_card_template_use SET @@ -107,7 +109,7 @@ - + UPDATE e_card_template_use SET @@ -117,7 +119,7 @@ - + UPDATE e_card_template_use SET @@ -127,7 +129,7 @@ - + UPDATE e_card_template_use SET @@ -140,7 +142,7 @@ - + INSERT INTO e_card_template_use( card_template_use_id, picture_template_id, @@ -209,7 +211,7 @@ - + UPDATE e_card_template_use SET @@ -224,7 +226,7 @@ - + DELETE FROM e_card_template_use WHERE @@ -235,7 +237,7 @@ - + UPDATE e_card_template_use SET @@ -271,7 +273,7 @@ - SELECT t1.card_template_use_id, t1.picture_template_id, @@ -310,7 +312,7 @@ - SELECT t1.card_template_use_id, t1.picture_template_id, @@ -349,7 +351,7 @@ - SELECT t1.card_template_use_id, t1.picture_template_id, @@ -457,7 +459,7 @@ - SELECT t1.card_template_use_id, t1.picture_template_id, diff --git a/src/main/resources/mybatis/mapper/cardtemplateusearea/card-template-use-area-mapper.xml b/src/main/resources/mybatis/mapper/cardtemplateusearea/card-template-use-area-mapper.xml index 890be3d..ad6f9c1 100644 --- a/src/main/resources/mybatis/mapper/cardtemplateusearea/card-template-use-area-mapper.xml +++ b/src/main/resources/mybatis/mapper/cardtemplateusearea/card-template-use-area-mapper.xml @@ -2,6 +2,8 @@ + + @@ -94,7 +96,7 @@ - + INSERT INTO e_card_template_use_area( card_template_use_area_id, card_template_use_id, @@ -157,7 +159,7 @@ - + UPDATE e_card_template_use_area SET @@ -172,7 +174,7 @@ - + DELETE FROM e_card_template_use_area WHERE @@ -183,7 +185,7 @@ - + UPDATE e_card_template_use_area SET @@ -201,7 +203,7 @@ - SELECT t1.card_template_use_area_id, t1.card_template_use_id, @@ -320,7 +322,7 @@ - SELECT t1.card_template_use_area_id, t1.card_template_use_id, diff --git a/src/main/resources/mybatis/mapper/cardtemplateusebag/card-template-use-bag-mapper.xml b/src/main/resources/mybatis/mapper/cardtemplateusebag/card-template-use-bag-mapper.xml index 69c03f3..1dbb684 100644 --- a/src/main/resources/mybatis/mapper/cardtemplateusebag/card-template-use-bag-mapper.xml +++ b/src/main/resources/mybatis/mapper/cardtemplateusebag/card-template-use-bag-mapper.xml @@ -2,6 +2,8 @@ + + @@ -42,7 +44,7 @@ - + INSERT INTO e_card_template_use_bag( card_template_use_bag_id, card_template_use_id, @@ -69,7 +71,7 @@ - + UPDATE e_card_template_use_bag SET @@ -84,7 +86,7 @@ - + DELETE FROM e_card_template_use_bag WHERE @@ -95,7 +97,7 @@ - + UPDATE e_card_template_use_bag SET @@ -105,7 +107,7 @@ - + UPDATE e_card_template_use_bag SET @@ -129,7 +131,7 @@ - SELECT t1.card_template_use_bag_id, t1.card_template_use_id, @@ -194,7 +196,7 @@ - SELECT temp.* FROM ( SELECT t1.card_template_use_bag_id, diff --git a/src/main/resources/templates/cardconsole/console.html b/src/main/resources/templates/cardconsole/console.html index 136916d..f0def78 100644 --- a/src/main/resources/templates/cardconsole/console.html +++ b/src/main/resources/templates/cardconsole/console.html @@ -145,11 +145,13 @@ }; //关闭事件 socket.onclose = function() { - console.log("Socket已关闭"); + consoleLog = "控制台连接断开...\r\n\r\n"; + setCodeTxt(consoleLog); }; //发生了错误事件 socket.onerror = function() { - alert("Socket发生了错误"); + consoleLog = "控制台连接错误...\r\n\r\n"; + setCodeTxt(consoleLog); //此时可以尝试刷新页面 } } @@ -298,13 +300,6 @@ $(cmainFrame()); - // 初始化内容 - function initData() { - - } - initData(); - - //设置代码内容 function setCodeTxt(value){ $("#editor").focus(); @@ -367,6 +362,15 @@ closeBox(); }); + + // 初始化内容 + function initData() { + consoleLog = "控制台等待连接...\r\n\r\n"; + setCodeTxt(consoleLog); + } + initData(); + + });