Skip to content

M
map-parent
Commit 03e838df by 宋珺琪
Options

时空桌面菜单路径、服务管理四个下载和新增excel上传（西藏）

parent 9bc1a91f
Showing with 486 additions and 51 deletions
common/common_utils/src/main/java/com/founder/commonutils/util/ExcelUtil.java 0 → 100644
package com.founder.commonutils.util;
import com.founder.commonutils.model.newPublicEntity.hnkshEntity.HnRygxExport;
import com.founder.commonutils.model.newPublicEntity.result.ApiException;
import org.apache.commons.lang.StringUtils;
import org.apache.poi.hssf.usermodel.HSSFSheet;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.Row;
import org.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.ss.usermodel.Workbook;
import org.apache.poi.xssf.usermodel.XSSFSheet;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import java.io.InputStream;
import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
public class ExcelUtil {
public static void main(String[] args) {
}
public static Map readXLSExcel(InputStream inputStream, Class obj) {
return readXLSExcel(inputStream, obj, 0);
}
/**
* @param inputStream
* @param obj
* @param abandonFields 不需要赋值的属性的长度
* @return
*/
public static Map readXLSExcel(InputStream inputStream, Class obj, int abandonFields) {
Map resultMap = new HashMap();
List dataList = new ArrayList();
try {
/* XSSFWorkbook hssfWorkbook = new XSSFWorkbook(inputStream);
XSSFSheet sheet = hssfWorkbook.getSheetAt(0);*/
HSSFWorkbook hssfWorkbook = new HSSFWorkbook(inputStream);
HSSFSheet sheet = hssfWorkbook.getSheetAt(0);
int totalRowNums = sheet.getPhysicalNumberOfRows();
//从第二行开始读（第一行是表头）
for (int i = 1; i < totalRowNums; i++) {
Row row = sheet.getRow(i);
if (row == null) {
totalRowNums++;
continue;
}
Object instance = obj.newInstance();
Field[] fields = obj.getDeclaredFields();
for (int j = 0; j < fields.length - abandonFields; j++) {
Field field = fields[j];
field.setAccessible(true);
Cell cell = row.getCell(j);
if (cell == null) {
continue;
}
cell.setCellType(Cell.CELL_TYPE_STRING);
String cellValue = cell.getStringCellValue();
field.set(instance, cellValue);
}
dataList.add(instance);
}
resultMap.put("dataList", dataList);
resultMap.put("totalRowNums", totalRowNums);
} catch (Exception e) {
throw new ApiException(201, "读取Excel文件异常请检查");
}
return resultMap;
}
public static Map readXLSXExcel(InputStream inputStream, Class obj) {
return readXLSXExcel(inputStream, obj, 0);
}
public static Map readXLSXExcel(InputStream inputStream, Class obj, int abandonFields) {
Map resultMap = new HashMap();
List dataList = new ArrayList();
try {
XSSFWorkbook xssfWorkbook = new XSSFWorkbook(inputStream);
XSSFSheet sheet = xssfWorkbook.getSheetAt(0);
int totalRowNums = sheet.getPhysicalNumberOfRows();
//从第二行开始读（第一行是表头）
for (int i = 1; i < totalRowNums; i++) {
Row row = sheet.getRow(i);
if (row == null) {
totalRowNums++;
continue;
}
Object instance = obj.newInstance();
Field[] fields = obj.getDeclaredFields();
for (int j = 0; j < fields.length - abandonFields; j++) {
Field field = fields[j];
field.setAccessible(true);
Cell cell = row.getCell(j);
if (cell == null) {
continue;
}
cell.setCellType(Cell.CELL_TYPE_STRING);
String cellValue = cell.getStringCellValue();
field.set(instance, cellValue);
}
dataList.add(instance);
resultMap.put("dataList", dataList);
resultMap.put("totalRowNums", totalRowNums);
}
} catch (Exception e) {
throw new ApiException(201, "读取Excel文件异常请检查");
}
return resultMap;
}
public static HSSFWorkbook exportData(List<HnRygxExport> dataList){
// 生成xlsx的Excel
HSSFWorkbook workbook = new HSSFWorkbook();
// 生成Sheet表，写入第一行的列头
Sheet sheet = buildDataSheet(workbook);
//构建每行的数据内容
int rowNum = 1;
for (HnRygxExport data : dataList) {
if (data == null) {
continue;
}
//输出行数据
Row row = sheet.createRow(rowNum++);
convertDataToRow(data, row);
}
return workbook;
}
/**
* 生成sheet表，并写入第一行数据（列头）
* @param workbook 工作簿对象
* @return 已经写入列头的Sheet
*/
private static Sheet buildDataSheet(Workbook workbook) {
List<String> cell_heads = new ArrayList<>();
cell_heads.add("标签");
cell_heads.add("标识");
cell_heads.add("姓名");
cell_heads.add("性别");
cell_heads.add("民族");
// cell_heads.add("年龄");
cell_heads.add("身份证号");
cell_heads.add("背景");
cell_heads.add("综合评分");
cell_heads.add("关系");
/*
cell_heads.add("出生日期");
cell_heads.add("服务处所");
cell_heads.add("出生地国家");
cell_heads.add("出生地");
cell_heads.add("籍贯");
cell_heads.add("职业");
cell_heads.add("户籍登记地址");
cell_heads.add("姓名注音");*/
Sheet sheet = workbook.createSheet();
// 设置列头宽度
for (int i=0; i<cell_heads.size(); i++) {
sheet.setColumnWidth(i, 4000);
}
// 设置默认行高
sheet.setDefaultRowHeight((short) 400);
// 写入第一行各列的数据
Row head = sheet.createRow(0);
for (int i = 0; i < cell_heads.size(); i++) {
Cell cell = head.createCell(i);
cell.setCellValue(cell_heads.get(i));
}
return sheet;
}
/**
* 将数据转换成行
* @param data 源数据
* @param row 行对象
* @return
*/
private static void convertDataToRow(HnRygxExport data, Row row){
int cellNum = 0;
Cell cell;
//标签
cell = row.createCell(cellNum++);
cell.setCellValue(StringUtils.isBlank(data.getDescription()) ? "" : data.getDescription());
//标识
cell = row.createCell(cellNum++);
cell.setCellValue(StringUtils.isBlank(data.getName()) ? "" : data.getName());
//姓名
cell = row.createCell(cellNum++);
cell.setCellValue(StringUtils.isBlank(data.getXm()) ? "" : data.getXm());
//性别
cell = row.createCell(cellNum++);
cell.setCellValue(StringUtils.isBlank(data.getXb()) ? "" : data.getXb());
//民族
cell = row.createCell(cellNum++);
cell.setCellValue(StringUtils.isBlank(data.getMz()) ? "" : data.getMz());
//身份证号
cell = row.createCell(cellNum++);
cell.setCellValue(StringUtils.isBlank(data.getSfzh()) ? "" : data.getSfzh());
//背景
cell = row.createCell(cellNum++);
cell.setCellValue(StringUtils.isBlank(data.getBj()) ? "" : data.getBj());
//综合评分
cell = row.createCell(cellNum++);
cell.setCellValue(StringUtils.isBlank(data.getZhpf()) ? "" : data.getZhpf());
//Value
cell = row.createCell(cellNum++);
cell.setCellValue(StringUtils.isBlank(data.getValue()) ? "" : data.getValue());
/*//服务处所
cell = row.createCell(cellNum++);
cell.setCellValue(StringUtils.isBlank(data.getFwcs()) ? "" : data.getFwcs());
//出生地国家
cell = row.createCell(cellNum++);
cell.setCellValue(StringUtils.isBlank(data.getCsdgj()) ? "" : data.getCsdgj());
//出生地
cell = row.createCell(cellNum++);
cell.setCellValue(StringUtils.isBlank(data.getCsd()) ? "" : data.getCsd());
//籍贯
cell = row.createCell(cellNum++);
cell.setCellValue(StringUtils.isBlank(data.getJg()) ? "" : data.getJg());
//职业
cell = row.createCell(cellNum++);
cell.setCellValue(StringUtils.isBlank(data.getZy()) ? "" : data.getZy());
//户籍登记地址
cell = row.createCell(cellNum++);
cell.setCellValue(StringUtils.isBlank(data.getHjdjdz()) ? "" : data.getHjdjdz());
//姓名拼音
cell = row.createCell(cellNum++);
cell.setCellValue(StringUtils.isBlank(data.getXmpy()) ? "" : data.getXmpy());*/
}
}
common/service_base/src/main/java/com/founder/servicebase/controller/SkServiceApplyController.java
......@@ -6,10 +6,12 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.api.ApiController;
import com.founder.commonutils.model.newPublicEntity.MapRestResult;
import com.founder.commonutils.model.newPublicEntity.SkService;
import com.founder.commonutils.model.newPublicEntity.SkServiceApply;
import com.founder.commonutils.model.newPublicEntity.ThirdToken;
import com.founder.commonutils.model.vo.param.SkServiceApplyParam;
import com.founder.commonutils.model.vo.response.SkServiceApplyVO;
import com.founder.commonutils.util.ExportExcelUtil;
import com.founder.commonutils.util.JwtUser;
import com.founder.commonutils.util.KeyUtil;
import com.founder.servicebase.logs.OperLog;
......@@ -25,6 +27,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.Date;
import java.util.List;
......@@ -159,6 +162,36 @@ public class SkServiceApplyController extends ApiController {
return new MapRestResult(200, "OK", count, list);
}
/**
* 服务授权列表信息导出
*/
@PostMapping("export")
@ApiOperation(value = "服务授权列表信息导出")
@OperLog(message = "服务授权列表信息导出", operation = OperationType.QUERY)
public void export(HttpServletResponse response, @RequestBody SkServiceApplyParam skRegionalsDetailParam) throws Exception {
QueryWrapper queryWrapper = new QueryWrapper<>();
if (skRegionalsDetailParam.getServicename()!=null&& !skRegionalsDetailParam.getServicename().equals("")){
queryWrapper.like("servicename",skRegionalsDetailParam.getServicename());
}
if (skRegionalsDetailParam.getServicems()!=null&& !skRegionalsDetailParam.getServicems().equals("")){
queryWrapper.like("servicems",skRegionalsDetailParam.getServicems());
}
if (skRegionalsDetailParam.getApplygs()!=null&& !skRegionalsDetailParam.getApplygs().equals("")){
queryWrapper.like("applygs",skRegionalsDetailParam.getApplygs());
}
if (skRegionalsDetailParam.getApplyurl()!=null&& !skRegionalsDetailParam.getApplyurl().equals("")){
queryWrapper.like("applyurl",skRegionalsDetailParam.getApplyurl());
}
queryWrapper.orderByDesc("sqsj");
List list = skServiceApplyService.list(queryWrapper);
ExportExcelUtil<SkService> exportExcelUtil = new ExportExcelUtil<>();
String[] headersName = {"服务名称","服务描述","申请公司","申请ip","申请时效","token值","备注"};
String[] headersField = {"servicename","servicems","applygs","applyurl","time","token","content"};
exportExcelUtil.exportExcel("DataStatistics", headersName, headersField, list, response,"服务授权列表信息");
}
}
common/service_base/src/main/java/com/founder/servicebase/controller/SkServiceController.java
......@@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.founder.commonutils.model.newPublicEntity.MapRestResult;
import com.founder.commonutils.model.newPublicEntity.SkService;
import com.founder.commonutils.model.vo.param.SkServiceParam;
import com.founder.commonutils.util.ExcelUtil;
import com.founder.commonutils.util.ExportExcelUtil;
import com.founder.commonutils.util.KeyUtil;
import com.founder.servicebase.logs.OperLog;
import com.founder.servicebase.logs.OperationType;
......@@ -19,10 +21,14 @@ 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 org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.Date;
import java.util.List;
import java.util.Map;
/**
* 服务列表(SkService)表控制层
......@@ -60,8 +66,48 @@ public class SkServiceController extends ApiController {
return new MapRestResult().error("保存失败");
}
}
/**
* excel新增服务信息
*/
@PostMapping("excelsave")
@ApiOperation(value = "excel新增服务信息")
@OperLog(message = "excel新增服务信息", operation = OperationType.ADD)
public MapRestResult excelsave( MultipartFile file) {
List<SkService> list = readExcel(file);
for (SkService sk : list) {
sk.setXxzjbh(KeyUtil.getUUIDKey("FW"));
sk.setCjsj(new Date());
sk.setServicetypename(skDictionaryService.findDmmcByDmAndDmlx(sk.getServicetype(),"ZF"));
skServiceService.save(sk);
}
return new MapRestResult();
}
/**
* 读取Excel表数据
*/
public List<SkService> readExcel(MultipartFile file) {
List resultList = null;
int abandonFields = 7;
try {
String filename = file.getOriginalFilename();
String postfix = filename.substring(filename.lastIndexOf(".") + 1);
//根据Excel文件后缀读取数据
if (postfix.equals("xls")) {
Map xlsExcelMap = ExcelUtil.readXLSExcel(file.getInputStream(), SkService.class, abandonFields);
resultList = (List) xlsExcelMap.get("dataList");
} else {
Map xlsxExcelMap = ExcelUtil.readXLSXExcel(file.getInputStream(), SkService.class, abandonFields);
resultList = (List) xlsxExcelMap.get("dataList");
}
} catch (Exception e) {
e.printStackTrace();
}
return resultList;
}
/**
* 修改服务信息
*/
@PostMapping("update")
......@@ -140,7 +186,32 @@ public class SkServiceController extends ApiController {
}
/**
* 服务列表信息导出
*/
@PostMapping("export")
@ApiOperation(value = "服务列表信息导出")
@OperLog(message = "服务列表信息导出", operation = OperationType.QUERY)
public void export(HttpServletResponse response, @RequestBody SkServiceParam skRegionalsDetailParam) throws Exception {
QueryWrapper queryWrapper = new QueryWrapper();
if (skRegionalsDetailParam.getName()!=null&& !skRegionalsDetailParam.getName().equals("")){
queryWrapper.like("serviceName",skRegionalsDetailParam.getName());
}
if (skRegionalsDetailParam.getDes()!=null&& !skRegionalsDetailParam.getDes().equals("")){
queryWrapper.like("serviceMs",skRegionalsDetailParam.getDes());
}
queryWrapper.eq("isDeleted", "0");
queryWrapper.orderByDesc("cjsj");
List list = skServiceService.list(queryWrapper);
ExportExcelUtil<SkService> exportExcelUtil = new ExportExcelUtil<>();
String[] headersName = {"服务id","服务名称","服务地址","服务描述","请求方式","请求参数","返回类型","返回参数","创建时间","状态"};
String[] headersField = {"xxzjbh","servicename","serviceurl","servicems","type","params","contenttype","content","cjsj","flag"};
exportExcelUtil.exportExcel("DataStatistics", headersName, headersField, list, response,"服务列表信息");
}
}
common/service_base/src/main/java/com/founder/servicebase/logs/controller/SkSysLogController.java
......@@ -4,7 +4,9 @@ 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.model.newPublicEntity.MapRestResult;
import com.founder.commonutils.model.newPublicEntity.SkService;
import com.founder.commonutils.util.DateUtil;
import com.founder.commonutils.util.ExportExcelUtil;
import com.founder.commonutils.util.StringUtil;
import com.founder.servicebase.logs.LogMoudleCount;
import com.founder.servicebase.logs.OperLog;
......@@ -20,6 +22,7 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletResponse;
import java.io.UnsupportedEncodingException;
import java.text.ParseException;
import java.text.SimpleDateFormat;
......@@ -46,10 +49,18 @@ public class SkSysLogController {
public MapRestResult query(@RequestBody LogParam logParam) throws ParseException, UnsupportedEncodingException {
QueryWrapper queryWrapper = new QueryWrapper();
SimpleDateFormat simpleDateFormat=new SimpleDateFormat("yyyy-MM-dd");
if (logParam.getLx() != null && !logParam.getLx().equals("")) {
queryWrapper.eq("lx", logParam.getLx());
}
if (logParam.getIp() != null && !logParam.getIp().equals("")) {
queryWrapper.like("ip", logParam.getIp());
}
if (logParam.getUrl() != null && !logParam.getUrl().equals("")) {
queryWrapper.like("url", logParam.getUrl());
}
if (logParam.getUserId() != null && !logParam.getUserId().equals("")) {
queryWrapper.eq("userId", logParam.getUserId());
}
......@@ -80,7 +91,46 @@ public class SkSysLogController {
return new MapRestResult(200, "OK", page1.getTotal(), newList);
}
@ApiOperation(value = "日志列表导出")
@OperLog(message = "日志列表导出", operation = OperationType.QUERY)
@PostMapping("export")
public void export(HttpServletResponse response, @RequestBody LogParam logParam) throws Exception {
QueryWrapper queryWrapper = new QueryWrapper();
SimpleDateFormat simpleDateFormat=new SimpleDateFormat("yyyy-MM-dd");
if (logParam.getLx() != null && !logParam.getLx().equals("")) {
queryWrapper.eq("lx", logParam.getLx());
}
if (logParam.getIp() != null && !logParam.getIp().equals("")) {
queryWrapper.like("ip", logParam.getIp());
}
if (logParam.getUrl() != null && !logParam.getUrl().equals("")) {
queryWrapper.like("url", logParam.getUrl());
}
if (logParam.getUserId() != null && !logParam.getUserId().equals("")) {
queryWrapper.like("userId", logParam.getUserId());
}
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.getMessage() != null && !logParam.getMessage().equals("")) {
queryWrapper.like("message", logParam.getMessage());
}
queryWrapper.orderByDesc("createDate");
List list = service.list(queryWrapper);
ExportExcelUtil<SkService> exportExcelUtil = new ExportExcelUtil<>();
String[] headersName = {"用户id","方法名","ip","请求url","传入参数","返回参数","响应时长","访问时间"};
String[] headersField = {"id","method","ip","url","params","content","totaltime","createdate"};
exportExcelUtil.exportExcel("DataStatistics", headersName, headersField, list, response,"日志列表信息");
}
@PostMapping("countTotal")
public MapRestResult countTotal(@RequestBody LogCountParam param) throws ParseException {
return new MapRestResult(service.countTotal(param));
......
common/service_base/src/main/java/com/founder/servicebase/logs/mapper/mysqlMapper/SkSysLogMapper.xml
......@@ -42,7 +42,7 @@
<select id="countThreeUserId" resultType="com.founder.servicebase.logs.LogMoudleCount" parameterType="com.founder.servicebase.logs.param.LogCountParam">
select COUNT(*) as count,userId as moudle from sk_sys_log
where userId like '%第三方%'
where lx = '2'
<if test="startTime!=null and startTime!='' ">
and str_to_date(#{startTime},'%Y-%m-%d') <![CDATA[ <= ]]> date_format(createDate,'%Y-%m-%d')
</if>
......
common/service_base/src/main/java/com/founder/servicebase/logs/param/LogParam.java
......@@ -27,6 +27,14 @@ public class LogParam {
*/
private String ip;
/**
* 请求url
*/
private String url;
/**
* 类型
*/
private String lx;
/**
* 开始时间
*/
private String startTime;
......
service/publicapi/src/main/java/com/founder/publicapi/controller/SkDataOperation/SkServiceSqController.java
......@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.founder.commonutils.model.newPublicEntity.SkService;
import com.founder.commonutils.model.newPublicEntity.MapRestResult;
import com.founder.commonutils.model.vo.param.SkServiceParam;
import com.founder.commonutils.util.ExportExcelUtil;
import com.founder.servicebase.logs.OperLog;
import com.founder.servicebase.logs.OperationType;
import com.founder.servicebase.service.SkDictionaryService;
......@@ -19,6 +20,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
/**
* 服务申请controller层
......@@ -66,7 +69,34 @@ public class SkServiceSqController {
return new MapRestResult(200, "OK", page1.getTotal(), page1.getRecords());
}
/**
* 服务申请列表信息导出
*/
@PostMapping("export")
@ApiOperation(value = "服务申请列表信息导出")
@OperLog(message = "服务申请列表信息导出", operation = OperationType.QUERY)
public void export(HttpServletResponse response, @RequestBody SkServiceParam skRegionalsDetailParam) throws Exception {
QueryWrapper queryWrapper = new QueryWrapper();
if (skRegionalsDetailParam.getName()!=null&& !skRegionalsDetailParam.getName().equals("")){
queryWrapper.like("serviceName",skRegionalsDetailParam.getName());
}
if (skRegionalsDetailParam.getDes()!=null&& !skRegionalsDetailParam.getDes().equals("")){
queryWrapper.like("serviceMs",skRegionalsDetailParam.getDes());
}
queryWrapper.eq("isDeleted", "0");
queryWrapper.eq("flag","1");
queryWrapper.orderByDesc("cjsj");
List list = skServiceService.list(queryWrapper);
ExportExcelUtil<SkService> exportExcelUtil = new ExportExcelUtil<>();
String[] headersName = {"服务id","服务名称","服务地址","服务描述","请求方式","请求参数","返回类型","返回参数","创建时间"};
String[] headersField = {"xxzjbh","servicename","serviceurl","servicems","type","params","contenttype","content","cjsj"};
exportExcelUtil.exportExcel("DataStatistics", headersName, headersField, list, response,"服务申请列表信息");
}
@PostMapping("updateFlag")
@ApiOperation(value = "更新服务列表展示状态")
......
service/publicapi/src/main/java/com/founder/publicapi/controller/SkypDesktop/SkypDesktopController.java
......@@ -5,8 +5,10 @@ import com.founder.commonutils.model.newPublicEntity.MapRestResult;
import com.founder.commonutils.model.newPublicEntity.SkypDesktopEntity.SkMenu;
import com.founder.commonutils.model.newPublicEntity.SkypDesktopEntity.SkSchedule;
import com.founder.commonutils.util.Base64Util;
import com.founder.commonutils.util.KeyUtil;
import com.founder.commonutils.util.KeyUtilNaotu;
import com.founder.commonutils.util.StringUtil;
import com.founder.publicapi.controller.SkDataUpload.FtpUtil;
import com.founder.publicapi.mapper.mysqlMapper.SkMenuMapper;
import com.founder.publicapi.mapper.mysqlMapper.SkScheduleMapper;
import com.founder.servicebase.logs.OperLog;
......@@ -14,20 +16,21 @@ import com.founder.servicebase.logs.OperationType;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.ObjectUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import java.io.IOException;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;
import java.util.stream.Stream;
@RestController
@RequestMapping("/desktop")
@Api(tags = "时空桌面")
public class SkypDesktopController {
@Value("${imagesUrl}")
public String imagesUrl;
@Autowired
SkMenuMapper skMenuMapper;
@Autowired
......@@ -41,7 +44,7 @@ public class SkypDesktopController {
@PostMapping("menuAdd")
@ApiOperation(value = "时空桌面菜单新增")
@OperLog(message = "时空桌面菜单新增", operation = OperationType.ADD)
public MapRestResult menuAdd( SkMenu skMenu , MultipartFile[] photoFile ) throws IOException {
public MapRestResult menuAdd( SkMenu skMenu , MultipartFile photoFile ) throws IOException {
QueryWrapper wrapper = new QueryWrapper();
wrapper.eq(!StringUtil.isEmpty(skMenu.getMenu()),"menu", skMenu.getMenu());
wrapper.eq("isDeleted","0");
......@@ -49,13 +52,17 @@ public class SkypDesktopController {
if (count!=0){
return new MapRestResult(200,"已经存在该菜单名称",null);
}else {
if(photoFile==null){
if (photoFile != null) {
// 上传图片后缀
String type = photoFile.getOriginalFilename().substring(photoFile.getOriginalFilename().lastIndexOf("."));
String far = KeyUtil.getUUIDKey("p")+type;
skMenu.setPhoto(imagesUrl+far);
// 上传图片到服务器
FtpUtil.uploadFile(far,photoFile.getInputStream());
}else {
return new MapRestResult(200,"请上传菜单图片",null);
}
skMenu.setState("1");// 桌面
for (MultipartFile file : photoFile) {
skMenu.setPhoto("data:image/jpg;base64,"+Base64Util.getBase64(file));
}
skMenu.setDjsj(nowTime());
skMenu.setGxsj(nowTime());
String xxzjbh = KeyUtilNaotu.getJzKey("me");
......@@ -69,6 +76,7 @@ public class SkypDesktopController {
}
}
}
/**
* 时空桌面菜单删除
* @return
......@@ -78,12 +86,16 @@ public class SkypDesktopController {
@OperLog(message = "时空桌面菜单删除", operation = OperationType.DELETE)
public MapRestResult menuDelete(@RequestBody SkMenu skMenu){
SkMenu byId = skMenuMapper.selectById(skMenu.getXxzjbh());
byId.setIsDeleted("1");
if (byId!=null){
byId.setIsDeleted("1");
}else {
return new MapRestResult(200,"删除失败,没有该菜单",null);
}
int i = skMenuMapper.updateById(byId);
if (i > 0){
return new MapRestResult();
if ( i > 0 ){
return new MapRestResult(200,"删除成功",null);
}else {
return new MapRestResult().error();
return new MapRestResult(200,"删除失败,没有该菜单",null);
}
}
......@@ -96,10 +108,14 @@ public class SkypDesktopController {
@OperLog(message = "时空桌面菜单修改", operation = OperationType.UPDATE)
public MapRestResult menuUpdate( SkMenu skMenu, @RequestParam(required = false) MultipartFile photoFile ) throws IOException {
if (photoFile!=null){
skMenu.setPhoto("data:image/jpg;base64,"+Base64Util.getBase64(photoFile));
if (photoFile != null) {
// 上传图片后缀
String type = photoFile.getOriginalFilename().substring(photoFile.getOriginalFilename().lastIndexOf("."));
String far = KeyUtil.getUUIDKey("p")+type;
skMenu.setPhoto(imagesUrl+far);
// 上传图片到服务器
FtpUtil.uploadFile(far,photoFile.getInputStream());
}
skMenu.setGxsj(nowTime());
int i = skMenuMapper.updateById(skMenu);
if (i > 0 ){
......@@ -118,44 +134,20 @@ public class SkypDesktopController {
@OperLog(message = "时空桌面菜单查询", operation = OperationType.QUERY)
public MapRestResult menuQuery(@RequestBody SkMenu skMenu){
String zjhm = skMenu.getZjhm();
if (StringUtil.isEmpty(zjhm)){
return new MapRestResult(200,"zjhm为空",null);
}
Map<Object, Object> map = new HashMap<>();
/* // 十个固定的
QueryWrapper wrapper2 = new QueryWrapper<>();
wrapper2.eq(!StringUtil.isEmpty(zjhm),"zjhm", zjhm);
wrapper2.eq("isDeleted","0");
wrapper2.eq("isFixedMenu","1");
List list2 = skMenuMapper.selectList(wrapper2);*/
// 新增的
QueryWrapper wrapper = new QueryWrapper<>();
wrapper.eq(!StringUtil.isEmpty(zjhm),"zjhm", zjhm);
wrapper.eq("isDeleted","0");
// wrapper.eq("state","1");
List list = skMenuMapper.selectList(wrapper);
/*
// 移入的
QueryWrapper wrapper3 = new QueryWrapper<>();
wrapper3.eq(!StringUtil.isEmpty(zjhm),"zjhm", zjhm);
wrapper3.eq("isDeleted","0");
wrapper3.eq("state","2");
List list3 = skMenuMapper.selectList(wrapper3);*/
/* List<Object> collect = Stream.of(list2, list)
.flatMap(Collection::stream)
.distinct()
.collect(Collectors.toList());*/
List<SkMenu> list = skMenuMapper.selectList(wrapper);
map.put("桌面",list);
//查询移入的
QueryWrapper wrapper1 = new QueryWrapper<>();
wrapper1.eq(!StringUtil.isEmpty(zjhm),"zjhm", zjhm);
wrapper1.eq("isDeleted","0");
wrapper1.eq("state","2");
List list1 = skMenuMapper.selectList(wrapper1);
List<SkMenu> list1 = list.stream().filter(s -> (s.getState().equals("2"))).collect(Collectors.toList());
map.put("移入",list1);
return new MapRestResult(200,"ok",map.size(),map);
......@@ -238,12 +230,17 @@ public class SkypDesktopController {
@OperLog(message = "时空桌面日程删除", operation = OperationType.DELETE)
public MapRestResult scheduleDelete(@RequestBody SkSchedule skSchedule){
SkSchedule byId = skScheduleMapper.selectById(skSchedule.getXxzjbh());
if (byId!=null){
byId.setIsDeleted("1");
}else {
return new MapRestResult(200,"删除失败,没有该日程",null);
}
byId.setIsDeleted("1");
int i = skScheduleMapper.updateById(byId);
if ( i > 0 ){
return new MapRestResult(200,"删除成功",null);
}else {
return new MapRestResult().error();
return new MapRestResult(200,"删除失败,没有该日程",null);
}
}
......
service/publicapi/src/main/resources/bootstrap-dev.properties
......@@ -45,10 +45,11 @@ port=54322
#FTP\uFFFD\uFFFD\u00BC\uFFFD\u02FA\uFFFD
usernameFtp=root
#FTP\uFFFD\uFFFD\u00BC\uFFFD\uFFFD\uFFFD\uFFFD
password=Cc150520
#FTP\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u013F\u00BC,/data2/images
basePath=/data2/images
imagesUrl=http://65.26.2.173:1008/images/
password=ENC(z+abBc/QcZelKfpAFXXeSwRBOcUjidsu)
#FTP\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u013F\u00BC,/data/images #\u65F6\u7A7A\u684C\u9762\u56FE\u6807\u8DEF\u5F84
basePath=/data/images
imagesUrl=http://47.92.48.137:1008/images/
#mongodb\uFFFD\uFFFD\uFFFD\uFFFD
spring.data.mongodb.primary=mongodb://localhost:27017/whale
......
service/publicapi/src/main/resources/bootstrap-prod.properties
......@@ -45,10 +45,10 @@ port=2233
#FTP\u767B\u5F55\u8D26\u53F7
usernameFtp=root
#FTP\u767B\u5F55\u5BC6\u7801
password=Hnsgat12#$1
#FTP\u670D\u52A1\u5668\u57FA\u7840\u76EE\u5F55,/data2/images
basePath=/data/hnxz/images
imagesUrl=http://65.26.2.173:1008/images/
password=password=ENC(z+abBc/QcZelKfpAFXXeSwRBOcUjidsu)
#FTP\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u013F\u00BC,/data/images #\u65F6\u7A7A\u684C\u9762\u56FE\u6807\u8DEF\u5F84
basePath=/data/images
imagesUrl=http://47.92.48.137:1008/images/
#mongodb\u914D\u7F6E \u8F66\u4E3B
spring.data.mongodb.primary.uri=mongodb://fz:wc%40thailand@155.1.11.212:28001/whale
#mongodb\u914D\u7F6E \u673A\u4E3B
......
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