yxt_group
/
supervise
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

数据中台

master
wangpengfei 2 years ago
parent
d606c355d8
commit
4b72ac09b8
13 changed files with 324 additions and 42 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/DataCenterRest.java
  2. 26
      yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/DataCenterService.java
  3. 34
      yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectinformation/ProjectInformationRest.java
  4. 34
      yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectstatedictionary/ProjectStateDictionaryRest.java
  5. 2
      yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportinventory/ReportInventoryDayGatherMapper.java
  6. 76
      yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportinventory/ReportInventoryDayGatherService.java
  7. 48
      yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/sysorganization/SysOrganizationRest.java
  8. 21
      yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/wechat/WechatService.java
  9. 6
      yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/crm/projectinformation/ProjectInformationFeign.java
  10. 33
      yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/crm/projectinformation/ProjectInformationQuery.java
  11. 22
      yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/crm/projectstatedictionary/ProjectStateDictionaryFeign.java
  12. 16
      yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/crm/projectstatedictionary/ProjectStateDictionaryVo.java
  13. 46
      yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/system/sysorganization/SysOrganizationFeign.java

2
yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/DataCenterRest.java
View File

@ -90,7 +90,7 @@ public class DataCenterRest {
@GetMapping("/getInventory")
public ResultBean getInventory(String orderDate) {
ResultBean rb = ResultBean.fireFail();
Map<String,Object> pv = dataCenterService.getInventoryByOrderDate(orderDate);
List<Map<String,Object>> pv = reportInventoryDayGatherService.getInventoryByOrderDate(orderDate);
return rb.success().setData(pv);
}
}

26
yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/DataCenterService.java
View File

@ -1,16 +1,21 @@
package com.yxt.supervise.report.biz.datacenter;
import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.supervise.report.api.dailysalesreport.DailySalesReport;
import com.yxt.supervise.report.api.reportinventorydaygather.ReportInventoryDayGatherVo;
import com.yxt.supervise.report.api.reportinventorydaystore.ReportInventoryDayStoreVo;
import com.yxt.supervise.report.biz.dailysalesreport.DailySalesReportMapper;
import com.yxt.supervise.report.biz.reportinventory.ReportInventoryDayGather;
import com.yxt.supervise.report.biz.reportinventory.ReportInventoryDayGatherService;
import com.yxt.supervise.report.biz.reportinventory.ReportInventoryDayStoreService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.text.SimpleDateFormat;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
@ -19,26 +24,5 @@ import java.util.Map;
*/
@Service
public class DataCenterService extends MybatisBaseService<DataCenterMapper, DataCenter> {
@Autowired
ReportInventoryDayGatherService reportInventoryDayGatherService;
@Autowired
ReportInventoryDayStoreService reportInventoryDayStoreService;
public Map<String,Object> getInventoryByOrderDate(String orderDate) {
Map<String,Object> map=new HashMap<>();
ReportInventoryDayGatherVo reportInventoryDayGatherVo=reportInventoryDayGatherService.getReportInventoryDayGather(orderDate);
ReportInventoryDayStoreVo reportInventoryDayStoreVo=reportInventoryDayStoreService.getReportInventoryDayStore(orderDate);
if(null!=reportInventoryDayGatherVo){
map.put("changwencang",reportInventoryDayGatherVo.getCountAmount());
}else{
map.put("changwencang",0);
}
if (null!=reportInventoryDayStoreVo){
map.put("mendian",reportInventoryDayStoreVo.getCountAmount());
}else{
map.put("mendian",0);
}
return map;
}
}

34
yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectinformation/ProjectInformationRest.java
View File

@ -0,0 +1,34 @@
package com.yxt.supervise.report.biz.projectinformation;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.supervise.report.feign.crm.projectinformation.ProjectInformationFeign;
import com.yxt.supervise.report.feign.crm.projectinformation.ProjectInformationQuery;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* @author wangpengfei
* @date 2023/4/12 17:10
*/
@Api(tags = "项目信息")
@RestController
@RequestMapping("v1/projectinformation")
public class ProjectInformationRest {
@Autowired
ProjectInformationFeign projectInformationFeign;
@ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage")
public ResultBean listPage(@RequestBody PagerQuery<ProjectInformationQuery> pq, @RequestHeader("token") String token) {
return projectInformationFeign.listPage(pq, token);
}
@GetMapping("/getProjectType")
public ResultBean getProjectType(){
return projectInformationFeign.getProjectType();
}
}

