V1

project-web2/.idea/.gitignore

@@ -0,0 +1,8 @@
+# 默认忽略的文件
+/shelf/
+/workspace.xml
+# 基于编辑器的 HTTP 客户端请求
+/httpRequests/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml

project-web2/.idea/dataSources.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="DataSourceManagerImpl" format="xml" multifile-model="true">
+    <data-source source="LOCAL" name="postgres@192.168.248.128" uuid="4a06af14-2f0e-48ff-84fa-41c6193a4c5c">
+      <driver-ref>postgresql</driver-ref>
+      <synchronize>true</synchronize>
+      <jdbc-driver>org.postgresql.Driver</jdbc-driver>
+      <jdbc-url>jdbc:postgresql://192.168.248.128:5432/postgres</jdbc-url>
+      <jdbc-additional-properties>
+        <property name="com.intellij.clouds.kubernetes.db.host.port" />
+        <property name="com.intellij.clouds.kubernetes.db.enabled" value="false" />
+        <property name="com.intellij.clouds.kubernetes.db.container.port" />
+      </jdbc-additional-properties>
+      <working-dir>$ProjectFileDir$</working-dir>
+    </data-source>
+  </component>
+</project>

project-web2/.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
+  </component>
+</project>

project-web2/.idea/workspace.xml

@@ -5,8 +5,54 @@
       <artifact name="project-idea:war exploded" />
     </artifacts-to-build>
   </component>
+  <component name="AutoImportSettings">
+    <option name="autoReloadType" value="SELECTIVE" />
+  </component>
   <component name="ChangeListManager">
