用户使用记录

common/common-request-mapping/src/main/java/com/yihu/jw/rm/health/house/HealthyHouseMapping.java

@@ -72,6 +72,18 @@ public class HealthyHouseMapping {
            public static final String GET_FEEDBACKS_BY_FIELD = "/getFeedBacksByField";
            public static final String UPDATE_FEEDBACKS_BY_ID = "/updateFeedBacksById";
        }
        //用户使用导航记录
        public static class FacilityUsedRecord {
            public static final String CREATE = "/create/facilityUsedRecords";
            public static final String DELETE = "/delete/facilityUsedRecords";
            public static final String UPDATE = "/update/facilityUsedRecords";
            public static final String PAGE = "/page/facilityUsedRecords";
            public static final String LIST = "/list/facilityUsedRecords";
            public static final String GET_FACILITY_USED_RECORD_BY_ID = "/getFacilityUsedRecordById";
            public static final String GET_FACILITY_USED_RECORD_BY_FIELD = "/getFacilityUsedRecordByField";
            public static final String UPDATE_FACILITY_USED_RECORD_BY_ID = "/updateFacilityUsedRecordById";
        }
    }

svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/controller/LoginController.java

@@ -13,18 +13,13 @@ import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.*;
import org.springframework.security.oauth2.common.exceptions.InvalidRequestException;
import org.springframework.util.LinkedMultiValueMap;
import org.springframework.util.MultiValueMap;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.client.RestTemplate;
import javax.servlet.http.HttpServletRequest;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
/**
 * @author HZY

svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/controller/user/FacilityUsedRecordController.java

@@ -0,0 +1,94 @@
package com.yihu.jw.healthyhouse.controller.user;
import com.yihu.jw.healthyhouse.model.user.FacilityUsedRecord;
import com.yihu.jw.healthyhouse.service.user.FacilityUsedRecordService;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ListEnvelop;
import com.yihu.jw.restmodel.web.ObjEnvelop;
import com.yihu.jw.restmodel.web.PageEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.rm.health.house.HealthyHouseMapping;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.io.IOException;
import java.util.List;
/**
 * 用户使用导航记录
 * Created by zdm on 2018/9/21.
 */
@RestController
@RequestMapping(HealthyHouseMapping.api_healthyHouse_common)
@Api(value = "FacilityUsedRecord", description = "用户使用导航记录管理", tags = {"用户使用导航记录管理"})
public class FacilityUsedRecordController extends EnvelopRestEndpoint {
    @Autowired
    private FacilityUsedRecordService facilityUsedRecordService;
    @ApiOperation(value = "获取用户使用导航记录列表", responseContainer = "List")
    @GetMapping(value = HealthyHouseMapping.HealthyHouse.FacilityUsedRecord.PAGE)
    public PageEnvelop<FacilityUsedRecord> getFacilityUsedRecords(
            @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段", defaultValue = "")
            @RequestParam(value = "fields", required = false) String fields,
            @ApiParam(name = "filters", value = "过滤器", defaultValue = "")
            @RequestParam(value = "filters", required = false) String filters,
            @ApiParam(name = "sorts", value = "排序", defaultValue = "")
            @RequestParam(value = "sorts", required = false) String sorts,
            @ApiParam(name = "size", value = "分页大小", defaultValue = "15")
            @RequestParam(value = "size", required = false) Integer size,
            @ApiParam(name = "page", value = "页码", defaultValue = "1")
            @RequestParam(value = "page", required = false) Integer page) throws Exception {
        List<FacilityUsedRecord> FacilityUsedRecordList = facilityUsedRecordService.search(fields, filters, sorts, page, size);
        return success(FacilityUsedRecordList, (null == FacilityUsedRecordList) ? 0 : FacilityUsedRecordList.size(), page, size);
    }
    @ApiOperation(value = "创建/更新（id存在）用户使用导航记录")
    @PostMapping(value = HealthyHouseMapping.HealthyHouse.FacilityUsedRecord.CREATE)
    public ObjEnvelop<FacilityUsedRecord> createFacilityUsedRecord(
            @ApiParam(name = "FacilityUsedRecord", value = "用户使用导航记录JSON结构")
            @RequestBody FacilityUsedRecord FacilityUsedRecord) throws IOException {
        FacilityUsedRecord = facilityUsedRecordService.save(FacilityUsedRecord);
        return success(FacilityUsedRecord);
    }
    @ApiOperation(value = "获取用户使用导航记录")
    @GetMapping(value = HealthyHouseMapping.HealthyHouse.FacilityUsedRecord.GET_FACILITY_USED_RECORD_BY_ID)
    public ObjEnvelop<FacilityUsedRecord> getFacilityUsedRecord(
            @ApiParam(name = "id", value = "用户使用导航记录ID", defaultValue = "")
            @RequestParam(value = "id") String id) throws Exception {
        FacilityUsedRecord FacilityUsedRecord = facilityUsedRecordService.findById(id);
        if (FacilityUsedRecord == null) {
            return failed("用户使用导航记录不存在！", ObjEnvelop.class);
        }
        return success(FacilityUsedRecord);
    }
    @ApiOperation(value = "获取用户使用导航记录:根据日期，根据反馈人等")
    @GetMapping(value = HealthyHouseMapping.HealthyHouse.FacilityUsedRecord.GET_FACILITY_USED_RECORD_BY_FIELD)
    public ListEnvelop<FacilityUsedRecord> getFacilityUsedRecordByField(
            @ApiParam(name = "field", value = "查找字段名", required = true)
            @RequestParam(value = "field") String field,
            @ApiParam(name = "value", value = "检索值")
            @RequestParam(value = "value") String value) throws Exception {
        List<FacilityUsedRecord> FacilityUsedRecordList = facilityUsedRecordService.findByField(field, value);
        return success(FacilityUsedRecordList);
    }
    @ApiOperation(value = "删除用户使用导航记录")
    @DeleteMapping(value = HealthyHouseMapping.HealthyHouse.FacilityUsedRecord.DELETE)
    public Envelop deleteFacilityUsedRecord(
            @ApiParam(name = "facilitiesServerId", value = "用户使用导航记录ID")
            @RequestParam(value = "facilitiesServerId") String facilitiesServerId) throws Exception {
        FacilityUsedRecord FacilityUsedRecord = facilityUsedRecordService.findById(facilitiesServerId);
        facilityUsedRecordService.delete(FacilityUsedRecord);
        return success("success");
    }
}

svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/controller/user/UserController.java

@@ -2,7 +2,6 @@ package com.yihu.jw.healthyhouse.controller.user;
import com.yihu.jw.exception.business.ManageException;
import com.yihu.jw.healthyhouse.cache.WlyyRedisVerifyCodeService;
import com.yihu.jw.healthyhouse.constant.LoginInfo;
import com.yihu.jw.healthyhouse.model.user.User;
import com.yihu.jw.healthyhouse.service.user.UserService;
import com.yihu.jw.restmodel.web.Envelop;

svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/dao/user/FacilityUsedRecordDao.java

@@ -0,0 +1,16 @@
package com.yihu.jw.healthyhouse.dao.user;
import com.yihu.jw.healthyhouse.model.user.FacilityUsedRecord;
import org.springframework.data.jpa.repository.JpaRepository;
/**
 * 用户导航记录 dao
 * @author zdm
 * @version 1.0
 * @created 2018.09.21
 */
public interface FacilityUsedRecordDao extends JpaRepository<FacilityUsedRecord, Long> {
    FacilityUsedRecord findById(String id);
}

svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/dao/user/UserDao.java

@@ -39,6 +39,6 @@ public interface UserDao extends PagingAndSortingRepository<User, String>, JpaSp
    Long countAllByCreateTimeBetween(Date start,Date end);
    User findByLoginCodeAAndUserType(String loginCode,String userType);
    User findByLoginCodeAndUserType(String loginCode,String userType);
}

svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/model/user/FacilityUsedRecord.java

@@ -0,0 +1,152 @@
package com.yihu.jw.healthyhouse.model.user;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
/**
 * 用户导航记录
 * @author zdm
 * @version 1.0
 * @created 2018.09.21
 */
