后台第二次提交

81041

2019-11-12 107623064b162aef3e5d1d734d0763d068a7c4f9

后台第二次提交

 platforms/android/app/app.iml

@@ -1,95 +1,96 @@
<?xml version="1.0" encoding="UTF-8"?>

<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" type="JAVA_MODULE" version="4">

  <component name="FacetManager">

    <facet type="android-gradle" name="Android-Gradle">

      <configuration>

        <option name="GRADLE_PROJECT_PATH" value=":app" />

        <option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" value="3.5.2" />

        <option name="LAST_KNOWN_AGP_VERSION" value="3.5.2" />

      </configuration>

    </facet>

    <facet type="android" name="Android">

      <configuration>

        <option name="SELECTED_BUILD_VARIANT" value="debug" />

        <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />

        <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />

        <afterSyncTasks>

          <task>generateDebugSources</task>

        </afterSyncTasks>

        <option name="ALLOW_USER_CONFIGURATION" value="false" />

        <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />

        <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />

        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res;file://$MODULE_DIR$/build/generated/res/resValues/debug" />

        <option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="" />

        <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />

      </configuration>

    </facet>

  </component>

  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">

    <output url="file://$MODULE_DIR$/build/intermediates/javac/debug/classes" />

    <output-test url="file://$MODULE_DIR$/build/intermediates/javac/debugUnitTest/classes" />

    <exclude-output />

    <content url="file://$MODULE_DIR$">

      <sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />

      <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debug/compileDebugAidl/out" isTestSource="false" generated="true" />

      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />

      <sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debug/compileDebugRenderscript/out" isTestSource="false" generated="true" />

      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" generated="true" />

      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" generated="true" />

      <sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debugAndroidTest/out" isTestSource="true" generated="true" />

      <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debugAndroidTest/compileDebugAndroidTestAidl/out" isTestSource="true" generated="true" />

      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />

      <sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debugAndroidTest/compileDebugAndroidTestRenderscript/out" isTestSource="true" generated="true" />

      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" generated="true" />

      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" generated="true" />

      <sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debugUnitTest/out" isTestSource="true" generated="true" />

      <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />

      <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />

      <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />

      <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />

      <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />

      <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />

      <sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />

      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/res" type="java-test-resource" />

      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/resources" type="java-test-resource" />

      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/assets" type="java-test-resource" />

      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/aidl" isTestSource="true" />

      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/java" isTestSource="true" />

      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/rs" isTestSource="true" />

      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/shaders" isTestSource="true" />

      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />

      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />

      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />

      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />

      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />

      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />

      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />

      <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />

      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />

      <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />

      <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />

      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />

      <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />

      <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />

      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />

      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />

      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />

      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />

      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />

      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />

      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />

      <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />

      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />

      <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />

      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />

      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />

      <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />

      <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />

      <excludeFolder url="file://$MODULE_DIR$/build" />

    </content>

    <orderEntry type="jdk" jdkName="Android API 28 Platform" jdkType="Android SDK" />

    <orderEntry type="sourceFolder" forTests="false" />

    <orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.8.5@jar" level="project" />

    <orderEntry type="module" module-name="CordovaLib" />

  </component>

