From 0404678803838f95af7b34ab6723ee210b2a8706 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 27 十一月 2023 10:38:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'git-pipIrr/master'
---
/dev/null | 49 -----
pipIrr-platform/pipIrr-mw/pipIrr-mw.iml | 1
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaDivideMapper.java | 23 ++
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/divide/DivideCtrl.java | 214 +++++++++++++++++++++++
pipIrr-platform/文档/~$pIrr接口.docx | 0
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaDivide.java | 12 +
pipIrr-platform/pipIrr-web/pipIrr-web.iml | 1
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/divide/DivideVo.java | 27 +++
pipIrr-platform/pipIrr-global/pipIrr-global.iml | 1
pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaDivideMapper.xml | 72 +++++++
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/divide/DivideSv.java | 87 +++++++++
11 files changed, 437 insertions(+), 50 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/pipIrr-common.iml b/pipIrr-platform/pipIrr-common/pipIrr-common.iml
deleted file mode 100644
index dc8e3ef..0000000
--- a/pipIrr-platform/pipIrr-common/pipIrr-common.iml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
- <component name="FacetManager">
- <facet type="web" name="Web">
- <configuration>
- <webroots />
- <sourceRoots>
- <root url="file://$MODULE_DIR$/src/main/java" />
- <root url="file://$MODULE_DIR$/src/main/resources" />
- </sourceRoots>
- </configuration>
- </facet>
- <facet type="Spring" name="Spring">
- <configuration />
- </facet>
- </component>
- <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_16">
- <output url="file://$MODULE_DIR$/target/classes" />
- <output-test url="file://$MODULE_DIR$/target/test-classes" />
- <content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
- <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
- <excludeFolder url="file://$MODULE_DIR$/target" />
- </content>
- <orderEntry type="jdk" jdkName="20" jdkType="JavaSDK" />
- <orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:3.1.3" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:3.1.3" level="project" />
- <orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:2.1.1" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-core:6.0.11" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-jcl:6.0.11" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:3.1.3" level="project" />
- <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:10.1.12" level="project" />
- <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:10.1.12" level="project" />
- <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:10.1.12" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-web:6.0.11" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-beans:6.0.11" level="project" />
- <orderEntry type="library" name="Maven: io.micrometer:micrometer-observation:1.11.2" level="project" />
- <orderEntry type="library" name="Maven: io.micrometer:micrometer-commons:1.11.2" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:6.0.11" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-aop:6.0.11" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-context:6.0.11" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-expression:6.0.11" level="project" />
- <orderEntry type="library" scope="RUNTIME" name="Maven: org.springframework.boot:spring-boot-devtools:3.1.3" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:3.1.3" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:3.1.3" level="project" />
- <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.28" level="project" />
- <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.20" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-log4j2:3.1.3" level="project" />
- <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-slf4j2-impl:2.20.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.20.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-core:2.20.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-jul:2.20.0" level="project" />
- <orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.15.2" level="project" />
- <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.15.2" level="project" />
- <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.15.2" level="project" />
- <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.33" level="project" />
- <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.15.2" level="project" />
- <orderEntry type="library" name="Maven: org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0" level="project" />
- <orderEntry type="library" name="Maven: org.webjars:swagger-ui:5.2.0" level="project" />
- <orderEntry type="library" name="Maven: org.springdoc:springdoc-openapi-starter-webmvc-api:2.2.0" level="project" />
- <orderEntry type="library" name="Maven: org.springdoc:springdoc-openapi-starter-common:2.2.0" level="project" />
- <orderEntry type="library" name="Maven: io.swagger.core.v3:swagger-core-jakarta:2.2.15" level="project" />
- <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.12.0" level="project" />
- <orderEntry type="library" name="Maven: io.swagger.core.v3:swagger-annotations-jakarta:2.2.15" level="project" />
- <orderEntry type="library" name="Maven: io.swagger.core.v3:swagger-models-jakarta:2.2.15" level="project" />
- <orderEntry type="library" name="Maven: jakarta.xml.bind:jakarta.xml.bind-api:4.0.0" level="project" />
- <orderEntry type="library" name="Maven: jakarta.validation:jakarta.validation-api:3.0.2" level="project" />
- <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.15.2" level="project" />
- <orderEntry type="library" name="Maven: org.springdoc:springdoc-openapi-security:1.7.0" level="project" />
- <orderEntry type="library" name="Maven: org.springdoc:springdoc-openapi-common:1.7.0" level="project" />
- <orderEntry type="library" name="Maven: io.swagger.core.v3:swagger-core:2.2.9" level="project" />
- <orderEntry type="library" name="Maven: io.swagger.core.v3:swagger-annotations:2.2.9" level="project" />
- <orderEntry type="library" name="Maven: io.swagger.core.v3:swagger-models:2.2.9" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.security:spring-security-core:6.1.2" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.security:spring-security-crypto:6.1.2" level="project" />
- <orderEntry type="library" name="Maven: com.mysql:mysql-connector-j:8.0.33" level="project" />
- <orderEntry type="library" name="Maven: com.alibaba:druid-spring-boot-starter:1.2.20" level="project" />
- <orderEntry type="library" name="Maven: com.alibaba:druid:1.2.20" level="project" />
- <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:2.0.7" level="project" />
- <orderEntry type="library" name="Maven: org.glassfish.jaxb:jaxb-runtime:4.0.3" level="project" />
- <orderEntry type="library" name="Maven: org.glassfish.jaxb:jaxb-core:4.0.3" level="project" />
- <orderEntry type="library" name="Maven: jakarta.activation:jakarta.activation-api:2.1.2" level="project" />
- <orderEntry type="library" scope="RUNTIME" name="Maven: org.eclipse.angus:angus-activation:2.0.1" level="project" />
- <orderEntry type="library" name="Maven: org.glassfish.jaxb:txw2:4.0.3" level="project" />
- <orderEntry type="library" name="Maven: com.sun.istack:istack-commons-runtime:4.1.2" level="project" />
- <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.5.3.2" level="project" />
- <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:3.5.3.2" level="project" />
- <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-extension:3.5.3.2" level="project" />
- <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:3.5.3.2" level="project" />
- <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-annotation:3.5.3.2" level="project" />
- <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:4.6" level="project" />
- <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.13" level="project" />
- <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.1.1" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:3.1.3" level="project" />
- <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:5.0.1" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:6.0.11" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-tx:6.0.11" level="project" />
- <orderEntry type="library" name="Maven: com.alibaba.fastjson2:fastjson2:2.0.40" level="project" />
- <orderEntry type="library" name="Maven: com.alibaba.fastjson2:fastjson2-extension-spring6:2.0.40" level="project" />
- <orderEntry type="library" name="Maven: com.alibaba.fastjson2:fastjson2-extension:2.0.40" level="project" />
- <orderEntry type="library" name="Maven: org.jdom:jdom2:2.0.6.1" level="project" />
- <orderEntry type="library" name="Maven: org.apache.mina:mina-core:2.2.2" level="project" />
- <orderEntry type="library" name="Maven: org.quartz-scheduler:quartz:2.3.2" level="project" />
- <orderEntry type="library" name="Maven: com.mchange:mchange-commons-java:0.2.15" level="project" />
- <orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.8.21" level="project" />
- </component>
-</module>
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/pipIrr-global.iml b/pipIrr-platform/pipIrr-global/pipIrr-global.iml
index 016a445..286d8a0 100644
--- a/pipIrr-platform/pipIrr-global/pipIrr-global.iml
+++ b/pipIrr-platform/pipIrr-global/pipIrr-global.iml
@@ -26,6 +26,7 @@
<orderEntry type="jdk" jdkName="20" jdkType="JavaSDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="pipIrr-common" scope="PROVIDED" />
+ <orderEntry type="module" module-name="pipIrr-common" scope="PROVIDED" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-validation:3.1.3" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:3.1.3" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:3.1.3" level="project" />
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaDivideMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaDivideMapper.java
index b22af31..493b892 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaDivideMapper.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaDivideMapper.java
@@ -3,6 +3,9 @@
import com.dy.pipIrrGlobal.pojoBa.BaDivide;
import org.apache.ibatis.annotations.Mapper;
+import java.util.List;
+import java.util.Map;
+
@Mapper
public interface BaDivideMapper {
@@ -14,6 +17,26 @@
BaDivide selectByPrimaryKey(Long id);
/**
+ * 寰楀埌鍏ㄩ儴瀹炰綋
+ * @return 鍏ㄩ儴瀹炰綋
+ * */
+ List<BaDivide> selectAll();
+
+ /**
+ * 鏌ヨ鎬绘暟
+ * @param params 鏌ヨ鏉′欢
+ * @return 鎬绘暟
+ * */
+ Long selectTotal(Map<?,?> params);
+
+ /**
+ * 鍒嗛〉鏌ヨ涓�浜�
+ * @param params 鏌ヨ鏉′欢
+ * @return 瀹炰綋闆嗗悎
+ * */
+ List<BaDivide> selectSome(Map<?,?> params);
+
+ /**
* insert record to table
* @param record the record
* @return insert count
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaDivide.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaDivide.java
index d57e95e..50685b6 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaDivide.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaDivide.java
@@ -3,6 +3,7 @@
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;
@@ -122,4 +123,15 @@
@Schema(description = "鍒犻櫎鏍囪瘑锛岃〃鍗曚笉鐢ㄥ～鍐�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
public Byte deleted;
+ @TableField(exist = false)
+ @Schema(description = "鎵�鍦ㄧ墖鍖哄悕绉帮紝form琛ㄥ崟涓笉瀛樺湪锛屽彧鍦ㄦ煡璇㈡樉绀轰腑鏈夋晥")
+ public String blockName ;
+
+ @TableField(exist = false)
+ @Schema(description = "鎵�鍦ㄩ晣鍚嶇О锛宖orm琛ㄥ崟涓笉瀛樺湪锛屽彧鍦ㄦ煡璇㈡樉绀轰腑鏈夋晥")
+ public String townName ;
+
+ @TableField(exist = false)
+ @Schema(description = "鎵�鍦ㄦ潙鍚嶇О锛宖orm琛ㄥ崟涓笉瀛樺湪锛屽彧鍦ㄦ煡璇㈡樉绀轰腑鏈夋晥")
+ public String villageName ;
}
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaDivideMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaDivideMapper.xml
index 3aecb4f..89e644f 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaDivideMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaDivideMapper.xml
@@ -23,6 +23,13 @@
<!--@mbg.generated-->
id, `name`, countyId, townId, villageId, blockId, villages, area, `header`, phone,
lng, lat, remark, deleted
+ </sql> <sql id="Base2_Column_List">
+ <!--@mbg.generated-->
+ ${alias}.id, ${alias}.name, ${alias}.countyId, ${alias}.townId, ${alias}.villageId, ${alias}.blockId, ${alias}.villages, ${alias}.area, ${alias}.header, ${alias}.phone, ${alias}.lng, ${alias}.lat, ${alias}.remark
+ </sql>
+ <sql id="part_Column_List">
+ <!--@mbg.generated-->
+ id, `name`
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
<!--@mbg.generated-->
@@ -31,11 +38,74 @@
from ba_divide
where id = #{id,jdbcType=BIGINT}
</select>
+ <select id="selectAll" resultMap="BaseResultMap">
+ <!--@mbg.generated-->
+ select
+ <include refid="part_Column_List"/>
+ from ba_divide
+ </select>
+ <select id="selectTotal" parameterType="java.util.Map" resultType="java.lang.Long">
+ <!--@mbg.generated-->
+ select
+ count(*)
+ from ba_divide bd
+ left join ba_block bbk on bd.blockId = bbk.id
+ where bd.deleted != 1
+ <trim prefix="and" suffixOverrides="and">
+ <if test="name != null">
+ bd.name like concat('%', #{name}, '%') and
+ </if>
+ <if test="header != null">
+ bd.header = '#{header,jdbcType=VARCHAR}' and
+ </if>
+ <if test="phone != null">
+ bd.phone = '#{phone,jdbcType=VARCHAR}' and
+ </if>
+ <if test="blockName != null">
+ bbk.name like concat('%', #{blockName}, '%') and
+ </if>
+ </trim>
+ </select>
+ <select id="selectSome" parameterType="java.util.Map" resultMap="BaseResultMap">
+ <!--@mbg.generated-->
+ select
+ <include refid="Base2_Column_List" >
+ <property name="alias" value="bd"/>
+ </include>,
+ bbk.name blockName,
+ bdtt.name townName,
+ bdtv.name villageName
+ from ba_divide bd
+ left join ba_block bbk on bd.blockId = bbk.id
+ left join ba_district bdtt on bd.townId=bdtt.id
+ left join ba_district bdtv on bd.villageId=bdtv.id
+ where bd.deleted != 1
+ <trim prefix="and" suffixOverrides="and">
+ <if test="name != null">
+ bd.name like concat('%', #{name}, '%') and
+ </if>
+ <if test="header != null">
+ bd.header = '#{header,jdbcType=VARCHAR}' and
+ </if>
+ <if test="phone != null">
+ bd.phone = '#{phone,jdbcType=VARCHAR}' and
+ </if>
+ <if test="blockName != null">
+ bbk.name like concat('%', #{blockName}, '%') and
+ </if>
+ </trim>
+ order by bd.id DESC
+ <trim prefix="limit " >
+ <if test="start != null and count != null">
+ #{start}, #{count}
+ </if>
+ </trim>
+ </select>
<insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoBa.BaDivide">
<!--@mbg.generated-->
insert into ba_divide (id, `name`, countyId,
townId, villageId, blockId,
- villages, area, `header`,
+ villages, area, header,
phone, lng, lat, remark,
deleted)
values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{countyId,jdbcType=BIGINT},
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw.iml b/pipIrr-platform/pipIrr-mw/pipIrr-mw.iml
index 7054b2a..12810d8 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw.iml
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw.iml
@@ -9,6 +9,7 @@
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="pipIrr-common" scope="PROVIDED" />
+ <orderEntry type="module" module-name="pipIrr-common" scope="PROVIDED" />
<orderEntry type="module" module-name="pipIrr-global" scope="PROVIDED" />
<orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.28" level="project" />
<orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.20" level="project" />
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/pipIrr-mwTest-server.iml b/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/pipIrr-mwTest-server.iml
deleted file mode 100644
index 4267c35..0000000
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/pipIrr-mwTest-server.iml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
- <component name="FacetManager">
- <facet type="web" name="Web">
- <configuration>
- <webroots />
- <sourceRoots>
- <root url="file://$MODULE_DIR$/src/main/java" />
- <root url="file://$MODULE_DIR$/src/main/resources" />
- </sourceRoots>
- </configuration>
- </facet>
- </component>
- <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_16">
- <output url="file://$MODULE_DIR$/target/classes" />
- <output-test url="file://$MODULE_DIR$/target/test-classes" />
- <content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
- <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
- <excludeFolder url="file://$MODULE_DIR$/target" />
- </content>
- <orderEntry type="jdk" jdkName="20" jdkType="JavaSDK" />
- <orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="module" module-name="pipIrr-common" scope="PROVIDED" />
- <orderEntry type="module" module-name="pipIrr-global" scope="PROVIDED" />
- <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.28" level="project" />
- <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.20" level="project" />
- <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:2.0.7" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-log4j2:3.1.3" level="project" />
- <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-slf4j2-impl:2.20.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.20.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-core:2.20.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-jul:2.20.0" level="project" />
- <orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.15.2" level="project" />
- <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.33" level="project" />
- <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.15.2" level="project" />
- <orderEntry type="library" name="Maven: com.alibaba.fastjson2:fastjson2:2.0.40" level="project" />
- <orderEntry type="library" name="Maven: com.alibaba.fastjson2:fastjson2-extension-spring6:2.0.40" level="project" />
- <orderEntry type="library" name="Maven: com.alibaba.fastjson2:fastjson2-extension:2.0.40" level="project" />
- <orderEntry type="library" name="Maven: org.mapstruct:mapstruct:1.5.5.Final" level="project" />
- <orderEntry type="library" name="Maven: org.mapstruct:mapstruct-processor:1.5.5.Final" level="project" />
- <orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.8.21" level="project" />
- <orderEntry type="library" name="Maven: org.jdom:jdom2:2.0.6.1" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.13.2" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:2.2" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest:2.2" level="project" />
- </component>
-</module>
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/divide/DivideCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/divide/DivideCtrl.java
new file mode 100644
index 0000000..c2ff506
--- /dev/null
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/divide/DivideCtrl.java
@@ -0,0 +1,214 @@
+package com.dy.pipIrrBase.divide;
+
+import com.dy.common.aop.SsoAop;
+import com.dy.common.webUtil.BaseResponse;
+import com.dy.common.webUtil.BaseResponseUtils;
+import com.dy.common.webUtil.QueryResultVo;
+import com.dy.common.webUtil.ResultCodeMsg;
+import com.dy.pipIrrGlobal.pojoBa.BaDivide;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+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 jakarta.validation.Valid;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Objects;
+
+@Slf4j
+@Tag(name = "鍒嗘按鍙ｇ鐞�", description = "鍒嗘按鍙ｅ鍒犳敼鏌ョ瓑鎿嶄綔")
+@RestController
+@RequestMapping(path = "divide")
+@SuppressWarnings("unchecked")
+//java鐗堟湰瓒婇珮锛屽娉涘瀷绾︽潫瓒婁弗锛屾墍浠ラ厤缃甋uppressWarnings("unchecked")
+public class DivideCtrl {
+
+ private DivideSv sv;
+
+ @Autowired
+ private void setSv(DivideSv sv) { this.sv = sv; }
+
+ /**
+ * 瀹㈡埛绔姹傚緱鍒版墍鏈夊垎姘村彛鍚嶅瓧
+ * @return 鎵�鏈夊垎姘村彛鍚嶅瓧
+ */
+ @Operation(summary = "鑾峰緱鍏ㄩ儴鍒嗘按鍙�", description = "杩斿洖鍏ㄩ儴鍒嗘按鍙ｆ暟鎹�")
+ @ApiResponses(value = {
+ @ApiResponse(
+ responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE,
+ description = "杩斿洖鍏ㄩ儴鍒嗘按鍙ｆ暟鎹紙BaseResponse.content:QueryResultVo[{}]锛�",
+ content = {@Content(mediaType = MediaType.APPLICATION_JSON_VALUE,
+ schema = @Schema(implementation = BaDivide.class))}
+ )
+ })
+ @GetMapping(path = "all")
+ @SsoAop("-1")
+ public BaseResponse<QueryResultVo<List<BaDivide>>> all(){
+ try {
+ QueryResultVo<List<BaDivide>> res = this.sv.selectAll() ;
+ return BaseResponseUtils.buildSuccess(res);
+ } catch (Exception e) {
+ log.error("鏌ヨ鍒嗘按鍙ｅ紓甯�", e);
+ return BaseResponseUtils.buildException(e.getMessage()) ;
+ }
+ }
+
+ /**
+ * 寰楀埌涓�涓垎姘村彛鏁版嵁
+ * @return 涓�涓垎姘村彛鏁版嵁
+ */
+ @Operation(summary = "涓�涓垎姘村彛", description = "寰楀埌涓�涓垎姘村彛鏁版嵁")
+ @ApiResponses(value = {
+ @ApiResponse(
+ responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE,
+ description = "杩斿洖涓�涓垎姘村彛鏁版嵁锛圔aseResponse.content:{}锛�",
+ content = {@Content(mediaType = MediaType.APPLICATION_JSON_VALUE,
+ schema = @Schema(implementation = BaDivide.class))}
+ )
+ })
+ @GetMapping(path = "one", consumes = MediaType.TEXT_PLAIN_VALUE)
+ @SsoAop("-1")
+ public BaseResponse<BaDivide> one(@Parameter(description = "瀹炰綋id", required = true) Long id){
+ return BaseResponseUtils.buildSuccess(this.sv.selectById(id));
+ }
+ /**
+ * 瀹㈡埛绔姹傚緱鍒颁竴浜涘垎姘村彛鏁版嵁
+ * @return 涓�浜涘垎姘村彛鏁版嵁
+ */
+ @Operation(summary = "鑾峰緱涓�浜涘垎姘村彛", description = "杩斿洖涓�浜涘垎椤靛垎姘村彛鏁版嵁")
+ @ApiResponses(value = {
+ @ApiResponse(
+ responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE,
+ description = "杩斿洖涓�浜涘垎姘村彛鏁版嵁锛圔aseResponse.content:QueryResultVo[{}]锛�",
+ content = {@Content(mediaType = MediaType.APPLICATION_JSON_VALUE,
+ schema = @Schema(implementation = BaDivide.class))}
+ )
+ })
+ @PostMapping(path = "some", consumes = MediaType.APPLICATION_JSON_VALUE)
+ @SsoAop("-1")
+ public BaseResponse<QueryResultVo<List<BaDivide>>> some(@RequestBody @Parameter(description = "鏌ヨform琛ㄥ崟json鏁版嵁", required = true) DivideVo vo){
+ try {
+ QueryResultVo<List<BaDivide>> res = this.sv.selectSome(vo) ;
+ return BaseResponseUtils.buildSuccess(res);
+ } catch (Exception e) {
+ log.error("鏌ヨ鍒嗘按鍙ｅ紓甯�", e);
+ return BaseResponseUtils.buildException(e.getMessage()) ;
+ }
+ }
+
+ /**
+ * 鏂板淇濆瓨鍒嗘按鍙�
+ * @param po 鏂板淇濆瓨鍒嗘按鍙orm琛ㄥ崟瀵硅薄
+ * @return 鏄惁鎴愬姛
+ */
+ @Operation(summary = "淇濆瓨鍒嗘按鍙�", description = "鎻愪氦鍒嗘按鍙ｆ暟鎹紙form琛ㄥ崟锛夛紝杩涜淇濆瓨")
+ @ApiResponses(value = {
+ @ApiResponse(
+ responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE,
+ description = "鎿嶄綔缁撴灉锛歵rue锛氭垚鍔燂紝false锛氬け璐ワ紙BaseResponse.content锛�",
+ content = {@Content(mediaType = MediaType.APPLICATION_JSON_VALUE,
+ schema = @Schema(implementation = Boolean.class))}
+ )
+ })
+ @PostMapping(path = "save", consumes = MediaType.APPLICATION_JSON_VALUE)
+ @SsoAop("-1")//@SsoAop(power = "-1")
+ public BaseResponse<Boolean> save(@RequestBody @Parameter(description = "form琛ㄥ崟json鏁版嵁", required = true) @Valid BaDivide po, @Parameter(hidden = true) BindingResult bindingResult){
+ if(bindingResult != null && bindingResult.hasErrors()){
+ return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
+ }
+ po.id = null ;
+ int count;
+ try {
+ count = this.sv.save(po);
+ } catch (Exception e) {
+ log.error("淇濆瓨鍒嗘按鍙ｅ紓甯�", e);
+ return BaseResponseUtils.buildException(e.getMessage()) ;
+ }
+ if(count <= 0){
+ return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�") ;
+ }else{
+ return BaseResponseUtils.buildSuccess(true) ;
+ }
+ }
+ /**
+ * 缂栬緫淇敼鍒嗘按鍙�
+ * @param po 淇濆瓨鍒嗘按鍙orm琛ㄥ崟瀵硅薄
+ * @return 鏄惁鎴愬姛
+ */
+ @Operation(summary = "缂栬緫淇敼鐗囧尯", description = "鎻愪氦鐗囧尯鏁版嵁锛坒orm琛ㄥ崟锛夛紝杩涜淇敼")
+ @ApiResponses(value = {
+ @ApiResponse(
+ responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE,
+ description = "鎿嶄綔缁撴灉锛歵rue锛氭垚鍔燂紝false锛氬け璐ワ紙BaseResponse.content锛�",
+ content = {@Content(mediaType = MediaType.APPLICATION_JSON_VALUE,
+ schema = @Schema(implementation = Boolean.class))}
+ )
+ })
+ @PostMapping(path = "update", consumes = MediaType.APPLICATION_JSON_VALUE)
+ @SsoAop("-1")//@SsoAop(power = "-1")
+ public BaseResponse<Boolean> update(@RequestBody @Parameter(description = "form琛ㄥ崟json鏁版嵁", required = true) @Valid BaDivide po, @Parameter(hidden = true) BindingResult bindingResult){
+ if(bindingResult != null && bindingResult.hasErrors()){
+ return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
+ }
+ if(po.id == null){
+ return BaseResponseUtils.buildFail("鏃犳暟鎹疄浣揑D") ;
+ }
+ int count;
+ try {
+ count = this.sv.update(po);
+ } catch (Exception e) {
+ log.error("淇濆瓨鍒嗘按鍙ｅ紓甯�", e);
+ return BaseResponseUtils.buildException(e.getMessage()) ;
+ }
+ if(count <= 0){
+ return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�") ;
+ }else{
+ return BaseResponseUtils.buildSuccess(true) ;
+ }
+ }
+
+
+ /**
+ * 鍒犻櫎鍒嗘按鍙�
+ * @param id 鍒嗘按鍙D
+ * @return 鏄惁鎴愬姛
+ */
+ @Operation(summary = "鍒犻櫎鍒嗘按鍙�", description = "鎻愪氦鍒嗘按鍙D锛岃繘琛岄�昏緫鍒犻櫎")
+ @ApiResponses(value = {
+ @ApiResponse(
+ responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE,
+ description = "鎿嶄綔缁撴灉锛歵rue锛氭垚鍔燂紝false锛氬け璐ワ紙BaseResponse.content锛�",
+ content = {@Content(mediaType = MediaType.APPLICATION_JSON_VALUE,
+ schema = @Schema(implementation = Boolean.class))}
+ )
+ })
+ @GetMapping(path = "delete", consumes = MediaType.TEXT_PLAIN_VALUE)
+ @SsoAop("-1")//@SsoAop(power = "-1")
+ public BaseResponse<Boolean> delete(@Parameter(description = "瀹炰綋id", required = true) Long id){
+ if(id == null){
+ return BaseResponseUtils.buildFail("id涓嶈兘涓虹┖") ;
+ }
+ int count;
+ try {
+ count = this.sv.delete(id);
+ } catch (Exception e) {
+ log.error("淇濆瓨鍒嗘按鍙ｅ紓甯�", e);
+ return BaseResponseUtils.buildException(e.getMessage()) ;
+ }
+ if(count <= 0){
+ return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�") ;
+ }else{
+ return BaseResponseUtils.buildSuccess(true) ;
+ }
+ }
+}
+
+
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/divide/DivideSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/divide/DivideSv.java
new file mode 100644
index 0000000..01e4f65
--- /dev/null
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/divide/DivideSv.java
@@ -0,0 +1,87 @@
+package com.dy.pipIrrBase.divide;
+
+import com.dy.common.webUtil.QueryResultVo;
+import com.dy.pipIrrGlobal.daoBa.BaDivideMapper;
+import com.dy.pipIrrGlobal.pojoBa.BaDivide;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.dubbo.common.utils.PojoUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+import java.util.Map;
+
+@Slf4j
+@Service
+public class DivideSv {
+
+ private BaDivideMapper dao;
+
+ @Autowired
+ private void setDao(BaDivideMapper dao) { this.dao = dao; }
+
+ /**
+ * 寰楀埌鎵�鏈夊垎姘村彛
+ * @return 鎵�鏈夊垎姘村彛闆嗗悎
+ */
+ public QueryResultVo<List<BaDivide>> selectAll(){
+ QueryResultVo<List<BaDivide>> rsVo = new QueryResultVo<>() ;
+ rsVo.obj = this.dao.selectAll() ;
+ return rsVo ;
+ }
+ /**
+ * 寰楀埌涓�涓垎姘村彛
+ * @param id 鍒嗘按鍙D
+ * @return 鍒嗘按鍙ｅ疄浣�
+ */
+ public BaDivide selectById(Long id){
+ return this.dao.selectByPrimaryKey(id) ;
+ }
+ /**
+ * 寰楀埌涓�浜涘垎姘村彛
+ * @param vo 鏌ヨ鏉′欢鍊煎璞�
+ * @return 鍒嗘按鍙ｅ疄浣�
+ */
+ @SuppressWarnings("unchecked")
+ public QueryResultVo<List<BaDivide>> selectSome(DivideVo vo){
+ Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(vo) ;
+ Long itemTotal = this.dao.selectTotal(params) ;
+
+ QueryResultVo<List<BaDivide>> rsVo = new QueryResultVo<>() ;
+ rsVo.pageSize = vo.pageSize ;
+ rsVo.pageCurr = vo.pageCurr ;
+ rsVo.calculateAndSet(itemTotal, params);
+ rsVo.obj = this.dao.selectSome(params) ;
+
+ return rsVo ;
+ }
+ /**
+ * 鏂板淇濆瓨鍒嗘按鍙ｅ疄浣�
+ * @param po 瀹炰綋
+ * @return 鏁伴噺
+ */
+ @Transactional
+ public int save(BaDivide po){
+ return this.dao.insertSelective(po) ;
+ }
+ /**
+ * 淇濆瓨淇敼瀹炰綋
+ * @param po 瀹炰綋
+ * @return 鏁伴噺
+ */
+ @Transactional
+ public int update(BaDivide po){
+ return this.dao.updateByPrimaryKeySelective(po) ;
+ }
+
+ /**
+ * 閫昏緫鍒犻櫎瀹炰綋
+ * @param id 瀹炰綋ID
+ * @return 鏁伴噺
+ */
+ @Transactional
+ public int delete(Long id){
+ return this.dao.deleteLogicById(id) ;
+ }
+}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/divide/DivideVo.java b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/divide/DivideVo.java
new file mode 100644
index 0000000..e815bfb
--- /dev/null
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/divide/DivideVo.java
@@ -0,0 +1,27 @@
+package com.dy.pipIrrBase.divide;
+
+import com.dy.common.webUtil.QueryConditionVo;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@ToString(callSuper = true)
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+@Schema(name = "鍒嗘按鍙ｆ煡璇㈡潯浠�")
+public class DivideVo extends QueryConditionVo {
+
+ @Schema(description = "鍒嗘按鍙ｅ悕绉�")
+ public String name;
+
+ @Schema(description = "鎵�灞炵墖鍖�")
+ public String blockName;
+
+ @Schema(description = "璐熻矗浜�")
+ public String header;
+
+ @Schema(description = "璐熻矗浜虹數璇�")
+ public String phone;
+}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web.iml b/pipIrr-platform/pipIrr-web/pipIrr-web.iml
index c70d370..f075f0e 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web.iml
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web.iml
@@ -23,6 +23,7 @@
<orderEntry type="jdk" jdkName="20" jdkType="JavaSDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="pipIrr-common" />
+ <orderEntry type="module" module-name="pipIrr-common" />
<orderEntry type="library" name="Maven: org.apache.mina:mina-core:2.2.2" level="project" />
<orderEntry type="library" name="Maven: org.quartz-scheduler:quartz:2.3.2" level="project" />
<orderEntry type="library" name="Maven: com.mchange:mchange-commons-java:0.2.15" level="project" />
diff --git "a/pipIrr-platform/\346\226\207\346\241\243/~$pIrr\346\216\245\345\217\243.docx" "b/pipIrr-platform/\346\226\207\346\241\243/~$pIrr\346\216\245\345\217\243.docx"
new file mode 100644
index 0000000..3e3ec77
--- /dev/null
+++ "b/pipIrr-platform/\346\226\207\346\241\243/~$pIrr\346\216\245\345\217\243.docx"
Binary files differ
--
Gitblit v1.8.0