From addedb6e27a0eff756ff3cabdd7dd2295ade5414 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 30 Oct 2023 14:41:52 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb
---
screen-api/src/main/java/com/moral/api/service/impl/HistorySecondUavServiceImpl.java | 2
screen-api/src/main/java/com/moral/api/mapper/AllocationMapper.java | 4
screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java | 15 ++
screen-api/src/main/java/com/moral/api/service/AllocationService.java | 11 +
screen-api/src/main/java/com/moral/api/pojo/ext/allocation/AllocationPageExt.java | 4
screen-api/src/main/java/com/moral/api/pojo/query/app/AppAllocationFileCond.java | 31 +++++
screen-api/src/main/java/com/moral/api/pojo/vo/app/AppAllocationFindVo.java | 94 +++++++++++++++
screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java | 72 ++++++++++++
screen-api/src/main/java/com/moral/api/pojo/query/app/AppAllocationPageCond.java | 42 +++++++
screen-api/src/main/java/com/moral/api/controller/AppAllocationController.java | 32 +++++
screen-api/src/main/java/com/moral/api/utils/WechatUtils.java | 4
screen-api/src/main/java/com/moral/api/controller/AppUserController.java | 2
screen-api/src/main/java/com/moral/api/pojo/enums/FileTableEnum.java | 5
screen-api/src/main/resources/application-qa.yml | 2
screen-api/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java | 5
screen-api/src/main/resources/mapper/AllocationMapper.xml | 29 ++++
16 files changed, 345 insertions(+), 9 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/controller/AppAllocationController.java b/screen-api/src/main/java/com/moral/api/controller/AppAllocationController.java
index 02165ba..c75a0e4 100644
--- a/screen-api/src/main/java/com/moral/api/controller/AppAllocationController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/AppAllocationController.java
@@ -1,6 +1,16 @@
package com.moral.api.controller;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.google.common.collect.Lists;
+import com.moral.api.pojo.enums.AllocationApproveEnum;
+import com.moral.api.pojo.enums.AppAllocationStateEnum;
+import com.moral.api.pojo.ext.allocation.AllocationPageExt;
+import com.moral.api.pojo.query.app.AppAllocationFileCond;
+import com.moral.api.pojo.query.app.AppAllocationPageCond;
+import com.moral.api.pojo.vo.allocation.AllocationPageVo;
+import com.moral.api.pojo.vo.app.AppAllocationFindVo;
+import com.moral.constant.PageResult;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -13,6 +23,8 @@
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
+import java.util.Arrays;
+import java.util.Collections;
import java.util.List;
import javax.validation.Valid;
@@ -44,6 +56,26 @@
return ResultMessage.ok(ObjectUtils.isEmpty(allocationFindVos)? "0":allocationFindVos);
}
+ @PostMapping("/page")
+ @ApiOperation("���������������������")
+ public ResultMessage<PageResult<AppAllocationFindVo>> page(@Valid @RequestBody AppAllocationPageCond allocationPageCond){
+ Page<AllocationPageExt> allocationFindVos = allocationService.pageApp(allocationPageCond);
+ PageResult<AppAllocationFindVo> result = new PageResult<>(allocationFindVos);
+ result.setList(AppAllocationFindVo.convert(allocationFindVos.getRecords()));
+ return ResultMessage.ok(result);
+ }
+
+ public static void main(String[] args) {
+ List<String> list = Arrays.asList("aaa", "bbb","aaa");
+ System.out.println("num;" + Collections.frequency(list, "aaa"));
+ }
+
+ @PostMapping("appFile")
+ @ApiOperation("������������������or������")
+ public ResultMessage appFile(@Valid @RequestBody AppAllocationFileCond appAllocationFileCond){
+ allocationService.saveFile(appAllocationFileCond);
+ return ResultMessage.ok();
+ }
@PostMapping("changeRoutine")
@ApiOperation("���������������")
diff --git a/screen-api/src/main/java/com/moral/api/controller/AppUserController.java b/screen-api/src/main/java/com/moral/api/controller/AppUserController.java
index ffe52c1..0b70e52 100644
--- a/screen-api/src/main/java/com/moral/api/controller/AppUserController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/AppUserController.java
@@ -55,7 +55,7 @@
}
@GetMapping("/wx/exit")
- @ApiOperation(value = "���������������")
+ @ApiOperation(value = "���������������")
public ResultMessage updateUserId(@RequestParam @ApiParam(value = "userId",name = "������������") Integer userId) {
userService.updateUserId(userId);
return ResultMessage.ok();
diff --git a/screen-api/src/main/java/com/moral/api/mapper/AllocationMapper.java b/screen-api/src/main/java/com/moral/api/mapper/AllocationMapper.java
index 93544d2..51d6ef6 100644
--- a/screen-api/src/main/java/com/moral/api/mapper/AllocationMapper.java
+++ b/screen-api/src/main/java/com/moral/api/mapper/AllocationMapper.java
@@ -8,6 +8,7 @@
import com.moral.api.pojo.ext.allocation.AllocationPageExt;
import com.moral.api.pojo.query.allocation.AllocationListCond;
import com.moral.api.pojo.query.allocation.AllocationPageCond;
+import com.moral.api.pojo.query.app.AppAllocationPageCond;
import com.moral.api.pojo.vo.allocation.AllocationFindVo;
import org.apache.ibatis.annotations.Param;
@@ -25,6 +26,9 @@
Page<AllocationPageExt> extPage(Page page, @Param("allocation") AllocationPageCond allocationPageCond);
+
+ Page<AllocationPageExt> extAppPage(Page page, @Param("allocation") AppAllocationPageCond allocationPageCond);
+
/**
* ������������������
* @param allocationListCond
diff --git a/screen-api/src/main/java/com/moral/api/pojo/enums/FileTableEnum.java b/screen-api/src/main/java/com/moral/api/pojo/enums/FileTableEnum.java
index 7907409..ca9b0bf 100644
--- a/screen-api/src/main/java/com/moral/api/pojo/enums/FileTableEnum.java
+++ b/screen-api/src/main/java/com/moral/api/pojo/enums/FileTableEnum.java
@@ -37,6 +37,11 @@
*/
ALLOCATION_EXTENSION(1251701, "������������"),
+ /**
+ * ���������������
+ */
+ APP_ALLOCATION(1202401, "app������"),
+
;
@EnumValue
diff --git a/screen-api/src/main/java/com/moral/api/pojo/ext/allocation/AllocationPageExt.java b/screen-api/src/main/java/com/moral/api/pojo/ext/allocation/AllocationPageExt.java
index ec7aec1..3b4b5d2 100644
--- a/screen-api/src/main/java/com/moral/api/pojo/ext/allocation/AllocationPageExt.java
+++ b/screen-api/src/main/java/com/moral/api/pojo/ext/allocation/AllocationPageExt.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.moral.api.entity.Allocation;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
@@ -23,4 +24,7 @@
private Integer applyState;
private Integer isApprove;
+
+ @ApiModelProperty(value = "������������")
+ private String stateName;
}
diff --git a/screen-api/src/main/java/com/moral/api/pojo/query/app/AppAllocationFileCond.java b/screen-api/src/main/java/com/moral/api/pojo/query/app/AppAllocationFileCond.java
new file mode 100644
index 0000000..4cffdc9
--- /dev/null
+++ b/screen-api/src/main/java/com/moral/api/pojo/query/app/AppAllocationFileCond.java
@@ -0,0 +1,31 @@
+package com.moral.api.pojo.query.app;
+
+import com.moral.api.pojo.vo.file.FileVo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+/**
+ * @ClassName AppAllocationFileCond
+ * @Description TODO
+ * @Author @cjl
+ * @Date 2023-10-26 10:48
+ * @Version 1.0
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="AppAllocationFileCond - App������������", description="AppAllocationFileCond - App������������")
+public class AppAllocationFileCond {
+
+ @ApiModelProperty(value = "������id")
+ private Integer userId;
+
+ @ApiModelProperty(value = "������������")
+ private FileVo file;
+
+}
diff --git a/screen-api/src/main/java/com/moral/api/pojo/query/app/AppAllocationPageCond.java b/screen-api/src/main/java/com/moral/api/pojo/query/app/AppAllocationPageCond.java
new file mode 100644
index 0000000..945f699
--- /dev/null
+++ b/screen-api/src/main/java/com/moral/api/pojo/query/app/AppAllocationPageCond.java
@@ -0,0 +1,42 @@
+package com.moral.api.pojo.query.app;
+
+import com.moral.api.pojo.query.PageCond;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+/**
+ * @ClassName AppAllocationPageCond
+ * @Description TODO
+ * @Author @cjl
+ * @Date 2023-10-25 16:13
+ * @Version 1.0
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="AppAllocation - App������������������", description="AppAllocation - App������������������")
+public class AppAllocationPageCond {
+
+ @ApiModelProperty(value = "������,0������ 1������2���������������������")
+ private Integer state;
+
+ @ApiModelProperty(value = "������������")
+ private String startTime;
+
+ @ApiModelProperty(value = "������������")
+ private String endTime;
+
+ @ApiModelProperty(value = "������������")
+ private PageCond page;
+
+ @ApiModelProperty(value = "������list")
+ private List<Integer> stateList;
+
+ @ApiModelProperty(value = "������list")
+ private List<Integer> unitList;
+}
diff --git a/screen-api/src/main/java/com/moral/api/pojo/vo/app/AppAllocationFindVo.java b/screen-api/src/main/java/com/moral/api/pojo/vo/app/AppAllocationFindVo.java
new file mode 100644
index 0000000..b5fb539
--- /dev/null
+++ b/screen-api/src/main/java/com/moral/api/pojo/vo/app/AppAllocationFindVo.java
@@ -0,0 +1,94 @@
+package com.moral.api.pojo.vo.app;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.moral.api.pojo.enums.AllocationApproveEnum;
+import com.moral.api.pojo.ext.allocation.AllocationPageExt;
+import com.moral.api.pojo.vo.allocation.AllocationPageVo;
+import com.moral.api.utils.BeanConverts;
+import com.moral.util.DateUtils;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * @ClassName AppAllocationFindVo
+ * @Description TODO
+ * @Author @cjl
+ * @Date 2023-10-26 10:28
+ * @Version 1.0
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="AppAllocation - ������VO������", description="AppAllocation - ������VO������")
+public class AppAllocationFindVo {
+
+ @ApiModelProperty(value = "������id")
+ private Integer allocationId;
+
+ @ApiModelProperty(value = "������������")
+ private String allocationNum;
+
+ @ApiModelProperty(value = "������������")
+ @JsonFormat(pattern="yyyy-MM-dd")
+ private Date escalationTime;
+
+ @ApiModelProperty(value = "������������id")
+ private Integer unitId;
+
+ @ApiModelProperty(value = "������������id")
+ private Integer polluteType;
+
+ @ApiModelProperty(value = "������������id")
+ private Integer changeType;
+ @ApiModelProperty(value = "������������")
+ private String pollutePosition;
+
+ @ApiModelProperty(value = "������������")
+ private Integer changeDay;
+
+ @ApiModelProperty(value = "������������")
+ private Integer residueDay;
+
+ @ApiModelProperty(value = "������������id")
+ private Integer escalationUnitId;
+
+ @ApiModelProperty(value = "���������")
+ private String escalationName;
+
+ @ApiModelProperty(value = "������������id")
+ private Integer investigationType;
+
+ @ApiModelProperty(value = "������")
+ private Integer state;
+
+ @ApiModelProperty(value = "������������")
+ private Integer isInvalid;
+
+ @ApiModelProperty(value = "������������")
+ private String stateName;
+
+ public Integer getResidueDay() {
+ int day = this.changeDay;
+ if(AllocationApproveEnum.UNDER_RECTIFICATION.value.equals(state)){
+ Date date = new Date();
+ int days = DateUtils.getDays(escalationTime, date);
+ return day-days;
+ }
+ return day;
+ }
+ public static AppAllocationFindVo convert(AllocationPageExt allocationPageExt) {
+ AppAllocationFindVo allocationPageVo = BeanConverts.convert(allocationPageExt, AppAllocationFindVo.class);
+ return allocationPageVo;
+ }
+
+ public static List<AppAllocationFindVo> convert(List<AllocationPageExt> allocationPageExtList) {
+ return allocationPageExtList.stream().map(AppAllocationFindVo::convert).collect(Collectors.toList());
+ }
+}
diff --git a/screen-api/src/main/java/com/moral/api/service/AllocationService.java b/screen-api/src/main/java/com/moral/api/service/AllocationService.java
index 58f721f..f98f7e4 100644
--- a/screen-api/src/main/java/com/moral/api/service/AllocationService.java
+++ b/screen-api/src/main/java/com/moral/api/service/AllocationService.java
@@ -14,8 +14,11 @@
import com.moral.api.pojo.query.allocation.*;
import com.moral.api.pojo.dto.allocation.AllocationUnitDto;
import com.moral.api.pojo.query.allocationextension.AllocationExtensionAddCond;
+import com.moral.api.pojo.query.app.AppAllocationFileCond;
+import com.moral.api.pojo.query.app.AppAllocationPageCond;
import com.moral.api.pojo.vo.allocation.AllocationFindVo;
import com.moral.api.pojo.vo.allocation.AllocationPageVo;
+import com.moral.api.pojo.vo.app.AppAllocationFindVo;
public interface AllocationService extends IService<Allocation> {
@@ -107,6 +110,14 @@
*/
List<AllocationFindVo> selectSmallRoutine(Integer state,String startTime,String endTime);
+ /**
+ * ���������������
+ * @param allocationPageCond
+ * @return
+ */
+ Page<AllocationPageExt> pageApp(AppAllocationPageCond allocationPageCond);
+
+ boolean saveFile(AppAllocationFileCond appAllocationFileCond);
/**
* ���������������
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java
index 1dbffad..6716882 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java
@@ -20,7 +20,10 @@
import com.moral.api.pojo.ext.allocation.AllocationPageExt;
import com.moral.api.pojo.query.allocation.*;
import com.moral.api.pojo.query.allocationextension.AllocationExtensionAddCond;
+import com.moral.api.pojo.query.app.AppAllocationFileCond;
+import com.moral.api.pojo.query.app.AppAllocationPageCond;
import com.moral.api.pojo.vo.allocation.AllocationFindVo;
+import com.moral.api.pojo.vo.app.AppAllocationFindVo;
import com.moral.api.pojo.vo.user.QxUser;
import com.moral.api.service.*;
import com.moral.constant.Constants;
@@ -687,6 +690,75 @@
return allocationFindVos;
}
+ @Override
+ public Page<AllocationPageExt> pageApp(AppAllocationPageCond allocationPageCond) {
+ List<Integer> listUnit = unitResult();
+ Integer integer = unitAreaCode();
+ allocationPageCond.setUnitList(listUnit);
+ allocationPageCond.setStateList(stateAllocationList(allocationPageCond.getState(),integer));
+ Page<AllocationPageExt> extAppPage = this.baseMapper.extAppPage(allocationPageCond.getPage().convertPage(),allocationPageCond);
+ extAppPage.getRecords().forEach(it->{
+ Integer state = it.getState();
+ if (state.equals(AllocationApproveEnum.DRAFT.value)||state.equals(AllocationApproveEnum.UNDER_RECTIFICATION.value)){
+ if(integer==0||integer==1){
+ it.setStateName(AppAllocationStateEnum.TO_BE_PROCESSED.name);
+ }else if(integer==2){
+ it.setStateName(AppAllocationStateEnum.TO_BE_COMPLETED.name);
+ }
+ }else if(state.equals(AllocationApproveEnum.IN_APPROVAL.value)){
+ if(integer==2||integer==1){
+ it.setStateName(AppAllocationStateEnum.TO_BE_PROCESSED.name);
+ }else if(integer==0){
+ it.setStateName(AppAllocationStateEnum.TO_BE_COMPLETED.name);
+ }
+ }else{
+ it.setStateName(AppAllocationStateEnum.COMPLETED.name);
+ }
+ });
+
+ return extAppPage;
+ }
+
+ @Override
+ @Transactional
+ public boolean saveFile(AppAllocationFileCond appAllocationFileCond) {
+ fileTableService.upDateResult(Arrays.asList(appAllocationFileCond.getFile()),appAllocationFileCond.getUserId(), FileTableEnum.APP_ALLOCATION.value);
+ return true;
+ }
+
+ private List<Integer> stateAllocationList(Integer type, Integer integer){
+ List<Integer> integerList = new ArrayList<>();
+ // type 0 ������ 1������ 2��������� 3 ���������
+ if(integer.equals(0)){
+ if(type.equals(1)){
+ integerList.add(AllocationApproveEnum.UNDER_RECTIFICATION.value);
+ integerList.add(AllocationApproveEnum.DRAFT.value);
+ }else if(type.equals(2)){
+ integerList.add(AllocationApproveEnum.IN_APPROVAL.value);
+ }
+ }else if(integer.equals(2)){
+ if(type.equals(1)){
+ integerList.add(AllocationApproveEnum.IN_APPROVAL.value);
+ }else if(type.equals(2)){
+ integerList.add(AllocationApproveEnum.UNDER_RECTIFICATION.value);
+ integerList.add(AllocationApproveEnum.DRAFT.value);
+ }
+ }else if(integer.equals(1)){
+ if(type.equals(1)){
+ integerList.add(AllocationApproveEnum.IN_APPROVAL.value);
+ integerList.add(AllocationApproveEnum.UNDER_RECTIFICATION.value);
+ integerList.add(AllocationApproveEnum.DRAFT.value);
+ }else if(type.equals(2)){
+ integerList.add(0);
+ }
+ }
+ if(type.equals(3)){
+ integerList.add(AllocationApproveEnum.PASS.value);
+ integerList.add(AllocationApproveEnum.REFUSE.value);
+ }
+ return integerList;
+ }
+
/**
* ���������������
*
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/HistorySecondUavServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/HistorySecondUavServiceImpl.java
index 671af4f..3853749 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/HistorySecondUavServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/HistorySecondUavServiceImpl.java
@@ -366,7 +366,7 @@
wrapper.select("value,mac,time,organization_id");
wrapper.orderByAsc("time");
List<HistorySecondUav> datas = historySecondUavMapper.selectList(wrapper);
- Date time =DateUtils.addDays(datas.get(2).getTime(),0);
+ Date time = new Date();
//String bat = "2023-08-08 14:42:20";
for(HistorySecondUav g : datas){
HistorySecondUav historySecondUav = new HistorySecondUav();
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java
index d6ceef5..e8204e2 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java
@@ -110,9 +110,10 @@
orgIds.add(orgId);
integerList.addAll(orgIds);
QueryWrapper<SpecialDeviceHistory> queryWrapper = new QueryWrapper<>();
- queryWrapper.select("mac", "name")
+ queryWrapper.select("DISTINCT mac, name").lambda();
+
//.eq("special_type", Constants.SPECIAL_DEVICE_CRUISER)
- .eq("is_delete", Constants.NOT_DELETE)
+ queryWrapper.eq("is_delete", Constants.NOT_DELETE)
.in("organization_id", integerList);
return specialDeviceHistoryService.listMaps(queryWrapper);
}
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java
index 2d1e465..ed17580 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java
@@ -11,6 +11,9 @@
import com.moral.api.entity.*;
import com.moral.api.mapper.*;
import com.moral.api.pojo.bo.UserBO;
+import com.moral.api.pojo.enums.FileTableEnum;
+import com.moral.api.pojo.vo.file.FileVo;
+import com.moral.api.service.FileTableService;
import com.moral.api.service.UserService;
import com.moral.api.utils.OperationLogUtils;
import com.moral.api.utils.WechatUtils;
@@ -18,6 +21,7 @@
import com.moral.constant.ResponseCodeEnum;
import com.moral.util.*;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
@@ -53,6 +57,9 @@
@Autowired
private UserLogMapper userLogMapper;
+
+ @Autowired
+ private FileTableService fileTableService;
@Autowired
private OperationLogUtils operationLogUtils;
@@ -116,7 +123,9 @@
result.put("unitId",userBo.getUnitId());
result.put("userId", userBo.getId());
result.put("account", userBo.getAccount());
- result.put("unName",Objects.nonNull(responsibilityUnit)&&Objects.nonNull(responsibilityUnit.getAreaName())?responsibilityUnit.getAreaName():"���������������������");
+ List<FileVo> listFile = fileTableService.list(userBo.getId(), FileTableEnum.APP_ALLOCATION.value);
+ result.put("file", CollectionUtils.isNotEmpty(listFile)?listFile.get(0):new FileVo());
+ result.put("unName",Objects.nonNull(responsibilityUnit)&&Objects.nonNull(responsibilityUnit.getUnitName())?responsibilityUnit.getUnitName():"���������������");
} catch (Exception e) {
log.error("token���������������" + e.getMessage());
result.put("code", ResponseCodeEnum.TOKEN_CREATE_ERROR.getCode());
@@ -185,9 +194,11 @@
result.put("token", token);
result.put("userName", user.getUserName());
result.put("unitId",user.getUnitId());
+ List<FileVo> listFile = fileTableService.list(user.getId(), FileTableEnum.APP_ALLOCATION.value);
+ result.put("file", CollectionUtils.isNotEmpty(listFile)?listFile.get(0):new FileVo());
result.put("userId", user.getId());
result.put("account", user.getAccount());
- result.put("unName",Objects.nonNull(responsibilityUnit)&&Objects.nonNull(responsibilityUnit.getAreaName())?responsibilityUnit.getAreaName():"���������������������");
+ result.put("unName",Objects.nonNull(responsibilityUnit)&&Objects.nonNull(responsibilityUnit.getUnitName())?responsibilityUnit.getUnitName():"���������������");
} catch (Exception e) {
log.error("token���������������" + e.getMessage());
result.put("code", ResponseCodeEnum.TOKEN_CREATE_ERROR.getCode());
diff --git a/screen-api/src/main/java/com/moral/api/utils/WechatUtils.java b/screen-api/src/main/java/com/moral/api/utils/WechatUtils.java
index de7e889..bdafa35 100644
--- a/screen-api/src/main/java/com/moral/api/utils/WechatUtils.java
+++ b/screen-api/src/main/java/com/moral/api/utils/WechatUtils.java
@@ -25,8 +25,8 @@
public class WechatUtils {
- public static final String APPID = "wx41f4c3c007545088";
- public static final String SECRET = "9e1a328ad525dd169252a1cc5067a6f3";
+ public static final String APPID = "wxf95fb77e0b1f8c09";
+ public static final String SECRET = "acf3be9facf7f26bb8286c9b4eff93d0";
public static JSONObject getSessionKeyOrOpenId(String code) {
diff --git a/screen-api/src/main/resources/application-qa.yml b/screen-api/src/main/resources/application-qa.yml
index 3cbbba3..f9dde1a 100644
--- a/screen-api/src/main/resources/application-qa.yml
+++ b/screen-api/src/main/resources/application-qa.yml
@@ -141,4 +141,4 @@
foh3wi2ooghiCh5
file:
- path: E:/upload
\ No newline at end of file
+ path: /data/upload/
\ No newline at end of file
diff --git a/screen-api/src/main/resources/mapper/AllocationMapper.xml b/screen-api/src/main/resources/mapper/AllocationMapper.xml
index 4b9159b..6753aa6 100644
--- a/screen-api/src/main/resources/mapper/AllocationMapper.xml
+++ b/screen-api/src/main/resources/mapper/AllocationMapper.xml
@@ -104,4 +104,33 @@
</where>
order by allocation.escalation_time desc,allocation.allocation_id desc
</select>
+
+ <select id="extAppPage" resultType="com.moral.api.pojo.ext.allocation.AllocationPageExt">
+ SELECT
+ <include refid="Allocation_Column_List"/>
+ FROM allocation allocation
+ <where>
+ 1 = 1 and allocation.is_del = 0
+ <if test="allocation.startTime != null and allocation.startTime != '' ">
+ and date(allocation.escalation_time) <![CDATA[>=]]> #{allocation.startTime}
+ </if>
+ <if test="allocation.endTime != null and allocation.endTime !='' ">
+ and date(allocation.escalation_time) <![CDATA[<=]]> #{allocation.endTime}
+ </if>
+ <if test="allocation.stateList != null and allocation.stateList.size !=0">
+ and allocation.state in
+ <foreach collection="allocation.stateList" item="id" index="index" open="(" close=")" separator=",">
+ #{id}
+ </foreach>
+
+ </if>
+ <if test="allocation.unitList != null and allocation.unitList.size !=0">
+ and allocation.unit_id in
+ <foreach collection="allocation.unitList" item="id" index="index" open="(" close=")" separator=",">
+ #{id}
+ </foreach>
+ </if>
+ </where>
+ order by allocation.escalation_time desc,allocation.allocation_id desc
+ </select>
</mapper>
--
Gitblit v1.8.0