34
yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectstatedictionary/ProjectStateDictionaryRest.java
View File

@ -0,0 +1,34 @@
package com.yxt.supervise.report.biz.projectstatedictionary;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.supervise.report.feign.crm.projectstatedictionary.ProjectStateDictionaryFeign;
import com.yxt.supervise.report.feign.crm.projectstatedictionary.ProjectStateDictionaryVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* @author wangpengfei
* @date 2023/10/16 10:06
*/
@Api(tags = "项目状态字典")
@RestController
@RequestMapping("projectstatedictionary")
public class ProjectStateDictionaryRest {
@Autowired
ProjectStateDictionaryFeign projectStateDictionaryFeign;
@ApiOperation("查询全部")
@GetMapping("/listAll")
public ResultBean<List<ProjectStateDictionaryVo>> listAll() {
ResultBean rb = ResultBean.fireFail();
return projectStateDictionaryFeign.listAll();
}
}

2
yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportinventory/ReportInventoryDayGatherMapper.java
View File

@ -97,4 +97,6 @@ public interface ReportInventoryDayGatherMapper extends BaseMapper<ReportInvento
ReportInventoryDayGatherVo getReportInventoryDayGather(@Param("orderDate") String orderDate);
@Select("select * from report_inventory_day_gather where ${ew.sqlSegment}")
List<ReportInventoryDayGatherVo> getReportInventoryByOrderDate(@Param(Constants.WRAPPER) Wrapper<ReportInventoryDayGather> ew);
@Select("select * from report_inventory_day_gather where ${ew.sqlSegment}")
ReportInventoryDayGatherVo getInventoryByOrderDate(@Param(Constants.WRAPPER) Wrapper<ReportInventoryDayGather> ew);
}

76
yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportinventory/ReportInventoryDayGatherService.java
View File

