消息推送

db.sql

@@ -1,357 +0,0 @@
-/*
-SQLyog Ultimate v12.3.1 (64 bit)
-MySQL - 10.3.12-MariaDB : Database - heatwatch
-*********************************************************************
-*/
-
-
-/*!40101 SET NAMES utf8 */;
-
-/*!40101 SET SQL_MODE=''*/;
-
-/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
-/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
-/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
-/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
-
-
-/*Table structure for table `apisql` */
-
-DROP TABLE IF EXISTS `apisql`;
-
-CREATE TABLE `apisql` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `sqlstr` text DEFAULT NULL,
-  `sqlname` varchar(50) DEFAULT NULL,
-  `returetype` varchar(50) DEFAULT 'map',
-  `method` varchar(50) DEFAULT 'query',
-  `created_on` int(11) DEFAULT 0,
-  `modified_on` int(11) DEFAULT 0,
-  `deleted_on` int(11) DEFAULT 0,
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=39 DEFAULT CHARSET=utf8;
-
-/*Data for the table `apisql` */
-
-insert  into `apisql`(`id`,`sqlstr`,`sqlname`,`returetype`,`method`,`created_on`,`modified_on`,`deleted_on`) values 
-
-(1,'SELECT `temp`,`humi`,`thi` ,CASE WHEN thi<68 THEN \'无应激\' \r\n WHEN thi<72 THEN \'轻度应激\' WHEN thi<80 THEN \'中度应激\' \r\n WHEN thi<90 THEN \'重度应激\' ELSE \'严重应激\' END   AS title \r\nFROM `temphumi` \r\nWHERE id = (SELECT MAX(id) FROM `temphumi` ) ','GetTempHumi','map','query',0,0,0),
-
-(2,'SELECT MAX(`temp`) max_temp,MIN(`temp`) min_temp,round(AVG(`temp`),2) avg_temp, \r\n		MAX(`humi`) max_humi,MIN(`humi`) min_humi,round(AVG(`humi`),2) avg_humi, \r\n		 	MAX(`thi`) max_thi,MIN(`thi`) min_thi,round(AVG(`thi`),2) avg_thi, \r\n		 	(SELECT MAX(t1.`receivetime`) FROM `temphumi` t1 \r\n		 WHERE thi=(SELECT MAX(`thi`) FROM `temphumi` \r\n		 WHERE `receivetime` > DATE_ADD(NOW(), INTERVAL -24 HOUR))) AS maxtime, \r\n		 	(SELECT MAX(t2.`receivetime`) FROM `temphumi` t2 \r\n		 WHERE thi= (SELECT MIN(`thi`) FROM `temphumi` \r\n		 WHERE `receivetime` > DATE_ADD(NOW(), INTERVAL -324 HOUR))) AS mintime \r\n		 FROM `temphumi`  WHERE `receivetime` > DATE_ADD(NOW(), INTERVAL -324 HOUR)','GetTempHumi24MinMax','map','query',0,0,0),
-
-(3,'SELECT no, MAX(`temp`) max_temp, MAX(`humi`) max_humi, 	MAX(`thi`) max_thi, \r\n			(SELECT DATE_FORMAT(MAX(t1.`receivetime`),\'%H:%i:%s\') FROM `temphumi` t1 \r\n		 WHERE thi= (SELECT MAX(`thi`) FROM `temphumi` \r\n		     WHERE `receivetime` > DATE_ADD(NOW(), INTERVAL -324 HOUR))) AS maxtime \r\n		     FROM `temphumi` WHERE `receivetime` > DATE_ADD(NOW(), INTERVAL -324 HOUR) group by no ','GetTempHumi24MinMaxByNo','map','query',0,0,0),
-
-(4,'SELECT DATE_FORMAT(`receivetime`,\'%m-%d %H:%i:%s\') AS `receivetime`,`temp`,`humi`,`thi`\r\n	            FROM `temphumi` WHERE `receivetime` > DATE_ADD(NOW(), INTERVAL -30 DAY) ORDER BY id','GetTempHumi30dayByNo','map','query',0,0,0),
-
-(5,'SELECT (h_time+1)*2 hours,ROUND(SUM(`opens`)/6) openmins FROM KPTAdmin \r\nWHERE `createtime` > DATE_ADD(NOW(), INTERVAL -324 HOUR) \r\nGROUP BY `h_time`','GetPriByHour','map','query',0,0,0),
-
-(6,'SELECT `eqcode`,ROUND(SUM(`opens`)/6) openmins FROM KPTAdmin \r\nWHERE `createtime` > DATE_ADD(NOW(), INTERVAL -224 HOUR) \r\nGROUP BY `eqcode`','GetPriByEQ','map','query',0,0,0),
-
-(7,'SELECT `eqcode`,ROUND(SUM(`opens`)/6) openmins FROM KPTAdmin \r\nWHERE `createtime` > DATE_ADD(NOW(), INTERVAL -324 HOUR) \r\nGROUP BY `eqcode` ','GetFutureMonthTemp','map','query',0,0,0),
-
-(8,'select intbarid,varbarname as \'爱妃\' from bar','getbar','map','query',0,0,0),
-
-(9,'select intcowid,varcowcode from cow','getcow','map','query',0,0,0),
-
-(10,'insert into applog(varcowcode,objcode,createtime) values(?,?,?)','setapplog','map','insert',0,0,0),
-
-(11,'call aaa','callaaa','map','query',0,0,0),
-
-(12,'select id,deptname,parentid,remark from dept','getdeptall','map','query',0,0,0),
-
-(13,'insert into dept(parentid, deptname, remark) values(?,?,?)','createdept','map','query',0,0,0),
-
-(14,'update dept set parentid= ? , deptname = ? , remark= ? where id = ?','updatedept','map','query',0,0,0),
-
-(15,'delete from dept where id = ?','deletedept','map','query',0,0,0),
-
-(16,'SELECT menu.id, menu.`path`, menu.`redirect`, menu.`component`, \nmenu.`title`,menu.`icon`,menu.`parentId`,menu.`name` FROM `user`,`user_role`,`role_menu`,`menu` \nWHERE user.`username`=? AND user_role.`user_id`=user.`id` AND role_menu.`role_id`=user_role.`role_id` \nAND menu.`id`=role_menu.`menu_id` AND menu.`menutype`=\'menu\' AND menu.`parentId`=? \norder by sort','getmenu','map','query',0,0,0),
-
-(17,'select id value,deptname label,parentid,remark from dept where parentid=?','getdeptrecu','map','query',0,0,0),
-
-(18,'select id,deptname,parentid,remark from dept  where parentid=?','getdeptlistrecu','map','query',0,0,0),
-
-(19,'select id,sqlstr,sqlname from apisql','getapisqlall','map','query',0,0,0),
-
-(20,'update apisql set sqlstr= ? , sqlname = ? where id = ?','updateapisql','map','query',0,0,0),
-
-(21,'delete from apisql where id = ?','deleteapisql','map','query',0,0,0),
-
-(22,'insert into apisql(sqlstr,sqlname) values(?,?)','createapisql','map','query',0,0,0),
-
-(23,'select id,title,parentid from menu where parentid=? and redirect =\'noredirect\'','getMenuListRecu','map','query',0,0,0),
-
-(24,'SELECT id,name,menutype,path,method,icon,redirect,title,parentid,component,sort FROM menu WHERE menutype=\'menu\' AND parentid=? order by sort','getMenuRecu','map','query',0,0,0),
-
-(25,'insert into menu(parentid,name,title,path,component,icon,redirect,sort,menutype,method) values(?,?,?,?,?,?,?,?,\'menu\',\'post\')','createMenu','map','query',0,0,0),
-
-(26,'delete from menu where id=?','deleteMenu','map','query',0,0,0),
-
-(27,'update menu\nset parentid=?,name=?,title=?,\npath=?,component=?,icon=?,redirect=?,sort=? \nwhere id =?','updateMenu','map','query',0,0,0),
-
-(28,'SELECT user.id ,user.username,user.fullname,dept.deptname FROM USER LEFT JOIN dept ON dept.id=user.deptid','getUserAll','map','query',0,0,0),
-
-(29,'insert into user(username, fullname, deptid) values(?,?,?)','createUser','map','query',0,0,0),
-
-(30,'update user set username=? ,fullname=? ,deptid=? where id=?','updateUser','map','query',0,0,0),
-
-(31,'delete from user where id = ?','deleteUser','map','query',0,0,0),
-
-(32,'select id,name from role','getRoleAll','map','query',0,0,0),
-
-(33,'insert into role(name) values(?)','createRole','map','query',0,0,0),
-
-(34,'update role set `name`=? where `id` =?','updateRole','map','query',0,0,0),
-
-(35,'delete from role where id = ?','deleteRole','map','query',0,0,0),
-
-(36,'select role_id from user_role where user_id = ?','getRoleByUser','map','query',0,0,0),
-
-(37,'select menu_id from role_menu where role_id = ?','getMenuByRole','map','query',0,0,0);
-
-/*Table structure for table `dept` */
-
-DROP TABLE IF EXISTS `dept`;
-
-CREATE TABLE `dept` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `deptname` varchar(50) DEFAULT NULL,
-  `parentid` int(11) DEFAULT -1,
-  `remark` varchar(50) DEFAULT NULL,
-  `createon` int(11) DEFAULT NULL,
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=68 DEFAULT CHARSET=utf8;
-
-/*Data for the table `dept` */
-
-insert  into `dept`(`id`,`deptname`,`parentid`,`remark`,`createon`) values 
-
-(39,'总公司',-1,'',NULL),
-
-(40,'销售部',39,'',NULL),
-
-(41,'行政部',39,'',NULL),
-
-(63,'士大夫',39,'',NULL),
-
-(66,'爱上',39,'是',NULL),
-
-(67,'是第三个',39,' ',NULL);
-
-/*Table structure for table `menu` */
-
-DROP TABLE IF EXISTS `menu`;
-
-CREATE TABLE `menu` (
-  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `name` varchar(50) DEFAULT '' COMMENT '名字',
-  `menutype` varchar(50) DEFAULT 'api',
-  `path` varchar(50) DEFAULT '' COMMENT '访问路径',
-  `method` varchar(50) DEFAULT 'post' COMMENT '资源请求方式',
-  `icon` varchar(50) DEFAULT '',
-  `redirect` varchar(50) DEFAULT 'noredirect',
-  `title` varchar(50) DEFAULT '',
-  `parentId` int(11) DEFAULT -1,
-  `component` varchar(50) DEFAULT 'Layout',
-  `sort` int(11) DEFAULT 0,
-  `created_on` int(11) unsigned DEFAULT 0 COMMENT '创建时间',
-  `modified_on` int(11) unsigned DEFAULT 0 COMMENT '更新时间',
-  `deleted_on` int(11) unsigned DEFAULT 0 COMMENT '删除时间戳',
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=32 DEFAULT CHARSET=utf8;
-
-/*Data for the table `menu` */
-
-insert  into `menu`(`id`,`name`,`menutype`,`path`,`method`,`icon`,`redirect`,`title`,`parentId`,`component`,`sort`,`created_on`,`modified_on`,`deleted_on`) values 
-
-(1,'查询所有菜单','api','/api/v1/menus','GET','','noredirect','查询所有菜单',25,'Layout',0,0,0,0),
-
-(2,'查询单个菜单','api','/api/v1/menus/:id','GET','','noredirect','查询单个菜单',25,'Layout',0,0,0,0),
-
-(3,'创建单个菜单','api','/api/v1/menus','POST','','noredirect','创建单个菜单',25,'Layout',0,0,0,0),
-
-(4,'更新单个菜单','api','/api/v1/menus/:id','PUT','','noredirect','更新单个菜单',25,'Layout',0,0,0,0),
-
-(5,'删除单个菜单','api','/api/v1/menus/:id','DELETE','','noredirect','删除单个菜单',25,'Layout',0,0,0,0),
-
-(6,'查询所有用户','api','/api/v1/users','GET','','noredirect','查询所有用户',25,'Layout',0,0,0,0),
-
-(7,'查询单个用户','api','/api/v1/users/:id','GET','','noredirect','查询单个用户',25,'Layout',0,0,0,0),
-
-(8,'创建单个用户','api','/api/v1/users','POST','','noredirect','创建单个用户',25,'Layout',0,0,0,0),
-
-(9,'更新单个用户','api','/api/v1/users/:id','PUT','','noredirect','更新单个用户',25,'Layout',0,0,0,0),
-
-(10,'删除单个用户','api','/api/v1/users/:id','DELETE','','noredirect','删除单个用户',25,'Layout',0,0,0,0),
-
-(11,'查询所有角色','api','/api/v1/roles','GET','','noredirect','查询所有角色',25,'Layout',0,0,0,0),
-
-(12,'查询单个角色','api','/api/v1/roles/:id','GET','','noredirect','查询单个角色',25,'Layout',0,0,0,0),
-
-(13,'创建单个角色','api','/api/v1/roles','POST','','noredirect','创建单个角色',25,'Layout',0,0,0,0),
-
-(14,'更新单个角色','api','/api/v1/roles/:id','PUT','','noredirect','更新单个角色',25,'Layout',0,0,0,0),
-
-(15,'删除单个角色','api','/api/v1/roles/:id','DELETE','','noredirect','删除单个角色',25,'Layout',0,0,0,0),
-
-(16,'登录','api','/auth','GET','','noredirect','登录',25,'Layout',0,0,0,0),
-
-(19,'console','menu','/console','POST','form','noredirect','系统管理',-1,'Layout',0,0,0,0),
-
-(21,'user','menu','user','POST','user','','用户管理',19,'console/user/index',3,0,0,0),
-
-(22,'menu','menu','menu','POST','table','','菜单管理',19,'console/menu/index',1,0,0,0),
-
-(23,'role','menu','role','POST','table','','角色管理',19,'console/role/index',2,0,0,0),
-
-(24,'dict','menu','dict','POST','table','','字典管理',19,'console/dict/index',3,0,0,0),
-
-(26,'dept','menu','dept','POST','user','','部门管理',19,'console/dept/index',4,0,0,0),
-
-(27,'apisql','menu','apisql','post','table','','SQL管理',19,'console/apisql/index',5,0,0,0),
-
-(30,'adf','menu','ad','post','','noredirect','adf',-1,'Layout',0,0,0,0),
-
-(31,'测试','menu','simple','post','form','','测试',19,'customviews/TableView',0,0,0,0);
-
-/*Table structure for table `role` */
-
-DROP TABLE IF EXISTS `role`;
-
-CREATE TABLE `role` (
-  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `name` varchar(50) DEFAULT '' COMMENT '名字',
-  `created_on` int(11) unsigned DEFAULT NULL COMMENT '创建时间',
-  `modified_on` int(11) unsigned DEFAULT NULL COMMENT '更新时间',
-  `deleted_on` int(11) unsigned DEFAULT 0 COMMENT '删除时间戳',
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=19 DEFAULT CHARSET=utf8;
-
-/*Data for the table `role` */
-
-insert  into `role`(`id`,`name`,`created_on`,`modified_on`,`deleted_on`) values 
-
-(1,'朱红宾',NULL,NULL,0),
-
-(11,'管理员',NULL,NULL,0),
-
-(12,'测试',NULL,NULL,0),
-
-(13,'adsf',NULL,NULL,0),
-
-(18,'舒服的',NULL,NULL,0);
-
-/*Table structure for table `role_menu` */
-
-DROP TABLE IF EXISTS `role_menu`;
-
-CREATE TABLE `role_menu` (
-  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `role_id` int(11) unsigned DEFAULT NULL COMMENT '角色ID',
-  `menu_id` int(11) unsigned DEFAULT NULL COMMENT '菜单ID',
-  `deleted_on` int(11) unsigned DEFAULT 0 COMMENT '删除时间戳',
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=26 DEFAULT CHARSET=utf8 COMMENT='用户_角色ID_管理';
-
-/*Data for the table `role_menu` */
-
-insert  into `role_menu`(`id`,`role_id`,`menu_id`,`deleted_on`) values 
-
-(1,1,1,0),
-
-(2,1,2,0),
-
-(3,1,3,0),
-
-(4,1,4,0),
-
-(5,1,5,0),
-
-(6,1,6,0),
-
-(7,1,7,0),
-
-(8,1,8,0),
-
-(9,1,9,0),
-
-(10,1,10,0),
-
-(11,1,11,0),
-
-(12,1,12,0),
-
-(13,1,13,0),
-
-(14,1,14,0),
-
-(15,1,15,0),
-
-(17,1,19,0),
-
-(18,1,21,0),
-
-(19,1,22,0),
-
-(20,1,23,0),
-
-(21,1,24,0),
-
-(22,1,25,0),
-
-(23,1,26,0),
-
-(24,1,27,0),
-
-(25,1,31,0);
-
-/*Table structure for table `user` */
-
-DROP TABLE IF EXISTS `user`;
-
-CREATE TABLE `user` (
-  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `username` varchar(50) DEFAULT '' COMMENT '账号',
-  `fullname` varchar(50) DEFAULT '',
-  `deptid` int(11) DEFAULT -1,
-  `password` varchar(50) DEFAULT '' COMMENT '密码',
-  `created_on` int(11) unsigned DEFAULT NULL COMMENT '创建时间',
-  `modified_on` int(11) unsigned DEFAULT NULL COMMENT '更新时间',
-  `deleted_on` int(11) unsigned DEFAULT 0 COMMENT '删除时间戳',
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=16 DEFAULT CHARSET=utf8 COMMENT='用户管理';
-
-/*Data for the table `user` */
-
-insert  into `user`(`id`,`username`,`fullname`,`deptid`,`password`,`created_on`,`modified_on`,`deleted_on`) values 
-
-(1,'admin','管理员',39,'e10adc3949ba59abbe56e057f20f883e',NULL,NULL,0),
-
-(2,'zhuhongbin','',39,'e10adc3949ba59abbe56e057f20f883e',1550642309,1550642309,0);
-
-/*Table structure for table `user_role` */
-
-DROP TABLE IF EXISTS `user_role`;
-
-CREATE TABLE `user_role` (
-  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `user_id` int(11) unsigned DEFAULT NULL COMMENT '用户ID',
-  `role_id` int(11) unsigned DEFAULT NULL COMMENT '角色ID',
-  `deleted_on` int(11) unsigned DEFAULT 0 COMMENT '删除时间戳',
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=29 DEFAULT CHARSET=utf8 COMMENT='用户_角色ID_管理';
-
-/*Data for the table `user_role` */
-
-insert  into `user_role`(`id`,`user_id`,`role_id`,`deleted_on`) values 
-
-(1,1,1,0),
-
-(8,2,1,0),
-
-(26,2,11,0);
-
-/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
-/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
-/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
-/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;

routers/api/scheduled.go

@@ -38,34 +38,34 @@ func CronScheduled(ctx context.Context) {
 		return
 	}
 
-	// duetimecst, _ := time.ParseInLocation("15:04:05", "00:05:00", time.Local)
-	// duetimecst1, _ := time.ParseInLocation("15:04:05", "00:00:00", time.Local)
-	// spec := fmt.Sprintf("@every %v", duetimecst.Sub(duetimecst1))
-
-	// c := cron.New()
-	// c.AddFunc(spec, func() {
-	// 	tx1 := restful.Engine.NewSession()
-	// 	defer tx1.Close()
-	// 	exist, err := tx1.Table("notice").Where("status = 1").And("content = ? ", "downloadedplan_log").Exist()
-	// 	if err != nil {
-	// 		logs.Error("CronScheduled-error-1:", err)
-	// 		return
-	// 	}
-
-	// 	fmt.Println(exist)
-	// 	if exist {
-	// 		_, err := tx.SQL(`update notice set status = 0  where content =  ? `, "downloadedplan_log").Execute()
-	// 		if err != nil {
-	// 			logs.Error("CronScheduled-error-2:", err)
-	// 			return
-	// 		}
-	// 		Scheduled(ctx, tx1, pastureinfo)
-	// 	}
-
-	// })
-	// c.Start()
-
-	duetimecst2, _ := time.ParseInLocation("15:04:05", "00:00:30", time.Local)
+	duetimecst, _ := time.ParseInLocation("15:04:05", "00:10:00", time.Local)
+	duetimecst1, _ := time.ParseInLocation("15:04:05", "00:00:00", time.Local)
+	spec := fmt.Sprintf("@every %v", duetimecst.Sub(duetimecst1))
+
+	c := cron.New()
+	c.AddFunc(spec, func() {
+		tx1 := restful.Engine.NewSession()
+		defer tx1.Close()
+		exist, err := tx1.Table("notice").Where("status = 1").And("content = ? ", "downloadedplan_log").Exist()
+		if err != nil {
+			logs.Error("CronScheduled-error-1:", err)
+			return
+		}
+
+		fmt.Println(exist)
+		if exist {
+			_, err := tx.SQL(`update notice set status = 0  where content =  ? `, "downloadedplan_log").Execute()
+			if err != nil {
+				logs.Error("CronScheduled-error-2:", err)
+				return
+			}
+			Scheduled(ctx, tx1, pastureinfo)
+		}
+
+	})
+	c.Start()
+
+	duetimecst2, _ := time.ParseInLocation("15:04:05", "00:01:00", time.Local)
 	duetimecst3, _ := time.ParseInLocation("15:04:05", "00:00:00", time.Local)
 	spec1 := fmt.Sprintf("@every %v", duetimecst2.Sub(duetimecst3))
 
@@ -168,7 +168,7 @@ func Scheduled(ctx context.Context, tx *xorm.Session, pastureinfo *udPastureInfo
 			ids = append(ids, strconv.FormatInt(item["id"].(int64), 10))
 		}
 		fmt.Println(ids, time.Now())
-		err = UpdatePush(ctx, tx, true, ids, pastureinfo, "")
+		err = UpdatePush(ctx, tx, true, ids, pastureinfo, "", time.Now().Format("2022-01-02"))
 		if err != nil {
 			return
 		}
@@ -199,7 +199,7 @@ func Scheduled(ctx context.Context, tx *xorm.Session, pastureinfo *udPastureInfo
 				for _, item := range downloadedplanLogList {
 					ids = append(ids, strconv.FormatInt(item["id"].(int64), 10))
 				}
-				err = UpdatePush(ctx, tx, true, ids, pastureinfo, "")
+				err = UpdatePush(ctx, tx, true, ids, pastureinfo, "", time.Now().Format("2022-01-02"))
 				if err != nil {
 					return
 				}
@@ -224,7 +224,7 @@ func Scheduled(ctx context.Context, tx *xorm.Session, pastureinfo *udPastureInfo
 			for _, item := range downloadedplanLogList {
 				ids = append(ids, strconv.FormatInt(item["id"].(int64), 10))
 			}
-			err = UpdatePush(ctx, tx, true, ids, pastureinfo, "")
+			err = UpdatePush(ctx, tx, true, ids, pastureinfo, "", time.Now().Format("2022-01-02"))
 			if err != nil {
 				return
 			}
@@ -327,6 +327,7 @@ func SynchronizeNow(c *gin.Context) {
 	dataByte, _ := ioutil.ReadAll(c.Request.Body)
 	fsion := gofasion.NewFasion(string(dataByte))
 	company := fsion.Get("company").ValueStr()
+	date := fsion.Get("date").ValueStr()
 
 	tx := restful.Engine.NewSession()
 	defer tx.Close()
@@ -339,7 +340,7 @@ func SynchronizeNow(c *gin.Context) {
 		return
 	}
 
-	dataList, err := tx.SQL(`select id from downloadedplan_log where date = date_format(now(),'%Y-%m-%d') `).Query().List()
+	dataList, err := tx.SQL(`select id from downloadedplan_log where date = date_format(?,'%Y-%m-%d') `, date).Query().List()
 	if err != nil {
 		appG.Response(http.StatusInternalServerError, e.ERROR, false)
 		return
@@ -349,7 +350,7 @@ func SynchronizeNow(c *gin.Context) {
 		idList = append(idList, strconv.FormatInt(data["id"].(int64), 10))
 	}
 
-	err = UpdatePush(c, tx, false, idList, pastureinfo, company)
+	err = UpdatePush(c, tx, false, idList, pastureinfo, company, date)
 	if err != nil {
 		appG.Response(http.StatusInternalServerError, e.ERROR, false)
 		return
@@ -364,7 +365,7 @@ func SynchronizeNow(c *gin.Context) {
 	appG.Response(http.StatusOK, e.SUCCESS, true)
 }
 
-func UpdatePush(ctx context.Context, tx *xorm.Session, auto bool, idList []string, pastureinfo *udPastureInfo, company string) error {
+func UpdatePush(ctx context.Context, tx *xorm.Session, auto bool, idList []string, pastureinfo *udPastureInfo, company, date string) error {
 	upList := make([]*ScheduledUpInfo, 0)
 	up := tx.Table("scheduled_up")
 	if company != "" {
@@ -392,9 +393,11 @@ func UpdatePush(ctx context.Context, tx *xorm.Session, auto bool, idList []strin
 					} else if targetdata == "idlist" {
 						// args = append(args, strings.Join(idList, ","))
 						item.Datasql = strings.ReplaceAll(item.Datasql, "idlist", strings.Join(idList, ","))
+					} else if targetdata == "date" {
+						args = append(args, date)
 					}
 				}
-
+				fmt.Println(item.Datasql)
 				data, err := tx.SQL(item.Datasql, args...).Query().List()
 				if err != nil {
 					log.Println("UpdataPush-error-2: ", err)
@@ -738,17 +741,15 @@ func wxPush(target []string, content []interface{}, pastureId string, serviceId
 		"pasture_id":%s,
 		"service_id":%d,
 		"sys_name": "tmrWatch",
-		"template_id": "BtkN1rWKOJtKP0C64lGxIrPzLRFsYFas-4gupX2-pFo",
 		"target": %s,
 		"miniprogram": {
 			"appid": "wx9ab2b5b25701da0a",
-			"pagepath": "pages/index/index?token=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VybmFtZSI6IjAwMDI4IiwicGFzc3dvcmQiOiJlMTBhZGMzOTQ5YmE1OWFiYmU1NmUwNTdmMjBmODgzZSIsImV4cCI6MTY1NDIzMDMxMywiaXNzIjoiaHR0cHM6Ly9naXRodWIuY29tL2twdHl1bi9nby1hZG1pbi8ifQ.jKLR74kTy9tXqFH5OwlwK7zTGKvMVbrOecsaJpxbxq8"
+			"pagepath": "pages/login/login"
 		},
 		"keys": [
 			"first",
 			"keyword1",
 			"keyword2",
-			"keyword3",
 			"remark"
 		],
 		"content":%s
@@ -765,13 +766,15 @@ func wxPush(target []string, content []interface{}, pastureId string, serviceId
 	client := &http.Client{}
 	resp, err := client.Do(req)
 	if err != nil {
-		panic(err)
+		logs.Error(err)
 	}
 
 	defer resp.Body.Close()
+
 	body, _ := ioutil.ReadAll(resp.Body)
 	fmt.Println(dataStr)
 	fmt.Println("response Body:", string(body), "fasong")
+
 }
 
 func UDPostPush1(data, method string) {
@@ -841,7 +844,7 @@ func processAnalysisEarlyWarning(target []string, pastureId string, serviceId in
 
 		for _, data := range dataList {
 			if data["type"].(int64) == 0 {
-				plandtl1List, err := tx2.SQL(`select d1.fname,d.tmrtname,d1.intime,d1.id,d1.feedallowratio,abs(d1.actualweightminus -d1.lweight ) errorvalue ,d1.actualweightminus,d1.lweight,
+				plandtl1List, err := tx2.SQL(`select d.projname,d1.fname,d.tmrtname,DATE_FORMAT(d1.intime, '%Y-%m-%d %H:%i:%S') as intime,d1.id,d1.feedallowratio,abs(d1.actualweightminus -d1.lweight ) errorvalue ,d1.actualweightminus,d1.lweight,
 					if(d1.actualweightminus <= d1.lweight,ROUND(d1.actualweightminus/d1.lweight* 100,2),ROUND(d1.lweight/d1.actualweightminus* 100,2) ) as accuracy  from
 					downloadplandtl1 d1
 					join downloadedplan d on d.id = d1.pid
@@ -872,29 +875,31 @@ func processAnalysisEarlyWarning(target []string, pastureId string, serviceId in
 						fmt.Println(plandtl1, "推送")
 						// target := []string{"13916925233"}
 						var sendList []interface{}
-						sendStr := fmt.Sprintf("tmr名称：%v\n饲料名称：%v\n计划重量（kg）：%v\n实际重量（kg）：%v\n误差值（kg）：%v\n准确率：%v",
-							plandtl1["tmrtname"], plandtl1["fname"], plandtl1["lweight"], plandtl1["actualweightminus"], plandtl1["errorvalue"], plandtl1["accuracy"])
+						sendStr := fmt.Sprintf("操作编号：%v\nTMR名称：%v\n饲料名称：%v\n计划重量（kg）：%v\n实际重量（kg）：%v\n误差值（kg）：%v\n准确率(%%)：%v",
+							plandtl1["projname"], plandtl1["tmrtname"], plandtl1["fname"], plandtl1["lweight"], plandtl1["actualweightminus"], plandtl1["errorvalue"], plandtl1["accuracy"])
 						// content = append(content, "混料", plandtl1["begintime"], "kpt", sendStr, "搅拌预警")
 
 						sendMap1 := make(map[string]interface{}, 0)
-						sendMap1["value"] = "搅拌"
+						sendMap1["value"] = "混料准确率异常"
 						sendMap1["color"] = "#173177"
 						sendList = append(sendList, sendMap1)
-						sendMap2 := make(map[string]interface{}, 0)
-						sendMap2["value"] = plandtl1["intime"]
-						sendMap2["color"] = "#173177"
-						sendList = append(sendList, sendMap2)
-						sendMap3 := make(map[string]interface{}, 0)
-						sendMap3["value"] = "kpt"
-						sendMap3["color"] = "#173177"
-						sendList = append(sendList, sendMap3)
+
 						sendMap4 := make(map[string]interface{}, 0)
 						sendMap4["value"] = sendStr
 						sendMap4["color"] = "#173177"
 						sendList = append(sendList, sendMap4)
 
+						sendMap2 := make(map[string]interface{}, 0)
+						sendMap2["value"] = plandtl1["intime"]
+						sendMap2["color"] = "#173177"
+						sendList = append(sendList, sendMap2)
+						// sendMap3 := make(map[string]interface{}, 0)
+						// sendMap3["value"] = "kpt"
+						// sendMap3["color"] = "#173177"
+						// sendList = append(sendList, sendMap3)
+
 						sendMap5 := make(map[string]interface{}, 0)
-						sendMap5["value"] = "搅拌预警"
+						sendMap5["value"] = "感谢您支持科湃腾"
 						sendMap5["color"] = "#173177"
 						sendList = append(sendList, sendMap5)
 						wxPush(target, sendList, pastureId, serviceId)
@@ -909,7 +914,7 @@ func processAnalysisEarlyWarning(target []string, pastureId string, serviceId in
 
 				}
 			} else {
-				plandtl1List, err := tx2.SQL(`select  d2.fname,d.tmrtname,d2.id,ifnull(d2.allowratio,0) allowratio ,abs(d2.actualweightminus -d2.lweight ) errorvalue ,d2.intime,d2.actualweightminus,d2.lweight,
+				plandtl1List, err := tx2.SQL(`select  d.projname,d2.fname,d.tmrtname,d2.id,ifnull(d2.allowratio,0) allowratio ,abs(d2.actualweightminus -d2.lweight ) errorvalue ,DATE_FORMAT(d2.intime, '%Y-%m-%d %H:%i:%S') as intime ,d2.actualweightminus,d2.lweight,
 					if(d2.actualweightminus <= d2.lweight,ROUND(d2.actualweightminus/d2.lweight* 100,2),ROUND(d2.lweight/d2.actualweightminus* 100,2) ) as accuracy
 				 from 	downloadplandtl2 d2
 					join downloadedplan d on d.id = d2.pid
@@ -928,27 +933,29 @@ func processAnalysisEarlyWarning(target []string, pastureId string, serviceId in
 						// var content []interface{}
 
 						var sendList []interface{}
-						sendStr := fmt.Sprintf("tmr名称：%v\n栏舍名称：%v\n计划重量（kg）：%v\n实际重量（kg）：%v\n误差值（kg）：%v\n准确率：%v",
-							plandtl1["tmrtname"], plandtl1["fname"], plandtl1["lweight"], plandtl1["actualweightminus"], plandtl1["errorvalue"], plandtl1["accuracy"])
+						sendStr := fmt.Sprintf("操作编号：%v\nTMR名称：%v\n栏舍名称：%v\n计划重量（kg）：%v\n实际重量（kg）：%v\n误差值（kg）：%v\n准确率(%%)：%v",
+							plandtl1["projname"], plandtl1["tmrtname"], plandtl1["fname"], plandtl1["lweight"], plandtl1["actualweightminus"], plandtl1["errorvalue"], plandtl1["accuracy"])
 						sendMap1 := make(map[string]interface{}, 0)
-						sendMap1["value"] = "撒料"
+						sendMap1["value"] = "撒料准确率异常"
 						sendMap1["color"] = "#173177"
 						sendList = append(sendList, sendMap1)
-						sendMap2 := make(map[string]interface{}, 0)
-						sendMap2["value"] = plandtl1["intime"]
-						sendMap2["color"] = "#173177"
-						sendList = append(sendList, sendMap2)
-						sendMap3 := make(map[string]interface{}, 0)
-						sendMap3["value"] = "kpt"
-						sendMap3["color"] = "#173177"
-						sendList = append(sendList, sendMap3)
+
 						sendMap4 := make(map[string]interface{}, 0)
 						sendMap4["value"] = sendStr
 						sendMap4["color"] = "#173177"
 						sendList = append(sendList, sendMap4)
 
+						sendMap2 := make(map[string]interface{}, 0)
+						sendMap2["value"] = plandtl1["intime"]
+						sendMap2["color"] = "#173177"
+						sendList = append(sendList, sendMap2)
+						// sendMap3 := make(map[string]interface{}, 0)
+						// sendMap3["value"] = "kpt"
+						// sendMap3["color"] = "#173177"
+						// sendList = append(sendList, sendMap3)
+
 						sendMap5 := make(map[string]interface{}, 0)
-						sendMap5["value"] = "撒料预警"
+						sendMap5["value"] = "感谢您支持科湃腾"
 						sendMap5["color"] = "#173177"
 						sendList = append(sendList, sendMap5)
 
@@ -967,3 +974,7 @@ func processAnalysisEarlyWarning(target []string, pastureId string, serviceId in
 		}
 	}
 }
+
+
+
+

routers/api/user.go

@@ -178,6 +178,7 @@ func UserWXOpenIDBinding(c *gin.Context) {
 	defer tx.Close()
 
 	userlist := strings.Split(userinfo, ".")
+	fmt.Println(len(userlist), userlist)
 	if len(userlist) < 3 {
 		logs.Error("UserWXOpenIDBinding-error1:", nil)
 		appG.Response(http.StatusInternalServerError, e.ERROR, false)