From e767b6182c2508acc983d095a66e48e3ded2d82e Mon Sep 17 00:00:00 2001 From: jiang Date: Wed, 3 Dec 2025 20:11:16 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=BA=E5=85=B7=E5=BA=93=E5=AD=98=E6=94=B6?= =?UTF-8?q?=E8=97=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mybatis/bm/ProjectManageMapper.xml | 3 +- resources/mybatis/bm/ProjectManageMapper.xml | 355 ++++----- .../controller/ProjectManageController.java | 672 +++++++++--------- src/com/bonus/bm/dao/ProjectManageDao.java | 27 +- .../bm/service/ProjectManageService.java | 6 +- .../bm/service/ProjectManageServiceImp.java | 99 +-- 6 files changed, 608 insertions(+), 554 deletions(-) diff --git a/bin/resources/mybatis/bm/ProjectManageMapper.xml b/bin/resources/mybatis/bm/ProjectManageMapper.xml index 3ddfb53..0df6006 100644 --- a/bin/resources/mybatis/bm/ProjectManageMapper.xml +++ b/bin/resources/mybatis/bm/ProjectManageMapper.xml @@ -160,7 +160,8 @@ LEFT JOIN bm_company bmc on bmc.ID = bmp.COMPANY_ID where bmp.ID=#{id} - + + update bm_project diff --git a/resources/mybatis/bm/ProjectManageMapper.xml b/resources/mybatis/bm/ProjectManageMapper.xml index b874e10..e9532e0 100644 --- a/resources/mybatis/bm/ProjectManageMapper.xml +++ b/resources/mybatis/bm/ProjectManageMapper.xml @@ -1,120 +1,125 @@ - - + + - select bmp.ID as id,bmp.`NAME` as name,bmp.COMPANY_ID as companyId,bmp.TIME as projectTime, - bmc.`NAME` as companyName,bmp.TYPE_ID as typeId,bpt.`NAME` as typeName, - bmp.VOL_ID as volId,bvl.`NAME` as volName, - bmp.NUM as num,bmp.MANAGER as manager,bmp.NATURE as nature, - bmp.TELPHONE as telphone,bmp.PHONE as phone,bmp.FAX as fax, - bmp.ADDRESS as address,bmp.REMARKS as remarks, - bmp.MATERIAL_CLERK as materialClerk,bmp.CLERK_PHONE as clerkPhone, - bmp.IS_BALANCE_END as isBalanceEnd, - bmp.KILOMETER as kilometer - from bm_project bmp - LEFT JOIN bm_vol_level bvl on bvl.ID = bmp.VOL_ID - LEFT JOIN bm_project_type bpt on bmp.TYPE_ID = bpt.ID - LEFT JOIN bm_company bmc on bmc.ID = bmp.COMPANY_ID - where 1=1 and bmp.IS_ACTIVE=1 and bmp.IS_BALANCE_END=#{param.isBal} - - - and bmp.COMPANY_ID =#{param.companyId} - - - and bmp.TYPE_ID =#{param.typeId} - + bmc.`NAME` as companyName,bmp.TYPE_ID as typeId,bpt.`NAME` as typeName, + bmp.VOL_ID as volId,bvl.`NAME` as volName, + bmp.NUM as num,bmp.MANAGER as manager,bmp.NATURE as nature, + bmp.TELPHONE as telphone,bmp.PHONE as phone,bmp.FAX as fax, + bmp.ADDRESS as address,bmp.REMARKS as remarks, + bmp.MATERIAL_CLERK as materialClerk,bmp.CLERK_PHONE as clerkPhone, + bmp.IS_BALANCE_END as isBalanceEnd, + bmp.KILOMETER as kilometer + from bm_project bmp + LEFT JOIN bm_vol_level bvl on bvl.ID = bmp.VOL_ID + LEFT JOIN bm_project_type bpt on bmp.TYPE_ID = bpt.ID + LEFT JOIN bm_company bmc on bmc.ID = bmp.COMPANY_ID + where 1=1 and bmp.IS_ACTIVE=1 and bmp.IS_BALANCE_END=#{param.isBal} + + + and bmp.COMPANY_ID =#{param.companyId} + + + and bmp.TYPE_ID =#{param.typeId} + - and ( - bmp.NAME LIKE CONCAT('%',#{param.keyWord},'%') OR - bmp.NUM LIKE CONCAT('%',#{param.keyWord},'%') OR - bmp.MANAGER LIKE CONCAT('%',#{param.keyWord},'%') OR - bmp.NATURE LIKE CONCAT('%',#{param.keyWord},'%') OR - bmp.TELPHONE LIKE CONCAT('%',#{param.keyWord},'%') OR - bmp.MATERIAL_CLERK LIKE CONCAT('%',#{param.keyWord},'%') - ) - - - + + #{param.startTime} ]]> - - - + + - - - + + #{param.startTime} and bmp.TIME < #{param.endTime} ) ]]> - - ORDER BY bmp.TIME desc + + ORDER BY bmp.TIME desc - + SELECT bpt.ID, bpt.`NAME` + from bm_vol_level bpt - - + SELECT bpt.ID, bpt.`NAME` + from bm_project_type bpt - + - - - + + + - + INSERT into bm_project @@ -170,7 +175,7 @@ MATERIAL_CLERK, - KILOMETER, + KILOMETER, CLERK_PHONE, @@ -182,16 +187,16 @@ #{name}, - - #{num}, - + + #{num}, + #{companyId1}, #{typeId1}, - + #{provinceid}, @@ -204,7 +209,7 @@ #{detailed}, - + #{manager}, @@ -233,7 +238,7 @@ #{materialClerk}, - #{kilometer}, + #{kilometer}, #{clerkPhone}, @@ -242,45 +247,46 @@ NOW(), - + select bmp.ID as id,bmp.`NAME` as name,bmp.COMPANY_ID as companyId, + bmc.`NAME` as companyName,bmp.TYPE_ID as typeId,bpt.`NAME` as typeName, + bmp.VOL_ID as volId,bvl.`NAME` as volName, + bmp.NUM as num,bmp.MANAGER as manager,bmp.NATURE as nature, + bmp.TELPHONE as telphone,bmp.PHONE as phone,bmp.FAX as fax, + bmp.ADDRESS as address,bmp.REMARKS as remarks, + bmp.MATERIAL_CLERK as materialClerk,bmp.CLERK_PHONE as clerkPhone, + bmp.IS_BALANCE_END as isBalanceEnd, + bmp.KILOMETER as kilometer, bmp.provinceid, bmp.cityid , bmp.areaid, bmp.detailed + from bm_project bmp + LEFT JOIN bm_vol_level bvl on bvl.ID = bmp.VOL_ID + LEFT JOIN bm_project_type bpt on bmp.TYPE_ID = bpt.ID + LEFT JOIN bm_company bmc on bmc.ID = bmp.COMPANY_ID + where bmp.ID=#{id} + - + update bm_project NAME=#{name}, - - NUM=#{num}, - - + + NUM=#{num}, + + COMPANY_ID =#{companyId1}, TYPE_ID =#{typeId1}, - + provinceid = #{provinceid}, @@ -311,7 +317,7 @@ ADDRESS=#{address}, - + VOL_ID = #{volId1}, @@ -321,7 +327,7 @@ MATERIAL_CLERK=#{materialClerk}, - KILOMETER=#{kilometer}, + KILOMETER=#{kilometer}, CLERK_PHONE=#{clerkPhone}, @@ -329,38 +335,67 @@ where id=#{id} - + - update bm_project set IS_ACTIVE =0 - where ID =#{id} + update bm_project + set IS_ACTIVE =0 + where ID = #{id} - - + SELECT ID, `NAME` + FROM bm_project + WHERE `NUM` = #{projectCode} - - + SELECT ID,`NAME` + FROM bm_project + WHERE COMPANY_ID = #{companyId} + + AND TYPE_ID = #{typeId} + - - - + SELECT ID, `NAME` + FROM bm_project + WHERE `NAME` = #{name} - - + SELECT provinceid as id, province as name + FROM provinces + ORDER BY id - - + SELECT cityid as id, city as name + FROM cities + WHERE provinceid = #{param.provinceid} + ORDER BY id - + + + + \ No newline at end of file diff --git a/src/com/bonus/bm/controller/ProjectManageController.java b/src/com/bonus/bm/controller/ProjectManageController.java index 0dab8bc..1e25a05 100644 --- a/src/com/bonus/bm/controller/ProjectManageController.java +++ b/src/com/bonus/bm/controller/ProjectManageController.java @@ -33,371 +33,363 @@ import com.bonus.sys.beans.ZNode; @RequestMapping("/backstage/project/") public class ProjectManageController extends BaseController { - // 16位KEY - private static final String aesKey = "Z3PX8V9KJ2T7W4QN"; - // 密钥 - private static final String appSecret = "secret20250705"; - // appID - private static final String allowAppId = "equipment"; + // 16位KEY + private static final String aesKey = "Z3PX8V9KJ2T7W4QN"; + // 密钥 + private static final String appSecret = "secret20250705"; + // appID + private static final String allowAppId = "equipment"; - @Autowired - private ProjectManageService pmService; + @Autowired + private ProjectManageService pmService; - @RequestMapping("list") - public String index(Model model) { - return "/bm/projectManage"; - } + @RequestMapping("list") + public String index(Model model) { + return "/bm/projectManage"; + } - @RequestMapping("projectTree") - public String unitTree(Model model) { - return "/bm/projectTree"; - } + @RequestMapping("projectTree") + public String unitTree(Model model) { + return "/bm/projectTree"; + } - /** - * 与数创部同步工程信息，单次接收1条 - */ - @RequestMapping(value = "syncProject", method = RequestMethod.POST) - @ResponseBody - public AjaxRes syncProject(@RequestBody JSONObject payload) { - AjaxRes result = getAjaxRes(); - if (payload == null) { - result.setFailMsg("同步错误，参数不能为空!"); - return result; - } + /** + * 与数创部同步工程信息，单次接收1条 + */ + @RequestMapping(value = "syncProject", method = RequestMethod.POST) + @ResponseBody + public AjaxRes syncProject(@RequestBody JSONObject payload) { + AjaxRes result = getAjaxRes(); + if (payload == null) { + result.setFailMsg("同步错误，参数不能为空!"); + return result; + } - String appId = payload.getStr("appId"); - String timestamp = payload.getStr("timestamp"); - String encryptedData = payload.getStr("data"); - String sign = payload.getStr("sign"); + String appId = payload.getStr("appId"); + String timestamp = payload.getStr("timestamp"); + String encryptedData = payload.getStr("data"); + String sign = payload.getStr("sign"); - // 1. 校验appId - if (Objects.isNull(appId) || !allowAppId.equals(appId)) { - result.setFailMsg("appId不匹配"); - return result; - } + // 1. 校验appId + if (Objects.isNull(appId) || !allowAppId.equals(appId)) { + result.setFailMsg("appId不匹配"); + return result; + } - // 2. 时间戳校验（防重放） -// try { -// Date time = DateUtil.parse(timestamp, "yyyyMMddHHmmss"); -// long diff = Math.abs(System.currentTimeMillis() - time.getTime()); -// if (diff > 5 * 60 * 1000) { -// result.setFailMsg("请求时间戳不合法!!"); -// return result; -// } -// } catch (Exception e) { -// System.err.println("时间戳解析异常:" + timestamp + "," + e.getMessage()); -// result.setFailMsg("时间戳解析异常"); -// return result; -// } + // 3. 验证签名 + String baseSign = appId + timestamp + encryptedData + appSecret; + String serverSign = SecureUtil.sha256(baseSign).toUpperCase(); + if (!serverSign.equals(sign)) { + result.setFailMsg("签名不合法!"); + return result; + } - // 3. 验证签名 - String baseSign = appId + timestamp + encryptedData + appSecret; - String serverSign = SecureUtil.sha256(baseSign).toUpperCase(); - if (!serverSign.equals(sign)) { - result.setFailMsg("签名不合法!"); - return result; - } + // 4. 解密数据 + AES aes = SecureUtil.aes(aesKey.getBytes()); + String json = aes.decryptStr(encryptedData); + JSONObject bizData = JSONUtil.parseObj(json); - // 4. 解密数据 - AES aes = SecureUtil.aes(aesKey.getBytes()); - String json = aes.decryptStr(encryptedData); - JSONObject bizData = JSONUtil.parseObj(json); + // 5. 业务处理 + String projectCode = bizData.getStr("projectCode"); + String projectName = bizData.getStr("projectName"); + String companyCode = bizData.getStr("companyCode"); + String typeCode = bizData.getStr("typeCode"); + String startDate = bizData.getStr("startDate", ""); + String status = bizData.getStr("status"); - // 5. 业务处理 - String projectCode = bizData.getStr("projectCode"); - String projectName = bizData.getStr("projectName"); - String companyCode = bizData.getStr("companyCode"); - String typeCode = bizData.getStr("typeCode"); - String startDate = bizData.getStr("startDate", ""); - String status = bizData.getStr("status"); + // 6. 校验数据 + if (StrUtil.isBlank(projectCode) || StrUtil.isBlank(projectName) || StrUtil.isBlank(companyCode) + || StrUtil.isBlank(typeCode) || StrUtil.isBlank(status)) { + System.err.println(projectCode + "," + projectName + "," + companyCode + "," + typeCode + "," + status + "," + + startDate); + result.setFailMsg("数据不完整!!"); + return result; + } else { + ProjectManageBean beanCode = pmService.findByCode(projectCode); + if (beanCode == null) { + ProjectManageBean findBean = pmService.findByName(projectName); + if (findBean != null) { + pmService.updateProject(projectCode, String.valueOf(findBean.getId())); + result.setFailMsg("工程名称已存在，跳过处理！"); + } else { + ProjectManageBean bean = new ProjectManageBean(); + bean.setName(projectName); + bean.setNum(projectCode); + bean.setCompanyId(companyCode); + bean.setTypeId(typeCode); + bean.setStartTime(startDate); + bean.setEndTime(""); + try { + pmService.insert(bean); + System.out.println("同步工程数据成功: " + json); + result.setSucceedMsg("同步成功"); + } catch (Exception e) { + System.err.println(e.getMessage()); + result.setFailMsg(projectName + "----工程信息同步失败：" + e.getMessage()); + } + } + } else { + pmService.updateProjectName(projectName, projectCode); + } - // 6. 校验数据 - if (StrUtil.isBlank(projectCode) || StrUtil.isBlank(projectName) || StrUtil.isBlank(companyCode) - || StrUtil.isBlank(typeCode) || StrUtil.isBlank(status)) { - System.err.println(projectCode + "," + projectName + "," + companyCode + "," + typeCode + "," + status + "," - + startDate); - result.setFailMsg("数据不完整!!"); - return result; - } else { - ProjectManageBean findBean = pmService.findByName(projectName); - if (findBean != null) { - System.out.println("工程名称已存在，跳过处理！"); - result.setFailMsg("工程名称已存在，跳过处理！"); - } else { - ProjectManageBean bean = new ProjectManageBean(); - bean.setName(projectName); - bean.setNum(projectCode); - bean.setCompanyId(companyCode); - bean.setTypeId(typeCode); - bean.setStartTime(startDate); - bean.setEndTime(""); - try { - pmService.insert(bean); - System.out.println("同步工程数据成功: " + json); - result.setSucceedMsg("同步成功"); - } catch (Exception e) { - System.err.println(e.getMessage()); - result.setFailMsg(projectName + "----工程信息同步失败：" + e.getMessage()); - } - } - } - return result; - } + } + return result; + } - @RequestMapping(value = "findByPage", method = RequestMethod.POST) - @ResponseBody - public AjaxRes findByPage(Page page, ProjectManageBean o) { - AjaxRes ar = getAjaxRes(); - if (ar.setNoAuth(doSecurityIntercept(GlobalConst.RESOURCES_TYPE_MENU, "/backstage/project/list"))) { - try { - if (o != null && !"".equals(o.getEndTime())) { - String time = DateTimeHelper.getAddNumDay(o.getEndTime(), 1); - o.setEndTime(time); - } - Page station = pmService.findByPage(o, page); - Map p = new HashMap(); - p.put("list", station); - ar.setSucceed(p); - } catch (Exception e) { - logger.error(e.toString(), e); - ar.setFailMsg(GlobalConst.DATA_FAIL); - } - } - return ar; - } + @RequestMapping(value = "findByPage", method = RequestMethod.POST) + @ResponseBody + public AjaxRes findByPage(Page page, ProjectManageBean o) { + AjaxRes ar = getAjaxRes(); + if (ar.setNoAuth(doSecurityIntercept(GlobalConst.RESOURCES_TYPE_MENU, "/backstage/project/list"))) { + try { + if (o != null && !"".equals(o.getEndTime())) { + String time = DateTimeHelper.getAddNumDay(o.getEndTime(), 1); + o.setEndTime(time); + } + Page station = pmService.findByPage(o, page); + Map p = new HashMap(); + p.put("list", station); + ar.setSucceed(p); + } catch (Exception e) { + logger.error(e.toString(), e); + ar.setFailMsg(GlobalConst.DATA_FAIL); + } + } + return ar; + } - @RequestMapping(value = "insert", method = RequestMethod.POST) - @ResponseBody - public AjaxRes insert(ProjectManageBean o) { - AjaxRes ar = getAjaxRes(); - try { - ProjectManageBean bean = pmService.findByName(o.getName()); - if (bean == null) { - String typeId = o.getTypeId1(); - String companyId = o.getCompanyId1(); + @RequestMapping(value = "insert", method = RequestMethod.POST) + @ResponseBody + public AjaxRes insert(ProjectManageBean o) { + AjaxRes ar = getAjaxRes(); + try { + ProjectManageBean bean = pmService.findByName(o.getName()); + if (bean == null) { + String typeId = o.getTypeId1(); + String companyId = o.getCompanyId1(); - String provinceid = o.getProvinceid(); - String cityid = o.getCityid(); - String areaid = o.getAreaid(); - if ("0".equals(typeId) || "0".equals(companyId)) { - ar.setFailMsg("请选择所属分公司或者工程类别"); - } else if ("0".equals(provinceid)) { - ar.setFailMsg("请选择所在省"); - } else if ("0".equals(cityid)) { - ar.setFailMsg("请选择所在市"); - } else if ("0".equals(areaid)) { - ar.setFailMsg("请选择所在区"); - } else { - pmService.insert(o); - ar.setSucceedMsg(GlobalConst.SAVE_SUCCEED); - } - } else { - ar.setFailMsg("工程名称重复，请重新填写"); - } - } catch (Exception e) { - logger.error(e.toString(), e); - ar.setFailMsg(GlobalConst.SAVE_FAIL); - } - return ar; - } + String provinceid = o.getProvinceid(); + String cityid = o.getCityid(); + String areaid = o.getAreaid(); + if ("0".equals(typeId) || "0".equals(companyId)) { + ar.setFailMsg("请选择所属分公司或者工程类别"); + } else if ("0".equals(provinceid)) { + ar.setFailMsg("请选择所在省"); + } else if ("0".equals(cityid)) { + ar.setFailMsg("请选择所在市"); + } else if ("0".equals(areaid)) { + ar.setFailMsg("请选择所在区"); + } else { + pmService.insert(o); + ar.setSucceedMsg(GlobalConst.SAVE_SUCCEED); + } + } else { + ar.setFailMsg("工程名称重复，请重新填写"); + } + } catch (Exception e) { + logger.error(e.toString(), e); + ar.setFailMsg(GlobalConst.SAVE_FAIL); + } + return ar; + } - @RequestMapping(value = "update", method = RequestMethod.POST) - @ResponseBody - public AjaxRes update(ProjectManageBean o) { - AjaxRes ar = getAjaxRes(); - try { + @RequestMapping(value = "update", method = RequestMethod.POST) + @ResponseBody + public AjaxRes update(ProjectManageBean o) { + AjaxRes ar = getAjaxRes(); + try { - String typeId = o.getTypeId1(); - String companyId = o.getCompanyId1(); + String typeId = o.getTypeId1(); + String companyId = o.getCompanyId1(); - String provinceid = o.getProvinceid(); - String cityid = o.getCityid(); - String areaid = o.getAreaid(); - if ("0".equals(typeId) || "0".equals(companyId)) { - ar.setFailMsg("请选择所属分公司或者工程类别"); - } else if ("0".equals(provinceid)) { - ar.setFailMsg("请选择所在省"); - } else if ("0".equals(cityid)) { - ar.setFailMsg("请选择所在市"); - } else if ("0".equals(areaid)) { - ar.setFailMsg("请选择所在区"); - } else { - pmService.update(o); - ar.setSucceedMsg(GlobalConst.UPDATE_SUCCEED); - } - } catch (Exception e) { - logger.error(e.toString(), e); - ar.setFailMsg(GlobalConst.UPDATE_FAIL); - } - return ar; - } + String provinceid = o.getProvinceid(); + String cityid = o.getCityid(); + String areaid = o.getAreaid(); + if ("0".equals(typeId) || "0".equals(companyId)) { + ar.setFailMsg("请选择所属分公司或者工程类别"); + } else if ("0".equals(provinceid)) { + ar.setFailMsg("请选择所在省"); + } else if ("0".equals(cityid)) { + ar.setFailMsg("请选择所在市"); + } else if ("0".equals(areaid)) { + ar.setFailMsg("请选择所在区"); + } else { + pmService.update(o); + ar.setSucceedMsg(GlobalConst.UPDATE_SUCCEED); + } + } catch (Exception e) { + logger.error(e.toString(), e); + ar.setFailMsg(GlobalConst.UPDATE_FAIL); + } + return ar; + } - @RequestMapping(value = "find", method = RequestMethod.POST) - @ResponseBody - public AjaxRes find(ProjectManageBean o) { - AjaxRes ar = getAjaxRes(); - try { - List list = pmService.find(o); - ar.setSucceed(list); - } catch (Exception e) { - logger.error(e.toString(), e); - ar.setFailMsg(GlobalConst.DATA_FAIL); - } - return ar; - } + @RequestMapping(value = "find", method = RequestMethod.POST) + @ResponseBody + public AjaxRes find(ProjectManageBean o) { + AjaxRes ar = getAjaxRes(); + try { + List list = pmService.find(o); + ar.setSucceed(list); + } catch (Exception e) { + logger.error(e.toString(), e); + ar.setFailMsg(GlobalConst.DATA_FAIL); + } + return ar; + } - @RequestMapping(value = "getProjectType", method = RequestMethod.POST) - @ResponseBody - public AjaxRes getProjectType() { - AjaxRes ar = getAjaxRes(); - try { - List list = pmService.getProjectType(); - Map p = new HashMap(); - p.put("list", list); - ar.setSucceed(p); - } catch (Exception e) { - logger.error(e.toString(), e); - ar.setFailMsg(GlobalConst.DATA_FAIL); - } - return ar; - } + @RequestMapping(value = "getProjectType", method = RequestMethod.POST) + @ResponseBody + public AjaxRes getProjectType() { + AjaxRes ar = getAjaxRes(); + try { + List list = pmService.getProjectType(); + Map p = new HashMap(); + p.put("list", list); + ar.setSucceed(p); + } catch (Exception e) { + logger.error(e.toString(), e); + ar.setFailMsg(GlobalConst.DATA_FAIL); + } + return ar; + } - @RequestMapping(value = "getProjectName", method = RequestMethod.POST) - @ResponseBody - public AjaxRes getProjectName(ProjectManageBean o) { - AjaxRes ar = getAjaxRes(); - try { - List list = pmService.getProjectName(o); - Map p = new HashMap(); - p.put("list", list); - ar.setSucceed(p); - } catch (Exception e) { - logger.error(e.toString(), e); - ar.setFailMsg(GlobalConst.DATA_FAIL); - } - return ar; - } + @RequestMapping(value = "getProjectName", method = RequestMethod.POST) + @ResponseBody + public AjaxRes getProjectName(ProjectManageBean o) { + AjaxRes ar = getAjaxRes(); + try { + List list = pmService.getProjectName(o); + Map p = new HashMap(); + p.put("list", list); + ar.setSucceed(p); + } catch (Exception e) { + logger.error(e.toString(), e); + ar.setFailMsg(GlobalConst.DATA_FAIL); + } + return ar; + } - @RequestMapping(value = "getVolLever", method = RequestMethod.POST) - @ResponseBody - public AjaxRes getVolLever() { - AjaxRes ar = getAjaxRes(); - try { - List list = pmService.getVolLever(); - Map p = new HashMap(); - p.put("list", list); - ar.setSucceed(p); - } catch (Exception e) { - logger.error(e.toString(), e); - ar.setFailMsg(GlobalConst.DATA_FAIL); - } - return ar; - } + @RequestMapping(value = "getVolLever", method = RequestMethod.POST) + @ResponseBody + public AjaxRes getVolLever() { + AjaxRes ar = getAjaxRes(); + try { + List list = pmService.getVolLever(); + Map p = new HashMap(); + p.put("list", list); + ar.setSucceed(p); + } catch (Exception e) { + logger.error(e.toString(), e); + ar.setFailMsg(GlobalConst.DATA_FAIL); + } + return ar; + } - @RequestMapping(value = "findWorkTree", method = RequestMethod.POST) - @ResponseBody - public AjaxRes roleTree() { - AjaxRes ar = getAjaxRes(); - try { - List list = pmService.findWorkTree(); - ar.setSucceed(list); - } catch (Exception e) { - logger.error(e.toString(), e); - ar.setFailMsg(GlobalConst.DATA_FAIL); - } - return ar; - } + @RequestMapping(value = "findWorkTree", method = RequestMethod.POST) + @ResponseBody + public AjaxRes roleTree() { + AjaxRes ar = getAjaxRes(); + try { + List list = pmService.findWorkTree(); + ar.setSucceed(list); + } catch (Exception e) { + logger.error(e.toString(), e); + ar.setFailMsg(GlobalConst.DATA_FAIL); + } + return ar; + } - @RequestMapping(value = "projectTree", method = RequestMethod.POST) - @ResponseBody - public AjaxRes projectTree(ProjectManageBean o, HttpServletRequest req) { - AjaxRes ar = getAjaxRes(); - try { - List list = null; - if ("0".equals(o.getUnitId())) { - list = pmService.projectTree(o); - } else { - if (StringHelper.isNotEmpty(o.getUnitId())) { - list = pmService.projectTreeByUnitId(o); - } else { - list = pmService.projectTree(o); - } - } - String isOpen = req.getParameter("isOpen"); - if (StringHelper.isNotEmpty(isOpen)) { - for (ZNode zNode : list) { - zNode.setOpen(true); - } - } - Map p = new HashMap(); - p.put("list", list); - ar.setSucceed(p); - } catch (Exception e) { - logger.error(e.toString(), e); - ar.setFailMsg(GlobalConst.DATA_FAIL); - } - return ar; - } + @RequestMapping(value = "projectTree", method = RequestMethod.POST) + @ResponseBody + public AjaxRes projectTree(ProjectManageBean o, HttpServletRequest req) { + AjaxRes ar = getAjaxRes(); + try { + List list = null; + if ("0".equals(o.getUnitId())) { + list = pmService.projectTree(o); + } else { + if (StringHelper.isNotEmpty(o.getUnitId())) { + list = pmService.projectTreeByUnitId(o); + } else { + list = pmService.projectTree(o); + } + } + String isOpen = req.getParameter("isOpen"); + if (StringHelper.isNotEmpty(isOpen)) { + for (ZNode zNode : list) { + zNode.setOpen(true); + } + } + Map p = new HashMap(); + p.put("list", list); + ar.setSucceed(p); + } catch (Exception e) { + logger.error(e.toString(), e); + ar.setFailMsg(GlobalConst.DATA_FAIL); + } + return ar; + } - @RequestMapping(value = "del", method = RequestMethod.POST) - @ResponseBody - public AjaxRes del(ProjectManageBean o) { - AjaxRes ar = getAjaxRes(); - try { - pmService.delete(o); - ar.setSucceedMsg(GlobalConst.DEL_SUCCEED); - } catch (Exception e) { - logger.error(e.toString(), e); - ar.setFailMsg(GlobalConst.DEL_FAIL); - } - return ar; - } + @RequestMapping(value = "del", method = RequestMethod.POST) + @ResponseBody + public AjaxRes del(ProjectManageBean o) { + AjaxRes ar = getAjaxRes(); + try { + pmService.delete(o); + ar.setSucceedMsg(GlobalConst.DEL_SUCCEED); + } catch (Exception e) { + logger.error(e.toString(), e); + ar.setFailMsg(GlobalConst.DEL_FAIL); + } + return ar; + } - @RequestMapping(value = "getProvinces", method = RequestMethod.POST) - @ResponseBody - public AjaxRes getProvinces() { - AjaxRes ar = getAjaxRes(); - try { - List list = pmService.getProvinces(); - Map p = new HashMap(); - p.put("list", list); - ar.setSucceed(p); - } catch (Exception e) { - logger.error(e.toString(), e); - ar.setFailMsg(GlobalConst.DATA_FAIL); - } - return ar; - } + @RequestMapping(value = "getProvinces", method = RequestMethod.POST) + @ResponseBody + public AjaxRes getProvinces() { + AjaxRes ar = getAjaxRes(); + try { + List list = pmService.getProvinces(); + Map p = new HashMap(); + p.put("list", list); + ar.setSucceed(p); + } catch (Exception e) { + logger.error(e.toString(), e); + ar.setFailMsg(GlobalConst.DATA_FAIL); + } + return ar; + } - @RequestMapping(value = "getCities", method = RequestMethod.POST) - @ResponseBody - public AjaxRes getCities(ProjectManageBean o) { - AjaxRes ar = getAjaxRes(); - try { - List list = pmService.getCities(o); - Map p = new HashMap(); - p.put("list", list); - ar.setSucceed(p); - } catch (Exception e) { - logger.error(e.toString(), e); - ar.setFailMsg(GlobalConst.DATA_FAIL); - } - return ar; - } + @RequestMapping(value = "getCities", method = RequestMethod.POST) + @ResponseBody + public AjaxRes getCities(ProjectManageBean o) { + AjaxRes ar = getAjaxRes(); + try { + List list = pmService.getCities(o); + Map p = new HashMap(); + p.put("list", list); + ar.setSucceed(p); + } catch (Exception e) { + logger.error(e.toString(), e); + ar.setFailMsg(GlobalConst.DATA_FAIL); + } + return ar; + } - @RequestMapping(value = "getDistricts", method = RequestMethod.POST) - @ResponseBody - public AjaxRes getDistricts(ProjectManageBean o) { - AjaxRes ar = getAjaxRes(); - try { - List list = pmService.getDistricts(o); - Map p = new HashMap(); - p.put("list", list); - ar.setSucceed(p); - } catch (Exception e) { - logger.error(e.toString(), e); - ar.setFailMsg(GlobalConst.DATA_FAIL); - } - return ar; - } + @RequestMapping(value = "getDistricts", method = RequestMethod.POST) + @ResponseBody + public AjaxRes getDistricts(ProjectManageBean o) { + AjaxRes ar = getAjaxRes(); + try { + List list = pmService.getDistricts(o); + Map p = new HashMap(); + p.put("list", list); + ar.setSucceed(p); + } catch (Exception e) { + logger.error(e.toString(), e); + ar.setFailMsg(GlobalConst.DATA_FAIL); + } + return ar; + } } diff --git a/src/com/bonus/bm/dao/ProjectManageDao.java b/src/com/bonus/bm/dao/ProjectManageDao.java index 38f25dc..8c4e81a 100644 --- a/src/com/bonus/bm/dao/ProjectManageDao.java +++ b/src/com/bonus/bm/dao/ProjectManageDao.java @@ -12,24 +12,31 @@ import com.bonus.sys.beans.ZNode; @BonusBatis public interface ProjectManageDao extends BaseDao { - List getVolLever(); + List getVolLever(); - List getProjectType(); + List getProjectType(); - public List findWorkTree(); + public List findWorkTree(); - List getProjectName(ProjectManageBean o); + List getProjectName(ProjectManageBean o); - List projectTree(ProjectManageBean o); + List projectTree(ProjectManageBean o); - List projectTreeByUnitId(ProjectManageBean o); + List projectTreeByUnitId(ProjectManageBean o); - ProjectManageBean findByName(String name); + ProjectManageBean findByName(String name); - List getProvinces(); - List getCities(@Param("param") ProjectManageBean o); - List getDistricts(@Param("param") ProjectManageBean o); + List getProvinces(); + List getCities(@Param("param") ProjectManageBean o); + + List getDistricts(@Param("param") ProjectManageBean o); + + void updateProject(@Param("num") String num, @Param("id") String id); + + ProjectManageBean findByCode(String projectCode); + + void updateProjectName(@Param("projectName")String projectName, @Param("projectCode")String projectCode); } diff --git a/src/com/bonus/bm/service/ProjectManageService.java b/src/com/bonus/bm/service/ProjectManageService.java index 2c08b6a..33d7fe6 100644 --- a/src/com/bonus/bm/service/ProjectManageService.java +++ b/src/com/bonus/bm/service/ProjectManageService.java @@ -21,10 +21,14 @@ public interface ProjectManageService extends BaseService { List projectTreeByUnitId(ProjectManageBean o); ProjectManageBean findByName(String name); - + void updateProject(String num,String id); List getProvinces(); List getCities(ProjectManageBean o); List getDistricts(ProjectManageBean o); + + ProjectManageBean findByCode(String projectCode); + + void updateProjectName(String projectName, String projectCode); } diff --git a/src/com/bonus/bm/service/ProjectManageServiceImp.java b/src/com/bonus/bm/service/ProjectManageServiceImp.java index dd254b4..58e7c3e 100644 --- a/src/com/bonus/bm/service/ProjectManageServiceImp.java +++ b/src/com/bonus/bm/service/ProjectManageServiceImp.java @@ -13,57 +13,72 @@ import com.bonus.sys.beans.ZNode; @Service("ProjectManageService") public class ProjectManageServiceImp extends BaseServiceImp implements ProjectManageService { - @Autowired - private ProjectManageDao pmDao; + @Autowired + private ProjectManageDao pmDao; - @Override - public List getVolLever() { - return pmDao.getVolLever(); - } + @Override + public List getVolLever() { + return pmDao.getVolLever(); + } - @Override - public List getProjectType() { - return pmDao.getProjectType(); - } + @Override + public List getProjectType() { + return pmDao.getProjectType(); + } - @Override - public List findWorkTree() { - return pmDao.findWorkTree(); - } + @Override + public List findWorkTree() { + return pmDao.findWorkTree(); + } - @Override - public List getProjectName(ProjectManageBean o) { - return pmDao.getProjectName(o); - } + @Override + public List getProjectName(ProjectManageBean o) { + return pmDao.getProjectName(o); + } - @Override - public List projectTree(ProjectManageBean o) { - return pmDao.projectTree(o); - } + @Override + public List projectTree(ProjectManageBean o) { + return pmDao.projectTree(o); + } - @Override - public List projectTreeByUnitId(ProjectManageBean o) { - return pmDao.projectTreeByUnitId(o); - } + @Override + public List projectTreeByUnitId(ProjectManageBean o) { + return pmDao.projectTreeByUnitId(o); + } - @Override - public ProjectManageBean findByName(String name) { - return pmDao.findByName(name); - } + @Override + public ProjectManageBean findByName(String name) { + return pmDao.findByName(name); + } - @Override - public List getProvinces() { - return pmDao.getProvinces(); - } + @Override + public void updateProject(String num, String id) { + pmDao.updateProject(num, id); + } - @Override - public List getCities(ProjectManageBean o) { - return pmDao.getCities(o); - } + @Override + public List getProvinces() { + return pmDao.getProvinces(); + } - @Override - public List getDistricts(ProjectManageBean o) { - return pmDao.getDistricts(o); - } + @Override + public List getCities(ProjectManageBean o) { + return pmDao.getCities(o); + } + + @Override + public List getDistricts(ProjectManageBean o) { + return pmDao.getDistricts(o); + } + + @Override + public ProjectManageBean findByCode(String projectCode) { + return pmDao.findByCode(projectCode); + } + + @Override + public void updateProjectName(String projectName, String projectCode) { + pmDao.updateProjectName(projectName, projectCode); + } }