From c62d8002bec6dfd520649a435085dc1f7e3ce147 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Wed, 01 Dec 2021 10:36:19 +0800
Subject: [PATCH] 1.押运
---
src/main/java/org/springblade/modules/equipage/service/impl/EquipageServiceImpl.java | 8 +
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 99 +++++++++++--
src/main/java/org/springblade/modules/equipage/mapper/EquipageMapper.java | 2
src/main/java/org/springblade/modules/equipage/service/impl/CarServiceImpl.java | 8 +
src/main/java/org/springblade/modules/FTP/MysqlCenlint.java | 2
src/main/java/org/springblade/modules/equipage/service/CarService.java | 4
src/main/java/org/springblade/modules/equipage/mapper/CarMapper.java | 2
src/main/java/org/springblade/modules/equipage/controller/CarController.java | 168 +----------------------
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java | 12 +
src/main/java/org/springblade/modules/equipage/service/EquipageService.java | 4
src/main/java/org/springblade/modules/equipage/mapper/EquipageMapper.xml | 3
src/main/java/org/springblade/modules/equipage/controller/EquipageController.java | 45 ++++++
src/main/java/org/springblade/modules/equipage/mapper/CarMapper.xml | 3
src/main/java/org/springblade/modules/system/controller/UserController.java | 10 +
src/main/java/org/springblade/modules/system/mapper/UserMapper.java | 6
src/main/java/org/springblade/modules/system/service/IUserService.java | 7 +
16 files changed, 199 insertions(+), 184 deletions(-)
diff --git a/src/main/java/org/springblade/modules/FTP/MysqlCenlint.java b/src/main/java/org/springblade/modules/FTP/MysqlCenlint.java
index 3a5cbe8..7f64d21 100644
--- a/src/main/java/org/springblade/modules/FTP/MysqlCenlint.java
+++ b/src/main/java/org/springblade/modules/FTP/MysqlCenlint.java
@@ -46,7 +46,7 @@
String driver = "com.mysql.cj.jdbc.Driver";
String url = sqlConnect; //换成要连接的数据库信息
String user = "root";
- String password = "zhba0728";
+ String password = "131556";
Connection conn = null;
PreparedStatement ps = null;
try {
diff --git a/src/main/java/org/springblade/modules/equipage/controller/CarController.java b/src/main/java/org/springblade/modules/equipage/controller/CarController.java
index 2a45c91..164c75a 100644
--- a/src/main/java/org/springblade/modules/equipage/controller/CarController.java
+++ b/src/main/java/org/springblade/modules/equipage/controller/CarController.java
@@ -109,165 +109,15 @@
CarVo detail = carService.selectCarInfo(car);
return R.data(detail);
}
+ /**
+ * 查询押运车辆
+ * @return
+ */
+ @GetMapping("/selectCar")
+ public R selectCar() {
+ List<Map<Object, Object>> maps = carService.selectCar();
+ return R.data(maps);
+ }
-// /**
-// * 查询车辆实时位置
-// */
-// @GetMapping("/locationcar")
-// public String locationcar(String imei) {
-// String url = "http://dvopenapi.aimap.net.cn/openapi/device/location";
-// String res = null;
-// Map<String, Object> params = new HashMap<>();
-// params.put("imei", imei);
-// params.put("appId", "PO00000761");
-// params.put("timestamp", System.currentTimeMillis());
-// String secert = "dXRGb2pRNVdWOGQ3d1ouV29UYzc1MnJaUnBwTzUx";
-//
-// String computeSign = "";
-// try {
-// computeSign = Md5SignUtil.signRequest(params, secert);
-// } catch (IOException e1) {
-// e1.printStackTrace();
-// }
-// params.put("sign", computeSign);
-// try {
-// //String res = HttpReqUtil.getInstance().doGet(url, params, null);
-// res = HttpReqUtil.getInstance().doPost(url, params, null);
-// System.out.println("----" + res);
-// } catch (Exception e) {
-// e.printStackTrace();
-// }
-// return res;
-// }
-//
-// /**
-// * 查询车辆轨迹
-// */
-//
-// @GetMapping("/locationhistoryTrack")
-// public R locationhistoryTrack(String beginTime, String endTime, String rectify,String callbackId) throws AWTException {
-// String url = "http://dvopenapi.aimap.net.cn/openapi/device/historyTrack";
-// String res = null;
-// Map<String, Object> params = new HashMap<>();
-// params.put("imei", "861636056082414");
-// params.put("beginTime", beginTime);
-// params.put("endTime", endTime);
-// params.put("rectify", rectify);
-// params.put("callbackUrl", "http://2h3f861221.wicp.vip/car/SaveUrl");
-// params.put("callbackId", callbackId);
-// params.put("appId", "PO00000761");
-// params.put("timestamp", System.currentTimeMillis());
-// String secert = "dXRGb2pRNVdWOGQ3d1ouV29UYzc1MnJaUnBwTzUx";
-//
-// String computeSign = "";
-// try {
-// computeSign = Md5SignUtil.signRequest(params, secert);
-// } catch (IOException e1) {
-// e1.printStackTrace();
-// }
-// params.put("sign", computeSign);
-// try {
-// //String res = HttpReqUtil.getInstance().doGet(url, params, null);
-// res = HttpReqUtil.getInstance().doPost(url, params, null);
-// Thread.sleep(2000);
-// } catch (Exception e) {
-// e.printStackTrace();
-// }
-//
-// return R.data(csvurl);
-//
-// }
-//
-// /**
-// * 实时视频直播指令下发接口
-// */
-// @GetMapping("/cmd")
-// public String cmd(int camera, String action) {
-// String url = "http://dvopenapi.aimap.net.cn/openapi/live/cmd";
-// String res = null;
-// Map<String, Object> params = new HashMap<>();
-// //设备imei号
-// params.put("imei", "861636056082414");
-// //摄像头ID
-// params.put("camera", camera);
-// //实时视频指令类型
-// params.put("action", action);
-// params.put("appId", "PO00000761");
-// params.put("timestamp", System.currentTimeMillis());
-// String secert = "dXRGb2pRNVdWOGQ3d1ouV29UYzc1MnJaUnBwTzUx";
-// String computeSign = "";
-// try {
-// computeSign = Md5SignUtil.signRequest(params, secert);
-// } catch (IOException e1) {
-// e1.printStackTrace();
-// }
-// params.put("sign", computeSign);
-// try {
-// //String res = HttpReqUtil.getInstance().doGet(url, params, null);
-// long startTime=System.currentTimeMillis(); //获取开始时间
-// res = HttpReqUtil.getInstance().doPost(url, params, null);
-// long endTime=System.currentTimeMillis(); //获取结束时间
-// System.out.println("程序运行时间： "+(endTime-startTime)+"ms");
-// } catch (Exception e) {
-// e.printStackTrace();
-// }
-// return res;
-// }
-//
-//
-// /**
-// * 轨迹回调
-// *
-// * @param callbackId
-// * @param fileUrl
-// * @throws UnsupportedEncodingException
-// */
-// @PostMapping("/SaveUrl")
-// @ApiOperation(value = "详情", notes = "传入car")
-// public void SaveUrl(String callbackId, String fileUrl) throws Exception {
-// csvurl = null;
-// DowloadZipUtil dowloadZipUtil = new DowloadZipUtil();
-// File file = dowloadZipUtil.downloadFile(fileUrl, "D:\\caiji");
-// //文件名
-// String name = file.getName();
-// String substring = name.substring(0, name.length() - 4);
-// //解压数据
-// FileZip fileZip = new FileZip();
-// fileZip.ZipUncompress("D:\\caiji\\" + substring + ".zip", "D:\\caiji");
-// csvurl =substring + ".csv";
-// }
-
-// /**
-// * 人员
-// * @return
-// * @throws Exception
-// */
-// @GetMapping("/Peo")
-// public String cs() throws Exception {
-// String url = "http://223.82.109.183:2080/Escort/getgis.php";
-// Map<String, Object> params = new HashMap<>();
-// //设备imei号
-// params.put("acc", "7731");
-// String res = null;
-// res = HttpReqUtil.getInstance().doPost(url, params, null);
-// return res;
-// }
-//
-// /**
-// * 轨迹
-// * @return
-// * @throws Exception
-// */
-// @GetMapping("/Peog")
-// public String Peocar() throws Exception {
-// String url = "http://223.82.109.183:2080/Escort/getgistrack.php";
-// Map<String, Object> params = new HashMap<>();
-// //设备imei号
-// params.put("number", "7730");
-// params.put("acc", "7731");
-// String res = null;
-// res = HttpReqUtil.getInstance().doPost(url, params, null);
-// return res;
-// }
}
diff --git a/src/main/java/org/springblade/modules/equipage/controller/EquipageController.java b/src/main/java/org/springblade/modules/equipage/controller/EquipageController.java
index a346f6d..e865cea 100644
--- a/src/main/java/org/springblade/modules/equipage/controller/EquipageController.java
+++ b/src/main/java/org/springblade/modules/equipage/controller/EquipageController.java
@@ -4,6 +4,9 @@
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
@@ -12,6 +15,9 @@
import org.springblade.modules.equipage.service.EquipageService;
import org.springblade.modules.equipage.vo.EquipageVo;
import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
/**
* @author zhongrj
@@ -84,4 +90,43 @@
return R.data(detail);
}
+ /**
+ * 枪支定位
+ * @param startTime
+ * @param endTime
+ * @return
+ */
+ @GetMapping("/Gun")
+ public R Gun(String startTime,String endTime) {
+ String s = httpGetOne(startTime, endTime);
+ return R.data(s);
+ }
+
+
+
+ public static String httpGetOne(String startTime,String endTime) {
+ OkHttpClient client = new OkHttpClient();
+ Request request = new Request.Builder()
+ .url("http://47.49.36.190/api/investigate/gun?startTime="+startTime+"&endTime="+endTime)
+ .get()
+ .build();
+ try {
+ Response response = client.newCall(request).execute();
+ return response.body().string();
+ } catch (Exception e) {
+
+ }
+ return null;
+ }
+ /**
+ * 查询枪支信息
+ *
+ * @return
+ */
+ @GetMapping("/selectGun")
+ public R selectGun() {
+ List<Map<Object, Object>> maps = equipageService.selectGun();
+ return R.data(maps);
+ }
+
}
diff --git a/src/main/java/org/springblade/modules/equipage/mapper/CarMapper.java b/src/main/java/org/springblade/modules/equipage/mapper/CarMapper.java
index c529bf4..a6de02b 100644
--- a/src/main/java/org/springblade/modules/equipage/mapper/CarMapper.java
+++ b/src/main/java/org/springblade/modules/equipage/mapper/CarMapper.java
@@ -7,6 +7,7 @@
import org.springblade.modules.equipage.vo.CarVo;
import java.util.List;
+import java.util.Map;
/**
* 车辆Mapper 接口
@@ -29,4 +30,5 @@
* @return
*/
CarVo selectCarInfo(@Param("car") Car car);
+ List<Map<Object,Object>> selectCar();
}
diff --git a/src/main/java/org/springblade/modules/equipage/mapper/CarMapper.xml b/src/main/java/org/springblade/modules/equipage/mapper/CarMapper.xml
index 9b81f5d..5352711 100644
--- a/src/main/java/org/springblade/modules/equipage/mapper/CarMapper.xml
+++ b/src/main/java/org/springblade/modules/equipage/mapper/CarMapper.xml
@@ -53,4 +53,7 @@
and sc.id = #{car.id}
</if>
</select>
+ <select id="selectCar" resultType="java.util.HashMap">
+ SELECT * FROM `sys_car` WHERE equipment_code IS NOT NULL
+ </select>
</mapper>
diff --git a/src/main/java/org/springblade/modules/equipage/mapper/EquipageMapper.java b/src/main/java/org/springblade/modules/equipage/mapper/EquipageMapper.java
index 67f42cc..3b7d117 100644
--- a/src/main/java/org/springblade/modules/equipage/mapper/EquipageMapper.java
+++ b/src/main/java/org/springblade/modules/equipage/mapper/EquipageMapper.java
@@ -7,6 +7,7 @@
import org.springblade.modules.equipage.vo.EquipageVo;
import java.util.List;
+import java.util.Map;
/**
* 装备Mapper 接口
@@ -29,4 +30,5 @@
* @return
*/
EquipageVo selectEquipageInfo(@Param("equipage") Equipage equipage);
+ List<Map<Object,Object>> selectGun();
}
diff --git a/src/main/java/org/springblade/modules/equipage/mapper/EquipageMapper.xml b/src/main/java/org/springblade/modules/equipage/mapper/EquipageMapper.xml
index 26b7381..77272ce 100644
--- a/src/main/java/org/springblade/modules/equipage/mapper/EquipageMapper.xml
+++ b/src/main/java/org/springblade/modules/equipage/mapper/EquipageMapper.xml
@@ -47,4 +47,7 @@
and se.id = #{equipage.id}
</if>
</select>
+ <select id="selectGun" resultType="java.util.HashMap">
+ SELECT * FROM `sys_gun`
+ </select>
</mapper>
diff --git a/src/main/java/org/springblade/modules/equipage/service/CarService.java b/src/main/java/org/springblade/modules/equipage/service/CarService.java
index 3a8bc34..3e431c8 100644
--- a/src/main/java/org/springblade/modules/equipage/service/CarService.java
+++ b/src/main/java/org/springblade/modules/equipage/service/CarService.java
@@ -6,6 +6,9 @@
import org.springblade.modules.equipage.entity.Car;
import org.springblade.modules.equipage.vo.CarVo;
+import java.util.List;
+import java.util.Map;
+
public interface CarService extends IService<Car> {
/**
@@ -22,4 +25,5 @@
* @return
*/
IPage<CarVo> selectCarPage(IPage<CarVo> page, CarVo car);
+ List<Map<Object,Object>> selectCar();
}
diff --git a/src/main/java/org/springblade/modules/equipage/service/EquipageService.java b/src/main/java/org/springblade/modules/equipage/service/EquipageService.java
index d4c4a83..ada9085 100644
--- a/src/main/java/org/springblade/modules/equipage/service/EquipageService.java
+++ b/src/main/java/org/springblade/modules/equipage/service/EquipageService.java
@@ -5,9 +5,13 @@
import org.springblade.modules.equipage.entity.Equipage;
import org.springblade.modules.equipage.vo.EquipageVo;
+import java.util.List;
+import java.util.Map;
+
public interface EquipageService extends IService<Equipage> {
EquipageVo selectEquipageInfo(Equipage equipage);
IPage<EquipageVo> selectEquipagePage(IPage<EquipageVo> page, EquipageVo equipage);
+ List<Map<Object,Object>> selectGun();
}
diff --git a/src/main/java/org/springblade/modules/equipage/service/impl/CarServiceImpl.java b/src/main/java/org/springblade/modules/equipage/service/impl/CarServiceImpl.java
index 9f9b908..76544b0 100644
--- a/src/main/java/org/springblade/modules/equipage/service/impl/CarServiceImpl.java
+++ b/src/main/java/org/springblade/modules/equipage/service/impl/CarServiceImpl.java
@@ -8,6 +8,9 @@
import org.springblade.modules.equipage.vo.CarVo;
import org.springframework.stereotype.Service;
+import java.util.List;
+import java.util.Map;
+
/**
* 车辆服务实现类
* @author zhongrj
@@ -26,6 +29,11 @@
return page.setRecords(baseMapper.selectCarPage(page, car));
}
+ @Override
+ public List<Map<Object, Object>> selectCar() {
+ return baseMapper.selectCar();
+ }
+
/**
* 详情
* @param car 车辆信息对象
diff --git a/src/main/java/org/springblade/modules/equipage/service/impl/EquipageServiceImpl.java b/src/main/java/org/springblade/modules/equipage/service/impl/EquipageServiceImpl.java
index d55061a..6273ed9 100644
--- a/src/main/java/org/springblade/modules/equipage/service/impl/EquipageServiceImpl.java
+++ b/src/main/java/org/springblade/modules/equipage/service/impl/EquipageServiceImpl.java
@@ -10,6 +10,9 @@
import org.springblade.modules.equipage.vo.EquipageVo;
import org.springframework.stereotype.Service;
+import java.util.List;
+import java.util.Map;
+
/**
* 装备服务实现类
* @author zhongrj
@@ -22,6 +25,11 @@
return page.setRecords(baseMapper.selectEquipagePage(page, rquipage));
}
+ @Override
+ public List<Map<Object, Object>> selectGun() {
+ return baseMapper.selectGun();
+ }
+
/**
* 详情
* @param rquipage 装备信息对象
diff --git a/src/main/java/org/springblade/modules/system/controller/UserController.java b/src/main/java/org/springblade/modules/system/controller/UserController.java
index 2fe0c1c..bdf1ab4 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -372,5 +372,15 @@
return R.success("吊销成功");
}
+ /**
+ * 查询押运人员
+ *
+ * @return
+ */
+ @GetMapping("/selectPeo")
+ public R selectPeo(@ApiIgnore UserVO user) {
+ List list = userService.selectPeo(user);
+ return R.data(list);
+ }
}
diff --git a/src/main/java/org/springblade/modules/system/mapper/UserMapper.java b/src/main/java/org/springblade/modules/system/mapper/UserMapper.java
index 91a1a64..a7ee5dc 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.java
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.java
@@ -29,6 +29,7 @@
import org.springframework.boot.autoconfigure.quartz.QuartzDataSource;
import java.util.List;
+import java.util.Map;
/**
* Mapper 接口
@@ -107,4 +108,9 @@
* @return
*/
List<SecurityExcel> exportSecurity(@Param("user") UserVO user);
+ /**
+ * 查询押运人员编码不为null的保安信息
+ * @return
+ */
+ List selectPeo(@Param("user") UserVO user);
}
diff --git a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
index 6541c99..9690a67 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -189,7 +189,7 @@
and bu.securitynumber = #{user.securitynumber}
</if>
<if test="user.score!=null and user.score != ''">
- and p.score = 3
+ and p.score = 3
</if>
ORDER BY bu.id
</select>
@@ -231,22 +231,22 @@
<if test="user.deptId!=null and user.deptId!=''">
and bd.id in
(
- select id from blade_dept where id = #{user.deptId}
- union
- SELECT
- id
- FROM
- (
- SELECT
- t1.id,t1.parent_id,t1.dept_name,
- IF
- ( find_in_set( parent_id, @pids ) > 0, @pids := concat( @pids, ',', id ), 0 ) AS ischild
- FROM
- ( SELECT id, parent_id,dept_name FROM blade_dept t ORDER BY parent_id, id ) t1,
- ( SELECT @pids := #{user.deptId} ) t2
- ) t3
- WHERE
- ischild != 0
+ select id from blade_dept where id = #{user.deptId}
+ union
+ SELECT
+ id
+ FROM
+ (
+ SELECT
+ t1.id,t1.parent_id,t1.dept_name,
+ IF
+ ( find_in_set( parent_id, @pids ) > 0, @pids := concat( @pids, ',', id ), 0 ) AS ischild
+ FROM
+ ( SELECT id, parent_id,dept_name FROM blade_dept t ORDER BY parent_id, id ) t1,
+ ( SELECT @pids := #{user.deptId} ) t2
+ ) t3
+ WHERE
+ ischild != 0
)
</if>
<if test="user.cardid!=null and user.cardid != ''">
@@ -345,15 +345,15 @@
<select id="getNotAuditAllUserList" resultType="org.springblade.modules.system.entity.User">
select id, cardid
from blade_user
- where 1=1
- and (examination_type is null or examination_type="" or examination_type=null)
+ where 1 = 1
+ and (examination_type is null or examination_type = "" or examination_type = null)
</select>
<!--根据保安员编码查询保安信息-->
<select id="getUserInfoBySecurityNumber" resultType="org.springblade.modules.system.vo.UserVO">
select bu.*,
ifnull(DATE_FORMAT(NOW(), '%Y') - SUBSTRING(cardid, 7, 4), 0) age,
- bd.dept_name deptName
+ bd.dept_name deptName
from blade_user bu
left join
blade_dept bd
@@ -471,4 +471,63 @@
order by bu.examination_mx ${user.sort}
</if>
</select>
+
+ <select id="selectPeo" resultType="java.util.HashMap">
+ select
+ bu.*,
+ ifnull(DATE_FORMAT(NOW(), '%Y') - SUBSTRING( bu.cardid,7,4),0) age,
+ bd.dept_name as deptName
+ from
+ blade_user bu
+ left join
+ blade_dept bd
+ on
+ bu.dept_id = bd.id
+ left join
+ blade_role br
+ on
+ br.id = bu.role_id
+ left join
+ sys_information si
+ on
+ si.departmentid = bd.id
+ left join
+ sys_jurisdiction sj
+ on
+ sj.id = si.jurisdiction
+ where
+ bu.is_deleted = 0
+ and
+ br.role_alias = "安保人员"
+ and
+ bu.status = 1
+ and bd.parent_id!=1425365577303621633
+ and bd.id != 1425365577303621633
+ and bd.id != 1432625856013971457
+ <if test="user.deptId!=null and user.deptId!=''">
+ and bd.id in
+ (
+ select id from blade_dept where id = #{user.deptId}
+ union
+ SELECT
+ id
+ FROM
+ (
+ SELECT
+ t1.id,t1.parent_id,t1.dept_name,
+ IF
+ ( find_in_set( parent_id, @pids ) > 0, @pids := concat( @pids, ',', id ), 0 ) AS ischild
+ FROM
+ ( SELECT id, parent_id,dept_name FROM blade_dept t ORDER BY parent_id, id ) t1,
+ ( SELECT @pids := #{user.deptId} ) t2
+ ) t3
+ WHERE
+ ischild != 0
+ )
+ </if>
+ <if test="user.type!=null">
+ and bu.equipment_code is not null
+ </if>
+
+ </select>
</mapper>
diff --git a/src/main/java/org/springblade/modules/system/service/IUserService.java b/src/main/java/org/springblade/modules/system/service/IUserService.java
index f883db2..37ab11c 100644
--- a/src/main/java/org/springblade/modules/system/service/IUserService.java
+++ b/src/main/java/org/springblade/modules/system/service/IUserService.java
@@ -30,6 +30,7 @@
import org.springblade.modules.system.vo.UserVO;
import java.util.List;
+import java.util.Map;
/**
* 服务类
@@ -247,4 +248,10 @@
* @return
*/
List<SecurityExcel> exportSecurity(UserVO user);
+ /**
+ * 查询押运人员编码不为null的保安信息
+ * @return
+ */
+ List selectPeo(UserVO user);
+
}
diff --git a/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java b/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
index 155e3dd..163a957 100644
--- a/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
+++ b/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
@@ -53,10 +53,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
import static org.springblade.common.constant.CommonConstant.DEFAULT_PARAM_PASSWORD;
@@ -485,4 +482,11 @@
public List<SecurityExcel> exportSecurity(UserVO user) {
return baseMapper.exportSecurity(user);
}
+
+ @Override
+ public List selectPeo(UserVO user) {
+ return baseMapper.selectPeo(user);
+ }
+
+
}
--
Gitblit v1.9.3