From c1e1cec83669bc2a70eb460c928496deef027305 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期四, 10 十一月 2022 14:23:36 +0800
Subject: [PATCH] 1.获取天气接口 2.搜索bug 3.小程序工单管理Bug
---
flower_city/src/main/java/com/dg/core/util/TestDate.java | 25 +++++
flower_city/src/main/java/com/dg/core/api/GuideRepairOrderAppletsController.java | 10 +
flower_city/src/main/resources/mapper/TransactionEventMapper.xml | 2
flower_city/src/main/java/com/dg/core/controller/CommonController.java | 217 ++++++++++++++++++++++--------------------
flower_city/src/main/java/com/dg/core/controller/RoleManagementController.java | 1
5 files changed, 145 insertions(+), 110 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/api/GuideRepairOrderAppletsController.java b/flower_city/src/main/java/com/dg/core/api/GuideRepairOrderAppletsController.java
index 6c012c3..3301408 100644
--- a/flower_city/src/main/java/com/dg/core/api/GuideRepairOrderAppletsController.java
+++ b/flower_city/src/main/java/com/dg/core/api/GuideRepairOrderAppletsController.java
@@ -27,6 +27,7 @@
import javax.annotation.Resource;
import java.time.LocalDateTime;
+import java.util.ArrayList;
import java.util.List;
@@ -328,14 +329,15 @@
{
List<String> ids=null;
String userId=null;
- if(StringUtils.equals("1",sysUser.getIsDivisionHead()))
+ if( StringUtils.equals("2",sysUser.getRoleIds()))
{
- userId=null;
- ids= PermissionUtil.getPermission(sysUser,iOrganizationChartService);
+ userId=sysUser.getUserId()+"";
+ ids=new ArrayList<>();
+ ids.add(sysUser.getDepartmentId());
}
else
{
- userId=sysUser.getUserId()+"";
+ ids=PermissionUtil.getPermission(sysUser,iOrganizationChartService);
}
List<GuideRepairOrder> list = iGuideRepairOrderService.selectConfigList(null,ids,status,userId,null,null,null);
int num=iGuideRepairOrderService.countConfigList(null,ids,status,userId);
diff --git a/flower_city/src/main/java/com/dg/core/controller/CommonController.java b/flower_city/src/main/java/com/dg/core/controller/CommonController.java
index 8f80eb0..12fa193 100644
--- a/flower_city/src/main/java/com/dg/core/controller/CommonController.java
+++ b/flower_city/src/main/java/com/dg/core/controller/CommonController.java
@@ -24,10 +24,7 @@
import javax.annotation.Resource;
import java.io.InputStream;
import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.UUID;
+import java.util.*;
import static com.dg.core.file.FileTypeUploadUtils.assertAllowed;
@@ -37,127 +34,139 @@
@RequestMapping("/common")
public class CommonController extends BaseController {
- private static final String FILE_DELIMETER = ",";
+ private static final String FILE_DELIMETER = ",";
- @Autowired
- private CorsConfig corsConfig;
+ @Autowired
+ private CorsConfig corsConfig;
-
- // FTP 登录用户名
- @Value("${ftp.username}")
- private String userName;
- // FTP 登录密码
- @Value("${ftp.password}")
- private String password;
- // FTP 服务器地址IP地址
- @Value("${ftp.host}")
- private String host;
- // FTP 端口
- @Value("${ftp.port}")
- private int port;
- @Value("${ftp.url}")
- private String url;
+ // FTP 登录用户名
+ @Value("${ftp.username}")
+ private String userName;
+ // FTP 登录密码
+ @Value("${ftp.password}")
+ private String password;
+ // FTP 服务器地址IP地址
+ @Value("${ftp.host}")
+ private String host;
+ // FTP 端口
+ @Value("${ftp.port}")
+ private int port;
+ @Value("${ftp.url}")
+ private String url;
- @RequestMapping("/hello")
+ @RequestMapping("/hello")
// @Authorization
- public ResponseEntity<String> hello() {
- return ResponseEntity.ok("hello world");
- }
-
-
- /**
- * 通用上传请求（多个）
- */
- @ApiOperation("文件上传接口（通用）")
- @PostMapping("/uploads")
- public ResultData uploadFiles(List<MultipartFile> files) throws Exception
- {
- List<String> urls = new ArrayList<String>();
- List<String> fileNames = new ArrayList<String>();
- List<String> originalFilenames = new ArrayList<String>();
- for (MultipartFile file : files) {
- String extension = FilenameUtils.getExtension(file.getOriginalFilename());
- String name = UUID.randomUUID().toString().replaceAll("-", "") + "." + extension;
- try {
- assertAllowed(file, MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION);
- SFTPUtil sftp = new SFTPUtil(userName, password, host, port);
- sftp.login();
- InputStream is = file.getInputStream();
- sftp.uploadMore(FtpConstants.FTPFILEPATH_IDCARD, name, is);
- sftp.logout();
-
- urls.add(url + "/idcard/" + name);
- fileNames.add(name);
- originalFilenames.add(file.getOriginalFilename());
-
- } catch (Exception e) {
- return ResultData.error("上传文件失败 "+e.getMessage());
- }
+ public ResponseEntity<String> hello() {
+ return ResponseEntity.ok("hello world");
}
- AjaxResult ajax = new AjaxResult();
- ajax.put("urls", StringUtils.join(urls, FILE_DELIMETER));
- ajax.put("fileNames", StringUtils.join(fileNames, FILE_DELIMETER));
- ajax.put("originalFilenames", StringUtils.join(originalFilenames, FILE_DELIMETER));
- return ResultData.success(ajax);
-
- }
+ /**
+ * 通用上传请求（多个）
+ */
+ @ApiOperation("文件上传接口（通用）")
+ @PostMapping("/uploads")
+ public ResultData uploadFiles(List<MultipartFile> files) throws Exception {
+ List<String> urls = new ArrayList<String>();
+ List<String> fileNames = new ArrayList<String>();
+ List<String> originalFilenames = new ArrayList<String>();
+ for (MultipartFile file : files) {
+ String extension = FilenameUtils.getExtension(file.getOriginalFilename());
+ String name = UUID.randomUUID().toString().replaceAll("-", "") + "." + extension;
+ try {
+ assertAllowed(file, MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION);
+ SFTPUtil sftp = new SFTPUtil(userName, password, host, port);
+ sftp.login();
+ InputStream is = file.getInputStream();
+ sftp.uploadMore(FtpConstants.FTPFILEPATH_IDCARD, name, is);
+ sftp.logout();
- /**
- * 通用上传请求（单个）
- */
- @ApiOperation("文件上传接口（通用）")
- @PostMapping("/upload")
- public ResultData uploadFile(MultipartFile file) throws Exception
- {
- List<String> urls = new ArrayList<String>();
- List<String> fileNames = new ArrayList<String>();
- List<String> originalFilenames = new ArrayList<String>();
+ urls.add(url + "/idcard/" + name);
+ fileNames.add(name);
+ originalFilenames.add(file.getOriginalFilename());
- String extension = FilenameUtils.getExtension(file.getOriginalFilename());
- String name = UUID.randomUUID().toString().replaceAll("-", "") + "." + extension;
- try {
- assertAllowed(file, MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION);
- SFTPUtil sftp = new SFTPUtil(userName, password, host, port);
- sftp.login();
- InputStream is = file.getInputStream();
- sftp.uploadMore(FtpConstants.FTPFILEPATH_IDCARD, name, is);
- sftp.logout();
+ } catch (Exception e) {
+ return ResultData.error("上传文件失败 " + e.getMessage());
+ }
+ }
+ AjaxResult ajax = new AjaxResult();
+ ajax.put("urls", StringUtils.join(urls, FILE_DELIMETER));
+ ajax.put("fileNames", StringUtils.join(fileNames, FILE_DELIMETER));
+ ajax.put("originalFilenames", StringUtils.join(originalFilenames, FILE_DELIMETER));
+ return ResultData.success(ajax);
+
+ }
+
+
+ /**
+ * 通用上传请求（单个）
+ */
+ @ApiOperation("文件上传接口（通用）")
+ @PostMapping("/upload")
+ public ResultData uploadFile(MultipartFile file) throws Exception {
+ List<String> urls = new ArrayList<String>();
+ List<String> fileNames = new ArrayList<String>();
+ List<String> originalFilenames = new ArrayList<String>();
+
+ String extension = FilenameUtils.getExtension(file.getOriginalFilename());
+ String name = UUID.randomUUID().toString().replaceAll("-", "") + "." + extension;
+ try {
+ assertAllowed(file, MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION);
+ SFTPUtil sftp = new SFTPUtil(userName, password, host, port);
+ sftp.login();
+ InputStream is = file.getInputStream();
+ sftp.uploadMore(FtpConstants.FTPFILEPATH_IDCARD, name, is);
+ sftp.logout();
// urls.add(url + "/idcard/" + name);
// fileNames.add(name);
// originalFilenames.add(file.getOriginalFilename());
- return ResultData.success(url + "/idcard/" + name);
- } catch (Exception e) {
- return ResultData.error("上传文件失败 "+e.getMessage());
- }
+ return ResultData.success(url + "/idcard/" + name);
+ } catch (Exception e) {
+ return ResultData.error("上传文件失败 " + e.getMessage());
+ }
// AjaxResult ajax = new AjaxResult();
// ajax.put("urls", StringUtils.join(urls, FILE_DELIMETER));
// ajax.put("fileNames", StringUtils.join(fileNames, FILE_DELIMETER));
// ajax.put("originalFilenames", StringUtils.join(originalFilenames, FILE_DELIMETER));
- }
+ }
- /**
- * 判断当前时间是否是工作日,格式为“2022-10-16”,不传默认为今天
- */
- @ApiOperation("判断当前时间是否是工作日,格式为“20221016”,不传默认为今天")
- @GetMapping("/isWeekday")
- public ResultData isWeekday(@RequestParam(value = "dateTime",required = false) String dateTime)
- {
- if (dateTime==null){
- Date date = new Date();
- SimpleDateFormat fmt = new SimpleDateFormat("yyyyMMdd");
- dateTime = fmt.format(date);
- }
- if (WorkUtils.isWorkendDay(dateTime))
- return success("休息日或者周末");
- else
- return success("工作日");
- }
+ /**
+ * 判断当前时间是否是工作日,格式为“2022-10-16”,不传默认为今天
+ */
+ @ApiOperation("判断当前时间是否是工作日,格式为“20221016”,不传默认为今天")
+ @GetMapping("/isWeekday")
+ public ResultData isWeekday(@RequestParam(value = "dateTime", required = false) String dateTime) {
+ if (dateTime == null) {
+ Date date = new Date();
+ SimpleDateFormat fmt = new SimpleDateFormat("yyyyMMdd");
+ dateTime = fmt.format(date);
+ }
+ if (WorkUtils.isWorkendDay(dateTime))
+ return success("休息日或者周末");
+ else
+ return success("工作日");
+ }
+
+
+ /**
+ * 获取天气默认为攀枝花
+ */
+ @ApiOperation("获取天气默认为攀枝花")
+ @GetMapping("/getWeather")
+ public ResultData getWeather(@RequestParam(value = "code", required = false) String code) {
+ TestDate td = new TestDate();
+ Map weather;
+ if (code == null) {
+ weather = td.getWeather("510400");
+ } else {
+ weather = td.getWeather(code);
+ }
+ return ResultData.success(weather);
+ }
}
diff --git a/flower_city/src/main/java/com/dg/core/controller/RoleManagementController.java b/flower_city/src/main/java/com/dg/core/controller/RoleManagementController.java
index 6b61c82..bcc1744 100644
--- a/flower_city/src/main/java/com/dg/core/controller/RoleManagementController.java
+++ b/flower_city/src/main/java/com/dg/core/controller/RoleManagementController.java
@@ -42,7 +42,6 @@
{
return getDataTable("分页不能为空");
}
-
if(pageSize==null)
{
return getDataTable("分页条数不能为空");
diff --git a/flower_city/src/main/java/com/dg/core/util/TestDate.java b/flower_city/src/main/java/com/dg/core/util/TestDate.java
index 1a13a9a..d166f08 100644
--- a/flower_city/src/main/java/com/dg/core/util/TestDate.java
+++ b/flower_city/src/main/java/com/dg/core/util/TestDate.java
@@ -87,6 +87,31 @@
}
/**
+ * 获取节假日不含周末
+ *
+ * @return
+ */
+ public Map getWeather(String code) {
+ String url = "https://restapi.amap.com/v3/weather/weatherInfo?key=9e0d819935da8a01de0e476ba8a9019e&city="+code;
+ OkHttpClient client = new OkHttpClient();
+ Response response;
+ //解密数据
+ String rsa = null;
+ Request request = new Request.Builder()
+ .url(url)
+ .get()
+ .addHeader("Content-Type", "application/x-www-form-urlencoded")
+ .build();
+ try {
+ response = client.newCall(request).execute();
+ rsa = response.body().string();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ return JSONObject.parseObject(rsa, Map.class);
+ }
+
+ /**
* 获取周末 月从0开始
*
* @param year
diff --git a/flower_city/src/main/resources/mapper/TransactionEventMapper.xml b/flower_city/src/main/resources/mapper/TransactionEventMapper.xml
index 7c7e976..11c314e 100644
--- a/flower_city/src/main/resources/mapper/TransactionEventMapper.xml
+++ b/flower_city/src/main/resources/mapper/TransactionEventMapper.xml
@@ -377,7 +377,7 @@
<include refid="selectTransactionEventEntityVo"/>
<where>
<if test="associateNames != null and associateNames != ''">
- AND (associate_names like concat('%', #{associateNames}, '%') or #{associateNames} like concat('%', associate_names, '%'))
+ AND (associate_names like concat('%', #{associateNames}, '%') )
</if>
<if test="classifyId != null and classifyId != ''">
and (classify_id= #{classifyId} or classify_id in (select id FROM automessage_classify_administration where parent_id =#{classifyId} ))
--
Gitblit v1.7.1