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

Merge remote-tracking branch 'origin/master'

master
dimengzhe 2 years ago
parent
d7c271781c 6d0a12679f
commit
80f49cb384
10 changed files with 137 additions and 77 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
      supervise-report-ui/.env.development
  2. 16
      supervise-report-ui/src/api/main/main.js
  3. 2
      supervise-report-ui/src/main.js
  4. 123
      supervise-report-ui/src/views/index.vue
  5. 4
      yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/api/riskmessageslog/RiskMessagesLogVo.java
  6. 7
      yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyService.java
  7. 4
      yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/riskmessageslog/RiskMessagesLogMapper.java
  8. 43
      yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/riskmessageslog/RiskMessagesLogMapper.xml
  9. 5
      yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/riskmessageslog/RiskMessagesLogRest.java
  10. 8
      yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/riskmessageslog/RiskMessagesLogService.java

2
supervise-report-ui/.env.development
View File

@ -6,4 +6,4 @@ VUE_APP_BASE_API = '/api'
## 配置测试和本地开发时的 接口地址
##VUE_APP_URL = "http://8.130.39.13:8112"
VUE_APP_URL = "http://192.168.0.104:7009"
VUE_APP_URL = "http://192.168.0.108:7009"

16
supervise-report-ui/src/api/main/main.js
View File

@ -0,0 +1,16 @@
import request from '@/utils/request'
// 主页
// 列表
export default {
getProjectDailys(data) {
return request({
url: '/projectdaily/getProjectDailys',
method: 'post',
data: data
})
},
}

2
supervise-report-ui/src/main.js
View File

