From 0f2202dfcea3309c1b0e7515f6db5fbdc83d51d1 Mon Sep 17 00:00:00 2001
From: wang-hao-jie <1550036656@qq.com>
Date: 星期五, 07 一月 2022 11:06:51 +0800
Subject: [PATCH] 违章记录
---
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/pc/StatisticController.java | 34 ++++++++
xboot-core/src/main/java/cn/exrick/xboot/core/config/security/permission/CorsFilter.java | 74 ++++++++++++++++++
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/IOrderTaskServiceImpl.java | 6 +
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/ICustomerServiceImpl.java | 5 +
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/OrderTaskMapper.java | 8 ++
xboot-core/src/main/java/cn/exrick/xboot/core/entity/User.java | 2
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/AreaMapper.java | 3
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/Customer.java | 3
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/schedulings/OrderSynScheduleImpl.java | 37 +++++---
xboot-core/src/main/java/cn/exrick/xboot/core/config/security/WebSecurityConfig.java | 6 +
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/AreaSectionController.java | 10 ++
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/service/IOrderTaskService.java | 2
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/wx/IndexController.java | 4
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/service/ICustomerService.java | 2
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/IAreaServiceImpl.java | 5 +
xboot-modules/xboot-base/src/main/java/cn/exrick/xboot/base/controller/manage/UserController.java | 6
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/service/IAreaService.java | 2
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/schedulings/StatisticPcScheduleImpl.java | 6
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/CustomerMapper.java | 3
19 files changed, 193 insertions(+), 25 deletions(-)
diff --git a/xboot-core/src/main/java/cn/exrick/xboot/core/config/security/WebSecurityConfig.java b/xboot-core/src/main/java/cn/exrick/xboot/core/config/security/WebSecurityConfig.java
index 2ad2ff3..01a6591 100644
--- a/xboot-core/src/main/java/cn/exrick/xboot/core/config/security/WebSecurityConfig.java
+++ b/xboot-core/src/main/java/cn/exrick/xboot/core/config/security/WebSecurityConfig.java
@@ -98,9 +98,11 @@
registry.and()
// 琛ㄥ崟鐧诲綍鏂瑰紡
.formLogin()
- .loginPage("/xboot/common/needLogin")
+ //.loginPage("/xboot/common/needLogin")
+ .loginPage("/index.html")
// 鐧诲綍璇锋眰url
.loginProcessingUrl("/xboot/login")
+ //.loginProcessingUrl("/login")
.permitAll()
// 鎴愬姛澶勭悊绫�
.successHandler(successHandler)
@@ -120,7 +122,7 @@
.authenticated()
.and()
// 鍏佽璺ㄥ煙
- .cors().and()
+ //.cors().and()
// 鍏抽棴璺ㄧ珯璇锋眰闃叉姢
.csrf().disable()
// 鍓嶅悗绔垎绂婚噰鐢↗WT 涓嶉渶瑕乻ession
diff --git a/xboot-core/src/main/java/cn/exrick/xboot/core/config/security/permission/CorsFilter.java b/xboot-core/src/main/java/cn/exrick/xboot/core/config/security/permission/CorsFilter.java
new file mode 100644
index 0000000..afd87c1
--- /dev/null
+++ b/xboot-core/src/main/java/cn/exrick/xboot/core/config/security/permission/CorsFilter.java
@@ -0,0 +1,74 @@
+package cn.exrick.xboot.core.config.security.permission;
+
+import org.springframework.stereotype.Component;
+
+import javax.servlet.*;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+/**
+ * 璺ㄥ煙杩囨护鍣�
+ * @author jitwxs
+ * @since 2018/10/16 20:53
+ */
+@Component
+public class CorsFilter implements Filter {
+ @Override
+ public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain) throws IOException, ServletException {
+ HttpServletResponse response = (HttpServletResponse) res;
+ HttpServletRequest request = (HttpServletRequest) req;
+
+ // 涓嶄娇鐢�*锛岃嚜鍔ㄩ�傞厤璺ㄥ煙鍩熷悕锛岄伩鍏嶆惡甯ookie鏃跺け鏁�
+ String origin = request.getHeader("Origin");
+ if(!isNullOrEmpty(origin)) {
+ response.setHeader("Access-Control-Allow-Origin", origin);
+ }
+
+ // 鑷�傚簲鎵�鏈夎嚜瀹氫箟澶�
+ String headers = request.getHeader("Access-Control-Request-Headers");
+ if(!isNullOrEmpty(headers)) {
+ response.setHeader("Access-Control-Allow-Headers", headers);
+ response.setHeader("Access-Control-Expose-Headers", headers);
+ }
+
+ // 鍏佽璺ㄥ煙鐨勮姹傛柟娉曠被鍨�
+ response.setHeader("Access-Control-Allow-Methods", "*");
+ // 棰勬鍛戒护锛圤PTIONS锛夌紦瀛樻椂闂达紝鍗曚綅锛氱
+ response.setHeader("Access-Control-Max-Age", "3600");
+ // 鏄庣‘璁稿彲瀹㈡埛绔彂閫丆ookie锛屼笉鍏佽鍒犻櫎瀛楁鍗冲彲
+ response.setHeader("Access-Control-Allow-Credentials", "true");
+
+ chain.doFilter(request, response);
+ }
+
+ public boolean isNullOrEmpty(String str) {
+ if (null == str || "".equalsIgnoreCase(str.trim())
+ || "null".equals(str.trim())) {
+ return true;
+ }
+ return false;
+ }
+
+ @Override
+ public void init(FilterConfig filterConfig) {
+
+ }
+
+ @Override
+ public void destroy() {
+ }
+
+ /*
+ 娉ㄥ唽杩囨护鍣細
+ @Bean
+ public FilterRegistrationBean registerFilter() {
+ FilterRegistrationBean<CorsFilter> bean = new FilterRegistrationBean<>();
+ bean.addUrlPatterns("/*");
+ bean.setFilter(new CorsFilter());
+ // 杩囨护椤哄簭锛屼粠灏忓埌澶т緷娆¤繃婊�
+ bean.setOrder(Ordered.HIGHEST_PRECEDENCE);
+ return bean;
+ }
+ */
+}
diff --git a/xboot-core/src/main/java/cn/exrick/xboot/core/entity/User.java b/xboot-core/src/main/java/cn/exrick/xboot/core/entity/User.java
index 2a4bc4d..101e2b0 100644
--- a/xboot-core/src/main/java/cn/exrick/xboot/core/entity/User.java
+++ b/xboot-core/src/main/java/cn/exrick/xboot/core/entity/User.java
@@ -61,7 +61,7 @@
private String mobile;
@ApiModelProperty(value = "閭")
- @Pattern(regexp = NameUtil.regEmail, message = "閭鏍煎紡涓嶆纭�")
+ //@Pattern(regexp = NameUtil.regEmail, message = "閭鏍煎紡涓嶆纭�")
private String email;
@ApiModelProperty(value = "鐪佸競鍘垮湴鍧�")
diff --git a/xboot-modules/xboot-base/src/main/java/cn/exrick/xboot/base/controller/manage/UserController.java b/xboot-modules/xboot-base/src/main/java/cn/exrick/xboot/base/controller/manage/UserController.java
index 5bd327e..05710e4 100644
--- a/xboot-modules/xboot-base/src/main/java/cn/exrick/xboot/base/controller/manage/UserController.java
+++ b/xboot-modules/xboot-base/src/main/java/cn/exrick/xboot/base/controller/manage/UserController.java
@@ -355,9 +355,9 @@
if (!old.getMobile().equals(u.getMobile()) && userService.findByMobile(u.getMobile()) != null) {
return ResultUtil.error("璇ユ墜鏈哄彿宸茬粦瀹氬叾浠栬处鎴�");
}
- if (!old.getEmail().equals(u.getEmail()) && userService.findByEmail(u.getEmail()) != null) {
- return ResultUtil.error("璇ラ偖绠卞凡缁戝畾鍏朵粬璐︽埛");
- }
+// if (!old.getEmail().equals(u.getEmail()) && userService.findByEmail(u.getEmail()) != null) {
+// return ResultUtil.error("璇ラ偖绠卞凡缁戝畾鍏朵粬璐︽埛");
+// }
if (StrUtil.isNotBlank(u.getDepartmentId())) {
Department d = departmentService.get(u.getDepartmentId());
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/AreaSectionController.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/AreaSectionController.java
index ccfb087..3a77c5a 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/AreaSectionController.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/AreaSectionController.java
@@ -47,6 +47,16 @@
return new ResultUtil<List<AreaSection>>().setData(list);
}
+ @RequestMapping(value = "/getAll2", method = RequestMethod.GET)
+ @ApiOperation(value = "鑾峰彇鍏ㄩ儴鏁版嵁")
+ public Result<List<AreaSection>> getAll2(String areaId) {
+
+ QueryWrapper<AreaSection> wrapper = new QueryWrapper<>();
+ wrapper.eq("area_id",areaId);
+ List<AreaSection> list = iAreaSectionService.list(wrapper);
+ return new ResultUtil<List<AreaSection>>().setData(list);
+ }
+
@RequestMapping(value = "/getByPage", method = RequestMethod.GET)
@ApiOperation(value = "鍒嗛〉鑾峰彇")
public Result<IPage<AreaSection>> getByPage(String areaId,PageVo page) {
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/pc/StatisticController.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/pc/StatisticController.java
index ef56f37..ab3b00c 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/pc/StatisticController.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/pc/StatisticController.java
@@ -119,6 +119,40 @@
return new ResultUtil<Object>().setData(list);
}
+ @RequestMapping(value = "/getAnalysisDetail", method = RequestMethod.GET)
+ @ApiOperation(value = "鑾峰彇閰嶉�佸垎鏋愯鎯�")
+ public Result<Object> getAnalysisDetail(String areaName,String selectName) {
+ QueryWrapper<Area> wrapper = new QueryWrapper<Area>();
+ wrapper.eq("name",areaName);
+ Area one = iAreaService.getOne(wrapper);
+
+ QueryWrapper<AreaSection> wrapper2 = new QueryWrapper<AreaSection>();
+ wrapper2.eq("area_id",one.getId());
+ wrapper2.eq("name",selectName);
+ AreaSection one1 = iAreaSectionService.getOne(wrapper2);
+
+ List<OrderTask> list = iOrderTaskService.groupByTime(one.getId(),one1.getId());
+
+ List<String> list1 = new ArrayList<>();
+ List<Integer> list2 = new ArrayList<>();
+ List<Integer> list3 = new ArrayList<>();
+ List<Integer> list4 = new ArrayList<>();
+
+ for(OrderTask obj:list){
+ list1.add(obj.getCustomerName());
+ list2.add(Integer.valueOf(obj.getTime()/60000));
+ list3.add(Integer.valueOf(obj.getNum()/60000));
+ list4.add(Integer.valueOf(obj.getLevel()/60000));
+ }
+ Map<String,Object> map = new HashMap<>();
+ map.put("name",list1);
+ map.put("avg",list2);
+ map.put("min",list3);
+ map.put("max",list4);
+
+ return new ResultUtil<Object>().setData(map);
+ }
+
public double trans2(double v2){
return (double) Math.round(v2 * 100) / 100;
}
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/wx/IndexController.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/wx/IndexController.java
index 778059a..284354a 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/wx/IndexController.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/wx/IndexController.java
@@ -76,6 +76,8 @@
if(one==null){
return ResultUtil.error(openid);//棣栨鐧婚檰闇�缁戝畾闆跺敭璁稿彲璇�
}else {
+ one.setLoginNum(one.getLoginNum()+1);
+ iCustomerService.saveOrUpdate(one);
return ResultUtil.data(one,"鐧诲綍鎴愬姛");
}
}
@@ -83,7 +85,7 @@
public static JSONObject getSessionKeyOrOpenId(String code){
//寰俊绔櫥褰昪ode
String wxCode = code;
- String requestUrl = "https://api.weixin.qq.com/sns/jscode2session?appid=wx0f10f6d253f3ee6b&secret=4d4cbc8da31a96559114ad693de70631&grant_type=authorization_code&js_code="+code;
+ String requestUrl = "https://api.weixin.qq.com/sns/jscode2session?appid=wx77c0d2c54010b7e4&secret=2282710e890670e916c189347d70a7c5&grant_type=authorization_code&js_code="+code;
JSONObject jsonObject = JSONUtil.parseObj( HttpUtil.get(requestUrl));
return jsonObject;
}
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/Customer.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/Customer.java
index c204ee7..b39ad27 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/Customer.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/Customer.java
@@ -81,6 +81,9 @@
@ApiModelProperty(value = "寰俊id")
private String openId;
+ @ApiModelProperty(value = "鐧婚檰娆℃暟")
+ private int loginNum;
+
@Transient
@TableField(exist = false)
@ApiModelProperty(value = "鎺ヨ揣浜哄垪琛�")
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/AreaMapper.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/AreaMapper.java
index de3c04a..2e2eff1 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/AreaMapper.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/AreaMapper.java
@@ -25,4 +25,7 @@
@Select("SELECT * FROM t_area")
@Results({@Result(column="id", property="children", many = @Many(select = "cn.exrick.xboot.your.mapper.AreaSectionMapper.getListByParentId"))})
List<Area> list2();
+
+ @Select("SELECT b.id FROM t_area a,t_car b where a.user_id=b.follow_user_id and a.id=#{arg0}")
+ String getCarId(String areaId);
}
\ No newline at end of file
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/CustomerMapper.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/CustomerMapper.java
index 24a4d60..ce1a54e 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/CustomerMapper.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/CustomerMapper.java
@@ -30,4 +30,7 @@
"sum(case when create_time < '${year}-12' then 1 else 0 end) as december\n" +
"from t_customer")
Month getCustomerCount(@Param("year")Integer year);
+
+ @Select("select sum(login_num) from t_customer")
+ int sumLogin();
}
\ No newline at end of file
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/OrderTaskMapper.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/OrderTaskMapper.java
index e009160..f29b9c2 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/OrderTaskMapper.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/OrderTaskMapper.java
@@ -63,4 +63,12 @@
"from t_order_task t\n" +
"where year(t.send_date)=#{year}")
Month getSendNum(@Param("year")int year);
+
+ @Select("select b.name as name1,avg(a.time) as num1,min(a.time) as num2,max(a.time) as num3 from t_order_task a LEFT JOIN t_customer b on a.customer_id=b.id where date_sub(curdate(), interval 1 month) <= date(a.send_date) and a.status=1 and a.area_id=#{arg0} and a.area_section_id=#{arg1} GROUP BY b.name")
+ @Results({
+ @Result(column="name1", property="customerName", jdbcType = JdbcType.VARCHAR),
+ @Result(column="num1", property="time", jdbcType = JdbcType.INTEGER),
+ @Result(column="num2", property="num", jdbcType = JdbcType.INTEGER),
+ @Result(column="num3", property="level", jdbcType = JdbcType.INTEGER)})
+ List<OrderTask> groupByTime(String areaId, String selectId);
}
\ No newline at end of file
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/schedulings/OrderSynScheduleImpl.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/schedulings/OrderSynScheduleImpl.java
index b925a92..fb63005 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/schedulings/OrderSynScheduleImpl.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/schedulings/OrderSynScheduleImpl.java
@@ -1,7 +1,6 @@
package cn.exrick.xboot.your.schedulings;
import cn.exrick.xboot.your.entity.*;
import cn.exrick.xboot.your.service.*;
-import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
@@ -42,9 +41,10 @@
@Autowired
private ICustomerReceiveService iCustomerReceiveService;
- @Scheduled(cron="0 30 23 * * ?")//姣忔櫄鍑屾櫒1鐐规墽琛�
- //@Scheduled(cron="0 22 17 * * ?")//姣忔櫄鍑屾櫒1鐐规墽琛�
+ //@Scheduled(cron="0 30 23 * * ?")//姣忔櫄鍑屾櫒1鐐规墽琛�
+ @Scheduled(cron="0 20 10 * * ?")//姣忔櫄鍑屾櫒1鐐规墽琛�
public void execute(){
+ System.out.println("寮�濮嬪鐞嗚鍗�");
QueryWrapper<OrderTaskOriginal> queryWrapper = new QueryWrapper<>();
queryWrapper.between("create_time",dateStringFormat(new Date()),dateStringFormat2(new Date()));
List<OrderTaskOriginal> list = iOrderTaskOriginalService.list(queryWrapper);
@@ -58,9 +58,14 @@
orderTask.setEndDate(original.getPacketDate());
orderTask.setSendDate(original.getSendDate());
orderTask.setOrderDate(original.getOrderDate());
- orderTask.setSeq(original.getSeq());
+ if(original.getSeq()!=null){
+ orderTask.setSeq(original.getSeq());
+ }else{
+ orderTask.setSeq(999);
+ }
+
orderTask.setNum(original.getNum());
- //orderTask.setCarId(orderTask.getAreaId());
+ orderTask.setCarId(getCarId(orderTask.getAreaId()));
iOrderTaskService.saveOrUpdate(orderTask);
updateCustomerRecive(orderTask.getCustomerId(),original.getLinker(),original.getCustomerPhone());
@@ -78,6 +83,7 @@
}
}
+ System.out.println("澶勭悊璁㈠崟缁撴潫");
}
@@ -148,16 +154,17 @@
}
public String getCarId(String areaId){
- Area area = iAreaService.getById(areaId);
- String userId = area.getUserId();
- if(StrUtil.isNotEmpty(userId)){
- QueryWrapper<Car> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("follow_user_id",userId);
- Car one = iCarService.getOne(queryWrapper);
- return one.getId();
- }else{
- return null;
- }
+// Area area = iAreaService.getById(areaId);
+// String userId = area.getUserId();
+// if(StrUtil.isNotEmpty(userId)){
+// QueryWrapper<Car> queryWrapper = new QueryWrapper<>();
+// queryWrapper.eq("follow_user_id",userId);
+// Car one = iCarService.getOne(queryWrapper);
+// return one.getId();
+// }else{
+// return null;
+// }
+ return iAreaService.getCarId(areaId);
}
public String dateStringFormat(Date strDate) {
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/schedulings/StatisticPcScheduleImpl.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/schedulings/StatisticPcScheduleImpl.java
index a2c27d9..48bc1d4 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/schedulings/StatisticPcScheduleImpl.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/schedulings/StatisticPcScheduleImpl.java
@@ -73,7 +73,7 @@
redisTemplate.set(HEAD+"call",iRemoteCallService.count()+"");//杩滅▼鍛煎彨娆℃暟
redisTemplate.set(HEAD+"paiCha","0");//浜嬫晠闅愭偅鎺掓煡
- //redisTemplate.set(HEAD+"wx",iCustomerService.sumLogin()+"");//灏忕▼搴忕櫥闄嗘鏁�
+ redisTemplate.set(HEAD+"wx",iCustomerService.sumLogin()+"");//灏忕▼搴忕櫥闄嗘鏁�
redisTemplate.set(HEAD+"wxRate",iCustomerService.countOpenId()+"");//灏忕▼搴忎娇鐢ㄧ巼
int i = iOrderTaskService.countLike();
redisTemplate.set(HEAD+"like",i+"");//浜掑姩娆℃暟
@@ -86,11 +86,11 @@
redisTemplate.set(HEAD+"outCar",iEquipmentService.countByTypeAndStatus(0)+"");//鍑哄彂杞﹁締
- redisTemplate.set(HEAD+"outCar","0");//鍗遍櫓寮�鍚�
+ redisTemplate.set(HEAD+"open","0");//鍗遍櫓寮�鍚�
QueryWrapper<Customer> wrapper = new QueryWrapper<>();
String format = DateUtil.format(new Date(), "yyyy-MM-dd");
wrapper.between("create_time",format+" 00:00:00",format+" 23:59:59");
- redisTemplate.set(HEAD+"outCar",iCustomerService.count(wrapper)+"");//浠婃棩鏂板鍟嗘埛
+ redisTemplate.set(HEAD+"addCustomer",iCustomerService.count(wrapper)+"");//浠婃棩鏂板鍟嗘埛
}
}
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/service/IAreaService.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/service/IAreaService.java
index b2b72a7..3968b19 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/service/IAreaService.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/service/IAreaService.java
@@ -16,4 +16,6 @@
IPage<Area> page2(Page initMpPage, QueryWrapper<Area> wrapper);
List<Area> list2();
+
+ String getCarId(String areaId);
}
\ No newline at end of file
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/service/ICustomerService.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/service/ICustomerService.java
index 7e961f6..7bb0572 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/service/ICustomerService.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/service/ICustomerService.java
@@ -13,4 +13,6 @@
int countOpenId();
Month getCustomerCount(Integer year);
+
+ int sumLogin();
}
\ No newline at end of file
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/service/IOrderTaskService.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/service/IOrderTaskService.java
index ce91357..938dc10 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/service/IOrderTaskService.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/service/IOrderTaskService.java
@@ -28,4 +28,6 @@
Month getSendNum(int year);
List<OrderTask> sumTime(String id);
+
+ List<OrderTask> groupByTime(String areaId, String selectId);
}
\ No newline at end of file
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/IAreaServiceImpl.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/IAreaServiceImpl.java
index 13e72ed..068da27 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/IAreaServiceImpl.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/IAreaServiceImpl.java
@@ -36,4 +36,9 @@
public List<Area> list2() {
return areaMapper.list2();
}
+
+ @Override
+ public String getCarId(String areaId) {
+ return areaMapper.getCarId(areaId);
+ }
}
\ No newline at end of file
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/ICustomerServiceImpl.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/ICustomerServiceImpl.java
index 125711e..9ccb7eb 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/ICustomerServiceImpl.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/ICustomerServiceImpl.java
@@ -40,4 +40,9 @@
public Month getCustomerCount(Integer year) {
return customerMapper.getCustomerCount(year);
}
+
+ @Override
+ public int sumLogin() {
+ return customerMapper.sumLogin();
+ }
}
\ No newline at end of file
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/IOrderTaskServiceImpl.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/IOrderTaskServiceImpl.java
index d88c30b..4843462 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/IOrderTaskServiceImpl.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/IOrderTaskServiceImpl.java
@@ -64,6 +64,12 @@
public List<OrderTask> sumTime(String id) {
return orderTaskMapper.sumTime(id);
}
+
+ @Override
+ public List<OrderTask> groupByTime(String areaId, String selectId) {
+ return orderTaskMapper.groupByTime(areaId,selectId);
+ }
+
@Override
public Month getSendNum(int year){
return orderTaskMapper.getSendNum(year);
--
Gitblit v1.9.1