-    <list default="true" id="34037fb4-868b-4b2e-9597-751e8d4f2446" name="Default Changelist" comment="" />
+    <list default="true" id="34037fb4-868b-4b2e-9597-751e8d4f2446" name="Default Changelist" comment="Default Changelist">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/out/artifacts/project_idea_war_exploded/WEB-INF/classes/com/codeying/dao/JiaofeiDao.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/artifacts/project_idea_war_exploded/WEB-INF/classes/com/codeying/dao/JiaofeiDao.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/out/artifacts/project_idea_war_exploded/WEB-INF/classes/com/codeying/dao/YichangDao.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/artifacts/project_idea_war_exploded/WEB-INF/classes/com/codeying/dao/YichangDao.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/out/artifacts/project_idea_war_exploded/WEB-INF/classes/com/codeying/entity/Jiaofei.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/artifacts/project_idea_war_exploded/WEB-INF/classes/com/codeying/entity/Jiaofei.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/out/artifacts/project_idea_war_exploded/WEB-INF/classes/com/codeying/entity/Yichang.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/artifacts/project_idea_war_exploded/WEB-INF/classes/com/codeying/entity/Yichang.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/out/artifacts/project_idea_war_exploded/WEB-INF/classes/com/codeying/servlet/HelloServlet$Dto.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/artifacts/project_idea_war_exploded/WEB-INF/classes/com/codeying/servlet/HelloServlet$Dto.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/out/artifacts/project_idea_war_exploded/WEB-INF/classes/com/codeying/servlet/HelloServlet$Echart.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/artifacts/project_idea_war_exploded/WEB-INF/classes/com/codeying/servlet/HelloServlet$Echart.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/out/artifacts/project_idea_war_exploded/WEB-INF/classes/com/codeying/servlet/HelloServlet.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/artifacts/project_idea_war_exploded/WEB-INF/classes/com/codeying/servlet/HelloServlet.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/out/artifacts/project_idea_war_exploded/WEB-INF/classes/com/codeying/servlet/jiaofei/SaveJiaofeiServlet.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/artifacts/project_idea_war_exploded/WEB-INF/classes/com/codeying/servlet/jiaofei/SaveJiaofeiServlet.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/out/artifacts/project_idea_war_exploded/WEB-INF/classes/com/codeying/servlet/yichang/SaveYichangServlet.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/artifacts/project_idea_war_exploded/WEB-INF/classes/com/codeying/servlet/yichang/SaveYichangServlet.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/out/artifacts/project_idea_war_exploded/WEB-INF/classes/com/codeying/utils/JdbcUtils.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/artifacts/project_idea_war_exploded/WEB-INF/classes/com/codeying/utils/JdbcUtils.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/out/artifacts/project_idea_war_exploded/assets/images/favicon.ico" beforeDir="false" afterPath="$PROJECT_DIR$/out/artifacts/project_idea_war_exploded/assets/images/favicon.ico" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/out/artifacts/project_idea_war_exploded/login.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/out/artifacts/project_idea_war_exploded/login.jsp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/out/artifacts/project_idea_war_exploded/pages/jiaofei-add.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/out/artifacts/project_idea_war_exploded/pages/jiaofei-add.jsp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/out/artifacts/project_idea_war_exploded/pages/jiaofei-detail.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/out/artifacts/project_idea_war_exploded/pages/jiaofei-detail.jsp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/out/artifacts/project_idea_war_exploded/pages/jiaofei-edit.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/out/artifacts/project_idea_war_exploded/pages/jiaofei-edit.jsp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/out/artifacts/project_idea_war_exploded/pages/jiaofei-list.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/out/artifacts/project_idea_war_exploded/pages/jiaofei-list.jsp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/out/artifacts/project_idea_war_exploded/pages/records-add.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/out/artifacts/project_idea_war_exploded/pages/records-add.jsp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/out/production/project-idea/com/codeying/dao/JiaofeiDao.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/project-idea/com/codeying/dao/JiaofeiDao.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/out/production/project-idea/com/codeying/dao/YichangDao.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/project-idea/com/codeying/dao/YichangDao.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/out/production/project-idea/com/codeying/entity/Jiaofei.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/project-idea/com/codeying/entity/Jiaofei.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/out/production/project-idea/com/codeying/entity/Yichang.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/project-idea/com/codeying/entity/Yichang.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/out/production/project-idea/com/codeying/servlet/HelloServlet$Dto.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/project-idea/com/codeying/servlet/HelloServlet$Dto.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/out/production/project-idea/com/codeying/servlet/HelloServlet$Echart.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/project-idea/com/codeying/servlet/HelloServlet$Echart.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/out/production/project-idea/com/codeying/servlet/HelloServlet.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/project-idea/com/codeying/servlet/HelloServlet.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/out/production/project-idea/com/codeying/servlet/jiaofei/SaveJiaofeiServlet.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/project-idea/com/codeying/servlet/jiaofei/SaveJiaofeiServlet.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/out/production/project-idea/com/codeying/servlet/yichang/SaveYichangServlet.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/project-idea/com/codeying/servlet/yichang/SaveYichangServlet.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/out/production/project-idea/com/codeying/utils/JdbcUtils.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/project-idea/com/codeying/utils/JdbcUtils.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/project-idea.iml" beforeDir="false" afterPath="$PROJECT_DIR$/project-idea.iml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/com/codeying/entity/Jiaofei.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/codeying/entity/Jiaofei.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/com/codeying/entity/Yichang.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/codeying/entity/Yichang.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/com/codeying/servlet/HelloServlet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/codeying/servlet/HelloServlet.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/com/codeying/servlet/jiaofei/SaveJiaofeiServlet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/codeying/servlet/jiaofei/SaveJiaofeiServlet.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/com/codeying/servlet/yichang/SaveYichangServlet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/codeying/servlet/yichang/SaveYichangServlet.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/com/codeying/utils/JdbcUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/codeying/utils/JdbcUtils.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/web/assets/images/favicon.ico" beforeDir="false" afterPath="$PROJECT_DIR$/web/assets/images/favicon.ico" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/web/login.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/web/login.jsp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/web/pages/jiaofei-add.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/web/pages/jiaofei-add.jsp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/web/pages/jiaofei-detail.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/web/pages/jiaofei-detail.jsp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/web/pages/jiaofei-edit.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/web/pages/jiaofei-edit.jsp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/web/pages/jiaofei-list.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/web/pages/jiaofei-list.jsp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/web/pages/records-add.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/web/pages/records-add.jsp" afterDir="false" />
+    </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -22,6 +68,9 @@
       </list>
     </option>
   </component>
+  <component name="Git.Settings">
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/.." />
+  </component>
   <component name="LogFilters">
     <option name="FILTER_ERRORS" value="false" />
     <option name="FILTER_WARNINGS" value="false" />
@@ -51,7 +100,8 @@
     <option name="vmOptions" value="-DarchetypeCatalog=internal" />
   </component>
   <component name="ProjectColorInfo">{
-  &quot;associatedIndex&quot;: 6
+  &quot;customColor&quot;: &quot;&quot;,
+  &quot;associatedIndex&quot;: 5
 }</component>
   <component name="ProjectFrameBounds" extendedState="6">
     <option name="x" value="917" />
