xboot-core/src/main/java/cn/exrick/xboot/core/entity/User.java
@@ -95,6 +95,9 @@ @ApiModelProperty(value = "所属部门名称") private String departmentTitle; @ApiModelProperty(value = "指纹登陆密码") private String key; @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd") @ApiModelProperty(value = "生日") xboot-modules/xboot-base/src/main/java/cn/exrick/xboot/base/controller/manage/MessageController.java
@@ -13,6 +13,7 @@ import cn.exrick.xboot.core.service.MessageSendService; import cn.exrick.xboot.core.service.MessageService; import cn.exrick.xboot.core.service.UserService; import cn.hutool.core.util.StrUtil; import cn.hutool.http.HtmlUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -54,7 +55,13 @@ public Result<Page<Message>> getByCondition(Message message, SearchVo searchVo, PageVo pageVo) { if(pageVo.getPageSize()==0){ pageVo.setPageSize(5); } if(StrUtil.isEmpty(pageVo.getOrder())){ pageVo.setOrder("desc"); pageVo.setSort("createTime"); } Page<Message> page = messageService.findByCondition(message, searchVo, PageUtil.initPage(pageVo)); page.forEach(e->{ e.setContentText(HtmlUtil.cleanHtmlTag(e.getContent())); @@ -77,29 +84,29 @@ Message m = messageService.save(message); // 保存消息发送表 List<MessageSend> messageSends = new ArrayList<>(); if (CommonConstant.MESSAGE_RANGE_ALL.equals(message.getRange())) { // 全体 List<User> allUser = userService.getAll(); allUser.forEach(u -> { MessageSend ms = new MessageSend().setMessageId(m.getId()).setUserId(u.getId()); messageSends.add(ms); }); sendService.saveOrUpdateAll(messageSends); // 推送 messagingTemplate.convertAndSend("/topic/subscribe", "您收到了新的系统消息"); } else if (CommonConstant.MESSAGE_RANGE_USER.equals(message.getRange())) { // 指定用户 for (String id : message.getUserIds()) { MessageSend ms = new MessageSend().setMessageId(m.getId()).setUserId(id); messageSends.add(ms); } sendService.saveOrUpdateAll(messageSends); // 推送 for (String id : message.getUserIds()) { messagingTemplate.convertAndSendToUser(id, "/queue/subscribe", "您收到了新的消息"); } } // List<MessageSend> messageSends = new ArrayList<>(); // if (CommonConstant.MESSAGE_RANGE_ALL.equals(message.getRange())) { // // 全体 // List<User> allUser = userService.getAll(); // allUser.forEach(u -> { // MessageSend ms = new MessageSend().setMessageId(m.getId()).setUserId(u.getId()); // messageSends.add(ms); // }); // sendService.saveOrUpdateAll(messageSends); // // 推送 // messagingTemplate.convertAndSend("/topic/subscribe", "您收到了新的系统消息"); // } else if (CommonConstant.MESSAGE_RANGE_USER.equals(message.getRange())) { // // 指定用户 // for (String id : message.getUserIds()) { // MessageSend ms = new MessageSend().setMessageId(m.getId()).setUserId(id); // messageSends.add(ms); // } // sendService.saveOrUpdateAll(messageSends); // // 推送 // for (String id : message.getUserIds()) { // messagingTemplate.convertAndSendToUser(id, "/queue/subscribe", "您收到了新的消息"); // } // } return ResultUtil.success("添加成功"); } @@ -116,13 +123,13 @@ public Result<Object> delMessage(@RequestParam String[] ids) { for (String id : ids) { if (ActivitiConstant.MESSAGE_PASS_ID.equals(id) || ActivitiConstant.MESSAGE_BACK_ID.equals(id) || ActivitiConstant.MESSAGE_DELEGATE_ID.equals(id) || ActivitiConstant.MESSAGE_TODO_ID.equals(id)) { return ResultUtil.error("抱歉，无法删除工作流相关系统消息"); } // if (ActivitiConstant.MESSAGE_PASS_ID.equals(id) || ActivitiConstant.MESSAGE_BACK_ID.equals(id) || ActivitiConstant.MESSAGE_DELEGATE_ID.equals(id) // || ActivitiConstant.MESSAGE_TODO_ID.equals(id)) { // return ResultUtil.error("抱歉，无法删除工作流相关系统消息"); // } messageService.delete(id); // 删除发送表 sendService.deleteByMessageId(id); //sendService.deleteByMessageId(id); } return ResultUtil.success("编辑成功"); } xboot-modules/xboot-base/src/main/java/cn/exrick/xboot/base/controller/manage/UserController.java
@@ -315,7 +315,7 @@ // 校验是否已存在 checkUserInfo(u.getUsername(), u.getMobile(), u.getEmail()); u.setKey(u.getPassword()); String encryptPass = new BCryptPasswordEncoder().encode(u.getPassword()); u.setPassword(encryptPass); if (StrUtil.isNotBlank(u.getDepartmentId())) { xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/appController/LoginController.java
New file @@ -0,0 +1,10 @@ package cn.exrick.xboot.your.appController; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @RestController @RequestMapping("/app/login") @Transactional public class LoginController { } xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/CustomerReceiveController.java
New file @@ -0,0 +1,77 @@ package cn.exrick.xboot.your.controller; import cn.exrick.xboot.core.common.utils.PageUtil; import cn.exrick.xboot.core.common.utils.ResultUtil; import cn.exrick.xboot.core.common.vo.PageVo; import cn.exrick.xboot.core.common.vo.Result; import cn.exrick.xboot.your.entity.CustomerReceive; import cn.exrick.xboot.your.service.ICustomerReceiveService; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.transaction.annotation.Transactional; import java.util.List; /** * @author whj */ @Slf4j @RestController @Api(tags = "商户接货人管理接口") @RequestMapping("/xboot/customerReceive") @Transactional public class CustomerReceiveController { @Autowired private ICustomerReceiveService iCustomerReceiveService; @RequestMapping(value = "/get/{id}", method = RequestMethod.GET) @ApiOperation(value = "通过id获取") public Result<CustomerReceive> get(@PathVariable String id) { CustomerReceive customerReceive = iCustomerReceiveService.getById(id); return new ResultUtil<CustomerReceive>().setData(customerReceive); } @RequestMapping(value = "/getAll", method = RequestMethod.GET) @ApiOperation(value = "获取全部数据") public Result<List<CustomerReceive>> getAll() { List<CustomerReceive> list = iCustomerReceiveService.list(); return new ResultUtil<List<CustomerReceive>>().setData(list); } @RequestMapping(value = "/getByPage", method = RequestMethod.GET) @ApiOperation(value = "分页获取") public Result<IPage<CustomerReceive>> getByPage(PageVo page) { IPage<CustomerReceive> data = iCustomerReceiveService.page(PageUtil.initMpPage(page)); return new ResultUtil<IPage<CustomerReceive>>().setData(data); } @RequestMapping(value = "/insertOrUpdate", method = RequestMethod.POST) @ApiOperation(value = "编辑或更新数据") public Result<CustomerReceive> saveOrUpdate(CustomerReceive customerReceive) { if (iCustomerReceiveService.saveOrUpdate(customerReceive)) { return new ResultUtil<CustomerReceive>().setData(customerReceive); } return new ResultUtil<CustomerReceive>().setErrorMsg("操作失败"); } @RequestMapping(value = "/delByIds", method = RequestMethod.POST) @ApiOperation(value = "批量通过id删除") public Result<Object> delAllByIds(@RequestParam String[] ids) { for (String id : ids) { iCustomerReceiveService.removeById(id); } return ResultUtil.success("批量通过id删除数据成功"); } } xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/FingerprintController.java
New file @@ -0,0 +1,77 @@ package cn.exrick.xboot.your.controller; import cn.exrick.xboot.core.common.utils.PageUtil; import cn.exrick.xboot.core.common.utils.ResultUtil; import cn.exrick.xboot.core.common.vo.PageVo; import cn.exrick.xboot.core.common.vo.Result; import cn.exrick.xboot.your.entity.Fingerprint; import cn.exrick.xboot.your.service.IFingerprintService; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.transaction.annotation.Transactional; import java.util.List; /** * @author Exrick */ @Slf4j @RestController @Api(tags = "指纹管理接口") @RequestMapping("/xboot/fingerprint") @Transactional public class FingerprintController { @Autowired private IFingerprintService iFingerprintService; @RequestMapping(value = "/get/{id}", method = RequestMethod.GET) @ApiOperation(value = "通过id获取") public Result<Fingerprint> get(@PathVariable String id) { Fingerprint fingerprint = iFingerprintService.getById(id); return new ResultUtil<Fingerprint>().setData(fingerprint); } @RequestMapping(value = "/getAll", method = RequestMethod.GET) @ApiOperation(value = "获取全部数据") public Result<List<Fingerprint>> getAll() { List<Fingerprint> list = iFingerprintService.list(); return new ResultUtil<List<Fingerprint>>().setData(list); } @RequestMapping(value = "/getByPage", method = RequestMethod.GET) @ApiOperation(value = "分页获取") public Result<IPage<Fingerprint>> getByPage(PageVo page) { IPage<Fingerprint> data = iFingerprintService.page(PageUtil.initMpPage(page)); return new ResultUtil<IPage<Fingerprint>>().setData(data); } @RequestMapping(value = "/insertOrUpdate", method = RequestMethod.POST) @ApiOperation(value = "编辑或更新数据") public Result<Fingerprint> saveOrUpdate(Fingerprint fingerprint) { if (iFingerprintService.saveOrUpdate(fingerprint)) { return new ResultUtil<Fingerprint>().setData(fingerprint); } return new ResultUtil<Fingerprint>().setErrorMsg("操作失败"); } @RequestMapping(value = "/delByIds", method = RequestMethod.POST) @ApiOperation(value = "批量通过id删除") public Result<Object> delAllByIds(@RequestParam String[] ids) { for (String id : ids) { iFingerprintService.removeById(id); } return ResultUtil.success("批量通过id删除数据成功"); } } xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/Accident.java
@@ -25,7 +25,7 @@ @DynamicUpdate @Table(name = "t_accident") @TableName("t_accident") @ApiModel(value = "车险记录") @ApiModel(value = "事故记录") public class Accident extends XbootBaseEntity { private static final long serialVersionUID = 1L; xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/Customer.java
@@ -49,6 +49,9 @@ @ApiModelProperty(value = "关联配送区域ID") private String areaId; @ApiModelProperty(value = "关联配送区域分段ID") private String areaSectionId; @ApiModelProperty(value = "0:正常 1:不活跃（默认=0）") private int status;
New file @@ -0,0 +1,40 @@ package cn.exrick.xboot.your.entity; import cn.exrick.xboot.core.base.XbootBaseEntity; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import org.springframework.format.annotation.DateTimeFormat; import javax.persistence.Entity; import javax.persistence.Table; import java.util.Date; /** * @author Exrick */ @Data @Entity @DynamicInsert @DynamicUpdate @Table(name = "t_customer_receive") @TableName("t_customer_receive") @ApiModel(value = "商户接货人表") public class CustomerReceive extends XbootBaseEntity { private static final long serialVersionUID = 1L; @ApiModelProperty(value = "区域id") private String customerId; @ApiModelProperty(value = "名称") private String name; @ApiModelProperty(value = "联系方式") private String phone; } xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/Fingerprint.java
New file @@ -0,0 +1,46 @@ package cn.exrick.xboot.your.entity; import cn.exrick.xboot.core.base.XbootBaseEntity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; /** * @author Exrick */ @Data @Entity @DynamicInsert @DynamicUpdate @Table(name = "t_fingerprint") @TableName("t_fingerprint") @ApiModel(value = "指纹") public class Fingerprint extends XbootBaseEntity { private static final long serialVersionUID = 1L; @ApiModelProperty(value = "用户id") private String userId; @ApiModelProperty(value = "商户id") private String customerId; @ApiModelProperty(value = "商户接收人id") private String customerReceiveId; @Column(length = 1000) @ApiModelProperty(value = "指纹") private String content; @ApiModelProperty(value = "指头1-10") private Integer num; } xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/CustomerReceiveMapper.java
New file @@ -0,0 +1,14 @@ package cn.exrick.xboot.your.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import cn.exrick.xboot.your.entity.CustomerReceive; import java.util.List; /** * 商户接货人数据处理层 * @author whj */ public interface CustomerReceiveMapper extends BaseMapper<CustomerReceive> { } xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/FingerprintMapper.java
New file @@ -0,0 +1,14 @@ package cn.exrick.xboot.your.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import cn.exrick.xboot.your.entity.Fingerprint; import java.util.List; /** * 指纹数据处理层 * @author Exrick */ public interface FingerprintMapper extends BaseMapper<Fingerprint> { } xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/service/ICustomerReceiveService.java
New file @@ -0,0 +1,14 @@ package cn.exrick.xboot.your.service; import com.baomidou.mybatisplus.extension.service.IService; import cn.exrick.xboot.your.entity.CustomerReceive; import java.util.List; /** * 商户接货人接口 * @author whj */ public interface ICustomerReceiveService extends IService<CustomerReceive> { } xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/service/IFingerprintService.java
New file @@ -0,0 +1,14 @@ package cn.exrick.xboot.your.service; import com.baomidou.mybatisplus.extension.service.IService; import cn.exrick.xboot.your.entity.Fingerprint; import java.util.List; /** * 指纹接口 * @author Exrick */ public interface IFingerprintService extends IService<Fingerprint> { } xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/ICustomerReceiveServiceImpl.java
New file @@ -0,0 +1,26 @@ package cn.exrick.xboot.your.serviceimpl; import cn.exrick.xboot.your.mapper.CustomerReceiveMapper; import cn.exrick.xboot.your.entity.CustomerReceive; import cn.exrick.xboot.your.service.ICustomerReceiveService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; import java.util.List; /** * 商户接货人接口实现 * @author whj */ @Slf4j @Service @Transactional public class ICustomerReceiveServiceImpl extends ServiceImpl<CustomerReceiveMapper, CustomerReceive> implements ICustomerReceiveService { @Autowired private CustomerReceiveMapper customerReceiveMapper; } xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/IFingerprintServiceImpl.java
New file @@ -0,0 +1,26 @@ package cn.exrick.xboot.your.serviceimpl; import cn.exrick.xboot.your.mapper.FingerprintMapper; import cn.exrick.xboot.your.entity.Fingerprint; import cn.exrick.xboot.your.service.IFingerprintService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; import java.util.List; /** * 指纹接口实现 * @author Exrick */ @Slf4j @Service @Transactional public class IFingerprintServiceImpl extends ServiceImpl<FingerprintMapper, Fingerprint> implements IFingerprintService { @Autowired private FingerprintMapper fingerprintMapper; } xboot-modules/xboot-your/src/main/resources/mapper/CustomerReceiveMapper.xml
New file @@ -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="cn.exrick.xboot.your.mapper.CustomerReceiveMapper"> </mapper> xboot-modules/xboot-your/src/main/resources/mapper/FingerprintMapper.xml
New file @@ -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="cn.exrick.xboot.your.mapper.FingerprintMapper"> </mapper>
