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

整理代码

parent 46b75fec
Expand all Hide whitespace changes
Inline Side-by-side
sql/jsh_erp.sql
View file @ 55135aca
This diff is collapsed.
src/com/jsh/action/asset/AssetAction.java
View file @ 55135aca
This diff is collapsed.
src/com/jsh/action/asset/ReportAction.java
View file @ 55135aca
package com.jsh.action.asset; package com.jsh.action.asset;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
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.exception.JshException;
import com.jsh.model.po.Asset; import com.jsh.model.po.Asset;
import com.jsh.model.vo.asset.ReportModel; import com.jsh.model.vo.asset.ReportModel;
import com.jsh.service.asset.ReportIService; import com.jsh.service.asset.ReportIService;
import com.jsh.util.common.PageUtil; import com.jsh.util.common.PageUtil;
@SuppressWarnings("serial") @SuppressWarnings("serial")
public class ReportAction extends BaseAction<ReportModel> public class ReportAction extends BaseAction<ReportModel>
{ {
private ReportModel model = new ReportModel(); private ReportModel model = new ReportModel();
private ReportIService reportService; private ReportIService reportService;
/** /**
* 查找资产信息 * 查找资产信息
* @return * @return
*/ */
public String find() public String find()
{ {
try try
{ {
PageUtil<Asset> pageUtil = new PageUtil<Asset>(); PageUtil<Asset> pageUtil = new PageUtil<Asset>();
pageUtil.setPageSize(0); pageUtil.setPageSize(0);
pageUtil.setCurPage(0); pageUtil.setCurPage(0);
pageUtil.setAdvSearch(getCondition()); pageUtil.setAdvSearch(getCondition());
String reportType = getReportType(new HashMap<String,Object>()); String reportType = getReportType(new HashMap<String,Object>());
reportService.find(pageUtil,reportType.split("_")[0],reportType.split("_")[1]); reportService.find(pageUtil,reportType.split("_")[0],reportType.split("_")[1]);
model.getShowModel().setReportData(pageUtil.getPageList()); model.getShowModel().setReportData(pageUtil.getPageList());
} }
catch (AmsException e) catch (JshException e)
{ {
Log.errorFileSync(">>>>>>>>>查找资产信息异常", e); Log.errorFileSync(">>>>>>>>>查找资产信息异常", e);
model.getShowModel().setMsgTip("get report data exception"); model.getShowModel().setMsgTip("get report data exception");
} }
return SUCCESS; return SUCCESS;
} }
/** /**
* 拼接搜索条件 * 拼接搜索条件
* @return * @return
*/ */
private Map<String,Object> getCondition() private Map<String,Object> getCondition()
{ {
/** /**
* 拼接搜索条件 * 拼接搜索条件
*/ */
Map<String,Object> condition = new HashMap<String,Object>(); Map<String,Object> condition = new HashMap<String,Object>();
condition.put("assetname.id_n_eq", model.getAssetNameID()); condition.put("assetname.id_n_eq", model.getAssetNameID());
condition.put("assetname.category.id_n_eq", model.getAssetCategoryID()); condition.put("assetname.category.id_n_eq", model.getAssetCategoryID());
condition.put("user.id_n_eq", model.getUsernameID()); condition.put("user.id_n_eq", model.getUsernameID());
condition.put("status_n_eq", model.getStatus()); condition.put("status_n_eq", model.getStatus());
condition.put("supplier.id_n_eq", model.getSupplierID()); condition.put("supplier.id_n_eq", model.getSupplierID());
condition.put("dataSum_s_order","desc"); condition.put("dataSum_s_order","desc");
//拼接统计数据条件 //拼接统计数据条件
getReportType(condition); getReportType(condition);
return condition; return condition;
} }
/** /**
* 获取统计条件 * 获取统计条件
* @param condition * @param condition
*/ */
private String getReportType(Map<String,Object> condition) private String getReportType(Map<String,Object> condition)
{ {
// <option value="0">资产状态</option> // <option value="0">资产状态</option>
// <option value="1">资产类型</option> // <option value="1">资产类型</option>
// <option value="2">供应商</option> // <option value="2">供应商</option>
// <option value="3">资产名称</option> // <option value="3">资产名称</option>
// <option value="4">所属用户</option> // <option value="4">所属用户</option>
int reportType = model.getReportType(); int reportType = model.getReportType();
String reportTypeInfo = ""; String reportTypeInfo = "";
String reportTypeName = ""; String reportTypeName = "";
switch(reportType) switch(reportType)
{ {
case 0: case 0:
condition.put("status_s_gb", "group"); condition.put("status_s_gb", "group");
reportTypeInfo = "status"; reportTypeInfo = "status";
reportTypeName = "status"; reportTypeName = "status";
break; break;
case 1: case 1:
condition.put("assetname.category.id_s_gb", "group"); condition.put("assetname.category.id_s_gb", "group");
reportTypeInfo = "assetname.category.id"; reportTypeInfo = "assetname.category.id";
reportTypeName = "assetname.category.assetname"; reportTypeName = "assetname.category.assetname";
break; break;
case 2: case 2:
condition.put("supplier.id_s_gb", "group"); condition.put("supplier.id_s_gb", "group");
reportTypeInfo = "supplier.id"; reportTypeInfo = "supplier.id";
reportTypeName = "supplier.supplier"; reportTypeName = "supplier.supplier";
break; break;
case 3: case 3:
condition.put("assetname.id_s_gb", "group"); condition.put("assetname.id_s_gb", "group");
reportTypeInfo = "assetname.id"; reportTypeInfo = "assetname.id";
reportTypeName = "assetname.assetname"; reportTypeName = "assetname.assetname";
break; break;
case 4: case 4:
condition.put("user.id_s_gb", "group"); condition.put("user.id_s_gb", "group");
reportTypeInfo = "user.id"; reportTypeInfo = "user.id";
reportTypeName = "user.username"; reportTypeName = "user.username";
break; break;
} }
return reportTypeInfo + "_" + reportTypeName; return reportTypeInfo + "_" + reportTypeName;
} }
//=========Spring注入以及model驱动公共方法=========== //=========Spring注入以及model驱动公共方法===========
public void setReportService(ReportIService reportService) public void setReportService(ReportIService reportService)
{ {
this.reportService = reportService; this.reportService = reportService;
} }
@Override @Override
public ReportModel getModel() public ReportModel getModel()
{ {
return model; return model;
} }
} }
src/com/jsh/action/basic/AppAction.java
View file @ 55135aca
This diff is collapsed.
src/com/jsh/action/basic/DepotAction.java
View file @ 55135aca
This diff is collapsed.
src/com/jsh/action/basic/RoleAction.java
View file @ 55135aca
This diff is collapsed.
src/com/jsh/action/basic/UserAction.java
View file @ 55135aca
...@@ -41,6 +41,7 @@ public class UserAction extends BaseAction<UserModel> ...@@ -41,6 +41,7 @@ public class UserAction extends BaseAction<UserModel>
try try
{ {
password = Tools.md5Encryp(password); password = Tools.md5Encryp(password);
System.out.println(password);
} }
catch (NoSuchAlgorithmException e) catch (NoSuchAlgorithmException e)
{ {
...@@ -136,7 +137,7 @@ public class UserAction extends BaseAction<UserModel> ...@@ -136,7 +137,7 @@ public class UserAction extends BaseAction<UserModel>
user.setIsystem((short)1); user.setIsystem((short)1);
user.setIsmanager((short)1); user.setIsmanager((short)1);
user.setLoginame(model.getLoginame()); user.setLoginame(model.getLoginame());
String password ="00000000"; String password ="123456";
//因密码用MD5加密，需要对密码进行转化 //因密码用MD5加密，需要对密码进行转化
try try
{ {
......
src/com/jsh/action/materials/BuildingAction.java
View file @ 55135aca
package com.jsh.action.materials; package com.jsh.action.materials;
import java.io.IOException; import java.io.IOException;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import net.sf.json.JSONArray; import net.sf.json.JSONArray;
import net.sf.json.JSONObject; import net.sf.json.JSONObject;
import org.springframework.dao.DataAccessException; 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.model.po.Depot; import com.jsh.model.po.Depot;
import com.jsh.model.po.Building; import com.jsh.model.po.Building;
import com.jsh.model.po.Logdetails; import com.jsh.model.po.Logdetails;
import com.jsh.model.vo.materials.BuildingModel; import com.jsh.model.vo.materials.BuildingModel;
import com.jsh.service.materials.BuildingIService; import com.jsh.service.materials.BuildingIService;
import com.jsh.util.common.PageUtil; import com.jsh.util.common.PageUtil;
@SuppressWarnings("serial") @SuppressWarnings("serial")
public class BuildingAction extends BaseAction<BuildingModel> public class BuildingAction extends BaseAction<BuildingModel>
{ {
private BuildingIService buildingService; private BuildingIService buildingService;
private BuildingModel model = new BuildingModel(); private BuildingModel model = new BuildingModel();
@SuppressWarnings({ "rawtypes", "unchecked" }) @SuppressWarnings({ "rawtypes", "unchecked" })
public String getBasicData() public String getBasicData()
{ {
Map<String,List> mapData = model.getShowModel().getMap(); Map<String,List> mapData = model.getShowModel().getMap();
PageUtil pageUtil = new PageUtil(); PageUtil pageUtil = new PageUtil();
pageUtil.setPageSize(0); pageUtil.setPageSize(0);
pageUtil.setCurPage(0); pageUtil.setCurPage(0);
try try
{ {
Map<String,Object> condition = pageUtil.getAdvSearch(); Map<String,Object> condition = pageUtil.getAdvSearch();
condition.put("ProjectId_n_eq", model.getProjectId()); condition.put("ProjectId_n_eq", model.getProjectId());
condition.put("Id_s_order", "asc"); condition.put("Id_s_order", "asc");
buildingService.find(pageUtil); buildingService.find(pageUtil);
mapData.put("buildingList", pageUtil.getPageList()); mapData.put("buildingList", pageUtil.getPageList());
} }
catch (Exception e) catch (Exception e)
{ {
Log.errorFileSync(">>>>>>>>>>>>>查找系统基础数据信息异常", e); Log.errorFileSync(">>>>>>>>>>>>>查找系统基础数据信息异常", e);
model.getShowModel().setMsgTip("exceptoin"); model.getShowModel().setMsgTip("exceptoin");
} }
return SUCCESS; return SUCCESS;
} }
/** /**
* 增加单元 * 增加单元
* @return * @return
*/ */
public void create() public void create()
{ {
Log.infoFileSync("==================开始调用增加单元信息方法create()==================="); Log.infoFileSync("==================开始调用增加单元信息方法create()===================");
Boolean flag = false; Boolean flag = false;
try try
{ {
Building building = new Building(); Building building = new Building();
building.setDepot(new Depot(model.getProjectId())); building.setDepot(new Depot(model.getProjectId()));
building.setName(model.getName()); building.setName(model.getName());
building.setRemark(model.getRemark()); building.setRemark(model.getRemark());
building.setEnabled(model.getEnabled()); building.setEnabled(model.getEnabled());
buildingService.create(building); buildingService.create(building);
//========标识位=========== //========标识位===========
flag = true; flag = true;
//记录操作日志使用 //记录操作日志使用
tipMsg = "成功"; tipMsg = "成功";
tipType = 0; tipType = 0;
} }
catch (DataAccessException e) catch (DataAccessException e)
{ {
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>增加单元信息异常", e); Log.errorFileSync(">>>>>>>>>>>>>>>>>>>增加单元信息异常", e);
flag = false; flag = false;
tipMsg = "失败"; tipMsg = "失败";
tipType = 1; tipType = 1;
} }
finally finally
{ {
try try
{ {
toClient(flag.toString()); toClient(flag.toString());
} }
catch (IOException e) catch (IOException e)
{ {
Log.errorFileSync(">>>>>>>>>>>>增加单元信息回写客户端结果异常", e); Log.errorFileSync(">>>>>>>>>>>>增加单元信息回写客户端结果异常", e);
} }
} }
logService.create(new Logdetails(getUser(), "增加单元", model.getClientIp(), logService.create(new Logdetails(getUser(), "增加单元", model.getClientIp(),
new Timestamp(System.currentTimeMillis()) new Timestamp(System.currentTimeMillis())
, tipType, "增加单元名称为 "+ model.getName() + " " + tipMsg + "！", "增加单元" + tipMsg)); , tipType, "增加单元名称为 "+ model.getName() + " " + tipMsg + "！", "增加单元" + tipMsg));
Log.infoFileSync("==================结束调用增加单元方法create()==================="); Log.infoFileSync("==================结束调用增加单元方法create()===================");
} }
/** /**
* 删除单元 * 删除单元
* @return * @return
*/ */
public String delete() public String delete()
{ {
Log.infoFileSync("====================开始调用删除单元信息方法delete()================"); Log.infoFileSync("====================开始调用删除单元信息方法delete()================");
try try
{ {
buildingService.delete(model.getBuildingID()); buildingService.delete(model.getBuildingID());
tipMsg = "成功"; tipMsg = "成功";
tipType = 0; tipType = 0;
} }
catch (DataAccessException e) catch (DataAccessException e)
{ {
Log.errorFileSync(">>>>>>>>>>>删除ID为 " + model.getBuildingID() + " 的单元异常", e); Log.errorFileSync(">>>>>>>>>>>删除ID为 " + model.getBuildingID() + " 的单元异常", e);
tipMsg = "失败"; tipMsg = "失败";
tipType = 1; tipType = 1;
} }
model.getShowModel().setMsgTip(tipMsg); model.getShowModel().setMsgTip(tipMsg);
logService.create(new Logdetails(getUser(), "删除单元", model.getClientIp(), logService.create(new Logdetails(getUser(), "删除单元", model.getClientIp(),
new Timestamp(System.currentTimeMillis()) new Timestamp(System.currentTimeMillis())
, tipType, "删除单元ID为 "+ model.getBuildingID() + " " + tipMsg + "！", "删除单元" + tipMsg)); , tipType, "删除单元ID为 "+ model.getBuildingID() + " " + tipMsg + "！", "删除单元" + tipMsg));
Log.infoFileSync("====================结束调用删除单元信息方法delete()================"); Log.infoFileSync("====================结束调用删除单元信息方法delete()================");
return SUCCESS; return SUCCESS;
} }
/** /**
* 更新单元 * 更新单元
* @return * @return
*/ */
public void update() public void update()
{ {
Boolean flag = false; Boolean flag = false;
try try
{ {
Building building = buildingService.get(model.getBuildingID()); Building building = buildingService.get(model.getBuildingID());
building.setDepot(new Depot(model.getProjectId())); building.setDepot(new Depot(model.getProjectId()));
building.setName(model.getName()); building.setName(model.getName());
building.setRemark(model.getRemark()); building.setRemark(model.getRemark());
building.setEnabled(model.getEnabled()); building.setEnabled(model.getEnabled());
buildingService.update(building); buildingService.update(building);
flag = true; flag = true;
tipMsg = "成功"; tipMsg = "成功";
tipType = 0; tipType = 0;
} }
catch (DataAccessException e) catch (DataAccessException e)
{ {
Log.errorFileSync(">>>>>>>>>>>>>修改单元ID为 ： " + model.getBuildingID() + "信息失败", e); Log.errorFileSync(">>>>>>>>>>>>>修改单元ID为 ： " + model.getBuildingID() + "信息失败", e);
flag = false; flag = false;
tipMsg = "失败"; tipMsg = "失败";
tipType = 1; tipType = 1;
} }
finally finally
{ {
try try
{ {
toClient(flag.toString()); toClient(flag.toString());
} }
catch (IOException e) catch (IOException e)
{ {
Log.errorFileSync(">>>>>>>>>>>>修改单元回写客户端结果异常", e); Log.errorFileSync(">>>>>>>>>>>>修改单元回写客户端结果异常", e);
} }
} }
logService.create(new Logdetails(getUser(), "更新单元", model.getClientIp(), logService.create(new Logdetails(getUser(), "更新单元", model.getClientIp(),
new Timestamp(System.currentTimeMillis()) new Timestamp(System.currentTimeMillis())
, tipType, "更新单元ID为 "+ model.getBuildingID() + " " + tipMsg + "！", "更新单元" + tipMsg)); , tipType, "更新单元ID为 "+ model.getBuildingID() + " " + tipMsg + "！", "更新单元" + tipMsg));
} }
/** /**
* 批量删除指定ID单元 * 批量删除指定ID单元
* @return * @return
*/ */
public String batchDelete() public String batchDelete()
{ {
try try
{ {
buildingService.batchDelete(model.getBuildingIDs()); buildingService.batchDelete(model.getBuildingIDs());
model.getShowModel().setMsgTip("成功"); model.getShowModel().setMsgTip("成功");
//记录操作日志使用 //记录操作日志使用
tipMsg = "成功"; tipMsg = "成功";
tipType = 0; tipType = 0;
} }
catch (DataAccessException e) catch (DataAccessException e)
{ {
Log.errorFileSync(">>>>>>>>>>>批量删除单元ID为：" + model.getBuildingIDs() + "信息异常", e); Log.errorFileSync(">>>>>>>>>>>批量删除单元ID为：" + model.getBuildingIDs() + "信息异常", e);
tipMsg = "失败"; tipMsg = "失败";
tipType = 1; tipType = 1;
} }
logService.create(new Logdetails(getUser(), "批量删除单元", model.getClientIp(), logService.create(new Logdetails(getUser(), "批量删除单元", model.getClientIp(),
new Timestamp(System.currentTimeMillis()) new Timestamp(System.currentTimeMillis())
, tipType, "批量删除单元ID为 "+ model.getBuildingIDs() + " " + tipMsg + "！", "批量删除单元" + tipMsg)); , tipType, "批量删除单元ID为 "+ model.getBuildingIDs() + " " + tipMsg + "！", "批量删除单元" + tipMsg));
return SUCCESS; return SUCCESS;
} }
/** /**
* 查找单元信息 * 查找单元信息
* @return * @return
*/ */
public void findBy() public void findBy()
{ {
try try
{ {
PageUtil<Building> pageUtil = new PageUtil<Building>(); PageUtil<Building> pageUtil = new PageUtil<Building>();
pageUtil.setPageSize(model.getPageSize()); pageUtil.setPageSize(model.getPageSize());
pageUtil.setCurPage(model.getPageNo()); pageUtil.setCurPage(model.getPageNo());
pageUtil.setAdvSearch(getCondition()); pageUtil.setAdvSearch(getCondition());
buildingService.find(pageUtil); buildingService.find(pageUtil);
List<Building> dataList = pageUtil.getPageList(); List<Building> dataList = pageUtil.getPageList();
//开始拼接json数据 //开始拼接json数据
// {"total":28,"rows":[ // {"total":28,"rows":[
// {"productid":"AV-CB-01","attr1":"Adult Male","itemid":"EST-18"} // {"productid":"AV-CB-01","attr1":"Adult Male","itemid":"EST-18"}
// ]} // ]}
JSONObject outer = new JSONObject(); JSONObject outer = new JSONObject();
outer.put("total", pageUtil.getTotalCount()); outer.put("total", pageUtil.getTotalCount());
//存放数据json数组 //存放数据json数组
JSONArray dataArray = new JSONArray(); JSONArray dataArray = new JSONArray();
if(null != dataList) if(null != dataList)
{ {
for(Building building:dataList) for(Building building:dataList)
{ {
JSONObject item = new JSONObject(); JSONObject item = new JSONObject();
item.put("Id", building.getId()); item.put("Id", building.getId());
item.put("ProjectId", building.getDepot().getId()); item.put("ProjectId", building.getDepot().getId());
item.put("ProjectName", building.getDepot().getName()); item.put("ProjectName", building.getDepot().getName());
item.put("Name", building.getName()); item.put("Name", building.getName());
item.put("Remark", building.getRemark()); item.put("Remark", building.getRemark());
item.put("Enabled", building.getEnabled()); item.put("Enabled", building.getEnabled());
item.put("op", 1); item.put("op", 1);
dataArray.add(item); dataArray.add(item);
} }
} }
outer.put("rows", dataArray); outer.put("rows", dataArray);
//回写查询结果 //回写查询结果
toClient(outer.toString()); toClient(outer.toString());
} }
catch (DataAccessException e) catch (DataAccessException e)
{ {
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找单元信息异常", e); Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找单元信息异常", e);
} }
catch (IOException e) catch (IOException e)
{ {
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询单元信息结果异常", e); Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询单元信息结果异常", e);
} }
} }
/** /**
* 拼接搜索条件 * 拼接搜索条件
* @return * @return
*/ */
private Map<String,Object> getCondition() private Map<String,Object> getCondition()
{ {
/** /**
* 拼接搜索条件 * 拼接搜索条件
*/ */
Map<String,Object> condition = new HashMap<String,Object>(); Map<String,Object> condition = new HashMap<String,Object>();
condition.put("ProjectId_n_eq", model.getProjectId()); condition.put("ProjectId_n_eq", model.getProjectId());
condition.put("Name_s_like", model.getName()); condition.put("Name_s_like", model.getName());
condition.put("Id_s_order", "asc"); condition.put("Id_s_order", "asc");
return condition; return condition;
} }
//=============以下spring注入以及Model驱动公共方法，与Action处理无关================== //=============以下spring注入以及Model驱动公共方法，与Action处理无关==================
@Override @Override
public BuildingModel getModel() public BuildingModel getModel()
{ {
return model; return model;
} }
public void setBuildingService(BuildingIService buildingService) public void setBuildingService(BuildingIService buildingService)
{ {
this.buildingService = buildingService; this.buildingService = buildingService;
} }
} }
src/com/jsh/base/BaseAction.java
View file @ 55135aca
This diff is collapsed.
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