guoyuepeng
/
qa-prevention-gwj
1
0
Fork 3
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge branch '0206czks' into 0205cmt 

# Conflicts:
#	src/main/java/com/zcloud/service/czksbimap/impl/CzksBiMapServiceImpl.java
#	src/main/java/com/zcloud/util/HiddenExcelImgToSessionView.java
#	src/main/resources/mybatis/datasource/firemanager/FireCheckStandardMapper.xml
0927cmt
zhaoyu 2024-03-08 15:08:55 +08:00
parent 37474aa188 53530e0513
commit c0245bdf3c
17 changed files with 139 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/zcloud/controller/app/inspection/AppSafetyEnvironmentalController.java
View File

@ -196,6 +196,7 @@ public class AppSafetyEnvironmentalController extends BaseController {
}
List<PageData> hiddenList = safetyenvironmentalService.edit(pd);
pd.put("hiddenList", hiddenList);
map.put("sendPicturesList", JSON.toJSONString(strings));
map.put("pd", pd);
map.put("sendPicturesList", JSON.toJSONString(strings));
map.put("result", errInfo);

46
src/main/java/com/zcloud/controller/bus/CorpPromiseController.java
View File

@ -88,20 +88,21 @@ public class CorpPromiseController extends BaseController {
if (people.size() > 0) { //承诺人数据
int num = 0;
for (int i = 0; i < people.size(); i++) {
PageData promise = new PageData();
promise.put("PROMISE_ID", pd.getString("PROMISE_ID")); //外键ID
promise.put("DEPARTMENT_ID", people.get(i).get("DEPARTMENT_ID"));
promise.put("POST_ID", people.get(i).get("POST_ID"));
List<JSONObject> user = (List<JSONObject>) people.get(i).get("USER_ID"); //同部门、同岗位下有可能选择多个人
promise.put("ISSIGN", 0);
if (user.size() > 0) {
for (int j = 0; j < user.size(); j++) {
promise.put("USER_ID", user.get(j));
promise.put("PROMISEPEOPLE_ID", this.get32UUID()); //主键
promise.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
promise.put("ISPROMISE_PEOPLE", "0");
corpPromisePeopleService.save(promise);
corpPromisePeoples.add(promise);
PageData peo = new PageData();
peo.put("ISSIGN", 0);
peo.put("PROMISE_ID", pd.getString("PROMISE_ID")); //外键ID
peo.put("DEPARTMENT_ID",people.get(i).get("DEPARTMENT_ID"));
peo.put("POST_ID",people.get(i).get("POST_ID"));
peo.put("USER_ID",user.get(j));
peo.put("ISSIGN",0);
peo.put("PROMISEPEOPLE_ID", this.get32UUID()); //主键
peo.put("CORPINFO_ID",people.get(i).get("CORPINFO_ID"));
peo.put("ISPROMISE_PEOPLE","1");
corpPromisePeopleService.save(peo);
corpPromisePeoples.add(peo);
num++;
}
dockData.put("corpPromisePeopleSave",JSON.toJSONString(corpPromisePeoples));
@ -114,20 +115,21 @@ public class CorpPromiseController extends BaseController {
List<JSONObject> coverpeople = (List<JSONObject>) JSON.parse(pd.getString("coverpeople"));
if (coverpeople.size() > 0) { //被承诺人数据
for (int i = 0; i < coverpeople.size(); i++) {
PageData promise = new PageData();
promise.put("PROMISE_ID", pd.getString("PROMISE_ID")); //外键ID
promise.put("DEPARTMENT_ID", coverpeople.get(i).get("DEPARTMENT_ID"));
promise.put("POST_ID", coverpeople.get(i).get("POST_ID"));
List<JSONObject> user = (List<JSONObject>) coverpeople.get(i).get("USER_ID"); //同部门、同岗位下有可能选择多个人
promise.put("ISSIGN", 0);
if (user.size() > 0) {
for (int j = 0; j < user.size(); j++) {
promise.put("USER_ID", user.get(j));
promise.put("PROMISEPEOPLE_ID", this.get32UUID()); //主键
promise.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
promise.put("ISPROMISE_PEOPLE", "1");
corpPromisePeopleService.save(promise);
coverPeoples.add(promise);
PageData peo = new PageData();
peo.put("ISSIGN", 0);
peo.put("PROMISE_ID", pd.getString("PROMISE_ID")); //外键ID
peo.put("DEPARTMENT_ID",people.get(i).get("DEPARTMENT_ID"));
peo.put("POST_ID",people.get(i).get("POST_ID"));
peo.put("USER_ID",user.get(j));
peo.put("ISSIGN",0);
peo.put("PROMISEPEOPLE_ID", this.get32UUID()); //主键
peo.put("CORPINFO_ID",people.get(i).get("CORPINFO_ID"));
peo.put("ISPROMISE_PEOPLE","1");
corpPromisePeopleService.save(peo);
coverPeoples.add(peo);
}
dockData.put("coverPeopleList",JSON.toJSONString(coverPeoples));
}

1
src/main/java/com/zcloud/controller/corpsystem/CorpRoleController.java
View File

@ -1,7 +1,6 @@
package com.zcloud.controller.corpsystem;
import com.alibaba.fastjson.JSON;
import com.zcloud.aspect.DockAnnotation;
import com.zcloud.controller.base.BaseController;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;

31
src/main/java/com/zcloud/controller/gatemachine/GateAreaController.java
View File

@ -1,5 +1,7 @@
package com.zcloud.controller.gatemachine;
import com.alibaba.fastjson.JSON;
import com.zcloud.aspect.DockAnnotation;
import com.zcloud.controller.base.BaseController;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
@ -9,7 +11,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* 说明：TODO
@ -36,22 +40,33 @@ public class GateAreaController extends BaseController {
}
@RequestMapping(value = "/edit")
public ReturnMap edit() {
PageData pd = this.getPageData();
gateAreaService.edit(pd);
return ReturnMap.ok();
@DockAnnotation
public Object edit() {
PageData pageData = this.getPageData();
gateAreaService.edit(pageData);
Map map = new HashMap();
map.put("dockData", JSON.toJSONString(pageData));
return map;
}
@RequestMapping(value = "/removeByIds")
public ReturnMap removeByIds() {
@DockAnnotation
public Object removeByIds() {
PageData pageData = this.getPageData();
gateAreaService.removeByIds(pageData);
return ReturnMap.ok();
Map map = new HashMap();
map.put("dockData", JSON.toJSONString(pageData));
return map;
}
@RequestMapping(value = "/add")
public ReturnMap add() {
@DockAnnotation
public Object add() {
PageData pageData = this.getPageData();
gateAreaService.save(pageData);
return ReturnMap.ok();
Map map = new HashMap();
map.put("dockData", JSON.toJSONString(pageData));
return map;
}
}

9
src/main/java/com/zcloud/controller/gatemachine/GateCarIOController.java
View File

@ -101,4 +101,13 @@ public class GateCarIOController extends BaseController {
return ReturnMap.ok().put("data", gateCarIOService.getAllEQCount(this.getPageData()));
}
/**
* 获取在场，离场，总量计数
* @return
*/
@RequestMapping(value = "/getTodayEQCountAllForOne")
public ReturnMap getTodayEQCountAllForOne() {
return ReturnMap.ok().put("data", gateCarIOService.getAllEQCountForOne(this.getPageData()));
}
}

1
src/main/java/com/zcloud/controller/inspection/SafetyEnvironmentalController.java
View File

@ -395,6 +395,7 @@ public class SafetyEnvironmentalController extends BaseController {
}
List<PageData> hiddenList = safetyenvironmentalService.edit(pd);
pd.put("hiddenList", hiddenList);
map.put("sendPicturesList", JSON.toJSONString(strings));
map.put("pd", pd);
map.put("sendPicturesList",JSON.toJSONString(strings));
map.put("result", errInfo);

7
src/main/java/com/zcloud/controller/keyProjects/PlatformvideomanagementController.java
View File

@ -7,6 +7,7 @@ import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
import com.zcloud.service.keyProjects.PlatformvideomanagementService;
import com.zcloud.util.Jurisdiction;
import com.zcloud.util.ReturnMap;
import com.zcloud.util.Tools;
import com.zcloud.util.hk.HKUtil;
import org.springframework.beans.factory.annotation.Autowired;
@ -127,10 +128,10 @@ public class PlatformvideomanagementController extends BaseController {
PageData pd =this.getPageData();
map = HKUtil.cameraSearch(pd);
if(ObjectUtils.isEmpty(map)){
map = new HashMap<String,Object>();
return ReturnMap.error("海康平台摄像头调用失败");
}
HashMap<Object, Object> data = new HashMap<>();
map.put("data", data);
//HashMap<Object, Object> data = new HashMap<>();
//map.put("data", data);
map.put("result", "success");
return map;
}

9
src/main/java/com/zcloud/controller/map/CmtMapController.java
View File

@ -240,11 +240,12 @@ public class CmtMapController extends BaseController {
*/
@RequestMapping("/getGatesInAndOutNumById")
@ResponseBody
public ReturnMap getGatesInAndOutNumById() {
public ReturnMap getGatesInAndOutNumById(Page page) {
ReturnMap returnMap = new ReturnMap();
PageData pageData = this.getPageData();
Map<String, Object> data = biMapService.getGatesInAndOutNumById(pageData);
returnMap.put("pd", data);
page.setCurrentPage(1);
page.setShowCount(999);
page.setPd(this.getPageData());
returnMap.put("data", biMapService.getGatesInAndOutNumById(page).get("data"));
return returnMap;
}

2
src/main/java/com/zcloud/controller/map/MapEightController.java
View File

@ -31,7 +31,7 @@ import java.util.Map;
* 官网：www.zcloudchina.com
*/
@Controller
@RequestMapping("/map/Eight")
@RequestMapping("/czksmap/Eight")
public class MapEightController extends BaseController {
@Autowired

2
src/main/java/com/zcloud/service/czksbimap/CzksBiMapService.java
View File

@ -37,7 +37,7 @@ public interface CzksBiMapService {
// PageData getGatesInAndOutNumById(PageData pageData);
Map<String, Object> getGatesInAndOutNumById(PageData pageData);
Map<String, Object> getGatesInAndOutNumById(Page page);
Map<String, Object> getPerpleCarGateMachineCount(PageData pageData);

55
src/main/java/com/zcloud/service/czksbimap/impl/CzksBiMapServiceImpl.java
View File

@ -5,9 +5,12 @@ import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
import com.zcloud.mapper.datasource.bus.CorpInfoMapper;
import com.zcloud.mapper.datasource.czksbimap.CzksBiMapMapper;
import com.zcloud.mapper.datasource.gatemachine.CzksGateAreaMapper;
import com.zcloud.mapper.datasource.gatemachine.CzksGateCarIOMapper;
import com.zcloud.mapper.dsno2.fireresources.CzksFireResourcesMapper;
import com.zcloud.mapper.datasource.keyProjects.PlatformvideomanagementMapper;
import com.zcloud.mapper.dsno2.fireresources.CmtFireResourcesMapper;
import com.zcloud.service.czksbimap.CzksBiMapService;
import com.zcloud.service.gatemachine.GateCarIOService;
import com.zcloud.util.czksBiMapFactory.AbsCzksFireSourcesHandel;
import com.zcloud.util.czksBiMapFactory.CzksAssemblyBeanFactory;
import org.apache.commons.lang.StringUtils;
@ -28,11 +31,18 @@ import java.util.*;
@Service
public class CzksBiMapServiceImpl implements CzksBiMapService {
@Resource
private CzksGateCarIOMapper czksGateCarIOMapper;
@Resource
private CzksBiMapMapper czksBiMapper;
@Autowired
GateCarIOService gateCarIOService;
@Autowired
CzksGateAreaMapper czksGateAreaMapper;
@Resource
private CmtFireResourcesMapper czksfireResourcesMapper;
private CzksFireResourcesMapper czksfireResourcesMapper;
@Autowired
private RestTemplate restTemplate;
@Value("${perLoc.url}")
@ -182,24 +192,35 @@ public class CzksBiMapServiceImpl implements CzksBiMapService {
}*/
@Override
public Map<String, Object> getGatesInAndOutNumById(PageData pd) {
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String fendDate = simpleDateFormat.format(new Date());
Calendar now = Calendar.getInstance();
now.add(Calendar.MINUTE, -1);
Date before = now.getTime();
String fstartDate = simpleDateFormat.format(before);
public Map<String, Object> getGatesInAndOutNumById(Page page) {
Map<String,Object> result = new HashMap<>();
if (pd.getString("TYPE").equals("PERSON")){
result = restTemplate.getForObject(url2+"/region/access/bayonetPersonnelEntryAndExitRecords?fstartDate="+fstartDate+"&fendDate="+fendDate+"&workNumber=&accId="+pd.getString("id"),Map.class);
}else {
result = restTemplate.getForObject(url2+"/region/access/bayonetVehicleEntryAndExitRecords?fstartDate="+fstartDate+"&fendDate="+fendDate+"&carsign=&accId="+pd.getString("id"),Map.class);
PageData pd = page.getPd();
List<PageData> datalistPage = czksGateAreaMapper.getDatalistPage(page);
String gateAreaName = (String) datalistPage.get(0).get("GATE_AREA_NAME");
if (gateAreaName != null && "矿石作业区域".equals(gateAreaName)) {
pd.put("GATE_AREA_TYPE", "1");
} else if (gateAreaName != null && "杂货作业区域".equals(gateAreaName)) {
pd.put("GATE_AREA_TYPE", "2");
}
Object msg = result.get("msg");
if (msg!=null && msg.equals("success")) {
result.remove("msg");
result.put("result","success");
Calendar calendar = Calendar.getInstance();
calendar.setTime(new Date());
calendar.set(Calendar.HOUR_OF_DAY, 0);
calendar.set(Calendar.MINUTE, 0);
calendar.set(Calendar.SECOND, 0);
new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(calendar.getTime());
pd.put("startTime", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(calendar.getTime()));
calendar.set(Calendar.HOUR_OF_DAY, 23);
calendar.set(Calendar.MINUTE, 59);
calendar.set(Calendar.SECOND, 59);
pd.put("endTime", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(calendar.getTime()));
page.setPd(pd);
List<PageData> ioRecord = new ArrayList<>();
if (page.getPd().get("GATE_AREA_TYPE") != null && "1".equals(page.getPd().get("GATE_AREA_TYPE"))) {
ioRecord = czksGateCarIOMapper.getMineralDatalistPage(page);
} else if (page.getPd().get("GATE_AREA_TYPE") != null && "2".equals(page.getPd().get("GATE_AREA_TYPE"))) {
ioRecord = czksGateCarIOMapper.getGroceryDatalistPage(page);
}
result.put("data", ioRecord);
return result;
}

1
src/main/java/com/zcloud/service/gatemachine/GateCarIOService.java
View File

@ -19,5 +19,6 @@ public interface GateCarIOService {
PageData getTodayEQCount(PageData pageData);
PageData getAllEQCount(PageData pageData);
PageData getAllEQCountForOne(PageData pageData);
}

20
src/main/java/com/zcloud/service/gatemachine/impl/GateCarIOServiceImpl.java
View File

@ -2,10 +2,12 @@ package com.zcloud.service.gatemachine.impl;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
import com.zcloud.mapper.datasource.gatemachine.CzksGateAreaMapper;
import com.zcloud.mapper.datasource.gatemachine.CzksGateCarIOMapper;
import com.zcloud.service.gatemachine.GateCarIOService;
import com.zcloud.util.InitPageDataUtil;
import com.zcloud.util.UuidUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -21,7 +23,11 @@ public class GateCarIOServiceImpl implements GateCarIOService {
@Resource
private CzksGateCarIOMapper czksGateCarIOMapper;
@Autowired
GateCarIOService gateCarIOService;
@Autowired
CzksGateAreaMapper czksGateAreaMapper;
@Resource
private InitPageDataUtil initPageDataUtil;
@ -128,4 +134,18 @@ public class GateCarIOServiceImpl implements GateCarIOService {
pageData.put("mineral", czksGateCarIOMapper.countMineralEnterAndQuitAll(pd));
return pageData;
}
@Override
public PageData getAllEQCountForOne(PageData pd) {
Page page = new Page();
page.setPd(pd);
List<PageData> datalistPage = czksGateAreaMapper.getDatalistPage(page);
String gateAreaName = (String) datalistPage.get(0).get("GATE_AREA_NAME");
if (gateAreaName != null && "矿石作业区域".equals(gateAreaName)) {
pd = czksGateCarIOMapper.countMineralEnterAndQuitAll(pd);
} else if (gateAreaName != null && "杂货作业区域".equals(gateAreaName)) {
pd = czksGateCarIOMapper.countGroceryEnterAndQuitAll(pd);
}
return pd;
}
}

3
src/main/java/com/zcloud/util/HiddenExcelImgToSessionView.java
View File

@ -19,7 +19,6 @@ import org.apache.poi.ss.usermodel.VerticalAlignment;
import org.apache.poi.ss.usermodel.Workbook;
import org.apache.shiro.session.Session;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
import org.springframework.web.servlet.view.document.AbstractXlsView;
import com.zcloud.entity.PageData;
@ -31,11 +30,11 @@ import net.coobird.thumbnailator.Thumbnails;
* 作者：luoxiaobao
* 官网：www.qdkjchina.com
*/
@Component
public class HiddenExcelImgToSessionView extends AbstractXlsView{
@Value("${http.file.url}")
private String fileUrl;
@Override
protected void buildExcelDocument(Map<String, Object> model,
Workbook workbook, HttpServletRequest request,

1
src/main/java/com/zcloud/util/hk/HKUtil.java
View File

@ -106,6 +106,7 @@ public class HKUtil {
path.put("https://", getCamsApi);
// post请求application/json类型参数
String result =ArtemisHttpUtil.doPostStringArtemis(path,jsonBody.toJSONString(),null,null,"application/json",null);
JSONObject parseObject = JSONArray.parseObject(result);
return parseObject;
}

10
src/main/resources/mybatis/datasource/gatemachine/CzksGateCarIOMapper.xml
View File

@ -165,7 +165,8 @@
<select id="countGroceryEnterAndQuitAll" resultType="pd" parameterType="pd">
select
count(case when g.PASS_TYPE = '0' then 0 end) as `entered`,
count(case when g.PASS_TYPE = '1' then 1 end) as `quited`
count(case when g.PASS_TYPE = '1' then 1 end) as `quited`,
count(case when g.PASS_TYPE = '0' then 0 end) - count(case when g.PASS_TYPE = '1' then 1 end) as present
from
`qa-czks-prevention`.`work_grocery_io_record` g
where
@ -174,7 +175,8 @@
<select id="countMineralEnterAndQuitAll" resultType="pd" parameterType="pd">
select
count(case when m.PASS_TYPE = '0' then 0 end) as `entered`,
count(case when m.PASS_TYPE = '1' then 1 end) as `quited`
count(case when m.PASS_TYPE = '1' then 1 end) as `quited`,
count(case when m.PASS_TYPE = '0' then 0 end) - count(case when m.PASS_TYPE = '1' then 1 end) as present
from
`qa-czks-prevention`.`work_mineral_io_record` m
where
@ -211,7 +213,7 @@
<if test="pd.CAR_TEAM_NAME!=null and pd.CAR_TEAM_NAME!='' ">
and f.CAR_TEAM_NAME like CONCAT(CONCAT('%',#{pd.CAR_TEAM_NAME}),'%')
</if>
order by f.OPERATTIME desc
order by f.JGSJ desc
</select>
<select id="getGroceryDatalistPage" resultType="pd" parameterType="com.zcloud.entity.Page">
select *
@ -243,6 +245,6 @@
<if test="pd.CAR_TEAM_NAME!=null and pd.CAR_TEAM_NAME!='' ">
and f.CAR_TEAM_NAME like CONCAT(CONCAT('%',#{pd.CAR_TEAM_NAME}),'%')
</if>
order by f.OPERATTIME desc
order by f.JGSJ desc
</select>
</mapper>

2
src/main/resources/mybatis/datasource/map/MapKeyProjectMapper.xml
View File

@ -79,7 +79,7 @@
<select id="getVideoLocation" parameterType="pd" resultType="pd">
SELECT
'camera' TYPE,
'VIDEO' TYPE,
v.VIDEOMANAGER_ID id,
v.LONGITUDE,
v.LATITUDE,