水泵添加 onoff

generated/com/miniframe/generate/comm/system/A_D20002.java

@@ -61,28 +61,28 @@ public class A_D20002 extends BaseMapModel implements Serializable {
 	public double getSite() {
 		return this.site;
 	}
-	double openhig;//位置
+	double openhig;//开启高度
 	/**
-	 *位置
+	 *开启高度
 	 */
 	public void setOpenhig(double openhig) {
 		this.openhig=openhig;
 	}
 	/**
-	 *位置
+	 *开启高度
 	 */
 	public double getOpenhig() {
 		return this.openhig;
 	}
-	double closehig;//位置
+	double closehig;//关闭高度
 	/**
-	 *位置
+	 *关闭高度
 	 */
 	public void setClosehig(double closehig) {
 		this.closehig=closehig;
 	}
 	/**
-	 *位置
+	 *关闭高度
 	 */
 	public double getClosehig() {
 		return this.closehig;
@@ -100,4 +100,17 @@ public class A_D20002 extends BaseMapModel implements Serializable {
 	public int getAid() {
 		return this.aid;
 	}
+	int onoff;//开关0-关1-开
+	/**
+	 *开关0-关1-开
+	 */
+	public void setOnoff(int onoff) {
+		this.onoff=onoff;
+	}
+	/**
+	 *开关0-关1-开
+	 */
+	public int getOnoff() {
+		return this.onoff;
+	}
 }

generated/com/miniframe/generate/comm/system/D_D20001_ROWS_RECODE.java

@@ -87,28 +87,28 @@ public class D_D20001_ROWS_RECODE extends BaseMapModel implements Serializable {
 	public double getSite() {
 		return this.site;
 	}
-	double openhig;//位置
+	double openhig;//开启高度
 	/**
-	 *位置
+	 *开启高度
 	 */
 	public void setOpenhig(double openhig) {
 		this.openhig=openhig;
 	}
 	/**
-	 *位置
+	 *开启高度
 	 */
 	public double getOpenhig() {
 		return this.openhig;
 	}
-	double closehig;//位置
+	double closehig;//关闭高度
 	/**
-	 *位置
+	 *关闭高度
 	 */
 	public void setClosehig(double closehig) {
 		this.closehig=closehig;
 	}
 	/**
-	 *位置
+	 *关闭高度
 	 */
 	public double getClosehig() {
 		return this.closehig;
@@ -126,4 +126,17 @@ public class D_D20001_ROWS_RECODE extends BaseMapModel implements Serializable {
 	public int getAid() {
 		return this.aid;
 	}
+	int onoff;//开关0-关1-开
+	/**
+	 *开关0-关1-开
+	 */
+	public void setOnoff(int onoff) {
+		this.onoff=onoff;
+	}
+	/**
+	 *开关0-关1-开
+	 */
+	public int getOnoff() {
+		return this.onoff;
+	}
 }

generated/validateform/a_d20002Form.xml

@@ -32,6 +32,9 @@
 <field property="aid" depends="required">
     <arg0 key="a_d20002.aid"/>
 </field>
+<field property="onoff" depends="required">
+    <arg0 key="a_d20002.onoff"/>
+</field>
 </form>
 </formset>
 </form-validation>

generated/validator/resources_a_d20002Form_validator.properties

@@ -2,7 +2,8 @@ a_d20002.pumpid = \u6C34\u6CF5id
 a_d20002.pid = \u7BA1\u9053ID
 a_d20002.pumpname = \u6C34\u6CF5\u540D\u79F0
 a_d20002.site = \u4F4D\u7F6E
-a_d20002.openhig = \u4F4D\u7F6E
-a_d20002.closehig = \u4F4D\u7F6E
+a_d20002.openhig = \u5F00\u542F\u9AD8\u5EA6
+a_d20002.closehig = \u5173\u95ED\u9AD8\u5EA6
 a_d20002.aid = \u4E8B\u6545id
+a_d20002.onoff = \u5F00\u51730-\u51731-\u5F00
 a_d20002Form = true

generated/validator/resources_a_d20002Form_validator_zh_CN.properties

@@ -2,7 +2,8 @@ a_d20002.pumpid = \u6C34\u6CF5id
 a_d20002.pid = \u7BA1\u9053ID
 a_d20002.pumpname = \u6C34\u6CF5\u540D\u79F0
 a_d20002.site = \u4F4D\u7F6E
-a_d20002.openhig = \u4F4D\u7F6E
-a_d20002.closehig = \u4F4D\u7F6E
+a_d20002.openhig = \u5F00\u542F\u9AD8\u5EA6
+a_d20002.closehig = \u5173\u95ED\u9AD8\u5EA6
 a_d20002.aid = \u4E8B\u6545id
+a_d20002.onoff = \u5F00\u51730-\u51731-\u5F00
 a_d20002Form = true

generated/validator/resources_d_d20001_rows_recodeForm_validator.properties

@@ -4,7 +4,8 @@ d_d20001_rows_recode.pname = \u7BA1\u9053\u540D\u79F0
 d_d20001_rows_recode.pcode = \u7BA1\u9053\u7F16\u53F7
 d_d20001_rows_recode.pumpname = \u6C34\u6CF5\u540D\u79F0
 d_d20001_rows_recode.site = \u4F4D\u7F6E
-d_d20001_rows_recode.openhig = \u4F4D\u7F6E
-d_d20001_rows_recode.closehig = \u4F4D\u7F6E
+d_d20001_rows_recode.openhig = \u5F00\u542F\u9AD8\u5EA6
+d_d20001_rows_recode.closehig = \u5173\u95ED\u9AD8\u5EA6
 d_d20001_rows_recode.aid = \u4E8B\u6545id
+d_d20001_rows_recode.onoff = \u5F00\u51730-\u51731-\u5F00
 d_d20001_rows_recodeForm = true

generated/validator/resources_d_d20001_rows_recodeForm_validator_zh_CN.properties

@@ -4,7 +4,8 @@ d_d20001_rows_recode.pname = \u7BA1\u9053\u540D\u79F0
 d_d20001_rows_recode.pcode = \u7BA1\u9053\u7F16\u53F7
 d_d20001_rows_recode.pumpname = \u6C34\u6CF5\u540D\u79F0
 d_d20001_rows_recode.site = \u4F4D\u7F6E
-d_d20001_rows_recode.openhig = \u4F4D\u7F6E
-d_d20001_rows_recode.closehig = \u4F4D\u7F6E
+d_d20001_rows_recode.openhig = \u5F00\u542F\u9AD8\u5EA6
+d_d20001_rows_recode.closehig = \u5173\u95ED\u9AD8\u5EA6
 d_d20001_rows_recode.aid = \u4E8B\u6545id
+d_d20001_rows_recode.onoff = \u5F00\u51730-\u51731-\u5F00
 d_d20001_rows_recodeForm = true

modelsrc/com/miniframe/model/system/DPump.java

@@ -49,6 +49,11 @@ public class DPump extends MiniserviceBaseModel implements Serializable {
      */
     private Float closehig;
 
+    /**
+     * 开关（0-关、1-开）
+     */
+    private Integer onoff;
+
     private static final long serialVersionUID = 1L;
 
     /**
@@ -208,4 +213,22 @@ public class DPump extends MiniserviceBaseModel implements Serializable {
     public void setClosehig(Float closehig) {
         this.closehig = closehig;
     }
+
+    /**
+     * 获取开关（0-关、1-开）
+     *
+     * @return onoff - 开关（0-关、1-开）
+     */
+    public Integer getOnoff() {
+        return onoff;
+    }
+
+    /**
+     * 设置开关（0-关、1-开）
+     *
+     * @param onoff 开关（0-关、1-开）
+     */
+    public void setOnoff(Integer onoff) {
+        this.onoff = onoff;
+    }
 }

modelsrc/com/miniframe/model/system/DPumpSQLBuilder.java

@@ -673,6 +673,66 @@ public class DPumpSQLBuilder {
             addCriterion("closehig not between", value1, value2, "closehig");
             return (Criteria) this;
         }
+
+        public Criteria andOnoffIsNull() {
+            addCriterion("onoff is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOnoffIsNotNull() {
+            addCriterion("onoff is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOnoffEqualTo(Integer value) {
+            addCriterion("onoff =", value, "onoff");
+            return (Criteria) this;
+        }
+
+        public Criteria andOnoffNotEqualTo(Integer value) {
+            addCriterion("onoff <>", value, "onoff");
+            return (Criteria) this;
+        }
+
+        public Criteria andOnoffGreaterThan(Integer value) {
+            addCriterion("onoff >", value, "onoff");
+            return (Criteria) this;
+        }
+
+        public Criteria andOnoffGreaterThanOrEqualTo(Integer value) {
+            addCriterion("onoff >=", value, "onoff");
+            return (Criteria) this;
+        }
+
+        public Criteria andOnoffLessThan(Integer value) {
+            addCriterion("onoff <", value, "onoff");
+            return (Criteria) this;
+        }
+
+        public Criteria andOnoffLessThanOrEqualTo(Integer value) {
+            addCriterion("onoff <=", value, "onoff");
+            return (Criteria) this;
+        }
+
+        public Criteria andOnoffIn(List<Integer> values) {
+            addCriterion("onoff in", values, "onoff");
+            return (Criteria) this;
+        }
+
+        public Criteria andOnoffNotIn(List<Integer> values) {
+            addCriterion("onoff not in", values, "onoff");
+            return (Criteria) this;
+        }
+
+        public Criteria andOnoffBetween(Integer value1, Integer value2) {
+            addCriterion("onoff between", value1, value2, "onoff");
+            return (Criteria) this;
+        }
+
+        public Criteria andOnoffNotBetween(Integer value1, Integer value2) {
+            addCriterion("onoff not between", value1, value2, "onoff");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

modelsrc/com/miniframe/model/system/dbconfig/MapperConfig-system.xml

@@ -5,7 +5,7 @@
     This file is generated by MyBatis Generator.
     This file is the shell of a Mapper Config file - in many cases you will need to add
       to this file before it is usable by MyBatis.
-    This file was generated on Tue Dec 10 16:29:23 CST 2024.
+    This file was generated on Wed Dec 11 14:02:06 CST 2024.
   -->
   <mappers>
     <mapper resource="com/miniframe/model/system/xml/SysAppcodeMapper.xml" />

pom.xml

@@ -10,7 +10,7 @@
     </parent>
     <groupId>com.miniframe</groupId>
     <artifactId>miniframe</artifactId>
-    <version>1.0.0</version>
+    <version>2.0.0</version>
     <name>miniframe</name>
     <description>miniframe</description>
 
@@ -25,8 +25,6 @@
 
         <spring-cloud.version>2020.0.4</spring-cloud.version>
 
-
-
     </properties>
 
     <dependencies>
@@ -43,14 +41,15 @@
                     <groupId>org.springframework.cloud</groupId>
                     <artifactId>spring-cloud-starter-netflix-ribbon</artifactId>
                 </exclusion>
+
             </exclusions>
         </dependency>
 
-        <dependency>
-            <groupId>com.taobao</groupId>
-            <artifactId>taobao-sdk-java-auto</artifactId>
-            <version>1.0.0</version>
-        </dependency>
+        <!--        <dependency>-->
+        <!--            <groupId>com.taobao</groupId>-->
+        <!--            <artifactId>taobao-sdk-java-auto</artifactId>-->
+        <!--            <version>1.0.0</version>-->
+        <!--        </dependency>-->
 
         <dependency>
             <groupId>org.springframework.cloud</groupId>
@@ -154,6 +153,12 @@
             <groupId>com.miniframe</groupId>
             <artifactId>miniframe-spring-boot-starter</artifactId>
             <version>2.1.0</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>poi</artifactId>
+                    <groupId>org.apache.poi</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
@@ -281,6 +286,31 @@
             <version>2.3.29</version>
         </dependency>
 
+
+        <!--报告生成-->
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-core</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi</artifactId>
+            <version>5.2.2</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi-ooxml</artifactId>
+            <version>5.2.2</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>poi</artifactId>
+                    <groupId>org.apache.poi</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
     </dependencies>
 
     <dependencyManagement>
@@ -292,11 +322,6 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
-
-
-
-
-
         </dependencies>
     </dependencyManagement>
 

src/main/java/com/miniframe/bisiness/system/D20001Service.java

@@ -45,6 +45,7 @@ public class D20001Service extends D20001BaseModel implements ExecProcessFlow {
 			row.setPumpid(p.getId());
 			row.setPumpname(p.getName());
 			row.setSite(CommonUtils.floatTodobule(p.getSite()));
+			row.setOnoff(p.getOnoff());
 			rows.add(row);
 		}
 		this.getD_d20001().setRows(rows);

src/main/java/com/miniframe/bisiness/system/D20002Service.java

@@ -28,6 +28,7 @@ public class D20002Service extends D20002BaseModel implements ExecProcessFlow {
 		Double openhig =this.getA_d20002().getOpenhig();
 		Double closehig =this.getA_d20002().getClosehig();
 		Integer aid =this.getA_d20002().getAid();
+		Integer onoff =this.getA_d20002().getOnoff();
 
 		DPipeMapper pipDao =UtilTools.getBean(DPipeMapper.class);
 		DPipe pipe = pipDao.selectByPrimaryKey(pid);
@@ -45,6 +46,7 @@ public class D20002Service extends D20002BaseModel implements ExecProcessFlow {
 			p.setOpenhig(openhig.floatValue());
 			p.setName(pumpname);
 			p.setSite(site.floatValue());
+			p.setOnoff(onoff);
 			pumpDao.insertSelective(p);
 		}else{//修改
 			DPump p =pumpDao.selectByPrimaryKey(pumpid);
@@ -59,6 +61,7 @@ public class D20002Service extends D20002BaseModel implements ExecProcessFlow {
 			p.setOpenhig(openhig.floatValue());
 			p.setName(pumpname);
 			p.setSite(site.floatValue());
+			p.setOnoff(onoff);
 			pumpDao.updateByPrimaryKey(p);
 		}
 

src/test/java/com/miniframe/wordTemplte.java

@@ -0,0 +1,61 @@
+package com.miniframe;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+
+import com.deepoove.poi.XWPFTemplate;
+import com.deepoove.poi.data.Charts;
+import com.deepoove.poi.data.Pictures;
+
+
+public class wordTemplte {
+    public static void main(String[] args) throws Exception {
+        testAnimal();
+    }
+
+    public static void testAnimal() throws Exception {
+
+        Map<String, Object> elephant = new HashMap<String, Object>() {
+            {
+                put("name", "大象");
+                put("chart",
+                        Charts.ofMultiSeries("大象生存现状", new String[] { "2018年", "2019年", "2020年" })
+                                .addSeries("成年象", new Integer[] { 500, 600, 700 })
+                                .addSeries("幼象", new Integer[] { 200, 300, 400 })
+                                .addSeries("全部", new Integer[] { 700, 900, 1100 })
+                                .create());
+
+            }
+        };
+        Map<String, Object> giraffe = new HashMap<String, Object>() {
+            {
+                put("name", "长颈鹿");
+                put("picture", Pictures.ofLocal("src/test/resources/lu.png").size(100, 120).create());
+                put("chart",
+                        Charts.ofMultiSeries("长颈鹿生存现状", new String[] { "2018年", "2019年", "2020年" })
+                                .addSeries("成年鹿", new Integer[] { 500, 600, 700 })
+                                .addSeries("幼鹿", new Integer[] { 200, 300, 400 })
+                                .create());
+
+            }
+        };
+        List<Map<String, Object>> animals = Arrays.asList(elephant, giraffe);
+        XWPFTemplate.compile("src/test/resources/animal/animal.docx").render(new HashMap<String, Object>() {
+            {
+                put("animals", animals);
+            }
+        }).writeToFile("target/out_example_animal.docx");
+
+//        XWPFTemplate.compile("D://pname.docx").render(new HashMap<String, Object>() {
+//            {
+//                put("pname", "sdf");
+//            }
+//        }).writeToFile("D:///out_example_animal.docx");
+    }
+
+}

系统设计/通信设计/通讯报文/system(系统服务)/报文体/D20001_D(水泵查询).csv

@@ -8,4 +8,5 @@
 1.6,site,位置,double,,,,,,,,,,,
 1.7,openhig,开启高度,double,,,,,,,,,,,
 1.8,closehig,关闭高度,double,,,,,,,,,,,
-1.9,aid,事故id,int,,,,,,,,,,,
+1.9,aid,事故id,int,,,,,,,,,,,
+1.10,onoff,开关0-关1-开,int,,,,,,,,,,,

系统设计/通信设计/通讯报文/system(系统服务)/报文体/D20002_A(水泵添加修改).csv

@@ -5,4 +5,5 @@
 4,site,位置,double,,,是,,,,,,,,
 5,openhig,开启高度,double,,,是,,,,,,,,
 6,closehig,关闭高度,double,,,是,,,,,,,,
-7,aid,事故id,int,,,是,,,,,,,,
+7,aid,事故id,int,,,是,,,,,,,,
+8,onoff,开关0-关1-开,int,,0,是,,,,,,,,