@ -50,7 +50,7 @@ VueAMap.initAMapApiLoader({
Vue.config.productionTip = false
let token = null
// let token = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VyTm8iOiI4NWUwYWY0Yi1lMGJhLTQyM2UtOTIxMS1kYjI2MDg2NTgwM2YiLCJpc3MiOiJXQksiLCJleHAiOjE3MDA0NDI3NDF9.ofDoXvqN58tdWomVV70gwpRxjYn6qeaNlbnd7qyy0AI'
// let token = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VyTm8iOiI4NWUwYWY0Yi1lMGJhLTQyM2UtOTIxMS1kYjI2MDg2NTgwM2YiLCJpc3MiOiJXQksiLCJleHAiOjE3MDA2MjAwNzF9.iAXRy8SKmeGqteP68u_MD32b1hG7pNsYoZQ3C-fgHSI'
token = GetQueryString('token')
if (token) {
setStorage(token)

123
supervise-report-ui/src/views/index.vue
View File

@ -9,8 +9,9 @@
<div class="title-select">
<el-select v-model="wareValue" placeholder="请选择仓库" style="width: 250px;margin-right: 50px;">
<el-option v-for="item in warehouse" :key="item.value" :label="item.label" :value="item.value">
<el-select v-model="projectValue" placeholder="请选择项目" style="width: 250px;margin-right: 50px;"
@change="projectSelect">
<el-option v-for="item in projectList" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
@ -143,11 +144,16 @@
<div class="bom">
<el-table v-loading="tableLoading" :data="listSalesChannelData" border style="width: 100%;">
<el-table-column width="200" label="销售渠道类别" prop="salesChannelCategory" align="center" />
<el-table-column label="总额" prop="totalAmount" align="center" />
<el-table-column label="应收帐款" prop="accountsReceivable" align="center" />
<el-table-column label="扣除应收" prop="deductionAccountsReceivable" align="center" />
<el-table v-loading="tableLoading" :data="projectlistlData" border style="width: 100%;" :row-style="{height: '50px'}">
<el-table-column width="200" label="项目名称" prop="projectName" align="center" />
<el-table-column label="授信额度(元)" prop="totalLoan" align="center" />
<el-table-column label="用信额度(元)" prop="useLimit" align="center" />
<el-table-column label="账户余额(元)" prop="accountsBalance" align="center" />
<el-table-column label="应收账款(元)" prop="accountsReceivable" align="center" />
<el-table-column label="库存货值(元)" prop="stockAmount" align="center" />
<el-table-column label="在途货值(元)" prop="transitAmount" align="center" />
<el-table-column label="预付款(元)" prop="advancePayment" align="center" />
<el-table-column label="质押率" prop="pledgeRatePercent" align="center" />
</el-table>
@ -161,6 +167,7 @@
</div>
<script>
import * as echarts from 'echarts'
import req from '@/api/main/main'
import {
getDateRang
} from '@/utils/index'
@ -168,9 +175,10 @@
name: '',
data() {
return {
tableLoading: false,
times: getDateRang('yesterday'),
wareValue: "",
warehouse: [
projectValue: "全部项目",
projectList: [
{
label: "111111111",
@ -185,66 +193,7 @@
value: "项目3"
}
],
listSalesChannelData: [{
salesChannelCategory: '连网连锁店',
totalAmount: '2000000',
accountsReceivable: '31,914',
deductionAccountsReceivable: '35,793'
},
{
salesChannelCategory: '连锁内加盟',
totalAmount: '28,700',
accountsReceivable: '28,749',
deductionAccountsReceivable: '58,339'
},
{
salesChannelCategory: '配送中心',
totalAmount: '-1241.81',
accountsReceivable: '28,749',
deductionAccountsReceivable: '58,339'
},
{
salesChannelCategory: '连锁外加盟',
totalAmount: '29822.44',
accountsReceivable: '28,749',
deductionAccountsReceivable: '58,339'
},
{
salesChannelCategory: '配送中心',
totalAmount: '-1241.81',
accountsReceivable: '28,749',
deductionAccountsReceivable: '58,339'
},
{
salesChannelCategory: '连锁外加盟',
totalAmount: '29822.44',
accountsReceivable: '28,749',
deductionAccountsReceivable: '58,339'
},
{
salesChannelCategory: '配送中心',
totalAmount: '-1241.81',
accountsReceivable: '28,749',
deductionAccountsReceivable: '58,339'
},
{
salesChannelCategory: '连锁外加盟',
totalAmount: '29822.44',
accountsReceivable: '28,749',
deductionAccountsReceivable: '58,339'
},
{
salesChannelCategory: '配送中心',
totalAmount: '-1241.81',
accountsReceivable: '28,749',
deductionAccountsReceivable: '58,339'
},
{
salesChannelCategory: '连锁外加盟',
totalAmount: '29822.44',
accountsReceivable: '28,749',
deductionAccountsReceivable: '58,339'
}
projectlistlData: [
],
}
@ -253,12 +202,39 @@
this.drawLine()
},
created() {
this.init()
},
methods: {
init() {
// 获取列表
let params = {
orderDate: this.times,
projectSid: "",
}
req.getProjectDailys(params).then(res => {
console.log('getProjectDailys:', res)
this.projectlistlData = res.data
})
},
projectSelect(val) {
console.log('projectSelect:', val)
},
selectTime(val) {
console.log('val:', val)
console.log('selectTime:', val)
this.times = val
this.init()
},
// 折线图初始化
@ -359,10 +335,11 @@
text-align: right;
padding-right: 40px;
}
.mains{
.mains {
overflow-x: hidden;
overflow-y: auto;
height: 100%;
overflow-y: auto;
height: 100%;
}
.index {

4
yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/api/riskmessageslog/RiskMessagesLogVo.java
View File

@ -59,6 +59,10 @@ public class RiskMessagesLogVo implements Vo {
//{thing3=瀚川商贸仓库, thing4=图片对比异常, time5=2023-11-06 05:04:08}
vo.setTime(map.get("time5"));
vo.setShName(map.get("thing3"));
}else if(type.equals("每日数据上报")){
//{time1=2023-08-15 09:57, thing3=赵丽晓, thing2=监管数据总览(喜相随生产加工动产质押项…}
vo.setTime(map.get("time1"));
vo.setShName(map.get("thing2"));
}
}
this.templateMessageVo=vo;

7
yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyService.java
View File

@ -350,10 +350,13 @@ public class ProjectDailyService extends ServiceImpl<ProjectDailyMapper, Project
public ResultBean<List<ProjectDailyVos>> getProjectDailys(ProjectDailyQuery query) {
ResultBean rb=new ResultBean().fail();
ProjectDailyQuery params = query;
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
QueryWrapper<ProjectDaily> qw = new QueryWrapper<>();
if (params != null) {
if (com.yxt.common.base.utils.StringUtils.isNotBlank(params.getOrderDate())) {
qw.eq("orderDate", params.getOrderDate());
}else{
qw.eq("orderDate",sdf.format(DateUtil.yesterday()));
}
if (com.yxt.common.base.utils.StringUtils.isNotBlank(params.getProjectSid())) {
@ -367,10 +370,12 @@ public class ProjectDailyService extends ServiceImpl<ProjectDailyMapper, Project
ResultBean rb=new ResultBean().fail();
ProjectDailyQuery params = query;
QueryWrapper<ProjectDaily> qw = new QueryWrapper<>();
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
if (params != null) {
if (com.yxt.common.base.utils.StringUtils.isNotBlank(params.getOrderDate())) {
qw.eq("orderDate", params.getOrderDate());
}else{
qw.eq("orderDate",sdf.format(DateUtil.yesterday()));
}
if (com.yxt.common.base.utils.StringUtils.isNotBlank(params.getProjectSid())) {

4
yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/riskmessageslog/RiskMessagesLogMapper.java
View File

@ -11,6 +11,8 @@ import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import java.util.List;
/**
* @author wangpengfei
* @date 2023/7/27 9:56
@ -27,4 +29,6 @@ public interface RiskMessagesLogMapper extends BaseMapper<RiskMessagesLog> {
RiskMessagesLogVo getMessage();
@Select("select count(*) from risk_messages_log i left join risk_message_user m on m.messageSid=i.sid where m.state='0' and m.openId =#{openId}")
Integer getMessageCount(@Param("openId") String openId);
List<RiskMessagesLogVo> messageNotice(@Param(Constants.WRAPPER) Wrapper<RiskMessagesLog> qw);
}

43
yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/riskmessageslog/RiskMessagesLogMapper.xml
View File

@ -67,4 +67,47 @@
report_sales_day_store
<where> ${ew.sqlSegment} </where>
</select>
<select id="messageNotice" resultType="com.yxt.supervise.report.api.riskmessageslog.RiskMessagesLogVo">
SELECT
log.messageTime,
log.content,
CASE
log.state
WHEN '1' THEN '设备离线'
WHEN '2' THEN '设备离线解除'
WHEN '3' THEN '系统异常'
WHEN '4' THEN '系统异常解除'
END AS type
FROM
risk_messages_log log
LEFT JOIN risk_message_user message ON log.sid =message.messageSid
<where> ${ew.sqlSegment} </where>
UNION
SELECT
log.messageTime,
log.content,
CASE
log.state
WHEN '1' THEN '每日数据上报'
END AS type
FROM
message_push_log log
LEFT JOIN message_openid message ON log.sid = message.messageSid
<where> ${ew.sqlSegment} </where>
UNION
SELECT
log.messageTime,
log.content,
CASE
log.state
WHEN '1' THEN '图片对比异常'
END AS type
FROM
img_messages_log log
LEFT JOIN img_message_user message ON log.sid = message.messageSid
<where> ${ew.sqlSegment} </where>
ORDER BY
messageTime DESC
LIMIT 4
</select>
</mapper>

5
yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/riskmessageslog/RiskMessagesLogRest.java
View File

@ -41,5 +41,8 @@ public class RiskMessagesLogRest {
public ResultBean getMessageBySid(@PathVariable("sid") String sid,@PathVariable("wxCode") String wxCode ){
return RiskMessagesLogService.getMessageBySid(sid,wxCode);
}
@GetMapping("/messageNotice/{userSid}")
public ResultBean messageNotice(@PathVariable("userSid") String userSid){
return RiskMessagesLogService.messageNotice(userSid);
}
}

8
yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/riskmessageslog/RiskMessagesLogService.java
View File

@ -140,4 +140,12 @@ public class RiskMessagesLogService extends MybatisBaseService<RiskMessagesLogMa
PagerVo<RiskMessagesLogVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public ResultBean messageNotice(String userSid){
ResultBean rb=new ResultBean();
SysUser sysUser=systemMapper.getAppletOpenidByUsersid(userSid);
QueryWrapper<RiskMessagesLog> qw = new QueryWrapper<>();
qw.eq("message.openId",sysUser.getOpenId());
// qw.orderByDesc("messageTime");
return rb.success().setData(baseMapper.messageNotice(qw));
}
}

Write Preview
Loading…
Cancel
Save