@Entity
@Table(name = "facility_used_records")
public class FacilityUsedRecord extends UuidIdentityEntityWithOperator {
    //用户起始位置经度
    @Column(name = "user_initial_longitude", nullable = false)
    private double userInitialLongitude;
    //用户起始位置纬度
    @Column(name = "user_initial_latitudes", nullable = false)
    private double userInitialLatitudes;
    //设施经度
    @Column(name = "facilitie_longitude", nullable = false)
    private double facilitieLongitude;
    //设施纬度
    @Column(name = "facilitie_latitudes", nullable = false)
    private double facilitieLatitudes;
    //设施编码
    @Column(name = "facilitie_code", nullable = false)
    private String facilitieCode;
    //设施名称
    @Column(name = "facilitie_name", nullable = false)
    private String facilitieName;
    //设施地址
    @Column(name = "facilitie_addr", nullable = false)
    private String facilitieAddr;
    //服务编码
    @Column(name = "service_code")
    private String serviceCode;
    //服务名称
    @Column(name = "service_name")
    private String serviceName;
    //导航时长
    @Column(name = "duration")
    private String duration;
    //用户id
    @Column(name = "user_id")
    private String userId;
    //使用次数
    @Column(name = "num")
    private Integer num;
    public double getUserInitialLongitude() {
        return userInitialLongitude;
    }
    public void setUserInitialLongitude(double userInitialLongitude) {
        this.userInitialLongitude = userInitialLongitude;
    }
    public double getUserInitialLatitudes() {
        return userInitialLatitudes;
    }
    public void setUserInitialLatitudes(double userInitialLatitudes) {
        this.userInitialLatitudes = userInitialLatitudes;
    }
    public double getFacilitieLongitude() {
        return facilitieLongitude;
    }
    public void setFacilitieLongitude(double facilitieLongitude) {
        this.facilitieLongitude = facilitieLongitude;
    }
    public double getFacilitieLatitudes() {
        return facilitieLatitudes;
    }
    public void setFacilitieLatitudes(double facilitieLatitudes) {
        this.facilitieLatitudes = facilitieLatitudes;
    }
    public String getFacilitieCode() {
        return facilitieCode;
    }
    public void setFacilitieCode(String facilitieCode) {
        this.facilitieCode = facilitieCode;
    }
    public String getFacilitieName() {
        return facilitieName;
    }
    public void setFacilitieName(String facilitieName) {
        this.facilitieName = facilitieName;
    }
    public String getFacilitieAddr() {
        return facilitieAddr;
    }
    public void setFacilitieAddr(String facilitieAddr) {
        this.facilitieAddr = facilitieAddr;
    }
    public String getServiceCode() {
        return serviceCode;
    }
    public void setServiceCode(String serviceCode) {
        this.serviceCode = serviceCode;
    }
    public String getServiceName() {
        return serviceName;
    }
    public void setServiceName(String serviceName) {
        this.serviceName = serviceName;
    }
    public String getDuration() {
        return duration;
    }
    public void setDuration(String duration) {
        this.duration = duration;
    }
    public String getUserId() {
        return userId;
    }
    public void setUserId(String userId) {
        this.userId = userId;
    }
    public Integer getNum() {
        return num;
    }
    public void setNum(Integer num) {
        this.num = num;
    }
}

svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/service/user/FacilityUsedRecordService.java

@@ -0,0 +1,28 @@
package com.yihu.jw.healthyhouse.service.user;
import com.yihu.jw.healthyhouse.dao.user.FacilityUsedRecordDao;
import com.yihu.jw.healthyhouse.model.user.FacilityUsedRecord;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
/**
 * 用户导航记录.
 *
 * @author zdm
 * @version 1.0
 * @created 2018.09.21
 */
@Service
@Transactional
public class FacilityUsedRecordService extends BaseJpaService<FacilityUsedRecord, FacilityUsedRecordDao> {
    @Autowired
    private FacilityUsedRecordDao facilityUsedRecordDao;
    public FacilityUsedRecord findById(String id) {
        return  facilityUsedRecordDao.findById(id);
    }
}

svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/service/user/LoginService.java

@@ -221,7 +221,7 @@ public class LoginService {
    @Transactional(noRollbackForClassName = "ManageException")
    public User managerPhoneLogin(HttpServletRequest request, String loginCode) throws ManageException {
        //判断管理员用户信息是否存在
        User user = userService.findByLoginCodeAAndUserType(loginCode, LoginInfo.USER_TYPE_AdminManager);
        User user = userService.findByLoginCodeAndUserType(loginCode, LoginInfo.USER_TYPE_AdminManager);
        if (user == null) {
            throw new ManageException("该管理员账号不存在!");
        } else {

svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/service/user/UserService.java

@@ -39,8 +39,8 @@ public class UserService {
        return userDao.findByLoginCode(code);
    }
    public User findByLoginCodeAAndUserType(String loginCode,String userType) {
        return userDao.findByLoginCodeAAndUserType(loginCode,userType);
    public User findByLoginCodeAndUserType(String loginCode,String userType) {
        return userDao.findByLoginCodeAndUserType(loginCode,userType);
    }