@@ -59,6 +109,7 @@
     <option name="height" value="1322" />
   </component>
   <component name="ProjectId" id="1ldr05uV39WHgkqgTYBfheWL9Pd" />
+  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
@@ -102,17 +153,31 @@
   <component name="PropertiesComponent"><![CDATA[{
   "keyToString": {
     "RunOnceActivity.ShowReadmeOnStart": "true",
+    "RunOnceActivity.git.unshallow": "true",
     "Tomcat 服务器.Tomcat 9.0.33.executor": "Run",
+    "git-widget-placeholder": "main",
     "ignore.virus.scanning.warn.message": "true",
     "kotlin-language-version-configured": "true",
-    "last_opened_file_path": "D:/jjava/project-web2",
+    "last_opened_file_path": "D:/水费管理/project-web2",
+    "node.js.detected.package.eslint": "true",
+    "node.js.detected.package.tslint": "true",
+    "node.js.selected.package.eslint": "(autodetect)",
+    "node.js.selected.package.tslint": "(autodetect)",
     "nodejs_package_manager_path": "npm",
-    "project.structure.last.edited": "模块",
-    "project.structure.proportion": "0.15",
-    "project.structure.side.proportion": "0.21609196",
     "vue.rearranger.settings.migration": "true"
+  },
+  "keyToStringList": {
+    "DatabaseDriversLRU": [
+      "postgresql"
+    ]
   }
 }]]></component>
+  <component name="RecentsManager">
+    <key name="CopyFile.RECENT_KEYS">
+      <recent name="D:\水费管理\project-web2\web\assets\images" />
+      <recent name="D:\水费管理\project-web2\web\WEB-INF\lib" />
+    </key>
+  </component>
   <component name="RunManager">
     <configuration name="Tomcat 9.0.33" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 9.0.33" ALTERNATIVE_JRE_ENABLED="false" nameIsGenerated="true">
       <option name="UPDATING_POLICY" value="restart-server" />
@@ -213,8 +278,8 @@
   <component name="SharedIndexes">
     <attachedChunks>
       <set>
-        <option value="bundled-jdk-9823dce3aa75-fdfe4dae3a2d-intellij.indexing.shared.core-IU-243.21565.193" />
+        <option value="bundled-jdk-9823dce3aa75-fdfe4dae3a2d-intellij.indexing.shared.core-IU-243.22562.218" />
-        <option value="bundled-js-predefined-d6986cc7102b-e768b9ed790e-JavaScript-IU-243.21565.193" />
+        <option value="bundled-js-predefined-d6986cc7102b-deb605915726-JavaScript-IU-243.22562.218" />
       </set>
     </attachedChunks>
   </component>
@@ -239,8 +304,24 @@
       <workItem from="1619158381030" duration="172000" />
       <workItem from="1619168468835" duration="1485000" />
       <workItem from="1619922069618" duration="26000" />
-      <workItem from="1734768679764" duration="182000" />
+      <workItem from="1734749549782" duration="765000" />
-      <workItem from="1734769307557" duration="6000" />
+      <workItem from="1734751314931" duration="1873000" />
+      <workItem from="1734753240036" duration="2549000" />
+      <workItem from="1734757786438" duration="3811000" />
+      <workItem from="1734768428571" duration="820000" />
+      <workItem from="1734769321328" duration="3199000" />
+      <workItem from="1734777732065" duration="1771000" />
+      <workItem from="1734784682848" duration="125000" />
+      <workItem from="1734784840304" duration="54000" />
+      <workItem from="1734785050133" duration="807000" />
+      <workItem from="1734786036930" duration="1663000" />
+      <workItem from="1734793821625" duration="451000" />
+      <workItem from="1734833179713" duration="2686000" />
+      <workItem from="1734840237855" duration="114000" />
+      <workItem from="1734870424596" duration="980000" />
+      <workItem from="1734871711814" duration="734000" />
+      <workItem from="1734876705349" duration="1218000" />
+      <workItem from="1734878874821" duration="41000" />
     </task>
     <servers />
   </component>

project-web2/out/artifacts/project_idea_war_exploded/login.jsp

@@ -102,7 +102,7 @@
 
 <body>
 <div class="lyear-login-box">
