Skip to content

M
map-parent
Commit 98eb2e35 by Jiang
Options

数据服务代码及日志

parent 3da196b3
Showing with 3534 additions and 266 deletions
common/common_utils/src/main/java/com/founder/commonutils/publicEntity/MapRestResult.java
......@@ -4,7 +4,9 @@ import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import io.swagger.annotations.ApiModelProperty;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* Xzxt-Rest自定义响应结构
......
common/common_utils/src/main/java/com/founder/commonutils/util/AesEncryptUtil.java
......@@ -16,9 +16,9 @@ import javax.crypto.spec.SecretKeySpec;
public class AesEncryptUtil {
//使用AES-128-CBC加密模式，key需要为16位,key和iv可以相同！
private static String KEY = "maplogin20200416";
private static String KEY = "maplogin20220321";
private static String IV = "map_vues20200416";
private static String IV = "map_vues20220321";
/**
......@@ -85,6 +85,8 @@ public class AesEncryptUtil {
}
}
/**
* 使用默认的key和iv加密
* @param data
......@@ -112,7 +114,7 @@ public class AesEncryptUtil {
*/
public static void main(String args[]) throws Exception {
String test1 = "1111111111000000";
String test1 = "admin";
String test =new String(test1.getBytes(),"UTF-8");
String data = null;
String key = KEY;
......
common/common_utils/src/main/java/com/founder/commonutils/util/JwtUser.java
......@@ -119,6 +119,23 @@ public class JwtUser {
return user;
}
public static String getHeadToken(HttpServletRequest request, String key) {
/**
*
* 功能描述: 得到头部保存的信息，通过key得到value
*
* @param: [attributes, key] attribute 固定(ServletRequestAttributes) RequestContextHolder.getRequestAttributes() key：为头部保存信息的键子key
* @return: java.lang.String
*/
Map<String, String> map = new HashMap<String, String>();
Enumeration headerNames = request.getHeaderNames();
while (headerNames.hasMoreElements()) {
String key1 = (String) headerNames.nextElement();
String value = request.getHeader(key1);
map.put(key1, value);
}
return map.get(key);
}
public static String getHeadToken(ServletRequestAttributes attributes, String key) {
/**
*
......
common/pom.xml
......@@ -19,7 +19,6 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<scope>provided </scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
......@@ -41,7 +40,6 @@
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-boot-starter</artifactId>
<scope>provided </scope>
</dependency>
<!--lombok用来简化实体类：需要安装lombok插件-->
......@@ -55,12 +53,10 @@
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger2</artifactId>
<scope>provided </scope>
</dependency>
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger-ui</artifactId>
<scope>provided </scope>
</dependency>
<!-- redis -->
......@@ -69,10 +65,10 @@
<artifactId>spring-boot-starter-data-redis</artifactId>
</dependency>
<!-- 引入spring-data-elasticsearch-->
<!-- <dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-elasticsearch</artifactId>
</dependency>-->
<!-- <dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-elasticsearch</artifactId>
</dependency>-->
<dependency>
<groupId>org.elasticsearch</groupId>
<artifactId>elasticsearch</artifactId>
......@@ -83,7 +79,10 @@
<artifactId>transport</artifactId>
<version>6.4.3</version>
</dependency>
<!-- https://mvnrepository.com/artifact/com.google.code.gson/gson -->
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
......@@ -126,6 +125,20 @@
<artifactId>poi-ooxml</artifactId>
<version>3.14</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-netflix-ribbon</artifactId>
</dependency>
<!--hystrix依赖，主要是用 @HystrixCommand -->
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-netflix-hystrix</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
</dependencies>
<build>
<plugins>
......
service/asj/src/main/java/com/founder/asj/mapper/mysqlMapper/TbStAsjMapper.java
......@@ -6,8 +6,6 @@ import com.founder.commonutils.asjEntity.CbxszAndXlaj;
import com.founder.commonutils.asjEntity.CzzdryEntity;
import com.founder.commonutils.asjEntity.TbStAsj;
import com.founder.commonutils.publicEntity.Receiving;
import com.founder.servicebase.logs.OperLog;
import com.founder.servicebase.logs.OperationType;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Component;
......
service/asj/src/main/java/com/founder/asj/service/impl/TbStAsjServiceImpl.java
......@@ -11,8 +11,6 @@ import com.founder.commonutils.asjEntity.TbStAsj;
import com.founder.commonutils.publicEntity.MapRestResult;
import com.founder.commonutils.publicEntity.Receiving;
import com.founder.commonutils.util.StringUtil;
import com.founder.servicebase.logs.OperLog;
import com.founder.servicebase.logs.OperationType;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
......
service/es/src/main/java/com/founder/eszy/controller/EsQueryController.java
......@@ -6,8 +6,8 @@ import com.founder.commonutils.publicEntity.RequestBean;
import com.founder.eszy.esSearch.EsTbZyCameraTranslationQuery;
import com.founder.eszy.esSearch.EsTbZyJzxxTranslationQuery;
import com.founder.eszy.esSearch.EsTbZyKkxxTranslationQuery;
import com.founder.servicebase.logs.OperLog;
import com.founder.servicebase.logs.OperationType;
import com.founder.publicapi.logs.OperLog;
import com.founder.publicapi.logs.OperationType;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.StringUtils;
......
service/publicapi/src/main/java/com/founder/publicapi/config/TokenConfig.java 0 → 100644
package com.founder.publicapi.config;
import com.founder.publicapi.interceptor.TokenInterceptor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.servlet.config.annotation.CorsRegistry;
import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
/**
* @author jlt
* @date 2022/03/21/
*/
@Configuration
public class TokenConfig implements WebMvcConfigurer {
@Autowired
private TokenInterceptor tokenInterceptor;
/**
* 拦截器配置
*/
@Override
public void addInterceptors(InterceptorRegistry registry) {
registry.addInterceptor(tokenInterceptor)
.addPathPatterns("/**")//指定该类拦截的url
.excludePathPatterns("/excel/*","/serviceList/*","/dictionary/*","/pointlocation/*"
,"/skRegionalsPerson/*","/skRegionalsResult/*","/skRegionalsTask/*","/skRegionalsDetail/*"
,"/trail/*","/user/*","/skRelatedResultAll/*","/skRelatedResult/*")
.excludePathPatterns( "/resources/**");//过滤静态资源
}
/**
* 跨域支持
*/
@Override
public void addCorsMappings(CorsRegistry registry) {
registry.addMapping("/**")
.allowedOrigins("*")
.allowCredentials(true)
.allowedMethods("GET", "POST", "DELETE", "PUT","OPTIONS","HEAD")
.allowedHeaders("*")
.maxAge(3600);
}
}
service/publicapi/src/main/java/com/founder/publicapi/controller/ExcelController.java
package com.founder.publicapi.controller;
import com.founder.commonutils.publicEntity.MapRestResult;
import com.founder.publicapi.logs.OperLog;
import com.founder.publicapi.logs.OperationType;
import com.founder.publicapi.util.DateUtil;
import com.founder.publicapi.util.ExcelUtil;
import com.founder.publicapi.util.FileUtil;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang.StringUtils;
import org.springframework.core.io.ClassPathResource;
import org.springframework.core.io.Resource;
......@@ -36,6 +40,8 @@ public class ExcelController {
* 导入数据
*/
@PostMapping("insert")
@ApiOperation(value = "导入excel数据")
@OperLog(message = "导入excel数据",operation = OperationType.ADD)
public MapRestResult insert(@RequestParam("imageFile") MultipartFile imageFile) throws IOException, IllegalAccessException, InstantiationException, ClassNotFoundException, NoSuchMethodException, InvocationTargetException, ParseException {
String className = ExcelUtil.getClassName(imageFile.getOriginalFilename());
//获取数据
......@@ -71,42 +77,18 @@ public class ExcelController {
}
/**
* 下载excel模板
* @return
* @author jlt
* @date 2022/3/2
*/
// @GetMapping("download")
// @ResponseBody
// public void download(Integer type, HttpServletResponse response) {
// String fileName = "";
// switch (type) {
// case 1:
// fileName = "sk_trail.xlsx";
// break;//轨迹
// case 2:
// fileName = "sk_pointlocation.xlsx";
// break;//点位
// }
//
// if (StringUtils.isNotEmpty(fileName)) {//文件名不能为空
// try {
// FileUtil.downFile(response, fileName);
// System.out.println("下载文件：" + fileName + "----------------");
// } catch (Exception e) {
// e.printStackTrace();
// }
// } else {
// System.out.println("对应文件不存在");
// }
//
//
// }
@GetMapping("/download")
@ResponseBody
@ApiOperation(value = "下载excel模板")
@OperLog(message = "下载excel模板",operation = OperationType.QUERY)
public void scheduleDownload(Integer type,HttpServletRequest request,HttpServletResponse response) throws Exception{
String fileName = "";
//1代表轨迹模板，2代表点位模板
......@@ -117,6 +99,19 @@ public class ExcelController {
case 2:
fileName = "sk_pointlocation.xlsx";
break;//点位
case 3:
fileName = "sk_regionals_detail.xlsx";
break;//结果翻译表
case 4:
fileName = "sk_regionals_person.xlsx";
break;//人员信息表
case 5:
fileName = "sk_regionals_result.xlsx";
break;//结果表
case 6:
fileName = "sk_regionals_task.xlsx";
break;//任务表
}
String name=fileName;
String userAgent = request.getHeader("User-Agent");
......
service/publicapi/src/main/java/com/founder/publicapi/controller/RegionalsTaskController.java
......@@ -4,9 +4,9 @@ import com.alibaba.fastjson.JSONObject;
import com.founder.commonutils.carEntity.*;
import com.founder.commonutils.publicEntity.MapRestResult;
import com.founder.commonutils.util.KeyUtil;
import com.founder.publicapi.logs.OperLog;
import com.founder.publicapi.logs.OperationType;
import com.founder.publicapi.service.RegTaskService;
import com.founder.servicebase.logs.OperLog;
import com.founder.servicebase.logs.OperationType;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
......@@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.text.SimpleDateFormat;
import java.util.List;
import java.util.stream.IntStream;
......@@ -98,5 +99,6 @@ public class RegionalsTaskController {
}
return MapRestResult.build(200,"更新任务区域接口和更新任务接口成功", "1",regionalsTask.getTaskId());
}
}
service/publicapi/src/main/java/com/founder/publicapi/controller/RyController.java
......@@ -10,9 +10,10 @@ import com.founder.commonutils.publicEntity.RyReceiving;
import com.founder.commonutils.util.HttpUtil;
import com.founder.commonutils.util.JsonUtils;
import com.founder.commonutils.util.KtInterfaceUtils;
import com.founder.publicapi.logs.OperationType;
import com.founder.publicapi.service.SysDictitemService;
import com.founder.servicebase.logs.OperLog;
import com.founder.servicebase.logs.OperationType;
import com.founder.publicapi.logs.OperLog;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
......
service/publicapi/src/main/java/com/founder/publicapi/controller/ServiceListController.java 0 → 100644
package com.founder.publicapi.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.api.ApiController;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.founder.commonutils.publicEntity.MapRestResult;
import com.founder.publicapi.entity.ServiceList;
import com.founder.publicapi.logs.OperLog;
import com.founder.publicapi.logs.OperationType;
import com.founder.publicapi.service.ServiceListService;
import com.founder.publicapi.vo.param.ServiceListParam;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
/**
* 服务列表(ServiceList)表控制层
*
* @author jlt
* @since 2022-03-11 15:35:30
*/
@RestController
@RequestMapping("serviceList")
public class ServiceListController extends ApiController {
/**
* 服务对象
*/
@Resource
private ServiceListService serviceListService;
@PostMapping("save")
@ApiOperation(value = "新增服务列表信息")
@OperLog(message = "新增服务列表信息", operation = OperationType.ADD)
public MapRestResult save(ServiceList serviceList) {
boolean flag = serviceListService.save(serviceList);
if (flag) {
return new MapRestResult();
} else {
return new MapRestResult().error();
}
}
@PostMapping("update")
@ApiOperation(value = "修改服务列表信息")
@OperLog(message = "修改服务列表信息", operation = OperationType.UPDATE)
public MapRestResult update(ServiceList serviceList) {
boolean flag = serviceListService.updateById(serviceList);
if (flag) {
return new MapRestResult();
} else {
return new MapRestResult().error();
}
}
@PostMapping("remove")
@ApiOperation(value = "删除服务列表信息")
@OperLog(message = "删除服务列表信息", operation = OperationType.DELETE)
public MapRestResult remove(Integer xxzjbh) {
ServiceList byId = serviceListService.getById(xxzjbh);
byId.setIsdeleted("1");
boolean flag = serviceListService.updateById(byId);
if (flag) {
return new MapRestResult();
} else {
return new MapRestResult().error();
}
}
@PostMapping("detail")
@ApiOperation(value = "查询服务列表详情信息")
@OperLog(message = "查询服务列表详情信息", operation = OperationType.QUERY)
public MapRestResult detail(Integer xxzjbh) {
QueryWrapper queryWrapper=new QueryWrapper();
queryWrapper.eq("xxzjbh",xxzjbh);
queryWrapper.eq("isDeleted","0");
ServiceList one = serviceListService.getOne(queryWrapper);
return new MapRestResult(one);
}
@PostMapping("query")
@ApiOperation(value = "查询服务列表列表信息")
@OperLog(message = "查询服务列表列表信息", operation = OperationType.QUERY)
public MapRestResult query(@RequestBody ServiceListParam serviceListParam) {
Page page=new Page(serviceListParam.getPage(),serviceListParam.getPageSize());
QueryWrapper queryWrapper=new QueryWrapper();
if (serviceListParam.getName()!=null && !"".equals(serviceListParam.getName())){
queryWrapper.like("name",serviceListParam.getName());
}
if (serviceListParam.getStatus()!=null){
queryWrapper.eq("status",serviceListParam.getStatus());
}
queryWrapper.eq("isDeleted","0");
IPage page1 = serviceListService.page(page, queryWrapper);
return new MapRestResult(200, "OK", page1.getTotal(), page1.getRecords());
}
}
service/publicapi/src/main/java/com/founder/publicapi/controller/SkDictionaryController.java
......@@ -11,6 +11,8 @@ import com.founder.publicapi.entity.SkPointlocation;
import com.founder.publicapi.logs.OperLog;
import com.founder.publicapi.logs.OperationType;
import com.founder.publicapi.service.SkDictionaryService;
import com.founder.publicapi.service.SkPointlocationService;
import com.founder.publicapi.util.SpringUtil;
import com.founder.publicapi.vo.param.SkDictionaryParam;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -19,6 +21,7 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
......@@ -30,7 +33,7 @@ import java.util.Map;
*/
@RestController
@RequestMapping("dictionary")
public class SkDictionaryController {
public class SkDictionaryController implements ExcelControllerInterface{
@Autowired
private SkDictionaryService service;
......@@ -41,7 +44,7 @@ public class SkDictionaryController {
@ApiOperation(value = "新增字典信息")
@OperLog(message = "新增字典信息",operation = OperationType.ADD)
public MapRestResult save(SkDictionary skDictionary) {
skDictionary.setXxzjbh(KeyUtil.getUUIDKey(""));
skDictionary.setXxzjbh(KeyUtil.getUUIDKey("ZD"));
boolean flag = service.save(skDictionary);
if (flag){
return new MapRestResult();
......@@ -73,7 +76,7 @@ public class SkDictionaryController {
@OperLog(message = "删除字典信息",operation = OperationType.DELETE)
public MapRestResult deleteById(String xxzjbh) {
SkDictionary byId = service.getById(xxzjbh);
byId.setIsdeleted(1);
byId.setIsdeleted("1");
boolean flag = service.updateById(byId);
if (flag){
return new MapRestResult();
......@@ -112,7 +115,7 @@ public class SkDictionaryController {
if (skDictionaryParam.getDmmc()!=null&& !"".equals(skDictionaryParam.getDmmc())){
queryWrapper.like("dmmc",skDictionaryParam.getDmmc());
}
queryWrapper.eq("isDeleted",0);
queryWrapper.eq("isDeleted","0");
IPage page1=service.page(page,queryWrapper);
return new MapRestResult(200, "OK", page1.getTotal(), page1.getRecords());
}
......@@ -123,10 +126,10 @@ public class SkDictionaryController {
@PostMapping("queryByDmlx")
@ApiOperation(value = "根据代码类型查找相应字典")
@OperLog(message = "根据代码类型查找相应字典",operation = OperationType.QUERY)
public Map<String,String> queryByDmlx(String dmlx){
public MapRestResult queryByDmlx(String dmlx){
QueryWrapper queryWrapper=new QueryWrapper();
queryWrapper.eq("dmlx",dmlx);
queryWrapper.eq("isDeleted",0);
queryWrapper.eq("isDeleted","0");
queryWrapper.select("dm","dmmc");
List<SkDictionary> list = service.list(queryWrapper);
......@@ -134,6 +137,53 @@ public class SkDictionaryController {
for (SkDictionary skDictionary:list) {
map.put(skDictionary.getDm(),skDictionary.getDmmc());
}
return map;
return new MapRestResult(map);
}
/**
* 查找所有代码类型
*/
@PostMapping("queryAllDmlx")
@ApiOperation(value = "查找所有代码类型")
@OperLog(message = "查找所有代码类型",operation = OperationType.QUERY)
public MapRestResult queryAllDmlx(){
QueryWrapper queryWrapper=new QueryWrapper();
queryWrapper.groupBy("dmlx");
queryWrapper.eq("isDeleted","0");
queryWrapper.select("dmlx","dmms");
List<SkDictionary> list = service.list(queryWrapper);
Map<String,String> map=new HashMap();
for (SkDictionary skDictionary:list) {
map.put(skDictionary.getDmlx(),skDictionary.getDmms());
}
return new MapRestResult(map);
}
@Override
public void setService(String bean) {
if (service == null) {
Object service = SpringUtil.getBean(bean);
this.service = (SkDictionaryService) service;
}
}
@Override
public String saveBatch(List<Object> objs) {
List<SkDictionary> list = new ArrayList<>();
try {
for (Object obj : objs) {
list.add((SkDictionary) obj);
}
boolean flag = service.saveBatch(list);
if (flag) {
return "插入成功";
} else {
return "插入失败";
}
} catch (Exception e) {
e.printStackTrace();
return "转化格式错误";
}
}
}
service/publicapi/src/main/java/com/founder/publicapi/controller/SkPointlocationController.java
......@@ -6,17 +6,20 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.api.ApiController;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.founder.commonutils.publicEntity.MapRestResult;
import com.founder.commonutils.util.KeyUtil;
import com.founder.publicapi.entity.SkPointlocation;
import com.founder.publicapi.logs.OperLog;
import com.founder.publicapi.logs.OperationType;
import com.founder.publicapi.service.SkDictionaryService;
import com.founder.publicapi.service.SkPointlocationService;
import com.founder.publicapi.util.DateUtil;
import com.founder.publicapi.util.SpringUtil;
import com.founder.publicapi.vo.param.SkPointlocationParam;
import com.founder.publicapi.vo.param.SkTrailParam;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
/**
......@@ -31,14 +34,33 @@ public class SkPointlocationController extends ApiController implements ExcelCon
/**
* 服务对象
*/
@Resource
@Autowired()
private SkPointlocationService skPointlocationService;
@Autowired
private SkDictionaryService skDictionaryService;
/**
* 新增点位
*/
@PostMapping("save")
@ApiOperation(value = "新增点位信息")
@OperLog(message = "新增点位信息", operation = OperationType.ADD)
public MapRestResult save(SkPointlocation skPointlocation) {
skPointlocation.setXxzjbh(KeyUtil.getUUIDKey("SB"));
if (skPointlocation.getObjectname() != null && !"".equals(skPointlocation.getObjectname())) {
} else {
skPointlocation.setObjectname(skDictionaryService.findDmmcByDmAndClass(skPointlocation.getObjecttype(), "SkPointlocation"));
}
try{
skPointlocation.setTime(DateUtil.getTimeStamp(skPointlocation.getDate()));
}catch (Exception e){
e.printStackTrace();
}
boolean save = skPointlocationService.save(skPointlocation);
if (save) {
return new MapRestResult();
......@@ -51,7 +73,21 @@ public class SkPointlocationController extends ApiController implements ExcelCon
* 修改点位
*/
@PostMapping("update")
@ApiOperation(value = "修改点位信息")
@OperLog(message = "修改点位信息", operation = OperationType.UPDATE)
public MapRestResult update(SkPointlocation skPointlocation) {
if (skPointlocation.getObjectname() != null && !"".equals(skPointlocation.getObjectname())) {
} else {
skPointlocation.setObjectname(skDictionaryService.findDmmcByDmAndClass(skPointlocation.getObjecttype(), "SkPointlocation"));
}
try{
skPointlocation.setTime(DateUtil.getTimeStamp(skPointlocation.getDate()));
}catch (Exception e){
e.printStackTrace();
}
boolean update = skPointlocationService.updateById(skPointlocation);
if (update) {
return new MapRestResult();
......@@ -64,10 +100,12 @@ public class SkPointlocationController extends ApiController implements ExcelCon
* 删除点位
*/
@PostMapping("remove")
public MapRestResult deleteById(Integer xxzjbh) {
@ApiOperation(value = "删除点位信息")
@OperLog(message = "删除点位信息", operation = OperationType.DELETE)
public MapRestResult deleteById(String xxzjbh) {
SkPointlocation skPointlocation = new SkPointlocation();
skPointlocation.setXxzjbh(xxzjbh);
skPointlocation.setIsDeleted(1);
skPointlocation.setIsdeleted("1");
boolean update = skPointlocationService.updateById(skPointlocation);
if (update) {
......@@ -81,7 +119,9 @@ public class SkPointlocationController extends ApiController implements ExcelCon
* 查询详情
*/
@PostMapping("detail")
public MapRestResult detail(Integer xxzjbh) {
@ApiOperation(value = "查询点位详情信息")
@OperLog(message = "查询点位详情信息", operation = OperationType.QUERY)
public MapRestResult detail(String xxzjbh) {
SkPointlocation byId = skPointlocationService.getById(xxzjbh);
if (byId == null) {
return new MapRestResult().error("不存在该数据");
......@@ -94,40 +134,42 @@ public class SkPointlocationController extends ApiController implements ExcelCon
* 查询列表（分页）
*/
@PostMapping("query")
@ApiOperation(value = "查询点位列表信息")
@OperLog(message = "查询点位列表信息", operation = OperationType.QUERY)
public MapRestResult query(@RequestBody SkPointlocationParam skPointlocationParam) {
//分页
Page page = new Page(skPointlocationParam.getPage(), skPointlocationParam.getPageSize());
QueryWrapper queryWrapper = new QueryWrapper();
queryWrapper.eq("is_deleted", 0);
queryWrapper.eq("isDeleted", "0");
if (skPointlocationParam.getLikeField() != null && !skPointlocationParam.getLikeField().equals("")) {
queryWrapper.eq("objectType", skPointlocationParam.getLikeField());
}
if (skPointlocationParam.getLikeValue() != null && !skPointlocationParam.getLikeValue().equals("")) {
queryWrapper.like("name", skPointlocationParam.getLikeValue());
queryWrapper.like("deviceName", skPointlocationParam.getLikeValue());
}
//纬度
if (skPointlocationParam.getStartLat() != null && !skPointlocationParam.getStartLat().equals("")) {
queryWrapper.ge("CAST(y AS decimal(9,8))", Double.parseDouble(skPointlocationParam.getStartLat()));
queryWrapper.ge("CAST(y AS decimal(16,8))", Double.parseDouble(skPointlocationParam.getStartLat()));
}
if (skPointlocationParam.getEndLat() != null && !skPointlocationParam.getEndLat().equals("")) {
queryWrapper.le("CAST(y AS decimal(9,8))", Double.parseDouble(skPointlocationParam.getEndLat()));
queryWrapper.le("CAST(y AS decimal(16,8))", Double.parseDouble(skPointlocationParam.getEndLat()));
}
//经度
if (skPointlocationParam.getStartLng() != null && !skPointlocationParam.getStartLng().equals("")) {
queryWrapper.ge("CAST(x AS decimal(9,8))", Double.parseDouble(skPointlocationParam.getStartLng()));
queryWrapper.ge("CAST(x AS decimal(16,8))", Double.parseDouble(skPointlocationParam.getStartLng()));
}
if (skPointlocationParam.getEndLng() != null && !skPointlocationParam.getEndLng().equals("")) {
queryWrapper.le("CAST(x AS decimal(9,8))", Double.parseDouble(skPointlocationParam.getEndLng()));
queryWrapper.le("CAST(x AS decimal(16,8))", Double.parseDouble(skPointlocationParam.getEndLng()));
}
//时间
if (skPointlocationParam.getKssj() != null ) {
queryWrapper.ge("str_to_date(date,'%Y-%m-%d %H:%i:%s')",skPointlocationParam.getKssj() );
if (skPointlocationParam.getKssj() != null) {
queryWrapper.ge("str_to_date(date,'%Y-%m-%d %H:%i:%s')", skPointlocationParam.getKssj());
}
if (skPointlocationParam.getJssj() != null ) {
queryWrapper.le("str_to_date(date,'%Y-%m-%d %H:%i:%s')",skPointlocationParam.getJssj() );
if (skPointlocationParam.getJssj() != null) {
queryWrapper.le("str_to_date(date,'%Y-%m-%d %H:%i:%s')", skPointlocationParam.getJssj());
}
......@@ -136,19 +178,6 @@ public class SkPointlocationController extends ApiController implements ExcelCon
}
/**
* 按照标识号查询对应点
*/
public List<SkPointlocation> findByBh(String bh){
QueryWrapper queryWrapper=new QueryWrapper();
queryWrapper.eq("is_deleted",0);//未删除
queryWrapper.eq("bh",bh);//编号
queryWrapper.orderByAsc("str_to_date(date,'%Y-%m-%d %H:%i:%s')");
return skPointlocationService.list(queryWrapper);
}
@Override
public void setService(String bean) {
......@@ -159,6 +188,8 @@ public class SkPointlocationController extends ApiController implements ExcelCon
}
@Override
@ApiOperation(value = "导入点位信息")
@OperLog(message = "导入点位信息", operation = OperationType.ADD)
public String saveBatch(List<Object> objs) {
List<SkPointlocation> list = new ArrayList<>();
try {
......
service/publicapi/src/main/java/com/founder/publicapi/controller/SkRegionalsDetailController.java 0 → 100644
package com.founder.publicapi.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.api.ApiController;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.founder.commonutils.publicEntity.MapRestResult;
import com.founder.commonutils.util.KeyUtil;
import com.founder.publicapi.entity.SkPointlocation;
import com.founder.publicapi.entity.SkRegionalsDetail;
import com.founder.publicapi.entity.SkTrail;
import com.founder.publicapi.logs.OperLog;
import com.founder.publicapi.logs.OperationType;
import com.founder.publicapi.service.SkRegionalsDetailService;
import com.founder.publicapi.service.SkTrailService;
import com.founder.publicapi.util.DateUtil;
import com.founder.publicapi.util.SpringUtil;
import com.founder.publicapi.vo.param.SkPointlocationParam;
import com.founder.publicapi.vo.param.SkRegionalsDetailParam;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
/**
* 结果翻译表(SkRegionalsDetail)表控制层
*
* @author jlt
* @since 2022-03-08 17:41:11
*/
@RestController
@RequestMapping("skRegionalsDetail")
public class SkRegionalsDetailController extends ApiController implements ExcelControllerInterface{
/**
* 服务对象
*/
@Resource
private SkRegionalsDetailService skRegionalsDetailService;
/**
* 新增结果翻译
*/
@PostMapping("save")
@ApiOperation(value = "新增结果翻译信息")
@OperLog(message = "新增结果翻译信息", operation = OperationType.ADD)
public MapRestResult save(SkRegionalsDetail skRegionalsDetail) {
skRegionalsDetail.setXxzjbh(KeyUtil.getUUIDKey("FY"));
boolean save = skRegionalsDetailService.save(skRegionalsDetail);
if (save) {
return new MapRestResult();
} else {
return new MapRestResult().error("保存失败");
}
}
/**
* 修改结果翻译
*/
@PostMapping("update")
@ApiOperation(value = "修改结果翻译信息")
@OperLog(message = "修改结果翻译信息", operation = OperationType.UPDATE)
public MapRestResult update(SkRegionalsDetail skRegionalsDetail) {
boolean update = skRegionalsDetailService.updateById(skRegionalsDetail);
if (update) {
return new MapRestResult();
} else {
return new MapRestResult().error("更新失败");
}
}
/**
* 删除结果翻译
*/
@PostMapping("remove")
@ApiOperation(value = "删除结果翻译信息")
@OperLog(message = "删除结果翻译信息", operation = OperationType.DELETE)
public MapRestResult deleteById(String xxzjbh) {
SkRegionalsDetail skRegionalsDetail = new SkRegionalsDetail();
skRegionalsDetail.setXxzjbh(xxzjbh);
skRegionalsDetail.setIsdeleted("1");
boolean update = skRegionalsDetailService.updateById(skRegionalsDetail);
if (update) {
return new MapRestResult();
} else {
return new MapRestResult().error("更新失败");
}
}
/**
* 查询详情
*/
@PostMapping("detail")
@ApiOperation(value = "查询结果翻译详情信息")
@OperLog(message = "查询结果翻译详情信息", operation = OperationType.QUERY)
public MapRestResult detail(String xxzjbh) {
SkRegionalsDetail byId = skRegionalsDetailService.getById(xxzjbh);
if (byId == null) {
return new MapRestResult().error("不存在该数据");
} else {
return new MapRestResult(byId);
}
}
/**
* 查询列表（分页）
*/
@PostMapping("query")
@ApiOperation(value = "查询结果翻译列表信息")
@OperLog(message = "查询结果翻译列表信息", operation = OperationType.QUERY)
public MapRestResult query(@RequestBody SkRegionalsDetailParam skRegionalsDetailParam) {
//分页
Page page = new Page(skRegionalsDetailParam.getPage(), skRegionalsDetailParam.getPageSize());
QueryWrapper queryWrapper = new QueryWrapper();
queryWrapper.eq("isDeleted", "0");
queryWrapper.orderByDesc("fysj");
IPage page1 = skRegionalsDetailService.page(page, queryWrapper);
return new MapRestResult(200, "OK", page1.getTotal(), page1.getRecords());
}
@Override
public void setService(String bean) {
if (skRegionalsDetailService == null) {
Object service = SpringUtil.getBean(bean);
this.skRegionalsDetailService = (SkRegionalsDetailService) service;
}
}
@Override
public String saveBatch(List<Object> objs) {
List<SkRegionalsDetail> list = new ArrayList<>();
try {
for (Object obj : objs) {
list.add((SkRegionalsDetail) obj);
}
boolean flag = skRegionalsDetailService.saveBatch(list);
if (flag) {
return "插入成功";
} else {
return "插入失败";
}
} catch (Exception e) {
e.printStackTrace();
return "转化格式错误";
}
}
}
service/publicapi/src/main/java/com/founder/publicapi/controller/SkRegionalsPersonController.java 0 → 100644
package com.founder.publicapi.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.api.ApiController;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.founder.commonutils.publicEntity.MapRestResult;
import com.founder.commonutils.util.KeyUtil;
import com.founder.publicapi.entity.SkRegionalsDetail;
import com.founder.publicapi.entity.SkRegionalsPerson;
import com.founder.publicapi.logs.OperLog;
import com.founder.publicapi.logs.OperationType;
import com.founder.publicapi.service.SkRegionalsDetailService;
import com.founder.publicapi.service.SkRegionalsPersonService;
import com.founder.publicapi.util.SpringUtil;
import com.founder.publicapi.vo.param.SkRegionalsDetailParam;
import com.founder.publicapi.vo.param.SkRegionalsPersonParam;
import com.founder.publicapi.vo.param.SkRegionalsPersonSaveParam;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
/**
* 人员信息表(SkRegionalsPerson)表控制层
*
* @author jlt
* @since 2022-03-09 09:30:35
*/
@RestController
@RequestMapping("skRegionalsPerson")
public class SkRegionalsPersonController extends ApiController implements ExcelControllerInterface{
/**
* 服务对象
*/
@Resource
private SkRegionalsPersonService skRegionalsPersonService;
/**
* 新增人员信息
*/
@PostMapping("save")
@ApiOperation(value = "新增人员信息")
@OperLog(message = "新增人员信息", operation = OperationType.ADD)
public MapRestResult save(SkRegionalsPersonSaveParam param,@RequestParam(required = false) MultipartFile img) throws IOException {
SkRegionalsPerson skRegionalsPerson=new SkRegionalsPerson(param,img);
skRegionalsPerson.setXxzjbh(KeyUtil.getUUIDKey("RY"));
boolean save = skRegionalsPersonService.save(skRegionalsPerson);
if (save) {
return new MapRestResult();
} else {
return new MapRestResult().error("保存失败");
}
}
/**
* 修改人员信息
*/
@PostMapping("update")
@ApiOperation(value = "修改人员信息")
@OperLog(message = "修改人员信息", operation = OperationType.UPDATE)
public MapRestResult update(SkRegionalsPersonSaveParam param,@RequestParam(required = false) MultipartFile img) throws IOException {
SkRegionalsPerson skRegionalsPerson=new SkRegionalsPerson(param,img);
boolean update = skRegionalsPersonService.updateById(skRegionalsPerson);
if (update) {
return new MapRestResult();
} else {
return new MapRestResult().error("更新失败");
}
}
/**
* 删除人员信息
*/
@PostMapping("remove")
@ApiOperation(value = "删除人员信息")
@OperLog(message = "删除人员信息", operation = OperationType.DELETE)
public MapRestResult deleteById(String xxzjbh) {
SkRegionalsPerson skRegionalsPerson = new SkRegionalsPerson();
skRegionalsPerson.setXxzjbh(xxzjbh);
skRegionalsPerson.setIsdeleted("1");
boolean update = skRegionalsPersonService.updateById(skRegionalsPerson);
if (update) {
return new MapRestResult();
} else {
return new MapRestResult().error("更新失败");
}
}
/**
* 查询人员详情信息
*/
@PostMapping("detail")
@ApiOperation(value = "查询人员详情信息")
@OperLog(message = "查询人员详情信息", operation = OperationType.QUERY)
public MapRestResult detail(String xxzjbh) {
SkRegionalsPerson byId = skRegionalsPersonService.getById(xxzjbh);
if (byId == null) {
return new MapRestResult().error("不存在该数据");
} else {
return new MapRestResult(byId);
}
}
/**
* 查询人员列表信息（分页）
*/
@PostMapping("query")
@ApiOperation(value = "查询人员列表信息")
@OperLog(message = "查询人员列表信息", operation = OperationType.QUERY)
public MapRestResult query(@RequestBody SkRegionalsPersonParam skRegionalsDetailParam) {
//分页
Page page = new Page(skRegionalsDetailParam.getPage(), skRegionalsDetailParam.getPageSize());
QueryWrapper queryWrapper = new QueryWrapper();
queryWrapper.eq("isDeleted", "0");
// queryWrapper.orderByDesc("djsj");
IPage page1 = skRegionalsPersonService.page(page, queryWrapper);
return new MapRestResult(200, "OK", page1.getTotal(), page1.getRecords());
}
@Override
public void setService(String bean) {
if (skRegionalsPersonService == null) {
Object service = SpringUtil.getBean(bean);
this.skRegionalsPersonService = (SkRegionalsPersonService) service;
}
}
@Override
public String saveBatch(List<Object> objs) {
List<SkRegionalsPerson> list = new ArrayList<>();
try {
for (Object obj : objs) {
list.add((SkRegionalsPerson) obj);
}
boolean flag = skRegionalsPersonService.saveBatch(list);
if (flag) {
return "插入成功";
} else {
return "插入失败";
}
} catch (Exception e) {
e.printStackTrace();
return "转化格式错误";
}
}
}
service/publicapi/src/main/java/com/founder/publicapi/controller/SkRegionalsResultController.java 0 → 100644
package com.founder.publicapi.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.api.ApiController;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.founder.commonutils.publicEntity.MapRestResult;
import com.founder.commonutils.util.KeyUtil;
import com.founder.publicapi.entity.SkRegionalsPerson;
import com.founder.publicapi.entity.SkRegionalsResult;
import com.founder.publicapi.logs.OperLog;
import com.founder.publicapi.logs.OperationType;
import com.founder.publicapi.service.SkDictionaryService;
import com.founder.publicapi.service.SkRegionalsResultService;
import com.founder.publicapi.util.SpringUtil;
import com.founder.publicapi.vo.param.SkRegionalsPersonParam;
import com.founder.publicapi.vo.param.SkRegionalsPersonSaveParam;
import com.founder.publicapi.vo.param.SkRegionalsResultParam;
import com.founder.publicapi.vo.param.SkRegionalsResultSaveParam;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
/**
* 结果表(SkRegionalsResult)表控制层
*
* @author jlt
* @since 2022-03-09 10:11:06
*/
@RestController
@RequestMapping("skRegionalsResult")
public class SkRegionalsResultController extends ApiController implements ExcelControllerInterface {
/**
* 服务对象
*/
@Resource
private SkRegionalsResultService skRegionalsResultService;
@Autowired
private SkDictionaryService skDictionaryService;
/**
* 新增结果信息
*/
@PostMapping("save")
@ApiOperation(value = "新增结果信息")
@OperLog(message = "新增结果信息", operation = OperationType.ADD)
public MapRestResult save(SkRegionalsResultSaveParam param,@RequestParam(required = false) MultipartFile img) throws IOException {
SkRegionalsResult skRegionalsResult=new SkRegionalsResult(param,img);
skRegionalsResult.setXxzjbh(KeyUtil.getUUIDKey("JG"));
skRegionalsResult.setObjecttypename(skDictionaryService.findDmmcByDmAndClass(skRegionalsResult.getObjecttype(),"SkRegionalsResult"));
boolean save = skRegionalsResultService.save(skRegionalsResult);
if (save) {
return new MapRestResult();
} else {
return new MapRestResult().error("保存失败");
}
}
/**
* 修改结果信息
*/
@PostMapping("update")
@ApiOperation(value = "修改结果信息")
@OperLog(message = "修改结果信息", operation = OperationType.UPDATE)
public MapRestResult update(SkRegionalsResultSaveParam param ,@RequestParam(required = false) MultipartFile img)throws IOException {
SkRegionalsResult skRegionalsResult=new SkRegionalsResult(param,img);
skRegionalsResult.setObjecttypename(skDictionaryService.findDmmcByDmAndClass(skRegionalsResult.getObjecttype(),"SkRegionalsResult"));
boolean update = skRegionalsResultService.updateById(skRegionalsResult);
if (update) {
return new MapRestResult();
} else {
return new MapRestResult().error("更新失败");
}
}
/**
* 删除结果信息
*/
@PostMapping("remove")
@ApiOperation(value = "删除结果信息")
@OperLog(message = "删除结果信息", operation = OperationType.DELETE)
public MapRestResult deleteById(String xxzjbh) {
SkRegionalsResult skRegionalsPerson = new SkRegionalsResult();
skRegionalsPerson.setXxzjbh(xxzjbh);
skRegionalsPerson.setIsdeleted("1");
boolean update = skRegionalsResultService.updateById(skRegionalsPerson);
if (update) {
return new MapRestResult();
} else {
return new MapRestResult().error("更新失败");
}
}
/**
* 查询结果详情信息
*/
@PostMapping("detail")
@ApiOperation(value = "查询结果详情信息")
@OperLog(message = "查询结果详情信息", operation = OperationType.QUERY)
public MapRestResult detail(String xxzjbh) {
SkRegionalsResult byId = skRegionalsResultService.getById(xxzjbh);
if (byId == null) {
return new MapRestResult().error("不存在该数据");
} else {
return new MapRestResult(byId);
}
}
/**
* 查询结果列表信息（分页）
*/
@PostMapping("query")
@ApiOperation(value = "查询结果列表信息")
@OperLog(message = "查询结果列表信息", operation = OperationType.QUERY)
public MapRestResult query(@RequestBody SkRegionalsResultParam skRegionalsDetailParam) {
//分页
Page page = new Page(skRegionalsDetailParam.getPage(), skRegionalsDetailParam.getPageSize());
QueryWrapper queryWrapper = new QueryWrapper();
queryWrapper.eq("isDeleted", "0");
queryWrapper.orderByDesc("djsj");
IPage page1 = skRegionalsResultService.page(page, queryWrapper);
return new MapRestResult(200, "OK", page1.getTotal(), page1.getRecords());
}
@Override
public void setService(String bean) {
if (skRegionalsResultService == null) {
Object service = SpringUtil.getBean(bean);
this.skRegionalsResultService = (SkRegionalsResultService) service;
}
}
@Override
public String saveBatch(List<Object> objs) {
List<SkRegionalsResult> list = new ArrayList<>();
try {
for (Object obj : objs) {
list.add((SkRegionalsResult) obj);
}
boolean flag = skRegionalsResultService.saveBatch(list);
if (flag) {
return "插入成功";
} else {
return "插入失败";
}
} catch (Exception e) {
e.printStackTrace();
return "转化格式错误";
}
}
}
service/publicapi/src/main/java/com/founder/publicapi/controller/SkRegionalsTaskController.java 0 → 100644
package com.founder.publicapi.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.api.ApiController;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.founder.commonutils.publicEntity.MapRestResult;
import com.founder.commonutils.util.KeyUtil;
import com.founder.publicapi.entity.SkRegionalsPerson;
import com.founder.publicapi.entity.SkRegionalsResult;
import com.founder.publicapi.entity.SkRegionalsTask;
import com.founder.publicapi.logs.OperLog;
import com.founder.publicapi.logs.OperationType;
import com.founder.publicapi.service.SkDictionaryService;
import com.founder.publicapi.service.SkRegionalsResultService;
import com.founder.publicapi.service.SkRegionalsTaskService;
import com.founder.publicapi.util.SpringUtil;
import com.founder.publicapi.vo.param.SkRegionalsPersonParam;
import com.founder.publicapi.vo.param.SkRegionalsPersonSaveParam;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
/**
* 任务表(SkRegionalsTask)表控制层
*
* @author jlt
* @since 2022-03-09 10:43:11
*/
@RestController
@RequestMapping("skRegionalsTask")
public class SkRegionalsTaskController extends ApiController implements ExcelControllerInterface {
/**
* 服务对象
*/
@Resource
private SkRegionalsTaskService skRegionalsTaskService;
@Autowired
private SkDictionaryService skDictionaryService;
/**
* 新增任务信息
*/
@PostMapping("save")
@ApiOperation(value = "新增任务信息")
@OperLog(message = "新增任务信息", operation = OperationType.ADD)
public MapRestResult save(SkRegionalsTask skRegionalsTask) throws IOException {
skRegionalsTask.setTaskid(KeyUtil.getUUIDKey("RW"));
skRegionalsTask.setTypename(skDictionaryService.findDmmcByDmAndClass(skRegionalsTask.getTasktype(), "SkRegionalsTask"));
if (skRegionalsTask.getStatename() != null && !skRegionalsTask.getStatename().equals("")) {
switch (skRegionalsTask.getStatename()) {
case "开始":
skRegionalsTask.setState("1");
break;
case "执行":
skRegionalsTask.setState("2");
break;
case "完成":
skRegionalsTask.setState("3");
break;
case "失败":
skRegionalsTask.setState("4");
break;
}
}
if (skRegionalsTask.getSfread().equals("已读")){
skRegionalsTask.setSfread("1");
}else if(skRegionalsTask.getSfread().equals("未读")){
skRegionalsTask.setSfread("0");
}
boolean save = skRegionalsTaskService.save(skRegionalsTask);
if (save) {
return new MapRestResult();
} else {
return new MapRestResult().error("保存失败");
}
}
/**
* 修改任务信息
*/
@PostMapping("update")
@ApiOperation(value = "修改任务信息")
@OperLog(message = "修改任务信息", operation = OperationType.UPDATE)
public MapRestResult update(SkRegionalsTask skRegionalsTask) throws IOException {
skRegionalsTask.setTypename(skDictionaryService.findDmmcByDmAndClass(skRegionalsTask.getTasktype(), "SkRegionalsTask"));
if (skRegionalsTask.getStatename() != null && !skRegionalsTask.getStatename().equals("")) {
switch (skRegionalsTask.getStatename()) {
case "开始":
skRegionalsTask.setState("1");
break;
case "执行":
skRegionalsTask.setState("2");
break;
case "完成":
skRegionalsTask.setState("3");
break;
case "失败":
skRegionalsTask.setState("4");
break;
}
}
if (skRegionalsTask.getSfread().equals("已读")){
skRegionalsTask.setSfread("1");
}else if(skRegionalsTask.getSfread().equals("未读")){
skRegionalsTask.setSfread("0");
}
boolean update = skRegionalsTaskService.updateById(skRegionalsTask);
if (update) {
return new MapRestResult();
} else {
return new MapRestResult().error("更新失败");
}
}
/**
* 删除任务信息
*/
@PostMapping("remove")
@ApiOperation(value = "删除任务信息")
@OperLog(message = "删除任务信息", operation = OperationType.DELETE)
public MapRestResult deleteById(String taskid) {
SkRegionalsTask skRegionalsTask = new SkRegionalsTask();
skRegionalsTask.setTaskid(taskid);
skRegionalsTask.setIsdeleted("1");
boolean update = skRegionalsTaskService.updateById(skRegionalsTask);
if (update) {
return new MapRestResult();
} else {
return new MapRestResult().error("更新失败");
}
}
/**
* 查询任务详情信息
*/
@PostMapping("detail")
@ApiOperation(value = "查询任务详情信息")
@OperLog(message = "查询任务详情信息", operation = OperationType.QUERY)
public MapRestResult detail(String taskid) {
SkRegionalsTask byId = skRegionalsTaskService.getById(taskid);
if (byId == null) {
return new MapRestResult().error("不存在该数据");
} else {
return new MapRestResult(byId);
}
}
/**
* 查询任务列表信息（分页）
*/
@PostMapping("query")
@ApiOperation(value = "查询任务列表信息")
@OperLog(message = "查询任务列表信息", operation = OperationType.QUERY)
public MapRestResult query(@RequestBody SkRegionalsPersonParam skRegionalsDetailParam) {
//分页
Page page = new Page(skRegionalsDetailParam.getPage(), skRegionalsDetailParam.getPageSize());
QueryWrapper queryWrapper = new QueryWrapper();
queryWrapper.eq("isDeleted", "0");
queryWrapper.orderByDesc("fssj ");
IPage page1 = skRegionalsTaskService.page(page, queryWrapper);
return new MapRestResult(200, "OK", page1.getTotal(), page1.getRecords());
}
@Override
public void setService(String bean) {
if (skRegionalsTaskService == null) {
Object service = SpringUtil.getBean(bean);
this.skRegionalsTaskService = (SkRegionalsTaskService) service;
}
}
@Override
public String saveBatch(List<Object> objs) {
List<SkRegionalsTask> list = new ArrayList<>();
try {
for (Object obj : objs) {
list.add((SkRegionalsTask) obj);
}
boolean flag = skRegionalsTaskService.saveBatch(list);
if (flag) {
return "插入成功";
} else {
return "插入失败";
}
} catch (Exception e) {
e.printStackTrace();
return "转化格式错误";
}
}
}
service/publicapi/src/main/java/com/founder/publicapi/controller/SkRelatedResultAllController.java 0 → 100644
package com.founder.publicapi.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.api.ApiController;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.founder.commonutils.publicEntity.MapRestResult;
import com.founder.commonutils.util.KeyUtil;
import com.founder.publicapi.entity.SkRegionalsTask;
import com.founder.publicapi.entity.SkRelatedResultAll;
import com.founder.publicapi.logs.OperLog;
import com.founder.publicapi.logs.OperationType;
import com.founder.publicapi.service.SkDictionaryService;
import com.founder.publicapi.service.SkRegionalsTaskService;
import com.founder.publicapi.service.SkRelatedResultAllService;
import com.founder.publicapi.util.SpringUtil;
import com.founder.publicapi.vo.param.SkRegionalsPersonParam;
import com.founder.publicapi.vo.response.SkRelatedResultAllVO;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
/**
* 关联关系表(SkRelated ResultAll)表控制层
*
* @author jlt
* @since 2022-03-21 16:30:18
*/
@RestController
@RequestMapping("skRelatedResultAll")
public class SkRelatedResultAllController extends ApiController implements ExcelControllerInterface {
/**
* 服务对象
*/
@Resource
private SkRelatedResultAllService service;
@Autowired
private SkDictionaryService skDictionaryService;
/**
* 新增关联关系信息
*/
@PostMapping("save")
@ApiOperation(value = "新增关联关系信息")
@OperLog(message = "新增关联关系信息", operation = OperationType.ADD)
public MapRestResult save(SkRelatedResultAll skRegionalsTask) throws IOException {
skRegionalsTask.setFirstdata(new Date());
skRegionalsTask.setData(new Date());
skRegionalsTask.setXxzjbh(KeyUtil.getUUIDKey("GLA"));
boolean save = service.save(skRegionalsTask);
if (save) {
return new MapRestResult();
} else {
return new MapRestResult().error("保存失败");
}
}
/**
* 修改关联关系信息
*/
@PostMapping("update")
@ApiOperation(value = "修改关联关系信息")
@OperLog(message = "修改关联关系信息", operation = OperationType.UPDATE)
public MapRestResult update(SkRelatedResultAll skRegionalsTask) throws IOException {
skRegionalsTask.setData(new Date());
boolean update = service.updateById(skRegionalsTask);
if (update) {
return new MapRestResult();
} else {
return new MapRestResult().error("更新失败");
}
}
/**
* 删除关联关系信息
*/
@PostMapping("remove")
@ApiOperation(value = "删除关联关系信息")
@OperLog(message = "删除关联关系信息", operation = OperationType.DELETE)
public MapRestResult deleteById(String xxzjbh) {
SkRelatedResultAll skRegionalsTask = new SkRelatedResultAll();
skRegionalsTask.setXxzjbh(xxzjbh);
skRegionalsTask.setIsdeleted("1");
boolean update = service.updateById(skRegionalsTask);
if (update) {
return new MapRestResult();
} else {
return new MapRestResult().error("更新失败");
}
}
/**
* 查询关联关系详情信息
*/
@PostMapping("detail")
@ApiOperation(value = "查询关联关系详情信息")
@OperLog(message = "查询关联关系详情信息", operation = OperationType.QUERY)
public MapRestResult detail(String xxzjbh) {
SkRelatedResultAll byId = service.getById(xxzjbh);
if (byId == null) {
return new MapRestResult().error("不存在该数据");
} else {
String name=skDictionaryService.findDmmcByDmAndDmlx(byId.getObjecttype(),"ST");
String toname=skDictionaryService.findDmmcByDmAndDmlx(byId.getObjecttotype(),"ST");
return new MapRestResult(new SkRelatedResultAllVO(byId,name,toname));
}
}
/**
* 查询关联关系列表信息（分页）
*/
@PostMapping("query")
@ApiOperation(value = "查询关联关系列表信息")
@OperLog(message = "查询关联关系列表信息", operation = OperationType.QUERY)
public MapRestResult query(@RequestBody SkRegionalsPersonParam skRegionalsDetailParam) {
//分页
Page page = new Page(skRegionalsDetailParam.getPage(), skRegionalsDetailParam.getPageSize());
QueryWrapper queryWrapper = new QueryWrapper();
queryWrapper.eq("isDeleted", "0");
queryWrapper.orderByDesc("data");
IPage page1 = service.page(page, queryWrapper);
List<SkRelatedResultAll> records = page1.getRecords();
List<SkRelatedResultAllVO> list=new ArrayList<>();
for (SkRelatedResultAll byId:records) {
String name=skDictionaryService.findDmmcByDmAndDmlx(byId.getObjecttype(),"ST");
String toname=skDictionaryService.findDmmcByDmAndDmlx(byId.getObjecttotype(),"ST");
list.add(new SkRelatedResultAllVO(byId,name,toname));
}
return new MapRestResult(200, "OK", page1.getTotal(), list);
}
@Override
public void setService(String bean) {
if (service == null) {
Object service = SpringUtil.getBean(bean);
this.service = (SkRelatedResultAllService) service;
}
}
@Override
public String saveBatch(List<Object> objs) {
List<SkRelatedResultAll> list = new ArrayList<>();
try {
for (Object obj : objs) {
list.add((SkRelatedResultAll) obj);
}
boolean flag = service.saveBatch(list);
if (flag) {
return "插入成功";
} else {
return "插入失败";
}
} catch (Exception e) {
e.printStackTrace();
return "转化格式错误";
}
}
}
service/publicapi/src/main/java/com/founder/publicapi/controller/SkRelatedResultController.java
......@@ -10,14 +10,22 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.founder.commonutils.publicEntity.MapRestResult;
import com.founder.commonutils.util.KeyUtil;
import com.founder.publicapi.entity.SkRelatedResult;
import com.founder.publicapi.logs.OperLog;
import com.founder.publicapi.logs.OperationType;
import com.founder.publicapi.logs.SkSysLog;
import com.founder.publicapi.logs.util.StringUtil;
import com.founder.publicapi.service.SkDictionaryService;
import com.founder.publicapi.service.SkRelatedResultService;
import com.founder.publicapi.util.JsonUtil;
import com.founder.publicapi.vo.param.SkRelatedResultParam;
import com.founder.publicapi.vo.response.SkRelatedResultVO;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
import java.io.UnsupportedEncodingException;
import java.util.ArrayList;
import java.util.List;
......@@ -35,12 +43,16 @@ public class SkRelatedResultController extends ApiController {
*/
@Resource
private SkRelatedResultService skRelatedResultService;
@Autowired
private SkDictionaryService skDictionaryService;
/**
* 上传json文件
*/
@PostMapping("insert")
@ApiOperation(value = "导入关联关系信息")
@OperLog(message = "导入关联关系信息", operation = OperationType.ADD)
public MapRestResult insert(@RequestParam("file") MultipartFile file) {
if (!file.getOriginalFilename().endsWith(".json")){
return new MapRestResult().error("文件格式不正确，请传json文件");
......@@ -50,6 +62,7 @@ public class SkRelatedResultController extends ApiController {
JSONObject jsonObject = new JSONObject(str);
SkRelatedResult skRelatedResult = new SkRelatedResult();
skRelatedResult.setXxzjbh(KeyUtil.getUUIDKey("GL"));
JSONArray data = (JSONArray)jsonObject.get("data");
// System.out.println(data);
......@@ -66,11 +79,10 @@ public class SkRelatedResultController extends ApiController {
skRelatedResult.setObjectvalue(objectValue);
// System.out.println(object);
skRelatedResult.setResult(object.toString());
skRelatedResult.setXxzjbh(KeyUtil.getUUIDKey(""));
boolean flag = skRelatedResultService.save(skRelatedResult);
if (flag) {
return new MapRestResult();
return new MapRestResult("插入成功");
} else {
return new MapRestResult().error();
}
......@@ -82,45 +94,92 @@ public class SkRelatedResultController extends ApiController {
* 查询列表
*/
@PostMapping("query")
public MapRestResult query(@RequestBody SkRelatedResultParam param){
@ApiOperation(value = "查询关联关系列表信息")
@OperLog(message = "查询关联关系列表信息", operation = OperationType.QUERY)
public MapRestResult query(@RequestBody SkRelatedResultParam param) throws UnsupportedEncodingException {
Page page = new Page(param.getPage(), param.getPageSize());
QueryWrapper queryWrapper = new QueryWrapper();
queryWrapper.eq("isDeleted", 0);
queryWrapper.eq("isDeleted", "0");
IPage page1 = skRelatedResultService.page(page, queryWrapper);
// return new MapRestResult(200, "OK", page1.getTotal(), page1.getRecords());
List<SkRelatedResult> records = page1.getRecords();
List<SkRelatedResultVO> list=new ArrayList<>();
for (SkRelatedResult result:records) {
list.add(resultToVo(result));
List<SkRelatedResult> list = page1.getRecords();
List<SkRelatedResultVO> newList = new ArrayList<>();
for (SkRelatedResult s :list) {
// s.setResult(StringUtil.toUTF8(s.getResult()));
newList.add(new SkRelatedResultVO(s,skDictionaryService.findDmmcByDmAndDmlx(s.getObjecttype(),"ST")));
}
return new MapRestResult(200, "OK", page1.getTotal(), list);
return new MapRestResult(200, "OK", page1.getTotal(), newList);
// List<SkRelatedResult> records = page1.getRecords();
// List<SkRelatedResultVO> list=new ArrayList<>();
// for (SkRelatedResult result:records) {
// list.add(resultToVo(result));
// }
// return new MapRestResult(200, "OK", page1.getTotal(), list);
}
/**
* result转为VO
*/
public SkRelatedResultVO resultToVo(SkRelatedResult byId){
SkRelatedResultVO resultVO=new SkRelatedResultVO();
* 查询详情
*/
@PostMapping("detail")
@ApiOperation(value = "查询关联关系详情信息")
@OperLog(message = "查询关联关系详情信息", operation = OperationType.QUERY)
public MapRestResult detail(String xxzjbh){
SkRelatedResult byId = skRelatedResultService.getById(xxzjbh);
return new MapRestResult(new SkRelatedResultVO(byId,skDictionaryService.findDmmcByDmAndDmlx(byId.getObjecttype(),"ST")));
}
String result = byId.getResult();
JSONObject jsonObject = new JSONObject(result);
JSONArray children = (JSONArray)jsonObject.get("children");
List<SkRelatedResultVO> skRelateds=new ArrayList<>();
for (int i=0;i<children.size();i++){
SkRelatedResultVO skRelated=new SkRelatedResultVO((JSONObject) children.get(i));
skRelateds.add(skRelated);
@PostMapping("update")
@ApiOperation(value = "修改关联关系信息")
@OperLog(message = "修改关联关系信息", operation = OperationType.UPDATE)
public MapRestResult update(SkRelatedResult result){
boolean updateById = skRelatedResultService.updateById(result);
if (updateById){
return new MapRestResult();
}else {
return new MapRestResult().error();
}
}
resultVO.setObjectType(byId.getObjecttype());
resultVO.setObjectValue(byId.getObjectvalue());
resultVO.setChildren(skRelateds);
@PostMapping("remove")
@ApiOperation(value = "删除关联关系信息")
@OperLog(message = "删除关联关系信息", operation = OperationType.DELETE)
public MapRestResult remove(String xxzjbh){
SkRelatedResult byId = skRelatedResultService.getById(xxzjbh);
byId.setIsdeleted("1");
return resultVO;
boolean updateById = skRelatedResultService.updateById(byId);
if (updateById){
return new MapRestResult();
}else {
return new MapRestResult().error();
}
}
/**
* result转为VO
*/
// public SkRelatedResultVO resultToVo(SkRelatedResult byId){
//
// SkRelatedResultVO resultVO=new SkRelatedResultVO();
//
// String result = byId.getResult();
// JSONObject jsonObject = new JSONObject(result);
// JSONArray children = (JSONArray)jsonObject.get("children");
//
// List<SkRelatedResultVO> skRelateds=new ArrayList<>();
// for (int i=0;i<children.size();i++){
// SkRelatedResultVO skRelated=new SkRelatedResultVO((JSONObject) children.get(i));
// skRelateds.add(skRelated);
// }
//
// resultVO.setObjectType(byId.getObjecttype());
// resultVO.setObjectValue(byId.getObjectvalue());
// resultVO.setChildren(skRelateds);
//
// return resultVO;
// }
}
service/publicapi/src/main/java/com/founder/publicapi/controller/SkTrailController.java
......@@ -6,12 +6,20 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.api.ApiController;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.founder.commonutils.publicEntity.MapRestResult;
import com.founder.commonutils.util.KeyUtil;
import com.founder.publicapi.entity.SkTrail;
import com.founder.publicapi.logs.OperLog;
import com.founder.publicapi.logs.OperationType;
import com.founder.publicapi.service.SkDictionaryService;
import com.founder.publicapi.service.SkTrailService;
import com.founder.publicapi.service.SysDictitemService;
import com.founder.publicapi.util.Base64Util;
import com.founder.publicapi.util.DateUtil;
import com.founder.publicapi.util.SpringUtil;
import com.founder.publicapi.vo.param.SkTrailParam;
import com.founder.publicapi.vo.param.SkTrailSaveParam;
import com.founder.publicapi.vo.response.SkTrailVO;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
......@@ -33,23 +41,31 @@ public class SkTrailController extends ApiController implements ExcelControllerI
@Autowired
private SkTrailService skTrailService;
@Autowired
private SkPointlocationController skPointlocationController;
private SkDictionaryService skDictionaryService;
/**
* 新增轨迹
*/
@PostMapping("save")
public MapRestResult save(SkTrail skTrail, @RequestParam("farimg") MultipartFile farimg,
@RequestParam("nearimg") MultipartFile nearimg) throws IOException {
@ApiOperation(value = "新增轨迹信息")
@OperLog(message = "新增轨迹信息", operation = OperationType.ADD)
public MapRestResult save(SkTrailSaveParam param, @RequestParam(required = false)
MultipartFile farimglist, @RequestParam(required = false) MultipartFile nearimglist)
throws IOException {
if (farimg != null) {
String far = Base64Util.getBase64(farimg);
skTrail.setFarimglist(far);
SkTrail skTrail = new SkTrail(param,farimglist,nearimglist);
skTrail.setXxzjbh(KeyUtil.getUUIDKey("GJ"));
if (skTrail.getObjectname() != null && !"".equals(skTrail.getObjectname())) {
} else {
skTrail.setObjectname(skDictionaryService.findDmmcByDmAndClass(skTrail.getObjecttype(), "SkTrail"));
}
if (nearimg != null) {
String near = Base64Util.getBase64(nearimg);
skTrail.setNearimglist(near);
try {
skTrail.setTime(DateUtil.getTimeStamp(skTrail.getDate()));
} catch (Exception e) {
e.printStackTrace();
}
boolean save = skTrailService.save(skTrail);
......@@ -64,17 +80,23 @@ public class SkTrailController extends ApiController implements ExcelControllerI
* 修改轨迹
*/
@PostMapping("update")
public MapRestResult update(SkTrail skTrail, @RequestParam("farimg") MultipartFile farimg,
@RequestParam("nearimg") MultipartFile nearimg) throws IOException {
@ApiOperation(value = "修改轨迹信息")
@OperLog(message = "修改轨迹信息", operation = OperationType.UPDATE)
public MapRestResult update(SkTrailSaveParam param, @RequestParam(required = false)
MultipartFile farimglist, @RequestParam(required = false) MultipartFile nearimglist) throws IOException {
SkTrail skTrail = new SkTrail(param,farimglist,nearimglist);
if (skTrail.getObjectname() != null && !"".equals(skTrail.getObjectname())) {
if (farimg != null) {
String far = Base64Util.getBase64(farimg);
skTrail.setFarimglist(far);
} else {
skTrail.setObjectname(skDictionaryService.findDmmcByDmAndClass(skTrail.getObjecttype(), "SkTrail"));
}
if (nearimg != null) {
String near = Base64Util.getBase64(nearimg);
skTrail.setNearimglist(near);
try {
skTrail.setTime(DateUtil.getTimeStamp(skTrail.getDate()));
} catch (Exception e) {
e.printStackTrace();
}
boolean update = skTrailService.updateById(skTrail);
......@@ -89,10 +111,12 @@ public class SkTrailController extends ApiController implements ExcelControllerI
* 删除轨迹
*/
@PostMapping("remove")
public MapRestResult deleteById(Integer xxzjbh) {
@ApiOperation(value = "删除轨迹信息")
@OperLog(message = "删除轨迹信息", operation = OperationType.DELETE)
public MapRestResult deleteById(String xxzjbh) {
SkTrail skTrail = new SkTrail();
skTrail.setXxzjbh(xxzjbh);
skTrail.setIsDeleted(1);
skTrail.setIsdeleted("1");
boolean update = skTrailService.updateById(skTrail);
if (update) {
......@@ -106,7 +130,9 @@ public class SkTrailController extends ApiController implements ExcelControllerI
* 查询详情
*/
@PostMapping("detail")
public MapRestResult detail(Integer xxzjbh) {
@ApiOperation(value = "查询轨迹详情信息")
@OperLog(message = "查询轨迹详情信息", operation = OperationType.QUERY)
public MapRestResult detail(String xxzjbh) {
SkTrail byId = skTrailService.getById(xxzjbh);
if (byId == null) {
return new MapRestResult().error("不存在该数据");
......@@ -119,11 +145,13 @@ public class SkTrailController extends ApiController implements ExcelControllerI
* 查询列表（分页）
*/
@PostMapping("query")
@ApiOperation(value = "查询轨迹列表信息")
@OperLog(message = "查询轨迹列表信息", operation = OperationType.QUERY)
public MapRestResult query(@RequestBody SkTrailParam sktrailParam) {
//分页
Page page = new Page(sktrailParam.getPage(), sktrailParam.getPageSize());
QueryWrapper queryWrapper = new QueryWrapper();
queryWrapper.eq("is_deleted", 0);
queryWrapper.eq("isDeleted", "0");
if (sktrailParam.getLikeField() != null && !sktrailParam.getLikeField().equals("")) {
queryWrapper.eq("objectType", sktrailParam.getLikeField());
......@@ -132,20 +160,23 @@ public class SkTrailController extends ApiController implements ExcelControllerI
queryWrapper.like("objectValue", sktrailParam.getLikeValue());
}
//时间
if (sktrailParam.getKssj() != null ) {
queryWrapper.ge("str_to_date(date,'%Y-%m-%d %H:%i:%s')",sktrailParam.getKssj() );
if (sktrailParam.getKssj() != null) {
queryWrapper.ge("str_to_date(date,'%Y-%m-%d %H:%i:%s')", sktrailParam.getKssj());
}
if (sktrailParam.getJssj() != null ) {
queryWrapper.le("str_to_date(date,'%Y-%m-%d %H:%i:%s')",sktrailParam.getJssj() );
if (sktrailParam.getJssj() != null) {
queryWrapper.le("str_to_date(date,'%Y-%m-%d %H:%i:%s')", sktrailParam.getJssj());
}
queryWrapper.groupBy("objectValue");
IPage page1 = skTrailService.page(page, queryWrapper);
List<SkTrail> records = page1.getRecords();
List<SkTrailVO> list = new ArrayList<>();
for (SkTrail skTrail:records) {
list.add(new SkTrailVO(skTrail,skPointlocationController.findByBh(skTrail.getObjectvalue())));
for (SkTrail skTrail : records) {
list.add(new SkTrailVO(skTrail, findByBh(skTrail.getObjectvalue())));
}
......@@ -153,6 +184,20 @@ public class SkTrailController extends ApiController implements ExcelControllerI
}
/**
* 根据编号查找相关轨迹
*/
@ApiOperation(value = "根据标识号查询轨迹信息")
@OperLog(message = "根据标识号查询轨迹信息", operation = OperationType.QUERY)
public List<SkTrail> findByBh(String bh) {
QueryWrapper queryWrapper = new QueryWrapper();
queryWrapper.eq("objectValue",bh);
queryWrapper.orderByAsc("date");
queryWrapper.eq("isDeleted", "0");
return skTrailService.list(queryWrapper);
}
@Override
public void setService(String bean) {
......@@ -163,11 +208,14 @@ public class SkTrailController extends ApiController implements ExcelControllerI
}
@Override
@ApiOperation(value = "导入轨迹信息")
@OperLog(message = "导入轨迹信息", operation = OperationType.ADD)
public String saveBatch(List<Object> objs) {
List<SkTrail> list = new ArrayList<>();
try {
for (Object obj : objs) {
list.add((SkTrail) obj);
System.out.println((SkTrail) obj);
}
boolean flag = skTrailService.saveBatch(list);
if (flag) {
......
service/publicapi/src/main/java/com/founder/publicapi/controller/SysUserController.java 0 → 100644
package com.founder.publicapi.controller;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.api.ApiController;
import com.founder.commonutils.publicEntity.MapRestResult;
import com.founder.commonutils.util.AesEncryptUtil;
import com.founder.commonutils.util.JwtUser;
import com.founder.publicapi.entity.SysUser;
import com.founder.publicapi.entity.Token;
import com.founder.publicapi.logs.OperLog;
import com.founder.publicapi.logs.OperationType;
import com.founder.publicapi.service.SysUserService;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
import static com.founder.commonutils.util.AesEncryptUtil.desEncrypt;
/**
* (SysUser)表控制层
*
* @author jlt
* @since 2022-03-17 14:09:46
*/
@RestController
@RequestMapping("user")
public class SysUserController extends ApiController {
/**
* 服务对象
*/
@Resource
private SysUserService sysUserService;
@ApiOperation(value = "登录")
@OperLog(message = "登录",operation = OperationType.LOGIN)
@PostMapping("/login")
public MapRestResult login(@RequestBody SysUser user, HttpServletRequest request) throws Exception {
//使用AES-128-CBC加密模式
Date now = new Date();
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMdd");
String today = simpleDateFormat.format(now);
String KEY = "maplogin" + today;
String IV = "map_vues" + today;
// KEY="maplogin20200416";
// IV="map_vues20200416";
String username = desEncrypt(user.getUsername(), KEY, IV).trim();
String password = desEncrypt(user.getPassword(), KEY, IV).trim();
// System.out.println(username);
// System.out.println(password);
QueryWrapper queryWrapper = new QueryWrapper();
queryWrapper.eq("USERNAME", username);
queryWrapper.eq("SCBZ", 0);
SysUser one = sysUserService.getOne(queryWrapper);
if (one == null) {
return MapRestResult.build(500, "该用户不存在", null);
}
if (!password.equals(one.getPassword())) {
return MapRestResult.build(500, "账号、密码不正确", null);
}
JwtUser util = new JwtUser();
String ip = request.getRemoteAddr();
Token tokenEntity=new Token(one.getId(),ip,password);
JSONObject jsonObject = (JSONObject) JSONObject.toJSON(tokenEntity);
//用户JWT生成token
String token = util.createJWT(jsonObject.toString());
Map<String,Object> map=new HashMap<>();
map.put("token",token);
map.put("user",one);
return new MapRestResult(map);
}
@PostMapping("/test")
public String test(String str) throws Exception {
Date now = new Date();
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMdd");
String today = simpleDateFormat.format(now);
String KEY = "maplogin" + today;
String IV = "map_vues" + today;
return AesEncryptUtil.encrypt(str,KEY,IV);
}
}
service/publicapi/src/main/java/com/founder/publicapi/controller/SysUsersController.java
......@@ -6,8 +6,8 @@ import com.founder.commonutils.publicEntity.SysUsers;
import com.founder.commonutils.util.Base64Util;
import com.founder.commonutils.util.JwtUser;
import com.founder.publicapi.service.SysUsersService;
import com.founder.servicebase.logs.OperLog;
import com.founder.servicebase.logs.OperationType;
import com.founder.publicapi.logs.OperLog;
import com.founder.publicapi.logs.OperationType;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -29,14 +29,15 @@ public class SysUsersController {
@Autowired
private SysUsersService sysUsersService;
//-----------新版jwt login登录
@ApiOperation(value = "登录")
// @OperLog(message = "登录",operation = OperationType.LOGIN)
@PostMapping("/login")
public MapRestResult login(@RequestBody SysUsers sysUsers, HttpServletRequest request, HttpServletResponse response) throws Exception {
//使用AES-128-CBC加密模式，key需要为16位,key和iv可以相同！
String KEY = "maplogin20200416";
String IV = "map_vues20200416";
String KEY = "maplogin";
String IV = "map_vues";
String Password = "";
String Username = "";
if (!sysUsers.getPassword().equals("") || !sysUsers.getUsername().equals("")) {
......
service/publicapi/src/main/java/com/founder/publicapi/controller/XyrController.java
......@@ -9,12 +9,12 @@ import com.founder.commonutils.util.DataUtil;
import com.founder.commonutils.util.HttpUtil;
import com.founder.commonutils.util.IKAnalyzerUtil;
import com.founder.commonutils.util.StringUtil;
import com.founder.publicapi.logs.OperLog;
import com.founder.publicapi.logs.OperationType;
import com.founder.publicapi.service.SysDictitemService;
import com.founder.publicapi.service.TbStAsjAndXyrService;
import com.founder.publicapi.service.ZhfzxyrQgckService;
import com.founder.publicapi.service.ZhfzxyrService;
import com.founder.servicebase.logs.OperLog;
import com.founder.servicebase.logs.OperationType;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
......
service/publicapi/src/main/java/com/founder/publicapi/entity/ServiceList.java 0 → 100644
package com.founder.publicapi.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import java.io.Serializable;
import java.util.Date;
import lombok.Data;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import org.springframework.format.annotation.DateTimeFormat;
/**
* 服务列表(ServiceList)表实体类
*
* @author jlt
* @since 2022-03-11 15:35:31
*/
@Data
@SuppressWarnings("serial")
@TableName("service_list")
public class ServiceList extends Model<ServiceList> {
@TableId(type = IdType.INPUT)
/**服务id*/
private Integer xxzjbh;
/**
* 服务名称
*/
private String name;
/**
* 服务地址
*/
private String address;
/**
* 请求方式
*/
private String method;
/**
* 请求参数
*/
private String requiredparams;
/**
* 返回参数
*/
private String retuenparams;
/**
* 服务描述
*/
private String des;
/**
* 删除标识，0代表未删除，1代表删除
*/
private String isdeleted;
/**
* 创建时间
*/
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date cjsj;
/**
* 服务状态，0运行，1异常
*/
private Integer status;
/**
* 获取主键值
*
* @return 主键值
*/
@Override
protected Serializable pkVal() {
return this.xxzjbh;
}
}
service/publicapi/src/main/java/com/founder/publicapi/entity/SkDictionary.java
......@@ -49,6 +49,6 @@ public class SkDictionary extends Model<SkDictionary> {
/**
* 是否删除，0代表未删除，1代表删除
*/
private Integer isdeleted;
private String isdeleted;
}
service/publicapi/src/main/java/com/founder/publicapi/entity/SkPointlocation.java
......@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import java.io.Serializable;
import java.lang.reflect.Method;
import java.util.List;
import lombok.Data;
import com.baomidou.mybatisplus.annotation.IdType;
......@@ -20,15 +22,15 @@ import com.baomidou.mybatisplus.annotation.TableId;
@SuppressWarnings("serial")
@TableName("sk_pointlocation")
public class SkPointlocation extends Model<SkPointlocation> {
@TableId(type = IdType.AUTO)
@TableId(type = IdType.INPUT)
/**
* 主键编号
*/
private Integer xxzjbh;
private String xxzjbh;
/**
* 标识号，对应轨迹表的号码
* 设备id
*/
private String bh;
private String deviceid;
/**
* 时间戳13位
*/
......@@ -46,14 +48,19 @@ public class SkPointlocation extends Model<SkPointlocation> {
*/
private String address;
/**
* 名称
* 设备名称
*/
private String name;
private String devicename;
/**
* 类型 地址dz 网吧wb 旅馆lg 火车站hcz 客运站kyz 机场 jc 卡口kkt 电子围栏dzwl 话单hd 电动车 ddc GPS GPS 手机MAC sjMac 视频点位spdw
*/
private String objecttype;
/**
* 类型名称 地址 网吧 旅馆 火车站 客运站 机场 卡口 电子围栏 话单 电动车 GPS 手机MAC 视频点位
*/
private String objectname;
/**
* 年月日 时分秒
*/
private String date;
......@@ -61,7 +68,7 @@ public class SkPointlocation extends Model<SkPointlocation> {
/**
* 是否删除，0代表未删除，1代表删除
*/
private Integer isDeleted;
private String isdeleted;
/**
* 获取主键值
......@@ -72,4 +79,42 @@ public class SkPointlocation extends Model<SkPointlocation> {
protected Serializable pkVal() {
return this.xxzjbh;
}
// /**
// * 根据objectname设置objecttype
// */
// public void setTypeByName() {
// if (objectname != null && !objectname.equals("")) {
// objectname=objectname.trim();
// if (objectname.equals("地址")) {
// objecttype = "dz";
// } else if (objectname.equals("网吧")) {
// objecttype = "wb";
// } else if (objectname.equals("旅馆")) {
// objecttype = "lg";
// } else if (objectname.equals("火车站")) {
// objecttype = "hcz";
// } else if (objectname.equals("客运站")) {
// objecttype = "kyz";
// } else if (objectname.equals("机场")) {
// objecttype = "jc";
// } else if (objectname.equals("卡口")) {
// objecttype = "kkt";
// } else if (objectname.equals("电子围栏")) {
// objecttype = "dzwl";
// } else if (objectname.equals("话单")) {
// objecttype = "hd";
// } else if (objectname.equals("电动车")) {
// objecttype = "ddc";
// } else if (objectname.equals("GPS")) {
// objecttype = "GPS";
// } else if (objectname.equals("手机MAC")) {
// objecttype = "sjMac";
// } else if (objectname.equals("视频点位")) {
// objecttype = "spdw";
// }
// }
// }
}
service/publicapi/src/main/java/com/founder/publicapi/entity/SkRegionalsDetail.java 0 → 100644
package com.founder.publicapi.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import java.io.Serializable;
import java.util.Date;
import lombok.Data;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import org.springframework.format.annotation.DateTimeFormat;
/**
* 结果翻译表(SkRegionalsDetail)表实体类
*
* @author jlt
* @since 2022-03-08 17:41:12
*/
@Data
@SuppressWarnings("serial")
@TableName("sk_regionals_detail")
public class SkRegionalsDetail extends Model<SkRegionalsDetail> {
@TableId(type = IdType.INPUT)
/**
* 主键编号
*/
private String xxzjbh;
/**
* 所属任务结果主键（对应RESULT的XXZJBH）
*/
private String resultid;
/**
* 实体类型
*/
private String objecttypename;
/**
* 对象类型 (czxx)
*/
private String objecttype;
/**
* 实体值
*/
private String objectvalue;
/**
* 身份证号码
*/
private String sfzhm;
/**
* 翻译时间
*/
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date fysj;
/**
* 是否删除，0代表未删除，1代表删除
*/
private String isdeleted;
/**
* 获取主键值
*
* @return 主键值
*/
@Override
protected Serializable pkVal() {
return this.xxzjbh;
}
}
service/publicapi/src/main/java/com/founder/publicapi/entity/SkRegionalsPerson.java 0 → 100644
package com.founder.publicapi.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import java.io.IOException;
import java.io.Serializable;
import java.util.Base64;
import com.founder.publicapi.util.Base64Util;
import com.founder.publicapi.vo.param.SkRegionalsPersonSaveParam;
import lombok.Data;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import org.springframework.beans.BeanUtils;
import org.springframework.web.multipart.MultipartFile;
/**
* 人员信息表(SkRegionalsPerson)表实体类
*
* @author jlt
* @since 2022-03-09 17:17:15
*/
@Data
@SuppressWarnings("serial")
@TableName("sk_regionals_person")
public class SkRegionalsPerson extends Model<SkRegionalsPerson> {
@TableId(type = IdType.INPUT)
/**信息主键编号*/
private String xxzjbh;
/**
* 民族
*/
private String mz;
/**
* 姓名
*/
private String xm;
/**
* 身份证号码
*/
private String sfzhm;
/**
* 性别
*/
private String xb;
/**
* 照片
*/
private String img;
/**
* 出生地名称
*/
private String csdzmc;
/**
* 现住址
*/
private String xzzdzmc;
/**
* 户籍地址
*/
private String hjdqhdz;
/**
* 是否犯罪嫌疑人 1是 0否
*/
private String sffzxyr;
/**
* 是否翻译成功 1成功 0未成功
*/
private String sfcheck;
/**
* 联系电话
*/
private String phone;
/**
* 出生日期
*/
private String csrq;
/**
* 是否删除，0代表未删除，1代表删除
*/
private String isdeleted;
/**
* 获取主键值
*
* @return 主键值
*/
@Override
protected Serializable pkVal() {
return this.xxzjbh;
}
public SkRegionalsPerson(){}
public SkRegionalsPerson(SkRegionalsPersonSaveParam param, MultipartFile img) throws IOException {
BeanUtils.copyProperties(param,this);
if (img!=null){
this.img= Base64Util.getBase64(img);
}
}
}
service/publicapi/src/main/java/com/founder/publicapi/entity/SkRegionalsResult.java 0 → 100644
package com.founder.publicapi.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import java.io.IOException;
import java.io.Serializable;
import java.util.Date;
import com.founder.publicapi.util.Base64Util;
import com.founder.publicapi.vo.param.SkRegionalsPersonSaveParam;
import com.founder.publicapi.vo.param.SkRegionalsResultSaveParam;
import lombok.Data;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import org.springframework.beans.BeanUtils;
import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.web.multipart.MultipartFile;
/**
* 结果表(SkRegionalsResult)表实体类
*
* @author jlt
* @since 2022-03-09 17:55:32
*/
@Data
@SuppressWarnings("serial")
@TableName("sk_regionals_result")
public class SkRegionalsResult extends Model<SkRegionalsResult> {
@TableId(type = IdType.INPUT)
/**信息主键编号*/
private String xxzjbh;
/**
* 任务id
*/
private String taskid;
/**
* 实体值
*/
private String objectvalue;
/**
* 实体类型，详见实体类型-类型名称对照表
*/
private String objecttype;
/**
* 类型名称，详见实体类型-类型名称对照表
*/
private String objecttypename;
/**
* 区域集合，[A1,A2]
*/
private String region;
/**
* 翻译标识
* 0：请求失败
* 1：请求成功有翻译数据
* 2：请求成功无翻译数据
* 3：无需翻译
*/
private String sfcheck;
/**
* 经度
*/
private String x;
/**
* 纬度
*/
private String y;
/**
* 照片
*/
private String img;
/**
* 过车时间
*/
@DateTimeFormat(pattern = "yyyy-MM-ss HH:mm:ss")
private Date time;
/**
* 设备ID
*/
private String deviceid;
/**
* 徘徊数量
*/
private Integer count;
/**
* 登记时间
*/
@DateTimeFormat(pattern = "yyyy-MM-ss HH:mm:ss")
private Date djsj;
/**
* 是否删除，0代表未删除，1代表删除
*/
private String isdeleted;
public SkRegionalsResult(){}
public SkRegionalsResult(SkRegionalsResultSaveParam param, MultipartFile img) throws IOException {
BeanUtils.copyProperties(param,this);
if (img!=null){
this.img= Base64Util.getBase64(img);
}
}
/**
* 获取主键值
*
* @return 主键值
*/
@Override
protected Serializable pkVal() {
return this.xxzjbh;
}
}
service/publicapi/src/main/java/com/founder/publicapi/entity/SkRegionalsTask.java 0 → 100644
package com.founder.publicapi.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import java.io.Serializable;
import java.util.Date;
import lombok.Data;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import org.springframework.format.annotation.DateTimeFormat;
/**
* 任务表(SkRegionalsTask)表实体类
*
* @author jlt
* @since 2022-03-09 17:56:00
*/
@Data
@SuppressWarnings("serial")
@TableName("sk_regionals_task")
public class SkRegionalsTask extends Model<SkRegionalsTask> {
@TableId(type = IdType.INPUT)
/**任务id*/
private String taskid;
/**
* 对应案件编号
*/
private String taskcaseid;
/**
* 任务名称
*/
private String taskname;
/**
* 任务类型，详见任务类型-类型名称对照表
*/
private String tasktype;
/**
* 类型名称，详见任务类型-类型名称对照表
*/
private String typename;
/**
* 标识号
*/
private String objectvalue;
/**
* 是否已读 0或空未读 1已读
*/
private String sfread;
/**
* 任务状态，1、2、3、4
*/
private String state;
/**
* 状态名称,开始、执行、完成、失败
*/
private String statename;
/**
* 发送人警号
*/
private String fsrjh;
/**
* 发送人身份证号码
*/
private String fsridentity;
/**
* 发送人姓名
*/
private String fsrxm;
/**
* 登记时间
*/
@DateTimeFormat(pattern = "yyyy-MM-ss HH:mm:ss")
private Date fssj;
/**
* 是否删除，0代表未删除，1代表删除
*/
private String isdeleted;
/**
* 获取主键值
*
* @return 主键值
*/
@Override
protected Serializable pkVal() {
return this.taskid;
}
}
service/publicapi/src/main/java/com/founder/publicapi/entity/SkRelatedResult.java
......@@ -38,7 +38,7 @@ public class SkRelatedResult extends Model<SkRelatedResult> {
/**
* 是否删除，0代表未删除，1代表删除
*/
private Integer isdeleted;
private String isdeleted;
/**
......
service/publicapi/src/main/java/com/founder/publicapi/entity/SkRelatedResultAll.java 0 → 100644
package com.founder.publicapi.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import java.io.Serializable;
import java.util.Date;
import lombok.Data;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import org.springframework.format.annotation.DateTimeFormat;
/**
* 关联关系表(SkRelated ResultAll)表实体类
*
* @author jlt
* @since 2022-03-21 16:30:19
*/
@Data
@SuppressWarnings("serial")
@TableName("sk_related_result_all")
public class SkRelatedResultAll extends Model<SkRelatedResultAll> {
@TableId(type = IdType.INPUT)
/**（生成GLA开头）*/
private String xxzjbh;
/**
* 实体值
*/
private String objectvalue;
/**
* 实体类型,详见实体类型-类型名称对照表
*/
private String objecttype;
/**
* 关联值
*/
private String objecttovalue;
/**
* 关联值类型
*/
private String objecttotype;
/**
* 关联次数
*/
private String count;
/**
* 首次关联时间
*/
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date firstdata;
/**
* 最新关联时间
*/
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date data;
/**
* 是否删除,0：否1；是
*/
private String isdeleted;
/**
* 获取主键值
*
* @return 主键值
*/
@Override
protected Serializable pkVal() {
return this.xxzjbh;
}
}
service/publicapi/src/main/java/com/founder/publicapi/entity/SkTrail.java
package com.founder.publicapi.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import java.io.IOException;
import java.io.Serializable;
import com.founder.publicapi.util.Base64Util;
import com.founder.publicapi.vo.param.SkTrailSaveParam;
import lombok.Data;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import org.springframework.beans.BeanUtils;
import org.springframework.web.multipart.MultipartFile;
/**
* (TbStClgj)表实体类
*
......@@ -18,67 +25,106 @@ import com.baomidou.mybatisplus.annotation.TableId;
@SuppressWarnings("serial")
@TableName("sk_trail")
public class SkTrail extends Model<SkTrail> {
@TableId(type = IdType.AUTO)
/**
*主键编号
*/
private Integer xxzjbh;
/**
*号码
*/
private String objectvalue;
/**
*经度
*/
private String x;
/**
*纬度
*/
private String y;
/**
*设备id
*/
private String deviceid;
/**
*设备名称
*/
private String devicename;
/**
*远照片
*/
private String farimglist;
/**
*近照片
*/
private String nearimglist;
/**
*13位时间戳
*/
private String time;
/**
*过车时间（年月日 时分秒）
*/
private String date;
/**
*地址
*/
private String address;
/**
*类型 网吧轨迹wbgj 旅店ldgj 火车hcgj 机场jcgj 基站jzgj 卡口kkgj 视频spgj
*/
private String objecttype;
@TableId(type = IdType.INPUT)
/**
*主键编号
*/
private String xxzjbh;
/**
* 标识号
*/
private String objectvalue;
/**
* 经度
*/
private String x;
/**
* 纬度
*/
private String y;
/**
* 设备id
*/
private String deviceid;
/**
* /**
* 远照片
*/
private String farimglist;
/**
* 近照片
*/
private String nearimglist;
/**
* 13位时间戳
*/
private String time;
/**
* 过车时间（年月日 时分秒）
*/
private String date;
/**
* 地址
*/
private String address;
/**
* 类型 网吧轨迹wbgj 旅店ldgj 火车hcgj 机场jcgj 基站jzgj 卡口kkgj 视频spgj
*/
private String objecttype;
/**
* 类型名称 网吧轨迹wbgj 旅店ldgj 火车hcgj 机场jcgj 基站jzgj 卡口kkgj 视频spgj
*/
private String objectname;
/**
* 是否删除，0代表未删除，1代表删除
*/
private String isdeleted;
/**
* 获取主键值
*
* @return 主键值
*/
@Override
protected Serializable pkVal() {
return this.xxzjbh;
}
public SkTrail(){}
public SkTrail(SkTrailSaveParam param,MultipartFile farimglist,MultipartFile nearimglist)
throws IOException {
BeanUtils.copyProperties(param,this);
if (farimglist != null) {
String far = Base64Util.getBase64(farimglist);
this.farimglist=far;
}
if (nearimglist != null) {
String near = Base64Util.getBase64(nearimglist);
this.nearimglist=near;
}
}
/**
* 是否删除，0代表未删除，1代表删除
*/
private Integer isDeleted;
/**
* 获取主键值
* @return 主键值
*/
@Override
protected Serializable pkVal() {
return this.xxzjbh;
}
}
// /**
// * 根据objectname设置objecttype
// */
// public void setTypeByName() {
// if (objectname != null && !objectname.equals("")) {
// objectname=objectname.trim();
// if (objectname.equals("网吧轨迹")) {
// objecttype = "wbgj";
// } else if (objectname.equals("旅店")) {
// objecttype = "ldgj";
// } else if (objectname.equals("火车")) {
// objecttype = "hcgj";
// } else if (objectname.equals("基站")) {
// objecttype = "jzgj";
// } else if (objectname.equals("卡口")) {
// objecttype = "kkgj";
// } else if (objectname.equals("视频")) {
// objecttype = "spgj";
// }
// }
//
// }
}
service/publicapi/src/main/java/com/founder/publicapi/entity/SysUser.java 0 → 100644
package com.founder.publicapi.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import java.io.Serializable;
import java.util.Date;
import lombok.Data;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import org.springframework.format.annotation.DateTimeFormat;
/**
* (SysUser)表实体类
*
* @author jlt
* @since 2022-03-17 14:09:48
*/
@Data
@SuppressWarnings("serial")
@TableName("sys_user")
public class SysUser extends Model<SysUser> {
@TableId(type = IdType.INPUT)
/**主键编号*/
private String id;
/**
* 单位代码
*/
private String unitcode;
/**
* 用户名
*/
private String username;
/**
* 密码
*/
private String password;
/**
* 真实姓名
*/
private String trueName;
/**
* 激活标志 (0是未激活 1激活)
*/
private String openFlag;
private String defaultModel;
private String remark;
/**
* 录入人
*/
private String lrr;
/**
* 录入时间
*/
@DateTimeFormat(pattern = "yyyy-MM-ss HH:mm:ss")
private Date lrsj;
/**
* 改写人
*/
private String gxr;
/**
* 改写时间
*/
@DateTimeFormat(pattern = "yyyy-MM-ss HH:mm:ss")
private Date gxsj;
/**
* 录入单位代码
*/
private String lrdwdm;
/**
* 录入单位名称
*/
private String lrdwmc;
/**
* 用户证件号码
*/
private String identitycard;
/**
* 用户性别
*/
private String sex;
/**
* 用户出生日期
*/
@DateTimeFormat(pattern = "yyyy-MM-ss HH:mm:ss")
private Date birthday;
/**
* 用户联系电话
*/
private String telephone;
/**
* 单位名称
*/
private String unitname;
/**
* 删除标志 0未删除 1删除
*/
private Integer scbz;
/**
* ip地址
*/
private String ip;
/**
* 用户级别
*/
private String grade;
/**
* 用户警号
*/
private String policemanid;
private Integer defaultDesktop;
private String theme;
private Date lastlogintime;
private Date lastchecktime;
/**
* 信息资源授权字符串
*/
private String xxzyurl;
/**
* 工作桌面指挥员模块id
*/
private String gzzmZhy;
/**
* 工作桌面研判员员模块id
*/
private String gzzmYpy;
/**
* 工作桌面侦查员模块id
*/
private String gzzmZcy;
/**
* 用户角色
*/
private String gzzmPlay;
/**
* 管理员判断标志 00：否 01：是
*/
private String glybz;
/**
* 特权用户判断标志 00：否 01：是
*/
private String tqyhbz;
private String jgzPhotoZm;
private String jgzPhotoFm;
private String zbzxDwdm;
private String grdf;
private String wjFlag;
private Integer qzRole;
private String xtlx;
private String jddwcode;
private String jddwname;
/**
* 获取主键值
*
* @return 主键值
*/
@Override
protected Serializable pkVal() {
return this.id;
}
}
service/publicapi/src/main/java/com/founder/publicapi/entity/Token.java 0 → 100644
package com.founder.publicapi.entity;
import cn.hutool.json.JSONObject;
import lombok.Data;
/**
* @author jlt
* @date 2022/03/17/
*/
@Data
public class Token {
/**
* 用户名
*/
private String id;
/**
* ip
*/
private String ip;
/**
* 密码
*/
private String password;
public Token(){}
public Token(String id,String ip,String password){
this.id=id;
this.ip=ip;
this.password=password;
}
public Token(JSONObject object) {
this.id= (String) object.get("id");
this.ip=(String) object.get("ip");
this.password=(String) object.get("password");
}
}
service/publicapi/src/main/java/com/founder/publicapi/interceptor/TokenInterceptor.java 0 → 100644
package com.founder.publicapi.interceptor;
import cn.hutool.json.JSONObject;
import com.founder.commonutils.Exception.TokenException;
import com.founder.commonutils.util.JwtUser;
import com.founder.publicapi.entity.Token;
import com.founder.publicapi.util.ResultUtil;
import io.jsonwebtoken.Claims;
import org.springframework.stereotype.Component;
import org.springframework.web.servlet.HandlerInterceptor;
import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.HashMap;
import java.util.Map;
/**
* @author jlt
* @date 2022/03/21/
*/
@Component
public class TokenInterceptor implements HandlerInterceptor {
private JwtUser jwtUser=new JwtUser();
@Override
public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) {
String authorization = JwtUser.getHeadToken(request, "authorization");
Claims claims=null;
try {
claims = jwtUser.parseJWT(authorization);
String sub = (String)claims.get("sub");
JSONObject object=new JSONObject(sub);
Token token=new Token(object);
System.out.println(token);
return true;
}catch (TokenException e){
System.out.println(e.getMessage());
Map<String,Object> map= getMap(401,e.getMessage());
ResultUtil.responseJson(response,map);
return false;
}
}
@Override
public void postHandle(HttpServletRequest request, HttpServletResponse response, Object handler, ModelAndView modelAndView) throws Exception {
}
@Override
public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) throws Exception {
}
public Map<String,Object> getMap(Integer status,String msg){
Map<String,Object> map=new HashMap<>();
map.put("code",status);
map.put("msg",msg);
return map;
}
}
service/publicapi/src/main/java/com/founder/publicapi/logs/SkSysLog.java
......@@ -15,8 +15,8 @@ import java.io.Serializable;
@TableName("sk_sys_log")
public class SkSysLog implements Serializable {
@TableId(type = IdType.AUTO)
private Integer id; //
@TableId(type = IdType.INPUT)
private String id; //
private String userid; // 操作用户 ID
......
service/publicapi/src/main/java/com/founder/publicapi/logs/SysLogAspect.java
package com.founder.publicapi.logs;
import cn.hutool.json.JSONObject;
import com.founder.commonutils.Exception.TokenException;
import com.founder.commonutils.util.JwtUser;
import com.founder.commonutils.util.KeyUtil;
import com.founder.publicapi.entity.Token;
import com.founder.publicapi.logs.mapper.SkSysLogMapper;
import com.founder.publicapi.util.ResultUtil;
import com.founder.servicebase.meassage.WebSocketServer;
import io.jsonwebtoken.Claims;
import lombok.SneakyThrows;
import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.annotation.After;
......@@ -57,6 +64,8 @@ public class SysLogAspect {
//保存日志
SkSysLog sysLog = new SkSysLog();
sysLog.setId(KeyUtil.getUUIDKey("RZ"));
//从切面织入点处通过反射机制获取织入点处的方法
MethodSignature signature = (MethodSignature) proceedingJoinPoint.getSignature();
//获取切入点所在的方法
......@@ -87,6 +96,21 @@ public class SysLogAspect {
ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
HttpServletRequest request = attributes.getRequest();
//获取token信息
try {
String authorization = JwtUser.getHeadToken(request, "authorization");
Claims claims = new JwtUser().parseJWT(authorization);
String sub = (String) claims.get("sub");
JSONObject object = new JSONObject(sub);
Token token = new Token(object);
System.out.println(token);
sysLog.setUserid(token.getId());
}catch (TokenException e){
sysLog.setUserid("system");
}
// 记录下请求内容
LOG.info("URL : " + request.getRequestURL().toString());
LOG.info("HTTP_METHOD : " + request.getMethod());
......@@ -97,7 +121,7 @@ public class SysLogAspect {
// 计时并调用目标函数
long start = System.currentTimeMillis();
Object result=null;
Object result = null;
try {
result = proceedingJoinPoint.proceed();
if (!StringUtils.isEmpty(result)) {
......
service/publicapi/src/main/java/com/founder/publicapi/logs/controller/SkSysLogController.java
......@@ -4,14 +4,23 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.founder.commonutils.publicEntity.MapRestResult;
import com.founder.publicapi.logs.SkSysLog;
import com.founder.publicapi.logs.param.LogParam;
import com.founder.publicapi.logs.service.SkSysLogService;
import com.founder.publicapi.logs.util.DateUtil;
import com.founder.publicapi.logs.util.StringUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.io.UnsupportedEncodingException;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.List;
/**
* 日志控制层
*
......@@ -29,8 +38,9 @@ public class SkSysLogController {
* 查询日志列表
*/
@PostMapping("query")
public MapRestResult query(@RequestBody LogParam logParam) {
public MapRestResult query(@RequestBody LogParam logParam) throws ParseException, UnsupportedEncodingException {
QueryWrapper queryWrapper = new QueryWrapper();
SimpleDateFormat simpleDateFormat=new SimpleDateFormat("yyyy-MM-dd");
if (logParam.getIp() != null && !logParam.getIp().equals("")) {
queryWrapper.eq("ip", logParam.getIp());
}
......@@ -39,12 +49,15 @@ public class SkSysLogController {
queryWrapper.eq("userId", logParam.getUserId());
}
if (logParam.getCreateDate() != null && !logParam.getCreateDate().equals("")) {
queryWrapper.eq("createDate", logParam.getCreateDate());
if (logParam.getStartTime() != null && !logParam.getStartTime().equals("")) {
queryWrapper.ge("str_to_date(createDate,'%Y-%m-%d')", simpleDateFormat.parse(logParam.getStartTime()));
}
if (logParam.getEndTime() != null && !logParam.getEndTime().equals("")) {
queryWrapper.lt("str_to_date(createDate,'%Y-%m-%d')", DateUtil.addHour(simpleDateFormat.parse(logParam.getEndTime()),24));
}
if (logParam.getMethod() != null && !logParam.getMethod().equals("")) {
queryWrapper.eq("method", logParam.getMethod());
if (logParam.getMessage() != null && !logParam.getMessage().equals("")) {
queryWrapper.like("message", logParam.getMessage());
}
queryWrapper.orderByDesc("createDate");
......@@ -52,6 +65,15 @@ public class SkSysLogController {
Page page=new Page(logParam.getPage(), logParam.getPageSize());
IPage page1 = service.page(page, queryWrapper);
return new MapRestResult(200, "OK", page1.getTotal(), page1.getRecords());
List<SkSysLog> list=page1.getRecords();
List<SkSysLog> newList=new ArrayList<>();
for (SkSysLog s :list) {
s.setContent(StringUtil.toUTF8(s.getContent()));
newList.add(s);
}
return new MapRestResult(200, "OK", page1.getTotal(), newList);
}
}
service/publicapi/src/main/java/com/founder/publicapi/logs/param/LogParam.java
......@@ -19,13 +19,21 @@ public class LogParam {
*/
private String method;
/**
* 服务名称
*/
private String message;
/**
* 请求IP
*/
private String ip;
/**
* 请求时间
* 开始时间
*/
private String startTime;
/**
* 结束时间
*/
private String createDate;
private String endTime;
/**
* 页数
*/
......
service/publicapi/src/main/java/com/founder/publicapi/logs/util/DateUtil.java 0 → 100644
package com.founder.publicapi.logs.util;
import java.util.Date;
/**
* 日期工具类
* @author jlt
* @date 2022/03/17/
*/
public class DateUtil {
/**
*将小时加入时间
*/
public static Date addHour(Date create, int hour){
long time = create.getTime();
return new Date(time+hour*60*60*1000);
}
}
service/publicapi/src/main/java/com/founder/publicapi/logs/util/StringUtil.java 0 → 100644
package com.founder.publicapi.logs.util;
/**
* @author jlt
* @date 2022/03/17/
*/
public class StringUtil {
public static boolean isEmpty(String str) {
if (str != null && !str.trim().isEmpty()) {
return false;// 不为空
}
return true;// 为空
}
public static String toUTF8(String str) {
if (isEmpty(str)) {
return "";
}
try {
if (str.equals(new String(str.getBytes("GB2312"), "GB2312"))) {
str = new String(str.getBytes("GB2312"), "utf-8");
return str;
}
} catch (Exception exception) {
}
try {
if (str.equals(new String(str.getBytes("ISO-8859-1"), "ISO-8859-1"))) {
str = new String(str.getBytes("ISO-8859-1"), "utf-8");
return str;
}
} catch (Exception exception1) {
}
try {
if (str.equals(new String(str.getBytes("GBK"), "GBK"))) {
str = new String(str.getBytes("GBK"), "utf-8");
return str;
}
} catch (Exception exception3) {
}
return str;
}
}
service/publicapi/src/main/java/com/founder/publicapi/mapper/ServiceListMapper.java 0 → 100644
package com.founder.publicapi.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.founder.publicapi.entity.ServiceList;
/**
* 服务列表(ServiceList)表数据库访问层
*
* @author jlt
* @since 2022-03-11 15:35:31
*/
public interface ServiceListMapper extends BaseMapper<ServiceList> {
}
service/publicapi/src/main/java/com/founder/publicapi/mapper/SkRegionalsDetailMapper.java 0 → 100644
package com.founder.publicapi.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.founder.publicapi.entity.SkRegionalsDetail;
/**
* 结果翻译表(SkRegionalsDetail)表数据库访问层
*
* @author jlt
* @since 2022-03-08 17:41:12
*/
public interface SkRegionalsDetailMapper extends BaseMapper<SkRegionalsDetail> {
}
service/publicapi/src/main/java/com/founder/publicapi/mapper/SkRegionalsPersonMapper.java 0 → 100644
package com.founder.publicapi.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.founder.publicapi.entity.SkRegionalsPerson;
/**
* 人员信息表(SkRegionalsPerson)表数据库访问层
*
* @author jlt
* @since 2022-03-09 09:30:35
*/
public interface SkRegionalsPersonMapper extends BaseMapper<SkRegionalsPerson> {
}
service/publicapi/src/main/java/com/founder/publicapi/mapper/SkRegionalsResultMapper.java 0 → 100644
package com.founder.publicapi.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.founder.publicapi.entity.SkRegionalsResult;
/**
* 结果表(SkRegionalsResult)表数据库访问层
*
* @author jlt
* @since 2022-03-09 10:11:06
*/
public interface SkRegionalsResultMapper extends BaseMapper<SkRegionalsResult> {
}
service/publicapi/src/main/java/com/founder/publicapi/mapper/SkRegionalsTaskMapper.java 0 → 100644
package com.founder.publicapi.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.founder.publicapi.entity.SkRegionalsTask;
/**
* 任务表(SkRegionalsTask)表数据库访问层
*
* @author jlt
* @since 2022-03-09 10:43:11
*/
public interface SkRegionalsTaskMapper extends BaseMapper<SkRegionalsTask> {
}
service/publicapi/src/main/java/com/founder/publicapi/mapper/SkRelatedResultAllMapper.java 0 → 100644
package com.founder.publicapi.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.founder.publicapi.entity.SkRelatedResultAll;
/**
* 关联关系表(SkRelated ResultAll)表数据库访问层
*
* @author jlt
* @since 2022-03-21 16:30:18
*/
public interface SkRelatedResultAllMapper extends BaseMapper<SkRelatedResultAll> {
}
service/publicapi/src/main/java/com/founder/publicapi/mapper/SysUserMapper.java 0 → 100644
package com.founder.publicapi.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.founder.publicapi.entity.SysUser;
/**
* (SysUser)表数据库访问层
*
* @author jlt
* @since 2022-03-17 14:09:47
*/
public interface SysUserMapper extends BaseMapper<SysUser> {
}
service/publicapi/src/main/java/com/founder/publicapi/service/ServiceListService.java 0 → 100644
package com.founder.publicapi.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.founder.publicapi.entity.ServiceList;
/**
* 服务列表(ServiceList)表服务接口
*
* @author jlt
* @since 2022-03-11 15:35:32
*/
public interface ServiceListService extends IService<ServiceList> {
}
service/publicapi/src/main/java/com/founder/publicapi/service/SkRegionalsDetailService.java 0 → 100644
package com.founder.publicapi.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.founder.publicapi.entity.SkRegionalsDetail;
/**
* 结果翻译表(SkRegionalsDetail)表服务接口
*
* @author jlt
* @since 2022-03-08 17:41:12
*/
public interface SkRegionalsDetailService extends IService<SkRegionalsDetail> {
}
service/publicapi/src/main/java/com/founder/publicapi/service/SkRegionalsPersonService.java 0 → 100644
package com.founder.publicapi.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.founder.publicapi.entity.SkRegionalsPerson;
/**
* 人员信息表(SkRegionalsPerson)表服务接口
*
* @author jlt
* @since 2022-03-09 09:30:36
*/
public interface SkRegionalsPersonService extends IService<SkRegionalsPerson> {
}
service/publicapi/src/main/java/com/founder/publicapi/service/SkRegionalsResultService.java 0 → 100644
package com.founder.publicapi.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.founder.publicapi.entity.SkRegionalsResult;
/**
* 结果表(SkRegionalsResult)表服务接口
*
* @author jlt
* @since 2022-03-09 10:11:06
*/
public interface SkRegionalsResultService extends IService<SkRegionalsResult> {
}
service/publicapi/src/main/java/com/founder/publicapi/service/SkRegionalsTaskService.java 0 → 100644
package com.founder.publicapi.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.founder.publicapi.entity.SkRegionalsTask;
/**
* 任务表(SkRegionalsTask)表服务接口
*
* @author jlt
* @since 2022-03-09 10:43:12
*/
public interface SkRegionalsTaskService extends IService<SkRegionalsTask> {
}
service/publicapi/src/main/java/com/founder/publicapi/service/SkRelatedResultAllService.java 0 → 100644
package com.founder.publicapi.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.founder.publicapi.entity.SkRelatedResultAll;
/**
* 关联关系表(SkRelated ResultAll)表服务接口
*
* @author jlt
* @since 2022-03-21 16:30:19
*/
public interface SkRelatedResultAllService extends IService<SkRelatedResultAll> {
}
service/publicapi/src/main/java/com/founder/publicapi/service/SysUserService.java 0 → 100644
package com.founder.publicapi.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.founder.publicapi.entity.SysUser;
/**
* (SysUser)表服务接口
*
* @author jlt
* @since 2022-03-17 14:09:48
*/
public interface SysUserService extends IService<SysUser> {
}
service/publicapi/src/main/java/com/founder/publicapi/service/serviceimpl/ServiceListServiceImpl.java 0 → 100644
package com.founder.publicapi.service.serviceimpl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.founder.publicapi.mapper.ServiceListMapper;
import com.founder.publicapi.entity.ServiceList;
import com.founder.publicapi.service.ServiceListService;
import org.springframework.stereotype.Service;
/**
* 服务列表(ServiceList)表服务实现类
*
* @author jlt
* @since 2022-03-11 15:35:32
*/
@Service("serviceListService")
public class ServiceListServiceImpl extends ServiceImpl<ServiceListMapper, ServiceList> implements ServiceListService {
}
service/publicapi/src/main/java/com/founder/publicapi/service/serviceimpl/SkRegionalsDetailServiceImpl.java 0 → 100644
package com.founder.publicapi.service.serviceimpl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.founder.publicapi.entity.SkRegionalsDetail;
import com.founder.publicapi.mapper.SkRegionalsDetailMapper;
import com.founder.publicapi.service.SkRegionalsDetailService;
import org.springframework.stereotype.Service;
/**
* 结果翻译表(SkRegionalsDetail)表服务实现类
*
* @author jlt
* @since 2022-03-08 17:41:13
*/
@Service("skRegionalsDetailService")
public class SkRegionalsDetailServiceImpl extends ServiceImpl<SkRegionalsDetailMapper, SkRegionalsDetail> implements SkRegionalsDetailService {
}
service/publicapi/src/main/java/com/founder/publicapi/service/serviceimpl/SkRegionalsPersonServiceImpl.java 0 → 100644
package com.founder.publicapi.service.serviceimpl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.founder.publicapi.entity.SkRegionalsPerson;
import com.founder.publicapi.mapper.SkRegionalsPersonMapper;
import com.founder.publicapi.service.SkRegionalsPersonService;
import org.springframework.stereotype.Service;
/**
* 人员信息表(SkRegionalsPerson)表服务实现类
*
* @author jlt
* @since 2022-03-09 09:30:36
*/
@Service("skRegionalsPersonService")
public class SkRegionalsPersonServiceImpl extends ServiceImpl<SkRegionalsPersonMapper, SkRegionalsPerson> implements SkRegionalsPersonService {
}
service/publicapi/src/main/java/com/founder/publicapi/service/serviceimpl/SkRegionalsResultServiceImpl.java 0 → 100644
package com.founder.publicapi.service.serviceimpl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.founder.publicapi.entity.SkRegionalsResult;
import com.founder.publicapi.mapper.SkRegionalsResultMapper;
import com.founder.publicapi.service.SkRegionalsResultService;
import org.springframework.stereotype.Service;
/**
* 结果表(SkRegionalsResult)表服务实现类
*
* @author jlt
* @since 2022-03-09 10:11:07
*/
@Service("skRegionalsResultService")
public class SkRegionalsResultServiceImpl extends ServiceImpl<SkRegionalsResultMapper, SkRegionalsResult> implements SkRegionalsResultService {
}
service/publicapi/src/main/java/com/founder/publicapi/service/serviceimpl/SkRegionalsTaskServiceImpl.java 0 → 100644
package com.founder.publicapi.service.serviceimpl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.founder.publicapi.mapper.SkRegionalsTaskMapper;
import com.founder.publicapi.entity.SkRegionalsTask;
import com.founder.publicapi.service.SkRegionalsTaskService;
import org.springframework.stereotype.Service;
/**
* 任务表(SkRegionalsTask)表服务实现类
*
* @author jlt
* @since 2022-03-09 10:43:12
*/
@Service("skRegionalsTaskService")
public class SkRegionalsTaskServiceImpl extends ServiceImpl<SkRegionalsTaskMapper, SkRegionalsTask> implements SkRegionalsTaskService {
}
service/publicapi/src/main/java/com/founder/publicapi/service/serviceimpl/SkRelatedResultAllServiceImpl.java 0 → 100644
package com.founder.publicapi.service.serviceimpl;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.founder.publicapi.entity.SkRelatedResultAll;
import com.founder.publicapi.mapper.SkRelatedResultAllMapper;
import com.founder.publicapi.service.SkRelatedResultAllService;
import org.springframework.stereotype.Service;
import java.io.Serializable;
import java.util.Collection;
import java.util.List;
import java.util.Map;
/**
* 关联关系表(SkRelated ResultAll)表服务实现类
*
* @author jlt
* @since 2022-03-21 16:28:17
*/
@Service("skRelatedResultAllService")
public class SkRelatedResultAllServiceImpl extends ServiceImpl<SkRelatedResultAllMapper, SkRelatedResultAll> implements SkRelatedResultAllService {
}
service/publicapi/src/main/java/com/founder/publicapi/service/serviceimpl/SysUserServiceImpl.java 0 → 100644
package com.founder.publicapi.service.serviceimpl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.founder.publicapi.mapper.SysUserMapper;
import com.founder.publicapi.entity.SysUser;
import com.founder.publicapi.service.SysUserService;
import org.springframework.stereotype.Service;
/**
* (SysUser)表服务实现类
*
* @author jlt
* @since 2022-03-17 14:09:48
*/
@Service("sysUserService")
public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> implements SysUserService {
}
service/publicapi/src/main/java/com/founder/publicapi/util/DateUtil.java 0 → 100644
package com.founder.publicapi.util;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
/**
* 日期工具类
*
* @author jlt
* @date 2022/03/14/
*/
public class DateUtil {
private static SimpleDateFormat sf = null;
public static String getTimeStamp(String currentDate) {
sf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
Date date = new Date();
try {
date = sf.parse(currentDate);
} catch (ParseException e) {
e.printStackTrace();
}
return String.valueOf(date.getTime());
}
}
service/publicapi/src/main/java/com/founder/publicapi/util/JsonUtil.java
......@@ -8,6 +8,7 @@ import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.commons.CommonsMultipartFile;
import java.io.*;
import java.util.UUID;
/**
* @author jlt
......@@ -22,10 +23,13 @@ public class JsonUtil {
*/
public static String readJsonFile(MultipartFile jsonFile) {
String jsonStr = "";
File file = MultipartFileToFile(jsonFile);
try {
FileReader fileReader = new FileReader(transferToFile(jsonFile));
Reader reader = new InputStreamReader(new FileInputStream(transferToFile(jsonFile)), "utf-8");
FileReader fileReader = new FileReader(file);
Reader reader = new InputStreamReader(new FileInputStream(file), "utf-8");
int ch = 0;
StringBuffer sb = new StringBuffer();
while ((ch = reader.read()) != -1) {
......@@ -38,27 +42,30 @@ public class JsonUtil {
} catch (IOException e) {
e.printStackTrace();
return null;
}finally {
if (file.exists()){
file.delete();
}
}
}
private static File transferToFile(MultipartFile multipartFile) {
// 选择用缓冲区来实现这个转换即使用java 创建的临时文件 使用 MultipartFile.transferto()方法 。
File file = null;
public static File MultipartFileToFile(MultipartFile multiFile) {
// 获取文件名
String fileName = multiFile.getOriginalFilename();
// 获取文件后缀
String prefix = fileName.substring(fileName.lastIndexOf("."));
// 若须要防止生成的临时文件重复,能够在文件名后添加随机码
try {
String originalFilename = multipartFile.getOriginalFilename();
String[] filename = originalFilename.split("\\.");
File dir = new File("/mnt/");
if (dir.exists()) {
file = File.createTempFile(filename[0] + "1111", ".json",dir);
} else {
file = File.createTempFile(filename[0] + "1111", ".json");
}
multipartFile.transferTo(file);
file.deleteOnExit();
} catch (IOException e) {
File file = File.createTempFile(fileName+ UUID.randomUUID().toString().substring(0,2), prefix);
multiFile.transferTo(file);
return file;
} catch (Exception e) {
e.printStackTrace();
}
return file;
return null;
}
}
service/publicapi/src/main/java/com/founder/publicapi/util/ResultUtil.java 0 → 100644
package com.founder.publicapi.util;
import com.alibaba.fastjson.JSON;
import javax.servlet.ServletResponse;
import java.io.PrintWriter;
import java.util.Map;
/**
* 返回结果工具类
* @author jlt
* @date 2022/03/21/
**/
public class ResultUtil {
/**
* 私有化构造器
*/
private ResultUtil(){}
/**
* 使用response输出JSON
**/
public static void responseJson(ServletResponse response, Map<String, Object> resultMap){
PrintWriter out = null;
try {
response.setCharacterEncoding("UTF-8");
response.setContentType("application/json");
out = response.getWriter();
out.println(JSON.toJSONString(resultMap));
} catch (Exception e) {
System.out.println("【JSON输出异常】"+e);
}finally{
if(out!=null){
out.flush();
out.close();
}
}
}
}
\ No newline at end of file
service/publicapi/src/main/java/com/founder/publicapi/vo/param/ServiceListParam.java 0 → 100644
package com.founder.publicapi.vo.param;
import lombok.Data;
/**
* @author jlt
* @date 2022/03/11/
*/
@Data
public class ServiceListParam {
/**
* 服务名称
*/
private String name;
/**
* 服务状态，0运行，1异常
*/
private Integer status;
/**
* 行数
*/
private Integer page;
/**
* 列数
*/
private Integer pageSize;
}
service/publicapi/src/main/java/com/founder/publicapi/vo/param/SkPointlocationParam.java
......@@ -13,7 +13,7 @@ import java.util.Date;
@Data
public class SkPointlocationParam {
/**
* 请求类型
* 请求类型（前端传的是objecttype）
*/
private String likeField;
/**
......
service/publicapi/src/main/java/com/founder/publicapi/vo/param/SkRegionalsDetailParam.java 0 → 100644
package com.founder.publicapi.vo.param;
import lombok.Data;
/**
* 结果翻译表传参
* @author jlt
* @date 2022/03/15/
*/
@Data
public class SkRegionalsDetailParam {
/**
* 行数
*/
private Integer page;
/**
* 列数
*/
private Integer pageSize;
}
service/publicapi/src/main/java/com/founder/publicapi/vo/param/SkRegionalsPersonParam.java 0 → 100644
package com.founder.publicapi.vo.param;
import lombok.Data;
/**
* @author jlt
* @date 2022/03/15/
*/
@Data
public class SkRegionalsPersonParam {
/**
* 行数
*/
private Integer page;
/**
* 列数
*/
private Integer pageSize;
}
service/publicapi/src/main/java/com/founder/publicapi/vo/param/SkRegionalsPersonSaveParam.java 0 → 100644
package com.founder.publicapi.vo.param;
import lombok.Data;
import org.springframework.web.multipart.MultipartFile;
/**
* @author jlt
* @date 2022/03/15/
*/
@Data
public class SkRegionalsPersonSaveParam {
private String xxzjbh;
/**
* 民族
*/
private String mz;
/**
* 姓名
*/
private String xm;
/**
* 身份证号码
*/
private String sfzhm;
/**
* 性别
*/
private String xb;
/**
* 出生地名称
*/
private String csdzmc;
/**
* 现住址
*/
private String xzzdzmc;
/**
* 户籍地址
*/
private String hjdqhdz;
/**
* 是否犯罪嫌疑人 1是 0否
*/
private String sffzxyr;
/**
* 是否翻译成功 1成功 0未成功
*/
private String sfcheck;
/**
* 联系电话
*/
private String phone;
/**
* 出生日期
*/
private String csrq;
/**
* 是否删除，0代表未删除，1代表删除
*/
private String isdeleted;
}
service/publicapi/src/main/java/com/founder/publicapi/vo/param/SkRegionalsResultParam.java 0 → 100644
package com.founder.publicapi.vo.param;
import lombok.Data;
/**
* 结果表传参
* @author jlt
* @date 2022/03/15/
*/
@Data
public class SkRegionalsResultParam {
/**
* 行数
*/
private Integer page;
/**
* 列数
*/
private Integer pageSize;
}
service/publicapi/src/main/java/com/founder/publicapi/vo/param/SkRegionalsResultSaveParam.java 0 → 100644
package com.founder.publicapi.vo.param;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.web.multipart.MultipartFile;
import java.util.Date;
/**
* @author jlt
* @date 2022/03/15/
*/
@Data
public class SkRegionalsResultSaveParam {
/**信息主键编号*/
private String xxzjbh;
/**
* 任务id
*/
private String taskid;
/**
* 实体值
*/
private String objectvalue;
/**
* 实体类型，详见实体类型-类型名称对照表
*/
private String objecttype;
/**
* 类型名称，详见实体类型-类型名称对照表
*/
private String objecttypename;
/**
* 区域集合，[A1,A2]
*/
private String region;
/**
* 翻译标识
* 0：请求失败
* 1：请求成功有翻译数据
* 2：请求成功无翻译数据
* 3：无需翻译
*/
private String sfcheck;
/**
* 经度
*/
private String x;
/**
* 纬度
*/
private String y;
/**
* 过车时间
*/
@DateTimeFormat(pattern = "yyyy-MM-ss HH:mm:ss")
private Date time;
/**
* 设备ID
*/
private String deviceid;
/**
* 设备名称
*/
private String devicename;
/**
* 徘徊数量
*/
private Integer count;
/**
* 登记时间
*/
@DateTimeFormat(pattern = "yyyy-MM-ss HH:mm:ss")
private Date djsj;
/**
* 是否删除，0代表未删除，1代表删除
*/
private Integer isdeleted;
}
service/publicapi/src/main/java/com/founder/publicapi/vo/param/SkRegionalsTaskParam.java 0 → 100644
package com.founder.publicapi.vo.param;
import lombok.Data;
/**
* 任务表传参
* @author jlt
* @date 2022/03/15/
*/
@Data
public class SkRegionalsTaskParam {
/**
* 行数
*/
private Integer page;
/**
* 列数
*/
private Integer pageSize;
}
service/publicapi/src/main/java/com/founder/publicapi/vo/param/SkRelatedResultAllParam.java 0 → 100644
package com.founder.publicapi.vo.param;
import lombok.Data;
/**
* @author jlt
* @date 2022/03/21/
*/
@Data
public class SkRelatedResultAllParam {
/**
* 行数
*/
private Integer page;
/**
* 列数
*/
private Integer pageSize;
}
service/publicapi/src/main/java/com/founder/publicapi/vo/param/SkTrailParam.java
......@@ -13,7 +13,7 @@ import java.util.Date;
@Data
public class SkTrailParam {
/**
* 请求类型
* 请求类型(前端传的是objecttype)
*/
private String likeField;
/**
......
service/publicapi/src/main/java/com/founder/publicapi/vo/param/SkTrailSaveParam.java 0 → 100644
package com.founder.publicapi.vo.param;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.web.multipart.MultipartFile;
import java.util.Date;
/**
* 保存轨迹传参类
* @author jlt
* @date 2022/03/15/
*/
@Data
public class SkTrailSaveParam {
/**
*主键编号
*/
private String xxzjbh;
/**
* 号码
*/
private String objectvalue;
/**
* 经度
*/
private String x;
/**
* 纬度
*/
private String y;
/**
* 设备id
*/
private String deviceid;
/**
* 设备名称
*/
private String devicename;
/**
* 人员姓名
*/
private String name;
/**
* 13位时间戳
*/
private String time;
/**
* 过车时间（年月日 时分秒）
*/
private String date;
/**
* 地址
*/
private String address;
/**
* 类型 网吧轨迹wbgj 旅店ldgj 火车hcgj 机场jcgj 基站jzgj 卡口kkgj 视频spgj
*/
private String objecttype;
/**
* 类型名称 网吧轨迹wbgj 旅店ldgj 火车hcgj 机场jcgj 基站jzgj 卡口kkgj 视频spgj
*/
private String objectname;
/**
* 是否删除，0代表未删除，1代表删除
*/
private Integer isdeleted;
}
service/publicapi/src/main/java/com/founder/publicapi/vo/response/SkRelatedResultAllVO.java 0 → 100644
package com.founder.publicapi.vo.response;
import com.founder.publicapi.entity.SkRelatedResult;
import com.founder.publicapi.entity.SkRelatedResultAll;
import lombok.Data;
import org.springframework.beans.BeanUtils;
import java.util.Date;
/**
* @author jlt
* @date 2022/03/16/
*/
@Data
public class SkRelatedResultAllVO {
private String xxzjbh;
/**
* 实体值
*/
private String objectvalue;
/**
* 实体类型,详见实体类型-类型名称对照表
*/
private String objecttype;
/**
* 实体类型名称
*/
private String objecttypename;
/**
* 关联值
*/
private String objecttovalue;
/**
* 关联值类型名称
*/
private String objecttotypename;
/**
* 关联值类型
*/
private String objecttotype;
/**
* 关联次数
*/
private String count;
/**
* 首次关联时间
*/
private Date firstdata;
/**
* 最新关联时间
*/
private Date data;
/**
* 是否删除,0：否1；是
*/
private String isdeleted;
// /**
// * 结果值
// */
// private List<SkRelatedResultVO> children;
public SkRelatedResultAllVO() {
}
public SkRelatedResultAllVO(SkRelatedResultAll s, String name, String toname) {
BeanUtils.copyProperties(s,this);
this.objecttypename=name;
this.objecttotypename=toname;
}
/*public SkRelatedResultVO(JSONObject jsonObject) {
this.objectType = (String) jsonObject.get("objectType");
this.objectValue = (String) jsonObject.get("objectValue");
Object object = jsonObject.get("children");
if (object == null || object.toString().equals("null")) {
this.children = null;
} else {
children=new ArrayList<>();
JSONArray objects = (JSONArray) object;
for (int i = 0; i < objects.size(); i++) {
SkRelatedResultVO skRelated = new SkRelatedResultVO((JSONObject) objects.get(i));
children.add(skRelated);
}
}
}*/
}
service/publicapi/src/main/java/com/founder/publicapi/vo/response/SkRelatedResultVO.java
......@@ -2,7 +2,10 @@ package com.founder.publicapi.vo.response;
import cn.hutool.json.JSONArray;
import cn.hutool.json.JSONObject;
import com.founder.publicapi.entity.SkRelatedResult;
import com.founder.publicapi.logs.util.StringUtil;
import lombok.Data;
import org.springframework.beans.BeanUtils;
import java.util.ArrayList;
import java.util.List;
......@@ -14,22 +17,40 @@ import java.util.List;
@Data
public class SkRelatedResultVO {
/**
* 实体值
* 信心主键编号
*/
private String objectValue;
private String xxzjbh;
/**
* 类型
*/
private String objectType;
private String objecttype;
/**
* 实体值
*/
private String objectvalue;
/**
* 类型名称
*/
private String objecttypename;
/**
* 结果值
* 结果
*/
private List<SkRelatedResultVO> children;
private String result;
// /**
// * 结果值
// */
// private List<SkRelatedResultVO> children;
public SkRelatedResultVO() {
}
public SkRelatedResultVO(JSONObject jsonObject) {
public SkRelatedResultVO(SkRelatedResult s, String str) {
BeanUtils.copyProperties(s,this);
this.objecttypename=str;
}
/*public SkRelatedResultVO(JSONObject jsonObject) {
this.objectType = (String) jsonObject.get("objectType");
this.objectValue = (String) jsonObject.get("objectValue");
Object object = jsonObject.get("children");
......@@ -43,5 +64,5 @@ public class SkRelatedResultVO {
children.add(skRelated);
}
}
}
}*/
}
service/publicapi/src/main/java/com/founder/publicapi/vo/response/SkTrailVO.java
......@@ -19,14 +19,14 @@ public class SkTrailVO {
*/
private String objectvalue;
/**
*名字
*/
private String name;
/**
*类型 网吧轨迹wbgj 旅店ldgj 火车hcgj 机场jcgj 基站jzgj 卡口kkgj 视频spgj
*/
private String objecttype;
/**
*类型名称
*/
private String objectname;
/**
* 开始时间
*/
private String kssj;
......@@ -37,14 +37,13 @@ public class SkTrailVO {
/**
* 对应点位
*/
private List<SkPointlocation> points;
private List<SkTrail> points;
public SkTrailVO(){}
public SkTrailVO(SkTrail skTrail, List<SkPointlocation> groupByBh) {
public SkTrailVO(SkTrail skTrail, List<SkTrail> groupByBh) {
BeanUtils.copyProperties(skTrail,this);
if (groupByBh!=null&&groupByBh.size()!=0){
name=groupByBh.get(0).getName();
kssj=groupByBh.get(0).getDate();//以时间升序
jssj=groupByBh.get(groupByBh.size()-1).getDate();
}
......
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