@ -9,6 +9,7 @@ import org.springframework.stereotype.Service;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;
@Service
public class ReportInventoryDayGatherService extends ServiceImpl<ReportInventoryDayGatherMapper, ReportInventoryDayGather> {
@ -88,46 +89,103 @@ public class ReportInventoryDayGatherService extends ServiceImpl<ReportInventory
}
public Map<String,Object> getReportInventoryByOrderDate() {
Map<String,Object> m=new HashMap<>();
QueryWrapper<ReportInventoryDayGather> qw = new QueryWrapper<>();
QueryWrapper<ReportInventoryDayGather> qw2 = new QueryWrapper<>();
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
String startDate=sdf.format(DateUtil.yesterday());
String EndDate=sdf.format(DateUtil.offsetDay(DateUtil.yesterday(),-14));
long i=DateUtil.between(DateUtil.parse(startDate),DateUtil.parse(EndDate), DateUnit.DAY);
QueryWrapper<ReportInventoryDayGather> qw = new QueryWrapper<>();
qw.le("STR_TO_DATE(orderDate,'%Y-%m-%d')",startDate);
qw.ge("STR_TO_DATE(orderDate,'%Y-%m-%d')",EndDate);
qw.eq("storeType","[101]365常温仓");
List<ReportInventoryDayGatherVo> changwencang=baseMapper.getReportInventoryByOrderDate(qw);
QueryWrapper<ReportInventoryDayGather> qw2 = new QueryWrapper<>();
qw2.le("STR_TO_DATE(orderDate,'%Y-%m-%d')",startDate);
qw2.ge("STR_TO_DATE(orderDate,'%Y-%m-%d')",EndDate);
qw2.eq("storeType","[112]供应链仓");
List<ReportInventoryDayGatherVo> gongyinglian=baseMapper.getReportInventoryByOrderDate(qw2);
qw2.eq("storeType","36524集团门店仓");
List<ReportInventoryDayGatherVo> mendian=baseMapper.getReportInventoryByOrderDate(qw2);
QueryWrapper<ReportInventoryDayGather> qw3 = new QueryWrapper<>();
qw3.le("STR_TO_DATE(orderDate,'%Y-%m-%d')",startDate);
qw3.ge("STR_TO_DATE(orderDate,'%Y-%m-%d')",EndDate);
qw3.eq("storeType","36524集团烟草门店仓");
List<ReportInventoryDayGatherVo> ycMendian=baseMapper.getReportInventoryByOrderDate(qw3);
QueryWrapper<ReportInventoryDayGather> qw4 = new QueryWrapper<>();
qw4.le("STR_TO_DATE(orderDate,'%Y-%m-%d')",startDate);
qw4.ge("STR_TO_DATE(orderDate,'%Y-%m-%d')",EndDate);
qw4.eq("storeType","[112]供应链仓");
List<ReportInventoryDayGatherVo> gongyinglian=baseMapper.getReportInventoryByOrderDate(qw4);
QueryWrapper<ReportInventoryDayGather> qw5 = new QueryWrapper<>();
qw5.le("STR_TO_DATE(orderDate,'%Y-%m-%d')",startDate);
qw5.ge("STR_TO_DATE(orderDate,'%Y-%m-%d')",EndDate);
qw5.eq("storeType","[199]365配送残品仓");
List<ReportInventoryDayGatherVo> cancipin=baseMapper.getReportInventoryByOrderDate(qw5);
List<String> a=new ArrayList<>();
List<String> b=new ArrayList<>();
List<String> c=new ArrayList<>();
List<String> d=new ArrayList<>();
List<String> e=new ArrayList<>();
List<String> f=new ArrayList<>();
//14
long i=DateUtil.between(DateUtil.parse(startDate),DateUtil.parse(EndDate), DateUnit.DAY);
for(int k=0;k<i+1;k++){
String date=sdf.format(DateUtil.offsetDay(DateUtil.parse(EndDate),k));
a.add(date);
b.add("0");
c.add("0");
d.add("0");
e.add("0");
f.add("0");
for(ReportInventoryDayGatherVo vo:changwencang){
if(vo.getOrderDate().equals(date)){
b.set(k,String.valueOf(vo.getProductAmount()));
}
}
for(ReportInventoryDayGatherVo vo:gongyinglian){
for(ReportInventoryDayGatherVo vo:mendian){
if(vo.getOrderDate().equals(date)){
c.set(k,String.valueOf(vo.getProductAmount()));
}
}
for(ReportInventoryDayGatherVo vo:ycMendian){
if(vo.getOrderDate().equals(date)){
d.set(k,String.valueOf(vo.getProductAmount()));
}
}
for(ReportInventoryDayGatherVo vo:gongyinglian){
if(vo.getOrderDate().equals(date)){
e.set(k,String.valueOf(vo.getProductAmount()));
}
}
for(ReportInventoryDayGatherVo vo:cancipin){
if(vo.getOrderDate().equals(date)){
f.set(k,String.valueOf(vo.getProductAmount()));
}
}
}
m.put("date",a.toArray());
m.put("changwencang",b.toArray());
m.put("gongyinglian",c.toArray());
m.put("mendian",c.toArray());
m.put("ycMendian",d.toArray());
m.put("gongyinglian",e.toArray());
m.put("cancipin",f.toArray());
return m;
}
public List<Map<String,Object>> getInventoryByOrderDate(String orderDate) {
List<Map<String,Object>> maps=new ArrayList<>();
QueryWrapper<ReportInventoryDayGather> qw = new QueryWrapper<>();
qw.eq("STR_TO_DATE(orderDate,'%Y-%m-%d')",orderDate);
List<ReportInventoryDayGatherVo> vos=baseMapper.getReportInventoryByOrderDate(qw);
for(ReportInventoryDayGatherVo vo:vos){
Map<String,Object> map=new HashMap<>();
map.put("name",vo.getStoreType());
map.put("amount",vo.getProductAmount());
maps.add(map);
}
return maps;
}
}