-    <div class="lyear-login-left www-bg" style="background-image: url('${pageContext.request.contextPath}/assets/images/nav-profile.png');background-repeat:no-repeat;">
+    <div class="lyear-login-left www-bg" style="background-image: url('${pageContext.request.contextPath}/assets/images/nav-profile2.png');background-repeat:no-repeat;">
         <div class="lyear-overlay"></div>
         <div class="lyear-featured">
             <h4>愿你有好运气，如果没有，愿你在不幸中学会慈悲；愿你被很多人爱，如果没有，愿你在寂寞中学会宽容。<small> - 刘瑜《愿你慢慢长大》</small></h4>

project-web2/out/artifacts/project_idea_war_exploded/pages/jiaofei-edit.jsp

@@ -60,8 +60,8 @@
                                                 </select>
                                             </div>
                                         </div>
-
+                        </c:if>
-              </c:if>                                                                      <div class="form-group">
+                                            <div class="form-group">
                                                 <label class="col-xs-12" >年月</label>
                                                 <div class="col-xs-12">
                                                     <input required                                                         maxlength="255" class="form-control w200"

project-web2/out/artifacts/project_idea_war_exploded/pages/records-add.jsp

@@ -63,7 +63,8 @@
                                             </div>
                                         </div>
 
-              </c:if>                                                                    <div class="form-group">
+              </c:if>
+                                            <div class="form-group">
                                                 <label class="col-xs-12" >年月</label>
                                                 <div class="col-xs-12">
                                                     <input required maxlength="255"                                                        class="form-control w200"

project-web2/project-idea.iml

@@ -4,7 +4,6 @@
     <facet type="web" name="Web">
       <configuration>
         <descriptors>
-          <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/web/web/WEB-INF/web.xml" />
           <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/web/WEB-INF/web.xml" />
         </descriptors>
         <webroots>
@@ -30,5 +29,6 @@
         <jarDirectory url="file://$MODULE_DIR$/web/WEB-INF/lib" recursive="false" />
       </library>
     </orderEntry>
+
   </component>
 </module>

project-web2/src/com/codeying/entity/Jiaofei.java

@@ -1,5 +1,6 @@
 package com.codeying.entity;
 
+import java.sql.Timestamp;
 import java.util.Date;
 
 import java.io.Serializable;
