Skip to content

H
hg-smart
Commit 96c8bb80 by liuyang
Options

Merge branch 'dev' of http://git.pseer.com:8800/platform/hg-smart into dev-ly

parents 33727bbc ac429dca
Showing with 117 additions and 119 deletions
src/main/java/com/baosight/hggp/controller/FileUploadController.java
......@@ -16,9 +16,11 @@ import org.springframework.web.multipart.commons.CommonsMultipartFile;
import java.io.IOException;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
import net.sf.json.JSONObject;
import org.springframework.web.multipart.support.DefaultMultipartHttpServletRequest;
import javax.servlet.http.HttpServletRequest;
......@@ -44,7 +46,11 @@ public class FileUploadController {
JSONObject upload = new JSONObject();
String projectEnv = ProjectInfo.getProjectEnv();
if (CommonConstant.projectEnv.RUN.equalsIgnoreCase(projectEnv)) {
upload = UploadUtils.upload((CommonsMultipartFile)file);
Iterator multiFileIterator = ((DefaultMultipartHttpServletRequest) request).getMultiFileMap().get("uploadFile").iterator();
while(multiFileIterator.hasNext()) {
CommonsMultipartFile multipartFile = (CommonsMultipartFile)multiFileIterator.next();
upload = UploadUtils.upload(multipartFile);
}
}else {
upload = UploadUtils.uploadFile(request);
}
......
src/main/java/com/baosight/hggp/core/security/UserSessionUtils.java
......@@ -133,6 +133,27 @@ public class UserSessionUtils extends UserSession {
}
/**
* 获取登录用户的所有组
*
* @return
*/
public static List<String> getAllGroupCode() {
List<Org> orgs = HGXSTools.XsOrg.queryByUser();
if (CollectionUtils.isEmpty(orgs)) {
return new ArrayList<>();
}
List<String> prodGroupCodes = new ArrayList<>();
for (Org org : orgs) {
if (OrgTypeEnum.PROD_GROUP.getCode().equals(org.getOrgType())
|| OrgTypeEnum.CUT_GROUP.getCode().equals(org.getOrgType())
|| OrgTypeEnum.SYN_GROUP.getCode().equals(org.getOrgType())) {
prodGroupCodes.add(org.getOrgId());
}
}
return prodGroupCodes;
}
/**
* 获取登录用户所有角色
*
* @return
......
src/main/java/com/baosight/hggp/hg/sc/service/ServiceHGSC007.java
package com.baosight.hggp.hg.sc.service;
import com.baosight.hggp.aspect.annotation.OperationLogAnnotation;
import com.baosight.hggp.common.DdynamicEnum;
import com.baosight.hggp.core.dao.DaoBase;
import com.baosight.hggp.core.dao.DaoUtils;
import com.baosight.hggp.core.enums.OrgTypeEnum;
import com.baosight.hggp.core.security.UserSessionUtils;
import com.baosight.hggp.hg.constant.HGSqlConstant;
import com.baosight.hggp.hg.cw.tools.HGCWTools;
import com.baosight.hggp.hg.cw.vo.UserVO;
import com.baosight.hggp.hg.sb.domain.HGSB002;
import com.baosight.hggp.hg.sb.tools.HGSBTools;
import com.baosight.hggp.hg.sc.domain.HGSC007;
import com.baosight.hggp.hg.xs.domain.Company;
import com.baosight.hggp.hg.xs.domain.Factory;
import com.baosight.hggp.hg.xs.domain.Org;
import com.baosight.hggp.hg.xs.tools.HGXSTools;
import com.baosight.hggp.util.*;
import com.baosight.hggp.util.DateUtil;
import com.baosight.hggp.util.EiInfoUtils;
import com.baosight.hggp.util.LogUtils;
import com.baosight.hggp.util.MapUtils;
import com.baosight.hggp.util.StringUtil;
import com.baosight.hggp.util.contants.ACConstants;
import com.baosight.iplat4j.core.ei.EiBlock;
import com.baosight.iplat4j.core.ei.EiConstant;
......@@ -26,16 +25,46 @@ import com.baosight.iplat4j.core.service.impl.ServiceEPBase;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import java.util.*;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.function.Function;
import java.util.stream.Collectors;
/**
* @author Zhang JiHui
* @version 1.0 2024/5/24
*/
public class ServiceHGSC007 extends ServiceEPBase {
public class ServiceHGSC007 extends ServiceEPBase {
public static List<Map<String, Object>> getOrg() {
List<Map<String, Object>> list = new ArrayList<>();
List<Org> orgList = HGXSTools.XsOrg.queryByUser();
if (CollectionUtils.isNotEmpty(orgList)) {
for (Org org : orgList) {
Map<String, Object> objectMap = new HashMap<>();
if (!org.getOrgType().equals(OrgTypeEnum.COMPANY.getCode())) {
//Org org1 = HGXSTools.XsOrg.queryCompany(org.getOrgId());
objectMap.put(Org.FIELD_FACTORY_CODE, org.getFactoryCode());
objectMap.put(Org.FIELD_FACTORY_NAME, org.getFactoryName());
} else {
Map<String, Object> map = new HashMap<String, Object>();
map.put(Org.FIELD_PARENT_ORG_ID, org.getOrgId());
List<Map> results = DaoBase.getInstance().query(HGSqlConstant.HgXsOrg.QUERY_BY_FACTORY, map);
if (results.size() > 0) {
Map org1 = results.get(0);
objectMap.put(Org.FIELD_FACTORY_CODE, org1.get(Org.FIELD_ORG_ID));
objectMap.put(Org.FIELD_FACTORY_NAME, org1.get(Org.FIELD_ORG_CNAME));
}
}
list.add(objectMap);
}
}
return list;
}
@OperationLogAnnotation(operModul = "生产任务", operType = "查询", operDesc = "初始化页面")
public EiInfo initLoad(EiInfo inInfo) {
......@@ -48,26 +77,29 @@ import java.util.stream.Collectors;
return inInfo;
}
/*
* 查询*/
/**
* 查询
*
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "生产任务", operType = "查询", operDesc = "查询")
public EiInfo query(EiInfo inInfo) {
try {
EiBlock block = inInfo.getBlock(EiConstant.queryBlock);
String creatTime = block.getCellStr(ACConstants.ROW_CODE_0, HGSC007.FIELD_created_time);
Map queryMap = EiInfoUtils.getFirstRow(inInfo);
String creatTime = MapUtils.getString(queryMap, HGSC007.FIELD_created_time);
if (StringUtils.isNotBlank(creatTime)) {
inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0,HGSC007.FIELD_created_time, StringUtil.removeHorizontalLine(creatTime));
queryMap.put(HGSC007.FIELD_created_time, StringUtil.removeHorizontalLine(creatTime));
}
inInfo = super.query(inInfo,HGSC007.QUERY,new HGSC007() );
// 仅查询自己所在组的任务
queryMap.put("groupCodes", UserSessionUtils.getAllGroupCode());
inInfo = super.query(inInfo, HGSC007.QUERY, new HGSC007());
} catch (PlatException e) {
LogUtils.setDetailMsg(inInfo, e, "查询失败");
}
return inInfo;
}
@OperationLogAnnotation(operModul = "生产任务", operType = "查询", operDesc = "APP查询数量")
public Integer count(EiInfo inInfo) {
Integer count = null;
......@@ -75,10 +107,11 @@ import java.util.stream.Collectors;
EiBlock block = inInfo.getBlock(EiConstant.queryBlock);
String creatTime = block.getCellStr(ACConstants.ROW_CODE_0, HGSC007.FIELD_created_time);
if (StringUtils.isNotBlank(creatTime)) {
inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0,HGSC007.FIELD_created_time, StringUtil.removeHorizontalLine(creatTime));
inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HGSC007.FIELD_created_time,
StringUtil.removeHorizontalLine(creatTime));
}
Map paramMap = EiInfoUtils.getFirstRow(inInfo);
count = super.count(HGSC007.COUNT,paramMap);
count = super.count(HGSC007.COUNT, paramMap);
} catch (PlatException e) {
LogUtils.setDetailMsg(inInfo, e, "查询失败");
......@@ -97,16 +130,20 @@ import java.util.stream.Collectors;
List<Org> factoryCodes = new ArrayList<>();
try {
List<String> roleCompanyCode = HGSBTools.getRoleCompanyCode();
Optional.ofNullable(roleCompanyCode).orElse(new ArrayList<>()).stream().forEach( code -> {
factoryCodes.addAll(HGXSTools.XsOrg.queryByParent(code,OrgTypeEnum.FACTORY.getCode()));
Optional.ofNullable(roleCompanyCode).orElse(new ArrayList<>()).stream().forEach(code -> {
factoryCodes.addAll(HGXSTools.XsOrg.queryByParent(code, OrgTypeEnum.FACTORY.getCode()));
});
//List<Map<String,Object>> mapList = getOrg();
//factoryCodes.addAll(mapList);
}catch (Exception e){
LogUtils.setDetailMsg(inInfo,e,"APP查询工厂失败");
} catch (Exception e) {
LogUtils.setDetailMsg(inInfo, e, "APP查询工厂失败");
}
return factoryCodes.stream().filter(o-> com.baosight.hggp.util.StringUtils.equals(o.getOrgType(),OrgTypeEnum.FACTORY.getCode())).map(item -> new Factory(item.getCompanyCode(),item.getCompanyName(),item.getFactoryCode(),item.getFactoryName())).collect(Collectors.collectingAndThen(
Collectors.toMap(Factory::getFactoryCode, Function.identity(), (oldValue, newValue) -> oldValue),
return factoryCodes.stream()
.filter(o -> com.baosight.hggp.util.StringUtils.equals(o.getOrgType(), OrgTypeEnum.FACTORY.getCode()))
.map(item -> new Factory(item.getCompanyCode(), item.getCompanyName(), item.getFactoryCode(),
item.getFactoryName())).collect(Collectors.collectingAndThen(
Collectors.toMap(Factory::getFactoryCode, Function.identity(),
(oldValue, newValue) -> oldValue),
// 将Map转回List
m -> new ArrayList<>(m.values())
));
......@@ -124,7 +161,7 @@ import java.util.stream.Collectors;
if (StringUtils.isEmpty(companyCode)) {
queryRow.setCell(ACConstants.ROW_CODE_0,HGSC007.FIELD_company_code,userVO.getUsercode());
}*/
inInfo = super.query(inInfo,HGSC007.QUERY_SUM_WT);
inInfo = super.query(inInfo, HGSC007.QUERY_SUM_WT);
} catch (PlatException e) {
LogUtils.setDetailMsg(inInfo, e, "查询失败");
}
......@@ -143,7 +180,7 @@ import java.util.stream.Collectors;
if (StringUtils.isEmpty(companyCode)) {
queryRow.setCell(ACConstants.ROW_CODE_0,HGSC007.FIELD_company_code,userVO.getUsercode());
}*/
inInfo = super.query(inInfo,HGSC007.QUERY_WT);
inInfo = super.query(inInfo, HGSC007.QUERY_WT);
} catch (PlatException e) {
LogUtils.setDetailMsg(inInfo, e, "查询失败");
}
......@@ -159,15 +196,15 @@ import java.util.stream.Collectors;
EiBlock queryRow = inInfo.getBlock(EiConstant.queryBlock);
//UserVO userVO = HGCWTools.HgCw002.getUserCompany();
//String companyCode = queryRow.getCellStr(ACConstants.ROW_CODE_0,HGSC007.FIELD_company_code);
String endDate = queryRow.getCellStr(ACConstants.ROW_CODE_0,ACConstants.SQL_END_DATE);
String endDate = queryRow.getCellStr(ACConstants.ROW_CODE_0, ACConstants.SQL_END_DATE);
if (StringUtils.isNotEmpty(endDate)) {
String startDate = DateUtil.dateSubStr(endDate,-7);
queryRow.setCell(ACConstants.ROW_CODE_0,ACConstants.SQL_START_DATE,startDate);
String startDate = DateUtil.dateSubStr(endDate, -7);
queryRow.setCell(ACConstants.ROW_CODE_0, ACConstants.SQL_START_DATE, startDate);
}
/*if (StringUtils.isEmpty(companyCode)) {
queryRow.setCell(ACConstants.ROW_CODE_0,HGSC007.FIELD_company_code,userVO.getUsercode());
}*/
inInfo = super.query(inInfo,HGSC007.QUERY_DAY_WT);
inInfo = super.query(inInfo, HGSC007.QUERY_DAY_WT);
} catch (PlatException e) {
LogUtils.setDetailMsg(inInfo, e, "查询失败");
}
......@@ -183,15 +220,15 @@ import java.util.stream.Collectors;
EiBlock queryRow = inInfo.getBlock(EiConstant.queryBlock);
//UserVO userVO = HGCWTools.HgCw002.getUserCompany();
//String companyCode = queryRow.getCellStr(ACConstants.ROW_CODE_0,HGSC007.FIELD_company_code);
String endDate = queryRow.getCellStr(ACConstants.ROW_CODE_0,ACConstants.SQL_END_DATE);
String endDate = queryRow.getCellStr(ACConstants.ROW_CODE_0, ACConstants.SQL_END_DATE);
if (StringUtils.isNotEmpty(endDate)) {
String startDate = DateUtil.getMonthOfDays(endDate,-6,DateUtil.DATE8_PATTERN);
queryRow.setCell(ACConstants.ROW_CODE_0,ACConstants.SQL_START_DATE,startDate);
String startDate = DateUtil.getMonthOfDays(endDate, -6, DateUtil.DATE8_PATTERN);
queryRow.setCell(ACConstants.ROW_CODE_0, ACConstants.SQL_START_DATE, startDate);
}
/*if (StringUtils.isEmpty(companyCode)) {
queryRow.setCell(ACConstants.ROW_CODE_0,HGSC007.FIELD_company_code,userVO.getUsercode());
}*/
inInfo = super.query(inInfo,HGSC007.QUERY_MONTH_WT);
inInfo = super.query(inInfo, HGSC007.QUERY_MONTH_WT);
} catch (PlatException e) {
LogUtils.setDetailMsg(inInfo, e, "查询失败");
}
......@@ -211,40 +248,13 @@ import java.util.stream.Collectors;
if (StringUtils.isEmpty(companyCode)) {
queryRow.setCell(ACConstants.ROW_CODE_0,HGSC007.FIELD_company_code,userVO.getUsercode());
}*/
inInfo = super.query(inInfo,HGSC007.QUERY_PROJ_CODE_WT);
inInfo = super.query(inInfo, HGSC007.QUERY_PROJ_CODE_WT);
} catch (PlatException e) {
LogUtils.setDetailMsg(inInfo, e, "查询失败");
}
return inInfo;
}
public static List<Map<String,Object>> getOrg() {
List<Map<String,Object>> list = new ArrayList<>();
List<Org> orgList = HGXSTools.XsOrg.queryByUser();
if (CollectionUtils.isNotEmpty(orgList)) {
for (Org org: orgList) {
Map<String,Object> objectMap = new HashMap<>();
if (!org.getOrgType().equals(OrgTypeEnum.COMPANY.getCode())) {
//Org org1 = HGXSTools.XsOrg.queryCompany(org.getOrgId());
objectMap.put(Org.FIELD_FACTORY_CODE,org.getFactoryCode());
objectMap.put(Org.FIELD_FACTORY_NAME,org.getFactoryName());
} else {
Map<String, Object> map = new HashMap<String, Object>();
map.put(Org.FIELD_PARENT_ORG_ID, org.getOrgId());
List<Map> results = DaoBase.getInstance().query(HGSqlConstant.HgXsOrg.QUERY_BY_FACTORY,map);
if (results.size()>0) {
Map org1 = results.get(0);
objectMap.put(Org.FIELD_FACTORY_CODE,org1.get(Org.FIELD_ORG_ID));
objectMap.put(Org.FIELD_FACTORY_NAME,org1.get(Org.FIELD_ORG_CNAME));
}
}
list.add(objectMap);
}
}
return list;
}
}
src/main/java/com/baosight/hggp/hg/sc/sql/HGSC007.xml
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE sqlMap PUBLIC "-//ibatis.apache.org//DTD SQL Map 2.0//EN" "http://ibatis.apache.org/dtd/sql-map-2.dtd"> <!-- table information
Generate time : 2024-05-23 17:55:59
Version : 1.0
schema : hggp
tableName : HGSC007
id BIGINT NOT NULL primarykey,
order_id BIGINT NOT NULL,
order_detail_id BIGINT NOT NULL,
tech_flow_id BIGINT,
tech_flow_name BIGINT,
invent_process_id BIGINT,
process_code VARCHAR,
process_name VARCHAR,
process_order BIGINT,
company_code VARCHAR NOT NULL,
company_name VARCHAR NOT NULL,
dep_code VARCHAR,
dep_name VARCHAR,
proj_code VARCHAR,
proj_name VARCHAR,
task_code VARCHAR,
product_type TINYINT,
product_code VARCHAR,
product_name VARCHAR,
plan_start_date VARCHAR,
plan_end_date VARCHAR,
factory_code VARCHAR,
factory_name VARCHAR,
group_code VARCHAR,
group_name VARCHAR,
complete_date VARCHAR,
quantity TINYINT,
finish_quantity TINYINT,
unfinish_quantity TINYINT,
single_weight DECIMAL,
total_weight DECIMAL,
finish_weight DECIMAL,
unfinish_weight DECIMAL,
account_code VARCHAR NOT NULL,
created_by VARCHAR,
created_name VARCHAR,
created_time VARCHAR,
updated_by VARCHAR,
updated_name VARCHAR,
updated_time VARCHAR
-->
<!DOCTYPE sqlMap PUBLIC "-//iBATIS.com//DTD SQL Map 2.0//EN" "http://www.ibatis.com/dtd/sql-map-2.dtd">
<sqlMap namespace="HGSC007">
<sql id="condition">
......@@ -184,6 +139,13 @@
ifnull(complete_date,'') != ''
</isEqual>
</sql>
<sql id="customCondition">
<isNotEmpty prepend=" AND " property="groupCodes">
GROUP_CODE IN <iterate close=")" open="(" conjunction="," property="groupCodes">#groupCodes[]#</iterate>
</isNotEmpty>
</sql>
<sql id="appCondition">
<!-- 无权限时使用 -->
<isNotEmpty prepend=" AND " property="authDepCode">
......
src/main/java/com/baosight/hggp/hg/wd/sql/HGWD001.xml
......@@ -108,7 +108,7 @@
$orderBy$
</isNotEmpty>
<isEmpty property="orderBy">
ID desc
ID DESC
</isEmpty>
</dynamic>
</sql>
......
src/main/java/com/baosight/hggp/hg/wd/tools/HGWDTools.java
package com.baosight.hggp.hg.wd.tools;
import com.baosight.hggp.core.constant.CommonConstant;
import com.baosight.hggp.core.dao.DaoBase;
import com.baosight.hggp.core.dao.DaoUtils;
import com.baosight.hggp.hg.sb.domain.HGSB002;
import com.baosight.hggp.hg.wd.constant.HgWdSqlConstant;
import com.baosight.hggp.hg.wd.domain.HGWD001;
import com.baosight.hggp.hg.wd.domain.HGWD001A;
import com.baosight.hggp.util.AssertUtils;
import org.apache.commons.collections.CollectionUtils;
import java.util.HashMap;
......@@ -32,7 +29,7 @@ public class HGWDTools {
* @return
*/
public static HGWD001 get(String fileId) {
AssertUtils.isNull(fileId, "文件ID不能为空");
AssertUtils.isEmpty(fileId, "文件ID不能为空");
Map queryMap = new HashMap();
queryMap.put(HGWD001.FIELD_FILE_ID, fileId);
List<HGWD001> results = DaoBase.getInstance().query(HGWD001.QUERY, queryMap);
......@@ -57,7 +54,7 @@ public class HGWDTools {
* @param fileId
*/
public static void previewIncr(String fileId) {
AssertUtils.isNull(fileId, "文件ID不能为空");
AssertUtils.isEmpty(fileId, "文件ID不能为空");
Map queryMap = new HashMap();
queryMap.put(HGWD001.FIELD_FILE_ID, fileId);
DaoUtils.update(HgWdSqlConstant.HgWd001.PREVIEW_INCR, queryMap);
......@@ -69,7 +66,7 @@ public class HGWDTools {
* @param fileId
*/
public static void downloadIncr(String fileId) {
AssertUtils.isNull(fileId, "文件ID不能为空");
AssertUtils.isEmpty(fileId, "文件ID不能为空");
Map queryMap = new HashMap();
queryMap.put(HGWD001.FIELD_FILE_ID, fileId);
DaoUtils.update(HgWdSqlConstant.HgWd001.DOWNLOAD_INCR, queryMap);
......
src/main/webapp/HG/WD/HGWD002.js
......@@ -21,7 +21,7 @@ $(function () {
}, {
field: "docVersion",
template: function (model) {
return "V" + model.docVersion;
return "v" + model.docVersion;
}
}],
loadComplete: function (grid) {
......
src/main/webapp/HG/WD/HGWD002.jsp
......@@ -34,6 +34,8 @@
<EF:EFColumn ename="docVersion" cname="版本号" enable="false" width="100" align="center"/>
<EF:EFColumn ename="docId" cname="文件号" enable="false" width="120" align="center" hidden="true"/>
<EF:EFColumn ename="docName" cname="文件附件名称" enable="false" width="100" align="left"/>
<EF:EFColumn ename="previewNum" cname="预览次数" enable="false" width="100" align="right"/>
<EF:EFColumn ename="downloadNum" cname="下载次数" enable="false" width="100" align="right"/>
</EF:EFGrid>
</EF:EFRegion>
......
Markdown is supported
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