48
yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/sysorganization/SysOrganizationRest.java
View File

@ -0,0 +1,48 @@
package com.yxt.supervise.report.biz.sysorganization;
import com.yxt.common.core.result.ResultBean;
import com.yxt.supervise.report.feign.system.sysorganization.SysOrganizationFeign;
import com.yxt.supervise.system.sysorganization.SysOrganizationVo;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
/**
* @author wangpengfei
* @date 2023/11/6 15:36
*/
@RestController("com.yxt.supervise.crm.biz.system.SysOrganizationRest")
@RequestMapping("v1/sysorganization")
public class SysOrganizationRest {
@Autowired
SysOrganizationFeign sysOrganizationFeign;
@ApiOperation("获取组织结构某一组织")
@GetMapping("/getUserListByOrg/{orgCode}")
public ResultBean<List<SysOrganizationVo>> getUserListByOrg(@PathVariable("orgCode")String orgCode){
return sysOrganizationFeign.getUserListByOrg(orgCode);
}
/**
* 获取组织结构下人员信息
* @return
*/
@ApiOperation("获取组织结构下关联项目人员信息")
@GetMapping("/associationUserList/{projectSid}")
public ResultBean<List<SysOrganizationVo>> associationUserList(@PathVariable("projectSid") String projectSid){
return sysOrganizationFeign.associationUserList(projectSid);
};
/**
* 获取组织结构下人员信息
* @return
*/
@ApiOperation("获取组织结构下人员信息")
@GetMapping("/userList/{projectSid}")
public ResultBean<List<SysOrganizationVo>> userList(@PathVariable("projectSid")String projectSid){
return sysOrganizationFeign.userList(projectSid);
};
}

21
yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/wechat/WechatService.java
View File

