no message

src/biz/caiShou.ts

@@ -102,7 +102,7 @@ export async function caiShouList(zhongYangType:number, selectStr:string, dId:st
         let dIds = dIdList;
         let didStr = "";
         dIds.forEach(dId => {
-            didStr += `${dId} `;
+            didStr += `${diKuaiMap[dId]} `;
         });
         dataList.push({
             plantType:changeEnumValue(PLANTTYPE, plantType),

src/biz/diKuai.ts

@@ -111,6 +111,28 @@ export async function diKuaiList(plotType:number, selectStr:string, code:string,
     return {dataList}
 }
 
+/**
+ * 地块列表分页
+ * @param plotType 
+ * @param selectStr 
+ * @param code 
+ * @param purpose 
+ * @param area 
+ * @returns 
+ */
+export async function diKuaiListToPage(pageNumber) {
+
+    let diKuaiList = await dikuaiData.findDataToParamToPage({}, pageNumber);
+    let dataList = [];
+    diKuaiList.forEach(item => {
+        let { size, dId, purpose, code } = item;
+        dataList.push({size,dId,type:changeEnumValue(PURPOSE, purpose),code});
+    });
+
+    return {dataList}
+}
+
+
 
 /**
  * 修改地块信息

src/biz/nongzi.ts

@@ -99,4 +99,70 @@ export async function nongZiList(selectStr:string, dId:string, nzType:number, us
     });
 
     return {dataList};
+}
+
+
+
+export async function updateZhongYang(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();
+}
+
+
+export async function zhongYangInfo(nzId) {
+    let nongZiInfo = await nongziData.findOne({nzId});
+
+    let dataInfo = {
+        nzType:nongZiInfo.nzType,//农资类型
+        dIdList:nongZiInfo.dIdList,//地块id
+        plantType:nongZiInfo.plantType,//种植种类【枚举】 PLANTTYPE
+        count:nongZiInfo.count,//用量
+        useTime:nongZiInfo.useTime//时间
+    };
+
+    return {dataInfo}
+}
+
+export async function zhongYangListToPage(page) {
+    let dbList = await nongziData.findDataToParamToPage({}, page);
+    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//时间
+        })
+    });
+
+    return {dataList, dataCount}
 }
\ No newline at end of file

src/biz/zhongYang.ts

@@ -41,6 +41,42 @@ export async function zhongYangDangQianList(zhongYangType:number, selectStr:stri
 }
 
 
+export async function zhongYangDangQianListToPage(zhongYangType:number, selectStr:string, pageNumber) {
+    let funName = `当前种养列表`;
+    let param:any = { };
+    if (zhongYangType) {
+        eccEnumValue(funName, 'zhongYangType', ZHONGYANGTYPE, zhongYangType);
+        param.plantType = {"$gte":zhongYangType, "$lt":zhongYangType+99};
+    }
+
+    let zyList = await zhongzhiData.findDataToParamToPage( param, pageNumber );
+    let dataCount = await zhongzhiData.findDataToParamCouant(param);
+    let dataList = [];
+    zyList.forEach(info => {
+        let addInfo = {
+            zId : info.zId,
+            size : info.size,
+            plantType : info.plantType,
+            dId : info.dId,
+            plantTime : info.plantTime
+        };
+        dataList.push(addInfo);
+    });
+
+    return {dataList, dataCount};
+}
+
+
+export async function deleteZhongYang(zId) {
+    let zhongYangInfo = await zhongzhiData.selectOne({zId});
+    if (!zhongYangInfo || !zhongYangInfo.zId) throw new BizError(ERRORENUM.数据不存在);
+
+    await zhongzhiData.deleteData({zId});
+
+    return successResult();
+}
+
+
 /**
  * 添加种养
  * @param reqUser 
@@ -78,6 +114,42 @@ export async function addZhongYang(reqUser, param) {
 }
 
 
+export async function updateZhongYang(reqUser, zId, param) {
+    let funName = `修改种养`;
+    eccFormParam(funName, ZhongYangConfig, param);
+    eccEnumValue(funName, "plantType", PLANTTYPE, param.plantType);
+
+    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.地块大小不足);
+
+    let zhongYangInfo = await zhongzhiData.selectOne({zId});
+
+    zhongYangInfo.plantType = param.plantType;
+    zhongYangInfo.dId = param.dId;
+    zhongYangInfo.size = param.size;
+    zhongYangInfo.plantTime = param.plantTime;
+
+    await zhongYangInfo.save();
+
+    return successResult();
+}
+
+
+export async function zhognYangInfo(zId) {
+
+    let dikuaiInfo = await zhongzhiData.selectOne({zId});
+    let dataInfo = {
+        plantType:dikuaiInfo.plantType,//编号
+        dId:dikuaiInfo.dId,//地块id
+        size:dikuaiInfo.size,//地块大小
+        plantTime:dikuaiInfo.plantTime,//种植时间
+    };
+
+    return {dataInfo}
+}
+
+
 /**
  * 种养记录
  * @param zhongYangType 

src/config/enum.ts

@@ -69,7 +69,16 @@ export enum SHUCAI {
     红薯叶,
     樱桃萝卜,
     菠菜,
-    豆苗
+    豆苗,
+    马齿苋,
+    小白菜,
+    青甘蓝,
+    丝瓜,
+    空心菜,
+    白萝卜,
+    油麦菜,
+    长茼蒿,
+    叶菜
 }
 
 
@@ -161,6 +170,15 @@ export enum PLANTTYPE {
     樱桃萝卜,
     菠菜,
     豆苗,
+    马齿苋,
+    小白菜,
+    青甘蓝,
+    丝瓜,
+    空心菜,
+    白萝卜,
+    油麦菜,
+    长茼蒿,
+    叶菜,
     鲈鱼 = 101,
     鳜鱼,
     鲢鱼,
@@ -208,6 +226,13 @@ export enum NONGZITYPE {
     银法利,
     农药,
     其他,
+    奥罗,
+    三令,
+    磷肥,
+    好力克,
+    啶虫脒,
+    龙克均,
+    药剂
 }
 
 

src/config/errorEnum.ts

@@ -16,7 +16,8 @@ export enum ERRORENUM {
     密码错误,
     非法登录,
     身份验证过期,
-    地块大小不足
+    地块大小不足,
+    数据不存在
  }
  
  /**

src/data/caishou.ts

@@ -52,8 +52,9 @@ export async function addManyData(param) {
 }
 
 
-export async function selectChanLiangOfMonth() {
+export async function selectChanLiangOfMonth(param) {
     return await caishouModel.aggregate([
+        { $match: param },
         {
           $group: {
             _id: {
@@ -77,8 +78,9 @@ export async function selectChanLiangOfMonth() {
       ]);
 }
 
-export async function selectChanLiangOfzuoWu() {
+export async function selectChanLiangOfzuoWu(param) {
     return await caishouModel.aggregate([
+       { $match: param },
         {
           $group: {
             _id:"$plantType",

src/data/dikuai.ts

@@ -59,9 +59,14 @@ export async function selectToParam(param) {
     return await dikuaiModel.find(param);
 }
 
+export async function findDataToParamToPage(param, pageNumber) {
+    return await dikuaiModel.find(param).skip((pageNumber-1)*10).limit(10);
+}
+
 
-export async function diKuaiSizeCount() {
+export async function diKuaiSizeCount(param) {
     let list = await dikuaiModel.aggregate([
+        { $match: param },
         {
             "$group":{
                 _id:null,

src/data/nongzi.ts

@@ -54,6 +54,20 @@ 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 findDataToParamToPage(param, pageNumber) {
+    return await nongziModel.find(param).skip((pageNumber-1)*10).limit(10);
+}
+
+
 
 export async function statisNongZiType() {
     let list = await nongziModel.aggregate([

src/data/users.ts

@@ -13,6 +13,8 @@ const userSchema = new Schema({
     token:String,
     tokenMs:Number,
     position:String,//职务
+    adminToken:String,
+    adminTokenMs:Number,
 });
 
 var userModel;

src/data/xiaoshou.ts

@@ -55,8 +55,9 @@ export async function selectToParam(param) {
 }
 
 
-export async function selectXiaoShouOfMonth() {
+export async function selectXiaoShouOfMonth(param) {
     return await xiaoshouModel.aggregate([
+        { $match: param },
         {
           $group: {
             _id: {
@@ -80,8 +81,9 @@ export async function selectXiaoShouOfMonth() {
     ]);
 }
 
-export async function selectXiaoShouOfzuoWu() {
+export async function selectXiaoShouOfzuoWu(param) {
     return await xiaoshouModel.aggregate([
+        { $match: param },
         {
             $group: {
             _id:"$plantType",

src/data/zhongzhi.ts

@@ -57,13 +57,26 @@ export async function selectToParam(param) {
     return await zhongzhiModel.find(param);
 }
 
+export async function findDataToParamToPage(param, pageNumber) {
+    return await zhongzhiModel.find(param).skip((pageNumber-1)*10).limit(10);
+}
+
 export async function updateManyToParam(param, updateInfo) {
     return await zhongzhiModel.updateMany(param, {"$set":updateInfo});
 }
 
-export async function pingZhongCount() {
+export async function findDataToParamCouant(param) {
+    return await zhongzhiModel.find(param).countDocuments();
+}
+
+
+export async function deleteData(param) {
+    return await zhongzhiModel.deleteOne(param);
+}
+
+export async function pingZhongCount(param) {
     let list = await zhongzhiModel.aggregate([
-        { $match: { isEnd: 0 } },
+        { $match: param },
         {
             "$group":{
                 _id:"$plantType",
@@ -76,9 +89,9 @@ export async function pingZhongCount() {
 }
 
 
-export async function zhongZhiTongJiCount() {
+export async function zhongZhiTongJiCount(param) {
     let list = await zhongzhiModel.aggregate([
-        { $match: { isEnd: 0 } },
+        { $match: param },
         {
             "$group":{
                 _id:"$plantType",

src/main.ts

@@ -2,22 +2,34 @@
 import { initConfig, systemConfig } from "./config/serverConfig";
 import { httpServer } from "./net/http_server";
 import { initDB } from "./db/dbInit";
-import { dataInit, dataInit0508, yjDataInit0508 } from "./biz/dataInt";
-import { getGuiYuOut } from "./biz/dataOut";
+import { dataInit0516, dataInit, dataInit0508, yjDataInit0508, dataInit0522, dataInit0604, dataInit0609, dataInit0618 } from "./biz/dataInt";
+import { getDataOut, getGuiYuOut } from "./biz/dataOut";
+import { homePageStatisChanLiang } from "./biz/user";
+import { getPwdMd5, md5PwdStr } from "./tools/system";
 
 async function lanuch() {
     /**初始化配置解析 */
     await initConfig();
+    
     /**初始化数据库 */
     await initDB();
     /**创建http服务 */
     httpServer.createServer(systemConfig.port);
     console.log('This indicates that the server is started successfully.');
  
+    // await homePageStatisChanLiang(1);
     // await dataInit();
+    await getDataOut();
+    // await dataInit0508();
     // await dataInit0508();
     // await yjDataInit0508();
+    // await dataInit0516();
+    // await dataInit0522();
+    // await dataInit0604();
+    // await dataInit0618();
 
+    let checkPwd = getPwdMd5("18120935727", md5PwdStr("123456"))
+    console.log();
 }
 
 lanuch();
\ No newline at end of file

src/middleware/user.ts

@@ -5,7 +5,7 @@ import { BizError } from "../util/bizError";
 
 
 /**
- * 管委会小程序中间件
+ * 小程序中间件
  * @param req 
  * @param res 
  * @param next 
@@ -32,3 +32,33 @@ export async function checkUserToken(req, res, next) {
 
     next();
 }
+
+
+/**
+ * 管理后台中间件
+ * @param req 
+ * @param res 
+ * @param next 
+ * @returns 
+ */
+export async function checkAdminUserToken(req, res, next) {
+    console.log(req.originalUrl, JSON.stringify(req.body));
+    if (!req.headers) req.headers = {};
+    const reqToken = req.headers.token;
+    const userId = req.headers.userid || "";
+
+    if (!userId) return next(new BizError(ERRORENUM.身份验证失败, `userId:${userId} token:${reqToken}`));
+
+    let userInfo = await findUserInfoByUserId(userId);
+    if (!userInfo) return next(new BizError(ERRORENUM.非法登录, `userId:${userId} token:${reqToken}`));
+    
+    if (userInfo.adminToken != reqToken ) return next(new BizError(ERRORENUM.身份验证过期, `userId:${userId} token:${reqToken}`));
+
+    req.userInfo = {
+        userId:userInfo.userId,
+        name:userInfo.name,
+        position:userInfo.position
+    }
+
+    next();
+}

src/routers/router.ts

@@ -6,6 +6,7 @@ import * as zhongYangBiz from '../biz/zhongYang';
 import * as nongziBiz from '../biz/nongzi';
 import * as nongShiBiz from '../biz/nongShi';
 import * as publicRouters from './public';
+import * as adminRouters from './admin';
 import * as caiShouBiz from '../biz/caiShou';
 import * as xiaoShouBiz from '../biz/xiaoShou';
 import { checkUserToken } from '../middleware/user';
@@ -61,6 +62,8 @@ export function setRouter(httpServer){
 
     /**公用 */
     publicRouters.setRouter(httpServer);
+    /**管理后台 */
+    adminRouters.setRouter(httpServer);
 }
 
 async function data_out(req, res) {