bonus
/
GZMachinesWeb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

机具库存收藏修改

This commit is contained in:
jiang 2025-12-03 20:11:16 +08:00
parent 037c8e3e69
commit e767b6182c
6 changed files with 608 additions and 554 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bin/resources/mybatis/bm/ProjectManageMapper.xml
View File

@ -161,6 +161,7 @@
where bmp.ID=#{id}
</select>
<update id="update" parameterType="com.bonus.bm.beans.ProjectManageBean">
update bm_project
<set>

63
resources/mybatis/bm/ProjectManageMapper.xml
View File

@ -3,7 +3,8 @@
<mapper namespace="com.bonus.bm.dao.ProjectManageDao">
<resultMap id="ZNode" type="com.bonus.sys.beans.ZNode"></resultMap>
<select id="findByPage" resultType="com.bonus.bm.beans.ProjectManageBean" parameterType="com.bonus.bm.beans.ProjectManageBean">
<select id="findByPage" resultType="com.bonus.bm.beans.ProjectManageBean"
parameterType="com.bonus.bm.beans.ProjectManageBean">
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,
@ -54,12 +55,16 @@
</if>
ORDER BY bmp.TIME desc
</select>
<select id="getVolLever" resultType="com.bonus.bm.beans.ProjectManageBean" parameterType="com.bonus.bm.beans.ProjectManageBean">
SELECT bpt.ID,bpt.`NAME` from bm_vol_level bpt
<select id="getVolLever" resultType="com.bonus.bm.beans.ProjectManageBean"
parameterType="com.bonus.bm.beans.ProjectManageBean">
SELECT bpt.ID, bpt.`NAME`
from bm_vol_level bpt
</select>
<select id="getProjectType" resultType="com.bonus.bm.beans.ProjectManageBean" parameterType="com.bonus.bm.beans.ProjectManageBean">
SELECT bpt.ID,bpt.`NAME` from bm_project_type bpt
<select id="getProjectType" resultType="com.bonus.bm.beans.ProjectManageBean"
parameterType="com.bonus.bm.beans.ProjectManageBean">
SELECT bpt.ID, bpt.`NAME`
from bm_project_type bpt
</select>
<select id="findWorkTree" resultMap="ZNode">
@ -242,7 +247,8 @@
NOW(),
</trim>
</insert>
<select id="find" resultType="com.bonus.bm.beans.ProjectManageBean" parameterType="com.bonus.bm.beans.ProjectManageBean">
<select id="find" resultType="com.bonus.bm.beans.ProjectManageBean"
parameterType="com.bonus.bm.beans.ProjectManageBean">
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,
@ -331,11 +337,28 @@
</update>
<update id="delete">
update bm_project set IS_ACTIVE =0
update bm_project
set IS_ACTIVE =0
where ID = #{id}
</update>
<select id="findByCode" resultType="com.bonus.bm.beans.ProjectManageBean">
SELECT ID, `NAME`
FROM bm_project
WHERE `NUM` = #{projectCode}
</select>
<update id="updateProject">
UPDATE bm_project
set NUM = #{num}
where ID = #{id}
</update>
<update id="updateProjectName">
UPDATE bm_project
set NAME = #{projectName}
where NUM = #{projectCode}
</update>
<select id="getProjectName" resultType="com.bonus.bm.beans.ProjectManageBean" parameterType="com.bonus.bm.beans.ProjectManageBean">
<select id="getProjectName" resultType="com.bonus.bm.beans.ProjectManageBean"
parameterType="com.bonus.bm.beans.ProjectManageBean">
SELECT ID,`NAME`
FROM bm_project
WHERE COMPANY_ID = #{companyId}
@ -351,16 +374,28 @@
</select>
<select id="getProvinces" resultType="com.bonus.bm.beans.ProjectManageBean" parameterType="com.bonus.bm.beans.ProjectManageBean">
SELECT provinceid as id, province as name FROM provinces ORDER BY id
<select id="getProvinces" resultType="com.bonus.bm.beans.ProjectManageBean"
parameterType="com.bonus.bm.beans.ProjectManageBean">
SELECT provinceid as id, province as name
FROM provinces
ORDER BY id
</select>
<select id="getCities" resultType="com.bonus.bm.beans.ProjectManageBean" parameterType="com.bonus.bm.beans.ProjectManageBean">
SELECT cityid as id, city as name FROM cities WHERE provinceid = #{param.provinceid} ORDER BY id
<select id="getCities" resultType="com.bonus.bm.beans.ProjectManageBean"
parameterType="com.bonus.bm.beans.ProjectManageBean">
SELECT cityid as id, city as name
FROM cities
WHERE provinceid = #{param.provinceid}
ORDER BY id
</select>
<select id="getDistricts" resultType="com.bonus.bm.beans.ProjectManageBean" parameterType="com.bonus.bm.beans.ProjectManageBean">
SELECT areaid as id, area as name FROM areas WHERE cityid = #{param.cityid} ORDER BY id
<select id="getDistricts" resultType="com.bonus.bm.beans.ProjectManageBean"
parameterType="com.bonus.bm.beans.ProjectManageBean">
SELECT areaid as id, area as name
FROM areas
WHERE cityid = #{param.cityid}
ORDER BY id
</select>
</mapper>