<?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" type="JAVA_MODULE" version="4">
  <component name="FacetManager">
    <facet type="android-gradle" name="Android-Gradle">
      <configuration>
        <option name="GRADLE_PROJECT_PATH" value=":app" />
        <option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" value="3.5.2" />
        <option name="LAST_KNOWN_AGP_VERSION" value="3.5.2" />
      </configuration>
    </facet>
    <facet type="android" name="Android">
      <configuration>
        <option name="SELECTED_BUILD_VARIANT" value="debug" />
        <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
        <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
        <afterSyncTasks>
          <task>generateDebugSources</task>
        </afterSyncTasks>
        <option name="ALLOW_USER_CONFIGURATION" value="false" />
        <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
        <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res;file://$MODULE_DIR$/build/generated/res/resValues/debug" />
        <option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" />
        <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
      </configuration>
    </facet>
  </component>
  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
    <output url="file://$MODULE_DIR$/build/intermediates/javac/debug/classes" />
    <output-test url="file://$MODULE_DIR$/build/intermediates/javac/debugUnitTest/classes" />
    <exclude-output />
    <content url="file://$MODULE_DIR$">
      <sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
      <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debug/compileDebugAidl/out" isTestSource="false" generated="true" />
      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
      <sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debug/compileDebugRenderscript/out" isTestSource="false" generated="true" />
      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" generated="true" />
      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" generated="true" />
      <sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debugAndroidTest/out" isTestSource="true" generated="true" />
      <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debugAndroidTest/compileDebugAndroidTestAidl/out" isTestSource="true" generated="true" />
      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
      <sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debugAndroidTest/compileDebugAndroidTestRenderscript/out" isTestSource="true" generated="true" />
      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" generated="true" />
      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" generated="true" />
      <sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debugUnitTest/out" isTestSource="true" generated="true" />
      <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
      <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
      <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
      <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
      <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
      <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
      <sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/res" type="java-test-resource" />
      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/resources" type="java-test-resource" />
      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/assets" type="java-test-resource" />
      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/aidl" isTestSource="true" />
      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/java" isTestSource="true" />
      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/rs" isTestSource="true" />
      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/shaders" isTestSource="true" />
      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
      <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
      <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
      <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
      <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
      <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
      <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
      <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
      <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
      <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
      <excludeFolder url="file://$MODULE_DIR$/build" />
    </content>
    <orderEntry type="jdk" jdkName="Android API 28 Platform" jdkType="Android SDK" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="library" name="Gradle: __local_aars__:D.\GitWorkSpace\FBS9600App\platforms\android\app\src\main\java\com\sqlite_DaoHelper\lib\sqlite-jdbc-3.7.2.jar:unspecified@jar" level="project" />
    <orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.8.5@jar" level="project" />
    <orderEntry type="module" module-name="CordovaLib" />
  </component>
</module>

 platforms/android/app/build.gradle

@@ -303,12 +303,12 @@


dependencies {
    implementation fileTree(dir: 'libs', include: '*.jar')
    implementation fileTree(include: '*.jar', dir: 'libs')
    // SUB-PROJECT DEPENDENCIES START
    implementation(project(path: ":CordovaLib"))
    implementation project(path: ':CordovaLib')
    // SUB-PROJECT DEPENDENCIES END

    implementation 'com.google.code.gson:gson:2.8.5'
    implementation files('src/main/java/com/sqlite_DaoHelper/lib/sqlite-jdbc-3.7.2.jar')
}

