Merge branch '2.0.0' of http://git.ycjcjy.com/fuxingfan/smartCommunity into 2.0.0

CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/AssembleController.java

@@ -5,6 +5,7 @@ import com.community.commom.mode.ResponseBean;
 import com.community.commom.session.UserElement;
 import com.community.huiju.model.TaSysMenu;
 import com.community.huiju.model.ToBanner;
+import com.community.huiju.service.AssembleServiceI;
 import com.community.huiju.service.BannerServiceI;
 import com.community.huiju.service.MenuServiceI;
 import com.community.huiju.service.MessageServiceI;
@@ -51,13 +52,15 @@ public class AssembleController extends BaseController {
 	@Autowired
 	private TpShopServicel tpShopServicel;
 	
+	@Autowired
+	private AssembleServiceI assembleService;
+	
 	@ApiOperation(value = "首页数据获取接口", notes = "首页数据获取接口")
 	@ApiImplicitParams({ @ApiImplicitParam(paramType = "path", dataType = "String", name = "communityId", value = "小区Id"),
 			@ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token") })
 	@RequestMapping(value = "/index/{communityId}",method = RequestMethod.GET)
 	public ResponseBean getIndexData(@PathVariable("communityId") Integer communityId, HttpSession session){
 		UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
-		Integer userId = userElement.getId();
 		ResponseBean responseBean = new ResponseBean();
 
 		if (!check(communityId)) {
@@ -86,6 +89,8 @@ public class AssembleController extends BaseController {
 		indexMap.put("tpShopList",((Map<Object, Object>)shopRes.getData()).get("tpShopList"));
 		indexMap.put("toDoTotal",totalMap.get("toDoTotal"));
 		responseBean.addSuccess(indexMap);
+		//获取成功的情况下记录
+		assembleService.saveBriskUser(userElement.getUserVerifyId(),userElement.getCommunityId());
 		return responseBean;
 	}
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TaBriskUserMapper.java

@@ -0,0 +1,16 @@
+package com.community.huiju.dao;
+
+import com.community.huiju.model.TaBriskUser;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Date;
+import java.util.List;
+
+@Mapper
+public interface TaBriskUserMapper {
+	
+	List<TaBriskUser> selectByParams(@Param("userVerifyId") Integer userVerifyId, @Param("communityId") Integer communityId,@Param("nowDate") Date nowDate);
+	
+	int saveBriskUser(TaBriskUser taBriskUser);
+}

CODE/smart-community/app-api/src/main/java/com/community/huiju/model/TaBriskUser.java

@@ -0,0 +1,50 @@
+package com.community.huiju.model;
+
+import java.util.Date;
+
+/**
+ * @author FXF
+ * @date 2019-05-28
+ */
+public class TaBriskUser {
+	
+	private Integer id;
+	
+	private Integer communityId;
+	
+	private Integer taUserVerifyId;
+	
+	private Date createDate;
+	
+	public Integer getId() {
+		return id;
+	}
+	
+	public void setId(Integer id) {
+		this.id = id;
+	}
+	
+	public Integer getCommunityId() {
+		return communityId;
+	}
+	
+	public void setCommunityId(Integer communityId) {
+		this.communityId = communityId;
+	}
+	
+	public Integer getTaUserVerifyId() {
+		return taUserVerifyId;
+	}
+	
+	public void setTaUserVerifyId(Integer taUserVerifyId) {
+		this.taUserVerifyId = taUserVerifyId;
+	}
+	
+	public Date getCreateDate() {
+		return createDate;
+	}
+	
+	public void setCreateDate(Date createDate) {
+		this.createDate = createDate;
+	}
+}

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/AssembleServiceI.java

@@ -0,0 +1,5 @@
+package com.community.huiju.service;
+
+public interface AssembleServiceI {
+	void saveBriskUser(Integer userVerifyId, Integer communityId);
+}

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/AssembleServiceImpl.java

@@ -0,0 +1,43 @@
+package com.community.huiju.service.impl;
+
+import com.community.huiju.dao.TaBriskUserMapper;
+import com.community.huiju.model.TaBriskUser;
+import com.community.huiju.service.AssembleServiceI;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author FXF
+ * @date 2019-05-28
+ */
+@Service("assembleService")
+@Transactional(rollbackFor = Exception.class)
+public class AssembleServiceImpl implements AssembleServiceI {
+	
+	@Autowired
+	private TaBriskUserMapper taBriskUserMapper;
+	
+	/**
+	 * 记录日活跃用户，同一个用户当天只记录一次
+	 * @param userVerifyId
+	 * @param communityId
+	 */
+	@Override
+	public void saveBriskUser(Integer userVerifyId, Integer communityId) {
+		//先查看此用户当天是否进入过首页，没进入过则插入
+		Date date = new Date();
+		List<TaBriskUser> list = taBriskUserMapper.selectByParams(userVerifyId,communityId,date);
+		if (list.size() < 1) {
+			//插入一条数据
+			TaBriskUser taBriskUser = new TaBriskUser();
+			taBriskUser.setCommunityId(communityId);
+			taBriskUser.setTaUserVerifyId(userVerifyId);
+			taBriskUser.setCreateDate(date);
+			taBriskUserMapper.saveBriskUser(taBriskUser);
+		}
+	}
+}

CODE/smart-community/app-api/src/main/resources/mapper/TaBriskUserMapper.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.community.huiju.dao.TaBriskUserMapper" >
+
+    <resultMap id="BaseResultMap" type="com.community.huiju.model.TaBriskUser" >
+        <id column="id" property="id" jdbcType="INTEGER" />
+        <result column="community_id" property="communityId" jdbcType="INTEGER" />
+        <result column="ta_user_verify_id" property="taUserVerifyId" jdbcType="INTEGER" />
+        <result column="create_date" property="createDate" jdbcType="TIMESTAMP" />
+    </resultMap>
+
+    <select id="selectByParams" resultMap="BaseResultMap">
+        select
+          id,community_id,ta_user_verify_id,create_date
+        from ta_brisk_user
+        where ta_user_verify_id = #{userVerifyId}
+        AND community_id = #{communityId}
+        AND to_days(create_date) = to_days(#{nowDate})
+    </select>
+
+    <insert id="saveBriskUser" parameterType="com.community.huiju.model.TaBriskUser" >
+    insert into ta_brisk_user (id, community_id, ta_user_verify_id,create_date
+      )
+    values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{taUserVerifyId,jdbcType=INTEGER}, #{createDate,jdbcType=TIMESTAMP}
+      )
+  </insert>
+</mapper>

CODE/smart-community/property-api/src/main/java/com/community/huiju/controller/TaTemporaryLicenseCountController.java

@@ -0,0 +1,113 @@
+package com.community.huiju.controller;
+
+import com.community.commom.mode.ResponseBean;
+import com.community.huiju.common.base.BaseController;
+import com.community.huiju.model.TaTemporaryLicenseCount;
+import com.community.huiju.service.ITaTemporaryLicenseCountService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+    * 临时车统计表，按天计算 前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2019-05-28
+ */
+@RestController
+@RequestMapping("/")
+public class TaTemporaryLicenseCountController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaTemporaryLicenseCountController.class);
+
+    @Autowired
+    public ITaTemporaryLicenseCountService iTaTemporaryLicenseCountService;
+
+
+    /**
+     * 保存对象
+     * @param taTemporaryLicenseCount 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taTemporaryLicenseCount/add",method= RequestMethod.POST)
+    public ResponseBean tpShopImgAdd(@RequestBody TaTemporaryLicenseCount taTemporaryLicenseCount){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaTemporaryLicenseCountService.save(taTemporaryLicenseCount)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            logger.error("taTemporaryLicenseCountAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/taTemporaryLicenseCount/delete/{id}", method= RequestMethod.DELETE)
+    public ResponseBean taTemporaryLicenseCountDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iTaTemporaryLicenseCountService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            logger.error("taTemporaryLicenseCountDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param taTemporaryLicenseCount 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taTemporaryLicenseCount/update",method= RequestMethod.PUT)
+    public ResponseBean tpShopImgUpdate(@RequestBody TaTemporaryLicenseCount taTemporaryLicenseCount){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaTemporaryLicenseCountService.updateById(taTemporaryLicenseCount)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            logger.error("taTemporaryLicenseCountUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/taTemporaryLicenseCount/get/{id}",method= RequestMethod.GET)
+    public ResponseBean tpShopImgGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaTemporaryLicenseCountService.getById(id));
+        }catch (Exception e){
+            logger.error("taTemporaryLicenseCountDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/controller/TaUserLicenseCountController.java

@@ -0,0 +1,113 @@
+package com.community.huiju.controller;
+
+import com.community.commom.mode.ResponseBean;
+import com.community.huiju.common.base.BaseController;
+import com.community.huiju.model.TaUserLicenseCount;
+import com.community.huiju.service.ITaUserLicenseCountService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+    * 月租车统计表，按天计算 前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2019-05-28
+ */
+@RestController
+@RequestMapping("/")
+public class TaUserLicenseCountController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaUserLicenseCountController.class);
+
+    @Autowired
+    public ITaUserLicenseCountService iTaUserLicenseCountService;
+
+
+    /**
+     * 保存对象
+     * @param taUserLicenseCount 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taUserLicenseCount/add",method= RequestMethod.POST)
+    public ResponseBean tpShopImgAdd(@RequestBody TaUserLicenseCount taUserLicenseCount){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaUserLicenseCountService.save(taUserLicenseCount)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            logger.error("taUserLicenseCountAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/taUserLicenseCount/delete/{id}", method= RequestMethod.DELETE)
+    public ResponseBean taUserLicenseCountDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iTaUserLicenseCountService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            logger.error("taUserLicenseCountDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param taUserLicenseCount 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taUserLicenseCount/update",method= RequestMethod.PUT)
+    public ResponseBean tpShopImgUpdate(@RequestBody TaUserLicenseCount taUserLicenseCount){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaUserLicenseCountService.updateById(taUserLicenseCount)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            logger.error("taUserLicenseCountUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/taUserLicenseCount/get/{id}",method= RequestMethod.GET)
+    public ResponseBean tpShopImgGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaUserLicenseCountService.getById(id));
+        }catch (Exception e){
+            logger.error("taUserLicenseCountDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/controller/TpBillInvoiceCountController.java

@@ -0,0 +1,113 @@
+package com.community.huiju.controller;
+
+import com.community.commom.mode.ResponseBean;
+import com.community.huiju.common.base.BaseController;
+import com.community.huiju.model.TpBillInvoiceCount;
+import com.community.huiju.service.ITpBillInvoiceCountService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+    * 收费单统计表，按天统计 前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2019-05-28
+ */
+@RestController
+@RequestMapping("/")
+public class TpBillInvoiceCountController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TpBillInvoiceCountController.class);
+
+    @Autowired
+    public ITpBillInvoiceCountService iTpBillInvoiceCountService;
+
+
+    /**
+     * 保存对象
+     * @param tpBillInvoiceCount 实体对象
+     * @return
+     */
+    @RequestMapping(value="/tpBillInvoiceCount/add",method= RequestMethod.POST)
+    public ResponseBean tpShopImgAdd(@RequestBody TpBillInvoiceCount tpBillInvoiceCount){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTpBillInvoiceCountService.save(tpBillInvoiceCount)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            logger.error("tpBillInvoiceCountAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/tpBillInvoiceCount/delete/{id}", method= RequestMethod.DELETE)
+    public ResponseBean tpBillInvoiceCountDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iTpBillInvoiceCountService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            logger.error("tpBillInvoiceCountDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param tpBillInvoiceCount 实体对象
+     * @return
+     */
+    @RequestMapping(value="/tpBillInvoiceCount/update",method= RequestMethod.PUT)
+    public ResponseBean tpShopImgUpdate(@RequestBody TpBillInvoiceCount tpBillInvoiceCount){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTpBillInvoiceCountService.updateById(tpBillInvoiceCount)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            logger.error("tpBillInvoiceCountUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/tpBillInvoiceCount/get/{id}",method= RequestMethod.GET)
+    public ResponseBean tpShopImgGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTpBillInvoiceCountService.getById(id));
+        }catch (Exception e){
+            logger.error("tpBillInvoiceCountDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/dao/BillInvoiceMapper.java

@@ -43,5 +43,6 @@ public interface BillInvoiceMapper extends BaseMapper<BillInvoice> {
      * @return
      */
     IPage<BillInvoice> selectBillInvoiceEffective(Page page, @Param("map") Map<String, Object> map);
-
+	
+	List<Map<String, Object>> getPriceCount();
 }

CODE/smart-community/property-api/src/main/java/com/community/huiju/dao/TaTemporaryLicenseCountMapper.java

@@ -0,0 +1,20 @@
+package com.community.huiju.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.community.huiju.model.TaTemporaryLicenseCount;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 临时车统计表，按天计算 Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-28
+ */
+public interface TaTemporaryLicenseCountMapper extends BaseMapper<TaTemporaryLicenseCount> {
+	
+	List<Map<String, Object>> getTemporaryLicenseOrderPriceCount();
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/dao/TaUserLicenseCountMapper.java

@@ -0,0 +1,16 @@
+package com.community.huiju.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.community.huiju.model.TaUserLicenseCount;
+
+/**
+ * <p>
+ * 月租车统计表，按天计算 Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-28
+ */
+public interface TaUserLicenseCountMapper extends BaseMapper<TaUserLicenseCount> {
+
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/dao/TaUserLicenseOrderMapper.java

@@ -7,6 +7,7 @@ import org.apache.ibatis.annotations.ResultType;
 import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -37,6 +38,7 @@ public interface TaUserLicenseOrderMapper extends BaseMapper<TaUserLicenseOrder>
     @ResultType(Integer.class)
     @Select("select count(*) from ta_user_license_order where community_id = #{communityId}")
     Integer getCount(@Param("communityId") Integer communityId);
-
-
+    
+    
+    List<Map<String, Object>> getPriceCount();
 }

CODE/smart-community/property-api/src/main/java/com/community/huiju/dao/TpBillInvoiceCountMapper.java

@@ -0,0 +1,16 @@
+package com.community.huiju.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.community.huiju.model.TpBillInvoiceCount;
+
+/**
+ * <p>
+ * 收费单统计表，按天统计 Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-28
+ */
+public interface TpBillInvoiceCountMapper extends BaseMapper<TpBillInvoiceCount> {
+
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/model/TaTemporaryLicenseCount.java

@@ -0,0 +1,41 @@
+package com.community.huiju.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 临时车统计表，按天计算
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-28
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaTemporaryLicenseCount implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 小区id
+     */
+    private Integer communityId;
+
+    /**
+     * 价格总和
+     */
+    private Integer priceTotal;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/model/TaUserLicenseCount.java

@@ -0,0 +1,41 @@
+package com.community.huiju.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 月租车统计表，按天计算
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-28
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaUserLicenseCount implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 小区id
+     */
+    private Integer communityId;
+
+    /**
+     * 价格总和
+     */
+    private Integer priceTotal;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/model/TpBillInvoiceCount.java

@@ -0,0 +1,41 @@
+package com.community.huiju.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 收费单统计表，按天统计
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-28
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TpBillInvoiceCount implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 小区ID
+     */
+    private Integer communityId;
+
+    /**
+     * 价格总和
+     */
+    private Integer priceTotal;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/IBillInvoiceService.java

@@ -7,6 +7,7 @@ import com.community.huiju.model.BillInvoice;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -99,4 +100,10 @@ public interface IBillInvoiceService extends IService<BillInvoice> {
      * @return
      */
     ResponseBean getInvoiceInvalid(UserElement userElement, String parameter);
+    
+    /**
+     * 按小区统计所有的金额
+     * @return
+     */
+	List<Map<String, Object>> getPriceCount();
 }

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/ITaTemporaryLicenseCountService.java

@@ -0,0 +1,20 @@
+package com.community.huiju.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.community.huiju.model.TaTemporaryLicenseCount;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 临时车统计表，按天计算 服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-28
+ */
+public interface ITaTemporaryLicenseCountService extends IService<TaTemporaryLicenseCount> {
+	
+	List<Map<String, Object>> getTemporaryLicenseOrderPriceCount();
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/ITaUserLicenseCountService.java

@@ -0,0 +1,16 @@
+package com.community.huiju.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.community.huiju.model.TaUserLicenseCount;
+
+/**
+ * <p>
+ * 月租车统计表，按天计算 服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-28
+ */
+public interface ITaUserLicenseCountService extends IService<TaUserLicenseCount> {
+
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/ITaUserLicenseOrderService.java

@@ -5,6 +5,9 @@ import com.community.commom.mode.ResponseBean;
 import com.community.commom.session.UserElement;
 import com.community.huiju.model.TaUserLicenseOrder;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  * 月租车缴费订单表 服务类
@@ -32,4 +35,6 @@ public interface ITaUserLicenseOrderService extends IService<TaUserLicenseOrder>
      * @return
      */
     ResponseBean exportDate(UserElement userElement);
+	
+	List<Map<String, Object>> getPriceCount();
 }

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/ITpBillInvoiceCountService.java

@@ -0,0 +1,16 @@
+package com.community.huiju.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.community.huiju.model.TpBillInvoiceCount;
+
+/**
+ * <p>
+ * 收费单统计表，按天统计 服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-28
+ */
+public interface ITpBillInvoiceCountService extends IService<TpBillInvoiceCount> {
+
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/BillInvoiceServiceImpl.java

@@ -612,4 +612,14 @@ public class BillInvoiceServiceImpl extends ServiceImpl<BillInvoiceMapper, BillI
         responseBean.addSuccess(map);
         return responseBean;
     }
+    
+    /**
+     * 按小区统计所有的金额
+     *
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> getPriceCount() {
+        return billInvoiceMapper.getPriceCount();
+    }
 }

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/TaTemporaryLicenseCountServiceImpl.java

@@ -0,0 +1,31 @@
+package com.community.huiju.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.community.huiju.dao.TaTemporaryLicenseCountMapper;
+import com.community.huiju.model.TaTemporaryLicenseCount;
+import com.community.huiju.service.ITaTemporaryLicenseCountService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 临时车统计表，按天计算 服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-28
+ */
+@Service
+public class TaTemporaryLicenseCountServiceImpl extends ServiceImpl<TaTemporaryLicenseCountMapper, TaTemporaryLicenseCount> implements ITaTemporaryLicenseCountService {
+	
+	@Autowired
+	private TaTemporaryLicenseCountMapper taTemporaryLicenseCountMapper;
+	
+	@Override
+	public List<Map<String, Object>> getTemporaryLicenseOrderPriceCount() {
+		return taTemporaryLicenseCountMapper.getTemporaryLicenseOrderPriceCount();
+	}
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/TaUserLicenseCountServiceImpl.java

@@ -0,0 +1,20 @@
+package com.community.huiju.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.community.huiju.dao.TaUserLicenseCountMapper;
+import com.community.huiju.model.TaUserLicenseCount;
+import com.community.huiju.service.ITaUserLicenseCountService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 月租车统计表，按天计算 服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-28
+ */
+@Service
+public class TaUserLicenseCountServiceImpl extends ServiceImpl<TaUserLicenseCountMapper, TaUserLicenseCount> implements ITaUserLicenseCountService {
+
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/TaUserLicenseOrderServiceImpl.java

@@ -24,6 +24,7 @@ import org.springframework.stereotype.Service;
 import java.text.SimpleDateFormat;
 import java.time.format.DateTimeFormatter;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -140,4 +141,9 @@ public class TaUserLicenseOrderServiceImpl extends ServiceImpl<TaUserLicenseOrde
         responseBean.addSuccess(workbook);
         return responseBean;
     }
+    
+    @Override
+    public List<Map<String, Object>> getPriceCount() {
+        return taUserLicenseOrderMapper.getPriceCount();
+    }
 }

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpBillInvoiceCountServiceImpl.java

@@ -0,0 +1,20 @@
+package com.community.huiju.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.community.huiju.dao.TpBillInvoiceCountMapper;
+import com.community.huiju.model.TpBillInvoiceCount;
+import com.community.huiju.service.ITpBillInvoiceCountService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 收费单统计表，按天统计 服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-28
+ */
+@Service
+public class TpBillInvoiceCountServiceImpl extends ServiceImpl<TpBillInvoiceCountMapper, TpBillInvoiceCount> implements ITpBillInvoiceCountService {
+
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/task/IndexCountTasks.java

@@ -0,0 +1,109 @@
+package com.community.huiju.task;
+
+import com.community.huiju.model.TaTemporaryLicenseCount;
+import com.community.huiju.model.TaUserLicenseCount;
+import com.community.huiju.model.TpBillInvoiceCount;
+import com.community.huiju.service.IBillInvoiceService;
+import com.community.huiju.service.ITaTemporaryLicenseCountService;
+import com.community.huiju.service.ITaUserLicenseCountService;
+import com.community.huiju.service.ITaUserLicenseOrderService;
+import com.community.huiju.service.ITpBillInvoiceCountService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author FXF
+ * @date 2019-05-28
+ */
+@Component
+@Slf4j
+public class IndexCountTasks {
+	
+	
+	@Autowired
+	private IBillInvoiceService billInvoiceService;
+	
+	@Autowired
+	private ITpBillInvoiceCountService tpBillInvoiceCountService;
+	
+	@Autowired
+	private ITaUserLicenseOrderService userLicenseOrderService;
+	
+	@Autowired
+	private ITaUserLicenseCountService taUserLicenseCountService;
+	
+	@Autowired
+	private ITaTemporaryLicenseCountService taTemporaryLicenseCountService;
+	
+	/**
+	 * 统计定时任务，每天23点执行。
+	 */
+	@Scheduled(cron = "0 0 23 * * ?")
+	public void billInvoice() {
+		log.info("定时任务，收费组总缴费统计,月租车总续费统计,临时车总缴费统计。开始。每天23点执行");
+		log.info("收费组总缴费统计");
+		//收费组总缴费统计,查询所有的金额并插入统计表
+		List<Map<String,Object>> priceList =  billInvoiceService.getPriceCount();
+		//插入统计表
+		List<TpBillInvoiceCount> countList = new ArrayList<>();
+		LocalDateTime nowTime = LocalDateTime.now();
+		for (Map<String,Object> map : priceList){
+			TpBillInvoiceCount tpBillInvoiceCount = new TpBillInvoiceCount();
+			tpBillInvoiceCount.setCommunityId(Integer.valueOf(map.get("communityId").toString()));
+			String totalPrice = String.valueOf(map.get("totalPrice"));
+			int index = totalPrice.indexOf(".");
+			if (index > 0) {
+				totalPrice = totalPrice.substring(0,index);
+			}
+			tpBillInvoiceCount.setPriceTotal(Integer.valueOf(totalPrice));
+			tpBillInvoiceCount.setCreateDate(nowTime);
+			countList.add(tpBillInvoiceCount);
+		}
+		tpBillInvoiceCountService.saveBatch(countList);
+		
+		log.info("月租车总续费统计");
+		//月租车总续费统计,查询所有的金额并插入统计表
+		List<Map<String,Object>> licenseOrderPriceList = userLicenseOrderService.getPriceCount();
+		//插入统计表
+		List<TaUserLicenseCount> LicenseCountList = new ArrayList<>();
+		for (Map<String,Object> map : licenseOrderPriceList){
+			TaUserLicenseCount taUserLicenseCount = new TaUserLicenseCount();
+			taUserLicenseCount.setCommunityId(Integer.valueOf(map.get("communityId").toString()));
+			String totalPrice = String.valueOf(map.get("totalPrice"));
+			int index = totalPrice.indexOf(".");
+			if (index > 0) {
+				totalPrice = totalPrice.substring(0,index);
+			}
+			taUserLicenseCount.setPriceTotal(Integer.valueOf(totalPrice));
+			taUserLicenseCount.setCreateDate(nowTime);
+			LicenseCountList.add(taUserLicenseCount);
+		}
+		taUserLicenseCountService.saveBatch(LicenseCountList);
+		
+		log.info("临时车总缴费统计");
+		//临时车总缴费统计,查询所有的金额并插入统计表
+		List<Map<String,Object>> temporarylicenseOrderPriceList = taTemporaryLicenseCountService.getTemporaryLicenseOrderPriceCount();
+		//插入统计表
+		List<TaTemporaryLicenseCount> temporaryLicenseCountList = new ArrayList<>();
+		for (Map<String,Object> map : licenseOrderPriceList){
+			TaTemporaryLicenseCount temporaryLicenseCount = new TaTemporaryLicenseCount();
+			temporaryLicenseCount.setCommunityId(Integer.valueOf(map.get("communityId").toString()));
+			String totalPrice = String.valueOf(map.get("totalPrice"));
+			int index = totalPrice.indexOf(".");
+			if (index > 0) {
+				totalPrice = totalPrice.substring(0,index);
+			}
+			temporaryLicenseCount.setPriceTotal(Integer.valueOf(totalPrice));
+			temporaryLicenseCount.setCreateDate(nowTime);
+			temporaryLicenseCountList.add(temporaryLicenseCount);
+		}
+		taTemporaryLicenseCountService.saveBatch(temporaryLicenseCountList);
+	}
+}

CODE/smart-community/property-api/src/main/resources/mapper/BillInvoiceMapper.xml

@@ -113,4 +113,16 @@
         order by tpi.create_date DESC
     </select>
 
+    <select id="getPriceCount" resultType="map">
+        SELECT
+            sum( pay_price ) AS totalPrice,
+            community_id AS communityId
+        FROM
+            tp_bill_invoice
+        WHERE
+            `status` = 1
+        AND bill_status = 1
+        GROUP BY
+            community_id
+    </select>
 </mapper>

CODE/smart-community/property-api/src/main/resources/mapper/TaTemporaryLicenseCountMapper.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.community.huiju.dao.TaTemporaryLicenseCountMapper">
+
+    <select id="getTemporaryLicenseOrderPriceCount" resultType="map">
+        SELECT
+            sum( actual_amount ) AS totalPrice,
+            community_id AS communityId
+        FROM
+            ta_temporary_license_order
+        WHERE
+            order_status = 1
+        GROUP BY
+            community_id
+    </select>
+</mapper>

CODE/smart-community/property-api/src/main/resources/mapper/TaUserLicenseCountMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.community.huiju.dao.TaUserLicenseCountMapper">
+
+</mapper>

CODE/smart-community/property-api/src/main/resources/mapper/TaUserLicenseOrderMapper.xml

@@ -1,5 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.community.huiju.dao.TaUserLicenseOrderMapper">
-
+    <select id="getPriceCount" resultType="map">
+        SELECT
+            sum( extension_price ) AS totalPrice,
+            community_id AS communityId
+        FROM
+            ta_user_license_order
+        WHERE
+            order_status = 1
+        GROUP BY
+            community_id
+    </select>
 </mapper>

CODE/smart-community/property-api/src/main/resources/mapper/TpBillInvoiceCountMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.community.huiju.dao.TpBillInvoiceCountMapper">
+
+</mapper>