22
src/com/bonus/bm/controller/ProjectManageController.java
View File

@ -76,20 +76,6 @@ public class ProjectManageController extends BaseController<ProjectManageBean> {
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();
@ -119,9 +105,11 @@ public class ProjectManageController extends BaseController<ProjectManageBean> {
result.setFailMsg("数据不完整!!");
return result;
} else {
ProjectManageBean beanCode = pmService.findByCode(projectCode);
if (beanCode == null) {
ProjectManageBean findBean = pmService.findByName(projectName);
if (findBean != null) {
System.out.println("工程名称已存在，跳过处理！");
pmService.updateProject(projectCode, String.valueOf(findBean.getId()));
result.setFailMsg("工程名称已存在，跳过处理！");
} else {
ProjectManageBean bean = new ProjectManageBean();
@ -140,6 +128,10 @@ public class ProjectManageController extends BaseController<ProjectManageBean> {
result.setFailMsg(projectName + "----工程信息同步失败：" + e.getMessage());
}
}
} else {
pmService.updateProjectName(projectName, projectCode);
}
}
return result;
}

7
src/com/bonus/bm/dao/ProjectManageDao.java
View File

@ -26,10 +26,17 @@ public interface ProjectManageDao extends BaseDao<ProjectManageBean> {
ProjectManageBean findByName(String name);
List<ProjectManageBean> getProvinces();
List<ProjectManageBean> getCities(@Param("param") ProjectManageBean o);
List<ProjectManageBean> 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);
}

6
src/com/bonus/bm/service/ProjectManageService.java
View File

@ -21,10 +21,14 @@ public interface ProjectManageService extends BaseService<ProjectManageBean> {
List<ZNode> projectTreeByUnitId(ProjectManageBean o);
ProjectManageBean findByName(String name);
void updateProject(String num,String id);
List<ProjectManageBean> getProvinces();
List<ProjectManageBean> getCities(ProjectManageBean o);
List<ProjectManageBean> getDistricts(ProjectManageBean o);
ProjectManageBean findByCode(String projectCode);
void updateProjectName(String projectName, String projectCode);
}

15
src/com/bonus/bm/service/ProjectManageServiceImp.java
View File

@ -51,6 +51,11 @@ public class ProjectManageServiceImp extends BaseServiceImp<ProjectManageBean> i
return pmDao.findByName(name);
}
@Override
public void updateProject(String num, String id) {
pmDao.updateProject(num, id);
}
@Override
public List<ProjectManageBean> getProvinces() {
return pmDao.getProvinces();
@ -66,4 +71,14 @@ public class ProjectManageServiceImp extends BaseServiceImp<ProjectManageBean> i
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);
}
}