list = dingUserService.listUser();
+ list.forEach(user-> dingService.sign(user));
+ }
}
diff --git a/src/main/java/com/tools/module/app/web/DingController.java b/src/main/java/com/tools/module/app/web/DingController.java
index 73ab8ec..3f4dcb5 100644
--- a/src/main/java/com/tools/module/app/web/DingController.java
+++ b/src/main/java/com/tools/module/app/web/DingController.java
@@ -2,12 +2,14 @@ package com.tools.module.app.web;
import com.tools.common.config.AbstractController;
import com.tools.common.model.Result;
-import com.tools.module.app.entity.AppDingDetails;
+import com.tools.common.util.CommonUtils;
import com.tools.module.app.entity.AppDingUser;
import com.tools.module.app.service.AppDingService;
-import com.tools.module.app.service.AppEmailService;
+import com.tools.module.app.service.AppDingUserService;
import io.swagger.annotations.Api;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -25,28 +27,72 @@ public class DingController extends AbstractController {
@Autowired
private AppDingService appDingService;
+ @Autowired
+ private AppDingUserService dingUserService;
+
+ /**
+ * 列表
+ */
+ @PostMapping("list")
+ public Result list(AppDingUser user){
+ return dingUserService.list(user);
+ }
+
+ /**
+ * 保存
+ */
+ @PostMapping("save")
+ public Result save(@RequestBody AppDingUser user){
+ return dingUserService.save(user);
+ }
+
+ /**
+ * 获取用户
+ */
+ @PostMapping("get")
+ public Result get(Integer userId){
+ AppDingUser user = dingUserService.get(userId);
+ return CommonUtils.msg(user);
+ }
+
+ /**
+ * 删除用户
+ */
+ @PostMapping("delete")
+ public Result delete(Integer userId){
+ return dingUserService.delete(userId);
+ }
+
+ /**
+ * 签到
+ */
+ @PostMapping("sign")
+ public Result sign(Integer userId){
+ AppDingUser user = dingUserService.get(userId);
+ return appDingService.sign(user);
+ }
+
/**
* 列表
*/
- @RequestMapping("sign")
+ @RequestMapping("signT")
public Result sign(){
try {
AppDingUser user = new AppDingUser();
- user.setUsername("******");
- user.setPassword("******");
+ user.setUsername("8888");
+ user.setPassword("8888");
String authorization = appDingService.login(user);
System.out.println(authorization);
String planId = appDingService.planId(authorization);
System.out.println(planId);
- AppDingDetails detailsBean = new AppDingDetails();
- detailsBean.setAddress("河南省.郑州市.人民政府");
- detailsBean.setCountry("中国");
- detailsBean.setProvince("河南省");
- detailsBean.setCity("郑州市");
- detailsBean.setLatitude("37.773296");
- detailsBean.setLongitude("113.759527");
- detailsBean.setDescription("开心");
- Result sin = appDingService.sin(authorization, planId, detailsBean);
+ user.setAddress("河南省.郑州市.人民政府");
+ user.setCountry("中国");
+ user.setProvince("河南省");
+ user.setCity("郑州市");
+ user.setLatitude("37.773296");
+ user.setLongitude("113.759527");
+ user.setDescription("开心");
+ String sin = appDingService.sin(authorization, planId, user);
System.out.println(sin);
} catch (Exception e) {
e.printStackTrace();
diff --git a/src/main/java/com/tools/module/sys/service/impl/SysMenuServiceImpl.java b/src/main/java/com/tools/module/sys/service/impl/SysMenuServiceImpl.java
index ef8d904..1cbd5f1 100644
--- a/src/main/java/com/tools/module/sys/service/impl/SysMenuServiceImpl.java
+++ b/src/main/java/com/tools/module/sys/service/impl/SysMenuServiceImpl.java
@@ -77,7 +77,7 @@ public class SysMenuServiceImpl implements SysMenuService {
nativeSql +="LEFT JOIN sys_role_menu rm ON m.menu_id = rm.menu_id ";
nativeSql +="LEFT JOIN sys_role r ON r.role_id = rm.role_id ";
nativeSql +="WHERE r.role_id IN (SELECT role_id FROM sys_user_role WHERE user_id=?) ";
- nativeSql +="AND m.TYPE = 0 ";
+ nativeSql +="AND m.TYPE = 0 ORDER BY m.order_num";
List list = dynamicQuery.query(SysMenu.class,nativeSql,new Object[]{userId});
list.stream().forEach(menu->{
String subSql = "SELECT DISTINCT m.* FROM sys_menu m ";
diff --git a/src/main/resources/templates/app/moguding/form.html b/src/main/resources/templates/app/moguding/form.html
new file mode 100644
index 0000000..e5dab43
--- /dev/null
+++ b/src/main/resources/templates/app/moguding/form.html
@@ -0,0 +1,125 @@
+
+
+
+
+
+
+
+
+
+
+
+ {{user.username}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main/resources/templates/app/moguding/list.html b/src/main/resources/templates/app/moguding/list.html
new file mode 100644
index 0000000..c343667
--- /dev/null
+++ b/src/main/resources/templates/app/moguding/list.html
@@ -0,0 +1,211 @@
+
+
+
+
+