Skip to content

Z
zjnyxcxServer
Commit 55a42a80 by lixinming
Options

Merge branch 'master' of http://123.207.147.179:8888/node_server/zjnyxcxServer 

# Conflicts:
#	src/biz/xcx/diKuai.ts
#	src/routers/admin.ts
parents 75350878 89c6a75a
Showing with 1565 additions and 161 deletions
package-lock.json
This source diff could not be displayed because it is too large. You can view the blob instead.
package.json
......@@ -29,7 +29,6 @@
"ws": "^5.2.2",
"xml2js": "^0.4.23"
},
"devDependencies": {},
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
},
......
serverConfig.xml
<config>
<port>13281</port>
<mongodb>
<path>127.0.0.1</path>
<path>192.168.0.105</path>
<port>27017</port>
<w>1</w>
<!-- <dataBase>baseDB</dataBase> -->
......
src/biz/admin/caiShou.ts 0 → 100644
/**
* 采收逻辑
*/
import { TABLENAME } from "../../config/dbEnum";
import { CaiShouConfig } from "../../config/eccParam";
import { PLANTTYPE, PURPOSE, ZHONGYANGTYPE } from "../../config/enum";
import { ERRORENUM } from "../../config/errorEnum";
import * as caishouData from "../../data/caishou";
import * as dikuaiData from "../../data/dikuai";
import * as zhongzhiData from "../../data/zhongzhi";
import { randomId, successResult } from "../../tools/system";
import { BizError } from "../../util/bizError";
import { changeEnumValue, eccEnumValue } from "../../util/verificationEnum";
import { eccFormParam } from "../../util/verificationParam";
import moment = require("moment");
/**
* 添加采收
* @param reqUser
* @param param
* @returns
*/
export async function addCaiShou(reqUser, param) {
let funName = `添加采收`;
eccFormParam(funName, CaiShouConfig, param );
eccEnumValue(funName, "plantType", PLANTTYPE, param.plantType);
//修改种养
let zhongyangParam = {isEnd:0, plantType:param.plantType, dId:param.dId};
let zhongzhiList = await zhongzhiData.selectToParam(zhongyangParam);
let sizeCount = 0;
for (let i = 0; i < zhongzhiList.length; i++) {
let {dId, size} = zhongzhiList[i];
sizeCount += size;
}
//释放地块
let diKuaiInfo = await dikuaiData.selectOne({dId:param.dId});
diKuaiInfo.nullSize = diKuaiInfo.nullSize + sizeCount;
diKuaiInfo.useSize = diKuaiInfo.useSize - sizeCount;
await diKuaiInfo.save();
let csId = randomId(TABLENAME.采收);
//改变种植面积
await zhongzhiData.updateManyToParam({isEnd:0, plantType:param.plantType}, {isEnd:1, csId});
//添加采收记录
let addInfo = {
csId,
dIdList:param.dId,
plantType:param.plantType,
operationTime:param.operationTime,
weight:param.weight,
ct:new Date().valueOf(),
createUser:reqUser.userId
};
await caishouData.addData(addInfo)
return successResult();
}
/**
* 采收列表
* @param selectStr
* @param dId
* @param zhongYangType
* @param plantType
* @param operationTime
* @returns
*/
export async function caiShouList(zhongYangType:number, dId:string, plantType:number, operationTime:number, pageNumber) {
let funName = "采收列表";
eccEnumValue(funName, "zhongYangType", ZHONGYANGTYPE, zhongYangType);
let param:any = { plantType : {"$gte":zhongYangType, "$lt":zhongYangType+99} };
if (plantType) {
eccEnumValue(funName, "plantType", PLANTTYPE, plantType);
param.plantType = plantType;
}
if (dId) {
param.dIdList = {"$in":[dId]};
}
if (operationTime) {
let startMs = moment(operationTime).startOf("day").valueOf();
let endMs = moment(operationTime).endOf("day").valueOf();
param.operationTime = {"$gte":startMs, "$lte":endMs};
}
let dikuaiList = await dikuaiData.selectToParam({});
let diKuaiMap = {};
dikuaiList.forEach(info => {
let {dId, code, purpose} = info;
diKuaiMap[dId] = {code, purpose};
});
let caishouList = await caishouData.findDataToParamToSortPage(param, {operationTime:-1}, pageNumber);
let dataCount = await caishouData.findDataToParamCouant(param);
let dataList = [];
caishouList.forEach(item => {
let {csId, plantType, dIdList, operationTime, weight, ct } = item;
let dIds = dIdList;
let didStr = "";
let purpose = "-";
dIds.forEach(dId => {
didStr += `${diKuaiMap[dId].code} `;
purpose = `${changeEnumValue(PURPOSE, diKuaiMap[dId].purpose)} `;
});
let operationTimeNum;
if (operationTime) operationTimeNum = operationTime;
else operationTimeNum = ct
dataList.push({
csId,
plantType:changeEnumValue(PLANTTYPE, plantType),
code:didStr || "-",
purpose,
operationTime:moment(operationTimeNum).format("YYYY-MM-DD"),
weight,
operationTimeNum,
ctTime:moment(ct).format("YYYY-MM-DD"),
});
});
dataList.sort( (a, b) => {
return b.operationTimeNum - a.operationTimeNum;
})
return {dataList, dataCount}
}
/**
* 采收回显
* @param csId
* @returns
*/
export async function caishouInfo(csId) {
let caishouInfo = await caishouData.findOne({csId});
let dataInfo = {
plantType:changeEnumValue(PLANTTYPE, caishouInfo.plantType),
code:caishouInfo.dIdList[0] || "",
operationTime:moment(caishouInfo.operationTime).format("YYYY-MM-DD"),
weight:caishouInfo.weight
};
return dataInfo;
}
/**
* 修改采收
* @param reqUser
* @param csId
* @param param
* @returns
*/
export async function updateCaiShou(reqUser, csId, param) {
let funName = `修改采收`;
eccFormParam(funName, CaiShouConfig, param );
eccEnumValue(funName, "plantType", PLANTTYPE, param.plantType);
let dikuaiList = await dikuaiData.selectToParam({});
let diKuaiMap = {};
dikuaiList.forEach(info => {
let {dId, code} = info;
diKuaiMap[dId] = code;
});
if (!diKuaiMap[param.dId]) throw new BizError(ERRORENUM.地块不存在, param.dIdList);
let caiShouInfo = await caishouData.findOne({csId});
caiShouInfo.plantType = param.plantType; //种植种类【枚举】 PLANTTYPE
caiShouInfo.dIdList = param.dId;//地块id
caiShouInfo.weight = param.weight;//采收重量
caiShouInfo.operationTime = param.operationTime; //采收时间
await caiShouInfo.save();
return successResult();
}
/**
* 删除采收
* @param nzId
* @returns
*/
export async function deleteCaiShou(csId) {
let caishouInfo = await caishouData.findOne({csId});
if (!caishouInfo || !caishouInfo.csId) throw new BizError(ERRORENUM.数据不存在);
await caishouData.deleteData({csId});
return successResult();
}
src/biz/diKuai.ts → src/biz/admin/diKuai.ts
......@@ -2,15 +2,16 @@
* 地块
*/
import { TABLENAME } from "../config/dbEnum";
import { DiKuaiConfig, YangZhiChiConfig } from "../config/eccParam";
import { AREARANGE, PLANTTYPE, PLOTTYPE, PURPOSE, ZHONGYANGTYPE } from "../config/enum";
import { ERRORENUM } from "../config/errorEnum";
import * as dikuaiData from "../data/dikuai";
import { randomId, successResult } from "../tools/system";
import { BizError } from "../util/bizError";
import { changeEnumValue, eccEnumValue } from "../util/verificationEnum";
import { eccFormParam } from "../util/verificationParam";
import moment = require("moment");
import { TABLENAME } from "../../config/dbEnum";
import { DiKuaiConfig, YangZhiChiConfig } from "../../config/eccParam";
import { AREARANGE, PLANTTYPE, PLOTTYPE, PURPOSE, ZHONGYANGTYPE } from "../../config/enum";
import { ERRORENUM } from "../../config/errorEnum";
import * as dikuaiData from "../../data/dikuai";
import { randomId, successResult } from "../../tools/system";
import { BizError } from "../../util/bizError";
import { changeEnumValue, eccEnumValue } from "../../util/verificationEnum";
import { eccFormParam } from "../../util/verificationParam";
/**
......@@ -60,8 +61,6 @@ export async function addDiKuai(reqUser, plotType, param) {
* @returns
*/
export async function diKuaiInfo(dId:String ) {
let funName = "地块信息";
let dikuaiInfo = await dikuaiData.selectOne({dId});
let dataInfo = {
size:dikuaiInfo.size,
......@@ -76,7 +75,7 @@ export async function diKuaiInfo(dId:String ) {
/**
* 地块列表
* 地块列表-暂无使用
* @param plotType
* @param selectStr
* @param code
......@@ -111,28 +110,46 @@ export async function diKuaiList(plotType:number, selectStr:string, code:string,
return {dataList}
}
/**
* 地块列表分页
* @param plotType
* @param selectStr
* @param code
* @param purpose
* @param area
* @param code 地块编号 string
* @param area 地块区域 string
* @param purpose 地块用途 number
* @param pageNumber 页码
* @returns
*
*/
export async function diKuaiListToPage(pageNumber) {
export async function diKuaiListToPage(code, area, purpose, pageNumber) {
let funName = "地块列表";
let param:any = {};
if (code) {
param.code = { "$regex":code };
}
if (area) {
param.area = { "$regex":area };
}
if (purpose) {
eccEnumValue(funName, "purpose", PURPOSE, purpose);
param.purpose = purpose;
}
let diKuaiList = await dikuaiData.findDataToParamToPage({}, pageNumber);
let diKuaiList = await dikuaiData.findDataToParamToSortPage(param, {ct:-1}, pageNumber);
let dataCount = await dikuaiData.findDataToParamCouant({});
let dataList = [];
diKuaiList.forEach(item => {
let { size, dId, purpose, code, area, ct } = item;
dataList.push({size,dId,type:changeEnumValue(PURPOSE, purpose),code,area,
let { size, dId, plotType, purpose, code, area, ct } = item;
dataList.push({
size,
dId,
plotType:changeEnumValue(PLOTTYPE, plotType),
type:changeEnumValue(PURPOSE, purpose),
code,
area,
ct:moment(ct).format("YYYY-MM-DD")
});
});
return {dataList}
return {dataList, dataCount}
}
......@@ -183,7 +200,7 @@ export async function keXuanDiKuaiList(zhongYangType:number) {
if (zhongYangType == ZHONGYANGTYPE.水产) purpose = PURPOSE.养殖;
else if (zhongYangType == ZHONGYANGTYPE.花卉 ||zhongYangType == ZHONGYANGTYPE.蔬菜 ) purpose = PURPOSE.菜田;
else if (zhongYangType == ZHONGYANGTYPE.粮食) purpose = PURPOSE.粮田;
param.nullSize = {"$gt":0};
// param.nullSize = {"$gt":0};
param.purpose = purpose;
}
......@@ -203,7 +220,7 @@ export async function keXuanDiKuaiList(zhongYangType:number) {
/**
* 当前采收地块列表
* 当前采收地块列表-暂无使用
* @returns
*/
export async function keCaiShouList(zhongYangType:number) {
......@@ -226,7 +243,7 @@ export async function keCaiShouList(zhongYangType:number) {
}
/**
* 全部地块列表
* 全部地块列表-暂无使用
* @param plotType
* @param selectStr
* @param code
......@@ -249,3 +266,4 @@ export async function allDiKuaiList(plotType:number ) {
return {dataList}
}
src/biz/admin/nongShi.ts 0 → 100644
import { TABLENAME } from "../../config/dbEnum";
import { CaiShouConfig, NongShiAdminConfig } from "../../config/eccParam";
import { NONGSHITYPE, PLANTTYPE, PURPOSE } from "../../config/enum";
import * as nongshiData from "../../data/nongshi";
import * as dikuaiData from "../../data/dikuai";
import { getMySqlMs, randomId, successResult } from "../../tools/system";
import { changeEnumValue, eccEnumValue } from "../../util/verificationEnum";
import { eccFormParam } from "../../util/verificationParam";
import moment = require("moment");
import { BizError } from "../../util/bizError";
import { ERRORENUM } from "../../config/errorEnum";
/**
* 添加农事
* @param reqUser
* @param param
* @returns
*/
export async function addNongShi(reqUser, param) {
let funName = `添加农事`;
eccFormParam(funName, NongShiAdminConfig, param );
eccEnumValue(funName, "nsType", NONGSHITYPE, param.nsType);
//确保添加时地块还在
let dikuaiList = await dikuaiData.selectToParam({});
let diKuaiMap = {};
dikuaiList.forEach(info => {
let {dId, code} = info;
diKuaiMap[dId] = code;
});
if (!diKuaiMap[param.dIdList]) throw new BizError(ERRORENUM.地块不存在, param.dIdList);
let addInfo = {
nsId:randomId(TABLENAME.农事),
nsType:param.nsType,
dIdList:[param.dIdList],
operationTime:param.operationTime,
ct:new Date().valueOf()
};
await nongshiData.addData(addInfo)
return successResult();
}
/**
* 农事列表
* @param selectStr
* @param dId
* @param nsType
* @param operationTime
* @returns
*/
export async function nongShiList(nsType:number, dId:string, operationTime:number, pageNumber:number) {
let funName = "农事列表";
let param:any = {};
if (nsType) {
eccEnumValue(funName, "nsType", NONGSHITYPE, nsType);
param.nsType = nsType;
}
if (dId) {
param.dIdList = {"$in":dId};
}
if (operationTime) {
let startMs = moment(operationTime).startOf("day").valueOf();
let endMs = moment(operationTime).endOf("day").valueOf();
param.operationTime = {"$gte":startMs, "$lte":endMs};
}
let dikuaiList = await dikuaiData.selectToParam({});
let diKuaiMap = {};
dikuaiList.forEach(info => {
let {dId, code, purpose} = info;
diKuaiMap[dId] = {code, purpose};
});
let nongShiList = await nongshiData.findDataToParamToSortPage(param, {operationTime:-1}, pageNumber);
let dataCount = await nongshiData.findDataToParamCouant({});
let dataList = [];
nongShiList.forEach(item => {
let {nsId, nsType, dIdList, operationTime } = item;
let dIds = dIdList;
let didStr = "";
let purpose = "";
dIds.forEach(dId => {
didStr += `${diKuaiMap[dId].code} `;
purpose += `${changeEnumValue(PURPOSE, diKuaiMap[dId].purpose)} `;
});
dataList.push({
nsId,
nsType:changeEnumValue(NONGSHITYPE, nsType),
// dIdList:didStr,
operationTime:moment(operationTime).format("YYYY-MM-DD"),
operationTimeNum:operationTime,
code:didStr,
purpose,
});
});
dataList.sort( (a, b) => {
return b.operationTimeNum - a.operationTimeNum;
})
return {dataList, dataCount}
}
/**
* 农事回显
* @param nzId
* @returns
*/
export async function nongShiInfo(nsId) {
let nongShiInfo = await nongshiData.findOne({nsId});
let dikuaiList = await dikuaiData.selectToParam({});
let diKuaiMap = {};
dikuaiList.forEach(info => {
let {dId, code, purpose} = info;
diKuaiMap[dId] = {code, purpose};
});
let didStr = "";
let purpose = "";
nongShiInfo.dIdList.forEach(dId => {
didStr += `${diKuaiMap[dId].code} `;
purpose += `${changeEnumValue(PURPOSE, diKuaiMap[dId].purpose)} `;
});
let dataInfo = {
nsType:changeEnumValue(NONGSHITYPE, nongShiInfo.nsType),
operationTime:moment(nongShiInfo.operationTime).format("YYYY-MM-DD"),
code:didStr,
purpose
};
return dataInfo;
}
/**
* 修改农事
* @param reqUser
* @param nzId
* @param param
* @returns
*/
export async function updateNongShi(reqUser, nsId, param) {
let funName = `修改农事`;
eccFormParam(funName, NongShiAdminConfig, param );
eccEnumValue(funName, "nsType", NONGSHITYPE, param.nsType);
let dikuaiList = await dikuaiData.selectToParam({});
let diKuaiMap = {};
dikuaiList.forEach(info => {
let {dId, code, purpose} = info;
diKuaiMap[dId] = {code, purpose};
});
if (!diKuaiMap[param.dIdList]) throw new BizError(ERRORENUM.地块不存在, param.dIdList);
let nongShiInfo = await nongshiData.findOne({nsId});
nongShiInfo.nsType = param.nsType;//农资类型
nongShiInfo.dIdList = param.dIdList;//地块id
nongShiInfo.operationTime = param.operationTime; //操作时间
await nongShiInfo.save();
return successResult();
}
/**
* 删除农事
* @param nzId
* @returns
*/
export async function deleteNongShi(nsId) {
let nongShiInfo = await nongshiData.findOne({nsId});
if (!nongShiInfo || !nongShiInfo.nsId) throw new BizError(ERRORENUM.数据不存在);
await nongshiData.deleteData({nsId});
return successResult();
}
src/biz/admin/nongzi.ts 0 → 100644
/**
* 农资
*/
import moment = require("moment");
import { TABLENAME } from "../../config/dbEnum";
import { NongZiConfig } from "../../config/eccParam";
import { NONGZITYPE, PLANTTYPE, PURPOSE } from "../../config/enum";
import * as nongziData from "../../data/nongzi";
import * as dikuaiData from "../../data/dikuai";
import { randomId, successResult } from "../../tools/system";
import { changeEnumValue, eccEnumValue } from "../../util/verificationEnum";
import { eccFormParam } from "../../util/verificationParam";
import { BizError } from "../../util/bizError";
import { ERRORENUM } from "../../config/errorEnum";
/**
* 添加农资
* @param reqUser
* @param param
* @returns
*/
export async function addNongZi(reqUser, param) {
let funName = `添加农资`;
eccFormParam(funName, NongZiConfig, param );
eccEnumValue(funName, "nzType", NONGZITYPE, param.nzType);
eccEnumValue(funName, "plantType", PLANTTYPE, param.plantType);
//确保添加时地块还在
let dikuaiList = await dikuaiData.selectToParam({});
let diKuaiMap = {};
dikuaiList.forEach(info => {
let {dId, code} = info;
diKuaiMap[dId] = code;
});
if (!diKuaiMap[param.dIdList]) throw new BizError(ERRORENUM.地块不存在, param.dIdList);
let addInfo = {
nzId:randomId(TABLENAME.农资),
nzType:param.nzType,
dIdList:[param.dIdList],
plantType:param.plantType,
count:param.count,
useTime:param.useTime,
ct:new Date().valueOf()
};
await nongziData.addData(addInfo)
return successResult();
}
/**
* 农资列表 暂无使用
* @param selectStr
* @param dId
* @param nzType
* @param useTime
* @returns
*/
export async function nongZiList(selectStr:string, dId:string, nzType:number, useTime:number) {
let funName = "农资列表";
let param:any = {};
if (nzType) {
eccEnumValue(funName, "nzType", NONGZITYPE, nzType);
param.nzType = nzType;
}
if (dId) {
param.dIdList = {"$in":dId};
}
if (useTime) {
let startMs = moment(useTime).startOf("day").valueOf();
let endMs = moment(useTime).endOf("day").valueOf();
param.useTime = {"$gte":startMs, "$lte":endMs};
}
let dikuaiList = await dikuaiData.selectToParam({});
let diKuaiMap = {};
dikuaiList.forEach(info => {
let {dId, code} = info;
diKuaiMap[dId] = code;
});
let diKuaiList = await nongziData.selectToParam( param );
let dataList = [];
diKuaiList.forEach(item => {
let {nzType, dIdList, plantType, count, useTime } = item;
let didStr = "";
dIdList.forEach(dId => {
didStr += `${diKuaiMap[dId] || "-"}`;
})
dataList.push({
nzType:changeEnumValue(NONGZITYPE, nzType),
dIdList:didStr,
plantType:changeEnumValue(PLANTTYPE, plantType),
count,
useTime:moment(useTime).format("YYYY-MM-DD")
});
});
return {dataList};
}
/**
* 修改农资
* @param reqUser
* @param nzId
* @param param
* @returns
*/
export async function updateNongZi(reqUser, nzId, param) {
let funName = `修改农资`;
eccFormParam(funName, NongZiConfig, param);
eccEnumValue(funName, "nzType", NONGZITYPE, param.nzType);
eccEnumValue(funName, "plantType", PLANTTYPE, param.plantType);
let dikuaiList = await dikuaiData.selectToParam({});
let diKuaiMap = {};
dikuaiList.forEach(info => {
let {dId, code} = info;
diKuaiMap[dId] = code;
});
if (!diKuaiMap[param.dIdList]) throw new BizError(ERRORENUM.地块不存在, param.dIdList);
let nongZiInfo = await nongziData.findOne({nzId});
nongZiInfo.nzType = param.nzType;//农资类型
nongZiInfo.dIdList = param.dIdList;//地块id
nongZiInfo.plantType = param.plantType; //种植种类【枚举】 PLANTTYPE
nongZiInfo.count = param.count;//用量
nongZiInfo.useTime = param.useTime; //用时间
await nongZiInfo.save();
return successResult();
}
/**
* 农资回显
* @param nzId
* @returns
*/
export async function nongZiInfo(nzId) {
let nongZiInfo = await nongziData.findOne({nzId});
let dataInfo = {
nzType:nongZiInfo.nzType,//农资类型
// dIdList:didStr, //地块id
dIdList:nongZiInfo.dIdList[0],//地块id
plantType:nongZiInfo.plantType,//种植种类【枚举】 PLANTTYPE
count:nongZiInfo.count,//用量
useTime:nongZiInfo.useTime//时间
};
return {dataInfo}
}
/**
* 农资列表
* @param selectStr
* @param dId
* @param nzType
* @param useTime
* @returns
*/
export async function nongZiListToPage(nzType:number, dId:string, useTime:number, pageNumber:number) {
let funName = "农资列表";
let param:any = {};
if (nzType) {
eccEnumValue(funName, "nzType", NONGZITYPE, nzType);
param.nzType = nzType;
}
if (dId) {
param.dIdList = {"$in":dId};
}
if (useTime) {
let startMs = moment(useTime).startOf("day").valueOf();
let endMs = moment(useTime).endOf("day").valueOf();
param.useTime = {"$gte":startMs, "$lte":endMs};
}
let dikuaiList = await dikuaiData.selectToParam({});
let diKuaiMap = {};
dikuaiList.forEach(info => {
let {dId, code, purpose} = info;
diKuaiMap[dId] = {code, purpose};
});
let nongziList = await nongziData.findDataToParamToSortPage( param, {useTime:-1}, pageNumber );
let dataCount = await nongziData.findDataToParamCouant(param);
let dataList = [];
nongziList.forEach(item => {
let {nzId, nzType, dIdList, plantType, count, useTime, ct } = item;
let didStr = "";
let area = "";
let purpose = "";
let size = "";
dIdList.forEach(dId => {
didStr += `${diKuaiMap[dId].code || "-"}`;
purpose = diKuaiMap[dId].purpose;
})
dataList.push({
nzId,
nzType:changeEnumValue(NONGZITYPE, nzType), //农资类型
dIdList:didStr, //地块id
plantType:changeEnumValue(PLANTTYPE, plantType), //种植种类【枚举】 PLANTTYPE
count, //用量
useTime:moment(useTime).format("YYYY-MM-DD"), //时间
ct:moment(ct).format("YYYY-MM-DD"), //创建时间
area, //所属区域
purpose:changeEnumValue(PURPOSE, purpose), //地块用途
size, //地块面积
});
});
return {dataList, dataCount}
}
/**
* 删除农资
* @param nzId
* @returns
*/
export async function deleteNongZi(nzId) {
let nongZiInfo = await nongziData.findOne({nzId});
if (!nongZiInfo || !nongZiInfo.nzId) throw new BizError(ERRORENUM.数据不存在);
await nongziData.deleteData({nzId});
return successResult();
}
src/biz/admin/xiaoShou.ts 0 → 100644
/**
* 销售
*/
import { TABLENAME } from "../../config/dbEnum";
import { XiaoShouConfig } from "../../config/eccParam";
import { PLANTTYPE, XIAOSHOUQUXIANG } from "../../config/enum";
import * as xiaoshouData from "../../data/xiaoshou";
import * as dikuaiData from "../../data/dikuai";
import { randomId, successResult } from "../../tools/system";
import { changeEnumValue, eccEnumValue } from "../../util/verificationEnum";
import { eccFormParam } from "../../util/verificationParam";
import moment = require("moment");
import { BizError } from "../../util/bizError";
import { ERRORENUM } from "../../config/errorEnum";
/**
* 添加销售
* @param reqUser
* @param param
* @returns
*/
export async function addXiaoShou(reqUser, param) {
let funName = `添加销售`;
eccFormParam(funName, XiaoShouConfig, param );
eccEnumValue(funName, "quXiang", XIAOSHOUQUXIANG, param.quXiang);
eccEnumValue(funName, "plantType", PLANTTYPE, param.plantType);
let addInfo = {
xsId:randomId(TABLENAME.销售),
quXiang:param.quXiang,
plantType:param.plantType,
operationTime:param.operationTime,
weight:param.weight,
ct:new Date().valueOf(),
createUser:reqUser.userId
};
await xiaoshouData.addData(addInfo)
return successResult();
}
/**
* 销售列表
* @param quXiang 销售去向
* @param plantType
* @param operationTime
* @returns
*/
export async function xiaoShouList(quXiang:number, plantType:number, operationTime:number, pageNumber:number) {
let funName = "销售列表";
let param:any = {};
if (plantType) {
eccEnumValue(funName, "plantType", PLANTTYPE, plantType);
param.plantType = plantType;
}
if (quXiang) {
eccEnumValue(funName, "quXiang", XIAOSHOUQUXIANG, quXiang);
param.quXiang = quXiang;
}
if (operationTime) {
let startMs = moment(operationTime).startOf("day").valueOf();
let endMs = moment(operationTime).endOf("day").valueOf();
param.operationTime = {"$gte":startMs, "$lte":endMs};
}
let xiaoShouData = await xiaoshouData.findDataToParamToSortPage(param, {operationTime:-1}, pageNumber);
let dataCount = await xiaoshouData.selectCountByParam(param);
let dataList = [];
xiaoShouData.forEach(item => {
let {xsId, plantType, quXiang, operationTime, weight } = item;
dataList.push({
xsId,
plantType:changeEnumValue(PLANTTYPE, plantType),
quXiang:changeEnumValue(XIAOSHOUQUXIANG, quXiang),
operationTime:moment(operationTime).format("YYYY-MM-DD"),
weight,
operationTimeNum:operationTime
});
});
dataList.sort( (a, b) => {
return b.operationTimeNum - a.operationTimeNum;
})
return {dataList, dataCount}
}
/**
* 修改销售
* @param reqUser
* @param nzId
* @param param
* @returns
*/
export async function updateXiaoShou(reqUser, xsId, param) {
let funName = `修改销售`;
eccFormParam(funName, XiaoShouConfig, param );
eccEnumValue(funName, "quXiang", XIAOSHOUQUXIANG, param.quXiang);
eccEnumValue(funName, "plantType", PLANTTYPE, param.plantType);
let xiaoShouInfo = await xiaoshouData.selectOne({xsId});
xiaoShouInfo.plantType = param.plantType;//销售种类【枚举】 PLANTTYPE
xiaoShouInfo.quXiang = param.quXiang;//销售去向
xiaoShouInfo.operationTime = param.operationTime;//销售时间
xiaoShouInfo.weight = param.weight;//销售重量
await xiaoShouInfo.save();
return successResult();
}
/**
* 销售回显
* @param nzId
* @returns
*/
export async function xiaoShouInfo(xsId) {
let xiaoShouInfo = await xiaoshouData.selectOne({xsId});
let dataInfo = {
plantType:changeEnumValue(PLANTTYPE, xiaoShouInfo.plantType),//种植种类【枚举】 PLANTTYPE
quXiang:changeEnumValue(XIAOSHOUQUXIANG, xiaoShouInfo.quXiang),//销售去向
operationTime:moment(xiaoShouInfo.operationTime).format("YYYY-MM-DD"),//销售时间
weight:xiaoShouInfo.weight//销售重量
};
return dataInfo;
}
/**
* 删除销售
* @param nzId
* @returns
*/
export async function deleteXiaoShou(xsId) {
let xiaoShouInfo = await xiaoshouData.selectOne({xsId});
if (!xiaoShouInfo || !xiaoShouInfo.xsId) throw new BizError(ERRORENUM.数据不存在);
await xiaoshouData.deleteData({xsId});
return successResult();
}
src/biz/zhongYang.ts → src/biz/admin/zhongYang.ts
......@@ -3,19 +3,19 @@
*/
import moment = require("moment");
import { TABLENAME } from "../config/dbEnum";
import { DiKuaiConfig, ZhongYangConfig } from "../config/eccParam";
import { PLANTTYPE, PLOTTYPE, ZHONGYANGTYPE } from "../config/enum";
import * as zhongzhiData from "../data/zhongzhi";
import * as dikuaiData from "../data/dikuai";
import { randomId, successResult } from "../tools/system";
import { changeEnumValue, eccEnumValue } from "../util/verificationEnum";
import { eccFormParam } from "../util/verificationParam";
import { BizError } from "../util/bizError";
import { ERRORENUM } from "../config/errorEnum";
import { TABLENAME } from "../../config/dbEnum";
import { DiKuaiConfig, ZhongYangConfig } from "../../config/eccParam";
import { PLANTTYPE, PLOTTYPE, PURPOSE, ZHONGYANGTYPE } from "../../config/enum";
import * as zhongzhiData from "../../data/zhongzhi";
import * as dikuaiData from "../../data/dikuai";
import { randomId, successResult } from "../../tools/system";
import { changeEnumValue, eccEnumValue } from "../../util/verificationEnum";
import { eccFormParam } from "../../util/verificationParam";
import { BizError } from "../../util/bizError";
import { ERRORENUM } from "../../config/errorEnum";
/**
* 种养列表
* 种养列表-暂无使用
* @param plantType 种养类型
* @param selectStr
* @returns
......@@ -41,32 +41,76 @@ export async function zhongYangDangQianList(zhongYangType:number, selectStr:stri
}
export async function zhongYangDangQianListToPage(zhongYangType:number, selectStr:string, pageNumber) {
/**
* 种养列表-分页
* @param zhongYangType 种养类型
* @param dId 使用地块
* @param plantTime 种养时间
* @param pageNumber
* @returns
*/
export async function zhongYangDangQianListToPage(zhongYangType:number, plantType:number, dId:number, plantTime:number, pageNumber:number) {
let funName = `当前种养列表`;
let param:any = { };
if (zhongYangType) {
eccEnumValue(funName, 'zhongYangType', ZHONGYANGTYPE, zhongYangType);
param.plantType = {"$gte":zhongYangType, "$lt":zhongYangType+99};
let param:any = { plantType:{"$gte":zhongYangType, "$lt":zhongYangType+99} };
if (plantType) {
eccEnumValue(funName, "plantType", PLANTTYPE, plantType);
param.plantType = plantType;
}
if (dId) {
param.dId = dId;
}
if (plantTime) {
let selectStartTime = moment(plantTime).startOf('day').valueOf();
let selectEndTime = moment(plantTime).endOf("day").valueOf();
// let selectStartTime = moment(plantTime).valueOf();
// let selectEndTime = moment(plantTime).valueOf();
param.plantTime = {"$gte":selectStartTime, "$lte":selectEndTime};
}
let zyList = await zhongzhiData.findDataToParamToPage( param, pageNumber );
/**获取地块名称 */
let dikuaiList = await dikuaiData.selectToParam({});
let diKuaiMap = {};
dikuaiList.forEach(info => {
let {dId, code, purpose} = info;
diKuaiMap[dId] = {code, purpose};
});
let zyList = await zhongzhiData.findDataToParamToSortPage( param, {plantTime:-1}, pageNumber );
let dataCount = await zhongzhiData.findDataToParamCouant(param);
let dataList = [];
zyList.forEach(info => {
let code = "-";
let purpose = "-";
if (diKuaiMap[info.dId]) {
code = diKuaiMap[info.dId].code;
purpose = changeEnumValue(PURPOSE, diKuaiMap[info.dId].purpose);
}
let addInfo = {
zId : info.zId,
size : info.size,
plantType : info.plantType,
dId : info.dId,
plantTime : info.plantTime
plantType : changeEnumValue(PLANTTYPE, info.plantType),
code,
plantTime:moment(info.plantTime).format("YYYY-MM-DD"),
purpose,
plantTimeNum:info.plantTime,
ctTime:moment(info.ct).format("YYYY-MM-DD"),
};
dataList.push(addInfo);
});
dataList.sort( (a, b) => {
return b.plantTimeNum - a.plantTimeNum;
})
return {dataList, dataCount};
}
/**
* 删除种养
* @param zId
* @returns
*/
export async function deleteZhongYang(zId) {
let zhongYangInfo = await zhongzhiData.selectOne({zId});
if (!zhongYangInfo || !zhongYangInfo.zId) throw new BizError(ERRORENUM.数据不存在);
......@@ -91,7 +135,7 @@ export async function addZhongYang(reqUser, param) {
//校验地块大小是否符合扣除
let dkInfo = await dikuaiData.selectOne({dId:param.dId});
if (!dkInfo || !dkInfo.dId) throw new BizError(ERRORENUM.地块不存在);
if (dkInfo.nullSize < param.size) throw new BizError(ERRORENUM.地块大小不足);
if (dkInfo.size < param.size) throw new BizError(ERRORENUM.地块大小不足);
let addInfo = {
zId:randomId(TABLENAME.种植表),
......@@ -114,6 +158,13 @@ export async function addZhongYang(reqUser, param) {
}
/**
* 修改种养
* @param reqUser
* @param zId
* @param param
* @returns
*/
export async function updateZhongYang(reqUser, zId, param) {
let funName = `修改种养`;
eccFormParam(funName, ZhongYangConfig, param);
......@@ -121,7 +172,7 @@ export async function updateZhongYang(reqUser, zId, param) {
let dkInfo = await dikuaiData.selectOne({dId:param.dId});
if (!dkInfo || !dkInfo.dId) throw new BizError(ERRORENUM.地块不存在);
if (dkInfo.nullSize < param.size) throw new BizError(ERRORENUM.地块大小不足);
if (dkInfo.size < param.size) throw new BizError(ERRORENUM.地块大小不足);
let zhongYangInfo = await zhongzhiData.selectOne({zId});
......@@ -136,6 +187,11 @@ export async function updateZhongYang(reqUser, zId, param) {
}
/**
* 种养回显
* @param zId
* @returns
*/
export async function zhognYangInfo(zId) {
let dikuaiInfo = await zhongzhiData.selectOne({zId});
......@@ -151,7 +207,7 @@ export async function zhognYangInfo(zId) {
/**
* 种养记录
* 种养记录-暂无使用
* @param zhongYangType
* @param selectStr
* @param plantType
......@@ -171,9 +227,9 @@ export async function zhongYangJiLu(zhongYangType:number, selectStr:string, plan
param.dId = dId;
}
if (plantTime) {
let selectStartTime = moment(plantTime).startOf('month').valueOf();
let selectEndTime = moment(plantTime).endOf("month").valueOf();
param.plantTime = {"$gt":selectStartTime, "$lt":selectEndTime};
let selectStartTime = moment(plantTime).startOf('day').valueOf();
let selectEndTime = moment(plantTime).endOf("day").valueOf();
param.plantTime = {"$gte":selectStartTime, "$lte":selectEndTime};
}
/**获取地块名称 */
......@@ -197,3 +253,5 @@ export async function zhongYangJiLu(zhongYangType:number, selectStr:string, plan
return {dataList};
}
src/biz/caiShou.ts → src/biz/xcx/caiShou.ts
/**
* 采收逻辑
* 小程序-采收逻辑
*/
import { TABLENAME } from "../config/dbEnum";
import { CaiShouConfig } from "../config/eccParam";
import { PLANTTYPE, ZHONGYANGTYPE } from "../config/enum";
import * as caishouData from "../data/caishou";
import * as dikuaiData from "../data/dikuai";
import * as zhongzhiData from "../data/zhongzhi";
import { randomId, successResult } from "../tools/system";
import { changeEnumValue, eccEnumValue } from "../util/verificationEnum";
import { eccFormParam } from "../util/verificationParam";
import { TABLENAME } from "../../config/dbEnum";
import { CaiShouConfig } from "../../config/eccParam";
import { PLANTTYPE, ZHONGYANGTYPE } from "../../config/enum";
import * as caishouData from "../../data/caishou";
import * as dikuaiData from "../../data/dikuai";
import * as zhongzhiData from "../../data/zhongzhi";
import { randomId, successResult } from "../../tools/system";
import { changeEnumValue, eccEnumValue } from "../../util/verificationEnum";
import { eccFormParam } from "../../util/verificationParam";
import moment = require("moment");
......@@ -47,7 +47,7 @@ export async function addCaiShou(reqUser, param) {
//添加采收记录
let addInfo = {
csId,
dIdList:param.dIdList,
dIdList:param.dId,
plantType:param.plantType,
operationTime:param.operationTime,
weight:param.weight,
......@@ -83,9 +83,9 @@ export async function caiShouList(zhongYangType:number, selectStr:string, dId:st
param.dIdList = {"$in":dId};
}
if (operationTime) {
let startMs = moment(operationTime).startOf("month").valueOf();
let endMs = moment(operationTime).endOf("month").valueOf();
param.useTime = {"$gt":startMs, "$lt":endMs};
let startMs = moment(operationTime).startOf("day").valueOf();
let endMs = moment(operationTime).endOf("day").valueOf();
param.useTime = {"$gte":startMs, "$lte":endMs};
}
let dikuaiList = await dikuaiData.selectToParam({});
......@@ -98,19 +98,28 @@ export async function caiShouList(zhongYangType:number, selectStr:string, dId:st
let nongShiList = await caishouData.selectToParam(param);
let dataList = [];
nongShiList.forEach(item => {
let {plantType, dIdList, operationTime, weight } = item;
let {plantType, dIdList, operationTime, weight, ct } = item;
let dIds = dIdList;
let didStr = "";
dIds.forEach(dId => {
didStr += `${diKuaiMap[dId]} `;
});
let operationTimeNum;
if (operationTime) operationTimeNum = operationTime;
else operationTimeNum = ct
dataList.push({
plantType:changeEnumValue(PLANTTYPE, plantType),
dIdList:didStr,
operationTime:moment(operationTime).format("YYYY-MM-DD"),
weight
operationTime:moment(operationTimeNum).format("YYYY-MM-DD"),
weight,
operationTimeNum
});
});
dataList.sort( (a, b) => {
return b.operationTimeNum - a.operationTimeNum;
})
return {dataList}
}
src/biz/xcx/diKuai.ts 0 → 100644
/**
* 地块
*/
import moment = require("moment");
import { TABLENAME } from "../../config/dbEnum";
import { DiKuaiConfig, YangZhiChiConfig } from "../../config/eccParam";
import { AREARANGE, PLANTTYPE, PLOTTYPE, PURPOSE, ZHONGYANGTYPE } from "../../config/enum";
import { ERRORENUM } from "../../config/errorEnum";
import * as dikuaiData from "../../data/dikuai";
import { randomId, successResult } from "../../tools/system";
import { BizError } from "../../util/bizError";
import { changeEnumValue, eccEnumValue } from "../../util/verificationEnum";
import { eccFormParam } from "../../util/verificationParam";
/**
* 添加地块
* @param reqUser
* @param plotType
* @param param
* @returns
*/
export async function addDiKuai(reqUser, plotType, param) {
let funName = `添加地块`;
eccEnumValue(funName, "plottype", PLOTTYPE, plotType);
let purpose = PURPOSE.养殖;
if (plotType == PLOTTYPE.地块) {
eccFormParam(funName+changeEnumValue(PLOTTYPE, plotType), DiKuaiConfig, param);
eccEnumValue(funName, "param=>type", PURPOSE, param.type);
purpose = param.type;
} else {
eccFormParam(funName+changeEnumValue(PLOTTYPE, plotType), YangZhiChiConfig, param);
}
let addInfo = {
dId:randomId(TABLENAME.地块表),
size:param.size,
useSize:0,//使用大小默认0
nullSize:param.size,//初始可使用大小为大小
code:param.code,
name:param.code, //地块名称
plotType,
purpose,//用途 【枚举】 PURPOSE
createUser:reqUser.userId,
ct:new Date().valueOf()
};
await dikuaiData.addData(addInfo);
return successResult();
}
/**
* 地块信息
* @param plotType
* @param selectStr
* @param code
* @param purpose
* @param area
* @returns
*/
export async function diKuaiInfo(dId:String ) {
let dikuaiInfo = await dikuaiData.selectOne({dId});
let dataInfo = {
size:dikuaiInfo.size,
dId:dikuaiInfo.dId,
type:dikuaiInfo.purpose,
purpose:changeEnumValue(PURPOSE, dikuaiInfo.purpose),
code:dikuaiInfo.code
};
return {dataInfo}
}
/**
* 地块列表
* @param plotType
* @param selectStr
* @param code
* @param purpose
* @param area
* @returns
*/
export async function diKuaiList(plotType:number, selectStr:string, code:string, purpose:number, area:number ) {
let funName = "地块列表";
eccEnumValue(funName, "plottype", PLOTTYPE, plotType);
let param:any = {plotType};
if (code) {
param.code = { "$regex":code };
}
if (purpose) {
eccEnumValue(funName, "purpose", PURPOSE, purpose);
param.purpose = purpose;
}
if (area) {
eccEnumValue(funName, "area", AREARANGE, area);
param.size = {"$lte": parseInt(AREARANGE[area].replace("<=", "")) };
}
let diKuaiList = await dikuaiData.selectToParam(param);
let dataList = [];
diKuaiList.forEach(item => {
let { size, dId, purpose, code } = item;
dataList.push({size,dId,type:changeEnumValue(PURPOSE, purpose),code});
});
return {dataList}
}
/**
* 地块列表分页-暂无使用
* @param code 地块编号 string
* @param area 地块区域 string
* @param purpose 地块用途 number
* @param pageNumber 页码
* @returns
*
*/
export async function diKuaiListToPage(code, area, purpose, pageNumber) {
let funName = "地块列表";
let param:any = {};
if (code) {
param.code = { "$regex":code };
}
if (area) {
param.area = { "$regex":area };
}
if (purpose) {
eccEnumValue(funName, "purpose", PURPOSE, purpose);
param.purpose = purpose;
}
let diKuaiList = await dikuaiData.findDataToParamToSortPage(param, {ct:-1}, pageNumber);
let dataCount = await dikuaiData.findDataToParamCouant({});
let dataList = [];
diKuaiList.forEach(item => {
let { size, dId, plotType, purpose, code, area, ct } = item;
dataList.push({
size,
dId,
plotType:changeEnumValue(PLOTTYPE, plotType),
type:changeEnumValue(PURPOSE, purpose),
code,
area,
ct:moment(ct).format("YYYY-MM-DD")
});
});
return {dataList, dataCount}
}
/**
* 修改地块信息
* @param reqUser
* @param plotType
* @param dId
* @param param
* @returns
*/
export async function updateDiKuai(reqUser, plotType, dId, param) {
let funName = `修改地块`;
eccEnumValue(funName, "plottype", PLOTTYPE, plotType);
let purpose = PURPOSE.养殖;
if (plotType == PLOTTYPE.地块) {
eccFormParam(funName+changeEnumValue(PLOTTYPE, plotType), DiKuaiConfig, param);
eccEnumValue(funName, "param=>type", PURPOSE, param.type);
purpose = param.type;
} else {
eccFormParam(funName+changeEnumValue(PLOTTYPE, plotType), YangZhiChiConfig, param);
}
let dInfo = await dikuaiData.selectOne({dId});
if (!dInfo || !dInfo.dId) throw new BizError(ERRORENUM.地块不存在);
dInfo.code = param.code,
dInfo.size = param.size,
dInfo.purpose = purpose;
await dInfo.save();
return successResult();
}
/**
* 当前可种植地块
* @returns
*/
export async function keXuanDiKuaiList(zhongYangType:number) {
let param:any = {};
if (zhongYangType) {
let purpose = 1;
if (zhongYangType == ZHONGYANGTYPE.水产) purpose = PURPOSE.养殖;
else if (zhongYangType == ZHONGYANGTYPE.花卉 ||zhongYangType == ZHONGYANGTYPE.蔬菜 ) purpose = PURPOSE.菜田;
else if (zhongYangType == ZHONGYANGTYPE.粮食) purpose = PURPOSE.粮田;
// param.nullSize = {"$gt":0};
param.purpose = purpose;
}
console.log("------>", JSON.stringify(param));
let dbList = await dikuaiData.selectToParam(param);
let dataList = [];
dbList.forEach(info => {
let {code, purpose, dId, size} = info;
dataList.push( {code, purpose:changeEnumValue(PURPOSE, purpose), dId, size});
});
return {dataList};
}
/**
* 当前采收地块列表
* @returns
*/
export async function keCaiShouList(zhongYangType:number) {
let purpose = 1;
if (zhongYangType == ZHONGYANGTYPE.水产) purpose = PURPOSE.养殖;
else if (zhongYangType == ZHONGYANGTYPE.花卉 ||zhongYangType == ZHONGYANGTYPE.蔬菜 ) purpose = PURPOSE.菜田;
else if (zhongYangType == ZHONGYANGTYPE.粮食) purpose = PURPOSE.粮田;
let param = {useSize:{"$gt":0}, purpose:purpose};
let dbList = await dikuaiData.selectToParam(param);
let dataList = [];
dbList.forEach(info => {
let {code, purpose, dId, size} = info;
dataList.push( {code, purpose:changeEnumValue(PURPOSE, purpose), dId, size});
});
return {dataList}
}
/**
* 全部地块列表
* @param plotType
* @param selectStr
* @param code
* @param purpose
* @param area
* @returns
*/
export async function allDiKuaiList(plotType:number ) {
let funName = "地块列表";
eccEnumValue(funName, "plottype", PLOTTYPE, plotType);
let param:any = {plotType};
let diKuaiList = await dikuaiData.selectToParam(param);
let dataList = [];
diKuaiList.forEach(item => {
let { size, dId, purpose, code } = item;
dataList.push({dId, code});
});
return {dataList}
}
src/biz/nongShi.ts → src/biz/xcx/nongShi.ts
import { TABLENAME } from "../config/dbEnum";
import { CaiShouConfig, NongShiConfig } from "../config/eccParam";
import { NONGSHITYPE, PLANTTYPE } from "../config/enum";
import * as nongshiData from "../data/nongshi";
import * as dikuaiData from "../data/dikuai";
import { getMySqlMs, randomId, successResult } from "../tools/system";
import { changeEnumValue, eccEnumValue } from "../util/verificationEnum";
import { eccFormParam } from "../util/verificationParam";
import { TABLENAME } from "../../config/dbEnum";
import { CaiShouConfig, NongShiConfig } from "../../config/eccParam";
import { NONGSHITYPE, PLANTTYPE } from "../../config/enum";
import * as nongshiData from "../../data/nongshi";
import * as dikuaiData from "../../data/dikuai";
import { getMySqlMs, randomId, successResult } from "../../tools/system";
import { changeEnumValue, eccEnumValue } from "../../util/verificationEnum";
import { eccFormParam } from "../../util/verificationParam";
import moment = require("moment");
import { BizError } from "../util/bizError";
import { ERRORENUM } from "../config/errorEnum";
import { BizError } from "../../util/bizError";
import { ERRORENUM } from "../../config/errorEnum";
/**
* 添加农事
......@@ -60,9 +60,9 @@ export async function nongShiList(selectStr:string, dId:string, nsType:number, o
param.dIdList = {"$in":dId};
}
if (operationTime) {
let startMs = moment(operationTime).startOf("month").valueOf();
let endMs = moment(operationTime).endOf("month").valueOf();
param.operationTime = {"$gt":startMs, "$lt":endMs};
let startMs = moment(operationTime).startOf("day").valueOf();
let endMs = moment(operationTime).endOf("day").valueOf();
param.operationTime = {"$gte":startMs, "$lte":endMs};
}
let dikuaiList = await dikuaiData.selectToParam({});
......@@ -83,9 +83,14 @@ export async function nongShiList(selectStr:string, dId:string, nsType:number, o
dataList.push({
nsType:changeEnumValue(NONGSHITYPE, nsType),
dIdList:didStr,
operationTime:moment(operationTime).format("YYYY-MM-DD")
operationTime:moment(operationTime).format("YYYY-MM-DD"),
operationTimeNum:operationTime
});
});
dataList.sort( (a, b) => {
return b.operationTimeNum - a.operationTimeNum;
})
return {dataList}
}
\ No newline at end of file
src/biz/nongzi.ts → src/biz/xcx/nongzi.ts
......@@ -3,16 +3,17 @@
*/
import moment = require("moment");
import { TABLENAME } from "../config/dbEnum";
import { NongZiConfig } from "../config/eccParam";
import { NONGZITYPE, PLANTTYPE } from "../config/enum";
import * as nongziData from "../data/nongzi";
import * as dikuaiData from "../data/dikuai";
import { randomId, successResult } from "../tools/system";
import { changeEnumValue, eccEnumValue } from "../util/verificationEnum";
import { eccFormParam } from "../util/verificationParam";
import { BizError } from "../util/bizError";
import { ERRORENUM } from "../config/errorEnum";
import { TABLENAME } from "../../config/dbEnum";
import { NongZiConfig } from "../../config/eccParam";
import { NONGZITYPE, PLANTTYPE, PURPOSE } from "../../config/enum";
import * as nongziData from "../../data/nongzi";
import * as dikuaiData from "../../data/dikuai";
import { randomId, successResult } from "../../tools/system";
import { changeEnumValue, eccEnumValue } from "../../util/verificationEnum";
import { eccFormParam } from "../../util/verificationParam";
import { BizError } from "../../util/bizError";
import { ERRORENUM } from "../../config/errorEnum";
/**
* 添加农资
......@@ -68,9 +69,9 @@ export async function nongZiList(selectStr:string, dId:string, nzType:number, us
param.dIdList = {"$in":dId};
}
if (useTime) {
let startMs = moment(useTime).startOf("month").valueOf();
let endMs = moment(useTime).endOf("month").valueOf();
param.useTime = {"$gt":startMs, "$lt":endMs};
let startMs = moment(useTime).startOf("day").valueOf();
let endMs = moment(useTime).endOf("day").valueOf();
param.useTime = {"$gte":startMs, "$lte":endMs};
}
let dikuaiList = await dikuaiData.selectToParam({});
......@@ -94,17 +95,28 @@ export async function nongZiList(selectStr:string, dId:string, nzType:number, us
dIdList:didStr,
plantType:changeEnumValue(PLANTTYPE, plantType),
count,
useTime:moment(useTime).format("YYYY-MM-DD")
useTime:moment(useTime).format("YYYY-MM-DD"),
useTimeNum:useTime
});
});
dataList.sort( (a, b) => {
return b.useTimeNum - a.useTimeNum;
})
return {dataList};
}
export async function updateZhongYang(reqUser, nzId, param) {
let funName = `修改种养`;
/**
* 修改农资 暂无使用
* @param reqUser
* @param nzId
* @param param
* @returns
*/
export async function updateNongZi(reqUser, nzId, param) {
let funName = `修改农资`;
eccFormParam(funName, NongZiConfig, param);
eccEnumValue(funName, "nzType", NONGZITYPE, param.nzType);
eccEnumValue(funName, "plantType", PLANTTYPE, param.plantType);
......@@ -133,12 +145,18 @@ export async function updateZhongYang(reqUser, nzId, param) {
}
export async function zhongYangInfo(nzId) {
/**
* 农资回显 暂无使用
* @param nzId
* @returns
*/
export async function nongZiInfo(nzId) {
let nongZiInfo = await nongziData.findOne({nzId});
let dataInfo = {
nzType:nongZiInfo.nzType,//农资类型
dIdList:nongZiInfo.dIdList,//地块id
// dIdList:didStr, //地块id
dIdList:nongZiInfo.dIdList[0],//地块id
plantType:nongZiInfo.plantType,//种植种类【枚举】 PLANTTYPE
count:nongZiInfo.count,//用量
useTime:nongZiInfo.useTime//时间
......@@ -147,22 +165,66 @@ export async function zhongYangInfo(nzId) {
return {dataInfo}
}
export async function zhongYangListToPage(page) {
let dbList = await nongziData.findDataToParamToPage({}, page);
/**
* 农资列表 暂无使用
* @param selectStr
* @param dId
* @param nzType
* @param useTime
* @returns
*/
export async function nongZiListToPage(nzType:number, dId:string, useTime:number, pageNumber:number) {
let funName = "农资列表";
let param:any = {};
if (nzType) {
eccEnumValue(funName, "nzType", NONGZITYPE, nzType);
param.nzType = nzType;
}
if (dId) {
param.dIdList = {"$in":dId};
}
if (useTime) {
let startMs = moment(useTime).startOf("day").valueOf();
let endMs = moment(useTime).endOf("day").valueOf();
param.useTime = {"$gte":startMs, "$lte":endMs};
}
let dikuaiList = await dikuaiData.selectToParam({});
let diKuaiMap = {};
dikuaiList.forEach(info => {
let {dId, code} = info;
diKuaiMap[dId] = code;
});
let nongziList = await nongziData.findDataToParamToSortPage( param, {useTime:-1}, pageNumber );
let dataCount = await nongziData.findDataToParamCouant({});
let dataList = [];
dbList.forEach(info => {
dataList.push({
nzId:info.nzId,
nzType:info.nzType,//农资类型
dIdList:info.dIdList,//地块id
plantType:info.plantType,//种植种类【枚举】 PLANTTYPE
count:info.count,//用量
useTime:info.useTime//时间
nongziList.forEach(item => {
let {nzId, nzType, dIdList, plantType, count, useTime, ct } = item;
let didStr = "";
let area = "";
let purpose = "";
let size = "";
dIdList.forEach(dId => {
didStr += `${diKuaiMap[dId] || "-"}`;
})
dataList.push({
nzId,
nzType:changeEnumValue(NONGZITYPE, nzType), //农资类型
dIdList:didStr, //地块id
plantType:changeEnumValue(PLANTTYPE, plantType), //种植种类【枚举】 PLANTTYPE
count, //用量
useTime:moment(useTime).format("YYYY-MM-DD"), //时间
ct:moment(ct).format("YYYY-MM-DD"), //创建时间
area, //所属区域
purpose:changeEnumValue(PURPOSE, purpose), //地块用途
size, //地块面积
});
});
return {dataList, dataCount}
}
src/biz/xiaoShou.ts → src/biz/xcx/xiaoShou.ts
/**
* 销售
*/
import { TABLENAME } from "../config/dbEnum";
import { XiaoShouConfig } from "../config/eccParam";
import { PLANTTYPE, XIAOSHOUQUXIANG } from "../config/enum";
import * as xiaoshouData from "../data/xiaoshou";
import { randomId, successResult } from "../tools/system";
import { changeEnumValue, eccEnumValue } from "../util/verificationEnum";
import { eccFormParam } from "../util/verificationParam";
import { TABLENAME } from "../../config/dbEnum";
import { XiaoShouConfig } from "../../config/eccParam";
import { PLANTTYPE, XIAOSHOUQUXIANG } from "../../config/enum";
import * as xiaoshouData from "../../data/xiaoshou";
import { randomId, successResult } from "../../tools/system";
import { changeEnumValue, eccEnumValue } from "../../util/verificationEnum";
import { eccFormParam } from "../../util/verificationParam";
import moment = require("moment");
/**
......@@ -58,9 +58,9 @@ export async function xiaoShouList(selectStr:string, quXiang:string, plantType:n
param.quXiang = quXiang;
}
if (operationTime) {
let startMs = moment(operationTime).startOf("month").valueOf();
let endMs = moment(operationTime).endOf("month").valueOf();
param.useTime = {"$gt":startMs, "$lt":endMs};
let startMs = moment(operationTime).startOf("day").valueOf();
let endMs = moment(operationTime).endOf("day").valueOf();
param.useTime = {"$gte":startMs, "$lte":endMs};
}
let nongShiList = await xiaoshouData.selectToParam(param);
......@@ -72,9 +72,14 @@ export async function xiaoShouList(selectStr:string, quXiang:string, plantType:n
plantType:changeEnumValue(PLANTTYPE, plantType),
quXiang:changeEnumValue(XIAOSHOUQUXIANG, quXiang),
operationTime:moment(operationTime).format("YYYY-MM-DD"),
weight
weight,
operationTimeNum:operationTime
});
});
dataList.sort( (a, b) => {
return b.operationTimeNum - a.operationTimeNum;
})
return {dataList}
}
\ No newline at end of file
src/config/eccParam.ts
......@@ -30,7 +30,14 @@ export const NongZiConfig = {
export const NongShiConfig = {
nsType:{type:"Number" },//农事类型
dIdList:{type:"[String]" },//地块id
operationTime:{type:"Number"},//使用时间
operationTime:{type:"Number"},//操作时间
}
export const NongShiAdminConfig = {
nsType:{type:"Number" },//农事类型
dIdList:{type:"String" },//地块id
operationTime:{type:"Number"},//操作时间
}
......@@ -38,7 +45,7 @@ export const CaiShouConfig = {
plantType:{type:"Number"}, //种植种类【枚举】 PLANTTYPE
dId:{type:"String" },//地块id
weight:{type:"Number"},//采收重量
operationTime:{type:"Number"},//使用时间
operationTime:{type:"Number"},//采收时间
}
......
src/config/enum.ts
......@@ -9,7 +9,6 @@ export enum PLOTTYPE {
}
/**
* 用途
*/
......@@ -20,6 +19,23 @@ export enum PURPOSE {
}
/**
* 地块用途
*/
export enum DIKUAIPURPOSE {
菜田 = 1,
粮田 = 2,
}
/**
* 养殖用途
*/
export enum YANGZHIPURPOSE {
养殖 = 1000
}
/**
* 种养类型
......
src/data/caishou.ts
......@@ -51,6 +51,22 @@ export async function addManyData(param) {
return await caishouModel.insertMany(param);
}
export async function findDataToParamToSortPage(param, sort, pageNumber) {
return await caishouModel.find(param).sort(sort).skip((pageNumber-1)*10).limit(10);
}
export async function findDataToParamToPage(param, pageNumber) {
return await caishouModel.find(param).skip((pageNumber-1)*10).limit(10);
}
export async function findDataToParamCouant(param) {
return await caishouModel.find(param).countDocuments();
}
export async function deleteData(param) {
return await caishouModel.deleteOne(param);
}
export async function selectChanLiangOfMonth(param) {
return await caishouModel.aggregate([
......
src/data/dikuai.ts
......@@ -59,10 +59,18 @@ export async function selectToParam(param) {
return await dikuaiModel.find(param);
}
export async function findDataToParamToSortPage(param, sort, pageNumber) {
return await dikuaiModel.find(param).sort(sort).skip((pageNumber-1)*10).limit(10);
}
export async function findDataToParamToPage(param, pageNumber) {
return await dikuaiModel.find(param).skip((pageNumber-1)*10).limit(10);
}
export async function findDataToParamCouant(param) {
return await dikuaiModel.find(param).countDocuments();
}
export async function diKuaiSizeCount(param) {
let list = await dikuaiModel.aggregate([
......
src/data/nongshi.ts
......@@ -57,6 +57,21 @@ export async function selectCountByParam(param) {
return await nongshiModel.find(param).countDocuments();
}
export async function findDataToParamToSortPage(param, sort, pageNumber) {
return await nongshiModel.find(param).sort(sort).skip((pageNumber-1)*10).limit(10);
}
export async function findDataToParamToPage(param, pageNumber) {
return await nongshiModel.find(param).skip((pageNumber-1)*10).limit(10);
}
export async function findDataToParamCouant(param) {
return await nongshiModel.find(param).countDocuments();
}
export async function deleteData(param) {
return await nongshiModel.deleteOne(param);
}
export async function statisNongShiType() {
let list = await nongshiModel.aggregate([
......
src/data/nongzi.ts
......@@ -54,20 +54,21 @@ export async function selectToParam(param) {
return await nongziModel.find(param);
}
export async function findDataToParamCouant(param) {
return await nongziModel.find(param).countDocuments();
}
export async function deleteData(param) {
return await nongziModel.deleteOne(param);
}
export async function findDataToParamToSortPage(param, sort, pageNumber) {
return await nongziModel.find(param).sort(sort).skip((pageNumber-1)*10).limit(10);
}
export async function findDataToParamToPage(param, pageNumber) {
return await nongziModel.find(param).skip((pageNumber-1)*10).limit(10);
}
export async function findDataToParamCouant(param) {
return await nongziModel.find(param).countDocuments();
}
export async function statisNongZiType() {
let list = await nongziModel.aggregate([
......@@ -82,7 +83,6 @@ export async function statisNongZiType() {
return list;
}
export async function statisNongZiTypeCountByTime() {
let list = await nongziModel.aggregate([
{
......@@ -111,3 +111,4 @@ export async function statisNongZiTypeCountByTime() {
return list;
}
src/data/xiaoshou.ts
......@@ -54,6 +54,21 @@ export async function selectToParam(param) {
return await xiaoshouModel.find(param);
}
export async function selectCountByParam(param) {
return await xiaoshouModel.find(param).countDocuments();
}
export async function findDataToParamToPage(param, pageNumber) {
return await xiaoshouModel.find(param).skip((pageNumber-1)*10).limit(10);
}
export async function findDataToParamToSortPage(param, sort, pageNumber) {
return await xiaoshouModel.find(param).sort(sort).skip((pageNumber-1)*10).limit(10);
}
export async function deleteData(param) {
return await xiaoshouModel.deleteOne(param);
}
export async function selectXiaoShouOfMonth(param) {
return await xiaoshouModel.aggregate([
......
src/data/zhongzhi.ts
/**
*
*
* 种植
*/
import {Schema} from 'mongoose';
......@@ -57,6 +56,10 @@ export async function selectToParam(param) {
return await zhongzhiModel.find(param);
}
export async function findDataToParamToSortPage(param, sort, pageNumber) {
return await zhongzhiModel.find(param).sort(sort).skip((pageNumber-1)*10).limit(10);
}
export async function findDataToParamToPage(param, pageNumber) {
return await zhongzhiModel.find(param).skip((pageNumber-1)*10).limit(10);
}
......@@ -118,3 +121,74 @@ export async function zhongYangTongJiCount() {
return list;
}
/**
* 按年份统计种植面积
* @param year 年份，可选
* @returns 按种植类型分组的面积统计
*/
export async function zhongYangTongJiCountByYear(year?: number) {
// 构建基础查询条件
let matchCondition: any = { plantType: {"$gt": 100, "$lt": 200} };
// 如果传入了年份参数，添加时间过滤
if (year) {
const startTime = new Date(year, 0, 1).getTime(); // 年份开始时间戳
const endTime = new Date(year + 1, 0, 1).getTime(); // 年份结束时间戳
matchCondition.plantTime = {
"$gte": startTime,
"$lt": endTime
};
}
let list = await zhongzhiModel.aggregate([
{ $match: matchCondition },
{
"$group": {
_id: "$plantType",
sizeCount: {"$sum": "$size"}
}
}
]);
return list;
}
/**
* 按年份统计种植数量
* @param year 年份，可选
* @returns 按种植类型分组的数量统计
*/
export async function pingZhongCountByYear(year?: number) {
let matchCondition: any = {};
// 如果传入了年份参数，添加时间过滤
if (year) {
const startTime = new Date(year, 0, 1).getTime(); // 年份开始时间戳
const endTime = new Date(year + 1, 0, 1).getTime(); // 年份结束时间戳
matchCondition.plantTime = {
"$gte": startTime,
"$lt": endTime
};
}
let list = await zhongzhiModel.aggregate([
{ $match: matchCondition },
{
"$group": {
_id: "$plantType",
count: {"$sum": 1}
}
}
]);
return list;
}
src/main.ts
......@@ -4,7 +4,7 @@ import { httpServer } from "./net/http_server";
import { initDB } from "./db/dbInit";
import { dataInit0516, dataInit, dataInit0508, yjDataInit0508, dataInit0522, dataInit0604, dataInit0609, dataInit0618, dataInit0817 } from "./biz/dataInt";
import { getDataOut, getGuiYuOut } from "./biz/dataOut";
import { homePageStatisChanLiang } from "./biz/user";
import { homePageStatisChanLiangWithYear, homePageStatisXiaoShou } from "./biz/xcx/user";
import { getPwdMd5, md5PwdStr } from "./tools/system";
async function lanuch() {
......@@ -17,7 +17,8 @@ async function lanuch() {
httpServer.createServer(systemConfig.port);
console.log('This indicates that the server is started successfully.');
// await homePageStatisChanLiang(1);
// await homePageStatisXiaoShou(1, 2025);
// await homePageStatisChanLiangWithYear(2025, 1);
// await dataInit();
await getDataOut();
// await dataInit0508();
......@@ -29,7 +30,7 @@ async function lanuch() {
// await dataInit0618();
await dataInit0817();
let checkPwd = getPwdMd5("18120935727", md5PwdStr("123456"))
// let checkPwd = getPwdMd5("18120935727", md5PwdStr("123456"))
console.log();
}
......
src/net/http_server.ts
......@@ -5,7 +5,7 @@ import compression = require('compression');
import { watch } from '../middleware/watch';
import { httpErrorHandler } from '../middleware/httpErrorHandler';
import * as path from "path";
import * as fallback from 'express-history-api-fallback';
import fallback from 'express-history-api-fallback';
export class httpServer {
static createServer(port:number) {
......
src/routers/public.ts
/**
* 公共资源路由
*/
import * as asyncHandler from 'express-async-handler';
import asyncHandler = require('express-async-handler');
import * as enumConfig from '../config/enum';
const config = {
"/zjnt/xcx/public/plottype":enumConfig.PLOTTYPE,//地块类型
"/zjnt/xcx/public/purpose":enumConfig.PURPOSE,//用途
"/zjnt/xcx/public/dikuaipurpose":enumConfig.DIKUAIPURPOSE,//地块用途
"/zjnt/xcx/public/yangzhipurpose":enumConfig.YANGZHIPURPOSE,//养殖用途
"/zjnt/xcx/public/planttype":enumConfig.PLANTTYPE,//种植种类
"/zjnt/xcx/public/arearange":enumConfig.AREARANGE,//面积范围
"/zjnt/xcx/public/nongzitype":enumConfig.NONGZITYPE,//农资类型
......
src/routers/router.ts
import * as asyncHandler from 'express-async-handler'
import asyncHandler = require('express-async-handler');
import { eccReqParamater } from '../util/verificationParam';
import * as diKuaiBiz from '../biz/diKuai';
import * as userBiz from '../biz/user';
import * as zhongYangBiz from '../biz/zhongYang';
import * as nongziBiz from '../biz/nongzi';
import * as nongShiBiz from '../biz/nongShi';
import * as diKuaiBiz from '../biz/xcx/diKuai';
import * as userBiz from '../biz/xcx/user';
import * as zhongYangBiz from '../biz/xcx/zhongYang';
import * as nongziBiz from '../biz/xcx/nongzi';
import * as nongShiBiz from '../biz/xcx/nongShi';
import * as publicRouters from './public';
import * as adminRouters from './admin';
import * as caiShouBiz from '../biz/caiShou';
import * as xiaoShouBiz from '../biz/xiaoShou';
import * as caiShouBiz from '../biz/xcx/caiShou';
import * as xiaoShouBiz from '../biz/xcx/xiaoShou';
import { checkUserToken } from '../middleware/user';
import * as dataOutBiz from '../biz/dataOut';
......@@ -19,7 +19,7 @@ export function setRouter(httpServer){
httpServer.post('/zjnt/xcx/dikuai/list', checkUserToken, asyncHandler(dikuai_list));//列表
httpServer.post('/zjnt/xcx/dikuai/all', checkUserToken, asyncHandler(dikuai_all));//全部地块列表
httpServer.post('/zjnt/xcx/dikuai/update', checkUserToken, asyncHandler(dikuai_update));//更新
httpServer.post('/zjnt/xcx/dikuai/xuanze/list', checkUserToken, asyncHandler(xuanze_dikuai_list));//可用
httpServer.post('/zjnt/xcx/dikuai/xuanze/list', checkUserToken, asyncHandler(xuanze_dikuai_list));//下拉选择-使用地块
httpServer.post('/zjnt/xcx/dikuai/kecaishou/list', checkUserToken, asyncHandler(xuanze_kecaishou_list));//可采收
/**种养 */
......@@ -55,9 +55,11 @@ export function setRouter(httpServer){
httpServer.post('/zjnt/xcx/user/login', asyncHandler(user_login));//登录
httpServer.post('/zjnt/xcx/user/logout', checkUserToken, asyncHandler(user_logout));//登出
/**大屏用 */
httpServer.post('/zjnt/xcx/dataout/zzzmj', asyncHandler(data_out));//
httpServer.post('/zjnt/xcx/dataout/guiyu', asyncHandler(data_out_guiyu));//
httpServer.post('/zjnt/xcx/dataout/guiyu', asyncHandler(data_out_guiyu));//鳜鱼
httpServer.post('/zjnt/xcx/dataout/zhongyang', asyncHandler(zhongyang_list));//种养列表
httpServer.post('/zjnt/xcx/dataout/yumiao', asyncHandler(yuMiao_list));//鱼苗销售列表
/**公用 */
......@@ -79,14 +81,16 @@ async function data_out_guiyu(req, res) {
/**================================================================首页 */
async function home_statis_chanliang(req, res) {
let reqConf = {type:'Number'};
let { type } = eccReqParamater(reqConf, req.body);
let result = await userBiz.homePageStatisChanLiang(type);
let reqConf = {type:'Number', year:'Number'};
let { type, year } = eccReqParamater(reqConf, req.body);
let result = await userBiz.homePageStatisChanLiang(year, type);
res.success(result);
}
async function home_statis_xiaoshou(req, res) {
let result = await userBiz.homePageStatisXiaoShou();
let reqConf = {year:'Number'};
let { year } = eccReqParamater(reqConf, req.body);
let result = await userBiz.homePageStatisXiaoShou(year);
res.success(result);
}
......@@ -286,6 +290,26 @@ async function zhongyang_jilu_list(req, res) {
res.success(result);
}
async function zhongyang_list(req, res) {
let reqConf = {zhongYangType:"Number"};
const NotMustHaveKeys = [];
let { zhongYangType } = eccReqParamater(reqConf, req.body, NotMustHaveKeys);
const UserInfo = req.userInfo;
let result = await zhongYangBiz.zhongYangList(zhongYangType);
res.success(result);
}
async function yuMiao_list(req, res) {
const UserInfo = req.userInfo;
let result = await zhongYangBiz.yuMiaoList();
res.success(result);
}
/**================================================================地块 */
async function dikuai_add(req, res) {
......
tsconfig.json
......@@ -4,9 +4,16 @@
"target": "es2017",
"sourceMap": true,
"rootDir":"./src",
"outDir":"./out"
"outDir":"./out",
"esModuleInterop": true,
"allowSyntheticDefaultImports": true,
"strict": false,
"noImplicitAny": false,
"strictNullChecks": false,
"types": ["node"]
},
"exclude": [
"node_modules"
"node_modules",
"public"
]
}
\ No newline at end of file
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