Skip to content
GitLab
Commit dd6cb7d5 authored by 季圣华's avatar 季圣华
Browse files

整理代码1

parent 631361fc
Hide whitespace changes
Inline Side-by-side
WebRoot/WEB-INF/classes/com/jsh/junitest/AmsTAsset.hbm.xml deleted 100644 → 0
View file @ 631361fc
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
<!--
Mapping file autogenerated by MyEclipse Persistence Tools
-->
<hibernate-mapping>
<class name="com.jsh.junitest.AmsTAsset" table="jsh_asset" catalog="ams">
<id name="id" type="java.lang.Long">
<column name="id" />
<generator class="native" />
</id>
<many-to-one name="amsTAssetname" class="com.jsh.junitest.AmsTAssetname" fetch="select">
<column name="assetnameID" not-null="true" />
</many-to-one>
<many-to-one name="amsTBasicuserByUpdator" class="com.jsh.junitest.AmsTBasicuser" fetch="select">
<column name="updator" />
</many-to-one>
<many-to-one name="amsTBasicuserByCreator" class="com.jsh.junitest.AmsTBasicuser" fetch="select">
<column name="creator" />
</many-to-one>
<many-to-one name="amsTSupplier" class="com.jsh.junitest.AmsTSupplier" fetch="select">
<column name="supplier" />
</many-to-one>
<many-to-one name="amsTBasicuserByUserId" class="com.jsh.junitest.AmsTBasicuser" fetch="select">
<column name="userID" />
</many-to-one>
<property name="location" type="java.lang.String">
<column name="location">
<comment>位置</comment>
</column>
</property>
<property name="labels" type="java.lang.String">
<column name="labels">
<comment>标签：以空格为分隔符</comment>
</column>
</property>
<property name="status" type="java.lang.Short">
<column name="status">
<comment>资产的状态：0==在库，1==在用，2==消费</comment>
</column>
</property>
<property name="price" type="java.lang.Long">
<column name="price" precision="10" scale="0">
<comment>购买价格</comment>
</column>
</property>
<property name="purchasedate" type="java.sql.Timestamp">
<column name="purchasedate" length="19">
<comment>购买日期</comment>
</column>
</property>
<property name="periodofvalidity" type="java.sql.Timestamp">
<column name="periodofvalidity" length="19">
<comment>有效日期</comment>
</column>
</property>
<property name="warrantydate" type="java.sql.Timestamp">
<column name="warrantydate" length="19">
<comment>保修日期</comment>
</column>
</property>
<property name="assetnum" type="java.lang.String">
<column name="assetnum">
<comment>资产编号</comment>
</column>
</property>
<property name="serialnum" type="java.lang.String">
<column name="serialnum">
<comment>资产序列号</comment>
</column>
</property>
<property name="description" type="java.lang.String">
<column name="description">
<comment>描述信息</comment>
</column>
</property>
<property name="addMonth" type="java.lang.String">
<column name="addMonth" length="30">
<comment>资产添加时间，统计报表使用</comment>
</column>
</property>
<property name="createtime" type="java.sql.Timestamp">
<column name="createtime" length="19" />
</property>
<property name="updatetime" type="java.sql.Timestamp">
<column name="updatetime" length="19" />
</property>
</class>
</hibernate-mapping>
src/com/jsh/action/materials/DepotHeadAction.java
View file @ dd6cb7d5
...@@ -15,12 +15,9 @@ import org.springframework.dao.DataAccessException; ...@@ -15,12 +15,9 @@ import org.springframework.dao.DataAccessException;
import com.jsh.base.BaseAction; import com.jsh.base.BaseAction;
import com.jsh.base.Log; import com.jsh.base.Log;
import com.jsh.exception.AmsException;
import com.jsh.model.po.Basicuser;
import com.jsh.model.po.Building; import com.jsh.model.po.Building;
import com.jsh.model.po.Depot; import com.jsh.model.po.Depot;
import com.jsh.model.po.DepotHead; import com.jsh.model.po.DepotHead;
import com.jsh.model.po.DepotItem;
import com.jsh.model.po.Logdetails; import com.jsh.model.po.Logdetails;
import com.jsh.model.po.Person; import com.jsh.model.po.Person;
import com.jsh.model.po.Supplier; import com.jsh.model.po.Supplier;
......
src/com/jsh/junitest/AmsTAsset.hbm.xml deleted 100644 → 0
View file @ 631361fc
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
<!--
Mapping file autogenerated by MyEclipse Persistence Tools
-->
<hibernate-mapping>
<class name="com.jsh.junitest.AmsTAsset" table="jsh_asset" catalog="ams">
<id name="id" type="java.lang.Long">
<column name="id" />
<generator class="native" />
</id>
<many-to-one name="amsTAssetname" class="com.jsh.junitest.AmsTAssetname" fetch="select">
<column name="assetnameID" not-null="true" />
</many-to-one>
<many-to-one name="amsTBasicuserByUpdator" class="com.jsh.junitest.AmsTBasicuser" fetch="select">
<column name="updator" />
</many-to-one>
<many-to-one name="amsTBasicuserByCreator" class="com.jsh.junitest.AmsTBasicuser" fetch="select">
<column name="creator" />
</many-to-one>
<many-to-one name="amsTSupplier" class="com.jsh.junitest.AmsTSupplier" fetch="select">
<column name="supplier" />
</many-to-one>
<many-to-one name="amsTBasicuserByUserId" class="com.jsh.junitest.AmsTBasicuser" fetch="select">
<column name="userID" />
</many-to-one>
<property name="location" type="java.lang.String">
<column name="location">
<comment>位置</comment>
</column>
</property>
<property name="labels" type="java.lang.String">
<column name="labels">
<comment>标签：以空格为分隔符</comment>
</column>
</property>
<property name="status" type="java.lang.Short">
<column name="status">
<comment>资产的状态：0==在库，1==在用，2==消费</comment>
</column>
</property>
<property name="price" type="java.lang.Long">
<column name="price" precision="10" scale="0">
<comment>购买价格</comment>
</column>
</property>
<property name="purchasedate" type="java.sql.Timestamp">
<column name="purchasedate" length="19">
<comment>购买日期</comment>
</column>
</property>
<property name="periodofvalidity" type="java.sql.Timestamp">
<column name="periodofvalidity" length="19">
<comment>有效日期</comment>
</column>
</property>
<property name="warrantydate" type="java.sql.Timestamp">
<column name="warrantydate" length="19">
<comment>保修日期</comment>
</column>
</property>
<property name="assetnum" type="java.lang.String">
<column name="assetnum">
<comment>资产编号</comment>
</column>
</property>
<property name="serialnum" type="java.lang.String">
<column name="serialnum">
<comment>资产序列号</comment>
</column>
</property>
<property name="description" type="java.lang.String">
<column name="description">
<comment>描述信息</comment>
</column>
</property>
<property name="addMonth" type="java.lang.String">
<column name="addMonth" length="30">
<comment>资产添加时间，统计报表使用</comment>
</column>
</property>
<property name="createtime" type="java.sql.Timestamp">
<column name="createtime" length="19" />
</property>
<property name="updatetime" type="java.sql.Timestamp">
<column name="updatetime" length="19" />
</property>
</class>
</hibernate-mapping>
src/com/jsh/junitest/common/ExtendsTest.java deleted 100644 → 0
View file @ 631361fc
package com.jsh.junitest.common;
import junit.framework.TestCase;
public class ExtendsTest extends TestCase
{
public void testExtends()
{
}
}
src/com/jsh/junitest/common/ForTest.java deleted 100644 → 0
View file @ 631361fc
package com.jsh.junitest.common;
import junit.framework.TestCase;
public class ForTest extends TestCase
{
public void testrrr()
{
String[] aa= {"111","222","333"};
for(String str:aa)
System.out.println(str);
System.out.println("bbb");
}
}
src/com/jsh/junitest/common/ImportExcelTest.java deleted 100644 → 0
View file @ 631361fc
package com.jsh.junitest.common;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.Map;
import org.apache.poi.hssf.usermodel.HSSFSheet;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.Row;
import com.jsh.model.po.Asset;
public class ImportExcelTest
{
/**
* 文件路径
*/
private static final String excelPath = "D:/movie/qq.xls";
/**
* 解析后的data
*/
private static Map<String,Asset> data = new LinkedHashMap<String, Asset>();
/**
* 解析数据格式
*/
public static void paseData()
{
int total = 0;
try
{
//创建对Excel工作簿文件的引用
HSSFWorkbook workbook = new HSSFWorkbook(new FileInputStream(excelPath));
//创建对工作表的引用,获取第一个工作表的内容
HSSFSheet sheet = workbook.getSheetAt(0);
/**
* =====================================
* 1、此处要增加报盘文件的验证，如果不是报盘文件需要进行特殊的处理,3列
* 2、报盘文件内容为空处理
* 3、如果是修改过的报盘文件内容
*/
Iterator<Row> itsheet = sheet.rowIterator();
while(itsheet.hasNext())
{
System.out.println();
Row row = itsheet.next();
//excel表格第几行数据 从1开始 0 是表头
int rowNum = row.getRowNum();
/**
* 表头跳过不读
*/
if(0 == rowNum)
continue;
total ++;
Iterator<Cell> it = row.cellIterator();
// PreAuthExcelTip preAuth = new PreAuthExcelTip();
// preAuth.setAuthState(authState);
// preAuth.setWrongRow(rowNum);
Cell cell = null;
String preAuthMacAddr = "";
//判断行号
int i = 0;
while(it.hasNext())
{
cell = it.next();
i = cell.getColumnIndex();
System.out.print(cell.getCellType() + " " + cell.getStringCellValue());
if(1 == i)
{
String contentValue = cell.getStringCellValue();
if(null == contentValue || "".equals(contentValue))
break;
// preAuth.setSnNo(cell.getStringCellValue());
}
if(2 == i)
{
String contentValue = cell.getStringCellValue();
if(null == contentValue || "".equals(contentValue))
break;
preAuthMacAddr = contentValue;
// preAuth.setMacAddr(PreAuthUtil.changeMacFormt(preAuthMacAddr));
}
}
System.out.println("此行总共有" + i + "列");
//报盘文件为3列，否则不是报盘文件
// if(i != 2)
// {
// PreAuthUtil.showMessageDialog("导入文件格式不合法，请重新选择文件进行操作！");
// return null;
// }
// //MAC地址合法添加到正确的MAC地址数组
// if(PreAuthUtil.isMacAddress(preAuthMacAddr))
// {
// if(allMacAddress.contains(preAuthMacAddr))
// {
// repeatPreAuth.add(preAuth);
// }
// else
// {
// allMacAddress.add(preAuthMacAddr);
// rightPreAuth.add(preAuth);
// }
// }
// else
// {
// wrongPreAuth.add(preAuth);
// }
}
// if((null==rightPreAuth || rightPreAuth.size()==0)&& (null == wrongPreAuth|| wrongPreAuth.size() ==0)&&(null == repeatPreAuth ||repeatPreAuth.size() ==0))
// {
// PreAuthUtil.showMessageDialog("报盘文件内容为空，请重新选择！");
// return map;
// }
// //处理完读取文件，返回处理结果
// map.put("rightMacAddr", rightPreAuth);
// map.put("wrongMacAddr", wrongPreAuth);
// map.put("repeatMacAddr", repeatPreAuth);
}
catch (FileNotFoundException e)
{
System.out.println("预授权读取文件异常 : " + e );
e.printStackTrace();
// PreAuthUtil.showMessageDialog("预授权读取excel文件异常:找不到指定文件！");
// return map;
}
catch (IOException e)
{
System.out.println("预授权读取文件IO异常 : " + e );
e.printStackTrace();
// PreAuthUtil.showMessageDialog("读取excel文件异常，请确认文件格式是否正确！");
// return map;
}
System.out.println("excel表格总共有 " + total + " 条记录!");
}
/**
* @param args
*/
public static void main(String[] args)
{
// TODO Auto-generated method stub
new ImportExcelTest().paseData();
}
}
src/com/jsh/junitest/common/SumTest.java deleted 100644 → 0
View file @ 631361fc
package com.jsh.junitest.common;
import junit.framework.TestCase;
public class SumTest extends TestCase
{
public void testSum()
{
//================宋芳====================
int[] songfang = {6,6,6,-4,-4,-6,3,12,6,-6,6,-12,3,-6,12};
int songfangSum = 0;
int songying = 0;
int songshu = 0;
for(int i = 0 ;i < songfang.length;i ++)
{
songfangSum += songfang[i];
if(songfang[i] > 0)
songying ++;
else
songshu ++;
}
System.out.println("宋芳斗地主局数：" + songfang.length + ",赢" + songying + "局，输" + songshu +"局,统计玩牌的计分是：" + songfangSum);
//================宋芳====================
//===============王维========================
int[] wangwei = {-3,-3,-3,8,2,12,-6,-6,6,3,-3,6,-6,3,-6};
int wangweiSum = 0;
int wangweiying = 0;
int wangweishu = 0;
for(int i = 0 ;i < wangwei.length;i ++)
{
wangweiSum += wangwei[i];
if(wangwei[i] > 0)
wangweiying ++;
else
wangweishu ++;
}
System.out.println("王维斗地主局数：" + wangwei.length + ",赢" + wangweiying + "局，输" + wangweishu +"局,统计玩牌的计分是：" + wangweiSum);
//===============王维========================
//===============王鹏========================
int[] wangpeng = {-3,-3,-3,-4,2,-6,3,-6,-12,3,-3,6,3,3,-6};
int wangpengSum = 0;
int wangpengying = 0;
int wangpengshu = 0;
for(int i = 0 ;i < wangpeng.length;i ++)
{
wangpengSum += wangpeng[i];
if(wangpeng[i] > 0)
wangpengying ++;
else
wangpengshu ++;
}
System.out.println("王鹏斗地主局数：" + wangwei.length + ",赢" + wangpengying + "局，输" + wangpengshu +"局,统计玩牌的计分是：" + wangpengSum);
//===============王鹏========================
int[] jishenghua={3,-6,2,5,-9,4,7,-8,-6,-1,4};
int jishenghuaSum=0;
int jishenghuaYing=0;
int jishenghuaShu=0;
for(int i=0;i<jishenghua.length;i++)
{
jishenghuaSum+=jishenghua[i];
if(jishenghua[i]>0)
jishenghuaYing++;
else
jishenghuaShu++;
}
System.out.println("季圣华斗地主局数："+jishenghua.length+",赢"+jishenghuaYing+"局，输"+jishenghuaShu+"局,统计玩牌的计分是："+jishenghuaSum);
}
}
src/com/jsh/junitest/common/whileTest.java deleted 100644 → 0
View file @ 631361fc
package com.jsh.junitest.common;
import net.sf.json.JSONArray;
import junit.framework.TestCase;
public class whileTest extends TestCase
{
public void testWhile()
{
int i = 0;
for(;;i ++)
{
while(i == 10)
System.out.println("aa" + i);
break;
}
}
}
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment