From d8b3392c78ef7275125b3c6d1f247d7256942f60 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期三, 12 六月 2024 10:26:19 +0800 Subject: [PATCH] 1、删除压力测试相关数据库表test*,相应删除pojo和mapper; 2、删除demo模块及相关数据库表demo*,相应删除pojo和mapper。 --- /dev/null | 181 --------------------------------------------- pipIrr-platform/pipIrr-web/pom.xml | 1 2 files changed, 0 insertions(+), 182 deletions(-) diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoDemo/DemoAddress.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoDemo/DemoAddress.java deleted file mode 100644 index 6f938e4..0000000 --- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoDemo/DemoAddress.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.dy.pipIrrGlobal.pojoDemo; - -import com.alibaba.fastjson2.annotation.JSONField; -import com.alibaba.fastjson2.writer.ObjectWriterImplToString; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.dy.common.po.BaseEntity; -import lombok.*; - -@TableName(value="demo_address", autoResultMap = true) -@Data -@Builder -@ToString -@NoArgsConstructor -@AllArgsConstructor -public class DemoAddress implements BaseEntity { - - public static final long serialVersionUID = 987654322L; - - @JSONField(serializeUsing= ObjectWriterImplToString.class) - @TableId(type = IdType.INPUT) - public Long id ; - - public String name ; - - @JSONField(serializeUsing= ObjectWriterImplToString.class) - public Long userId ; - - -} diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoDemo/DemoAuth.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoDemo/DemoAuth.java deleted file mode 100644 index 3448bf4..0000000 --- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoDemo/DemoAuth.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.dy.pipIrrGlobal.pojoDemo; - - -import com.alibaba.fastjson2.annotation.JSONField; -import com.alibaba.fastjson2.writer.ObjectWriterImplToString; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.dy.common.po.BaseEntity; -import lombok.*; - -import java.io.Serializable; -import java.util.Date; -import java.util.List; - -@TableName(value="demo_auth", autoResultMap = true) -@Data -@Builder -@ToString -@NoArgsConstructor -@AllArgsConstructor -public class DemoAuth implements BaseEntity { - - public static final long serialVersionUID = 2023112658742315L; - - @JSONField(serializeUsing= ObjectWriterImplToString.class) - @TableId(type = IdType.INPUT) - public Long id; - /** - * 鏉冮檺缂栧彿 - */ - public Integer num; - /** - * 鏉冮檺鍚嶇О - */ - public String name; - /** - * 鏉冮檺绫诲埆 - */ - public String type; - - @TableField(exist = false) - public List<DemoRole> roleList ; - - @JSONField(format="yyyy-MM-dd HH:mm:ss") - @TableField(exist = false) - public Date date ; - -} diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoDemo/DemoMp.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoDemo/DemoMp.java deleted file mode 100644 index b0818e7..0000000 --- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoDemo/DemoMp.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.dy.pipIrrGlobal.pojoDemo; - -import com.alibaba.fastjson2.annotation.JSONField; -import com.alibaba.fastjson2.writer.ObjectWriterImplToString; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.dy.common.po.BaseEntity; -import lombok.*; - -import java.time.LocalDateTime; - -@TableName(value="demo_mp", autoResultMap = true) -@Data -@Builder -@ToString -@NoArgsConstructor -@AllArgsConstructor -public class DemoMp implements BaseEntity { - public static final long serialVersionUID = 202311071534001L; - - @JSONField(serializeUsing= ObjectWriterImplToString.class) - @TableId(type = IdType.INPUT) - public Long id ; - - public String name ; - - public Integer age ; - - public LocalDateTime dt ; - -} diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoDemo/DemoRole.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoDemo/DemoRole.java deleted file mode 100644 index 8268249..0000000 --- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoDemo/DemoRole.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.dy.pipIrrGlobal.pojoDemo; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.*; - -import java.util.List; - -@TableName(value="demo_role", autoResultMap = true) -@Data -@Builder -@ToString -@NoArgsConstructor -@AllArgsConstructor -public class DemoRole { - public static final long serialVersionUID = 202310311722001L; - private Long id; - - private String name; - - private Byte deleted; - - @TableField(exist = false) - private List<DemoUser> userList; - -} \ No newline at end of file diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoDemo/DemoRoleAuth.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoDemo/DemoRoleAuth.java deleted file mode 100644 index 4448222..0000000 --- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoDemo/DemoRoleAuth.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.dy.pipIrrGlobal.pojoDemo; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.dy.common.po.BaseEntity; -import lombok.*; - -import java.io.Serializable; - -@TableName(value="demo_role_auth", autoResultMap = true) -@Data -@Builder -@ToString -@NoArgsConstructor -@AllArgsConstructor -public class DemoRoleAuth implements BaseEntity { - - public static final long serialVersionUID = 987654323L; - - @TableId(value = "roleId", type = IdType.INPUT) - public Long roleId ; - - @TableId(value = "authId", type = IdType.INPUT) - public Long authId ; - -} diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoDemo/DemoTest.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoDemo/DemoTest.java deleted file mode 100644 index d22672e..0000000 --- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoDemo/DemoTest.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.dy.pipIrrGlobal.pojoDemo; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.dy.common.po.BaseEntity; -import lombok.*; - -import java.io.Serializable; -import java.util.Date; - -@TableName(value="demo_test", autoResultMap = true) -@Data -@Builder -@ToString -@NoArgsConstructor -@AllArgsConstructor -public class DemoTest implements BaseEntity { - - public static final long serialVersionUID = 202310101010001L; - - @TableId(value = "id", type = IdType.INPUT) - public Long id ; - - @TableField(value = "age") - public Integer age ; - - @TableField(value = "name") - public String name ; - - @TableField(value = "nick_name") - public String nickName ; - - @TableField(value = "phone") - public String phone ; - - @TableField(value = "create_dt") - public Date createDt ; - - @TableField(exist = false) - public DemoTestAttr attr ; - -} diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoDemo/DemoTestAttr.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoDemo/DemoTestAttr.java deleted file mode 100644 index f41f0c2..0000000 --- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoDemo/DemoTestAttr.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.dy.pipIrrGlobal.pojoDemo; - -import com.dy.common.po.BaseEntity; -import lombok.*; - -//鏃犲搴旀暟鎹簱琛� -//@TableName(value="demo_test_attr", autoResultMap = true) -@Data -@Builder -@ToString -@NoArgsConstructor -@AllArgsConstructor -public class DemoTestAttr implements BaseEntity { - private Long id; - private String name; -} diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoDemo/DemoUser.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoDemo/DemoUser.java deleted file mode 100644 index 83860ea..0000000 --- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoDemo/DemoUser.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.dy.pipIrrGlobal.pojoDemo; - -import com.alibaba.fastjson2.annotation.JSONField; -import com.alibaba.fastjson2.writer.ObjectWriterImplToString; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.dy.common.mybatis.envm.Deleted; -import com.dy.common.mybatis.envm.Disabled; -import com.dy.common.po.BaseEntity; -import lombok.*; - -@TableName(value="demo_user", autoResultMap = true) -@Data -@Builder -@ToString -@NoArgsConstructor -@AllArgsConstructor -public class DemoUser implements BaseEntity { - - public static final long serialVersionUID = 987654321L; - - @JSONField(serializeUsing= ObjectWriterImplToString.class) - @TableId(type = IdType.INPUT) - public Long id ; - - public String name ; - - public String password ; - - public Disabled disabled ; - - public Deleted deleted ; - - @TableField(exist = false) - public DemoAddress address ; - - @JSONField(serializeUsing= ObjectWriterImplToString.class) - public Long roleId ; - - -} diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestConflict.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestConflict.java deleted file mode 100644 index c672194..0000000 --- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestConflict.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.dy.pipIrrGlobal.test; - -public class TestConflict { - public void test1(){ - System.out.println("test1"); - } - public void test2(){ - System.out.println("test2"); - } - public void test3(){ - System.out.println("test31"); - System.out.println("test32"); - System.out.println("test33"); - System.out.println("test34"); - System.out.println("test33"); - } -} diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo0.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo0.java deleted file mode 100644 index 8468fe1..0000000 --- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo0.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.dy.pipIrrGlobal.test; - - -import com.alibaba.fastjson2.annotation.JSONField; -import com.alibaba.fastjson2.writer.ObjectWriterImplToString; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.dy.common.po.BaseEntity; -import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; - -import java.util.Date; - -/** - * 娴嬭瘯琛� - */ -@TableName(value="test0", autoResultMap = true) -@Data -@Builder -@ToString -@NoArgsConstructor -@AllArgsConstructor -@Schema(name = "RTU娴嬭瘯涓婃姤鏁版嵁0") -public class TestPo0 implements BaseEntity { - - public static final long serialVersionUID = 202311141539001L; - - @JSONField(serializeUsing= ObjectWriterImplToString.class) - @TableId(type = IdType.INPUT) - @Schema(description = "瀹炰綋id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Long id ; - - @Schema(description = "rtu鍦板潃", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String rtuAddr ; - - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", locale = "zh", timezone = "GMT+8") - @Schema(description = "涓婃姤鏁版嵁鏃堕棿", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Date dt ; - - @Schema(description = "涓婃姤鏁版嵁鍐呭锛圚EX锛�", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String content ; - -} diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo0Mapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo0Mapper.java deleted file mode 100644 index 7863a5b..0000000 --- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo0Mapper.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.dy.pipIrrGlobal.test; - - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; - -@Mapper -public interface TestPo0Mapper extends BaseMapper<TestPo0> { - - /** - * insert record to table - * @param po the record - * @return insert count - */ - int putin(TestPo0 po); - - -} diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo1.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo1.java deleted file mode 100644 index 6c0928a..0000000 --- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo1.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.dy.pipIrrGlobal.test; - - -import com.alibaba.fastjson2.annotation.JSONField; -import com.alibaba.fastjson2.writer.ObjectWriterImplToString; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.dy.common.po.BaseEntity; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; - -import java.time.LocalDateTime; -import java.util.Date; - -/** - * 娴嬭瘯琛� - */ -@TableName(value="test1", autoResultMap = true) -@Data -@Builder -@ToString -@NoArgsConstructor -@AllArgsConstructor -@Schema(name = "RTU娴嬭瘯涓婃姤鏁版嵁1") -public class TestPo1 implements BaseEntity { - - public static final long serialVersionUID = 202311141539001L; - - @JSONField(serializeUsing= ObjectWriterImplToString.class) - @TableId(type = IdType.INPUT) - @Schema(description = "瀹炰綋id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Long id ; - - @Schema(description = "rtu鍦板潃", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String rtuAddr ; - - @Schema(description = "涓婃姤鏁版嵁鏃堕棿", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Date dt ; - - @Schema(description = "涓婃姤鏁版嵁鍐呭锛圚EX锛�", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String content ; - -} diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo1Mapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo1Mapper.java deleted file mode 100644 index 8b552cb..0000000 --- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo1Mapper.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.dy.pipIrrGlobal.test; - - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; - -@Mapper -public interface TestPo1Mapper extends BaseMapper<TestPo1> { - - /** - * insert record to table - * @param po the record - * @return insert count - */ - int putin(TestPo1 po); - - -} diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo2.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo2.java deleted file mode 100644 index 8eb7258..0000000 --- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo2.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.dy.pipIrrGlobal.test; - - -import com.alibaba.fastjson2.annotation.JSONField; -import com.alibaba.fastjson2.writer.ObjectWriterImplToString; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.dy.common.po.BaseEntity; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; - -import java.time.LocalDateTime; -import java.util.Date; - -/** - * 娴嬭瘯琛� - */ -@TableName(value="test2", autoResultMap = true) -@Data -@Builder -@ToString -@NoArgsConstructor -@AllArgsConstructor -@Schema(name = "RTU娴嬭瘯涓婃姤鏁版嵁2") -public class TestPo2 implements BaseEntity { - - public static final long serialVersionUID = 202311141539001L; - - @JSONField(serializeUsing= ObjectWriterImplToString.class) - @TableId(type = IdType.INPUT) - @Schema(description = "瀹炰綋id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Long id ; - - @Schema(description = "rtu鍦板潃", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String rtuAddr ; - - @Schema(description = "涓婃姤鏁版嵁鏃堕棿", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Date dt ; - - @Schema(description = "涓婃姤鏁版嵁鍐呭锛圚EX锛�", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String content ; - -} diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo2Mapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo2Mapper.java deleted file mode 100644 index 167a093..0000000 --- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo2Mapper.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.dy.pipIrrGlobal.test; - - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; - -@Mapper -public interface TestPo2Mapper extends BaseMapper<TestPo2> { - - /** - * insert record to table - * @param po the record - * @return insert count - */ - int putin(TestPo2 po); - - -} diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo3.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo3.java deleted file mode 100644 index 38312d8..0000000 --- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo3.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.dy.pipIrrGlobal.test; - - -import com.alibaba.fastjson2.annotation.JSONField; -import com.alibaba.fastjson2.writer.ObjectWriterImplToString; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.dy.common.po.BaseEntity; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; - -import java.time.LocalDateTime; -import java.util.Date; - -/** - * 娴嬭瘯琛� - */ -@TableName(value="test3", autoResultMap = true) -@Data -@Builder -@ToString -@NoArgsConstructor -@AllArgsConstructor -@Schema(name = "RTU娴嬭瘯涓婃姤鏁版嵁3") -public class TestPo3 implements BaseEntity { - - public static final long serialVersionUID = 202311141539001L; - - @JSONField(serializeUsing= ObjectWriterImplToString.class) - @TableId(type = IdType.INPUT) - @Schema(description = "瀹炰綋id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Long id ; - - @Schema(description = "rtu鍦板潃", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String rtuAddr ; - - @Schema(description = "涓婃姤鏁版嵁鏃堕棿", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Date dt ; - - @Schema(description = "涓婃姤鏁版嵁鍐呭锛圚EX锛�", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String content ; - -} diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo3Mapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo3Mapper.java deleted file mode 100644 index fed9dca..0000000 --- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo3Mapper.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.dy.pipIrrGlobal.test; - - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; - -@Mapper -public interface TestPo3Mapper extends BaseMapper<TestPo3> { - - /** - * insert record to table - * @param po the record - * @return insert count - */ - int putin(TestPo3 po); - - -} diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo4.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo4.java deleted file mode 100644 index 8430bfc..0000000 --- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo4.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.dy.pipIrrGlobal.test; - - -import com.alibaba.fastjson2.annotation.JSONField; -import com.alibaba.fastjson2.writer.ObjectWriterImplToString; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.dy.common.po.BaseEntity; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; - -import java.time.LocalDateTime; -import java.util.Date; - -/** - * 娴嬭瘯琛� - */ -@TableName(value="test4", autoResultMap = true) -@Data -@Builder -@ToString -@NoArgsConstructor -@AllArgsConstructor -@Schema(name = "RTU娴嬭瘯涓婃姤鏁版嵁4") -public class TestPo4 implements BaseEntity { - - public static final long serialVersionUID = 202311141539001L; - - @JSONField(serializeUsing= ObjectWriterImplToString.class) - @TableId(type = IdType.INPUT) - @Schema(description = "瀹炰綋id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Long id ; - - @Schema(description = "rtu鍦板潃", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String rtuAddr ; - - @Schema(description = "涓婃姤鏁版嵁鏃堕棿", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Date dt ; - - @Schema(description = "涓婃姤鏁版嵁鍐呭锛圚EX锛�", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String content ; - -} diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo4Mapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo4Mapper.java deleted file mode 100644 index 76d774a..0000000 --- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo4Mapper.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.dy.pipIrrGlobal.test; - - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; - -@Mapper -public interface TestPo4Mapper extends BaseMapper<TestPo4> { - - /** - * insert record to table - * @param po the record - * @return insert count - */ - int putin(TestPo4 po); - - -} diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo5.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo5.java deleted file mode 100644 index 7809faa..0000000 --- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo5.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.dy.pipIrrGlobal.test; - - -import com.alibaba.fastjson2.annotation.JSONField; -import com.alibaba.fastjson2.writer.ObjectWriterImplToString; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.dy.common.po.BaseEntity; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; - -import java.time.LocalDateTime; -import java.util.Date; - -/** - * 娴嬭瘯琛� - */ -@TableName(value="test5", autoResultMap = true) -@Data -@Builder -@ToString -@NoArgsConstructor -@AllArgsConstructor -@Schema(name = "RTU娴嬭瘯涓婃姤鏁版嵁5") -public class TestPo5 implements BaseEntity { - - public static final long serialVersionUID = 202311141539001L; - - @JSONField(serializeUsing= ObjectWriterImplToString.class) - @TableId(type = IdType.INPUT) - @Schema(description = "瀹炰綋id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Long id ; - - @Schema(description = "rtu鍦板潃", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String rtuAddr ; - - @Schema(description = "涓婃姤鏁版嵁鏃堕棿", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Date dt ; - - @Schema(description = "涓婃姤鏁版嵁鍐呭锛圚EX锛�", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String content ; - -} diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo5Mapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo5Mapper.java deleted file mode 100644 index 678cbf2..0000000 --- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo5Mapper.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.dy.pipIrrGlobal.test; - - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; - -@Mapper -public interface TestPo5Mapper extends BaseMapper<TestPo5> { - - /** - * insert record to table - * @param po the record - * @return insert count - */ - int putin(TestPo5 po); - - -} diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo6.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo6.java deleted file mode 100644 index fbdb8db..0000000 --- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo6.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.dy.pipIrrGlobal.test; - - -import com.alibaba.fastjson2.annotation.JSONField; -import com.alibaba.fastjson2.writer.ObjectWriterImplToString; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.dy.common.po.BaseEntity; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; - -import java.time.LocalDateTime; -import java.util.Date; - -/** - * 娴嬭瘯琛� - */ -@TableName(value="test6", autoResultMap = true) -@Data -@Builder -@ToString -@NoArgsConstructor -@AllArgsConstructor -@Schema(name = "RTU娴嬭瘯涓婃姤鏁版嵁6") -public class TestPo6 implements BaseEntity { - - public static final long serialVersionUID = 202311141539001L; - - @JSONField(serializeUsing= ObjectWriterImplToString.class) - @TableId(type = IdType.INPUT) - @Schema(description = "瀹炰綋id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Long id ; - - @Schema(description = "rtu鍦板潃", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String rtuAddr ; - - @Schema(description = "涓婃姤鏁版嵁鏃堕棿", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Date dt ; - - @Schema(description = "涓婃姤鏁版嵁鍐呭锛圚EX锛�", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String content ; - -} diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo6Mapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo6Mapper.java deleted file mode 100644 index 3441990..0000000 --- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo6Mapper.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.dy.pipIrrGlobal.test; - - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; - -@Mapper -public interface TestPo6Mapper extends BaseMapper<TestPo6> { - - /** - * insert record to table - * @param po the record - * @return insert count - */ - int putin(TestPo6 po); - - -} diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo7.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo7.java deleted file mode 100644 index 6821803..0000000 --- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo7.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.dy.pipIrrGlobal.test; - - -import com.alibaba.fastjson2.annotation.JSONField; -import com.alibaba.fastjson2.writer.ObjectWriterImplToString; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.dy.common.po.BaseEntity; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; - -import java.time.LocalDateTime; -import java.util.Date; - -/** - * 娴嬭瘯琛� - */ -@TableName(value="test7", autoResultMap = true) -@Data -@Builder -@ToString -@NoArgsConstructor -@AllArgsConstructor -@Schema(name = "RTU娴嬭瘯涓婃姤鏁版嵁7") -public class TestPo7 implements BaseEntity { - - public static final long serialVersionUID = 202311141539001L; - - @JSONField(serializeUsing= ObjectWriterImplToString.class) - @TableId(type = IdType.INPUT) - @Schema(description = "瀹炰綋id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Long id ; - - @Schema(description = "rtu鍦板潃", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String rtuAddr ; - - @Schema(description = "涓婃姤鏁版嵁鏃堕棿", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Date dt ; - - @Schema(description = "涓婃姤鏁版嵁鍐呭锛圚EX锛�", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String content ; - -} diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo7Mapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo7Mapper.java deleted file mode 100644 index 5cc6efb..0000000 --- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo7Mapper.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.dy.pipIrrGlobal.test; - - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; - -@Mapper -public interface TestPo7Mapper extends BaseMapper<TestPo7> { - - /** - * insert record to table - * @param po the record - * @return insert count - */ - int putin(TestPo7 po); - - -} diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo8.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo8.java deleted file mode 100644 index 68be918..0000000 --- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo8.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.dy.pipIrrGlobal.test; - - -import com.alibaba.fastjson2.annotation.JSONField; -import com.alibaba.fastjson2.writer.ObjectWriterImplToString; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.dy.common.po.BaseEntity; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; - -import java.time.LocalDateTime; -import java.util.Date; - -/** - * 娴嬭瘯琛� - */ -@TableName(value="test8", autoResultMap = true) -@Data -@Builder -@ToString -@NoArgsConstructor -@AllArgsConstructor -@Schema(name = "RTU娴嬭瘯涓婃姤鏁版嵁8") -public class TestPo8 implements BaseEntity { - - public static final long serialVersionUID = 202311141539001L; - - @JSONField(serializeUsing= ObjectWriterImplToString.class) - @TableId(type = IdType.INPUT) - @Schema(description = "瀹炰綋id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Long id ; - - @Schema(description = "rtu鍦板潃", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String rtuAddr ; - - @Schema(description = "涓婃姤鏁版嵁鏃堕棿", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Date dt ; - - @Schema(description = "涓婃姤鏁版嵁鍐呭锛圚EX锛�", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String content ; - -} diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo8Mapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo8Mapper.java deleted file mode 100644 index ef6b34d..0000000 --- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo8Mapper.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.dy.pipIrrGlobal.test; - - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; - -@Mapper -public interface TestPo8Mapper extends BaseMapper<TestPo8> { - - /** - * insert record to table - * @param po the record - * @return insert count - */ - int putin(TestPo8 po); - - -} diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo9.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo9.java deleted file mode 100644 index bc540d5..0000000 --- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo9.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.dy.pipIrrGlobal.test; - - -import com.alibaba.fastjson2.annotation.JSONField; -import com.alibaba.fastjson2.writer.ObjectWriterImplToString; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.dy.common.po.BaseEntity; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; - -import java.time.LocalDateTime; -import java.util.Date; - -/** - * 娴嬭瘯琛� - */ -@TableName(value="test9", autoResultMap = true) -@Data -@Builder -@ToString -@NoArgsConstructor -@AllArgsConstructor -@Schema(name = "RTU娴嬭瘯涓婃姤鏁版嵁9") -public class TestPo9 implements BaseEntity { - - public static final long serialVersionUID = 202311141539001L; - - @JSONField(serializeUsing= ObjectWriterImplToString.class) - @TableId(type = IdType.INPUT) - @Schema(description = "瀹炰綋id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Long id ; - - @Schema(description = "rtu鍦板潃", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String rtuAddr ; - - @Schema(description = "涓婃姤鏁版嵁鏃堕棿", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public Date dt ; - - @Schema(description = "涓婃姤鏁版嵁鍐呭锛圚EX锛�", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - public String content ; - -} diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo9Mapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo9Mapper.java deleted file mode 100644 index e4afae4..0000000 --- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo9Mapper.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.dy.pipIrrGlobal.test; - - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; - -@Mapper -public interface TestPo9Mapper extends BaseMapper<TestPo9> { - - /** - * insert record to table - * @param po the record - * @return insert count - */ - int putin(TestPo9 po); - - -} diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/DemoAddressMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/DemoAddressMapper.xml deleted file mode 100644 index 612d013..0000000 --- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/DemoAddressMapper.xml +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> -<!--namespace瀵瑰簲mapper鎺ュ彛鎵�鍦ㄧ殑浣嶇疆--> -<mapper namespace="com.dy.pipIrrGlobal.daoDemo.DemoAddressMapper"> - - <resultMap id="addressMap" type="com.dy.pipIrrGlobal.pojoDemo.DemoAddress"> - <id property="id" column="id" /> - <result property="name" column="name"/> - <result property="userId" column="userId"/> - </resultMap> - - <select id="selectByUserId" resultType="com.dy.pipIrrGlobal.pojoDemo.DemoAddress"> - select * from demo_address where userId=#{userId} - </select> - - -</mapper> \ No newline at end of file diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/DemoAuthMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/DemoAuthMapper.xml deleted file mode 100644 index f726906..0000000 --- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/DemoAuthMapper.xml +++ /dev/null @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> -<!--namespace瀵瑰簲mapper鎺ュ彛鎵�鍦ㄧ殑浣嶇疆--> -<mapper namespace="com.dy.pipIrrGlobal.daoDemo.DemoAuthMapper"> - <resultMap id="authMap" type="com.dy.pipIrrGlobal.pojoDemo.DemoAuth"> - <id property="id" column="id" /> - <result property="num" column="num"/> - <result property="name" column="name"/> - <result property="type" column="type"/> - </resultMap> - - - <!-- fetchType="lazy" 杩橀渶瑕侀厤缃產ggressiveLazyLoading=false --> - <resultMap id="selectAll" extends="authMap" type="com.dy.pipIrrGlobal.pojoDemo.DemoAuth"> - <collection property="roleList" fetchType="lazy" column="{authId=id}" select="com.dy.pipIrrGlobal.daoDemo.DemoRoleMapper.selectByAuthId" /> - </resultMap> - - - <select id="selectAll" resultMap="selectAll"> - select * from demo_auth - </select> - - -</mapper> \ No newline at end of file diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/DemoRoleMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/DemoRoleMapper.xml deleted file mode 100644 index 9a5e14d..0000000 --- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/DemoRoleMapper.xml +++ /dev/null @@ -1,91 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> -<mapper namespace="com.dy.pipIrrGlobal.daoDemo.DemoRoleMapper"> - - <resultMap id="BaseResultMap" type="com.dy.pipIrrGlobal.pojoDemo.DemoRole"> - <!--@mbg.generated--> - <!--@Table demo_role--> - <id column="id" jdbcType="BIGINT" property="id" /> - <result column="name" jdbcType="VARCHAR" property="name" /> - <result property="deleted" column="deleted" typeHandler="com.dy.common.mybatis.envm.EnumCodeTypeHandler" javaType="com.dy.common.mybatis.envm.Deleted"/> - </resultMap> - - <sql id="Base_Column_List"> - <!--@mbg.generated--> - id, `name`, deleted - </sql> - - <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap"> - <!--@mbg.generated--> - select - <include refid="Base_Column_List" /> - from demo_role - where id = #{id,jdbcType=BIGINT} - </select> - - <delete id="deleteByPrimaryKey" parameterType="java.lang.Long"> - <!--@mbg.generated--> - delete from demo_role - where id = #{id,jdbcType=BIGINT} - </delete> - - <insert id="putin" parameterType="com.dy.pipIrrGlobal.pojoDemo.DemoRole"> - <!--@mbg.generated--> - insert into demo_role (id, `name`, deleted - ) - values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{deleted,jdbcType=TINYINT} - ) - </insert> - - <insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoDemo.DemoRole"> - <!--@mbg.generated--> - insert into demo_role - <trim prefix="(" suffix=")" suffixOverrides=","> - <if test="id != null"> - id, - </if> - <if test="name != null"> - `name`, - </if> - <if test="deleted != null"> - deleted, - </if> - </trim> - <trim prefix="values (" suffix=")" suffixOverrides=","> - <if test="id != null"> - #{id,jdbcType=BIGINT}, - </if> - <if test="name != null"> - #{name,jdbcType=VARCHAR}, - </if> - <if test="deleted != null"> - #{deleted,jdbcType=TINYINT}, - </if> - </trim> - </insert> - <update id="updateByPrimaryKeySelective" parameterType="com.dy.pipIrrGlobal.pojoDemo.DemoRole"> - <!--@mbg.generated--> - update demo_role - <set> - <if test="name != null"> - `name` = #{name,jdbcType=VARCHAR}, - </if> - <if test="deleted != null"> - deleted = #{deleted,jdbcType=TINYINT}, - </if> - </set> - where id = #{id,jdbcType=BIGINT} - </update> - <update id="updateByPrimaryKey" parameterType="com.dy.pipIrrGlobal.pojoDemo.DemoRole"> - <!--@mbg.generated--> - update demo_role - set `name` = #{name,jdbcType=VARCHAR}, - deleted = #{deleted,jdbcType=TINYINT} - where id = #{id,jdbcType=BIGINT} - </update> - <select id="selectAll" resultMap="BaseResultMap"> - select - <include refid="Base_Column_List" /> - from demo_role - </select> -</mapper> \ No newline at end of file diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/DemoTestMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/DemoTestMapper.xml deleted file mode 100644 index ab0b277..0000000 --- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/DemoTestMapper.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<!DOCTYPE mapper - PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> -<!--namespace瀵瑰簲mapper鎺ュ彛鎵�鍦ㄧ殑浣嶇疆--> -<mapper namespace="com.dy.pipIrrGlobal.daoDemo.DemoTestMapper"> - <!--瀵瑰簲mapper鎺ュ彛涓殑鏂规硶public Integer queryCount();--> - <select id="queryCount" resultType="java.lang.Integer"> - select count(*) from demo_test ; - </select> -</mapper> diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/DemoUserMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/DemoUserMapper.xml deleted file mode 100644 index 13b5d2a..0000000 --- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/DemoUserMapper.xml +++ /dev/null @@ -1,104 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> -<!--namespace瀵瑰簲mapper鎺ュ彛鎵�鍦ㄧ殑浣嶇疆--> -<mapper namespace="com.dy.pipIrrGlobal.daoDemo.DemoUserMapper"> - <resultMap id="userMap" type="com.dy.pipIrrGlobal.pojoDemo.DemoUser"> - <id property="id" column="id" /> - <result property="name" column="name"/> - <result property="password" column="password"/> - <result property="roleId" column="roleId"/> - <result property="disabled" column="disabled" typeHandler="com.dy.common.mybatis.envm.EnumCodeTypeHandler" javaType="com.dy.common.mybatis.envm.Disabled"/> - <result property="deleted" column="deleted" typeHandler="com.dy.common.mybatis.envm.EnumCodeTypeHandler" javaType="com.dy.common.mybatis.envm.Deleted"/> - </resultMap> - - <resultMap id="addressMap" type="com.dy.pipIrrGlobal.pojoDemo.DemoAddress"> - <id property="id" column="id" /> - <result property="name" column="name"/> - <result property="userId" column="userId"/> - </resultMap> - - <resultMap id="userAddressMap1" extends="userMap" type="com.dy.pipIrrGlobal.pojoDemo.DemoUser"> - <association property="address" columnPrefix="addr_" resultMap="addressMap" /> - </resultMap> - - <resultMap id="userAddressMap2" extends="userMap" type="com.dy.pipIrrGlobal.pojoDemo.DemoUser"> - <association property="address" columnPrefix="addr_" resultMap="com.dy.pipIrrGlobal.daoDemo.DemoAddressMapper.addressMap" /> - </resultMap> - - <resultMap id="userAddressMap3" extends="userMap" type="com.dy.pipIrrGlobal.pojoDemo.DemoUser"> - <association property="address" column="{userId=id}" select="com.dy.pipIrrGlobal.daoDemo.DemoAddressMapper.selectByUserId" /> - </resultMap> - - <!-- fetchType="lazy" 杩橀渶瑕侀厤缃產ggressiveLazyLoading=false --> - <resultMap id="userAddressMap4" extends="userMap" type="com.dy.pipIrrGlobal.pojoDemo.DemoUser"> - <association property="address" fetchType="lazy" column="{userId=id}" select="com.dy.pipIrrGlobal.daoDemo.DemoAddressMapper.selectByUserId" /> - </resultMap> - - <!-- 鍏宠仈鐨勫祵濂楃粨鏋滄槧灏勶紝浼樼偣锛氭暟鎹簱鏌ヨ娆℃暟灏戯紝鍘嬪姏灏忥紝缂虹偣锛歋QL澶嶆潅 --> - <select id="selectById1" resultType="com.dy.pipIrrGlobal.pojoDemo.DemoUser"> - select u.*, - adr.id "address.id", - adr.name "address.name", - adr.userId "address.userId" - from demo_user u - inner join demo_address adr on u.id = adr.userId - where u.id = #{id} - </select> - - - <!-- 鍏宠仈鐨勫祵濂楃粨鏋滄槧灏勶紝浼樼偣锛氭暟鎹簱鏌ヨ娆℃暟灏戯紝鍘嬪姏灏忥紝缂虹偣锛歋QL澶嶆潅 --> - <select id="selectById2" resultMap="userAddressMap1"> - select u.*, - adr.id addr_id, - adr.name addr_name, - adr.userId addr_userId - from demo_user u - inner join demo_address adr on u.id = adr.userId - where u.id = #{id} - </select> - - - <!-- 鍏宠仈鐨勫祵濂楃粨鏋滄槧灏勶紝浼樼偣锛氭暟鎹簱鏌ヨ娆℃暟灏戯紝鍘嬪姏灏忥紝缂虹偣锛歋QL澶嶆潅 --> - <select id="selectById3" resultMap="userAddressMap2"> - select u.*, - adr.id addr_id, - adr.name addr_name, - adr.userId addr_userId - from demo_user u - inner join demo_address adr on u.id = adr.userId - where u.id = #{id} - </select> - - - - <!-- 鍏宠仈宓屽鏌ヨ锛屼紭鐐癸細SQL绠�鍗曪紝缂虹偣锛氭暟鎹簱鍙兘鏌ヨ澶氭鏁帮紝鍘嬪姏澶э紝 --> - <select id="selectById4" resultMap="userAddressMap3"> - select u.* - from demo_user u - where u.id = #{id} - </select> - - - <!-- 鍏宠仈宓屽鏌ヨ锛屼紭鐐癸細SQL绠�鍗曪紝缂虹偣锛氭暟鎹簱鍙兘鏌ヨ澶氭鏁帮紝鍘嬪姏澶э紝 --> - <select id="selectById5" resultMap="userAddressMap4"> - select u.* - from demo_user u - where u.id = #{id} - </select> - - <!-- 绗笁鏂瑰叧鑱旀煡璇� --> - <select id="selectByRoleId" resultMap="userAddressMap4"> - select * from demo_user where roleId=#{roleId} - </select> - - <!--瀵瑰簲mapper鎺ュ彛鏂规硶public void insert(DemoUser user);--> - <insert id="putin" parameterType="com.dy.pipIrrGlobal.pojoDemo.DemoUser"> - insert into - demo_user (id, name, password, roleId, disabled, deleted) - values (#{id},#{name},#{password},#{roleId}, - #{disabled, typeHandler=com.dy.common.mybatis.envm.EnumCodeTypeHandler, jdbcType=TINYINT}, - #{deleted, typeHandler=com.dy.common.mybatis.envm.EnumCodeTypeHandler, jdbcType=TINYINT} - ); - </insert> - -</mapper> \ No newline at end of file diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Test0Mapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Test0Mapper.xml deleted file mode 100644 index 1d3c95f..0000000 --- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Test0Mapper.xml +++ /dev/null @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> -<mapper namespace="com.dy.pipIrrGlobal.test.TestPo0Mapper"> - <resultMap id="BaseResultMap" type="com.dy.pipIrrGlobal.test.TestPo0"> - <!--@mbg.generated--> - <!--@Table test0--> - <id column="id" jdbcType="BIGINT" property="id" /> - <result column="rtuAddr" jdbcType="VARCHAR" property="rtuAddr" /> - <result column="content" jdbcType="VARCHAR" property="content" /> - <result column="dt" jdbcType="TIMESTAMP" property="dt" /> - </resultMap> - <sql id="Base_Column_List"> - <!--@mbg.generated--> - id, rtuAddr, content, dt - </sql> - - <insert id="putin" parameterType="com.dy.pipIrrGlobal.test.TestPo0"> - <!--@mbg.generated--> - insert into test0 (id, rtuAddr, content, dt) - values (#{id,jdbcType=BIGINT}, - #{rtuAddr,jdbcType=VARCHAR}, - #{content,jdbcType=VARCHAR}, - #{dt,jdbcType=TIMESTAMP}) - </insert> -</mapper> \ No newline at end of file diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Test1Mapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Test1Mapper.xml deleted file mode 100644 index a95a566..0000000 --- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Test1Mapper.xml +++ /dev/null @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> -<mapper namespace="com.dy.pipIrrGlobal.test.TestPo1Mapper"> - <resultMap id="BaseResultMap" type="com.dy.pipIrrGlobal.test.TestPo1"> - <!--@mbg.generated--> - <!--@Table test1--> - <id column="id" jdbcType="BIGINT" property="id" /> - <result column="rtuAddr" jdbcType="VARCHAR" property="rtuAddr" /> - <result column="content" jdbcType="VARCHAR" property="content" /> - <result column="dt" jdbcType="TIMESTAMP" property="dt" /> - </resultMap> - <sql id="Base_Column_List"> - <!--@mbg.generated--> - id, rtuAddr, content, dt - </sql> - - <insert id="putin" parameterType="com.dy.pipIrrGlobal.test.TestPo1"> - <!--@mbg.generated--> - insert into test1 (id, rtuAddr, content, dt) - values (#{id,jdbcType=BIGINT}, - #{rtuAddr,jdbcType=VARCHAR}, - #{content,jdbcType=VARCHAR}, - #{dt,jdbcType=TIMESTAMP}) - </insert> -</mapper> \ No newline at end of file diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Test2Mapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Test2Mapper.xml deleted file mode 100644 index a150f8f..0000000 --- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Test2Mapper.xml +++ /dev/null @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> -<mapper namespace="com.dy.pipIrrGlobal.test.TestPo2Mapper"> - <resultMap id="BaseResultMap" type="com.dy.pipIrrGlobal.test.TestPo2"> - <!--@mbg.generated--> - <!--@Table test2--> - <id column="id" jdbcType="BIGINT" property="id" /> - <result column="rtuAddr" jdbcType="VARCHAR" property="rtuAddr" /> - <result column="content" jdbcType="VARCHAR" property="content" /> - <result column="dt" jdbcType="TIMESTAMP" property="dt" /> - </resultMap> - <sql id="Base_Column_List"> - <!--@mbg.generated--> - id, rtuAddr, content, dt - </sql> - - <insert id="putin" parameterType="com.dy.pipIrrGlobal.test.TestPo2"> - <!--@mbg.generated--> - insert into test2 (id, rtuAddr, content, dt) - values (#{id,jdbcType=BIGINT}, - #{rtuAddr,jdbcType=VARCHAR}, - #{content,jdbcType=VARCHAR}, - #{dt,jdbcType=TIMESTAMP}) - </insert> -</mapper> \ No newline at end of file diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Test3Mapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Test3Mapper.xml deleted file mode 100644 index 694b363..0000000 --- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Test3Mapper.xml +++ /dev/null @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> -<mapper namespace="com.dy.pipIrrGlobal.test.TestPo3Mapper"> - <resultMap id="BaseResultMap" type="com.dy.pipIrrGlobal.test.TestPo3"> - <!--@mbg.generated--> - <!--@Table test3--> - <id column="id" jdbcType="BIGINT" property="id" /> - <result column="rtuAddr" jdbcType="VARCHAR" property="rtuAddr" /> - <result column="content" jdbcType="VARCHAR" property="content" /> - <result column="dt" jdbcType="TIMESTAMP" property="dt" /> - </resultMap> - <sql id="Base_Column_List"> - <!--@mbg.generated--> - id, rtuAddr, content, dt - </sql> - - <insert id="putin" parameterType="com.dy.pipIrrGlobal.test.TestPo3"> - <!--@mbg.generated--> - insert into test3 (id, rtuAddr, content, dt) - values (#{id,jdbcType=BIGINT}, - #{rtuAddr,jdbcType=VARCHAR}, - #{content,jdbcType=VARCHAR}, - #{dt,jdbcType=TIMESTAMP}) - </insert> -</mapper> \ No newline at end of file diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Test4Mapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Test4Mapper.xml deleted file mode 100644 index b0960fb..0000000 --- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Test4Mapper.xml +++ /dev/null @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> -<mapper namespace="com.dy.pipIrrGlobal.test.TestPo4Mapper"> - <resultMap id="BaseResultMap" type="com.dy.pipIrrGlobal.test.TestPo4"> - <!--@mbg.generated--> - <!--@Table test4--> - <id column="id" jdbcType="BIGINT" property="id" /> - <result column="rtuAddr" jdbcType="VARCHAR" property="rtuAddr" /> - <result column="content" jdbcType="VARCHAR" property="content" /> - <result column="dt" jdbcType="TIMESTAMP" property="dt" /> - </resultMap> - <sql id="Base_Column_List"> - <!--@mbg.generated--> - id, rtuAddr, content, dt - </sql> - - <insert id="putin" parameterType="com.dy.pipIrrGlobal.test.TestPo4"> - <!--@mbg.generated--> - insert into test4 (id, rtuAddr, content, dt) - values (#{id,jdbcType=BIGINT}, - #{rtuAddr,jdbcType=VARCHAR}, - #{content,jdbcType=VARCHAR}, - #{dt,jdbcType=TIMESTAMP}) - </insert> -</mapper> \ No newline at end of file diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Test5Mapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Test5Mapper.xml deleted file mode 100644 index a4baa60..0000000 --- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Test5Mapper.xml +++ /dev/null @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> -<mapper namespace="com.dy.pipIrrGlobal.test.TestPo5Mapper"> - <resultMap id="BaseResultMap" type="com.dy.pipIrrGlobal.test.TestPo5"> - <!--@mbg.generated--> - <!--@Table test5--> - <id column="id" jdbcType="BIGINT" property="id" /> - <result column="rtuAddr" jdbcType="VARCHAR" property="rtuAddr" /> - <result column="content" jdbcType="VARCHAR" property="content" /> - <result column="dt" jdbcType="TIMESTAMP" property="dt" /> - </resultMap> - <sql id="Base_Column_List"> - <!--@mbg.generated--> - id, rtuAddr, content, dt - </sql> - - <insert id="putin" parameterType="com.dy.pipIrrGlobal.test.TestPo5"> - <!--@mbg.generated--> - insert into test5 (id, rtuAddr, content, dt) - values (#{id,jdbcType=BIGINT}, - #{rtuAddr,jdbcType=VARCHAR}, - #{content,jdbcType=VARCHAR}, - #{dt,jdbcType=TIMESTAMP}) - </insert> -</mapper> \ No newline at end of file diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Test6Mapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Test6Mapper.xml deleted file mode 100644 index 7a7972c..0000000 --- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Test6Mapper.xml +++ /dev/null @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> -<mapper namespace="com.dy.pipIrrGlobal.test.TestPo6Mapper"> - <resultMap id="BaseResultMap" type="com.dy.pipIrrGlobal.test.TestPo6"> - <!--@mbg.generated--> - <!--@Table test6--> - <id column="id" jdbcType="BIGINT" property="id" /> - <result column="rtuAddr" jdbcType="VARCHAR" property="rtuAddr" /> - <result column="content" jdbcType="VARCHAR" property="content" /> - <result column="dt" jdbcType="TIMESTAMP" property="dt" /> - </resultMap> - <sql id="Base_Column_List"> - <!--@mbg.generated--> - id, rtuAddr, content, dt - </sql> - - <insert id="putin" parameterType="com.dy.pipIrrGlobal.test.TestPo6"> - <!--@mbg.generated--> - insert into test6 (id, rtuAddr, content, dt) - values (#{id,jdbcType=BIGINT}, - #{rtuAddr,jdbcType=VARCHAR}, - #{content,jdbcType=VARCHAR}, - #{dt,jdbcType=TIMESTAMP}) - </insert> -</mapper> \ No newline at end of file diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Test7Mapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Test7Mapper.xml deleted file mode 100644 index 53eba1c..0000000 --- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Test7Mapper.xml +++ /dev/null @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> -<mapper namespace="com.dy.pipIrrGlobal.test.TestPo7Mapper"> - <resultMap id="BaseResultMap" type="com.dy.pipIrrGlobal.test.TestPo7"> - <!--@mbg.generated--> - <!--@Table test7--> - <id column="id" jdbcType="BIGINT" property="id" /> - <result column="rtuAddr" jdbcType="VARCHAR" property="rtuAddr" /> - <result column="content" jdbcType="VARCHAR" property="content" /> - <result column="dt" jdbcType="TIMESTAMP" property="dt" /> - </resultMap> - <sql id="Base_Column_List"> - <!--@mbg.generated--> - id, rtuAddr, content, dt - </sql> - - <insert id="putin" parameterType="com.dy.pipIrrGlobal.test.TestPo7"> - <!--@mbg.generated--> - insert into test7 (id, rtuAddr, content, dt) - values (#{id,jdbcType=BIGINT}, - #{rtuAddr,jdbcType=VARCHAR}, - #{content,jdbcType=VARCHAR}, - #{dt,jdbcType=TIMESTAMP}) - </insert> -</mapper> \ No newline at end of file diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Test8Mapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Test8Mapper.xml deleted file mode 100644 index ae507a8..0000000 --- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Test8Mapper.xml +++ /dev/null @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> -<mapper namespace="com.dy.pipIrrGlobal.test.TestPo8Mapper"> - <resultMap id="BaseResultMap" type="com.dy.pipIrrGlobal.test.TestPo8"> - <!--@mbg.generated--> - <!--@Table test8--> - <id column="id" jdbcType="BIGINT" property="id" /> - <result column="rtuAddr" jdbcType="VARCHAR" property="rtuAddr" /> - <result column="content" jdbcType="VARCHAR" property="content" /> - <result column="dt" jdbcType="TIMESTAMP" property="dt" /> - </resultMap> - <sql id="Base_Column_List"> - <!--@mbg.generated--> - id, rtuAddr, content, dt - </sql> - - <insert id="putin" parameterType="com.dy.pipIrrGlobal.test.TestPo8"> - <!--@mbg.generated--> - insert into test8 (id, rtuAddr, content, dt) - values (#{id,jdbcType=BIGINT}, - #{rtuAddr,jdbcType=VARCHAR}, - #{content,jdbcType=VARCHAR}, - #{dt,jdbcType=TIMESTAMP}) - </insert> -</mapper> \ No newline at end of file diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Test9Mapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Test9Mapper.xml deleted file mode 100644 index c2d13a4..0000000 --- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Test9Mapper.xml +++ /dev/null @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> -<mapper namespace="com.dy.pipIrrGlobal.test.TestPo9Mapper"> - <resultMap id="BaseResultMap" type="com.dy.pipIrrGlobal.test.TestPo9"> - <!--@mbg.generated--> - <!--@Table test9--> - <id column="id" jdbcType="BIGINT" property="id" /> - <result column="rtuAddr" jdbcType="VARCHAR" property="rtuAddr" /> - <result column="content" jdbcType="VARCHAR" property="content" /> - <result column="dt" jdbcType="TIMESTAMP" property="dt" /> - </resultMap> - <sql id="Base_Column_List"> - <!--@mbg.generated--> - id, rtuAddr, content, dt - </sql> - - <insert id="putin" parameterType="com.dy.pipIrrGlobal.test.TestPo9"> - <!--@mbg.generated--> - insert into test9 (id, rtuAddr, content, dt) - values (#{id,jdbcType=BIGINT}, - #{rtuAddr,jdbcType=VARCHAR}, - #{content,jdbcType=VARCHAR}, - #{dt,jdbcType=TIMESTAMP}) - </insert> -</mapper> \ No newline at end of file diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-demo/.gitignore b/pipIrr-platform/pipIrr-web/pipIrr-web-demo/.gitignore deleted file mode 100644 index a80eabd..0000000 --- a/pipIrr-platform/pipIrr-web/pipIrr-web-demo/.gitignore +++ /dev/null @@ -1,34 +0,0 @@ -HELP.md -target/ -/pipIrr-web-demo.iml -!.mvn/wrapper/maven-wrapper.jar -!**/src/main/**/target/ -!**/src/test/**/target/ - -### STS ### -.apt_generated -.classpath -.factorypath -.project -.settings -.springBeans -.sts4-cache - -### IntelliJ IDEA ### -.idea -*.iws -*.iml -*.ipr - -### NetBeans ### -/nbproject/private/ -/nbbuild/ -/dist/ -/nbdist/ -/.nb-gradle/ -build/ -!**/src/main/**/build/ -!**/src/test/**/build/ - -### VS Code ### -.vscode/ diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-demo/.mvn/wrapper/maven-wrapper.jar b/pipIrr-platform/pipIrr-web/pipIrr-web-demo/.mvn/wrapper/maven-wrapper.jar deleted file mode 100644 index cb28b0e..0000000 --- a/pipIrr-platform/pipIrr-web/pipIrr-web-demo/.mvn/wrapper/maven-wrapper.jar +++ /dev/null Binary files differ diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-demo/.mvn/wrapper/maven-wrapper.properties b/pipIrr-platform/pipIrr-web/pipIrr-web-demo/.mvn/wrapper/maven-wrapper.properties deleted file mode 100644 index 5f0536e..0000000 --- a/pipIrr-platform/pipIrr-web/pipIrr-web-demo/.mvn/wrapper/maven-wrapper.properties +++ /dev/null @@ -1,2 +0,0 @@ -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.5/apache-maven-3.9.5-bin.zip -wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-demo/logs/pipIrrDemo.log b/pipIrr-platform/pipIrr-web/pipIrr-web-demo/logs/pipIrrDemo.log deleted file mode 100644 index e69de29..0000000 --- a/pipIrr-platform/pipIrr-web/pipIrr-web-demo/logs/pipIrrDemo.log +++ /dev/null diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-demo/mvnw b/pipIrr-platform/pipIrr-web/pipIrr-web-demo/mvnw deleted file mode 100644 index 66df285..0000000 --- a/pipIrr-platform/pipIrr-web/pipIrr-web-demo/mvnw +++ /dev/null @@ -1,308 +0,0 @@ -#!/bin/sh -# ---------------------------------------------------------------------------- -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# ---------------------------------------------------------------------------- - -# ---------------------------------------------------------------------------- -# Apache Maven Wrapper startup batch script, version 3.2.0 -# -# Required ENV vars: -# ------------------ -# JAVA_HOME - location of a JDK home dir -# -# Optional ENV vars -# ----------------- -# MAVEN_OPTS - parameters passed to the Java VM when running Maven -# e.g. to debug Maven itself, use -# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 -# MAVEN_SKIP_RC - flag to disable loading of mavenrc files -# ---------------------------------------------------------------------------- - -if [ -z "$MAVEN_SKIP_RC" ] ; then - - if [ -f /usr/local/etc/mavenrc ] ; then - . /usr/local/etc/mavenrc - fi - - if [ -f /etc/mavenrc ] ; then - . /etc/mavenrc - fi - - if [ -f "$HOME/.mavenrc" ] ; then - . "$HOME/.mavenrc" - fi - -fi - -# OS specific support. $var _must_ be set to either true or false. -cygwin=false; -darwin=false; -mingw=false -case "$(uname)" in - CYGWIN*) cygwin=true ;; - MINGW*) mingw=true;; - Darwin*) darwin=true - # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home - # See https://developer.apple.com/library/mac/qa/qa1170/_index.html - if [ -z "$JAVA_HOME" ]; then - if [ -x "/usr/libexec/java_home" ]; then - JAVA_HOME="$(/usr/libexec/java_home)"; export JAVA_HOME - else - JAVA_HOME="/Library/Java/Home"; export JAVA_HOME - fi - fi - ;; -esac - -if [ -z "$JAVA_HOME" ] ; then - if [ -r /etc/gentoo-release ] ; then - JAVA_HOME=$(java-config --jre-home) - fi -fi - -# For Cygwin, ensure paths are in UNIX format before anything is touched -if $cygwin ; then - [ -n "$JAVA_HOME" ] && - JAVA_HOME=$(cygpath --unix "$JAVA_HOME") - [ -n "$CLASSPATH" ] && - CLASSPATH=$(cygpath --path --unix "$CLASSPATH") -fi - -# For Mingw, ensure paths are in UNIX format before anything is touched -if $mingw ; then - [ -n "$JAVA_HOME" ] && [ -d "$JAVA_HOME" ] && - JAVA_HOME="$(cd "$JAVA_HOME" || (echo "cannot cd into $JAVA_HOME."; exit 1); pwd)" -fi - -if [ -z "$JAVA_HOME" ]; then - javaExecutable="$(which javac)" - if [ -n "$javaExecutable" ] && ! [ "$(expr "\"$javaExecutable\"" : '\([^ ]*\)')" = "no" ]; then - # readlink(1) is not available as standard on Solaris 10. - readLink=$(which readlink) - if [ ! "$(expr "$readLink" : '\([^ ]*\)')" = "no" ]; then - if $darwin ; then - javaHome="$(dirname "\"$javaExecutable\"")" - javaExecutable="$(cd "\"$javaHome\"" && pwd -P)/javac" - else - javaExecutable="$(readlink -f "\"$javaExecutable\"")" - fi - javaHome="$(dirname "\"$javaExecutable\"")" - javaHome=$(expr "$javaHome" : '\(.*\)/bin') - JAVA_HOME="$javaHome" - export JAVA_HOME - fi - fi -fi - -if [ -z "$JAVACMD" ] ; then - if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" - else - JAVACMD="$JAVA_HOME/bin/java" - fi - else - JAVACMD="$(\unset -f command 2>/dev/null; \command -v java)" - fi -fi - -if [ ! -x "$JAVACMD" ] ; then - echo "Error: JAVA_HOME is not defined correctly." >&2 - echo " We cannot execute $JAVACMD" >&2 - exit 1 -fi - -if [ -z "$JAVA_HOME" ] ; then - echo "Warning: JAVA_HOME environment variable is not set." -fi - -# traverses directory structure from process work directory to filesystem root -# first directory with .mvn subdirectory is considered project base directory -find_maven_basedir() { - if [ -z "$1" ] - then - echo "Path not specified to find_maven_basedir" - return 1 - fi - - basedir="$1" - wdir="$1" - while [ "$wdir" != '/' ] ; do - if [ -d "$wdir"/.mvn ] ; then - basedir=$wdir - break - fi - # workaround for JBEAP-8937 (on Solaris 10/Sparc) - if [ -d "${wdir}" ]; then - wdir=$(cd "$wdir/.." || exit 1; pwd) - fi - # end of workaround - done - printf '%s' "$(cd "$basedir" || exit 1; pwd)" -} - -# concatenates all lines of a file -concat_lines() { - if [ -f "$1" ]; then - # Remove \r in case we run on Windows within Git Bash - # and check out the repository with auto CRLF management - # enabled. Otherwise, we may read lines that are delimited with - # \r\n and produce $'-Xarg\r' rather than -Xarg due to word - # splitting rules. - tr -s '\r\n' ' ' < "$1" - fi -} - -log() { - if [ "$MVNW_VERBOSE" = true ]; then - printf '%s\n' "$1" - fi -} - -BASE_DIR=$(find_maven_basedir "$(dirname "$0")") -if [ -z "$BASE_DIR" ]; then - exit 1; -fi - -MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}; export MAVEN_PROJECTBASEDIR -log "$MAVEN_PROJECTBASEDIR" - -########################################################################################## -# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central -# This allows using the maven wrapper in projects that prohibit checking in binary data. -########################################################################################## -wrapperJarPath="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" -if [ -r "$wrapperJarPath" ]; then - log "Found $wrapperJarPath" -else - log "Couldn't find $wrapperJarPath, downloading it ..." - - if [ -n "$MVNW_REPOURL" ]; then - wrapperUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" - else - wrapperUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" - fi - while IFS="=" read -r key value; do - # Remove '\r' from value to allow usage on windows as IFS does not consider '\r' as a separator ( considers space, tab, new line ('\n'), and custom '=' ) - safeValue=$(echo "$value" | tr -d '\r') - case "$key" in (wrapperUrl) wrapperUrl="$safeValue"; break ;; - esac - done < "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties" - log "Downloading from: $wrapperUrl" - - if $cygwin; then - wrapperJarPath=$(cygpath --path --windows "$wrapperJarPath") - fi - - if command -v wget > /dev/null; then - log "Found wget ... using wget" - [ "$MVNW_VERBOSE" = true ] && QUIET="" || QUIET="--quiet" - if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then - wget $QUIET "$wrapperUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" - else - wget $QUIET --http-user="$MVNW_USERNAME" --http-password="$MVNW_PASSWORD" "$wrapperUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" - fi - elif command -v curl > /dev/null; then - log "Found curl ... using curl" - [ "$MVNW_VERBOSE" = true ] && QUIET="" || QUIET="--silent" - if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then - curl $QUIET -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath" - else - curl $QUIET --user "$MVNW_USERNAME:$MVNW_PASSWORD" -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath" - fi - else - log "Falling back to using Java to download" - javaSource="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.java" - javaClass="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.class" - # For Cygwin, switch paths to Windows format before running javac - if $cygwin; then - javaSource=$(cygpath --path --windows "$javaSource") - javaClass=$(cygpath --path --windows "$javaClass") - fi - if [ -e "$javaSource" ]; then - if [ ! -e "$javaClass" ]; then - log " - Compiling MavenWrapperDownloader.java ..." - ("$JAVA_HOME/bin/javac" "$javaSource") - fi - if [ -e "$javaClass" ]; then - log " - Running MavenWrapperDownloader.java ..." - ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$wrapperUrl" "$wrapperJarPath") || rm -f "$wrapperJarPath" - fi - fi - fi -fi -########################################################################################## -# End of extension -########################################################################################## - -# If specified, validate the SHA-256 sum of the Maven wrapper jar file -wrapperSha256Sum="" -while IFS="=" read -r key value; do - case "$key" in (wrapperSha256Sum) wrapperSha256Sum=$value; break ;; - esac -done < "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties" -if [ -n "$wrapperSha256Sum" ]; then - wrapperSha256Result=false - if command -v sha256sum > /dev/null; then - if echo "$wrapperSha256Sum $wrapperJarPath" | sha256sum -c > /dev/null 2>&1; then - wrapperSha256Result=true - fi - elif command -v shasum > /dev/null; then - if echo "$wrapperSha256Sum $wrapperJarPath" | shasum -a 256 -c > /dev/null 2>&1; then - wrapperSha256Result=true - fi - else - echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." - echo "Please install either command, or disable validation by removing 'wrapperSha256Sum' from your maven-wrapper.properties." - exit 1 - fi - if [ $wrapperSha256Result = false ]; then - echo "Error: Failed to validate Maven wrapper SHA-256, your Maven wrapper might be compromised." >&2 - echo "Investigate or delete $wrapperJarPath to attempt a clean download." >&2 - echo "If you updated your Maven version, you need to update the specified wrapperSha256Sum property." >&2 - exit 1 - fi -fi - -MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" - -# For Cygwin, switch paths to Windows format before running java -if $cygwin; then - [ -n "$JAVA_HOME" ] && - JAVA_HOME=$(cygpath --path --windows "$JAVA_HOME") - [ -n "$CLASSPATH" ] && - CLASSPATH=$(cygpath --path --windows "$CLASSPATH") - [ -n "$MAVEN_PROJECTBASEDIR" ] && - MAVEN_PROJECTBASEDIR=$(cygpath --path --windows "$MAVEN_PROJECTBASEDIR") -fi - -# Provide a "standardized" way to retrieve the CLI args that will -# work with both Windows and non-Windows executions. -MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $*" -export MAVEN_CMD_LINE_ARGS - -WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain - -# shellcheck disable=SC2086 # safe args -exec "$JAVACMD" \ - $MAVEN_OPTS \ - $MAVEN_DEBUG_OPTS \ - -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ - "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ - ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-demo/mvnw.cmd b/pipIrr-platform/pipIrr-web/pipIrr-web-demo/mvnw.cmd deleted file mode 100644 index 95ba6f5..0000000 --- a/pipIrr-platform/pipIrr-web/pipIrr-web-demo/mvnw.cmd +++ /dev/null @@ -1,205 +0,0 @@ -@REM ---------------------------------------------------------------------------- -@REM Licensed to the Apache Software Foundation (ASF) under one -@REM or more contributor license agreements. See the NOTICE file -@REM distributed with this work for additional information -@REM regarding copyright ownership. The ASF licenses this file -@REM to you under the Apache License, Version 2.0 (the -@REM "License"); you may not use this file except in compliance -@REM with the License. You may obtain a copy of the License at -@REM -@REM https://www.apache.org/licenses/LICENSE-2.0 -@REM -@REM Unless required by applicable law or agreed to in writing, -@REM software distributed under the License is distributed on an -@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -@REM KIND, either express or implied. See the License for the -@REM specific language governing permissions and limitations -@REM under the License. -@REM ---------------------------------------------------------------------------- - -@REM ---------------------------------------------------------------------------- -@REM Apache Maven Wrapper startup batch script, version 3.2.0 -@REM -@REM Required ENV vars: -@REM JAVA_HOME - location of a JDK home dir -@REM -@REM Optional ENV vars -@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands -@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending -@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven -@REM e.g. to debug Maven itself, use -@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 -@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files -@REM ---------------------------------------------------------------------------- - -@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' -@echo off -@REM set title of command window -title %0 -@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on' -@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% - -@REM set %HOME% to equivalent of $HOME -if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") - -@REM Execute a user defined script before this one -if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre -@REM check for pre script, once with legacy .bat ending and once with .cmd ending -if exist "%USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat" %* -if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\mavenrc_pre.cmd" %* -:skipRcPre - -@setlocal - -set ERROR_CODE=0 - -@REM To isolate internal variables from possible post scripts, we use another setlocal -@setlocal - -@REM ==== START VALIDATION ==== -if not "%JAVA_HOME%" == "" goto OkJHome - -echo. -echo Error: JAVA_HOME not found in your environment. >&2 -echo Please set the JAVA_HOME variable in your environment to match the >&2 -echo location of your Java installation. >&2 -echo. -goto error - -:OkJHome -if exist "%JAVA_HOME%\bin\java.exe" goto init - -echo. -echo Error: JAVA_HOME is set to an invalid directory. >&2 -echo JAVA_HOME = "%JAVA_HOME%" >&2 -echo Please set the JAVA_HOME variable in your environment to match the >&2 -echo location of your Java installation. >&2 -echo. -goto error - -@REM ==== END VALIDATION ==== - -:init - -@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". -@REM Fallback to current working directory if not found. - -set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% -IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir - -set EXEC_DIR=%CD% -set WDIR=%EXEC_DIR% -:findBaseDir -IF EXIST "%WDIR%"\.mvn goto baseDirFound -cd .. -IF "%WDIR%"=="%CD%" goto baseDirNotFound -set WDIR=%CD% -goto findBaseDir - -:baseDirFound -set MAVEN_PROJECTBASEDIR=%WDIR% -cd "%EXEC_DIR%" -goto endDetectBaseDir - -:baseDirNotFound -set MAVEN_PROJECTBASEDIR=%EXEC_DIR% -cd "%EXEC_DIR%" - -:endDetectBaseDir - -IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig - -@setlocal EnableExtensions EnableDelayedExpansion -for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a -@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% - -:endReadAdditionalConfig - -SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" -set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" -set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain - -set WRAPPER_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" - -FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( - IF "%%A"=="wrapperUrl" SET WRAPPER_URL=%%B -) - -@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central -@REM This allows using the maven wrapper in projects that prohibit checking in binary data. -if exist %WRAPPER_JAR% ( - if "%MVNW_VERBOSE%" == "true" ( - echo Found %WRAPPER_JAR% - ) -) else ( - if not "%MVNW_REPOURL%" == "" ( - SET WRAPPER_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" - ) - if "%MVNW_VERBOSE%" == "true" ( - echo Couldn't find %WRAPPER_JAR%, downloading it ... - echo Downloading from: %WRAPPER_URL% - ) - - powershell -Command "&{"^ - "$webclient = new-object System.Net.WebClient;"^ - "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^ - "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^ - "}"^ - "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%WRAPPER_URL%', '%WRAPPER_JAR%')"^ - "}" - if "%MVNW_VERBOSE%" == "true" ( - echo Finished downloading %WRAPPER_JAR% - ) -) -@REM End of extension - -@REM If specified, validate the SHA-256 sum of the Maven wrapper jar file -SET WRAPPER_SHA_256_SUM="" -FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( - IF "%%A"=="wrapperSha256Sum" SET WRAPPER_SHA_256_SUM=%%B -) -IF NOT %WRAPPER_SHA_256_SUM%=="" ( - powershell -Command "&{"^ - "$hash = (Get-FileHash \"%WRAPPER_JAR%\" -Algorithm SHA256).Hash.ToLower();"^ - "If('%WRAPPER_SHA_256_SUM%' -ne $hash){"^ - " Write-Output 'Error: Failed to validate Maven wrapper SHA-256, your Maven wrapper might be compromised.';"^ - " Write-Output 'Investigate or delete %WRAPPER_JAR% to attempt a clean download.';"^ - " Write-Output 'If you updated your Maven version, you need to update the specified wrapperSha256Sum property.';"^ - " exit 1;"^ - "}"^ - "}" - if ERRORLEVEL 1 goto error -) - -@REM Provide a "standardized" way to retrieve the CLI args that will -@REM work with both Windows and non-Windows executions. -set MAVEN_CMD_LINE_ARGS=%* - -%MAVEN_JAVA_EXE% ^ - %JVM_CONFIG_MAVEN_PROPS% ^ - %MAVEN_OPTS% ^ - %MAVEN_DEBUG_OPTS% ^ - -classpath %WRAPPER_JAR% ^ - "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^ - %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* -if ERRORLEVEL 1 goto error -goto end - -:error -set ERROR_CODE=1 - -:end -@endlocal & set ERROR_CODE=%ERROR_CODE% - -if not "%MAVEN_SKIP_RC%"=="" goto skipRcPost -@REM check for post script, once with legacy .bat ending and once with .cmd ending -if exist "%USERPROFILE%\mavenrc_post.bat" call "%USERPROFILE%\mavenrc_post.bat" -if exist "%USERPROFILE%\mavenrc_post.cmd" call "%USERPROFILE%\mavenrc_post.cmd" -:skipRcPost - -@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' -if "%MAVEN_BATCH_PAUSE%"=="on" pause - -if "%MAVEN_TERMINATE_CMD%"=="on" exit %ERROR_CODE% - -cmd /C exit /B %ERROR_CODE% diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-demo/pom.xml b/pipIrr-platform/pipIrr-web/pipIrr-web-demo/pom.xml deleted file mode 100644 index ae0ed8e..0000000 --- a/pipIrr-platform/pipIrr-web/pipIrr-web-demo/pom.xml +++ /dev/null @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - - <parent> - <artifactId>pipIrr-web</artifactId> - <groupId>com.dy</groupId> - <version>1.0.0</version> - <relativePath>../pom.xml</relativePath> - </parent> - - <packaging>jar</packaging> - <artifactId>pipIrr-web-demo</artifactId> - <name>pipIrr-web-demo</name> - <description>web寮�鍙戞紨绀虹郴缁燂紝婕旂ず绀轰緥</description> - - -</project> \ No newline at end of file diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/main/java/com/dy/pipIrrDemo/PipIrrDemoApplication.java b/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/main/java/com/dy/pipIrrDemo/PipIrrDemoApplication.java deleted file mode 100644 index 06eeafc..0000000 --- a/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/main/java/com/dy/pipIrrDemo/PipIrrDemoApplication.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.dy.pipIrrDemo; - -import com.dy.common.multiDataSource.EnableMultiDataSource; -import org.mybatis.spring.annotation.MapperScan; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.context.annotation.ComponentScan; -import org.springframework.context.annotation.EnableAspectJAutoProxy; -import org.springframework.context.annotation.FilterType; - -@SpringBootApplication -@EnableAspectJAutoProxy -@EnableMultiDataSource -@ComponentScan(basePackages = {"com.dy.common", "com.dy.pipIrrGlobal", "com.dy.pipIrrDemo"}, - excludeFilters = { - @ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, classes = { - com.dy.common.singleDataSource.DruidDataSourceConfig.class //鎺掗櫎鍗曟暟鎹簮 - }) - } -) -@MapperScan(basePackages={"com.dy.pipIrrGlobal.daoDemo"}) -public class PipIrrDemoApplication { - - public static void main(String[] args) { - SpringApplication.run(PipIrrDemoApplication.class, args); - } - -} - diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/main/java/com/dy/pipIrrDemo/auth/AuthCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/main/java/com/dy/pipIrrDemo/auth/AuthCtrl.java deleted file mode 100644 index 84661c6..0000000 --- a/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/main/java/com/dy/pipIrrDemo/auth/AuthCtrl.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.dy.pipIrrDemo.auth; - - -import com.dy.common.webUtil.BaseResponse; -import com.dy.common.webUtil.BaseResponseUtils; -import com.dy.pipIrrGlobal.pojoDemo.DemoAuth; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.util.List; - -@Slf4j -@RestController -@RequestMapping(path="auth") -@SuppressWarnings("unchecked") -public class AuthCtrl { - - @Autowired - AuthSv sv ; - - @GetMapping("selectAll") - public BaseResponse<DemoAuth> selectAll(){ - try { - List<DemoAuth> list = sv.selectAll() ; - return BaseResponseUtils.buildSuccess(list); - } catch (Exception e) { - log.error("寰楀埌鎵�鏈塪emo鏉冮檺寮傚父", e); - return BaseResponseUtils.buildException(e.getMessage()) ; - } - } -} diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/main/java/com/dy/pipIrrDemo/auth/AuthSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/main/java/com/dy/pipIrrDemo/auth/AuthSv.java deleted file mode 100644 index 495b6ca..0000000 --- a/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/main/java/com/dy/pipIrrDemo/auth/AuthSv.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.dy.pipIrrDemo.auth; - - -import com.dy.pipIrrGlobal.daoDemo.DemoAuthMapper; -import com.dy.pipIrrGlobal.pojoDemo.DemoAddress; -import com.dy.pipIrrGlobal.pojoDemo.DemoAuth; -import com.dy.pipIrrGlobal.pojoDemo.DemoRole; -import com.dy.pipIrrGlobal.pojoDemo.DemoUser; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.Date; -import java.util.List; - -@Service -public class AuthSv { - @Autowired - private DemoAuthMapper demoAuthMapper ; - - public List<DemoAuth> selectAll() { - List<DemoAuth> list = this.demoAuthMapper.selectAll() ; - for(DemoAuth po : list){ - po.date = new Date() ; - List<DemoRole> roleList = po.getRoleList() ; - if(roleList != null){ - for(DemoRole rpo : roleList){ - List<DemoUser> userList = rpo.getUserList() ; - if(userList != null){ - for(DemoUser upo : userList){ - DemoAddress dPo = upo.getAddress() ; - if(dPo != null){ - System.out.println(dPo.name); - } - } - } - } - } - } - return list ; - } -} diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/main/java/com/dy/pipIrrDemo/config/WebFilterConfiguration.java b/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/main/java/com/dy/pipIrrDemo/config/WebFilterConfiguration.java deleted file mode 100644 index c4f1e2e..0000000 --- a/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/main/java/com/dy/pipIrrDemo/config/WebFilterConfiguration.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.dy.pipIrrDemo.config; - -import com.dy.common.webFilter.DevOfDataSourceNameSetFilter; -import com.dy.common.webFilter.UserTokenFilter; -import jakarta.servlet.Filter; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.boot.web.servlet.FilterRegistrationBean; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -@Configuration -public class WebFilterConfiguration { - - @Value("${pipIrr.global.dev}") - public String isDevStage ;//鏄惁涓哄紑鍙戦樁娈� - @Value("${pipIrr.global.dsName}") - public String dsName ;//寮�鍙戦樁娈电殑鏁版嵁婧愬悕绉� - - /** - * DevOfDataSourceNameSetFilter涓嶶serTokenFilter鍙兘涓�涓閰嶇疆涓婏紝 - * 鎵�浠ヤ粬浠殑order閮芥槸1 - */ - private static final int order_UserTokenFilter = 1 ;//涓庝笅闈� - private static final int order_DevOfDataSourceNameSetFilter = 1 ; - - - @Bean - public FilterRegistrationBean<? extends Filter> RegFilter() { - FilterRegistrationBean<Filter> filterRegistrationBean = new FilterRegistrationBean<>(); - if(this.isDevStage != null && !this.isDevStage.trim().equals("") && this.isDevStage.trim().equalsIgnoreCase("true")){ - filterRegistrationBean.setFilter(new DevOfDataSourceNameSetFilter()); - filterRegistrationBean.addUrlPatterns("/*");//閰嶇疆杩囨护瑙勫垯 - filterRegistrationBean.addInitParameter("dataSourceName",dsName);//璁剧疆init鍙傛暟 - filterRegistrationBean.setName("DevOfDataSourceNameSetFilter");//璁剧疆杩囨护鍣ㄥ悕绉� - filterRegistrationBean.setOrder(order_DevOfDataSourceNameSetFilter);//鎵ц娆″簭 - }else{ - filterRegistrationBean.setFilter(new UserTokenFilter()); - filterRegistrationBean.addUrlPatterns("/*");//閰嶇疆杩囨护瑙勫垯 - filterRegistrationBean.setName("UserTokenFilter");//璁剧疆杩囨护鍣ㄥ悕绉� - filterRegistrationBean.setOrder(order_UserTokenFilter);//鎵ц娆″簭 - } - return filterRegistrationBean; - } - -} diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/main/java/com/dy/pipIrrDemo/config/WebListenerConfiguration.java b/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/main/java/com/dy/pipIrrDemo/config/WebListenerConfiguration.java deleted file mode 100644 index d0dd81a..0000000 --- a/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/main/java/com/dy/pipIrrDemo/config/WebListenerConfiguration.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.dy.pipIrrDemo.config; - -import com.dy.common.webListener.GenerateIdSetSuffixListener; -import jakarta.servlet.ServletContextListener; -import org.springframework.boot.web.servlet.ServletListenerRegistrationBean; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -@Configuration -//@SuppressWarnings("unchecked")//涓嶅姞缂栬緫鏃惰鍛婏細鈥滀娇鐢ㄤ簡鏈粡妫�鏌ユ垨涓嶅畨鍏ㄧ殑鎿嶄綔銆傗�� -public class WebListenerConfiguration { - - /** - * 鍚姩椤哄簭 - */ - //private static final int order_config = 1 ; - private static final int order_idSetSuffix = 2 ; - -// @Bean -// public ConfigListener getGlConfigListener(){ -// return new ConfigListener() ; -// } -// -// /** -// * 澶栭儴鎻愪緵Listener -// * @param listener 澶栭儴鎻愪緵Listener -// * @return 娉ㄥ唽Bean -// */ -// @Bean -// public ServletListenerRegistrationBean<? extends ServletContextListener> regConfigListener(ConfigListener listener) { -// ServletListenerRegistrationBean<ConfigListener> listenerRegistrationBean = new ServletListenerRegistrationBean<>(); -// listenerRegistrationBean.setListener(listener); -// listenerRegistrationBean.setOrder(order_config); -// return listenerRegistrationBean; -// } - - /** - * 鍐呴儴鎻愪緵listener - * @return 娉ㄥ唽Bean - */ - @Bean - public ServletListenerRegistrationBean<? extends ServletContextListener> reqSsoListener() { - ServletListenerRegistrationBean<GenerateIdSetSuffixListener> listenerRegistrationBean = new ServletListenerRegistrationBean<>(); - listenerRegistrationBean.setListener(new GenerateIdSetSuffixListener()); - listenerRegistrationBean.setOrder(order_idSetSuffix); - return listenerRegistrationBean; - } -} diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/main/java/com/dy/pipIrrDemo/demo/DemoCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/main/java/com/dy/pipIrrDemo/demo/DemoCtrl.java deleted file mode 100644 index 6b1c16a..0000000 --- a/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/main/java/com/dy/pipIrrDemo/demo/DemoCtrl.java +++ /dev/null @@ -1,127 +0,0 @@ -package com.dy.pipIrrDemo.demo; - -import com.dy.common.aop.SsoAop; -import com.dy.common.springUtil.SpringContextUtil; -import com.dy.common.multiDataSource.DataSourceContext; -import com.dy.common.webUtil.BaseResponse; -import com.dy.common.webUtil.BaseResponseUtils; -import com.dy.common.webUtil.GlException; -import com.dy.common.webUtil.ResultCodeMsg; -import com.dy.pipIrrGlobal.pojoBa.BaUser; -import com.dy.pipIrrGlobal.pojoDemo.DemoTest; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Parameters; -import io.swagger.v3.oas.annotations.enums.ParameterIn; -import io.swagger.v3.oas.annotations.media.Content; -import io.swagger.v3.oas.annotations.media.Schema; -import io.swagger.v3.oas.annotations.responses.ApiResponse; -import io.swagger.v3.oas.annotations.responses.ApiResponses; -import io.swagger.v3.oas.annotations.tags.Tag; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.context.ApplicationContext; -import org.springframework.web.bind.annotation.*; - -/** - * @Tag 鐢ㄦ潵璁剧疆 Controller 鐨勫悕绉板拰鎻忚堪锛岀被浼间簬缁� Postman 鐨� Collections 鍛藉悕锛� - * @ApiResponses 鍜� @ApiResponse 鐢ㄦ潵閰嶇疆鍝嶅簲锛� - * @Operation 鐢ㄦ潵璁剧疆鎺ュ彛鍚嶇О鍜屾弿杩帮紱 - * @Parameter 鐢ㄦ潵璁剧疆璇锋眰鍙傛暟鐨勬弿杩般�佹槸鍚﹀繀濉拰绀轰緥銆� - */ -//鍦ˋPI涓樉绀猴細 Tag 娉ㄨВ, 缁欐暣涓帴鍙h捣浜嗕釜鍚嶅瓧, 鎻忚堪" -@Tag(name = "娴嬭瘯鎺ュ彛", description = "娴嬭瘯鏁翠釜妗嗘灦鍙繍琛屾��") -@RestController -@RequestMapping(path="demo") -@SuppressWarnings("unchecked") -public class DemoCtrl { - - @Value("${pipIrr.test}") - public String test ; - - @Value("${pipIrr.demo.name}") - public String name ; - - @Autowired - public DemoSv demoSv; - - //鍦ˋPI涓樉绀猴細 Operation 娉ㄨВ璁剧疆鐨勬帴鍙e悕绉�, 鎺ュ彛鎻忚堪 - @Operation(summary = "涓�娴嬭瘯", description = "娴嬭瘯Get璇锋眰銆佸熀浜庨厤缃緱鍒板緱閰嶇疆椤瑰�笺�佸強鎶涘嚭寮傚父娴嬭瘯") - //鍦ˋPI涓樉绀猴細 缁欐瘡涓帴鍙f彁渚涗竴涓粯璁ょ殑鍝嶅簲, 鐘舵�佺爜鏄� XXXX, 鎻忚堪鏄� "XXXX",Media type鏄�"application/json锛岃繑鍥瀞chema: BaseResponse json - @Parameters(value = { - @Parameter(name = "id", description = "瀹炰綋ID", in = ParameterIn.PATH), - @Parameter(name = "name", description = "濮撳悕", in = ParameterIn.QUERY) - }) - @ApiResponses(value = { - @ApiResponse( - responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE, - description = "杩斿洖瀛楃涓�", - content = {@Content(mediaType = "text/plain", - schema = @Schema(implementation = String.class))} - ), - @ApiResponse( - responseCode = ResultCodeMsg.RsCode.ERROR_CODE, - description = "鍙傛暟濉啓閿欒", - content = @Content - ) - }) - @GetMapping("info/{id}/") - //http://127.0.0.1:8000/demo/demo/info/123234234/?name=寮犱笁 - @SsoAop() - public BaseResponse<String> info(@PathVariable String id, @RequestParam String name) throws GlException{ - if(name == null || name.trim().equals("")){ - return BaseResponseUtils.buildFail(ResultCodeMsg.RsMsg.ERROR_PARAM); - } - ApplicationContext sctx = SpringContextUtil.getApplicationContext() ; - if(sctx == null){ - throw new GlException("鏈幏寰桽pring 涓婁笅鏂�"); - } - DataSourceContext.set("ym"); - String str = "" + this.test + "\n" + this.name ; - String count = demoSv.getCount() ; - str += "\n 鐢ㄦ埛鏁帮細" + count ; - if(count.equals("0")){ - throw new GlException("娴嬭瘯鎶涘嚭寮傚父"); - } - return BaseResponseUtils.buildSuccess(str); - } - - @Operation(summary = "浜屾祴璇�", description = "娴嬭瘯寰楀埌瀹炰綋锛屼娇寰楀疄浣撶殑API鍙") - //鍦ˋPI涓樉绀猴細 缁欐瘡涓帴鍙f彁渚涗竴涓粯璁ょ殑鍝嶅簲, 鐘舵�佺爜鏄� XXXX, 鎻忚堪鏄� "XXXX",Media type鏄�"application/json锛岃繑鍥瀞chema: BaseResponse json - @ApiResponses(@ApiResponse( - responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE, - description = "杩斿洖鏁版嵁瀹炰綋", - content = {@Content(mediaType = "application/json", - schema = @Schema(implementation = BaseResponse.class))} - )) - @PostMapping(value = "test", consumes = "application/json") - //@RequestMapping(value="test", method = RequestMethod.POST, consumes = "application/json") - //http://127.0.0.1:8000/demo/demo/test/{"id":123456789,"age":12,"name":"test","tel":"1230987654"} - public BaseResponse<DemoTest> test(@RequestBody DemoTestVo req){ - DemoTest po = new DemoTest() ; - po.id = System.currentTimeMillis() ; - po.name = "寮犱笁" ; - po.phone = "13912345678" ; - - return BaseResponseUtils.buildSuccess(po); - } - @Operation(summary = "涓夋祴璇�", description = "娴嬭瘯BaUser") - //鍦ˋPI涓樉绀猴細 缁欐瘡涓帴鍙f彁渚涗竴涓粯璁ょ殑鍝嶅簲, 鐘舵�佺爜鏄� XXXX, 鎻忚堪鏄� "XXXX",Media type鏄�"application/json锛岃繑鍥瀞chema: BaseResponse json - @ApiResponses(@ApiResponse( - responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE, - description = "杩斿洖鏁版嵁瀹炰綋", - content = {@Content(mediaType = "application/json", - schema = @Schema(implementation = BaseResponse.class))} - )) - @GetMapping("test1") - public BaseResponse<BaUser> test1(){ - BaUser po = new BaUser() ; - po.id = System.currentTimeMillis() ; - po.userName = "寮犱笁" ; - po.phone = "13912345678" ; - - return BaseResponseUtils.buildSuccess(po); - } - - -} diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/main/java/com/dy/pipIrrDemo/demo/DemoSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/main/java/com/dy/pipIrrDemo/demo/DemoSv.java deleted file mode 100644 index 4492294..0000000 --- a/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/main/java/com/dy/pipIrrDemo/demo/DemoSv.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.dy.pipIrrDemo.demo; - -import com.dy.pipIrrGlobal.daoDemo.DemoTestMapper; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -@Service -public class DemoSv { - @Autowired - private DemoTestMapper demoTestDao; - - public String getCount(){ - Integer count = this.demoTestDao.queryCount() ; - return "" + count ; - } - - - @Transactional - public int addAuthAndUser() { - //int n = this.baUserDao.addAuth(auth); - //return n + i; - return 2 ; - } - -} diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/main/java/com/dy/pipIrrDemo/demo/DemoTestMapper.java b/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/main/java/com/dy/pipIrrDemo/demo/DemoTestMapper.java deleted file mode 100644 index 5ba42b0..0000000 --- a/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/main/java/com/dy/pipIrrDemo/demo/DemoTestMapper.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.dy.pipIrrDemo.demo; - -import com.alibaba.fastjson2.JSONObject; -import com.dy.pipIrrGlobal.pojoDemo.DemoTest; -import com.dy.pipIrrGlobal.pojoDemo.DemoTestAttr; -import org.apache.commons.lang3.ObjectUtils; -import org.apache.commons.lang3.StringUtils; -import org.mapstruct.Mapper; -import org.mapstruct.Mapping; -import org.mapstruct.Named; -import org.mapstruct.factory.Mappers; - -import java.util.List; - -@Mapper -public interface DemoTestMapper { - DemoTestMapper INSTANCT = Mappers.getMapper(DemoTestMapper.class); - - /** - * vo杞琾o - * @param vo - * @return - */ - @Mapping(target = "phone", source = "tel") - @Mapping(target = "createDt", source = "createDt", dateFormat = "yyyy-MM-dd") - @Mapping(target = "age", source = "age", numberFormat = "#0.00") - @Mapping(target = "id", ignore = true) - @Mapping(target = "nickName", defaultValue = "鍒悕") - @Mapping(target = "attr", qualifiedByName = "attrJsonToObject") - DemoTest vo2po(DemoTestVo vo); - - /** - * - * @param vos - * @return - */ - List<DemoTest> vos2pos(List<DemoTestVo> vos) ; - - /** - * po杞瑅o - * @param po - * @return - */ - @Mapping(target = "tel", source = "phone") - @Mapping(target = "attr", qualifiedByName = "attrObjectToJson") - DemoTestVo po2vo(DemoTest po); - - /** - * - * @param pos - * @return - */ - List<DemoTestVo> pos2vos(List<DemoTest> pos) ; - - /** - * json瀛楃涓茶浆瀵硅薄 - */ - @Named("attrJsonToObject") - default DemoTestAttr attrJsonToObject(String jsonStr) { - if (StringUtils.isEmpty(jsonStr)) { - return null; - } - return JSONObject.parseObject(jsonStr, DemoTestAttr.class); - } - /** - * 瀵硅薄杞琷son瀛楃涓� - */ - @Named("attrObjectToJson") - default String attrObjectToJson(DemoTestAttr attr) { - if (ObjectUtils.isEmpty(attr)) { - return null; - } - return JSONObject.toJSONString(attr) ; - } - -} diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/main/java/com/dy/pipIrrDemo/demo/DemoTestVo.java b/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/main/java/com/dy/pipIrrDemo/demo/DemoTestVo.java deleted file mode 100644 index 77a205f..0000000 --- a/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/main/java/com/dy/pipIrrDemo/demo/DemoTestVo.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.dy.pipIrrDemo.demo; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; - -import java.util.Date; - -@Data -@ToString -@NoArgsConstructor -@AllArgsConstructor -@Builder -@Schema(name = "娴嬭瘯鏁版嵁鍊煎璞�") -/* -妯″潡Controller绫绘柟娉曞弬鏁板紩鐢ㄤ簡璇ュ疄浣擄紙@RequestBody锛夛紝妯″潡Schemas API鏂囨。鎵嶄細鍑虹幇璇ュ疄浣撶殑API锛� -渚嬪鏈疄浣撳湪pipIrr-web-base妯″潡BaseDemoCtrl绫绘柟娉晅est(@RequestBody DemoTest req) -涓寮曠敤浜嗭紝璇ュ疄浣撴墠浼氬嚭鐜板湪璇ユā鍧楃殑API鏂囨。锛圵EB鐣岄潰锛変腑 - */ -public class DemoTestVo { - public Long id ; - - public String name ; - - public String nickName ; - - public Integer age ; - - public String tel ; - - public Date createDt ; - - public String address ; - - public String attr ; - -} diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/main/java/com/dy/pipIrrDemo/demo/Test4MapperStruct.java b/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/main/java/com/dy/pipIrrDemo/demo/Test4MapperStruct.java deleted file mode 100644 index 291b79e..0000000 --- a/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/main/java/com/dy/pipIrrDemo/demo/Test4MapperStruct.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.dy.pipIrrDemo.demo; - -import com.dy.pipIrrGlobal.pojoDemo.DemoTest; - -import java.util.Date; - -public class Test4MapperStruct { - public static void main(String[] args) { - testNormal(); - } - - - public static void testNormal() { - System.out.println("-----------testNormal-----start1------"); - String attr = "{\"id\":2,\"name\":\"娴嬭瘯123\"}"; - DemoTestVo userVo = DemoTestVo.builder() - .id(1L) - .name("寮犱笁") - .age(18) - .tel("18600222356") - .createDt(new Date()) - .address("寮犱笁浣忓潃") - .attr(attr) - .build(); - System.out.println("Vo锛�" + userVo); - DemoTest userPo = DemoTestMapper.INSTANCT.vo2po(userVo); - System.out.println("Po锛�" + userPo); - System.out.println("-----------testNormal-----ent1------"); - - System.out.println("-----------testNormal-----start2------"); - DemoTestVo userVo_ = DemoTestMapper.INSTANCT.po2vo(userPo); - System.out.println("vo_锛�" + userVo_); - - System.out.println("-----------testNormal-----ent2------"); - - } -} diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/main/java/com/dy/pipIrrDemo/mp/DemoMpSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/main/java/com/dy/pipIrrDemo/mp/DemoMpSv.java deleted file mode 100644 index 6a0b3e9..0000000 --- a/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/main/java/com/dy/pipIrrDemo/mp/DemoMpSv.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.dy.pipIrrDemo.mp; - -import com.dy.pipIrrGlobal.daoDemo.DemoMpMapper; -import com.dy.pipIrrGlobal.pojoDemo.DemoMp; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; - -@Service -public class DemoMpSv { - - @Autowired - private DemoMpMapper demoMpMapper ; - - public DemoMp selectById(Long id){ - return this.demoMpMapper.selectById(id); - } - - - public List<DemoMp> selectBatchIds(List<Long> ids){ - return this.demoMpMapper.selectBatchIds(ids); - } - - public int insert(DemoMp po){ - return this.demoMpMapper.insert(po) ; - } - - public int updateById(DemoMp po){ - return this.demoMpMapper.updateById(po) ; - } - -} diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/main/java/com/dy/pipIrrDemo/role/RoleCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/main/java/com/dy/pipIrrDemo/role/RoleCtrl.java deleted file mode 100644 index 79a4e91..0000000 --- a/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/main/java/com/dy/pipIrrDemo/role/RoleCtrl.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.dy.pipIrrDemo.role; - - -import com.dy.common.webUtil.BaseResponse; -import com.dy.common.webUtil.BaseResponseUtils; -import com.dy.pipIrrGlobal.pojoDemo.DemoRole; -import com.dy.pipIrrGlobal.pojoDemo.DemoUser; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.util.List; - -@Slf4j -@RestController -@RequestMapping(path="role") -@SuppressWarnings("unchecked") -public class RoleCtrl { - - @Autowired - RoleSv sv ; - - @GetMapping("selectAll") - public BaseResponse<DemoUser> selectAll(){ - try { - List<DemoRole> list = sv.selectAll() ; - return BaseResponseUtils.buildSuccess(list); - } catch (Exception e) { - log.error("寰楀埌鎵�鏈塪emo鐢ㄦ埛寮傚父", e); - return BaseResponseUtils.buildException(e.getMessage()) ; - } - } -} diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/main/java/com/dy/pipIrrDemo/role/RoleSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/main/java/com/dy/pipIrrDemo/role/RoleSv.java deleted file mode 100644 index 55253b6..0000000 --- a/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/main/java/com/dy/pipIrrDemo/role/RoleSv.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.dy.pipIrrDemo.role; - - -import com.dy.pipIrrGlobal.daoDemo.DemoRoleMapper; -import com.dy.pipIrrGlobal.pojoDemo.DemoRole; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; - -@Service -public class RoleSv { - @Autowired - private DemoRoleMapper demoRoleMapper ; - - public List<DemoRole> selectAll() { - List<DemoRole> list = this.demoRoleMapper.selectAll() ; - return list ; - } -} diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/main/java/com/dy/pipIrrDemo/user/UserCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/main/java/com/dy/pipIrrDemo/user/UserCtrl.java deleted file mode 100644 index 9874d30..0000000 --- a/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/main/java/com/dy/pipIrrDemo/user/UserCtrl.java +++ /dev/null @@ -1,103 +0,0 @@ -package com.dy.pipIrrDemo.user; - -import com.dy.common.mybatis.envm.Deleted; -import com.dy.common.mybatis.envm.Disabled; -import com.dy.common.webUtil.BaseResponse; -import com.dy.common.webUtil.BaseResponseUtils; -import com.dy.pipIrrGlobal.pojoDemo.DemoUser; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -@Slf4j -@RestController -@RequestMapping(path="user") -@SuppressWarnings("unchecked") -public class UserCtrl { - - UserSv userSv; - - @Autowired - public void setUserSv(UserSv userSv){ - this.userSv = userSv; - } - - @GetMapping("selectById1") - public BaseResponse<DemoUser> selectById1(){ - try { - DemoUser po = userSv.selectById1(1L) ; - return BaseResponseUtils.buildSuccess(po); - } catch (Exception e) { - log.error("selectById1", e); - return BaseResponseUtils.buildException(e.getMessage()) ; - } - } - - - @GetMapping("selectById2") - public BaseResponse<DemoUser> selectById2(){ - try { - DemoUser po = userSv.selectById2(1L) ; - return BaseResponseUtils.buildSuccess(po); - } catch (Exception e) { - log.error("selectById2", e); - return BaseResponseUtils.buildException(e.getMessage()) ; - } - } - - - @GetMapping("selectById3") - public BaseResponse<DemoUser> selectById3(){ - try { - DemoUser po = userSv.selectById3(1L) ; - return BaseResponseUtils.buildSuccess(po); - } catch (Exception e) { - log.error("selectById3", e); - return BaseResponseUtils.buildException(e.getMessage()) ; - } - } - - - @GetMapping("selectById4") - public BaseResponse<DemoUser> selectById4(){ - try { - DemoUser po = userSv.selectById4(1L) ; - return BaseResponseUtils.buildSuccess(po); - } catch (Exception e) { - log.error("selectById4", e); - return BaseResponseUtils.buildException(e.getMessage()) ; - } - } - - - @GetMapping("selectById5") - public BaseResponse<DemoUser> selectById5(){ - try { - DemoUser po = userSv.selectById5(1L) ; - return BaseResponseUtils.buildSuccess(po); - } catch (Exception e) { - log.error("selectById5", e); - return BaseResponseUtils.buildException(e.getMessage()) ; - } - } - - - - @GetMapping("insert") - public BaseResponse<DemoUser> insert(){ - try { - DemoUser po = new DemoUser(); - po.name = "鐜嬩簲" ; - po.password = "123456" ; - po.disabled = Disabled.NO ; - po.deleted = Deleted.NO ; - po.roleId = 1L ; - this.userSv.insert(po) ; - return BaseResponseUtils.buildSuccess(po); - } catch (Exception e) { - log.error("insert", e); - return BaseResponseUtils.buildException(e.getMessage()) ; - } - } - -} diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/main/java/com/dy/pipIrrDemo/user/UserSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/main/java/com/dy/pipIrrDemo/user/UserSv.java deleted file mode 100644 index 79c8527..0000000 --- a/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/main/java/com/dy/pipIrrDemo/user/UserSv.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.dy.pipIrrDemo.user; - - -import com.dy.pipIrrGlobal.daoDemo.DemoUserMapper; -import com.dy.pipIrrGlobal.pojoDemo.DemoUser; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -@Service -public class UserSv { - @Autowired - private DemoUserMapper demoUserMapper ; - - public int insert(DemoUser user){ - return demoUserMapper.insert(user) ; - } - - public DemoUser selectById1(Long id ) { - DemoUser user = this.demoUserMapper.selectById1(id) ; - return user ; - } - public DemoUser selectById2(Long id ) { - DemoUser user = this.demoUserMapper.selectById2(id) ; - return user ; - } - public DemoUser selectById3(Long id ) { - DemoUser user = this.demoUserMapper.selectById3(id) ; - return user ; - } - public DemoUser selectById4(Long id ) { - DemoUser user = this.demoUserMapper.selectById4(id) ; - return user ; - } - public DemoUser selectById5(Long id ) { - DemoUser user = this.demoUserMapper.selectById5(id) ; - return user ; - } -} \ No newline at end of file diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/main/resources/application.yml b/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/main/resources/application.yml deleted file mode 100644 index c03d2cc..0000000 --- a/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/main/resources/application.yml +++ /dev/null @@ -1,23 +0,0 @@ -spring: - profiles: - include: global, database - -#actutor鐨剋eb绔彛 -management: - server: - port: ${pipIrr.demo.actutorPort} -#web鏈嶅姟绔彛锛宼omcat榛樿鏄�8080 -server: - port: ${pipIrr.demo.webPort} - servlet: - context-path: /demo #web璁块棶涓婁笅鏂囪矾寰� - context-parameters: - #GenerateIdSetSuffixListener涓簲鐢紝鍙栧�艰寖鍥存槸0-99 - idSuffix: ${pipIrr.demo.idSuffix} - #ConfigListener涓簲鐢� - #configFileNames: config-global.xml,config-demo.xml - -pipIrr: - demo: - name: 婕旂ず淇℃伅绯荤粺 - test: 婕旂ず娴嬭瘯 diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/main/resources/log4j2.yml b/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/main/resources/log4j2.yml deleted file mode 100644 index ca7e35b..0000000 --- a/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/main/resources/log4j2.yml +++ /dev/null @@ -1,73 +0,0 @@ -Configuration: - #status锛岃繖涓敤浜庤缃甽og4j2鑷韩鍐呴儴鐨勪俊鎭緭鍑猴紝鍙互涓嶈缃紝褰撹缃垚trace鏃讹紝浣犱細鐪嬪埌log4j2鍐呴儴鍚勭璇︾粏杈撳嚭锛涘彲浠ヨ缃垚Off(鍏抽棴)鎴朎rror(鍙緭鍑洪敊璇俊鎭�) - status: Error - - Properties: # 瀹氫箟鍏ㄥ眬鍙橀噺 - Property: - #鏃ュ織鏂囦欢瀛樺偍鐨勭洰褰� - - name: log.path - value: ./logs - #鏃ュ織鏂囦欢瀛樺偍鍚嶇О - - name: project.name - value: pipIrrDemo - - #瀹氫箟杈撳嚭鍣紝鍙互杈撳嚭鍒版帶鍒跺彴鍜屾枃浠�. - Appenders: - #杈撳嚭鍒版帶鍒跺彴 - Console: - #Appender鍛藉悕 - name: CONSOLE - target: SYSTEM_OUT - ThresholdFilter: - level: debug #杈撳嚭鏃ュ織绾у埆锛岃緭鍑烘棩蹇楁椂锛岄鍏堢敱Loggers.Root.level鎴朙oggers.Logger.level鍒ゆ柇鏄惁杈撳嚭锛岀劧鍚庡啀鐢辨湰level鍒ゆ柇鏄惁杈撳嚭 - onMatch: ACCEPT #onMatch=ACCEPT 澶т簬绛変簬 "level" 閰嶇疆鐨勭瓑绾у湴鏃ュ織杈撳嚭 - onMismatch: DENY #onMismatch=DENY 灏忎簬 "level" 閰嶇疆鐨勭瓑绾у湴鏃ュ織涓嶈緭鍑� - #鏃ュ織鍐呭鏍峰紡 - PatternLayout: - #%n-鎹㈣ - #%m-鏃ュ織鍐呭锛岃緭鍑轰唬鐮佷腑鎸囧畾鐨勬棩蹇椾俊鎭� - #%p-杈撳嚭浼樺厛绾э紝鍗矰EBUG,INFO,WARN,ERROR,FATAL - #%r-绋嬪簭鍚姩鍒扮幇鍦ㄧ殑姣鏁� - #%%- 杈撳嚭涓�涓�"%" 瀛楃 - #%t-褰撳墠绾跨▼鍚� - #%d-鏃ユ湡鍜屾椂闂�, 甯哥敤鐨勬牸寮忔湁%d{DATE},%d{ABSOLUTE},%d{HH:mm:ss,SSS},%d{ddMMyyyyHH:mm:ss,SSS} - #%l-鍚�%F%L%C%M - #%F-java婧愭枃浠跺悕 - #%L-java婧愮爜琛屾暟 - #%C-java绫诲悕,%C{1}杈撳嚭鏈�鍚庝竴涓厓绱� - #%M-java鏂规硶鍚� - pattern: "%d{yyyy-MM-dd HH:mm:ss,SSS}:%4p %t (%C.%M:%L) - %m%n" - # 杈撳嚭鍒版枃浠讹紝瓒呰繃10MB褰掓。 - RollingFile: - - name: ROLLING_FILE - ignoreExceptions: false - fileName: ${log.path}/${project.name}.log - filePattern: "${log.path}/$${date:yyyy-MM}/${project.name}-%d{yyyy-MM-dd}-%i.log.gz" - ThresholdFilter: - level: error #杈撳嚭鏃ュ織绾у埆锛岃緭鍑烘棩蹇楁椂锛岄鍏堢敱Loggers.Root.level鎴朙oggers.Logger.level鍒ゆ柇鏄惁杈撳嚭锛岀劧鍚庡啀鐢辨湰level鍒ゆ柇鏄惁杈撳嚭 - onMatch: ACCEPT #onMatch=ACCEPT 澶т簬绛変簬 "level" 閰嶇疆鐨勭瓑绾у湴鏃ュ織杈撳嚭 - onMismatch: DENY #onMismatch=DENY 灏忎簬 "level" 閰嶇疆鐨勭瓑绾у湴鏃ュ織涓嶈緭鍑� - #鏃ュ織鍐呭鏍峰紡 - PatternLayout: - pattern: "%d{yyyy-MM-dd HH:mm:ss,SSS}:%4p %t (%C.%M:%L) - %m%n" - Policies: - SizeBasedTriggeringPolicy: - size: "10 MB" - DefaultRolloverStrategy: - max: 1000 - - Loggers: - Root: - level: info #鏃ュ織杈撳嚭绾у埆锛屽叡鏈�8涓骇鍒紝鎸夌収浠庝綆鍒伴珮涓猴細all < trace < debug < info < warn < error < fatal < off - AppenderRef: #Root鐨勫瓙鑺傜偣锛岀敤鏉ユ寚瀹氳鏃ュ織杈撳嚭鍒板摢涓狝ppender. - - ref: CONSOLE #杈撳嚭鏃ュ織鏃讹紝棣栧厛鐢辨湰level鍒ゆ柇鏄惁杈撳嚭锛岀劧鍚庡啀鐢变笂闈㈢殑Appenders.Console.ThresholdFilter.level鍒ゆ柇鏄惁杈撳嚭 - - ref: ROLLING_FILE #杈撳嚭鏃ュ織鏃讹紝棣栧厛鐢辨湰level鍒ゆ柇鏄惁杈撳嚭锛岀劧鍚庡啀鐢变笂闈㈢殑Appenders.RollingFile.ThresholdFilter.level鍒ゆ柇鏄惁杈撳嚭 - # 涓哄寘閰嶇疆鐗规畩鐨凩og绾у埆锛屾柟渚胯皟璇曪紝 - # 涓嶅彈Loggers.Root.level闄愬埗 - Logger: - - name: com.dy.pipIrrGlobal.daoDemo - additivity: false #鍘婚櫎閲嶅鐨刲og - level: debug #杈撳嚭鏃ュ織绾у埆 - AppenderRef: - - ref: CONSOLE #杈撳嚭鏃ュ織鏃讹紝棣栧厛鐢辨湰.level鍒ゆ柇鏄惁杈撳嚭锛岀劧鍚庡啀鐢变笂闈㈢殑Appenders.Console.ThresholdFilter.level鍒ゆ柇鏄惁杈撳嚭 - - ref: ROLLING_FILE #杈撳嚭鏃ュ織鏃讹紝棣栧厛鐢辨湰level鍒ゆ柇鏄惁杈撳嚭锛岀劧鍚庡啀鐢变笂闈㈢殑Appenders.RollingFile.ThresholdFilter.level鍒ゆ柇鏄惁杈撳嚭 diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/test/java/com/dy/pipIrrDemo/PipIrrWebDemoApplicationTests.java b/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/test/java/com/dy/pipIrrDemo/PipIrrWebDemoApplicationTests.java deleted file mode 100644 index 3ec992d..0000000 --- a/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/test/java/com/dy/pipIrrDemo/PipIrrWebDemoApplicationTests.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.dy.pipIrrDemo; - -import org.junit.jupiter.api.Test; -import org.springframework.boot.test.context.SpringBootTest; - -@SpringBootTest -class PipIrrWebDemoApplicationTests { - - @Test - void contextLoads() { - } - -} diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/test/java/com/dy/pipIrrDemo/mp/MpTest1.java b/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/test/java/com/dy/pipIrrDemo/mp/MpTest1.java deleted file mode 100644 index d20db9a..0000000 --- a/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/test/java/com/dy/pipIrrDemo/mp/MpTest1.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.dy.pipIrrDemo.mp; - -import com.dy.common.multiDataSource.DataSourceContext; -import com.dy.pipIrrGlobal.pojoDemo.DemoMp; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -import java.time.LocalDateTime; - -@RunWith(SpringRunner.class) -@SpringBootTest -public class MpTest1 { - - @Autowired - private DemoMpSv demoMpSv ; - - @Before - public void setup(){ - DataSourceContext.set("ym"); - } - - @Test - public void insert(){ - DemoMp po = new DemoMp() ; - po.name = "寮犱笁" ; - po.age = 20 ; - po.dt = LocalDateTime.now() ; - int count = this.demoMpSv.insert(po) ; - System.out.println("鎻掑叆浜�" + count + "璁板綍"); - } - - @Test - public void updateById(){ - //鎶婁笂闈㈡彃鍏ョ殑璁板綍杩涜鏇存柊 - DemoMp po = new DemoMp() ; - po.id = 2023110716001900000L ; - po.name = "鏉庡洓" ; - po.age = 22 ; - //po.dt = LocalDateTime.now() ; - int count = this.demoMpSv.updateById(po); - System.out.println("鏇存柊浜�" + count + "璁板綍"); - } - - @Test - public void selectById(){ - DemoMp po = this.demoMpSv.selectById(1L) ; - } -} diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/test/java/com/dy/pipIrrDemo/mp/MpTest2.java b/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/test/java/com/dy/pipIrrDemo/mp/MpTest2.java deleted file mode 100644 index 0136946..0000000 --- a/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/test/java/com/dy/pipIrrDemo/mp/MpTest2.java +++ /dev/null @@ -1,181 +0,0 @@ -package com.dy.pipIrrDemo.mp; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.dy.common.multiDataSource.DataSourceContext; -import com.dy.pipIrrGlobal.daoDemo.DemoMpMapper; -import com.dy.pipIrrGlobal.pojoDemo.DemoMp; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -@RunWith(SpringRunner.class) -@SpringBootTest -public class MpTest2 { - - @Autowired - private DemoMpMapper demoMpMapper ; - - @Before - public void setup(){ - DataSourceContext.set("ym"); - } - - @Test - public void selectById(){ - DemoMp po = this.demoMpMapper.selectById(2023110716001900000L) ; - System.out.println(po); - } - @Test - public void selectBatchIds(){ - List<Long> listIds = Arrays.asList(1L, 2L, 2023110716001900000L) ; - List<DemoMp> poList = this.demoMpMapper.selectBatchIds(listIds) ; - System.out.println(poList); - } - @Test - public void selectByMap(){ - Map<String, Object > paramMap = new HashMap<>() ; - paramMap.put("name", "鏉庡洓"); - paramMap.put("age", "22") ; - List<DemoMp> poList = this.demoMpMapper.selectByMap(paramMap) ; - System.out.println(poList); - } - - @Test - public void selectByWrapperLt(){ - QueryWrapper<DemoMp> queryWrapper = new QueryWrapper<>(); - //QueryWrapper<DemoMp> queryWrapper = Wrappers.<DemoMp>query() ; - queryWrapper.like("name", "鍥�").lt("age", 40) ; - List<DemoMp> poList = this.demoMpMapper.selectList(queryWrapper) ; - poList.forEach(System.out::println); - } - - @Test - public void selectByWrapperBt(){ - QueryWrapper<DemoMp> queryWrapper = new QueryWrapper<>(); - //QueryWrapper<DemoMp> queryWrapper = Wrappers.<DemoMp>query() ; - queryWrapper.like("name", "鍥�") - .between("age", 20, 40) - .isNotNull("dt"); - List<DemoMp> poList = this.demoMpMapper.selectList(queryWrapper) ; - poList.forEach(System.out::println); - } - - @Test - public void selectByWrapperOr(){ - QueryWrapper<DemoMp> queryWrapper = new QueryWrapper<>(); - //QueryWrapper<DemoMp> queryWrapper = Wrappers.<DemoMp>query() ; - queryWrapper.like("name", "鍥�") - .or() - .between("age", 20, 40) - .isNotNull("dt") - .orderByAsc("id") - .orderByAsc("age"); - List<DemoMp> poList = this.demoMpMapper.selectList(queryWrapper) ; - poList.forEach(System.out::println); - } - - @Test - public void selectByWrapperOr1(){ - QueryWrapper<DemoMp> queryWrapper = new QueryWrapper<>(); - //QueryWrapper<DemoMp> queryWrapper = Wrappers.<DemoMp>query() ; - queryWrapper.likeLeft("name", "鍥�") - .and(wq->wq.between("age", 20, 40).or().isNotNull("dt")) - .orderByAsc("id") - .orderByAsc("age"); - List<DemoMp> poList = this.demoMpMapper.selectList(queryWrapper) ; - poList.forEach(System.out::println); - } - - @Test - public void selectByWrapperOr2(){ - QueryWrapper<DemoMp> queryWrapper = new QueryWrapper<>(); - //QueryWrapper<DemoMp> queryWrapper = Wrappers.<DemoMp>query() ; - queryWrapper.likeLeft("name", "鍥�") - .and(wq->wq.between("age", 20, 40).isNotNull("dt")) - .orderByAsc("id") - .orderByAsc("age"); - List<DemoMp> poList = this.demoMpMapper.selectList(queryWrapper) ; - poList.forEach(System.out::println); - } - - @Test - public void selectByWrapperOr3(){ - QueryWrapper<DemoMp> queryWrapper = new QueryWrapper<>(); - //QueryWrapper<DemoMp> queryWrapper = Wrappers.<DemoMp>query() ; - queryWrapper.likeLeft("name", "鍥�") - .or(wq->wq.lt("age", 100).gt("age", 10).isNotNull("dt")) - .orderByAsc("id") - .orderByAsc("age"); - List<DemoMp> poList = this.demoMpMapper.selectList(queryWrapper) ; - poList.forEach(System.out::println); - } - - @Test - public void selectByWrapperOr4(){ - QueryWrapper<DemoMp> queryWrapper = new QueryWrapper<>(); - //QueryWrapper<DemoMp> queryWrapper = Wrappers.<DemoMp>query() ; - queryWrapper.nested(wq->wq.lt("age", 50).or().isNotNull("dt")) - .likeLeft("name", "鍥�") - .orderByAsc("id") - .orderByAsc("age"); - List<DemoMp> poList = this.demoMpMapper.selectList(queryWrapper) ; - poList.forEach(System.out::println); - } - - - @Test - public void selectByWrapperAnd(){ - QueryWrapper<DemoMp> queryWrapper = new QueryWrapper<>(); - //QueryWrapper<DemoMp> queryWrapper = Wrappers.<DemoMp>query() ; - queryWrapper.likeLeft("name", "鍥�") - .and(wq->wq.between("age", 20, 40)) - .isNotNull("dt") - .orderByAsc("id") - .orderByAsc("age"); - List<DemoMp> poList = this.demoMpMapper.selectList(queryWrapper) ; - poList.forEach(System.out::println); - } - - - @Test - public void selectByWrapperIn(){ - QueryWrapper<DemoMp> queryWrapper = new QueryWrapper<>(); - //QueryWrapper<DemoMp> queryWrapper = Wrappers.<DemoMp>query() ; - queryWrapper.in("age", Arrays.asList(38, 45)) - .orderByAsc("id") - .orderByAsc("age"); - List<DemoMp> poList = this.demoMpMapper.selectList(queryWrapper) ; - poList.forEach(System.out::println); - } - - @Test - public void selectByWrapperLimit(){ - QueryWrapper<DemoMp> queryWrapper = new QueryWrapper<>(); - //QueryWrapper<DemoMp> queryWrapper = Wrappers.<DemoMp>query() ; - queryWrapper.in("age", Arrays.asList(38, 45)).last("limit 1") - .orderByAsc("id") - .orderByAsc("age"); - List<DemoMp> poList = this.demoMpMapper.selectList(queryWrapper) ; - poList.forEach(System.out::println); - } - - @Test - public void selectByWrapperLimitSupper(){ - QueryWrapper<DemoMp> queryWrapper = new QueryWrapper<>(); - //QueryWrapper<DemoMp> queryWrapper = Wrappers.<DemoMp>query() ; - queryWrapper.select("id", "name").in("age", Arrays.asList(38, 45)).last("limit 1") - .orderByAsc("id") - .orderByAsc("age"); - List<DemoMp> poList = this.demoMpMapper.selectList(queryWrapper) ; - poList.forEach(System.out::println); - } - -} diff --git a/pipIrr-platform/pipIrr-web/pom.xml b/pipIrr-platform/pipIrr-web/pom.xml index 2d260be..1f1dd86 100644 --- a/pipIrr-platform/pipIrr-web/pom.xml +++ b/pipIrr-platform/pipIrr-web/pom.xml @@ -19,7 +19,6 @@ <modules> <module>pipIrr-mwTest-web</module> - <module>pipIrr-web-demo</module> <module>pipIrr-web-sso</module> <module>pipIrr-web-base</module> <module>pipIrr-web-remote</module> -- Gitblit v1.8.0