@@ -23,7 +24,7 @@ public class Jiaofei implements Serializable {
   private Double shifje;
 
   /** 缴费日期 */
-  private Date createtime;
+  private Timestamp createtime;
 
   /** 员工 */
   private String yuang;
@@ -78,11 +79,11 @@ public class Jiaofei implements Serializable {
     this.shifje = shifje;
   }
 
-  public Date getCreatetime() {
+  public Timestamp getCreatetime() {
     return createtime;
   }
 
-  public void setCreatetime(Date createtime) {
+  public void setCreatetime(Timestamp createtime) {
     this.createtime =  createtime;
   }
 

project-web2/src/com/codeying/entity/Yichang.java

@@ -1,5 +1,6 @@
 package com.codeying.entity;
 
+import java.sql.Timestamp;
 import java.util.Date;
 
 import java.io.Serializable;
@@ -20,7 +21,7 @@ public class Yichang implements Serializable {
   private String zhuangt;
 
   /** 创建时间 */
-  private Date createtime;
+  private Timestamp createtime;
 
   public String getId() {
     return id;
@@ -62,12 +63,12 @@ public class Yichang implements Serializable {
     this.zhuangt = zhuangt;
   }
 
-  public Date getCreatetime() {
+  public Timestamp getCreatetime() {
     return createtime;
   }
 
-  public void setCreatetime(Date createtime) {
+  public void setCreatetime(Timestamp createtime) {
-    this.createtime = createtime;
+    this.createtime =createtime;
   }
 }
 

project-web2/src/com/codeying/servlet/HelloServlet.java

@@ -37,13 +37,35 @@ public class HelloServlet extends AbsServlet {
         resp.setCharacterEncoding("UTF-8");
         //数据
         List<Echart> l = new ArrayList<>();
-        //图表1..
         {
             Echart echart = new Echart();
-            echart.setName("XXX数据");
+            echart.setName("用水统计");
-//            echart.setDtos(list("select name,value from ..."));
+            echart.setDtos(list("SELECT \n" +
-//            l.add(echart.init());
+                    "    nmonth AS \"name\", \n" +
+                    "    SUM(CAST(waterUsage AS DECIMAL(10,2))) AS \"value\"\n" +
+                    "FROM \n" +
+                    "    tb_records\n" +
+                    "GROUP BY \n" +
+                    "    nmonth\n" +
+                    "ORDER BY \n" +
+                    "    nmonth;"));
+            l.add(echart.init());
         }
+        {
+            Echart echart = new Echart();
+            echart.setName("实收统计");
+            echart.setDtos(list("SELECT \n" +
+                    "    niany AS \"name\", \n" +
+                    "    SUM(shifje) AS \"value\"\n" +
+                    "FROM \n" +
+                    "    tb_jiaofei\n" +
+                    "GROUP BY \n" +
+                    "    niany\n" +
+                    "ORDER BY \n" +
+                    "    niany;"));
+            l.add(echart.init());
+        }
+
 
         resp.getWriter().print(ApiResult.successData(l));
     }

project-web2/src/com/codeying/servlet/jiaofei/SaveJiaofeiServlet.java

@@ -1,5 +1,6 @@
 package com.codeying.servlet.jiaofei;
 
+import java.sql.Timestamp;
 import com.codeying.servlet.AbsServlet;
 import com.codeying.entity.*;
 import javax.servlet.ServletException;
@@ -30,7 +31,7 @@ public class SaveJiaofeiServlet extends AbsServlet {
     String niany = ""; // 年月
     Double yingfje = 0.0; // 应付金额
     Double shifje = 0.0; // 实付金额
-    Date createtime = null; // 缴费日期
+    Timestamp createtime = null; // 缴费日期
     String yuang = ""; // 员工
     if (reqMap.get("id") != null) {
       id = (String) reqMap.get("id");
@@ -53,7 +54,7 @@ public class SaveJiaofeiServlet extends AbsServlet {
       entityTemp.setShifje(shifje);
     }
     if (reqMap.get("createtime") != null && !reqMap.get("createtime").equals("")) {
-      createtime = DateUtil.strToDate((String) reqMap.get("createtime"));
+      createtime = (Timestamp) DateUtil.strToDate((String) reqMap.get("createtime"));
       entityTemp.setCreatetime(createtime);
     }
     if (reqMap.get("yuang") != null) {
@@ -65,7 +66,7 @@ public class SaveJiaofeiServlet extends AbsServlet {
     if (entityTemp.getId() == null || "".equals(entityTemp.getId())) { // 新增
       id = CommonUtils.newId();
       entityTemp.setId(id);
-      createtime = new Date();
+      createtime = new Timestamp(System.currentTimeMillis());
       entityTemp.setCreatetime(createtime);
       // 如果有唯一字段，则在此校验 （字段不为空在前端校验）
       // =========添加之前

project-web2/src/com/codeying/servlet/yichang/SaveYichangServlet.java

@@ -6,6 +6,7 @@ import javax.servlet.ServletException;
 import javax.servlet.annotation.WebServlet;
 import javax.servlet.http.*;
 import java.io.IOException;
+import java.sql.Timestamp;
 import java.util.*;
 import com.codeying.utils.*;
 import com.codeying.utils.component.*;
@@ -29,7 +30,7 @@ public class SaveYichangServlet extends AbsServlet {
     String zhangh = ""; // 账户
     String yiclx = ""; // 异常类型
     String zhuangt = ""; // 状态
-    Date createtime = null; // 创建时间
+    Timestamp createtime = null; // 创建时间
     if (reqMap.get("id") != null) {
       id = (String) reqMap.get("id");
       entityTemp.setId(id); // String类型参数
@@ -47,7 +48,7 @@ public class SaveYichangServlet extends AbsServlet {
       entityTemp.setZhuangt(zhuangt); // String类型参数
     }
     if (reqMap.get("createtime") != null && !reqMap.get("createtime").equals("")) {
-      createtime = DateUtil.strToDate((String) reqMap.get("createtime"));
+      createtime = (Timestamp) DateUtil.strToDate((String) reqMap.get("createtime"));
       entityTemp.setCreatetime(createtime);
     }
 
@@ -55,7 +56,7 @@ public class SaveYichangServlet extends AbsServlet {
     if (entityTemp.getId() == null || "".equals(entityTemp.getId())) { // 新增
       id = CommonUtils.newId();
       entityTemp.setId(id);
-      createtime = new Date();
+      createtime = new Timestamp(System.currentTimeMillis());
       entityTemp.setCreatetime(createtime);
       // 如果有唯一字段，则在此校验 （字段不为空在前端校验）
       // =========添加之前

project-web2/src/com/codeying/utils/JdbcUtils.java

@@ -10,20 +10,12 @@ import java.util.Date;
 
 /** 数据库连接工具 */
 public class JdbcUtils {
-  // mysql需要修改的配置有： ip改成localhost，mysql用户名密码
+  private static final String driverClass = "org.postgresql.Driver";  // PostgreSQL JDBC驱动类
-  private static final String driverClass = "com.mysql.cj.jdbc.Driver";
   private static final String url =
-      "jdbc:mysql://localhost:/app_fee?serverTimezone=GMT%2B8&characterEncoding=utf-8&allowPublicKeyRetrieval=true&useSSL=false";
+          "jdbc:postgresql://192.168.248.128:5432/postgres?characterEncoding=UTF-8&ssl=false";  // 连接URL
-  // private static final String
+  private static final String username = "gaussdb";  // 数据库用户名
-  // url="jdbc:mysql://localhost:3306/app_fee?characterEncoding=utf8&useSSL=false";
+  private static final String password = "openGauss@1234";  // 数据库密码
-  private static final String username = "app_fee"; // 自行修改用户名和密码
-  private static final String password = "app_fee";
 
-  /* 测试     private static final String driverClass="com.microsoft.sqlserver.jdbc.SQLServerDriver";
-  private static final String url="jdbc:sqlserver://localhost:1433;DatabaseName=app_fee;encrypt=true;trustServerCertificate=true";
-  private static final String username="sa"; //自行修改用户名和密码
-  private static final String password="123456";
-  */
 
   /** 测试能否连接成功 */
   public static void main(String[] args) {
@@ -36,25 +28,24 @@ public class JdbcUtils {
   private static Connection con;
   private static long timeNow;
 
-  static { // 静态代码块,只会被执行一次
+  static {
     try {
       Class.forName(driverClass); // 加载数据库连接的驱动
-      con = DriverManager.getConnection(url, username, password); // 创建连接
+      con = DriverManager.getConnection(url, username, password);
       timeNow = new Date().getTime();
     } catch (Exception ex) {
       ex.printStackTrace();
-      throw new RuntimeException("数据库连接失败"); // 连接失败则抛错
+      throw new RuntimeException("数据库连接失败");
     }
   }
 
   /** 获取连接 */
   public static Connection getConnection() {
-    // 连接关闭了则重新连接
     try {
-      if (new Date().getTime() - 180000 > timeNow) { // 3分钟重新或者一次数据库连接
+      if (new Date().getTime() - 180000 > timeNow) {
         timeNow = new Date().getTime();
         con.close();
-        con = DriverManager.getConnection(url, username, password); // 创建连接
+        con = DriverManager.getConnection(url, username, password);
       }
     } catch (SQLException throwables) {
       throwables.printStackTrace();

project-web2/web/login.jsp

@@ -102,7 +102,7 @@
 
 <body>
 <div class="lyear-login-box">
-    <div class="lyear-login-left www-bg" style="background-image: url('${pageContext.request.contextPath}/assets/images/nav-profile.png');background-repeat:no-repeat;">
+    <div class="lyear-login-left www-bg" style="background-image: url('${pageContext.request.contextPath}/assets/images/nav-profile2.png');background-repeat:no-repeat;">
         <div class="lyear-overlay"></div>
         <div class="lyear-featured">
             <h4>愿你有好运气，如果没有，愿你在不幸中学会慈悲；愿你被很多人爱，如果没有，愿你在寂寞中学会宽容。<small> - 刘瑜《愿你慢慢长大》</small></h4>

project-web2/web/pages/jiaofei-edit.jsp

@@ -60,8 +60,8 @@
                                                 </select>
                                             </div>
                                         </div>
-
+                        </c:if>
-              </c:if>                                                                      <div class="form-group">
+                                            <div class="form-group">
                                                 <label class="col-xs-12" >年月</label>
                                                 <div class="col-xs-12">
                                                     <input required                                                         maxlength="255" class="form-control w200"

project-web2/web/pages/records-add.jsp

@@ -63,7 +63,8 @@
                                             </div>
                                         </div>
 
-              </c:if>                                                                    <div class="form-group">
+              </c:if>
+                                            <div class="form-group">
                                                 <label class="col-xs-12" >年月</label>
                                                 <div class="col-xs-12">
                                                     <input required maxlength="255"                                                        class="form-control w200"