def promptForReleaseKeyPassword() {

 platforms/android/app/src/main/java/com/fgkj/action/ServiceModel.java

@@ -1,42 +1,42 @@
package com.fgkj.action;



import android.os.Handler;

import android.util.Log;



import java.io.Serializable;



public class ServiceModel implements Serializable {

    public Integer code = 0;                    //返回到前台的消息命令码   0:成功        1：失败

    public int cmd;                             //寄存器地址

    public int cmd_type;                        //操作类型   0x03  读     0x05 控制       0x10 多点写入

    public String msg;

    public Object data;

    public Handler mhandler;

    public int battindex;                       //电池组索引1-16



    @Override

    public String toString() {

        return "ServiceModel{" +

                "code=" + code +

                ", cmd=" + cmd +

                ", cmd_type=" + cmd_type +

                ", msg='" + msg + '\'' +

                ", data=" + data +

                ", mhandler=" + mhandler +

                '}';

    }



    public ServiceModel clone(){

        ServiceModel model = new ServiceModel();

        model.cmd = this.cmd;

        model.cmd_type = this.cmd_type;

        model.msg = this.msg;

        model.mhandler = this.mhandler;

        model.data = this.data;

        model.battindex = this.battindex;

        return model;

    }

    //    public static void main(String[] args) {

//        System.out.println("$$$$$$$$$$$$$");

//    }

}

package com.fgkj.action;

import android.os.Handler;
import android.util.Log;

import java.io.Serializable;

public class ServiceModel implements Serializable {
    public Integer code = 0;                    //返回到前台的消息命令码   0:成功        1：失败
    public int cmd;                             //寄存器地址
    public int cmd_type;                        //操作类型   0x03  读     0x05 控制       0x10 多点写入
    public String msg;
    public Object data;
    public Handler mhandler;
    public int battindex;                       //电池组索引1-16
    
    @Override
    public String toString() {
        return "ServiceModel{" +
                "code=" + code +
                ", cmd=" + cmd +
                ", cmd_type=" + cmd_type +
                ", msg='" + msg + '\'' +
                ", data=" + data +
                ", mhandler=" + mhandler +
                '}';
    }

    public ServiceModel clone(){
        ServiceModel model = new ServiceModel();
        model.cmd = this.cmd;
        model.cmd_type = this.cmd_type;
        model.msg = this.msg;
        model.mhandler = this.mhandler;
        model.data = this.data;
        model.battindex = this.battindex;
        return model;
    }
    //    public static void main(String[] args) {
//        System.out.println("$$$$$$$$$$$$$");
//    }
}

 platforms/android/app/src/main/java/com/fgkj/dao/BaseDAO.java

@@ -5,6 +5,8 @@
public interface BaseDAO {

    public static final int BATTTESTDATA_INF = 1;
    public static final int BATTINF=2;
    public static final int BATTTESTDATA=3;


    public boolean add(Object obj); // 添加

 platforms/android/app/src/main/java/com/fgkj/dao/BaseDAOFactory.java

@@ -1,6 +1,8 @@
package com.fgkj.dao;


import com.fgkj.impl.BattinfImpl;
import com.fgkj.impl.BatttestdataDAOImpl;
import com.fgkj.impl.Batttestdata_infDAOImpl;

public class BaseDAOFactory {
@@ -13,6 +15,8 @@
    public static BaseDAO getBaseDAO(int DAOcode){
        switch(DAOcode){
            case 1:return new Batttestdata_infDAOImpl();
            case 2:return new BattinfImpl();
            case 3:return new BatttestdataDAOImpl();
            default :return null;
        }
    }

 platforms/android/app/src/main/java/com/fgkj/dto/Battinf.java

New file
@@ -0,0 +1,153 @@
package com.fgkj.dto;

import java.io.Serializable;
import java.util.Date;

public class Battinf implements Serializable {
    private int num;
    private int BattGroupId;
    private String BattGroupName;
    private String BattGroupName1;
    private double BattFloatCurrent;
    private int MonCount;
    private double MonCapStd;
    private double MonVolStd;
    private double MonResStd;
    private double MonSerStd;
    private double MonTmpStd;
    private String BattProducer;
    private Date BattInUseDate;
    private int station_install;

    public int getNum() {
        return num;
    }

    public void setNum(int num) {
        this.num = num;
    }

    public int getBattGroupId() {
        return BattGroupId;
    }

    public void setBattGroupId(int battGroupId) {
        BattGroupId = battGroupId;
    }

    public String getBattGroupName() {
        return BattGroupName;
    }

    public void setBattGroupName(String battGroupName) {
        BattGroupName = battGroupName;
    }

    public String getBattGroupName1() {
        return BattGroupName1;
    }

    public void setBattGroupName1(String battGroupName1) {
        BattGroupName1 = battGroupName1;
    }

    public double getBattFloatCurrent() {
        return BattFloatCurrent;
    }

    public void setBattFloatCurrent(double battFloatCurrent) {
        BattFloatCurrent = battFloatCurrent;
    }

    public int getMonCount() {
        return MonCount;
    }

    public void setMonCount(int monCount) {
        MonCount = monCount;
    }

    public double getMonCapStd() {
        return MonCapStd;
    }

    public void setMonCapStd(double monCapStd) {
        MonCapStd = monCapStd;
    }

    public double getMonVolStd() {
        return MonVolStd;
    }

    public void setMonVolStd(double monVolStd) {
        MonVolStd = monVolStd;
    }

    public double getMonResStd() {
        return MonResStd;
    }

    public void setMonResStd(double monResStd) {
        MonResStd = monResStd;
    }

    public double getMonSerStd() {
        return MonSerStd;
    }

    public void setMonSerStd(double monSerStd) {
        MonSerStd = monSerStd;
    }

    public double getMonTmpStd() {
        return MonTmpStd;
    }

    public void setMonTmpStd(double monTmpStd) {
        MonTmpStd = monTmpStd;
    }

    public String getBattProducer() {
        return BattProducer;
    }

    public void setBattProducer(String battProducer) {
        BattProducer = battProducer;
    }

    public Date getBattInUseDate() {
        return BattInUseDate;
    }

    public void setBattInUseDate(Date battInUseDate) {
        BattInUseDate = battInUseDate;
    }

    public int getStation_install() {
        return station_install;
    }

    public void setStation_install(int station_install) {
        this.station_install = station_install;
    }

    @Override
    public String toString() {
        return "Battinf{" +
                "num=" + num +
                ", BattGroupId=" + BattGroupId +
                ", BattGroupName='" + BattGroupName + '\'' +
                ", BattGroupName1='" + BattGroupName1 + '\'' +
                ", BattFloatCurrent=" + BattFloatCurrent +
                ", MonCount=" + MonCount +
                ", MonCapStd=" + MonCapStd +
                ", MonVolStd=" + MonVolStd +
                ", MonResStd=" + MonResStd +
                ", MonSerStd=" + MonSerStd +
                ", MonTmpStd=" + MonTmpStd +
                ", BattProducer='" + BattProducer + '\'' +
                ", BattInUseDate=" + BattInUseDate +
                ", station_install=" + station_install +
                '}';
    }
}

 platforms/android/app/src/main/java/com/fgkj/impl/BattinfImpl.java

New file
@@ -0,0 +1,123 @@
package com.fgkj.impl;

import com.fgkj.dao.BaseDAO;
import com.fgkj.dto.Battinf;
import com.sqlite_DaoHelper.CallBack;
import com.sqlite_DaoHelper.DAOHelper;
import com.sqlite_DaoHelper.DBUtil;

import java.sql.ResultSet;
import java.sql.SQLException;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;


public class BattinfImpl implements BaseDAO, CallBack {
    //插入电池组信息
    @Override
    public boolean add(Object obj) {
        Battinf binf=(Battinf) obj;
        String sql=" insert into tb_battinf(BattGroupId,BattGroupName,BattGroupName1,BattFloatCurrent,MonCount,MonCapStd,MonVolStd,MonResStd,MonSerStd,MonTmpStd,BattProducer,BattInUseDate,station_install) " +
                "   values(?,?,?,?,?,?,?,?,?,?,?,?,?)";
        boolean bl= DAOHelper.executeUpdate(DBUtil.getConn(),sql,new  Object[]{binf.getBattGroupId(),binf.getBattGroupName(),binf.getBattGroupName1(),binf.getBattFloatCurrent(),binf.getMonCount(),binf.getMonCapStd(),binf.getMonVolStd()
        ,binf.getMonResStd(),binf.getMonSerStd(),binf.getMonTmpStd(),binf.getBattProducer(),binf.getBattInUseDate(),binf.getStation_install()});
        return bl;
    }
    //根据battgroupid修改表的数据
    @Override
    public boolean update(Object obj) {
        Battinf binf=(Battinf) obj;
        String sql=" update tb_battinf set BattGroupName=?,BattGroupName1=?,BattFloatCurrent=?,MonCount=?,MonCapStd=?,MonVolStd=?,MonResStd=?,MonSerStd=?,MonTmpStd=?,BattProducer=?,BattInUseDate=?,station_install=? where BattGroupId=? ) ";
        boolean bl= DAOHelper.executeUpdate(DBUtil.getConn(),sql,new  Object[]{binf.getBattGroupName(),binf.getBattGroupName1(),binf.getBattFloatCurrent(),binf.getMonCount(),binf.getMonCapStd(),binf.getMonVolStd()
                ,binf.getMonResStd(),binf.getMonSerStd(),binf.getMonTmpStd(),binf.getBattProducer(),binf.getBattInUseDate(),binf.getStation_install(),binf.getBattGroupId()});
        return bl;
    }

    @Override
    public boolean del(Object obj) {
        return false;
    }
    //查询库中存在的所有电池组信息
    @Override
    public List searchAll() {
        String sql=" select * from tb_battinf where station_install=1 order by battgroupid asc ";
        List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), null, new CallBack() {
            @Override
            public List getResults(ResultSet rs) {
                List list=new ArrayList();
                try {
                    while (rs.next()){
                        Battinf binf=new Battinf();
                        binf.setNum(rs.getInt("num"));
                        binf.setBattGroupId(rs.getInt("battgroupid"));
                        binf.setBattGroupName(rs.getString("battgroupname"));
                        binf.setBattGroupName1(rs.getString("battgroupname1"));
                        binf.setBattFloatCurrent(rs.getDouble("BattFloatCurrent"));
                        binf.setMonCapStd(rs.getDouble("MonCapStd"));
                        binf.setMonVolStd(rs.getDouble("MonVolStd"));
                        binf.setMonCount(rs.getInt("MonCount"));
                        binf.setMonResStd(rs.getDouble("MonResStd"));
                        binf.setMonSerStd(rs.getDouble("MonSerStd"));
                        binf.setMonTmpStd(rs.getDouble("MonTmpStd"));
                        binf.setBattProducer(rs.getString("BattProducer"));
                        binf.setBattInUseDate(rs.getDate("BattInUseDate"));
                        binf.setStation_install(rs.getInt("Station_install"));
                        list.add(binf);
                    }
                } catch (SQLException e) {
                    e.printStackTrace();
                }
                return list;
            }
        });
        return list;
    }

    @Override
    public List serchByCondition(Object obj) {
        return null;
    }

    @Override
    public List serchByInfo(Object obj) {
        return null;
    }

    @Override
    public List getResults(ResultSet rs) {
        return null;
    }

    public static void main (String[] args) throws ParseException {
        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
        Date date1 = sdf.parse("2000-01-01");
   
        Battinf binf=new Battinf();
        binf.setBattGroupId(1000002);
        binf.setBattGroupName("电池组2");
        binf.setBattGroupName1("电池组");
        binf.setBattFloatCurrent(51.5);
        binf.setMonCapStd(150);
        binf.setMonVolStd(12);
        binf.setMonCount(4);
        binf.setMonResStd(5000);
        binf.setMonSerStd(0.002);
        binf.setMonTmpStd(50.2);
        binf.setBattProducer("理士");
        binf.setBattInUseDate(DAOHelper.getSimpDate(date1));
        //System.out.println(DAOHelper.getSimpDate(date1));
       // System.out.println(binf.getBattInUseDate());
        binf.setStation_install(1);
        BattinfImpl bimpl=new BattinfImpl();
        /*boolean bl=bimpl.add(binf);
        System.out.println(bl);*/
        List<Battinf> list=bimpl.searchAll();
        for (Battinf b:list
             ) {
            System.out.println(b);
        }
    }
}

 platforms/android/app/src/main/java/com/fgkj/impl/BatttestdataDAOImpl.java

@@ -40,17 +40,6 @@
        return bl;
    }
    
    public boolean updatenew(Object obj) {
        Batttestdata b=(Batttestdata) obj;
        float mon_tmp=(float) (Math.random()+20);
        BigDecimal   bd  =   new  BigDecimal((double)mon_tmp);  
        bd   =  bd.setScale(1,4);  
        mon_tmp  =  bd.floatValue();
        String sql="update db_batt_testdata.tb_batttestdata_"+b.getBattGroupId()+" set mon_tmp=? where num=?";
        boolean bl=DAOHelper.executeUpdate(DBUtil.getConn(), sql, new Object[]{mon_tmp,b.getNum()});
        return bl;
    }
	
    
    public boolean updatePro(Object obj) {
        List<Batttestdata> list= (List<Batttestdata>) obj;
@@ -114,7 +103,6 @@
            roteN=number/endN+1;
          }
         }
        //System.out.println(number+"  "+roteN);
        String sql="select num,BattGroupId,test_record_count,test_type,data_new,data_available,record_num,test_starttime,record_time,test_timelong,online_vol,group_vol,test_curr,test_cap,mon_num,mon_vol,mon_tmp " +
                "  from db_batt_testdata.tb_batttestdata_"+btd.getBattGroupId()+"" +
                 " where test_record_count=?  and (record_num%"+roteN+"=0 or test_timelong>=? or test_timelong<= ? or record_num>=("+number+"-100))  " +