@ -375,20 +375,21 @@ public class WechatService {
List<String> mobiles=new ArrayList<>();
openIds.add("oGdho60xVtWEXUks7nYEAn0tGlDE");
mobiles.add("15932270269");
openIds.add("oGdho66394A-4-NyumcJ1MEaT8Lo");
mobiles.add("18603312020");
openIds.add("oGdho615_xBMYYwftEjjBlC6p2uE");
mobiles.add("13513219196");
openIds.add("oGdho6yYB47f52HVk2NqirrFbRRk");
mobiles.add("13513211777");
openIds.add("oGdho668Hew45t0xfBJC84TNGVzI");
mobiles.add("13623307393");
openIds.add("oGdho68CArVhC_-7ELkG-jX21ruk");
mobiles.add("13131170271");
openIds.add("oGdho69VxJil_NRxv9StYVpQg58U");
mobiles.add("13333113292");
openIds.add("oGdho66Wy-Or1UeqoNHU1YL5yAEM");
mobiles.add("19933133338");
// openIds.add("oGdho66394A-4-NyumcJ1MEaT8Lo");
// mobiles.add("18603312020");
// openIds.add("oGdho615_xBMYYwftEjjBlC6p2uE");
// mobiles.add("13513219196");
// openIds.add("oGdho6yYB47f52HVk2NqirrFbRRk");
// mobiles.add("13513211777");
// openIds.add("oGdho69VxJil_NRxv9StYVpQg58U");
// mobiles.add("13333113292");
// openIds.add("oGdho66Wy-Or1UeqoNHU1YL5yAEM");
// mobiles.add("19933133338");
// for(UserProject u:user){
// SysUser sysUser=systemMapper.getAppletOpenidByUsersid(u.getUserSid());
// if(null!=sysUser) {

6
yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/crm/projectinformation/ProjectInformationFeign.java
View File

@ -19,7 +19,11 @@ import java.util.List;
name = "supervise-crm",
path = "v1/projectinformation")
public interface ProjectInformationFeign {
@ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage")
public ResultBean<PagerVo<ProjectInformationVo>> listPage(@RequestBody PagerQuery<ProjectInformationQuery> pq,@RequestHeader("token") String token);
@GetMapping("/getProjectType")
public ResultBean getProjectType();
@ApiOperation("查询全部")
@GetMapping("/listAll")
public ResultBean<List<ProjectInformationVo>> listAll(@RequestHeader("token") String token);

33
yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/crm/projectinformation/ProjectInformationQuery.java
View File

@ -0,0 +1,33 @@
package com.yxt.supervise.report.feign.crm.projectinformation;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModel;
import lombok.Data;
/**
* @author wangpengfei
* @date 2023/4/25 9:29
*/
@ApiModel(value = "项目信息 查询条件", description = "项目信息 查询条件")
@Data
public class ProjectInformationQuery implements Query {
private String id;
private String sid;
private String entryName;
private String engaDate;
private String creditLimit;
private String signingDate;
private String endDate;
private String regulatoryLeader;
private String generalManager;
private String fillInDate;
private String bankSid;
private String bManagerSid;
private String enterpriseSid;
private String industrySid;
private String typeSid;
private String remarks;
private String projectType;
private String bankName;
private String stateSid;
}

22
yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/crm/projectstatedictionary/ProjectStateDictionaryFeign.java
View File

@ -0,0 +1,22 @@
package com.yxt.supervise.report.feign.crm.projectstatedictionary;
import com.yxt.common.core.result.ResultBean;
import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping;
import java.util.List;
/**
* @author wangpengfei
* @date 2023/11/15 11:40
*/
@FeignClient(
contextId = "supervise-crm-projectstatedictionary",
name = "supervise-crm",
path = "projectstatedictionary")
public interface ProjectStateDictionaryFeign {
@ApiOperation("查询全部")
@GetMapping("/listAll")
public ResultBean<List<ProjectStateDictionaryVo>> listAll();
}

16
yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/crm/projectstatedictionary/ProjectStateDictionaryVo.java
View File

@ -0,0 +1,16 @@
package com.yxt.supervise.report.feign.crm.projectstatedictionary;
import com.yxt.common.core.query.Query;
import lombok.Data;
/**
* @author wangpengfei
* @date 2023/10/16 10:05
*/
@Data
public class ProjectStateDictionaryVo implements Query {
private String id;
private String sid;
private String name;
private String remarks;
}

46
yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/system/sysorganization/SysOrganizationFeign.java
View File

@ -0,0 +1,46 @@
package com.yxt.supervise.report.feign.system.sysorganization;
import com.yxt.common.core.result.ResultBean;
import com.yxt.supervise.system.sysorganization.SysOrganizationVo;
import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.ResponseBody;
import java.util.List;
/**
* @author wangpengfei
* @date 2023/10/7 15:31
*/
@FeignClient(
contextId = "supervise-system-sysorganization",
name = "supervise-system",
path = "v1/sysorganization")
public interface SysOrganizationFeign {
@ApiOperation("获取组织结构下人员信息")
@GetMapping("/userList")
public ResultBean<List<SysOrganizationVo>> userList();
@ApiOperation("获取一条记录 根据sid")
@ResponseBody
@GetMapping("/fetchBySid/{sid}")
public ResultBean<SysOrganizationVo> fetchBySid(@PathVariable("sid") String sid);
@ApiOperation("获取组织结构某一组织")
@GetMapping("/getUserListByOrg/{orgCode}")
public ResultBean<List<SysOrganizationVo>> getUserListByOrg(@PathVariable("orgCode")String orgCode);
/**
* 获取组织结构下人员信息
* @return
*/
@ApiOperation("获取组织结构下关联项目人员信息")
@GetMapping("/associationUserList/{projectSid}")
public ResultBean<List<SysOrganizationVo>> associationUserList(@PathVariable("projectSid") String projectSid);
/**
* 获取组织结构下人员信息
* @return
*/
@ApiOperation("获取组织结构下人员信息")
@GetMapping("/userList/{projectSid}")
public ResultBean<List<SysOrganizationVo>> userList(@PathVariable("projectSid")String projectSid);
}
Write Preview
Loading…
Cancel
Save