@@ -153,59 +141,13 @@
        });
        return list;
    }
    //历史监测<-------跨域----------->
    public List serchByCondition_ky(Object obj) {
        Batttestdata btd=(Batttestdata)obj;
        int number=btd.getRecord_num();//总数
        int roteN=0;
        int endN=BattTestData.RC_NUM_PARAM;//总笔数
        if(number<=endN){
            roteN=1;
        }else{		
            if(number%endN==0){
            roteN=number/endN;
           }else{
            roteN=number/endN+1;
          }
         }
        String sql="select num,BattGroupId,test_record_count,test_type,data_new,data_available,record_num,test_starttime,record_time,test_timelong,online_vol,group_vol,test_curr,test_cap,mon_num,mon_vol,mon_tmp " +
                "  from db_batt_testdata.tb_batttestdata_"+btd.getBattGroupId()+"" +
                 " where test_record_count=?  and (record_num%"+roteN+"=0 or test_timelong>=? or test_timelong<= ?)  " +
                 " and db_batt_testdata.tb_batttestdata_"+btd.getBattGroupId()+".data_available=1 ";
        List list=DAOHelper.executeQuery(sql, DBUtil.getConn(),new Object[]{btd.getTest_record_count(),btd.getNum(),btd.getTest_type()}, new CallBack() {
            public List getResults(ResultSet rs) {
                List list=new ArrayList();
                try {
                    while(rs.next()){
                        Batttestdata b=new Batttestdata();
                        b.setNum(rs.getInt("num"));
                        b.setBattGroupId(rs.getInt("BattGroupId"));
                        b.setTest_record_count(rs.getInt("test_record_count"));
                        b.setTest_type(rs.getInt("test_type"));
                        b.setData_new(rs.getInt("data_new"));						
                        b.setData_available(rs.getInt("data_available"));
                        b.setRecord_num(rs.getInt("record_num"));
                        b.setTest_starttime(rs.getTimestamp("test_starttime"));
                        b.setRecord_time(rs.getTimestamp("record_time"));
                        b.setTest_timelong(rs.getInt("test_timelong"));
                        b.setOnline_vol(rs.getFloat("online_vol"));
                        b.setGroup_vol(rs.getFloat("group_vol"));
                        b.setTest_curr(rs.getFloat("test_curr"));
                        b.setTest_cap(rs.getFloat("test_cap"));
                        b.setMon_num(rs.getInt("mon_num"));
                        b.setMon_vol(rs.getFloat("mon_vol"));
                        b.setMon_tmp(rs.getFloat("mon_tmp"));
                        list.add(b);
                    }
                }catch (SQLException e) {
                    e.printStackTrace();
                } 
                return list;
            }
        });
        return list;

    @Override
    public List serchByInfo(Object obj) {
        return null;
    }
    //查询某一次测试中的最大一次的测试时长和最短时长<历史监测>

    //查询某一次测试中的最大一次的测试时长和最短时长<历史监测>
    public List serchMaxAndMintime(Object obj){
        Batttestdata btb=(Batttestdata) obj;
        String sql=" SELECT MAX(record_num) number,MAX(test_timelong) as maxtime,MIN(test_timelong) as mintime FROM db_batt_testdata.tb_batttestdata_"+btb.getBattGroupId()+
@@ -232,50 +174,7 @@
        return list;
    } 
    


    //查询电池组监测放电中最后三比数据中是否存在二次下电
    public List serchByInfo(Object obj) {
        List<Batttestdata_inf> list_inf=(List<Batttestdata_inf>) obj;
        List list_all=new ArrayList();
        for (Batttestdata_inf batt : list_inf) {
            String sql=" select DISTINCT  db_batt_testdata.tb_batttestdata_"+batt.getBattGroupId()+".BattGroupId,test_record_count,test_type,test_starttime   "
                    + "  ,stationname,stationname1,stationname2,stationname3,stationname5,GroupIndexInFBSDevice,BattGroupName,StationId,FBSDeviceId  "
                    + "  from db_batt_testdata.tb_batttestdata_"+batt.getBattGroupId()+",db_battinf.tb_battinf "
                    + "  where  db_batt_testdata.tb_batttestdata_"+batt.getBattGroupId()+".BattGroupId=db_battinf.tb_battinf.BattGroupId"
                    + "  and test_record_count in("+batt.getNote()+")"
                    + "  and online_vol<40  "
                    + "  order  by test_starttime desc";
            //System.out.println(sql);
            List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), null, new CallBack() {
				
                @Override
                public List getResults(ResultSet rs) {
                    List list=new ArrayList();
                    try {
                        while(rs.next()){
                                Batttestdata data=new Batttestdata();
                                data.setBattGroupId(rs.getInt("battGroupId"));
                                data.setTest_record_count(rs.getInt("test_record_count"));
                                data.setTest_type(rs.getInt("test_type"));
                                data.setTest_starttime(rs.getTimestamp("test_starttime"));
                                list.add(data);
                        }
                    } catch (SQLException e) {
                        // TODO Auto-generated catch block
                        e.printStackTrace();
                    }
                    return list;
                }
            });
            if(list!=null&&list.size()>0){
                list_all.add(list);
            }
			
        }
		
        return list_all;
    }
	

    public static void main(String[] args) {
        BatttestdataDAOImpl bimpl=new BatttestdataDAOImpl();

 platforms/android/app/src/main/java/com/fgkj/impl/Batttestdata_infDAOImpl.java

@@ -122,8 +122,8 @@
    public List serchByCondition(Object obj) {
        final Batttestdata_inf bti=(Batttestdata_inf)obj;
        String sql="select tb_batttestdata_inf.num,tb_batttestdata_inf.BattGroupId,test_record_count,test_record_count_ex,test_type,record_time_interval,data_new,data_available,record_num,test_starttime,test_starttime_ex,test_starttype,record_time,test_timelong,test_stoptype,group_vol,test_curr,test_cap,max_monnum,max_monvol,min_monnum,min_monvol,mon_num,mon_vol,upload_usr_id"
                +" from db_batt_testdata.tb_batttestdata_inf where "
                +" db_batt_testdata.tb_batttestdata_inf.data_available=1 " +
                +" from tb_batttestdata_inf where "
                +" tb_batttestdata_inf.data_available=1 " +
                " order by test_type asc,test_starttime desc ";
        return DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{bti.getBattGroupId()}, new CallBack() {
            
@@ -177,32 +177,7 @@
            }
        });
    }

    //6.2根据battgroupi和test_starttime查test_record_count
    public List serchTest_record_count(Object obj) {
        Batttestdata_inf tdata=(Batttestdata_inf)obj;
        String sql="select test_record_count  " +
                "from tb_batttestdata_inf where BattGroupId=?  and (test_starttime)=(?)  " +
                "and tb_batttestdata_inf.data_available=1 ";
        return DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{tdata.getBattGroupId(),tdata.getTest_starttime()}, new CallBack() {
			
            public List getResults(ResultSet rs) {
                List list=new ArrayList();
                try {
                    while(rs.next()){
                        Batttestdata_inf tdata=new Batttestdata_inf();
						
                        tdata.setTest_record_count(rs.getInt("test_record_count"));
                        list.add(tdata);
                    }
                } catch (SQLException e) {
                    e.printStackTrace();
                }
                return list;
            }
        });
    }
    //0.7电测放电测试比例
	
    public List serchByInfo(Object obj) {
        return null;
    }

 platforms/android/app/src/main/java/com/fgkj/service/BattinfService.java

New file
@@ -0,0 +1,50 @@
package com.fgkj.service;

import android.os.Handler;
import android.os.Looper;
import android.webkit.JavascriptInterface;
import android.webkit.WebView;

import com.fgkj.action.ServiceModel;
import com.fgkj.dao.BaseDAO;
import com.fgkj.dao.BaseDAOFactory;
import com.google.gson.Gson;

import java.util.List;

public class BattinfService {  
    private BaseDAO dao;
    private ServiceModel model;
    private WebView webView;
    private Gson gson = new Gson();
    public static final String BATTINFSERVICE_NAME = "BattinfService";//JS调用类名

    public BattinfService( WebView webView) {
        this.dao = BaseDAOFactory.getBaseDAO(BaseDAO.BATTINF);
        this.model = new ServiceModel();
        this.webView = webView;
    }
    //查询库中存在的所有电池组信息
    @JavascriptInterface
    public void searchAll() {
        List list=dao.searchAll();
        if(list!=null&&list.size()>0){
            model.code=1;
            model.data=list;
            model.msg="查询成功";
        }else{
            model.code=0;
            model.msg="查询失败";
        }
        SendCallDataToJS("searchAll",model);
    }
    /**
     *  返回数据给前台js
     * @param funName
     * @param model
     */
    public void SendCallDataToJS(String funName,ServiceModel model){
        String call = "javascript:"+funName+"calljs(" + gson.toJson(model) + ")";
        new Handler(Looper.getMainLooper()).post(() -> webView.loadUrl(call));
    }
}

 platforms/android/app/src/main/java/com/sqlite_DaoHelper/DAOHelper.java

@@ -27,6 +27,10 @@
public class DAOHelper {
    public static SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
    public static SimpleDateFormat sdfwithOut=new SimpleDateFormat("yyyy-MM-dd");
    public static Date getSimpDate(Date time){
        //System.out.println(time);
        return new java.sql.Date(time.getTime());
    }
    /**
     * 封装所有更新的操作(添加,删除,修改)
     * @param conn
@@ -42,6 +46,7 @@
            ps = conn.prepareStatement(sql);
            if(values != null){
                for (int i = 0; i < values.length; i++) {
                    //System.out.println(values[i]);
                    ps.setObject(i+1, values[i]);
                }
            }
@@ -70,7 +75,7 @@
    public static List executeQuery(String sql,Connection conn,Object[] values,CallBack call){
        //System.out.println("释放之前************");
        //DBUtil.getConnections();
        System.out.println("connection:"+conn);
        //System.out.println("connection:"+conn);
        PreparedStatement ps = null;
        ResultSet rs = null;
        try {
@@ -327,15 +332,16 @@
    }
    
    public static void main(String[] args) {
          String sql="SELECT * from main.tb_battinf where StationId=? ";
          List list=DAOHelper.executeQuery(sql, DBUtil.getConn(),new Object[]{"4208555"}, new CallBack() {
          String sql="SELECT * from main.tb_battinf where num=?";
          List list=DAOHelper.executeQuery(sql, DBUtil.getConn(),new Object[]{6}, new CallBack() {
              @Override
              public List getResults(ResultSet rs) {
                  List list=new ArrayList();
                  try {
                      while (rs.next()){
                          list.add(rs.getString("StationId"));
                          list.add(rs.getInt("FBSDeviceId"));
                          list.add(rs.getInt("BattGroupId"));
                          list.add(rs.getFloat("MonSerStd"));
                          list.add(rs.getDate("BattInUseDate"));
                    }
                  } catch (SQLException e) {
                      e.printStackTrace();

 platforms/android/app/src/main/java/com/sqlite_DaoHelper/SqliteHelper.java

@@ -35,10 +35,11 @@
    public static  void getSqliteHelper() throws ClassNotFoundException, SQLException{

        String path=System.getProperty("user.dir");
        //System.out.println(path);
       // System.out.println(path);
        dbFilePath = path+"/app/src/main/java/com/sqlite_DaoHelper/fbs9600.db";
        //System.out.println(dbFilePath);
        connection = SqliteHelper.getConnection(dbFilePath);
       // System.out.println(connection);
    }
    /**
     * 获取数据库连接
@@ -190,7 +191,7 @@

    public static void main(String[] args) throws ClassNotFoundException, SQLException{
       //SqliteHelper.getSqliteHelper();
        String sql="SELECT * from \"main\".\" tb_battinf \"";
       String sql="SELECT * from  tb_battinf ";
        getSqliteHelper();
        List list=SqliteHelper.executeQuery(sql, connection, null, new CallBack() {
            @Override

 platforms/android/app/src/main/java/io/cordova/hellocordova/MainActivity.java

@@ -23,6 +23,7 @@
import android.webkit.WebView;

import com.fgkj.action.JsInterface;
import com.fgkj.service.BattinfService;

import org.apache.cordova.*;

@@ -47,5 +48,9 @@
        webview = findViewById(appView.getView().getId());
        // 添加事件
        webview.addJavascriptInterface(new JsInterface(this, webview,MainActivity.this), JsInterface.JS_INTERFACE_NAME);

        webview.addJavascriptInterface(new BattinfService(webview), BattinfService.BATTINFSERVICE_NAME);


    }
}