x修改文件名问题

yijia-label/src/main/java/com/yijia/label/controller/CustomerLabelController.java

@@ -1,214 +0,0 @@
-package com.yijia.label.controller;
-
-import java.util.List;
-
-import com.yijia.common.core.domain.model.LoginUser;
-import com.yijia.common.utils.SecurityUtils;
-import com.yijia.label.domain.RequstCustomerLabel;
-import com.yijia.label.domain.ResponeCustomerLabel;
-import com.yijia.system.service.ISysDeptService;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-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.RestController;
-import com.yijia.common.annotation.Log;
-import com.yijia.common.core.controller.BaseController;
-import com.yijia.common.core.domain.AjaxResult;
-import com.yijia.common.enums.BusinessType;
-import com.yijia.label.domain.CustomerLabel;
-import com.yijia.label.service.ICustomerLabelService;
-import com.yijia.common.utils.poi.ExcelUtil;
-import com.yijia.common.core.page.TableDataInfo;
-
-/**
- * 用户标签Controller
- * 
- * @author yijia
- * @date 2021-06-15
- */
-@RestController
-@RequestMapping("/label/label")
-public class CustomerLabelController extends BaseController
-{
-    @Autowired
-    private ICustomerLabelService customerLabelService;
-
-    @Autowired
-    private ISysDeptService deptService;
-    /**
-     * 查询用户标签列表
-     */
-    @GetMapping("/list")
-    public TableDataInfo list(CustomerLabel customerLabel)
-    {
-        startPage();
-        List<CustomerLabel> list = customerLabelService.selectCustomerLabelList(customerLabel);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出用户标签列表
-     */
-    @Log(title = "用户标签", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult export(CustomerLabel customerLabel)
-    {
-        List<CustomerLabel> list = customerLabelService.selectCustomerLabelList(customerLabel);
-        ExcelUtil<CustomerLabel> util = new ExcelUtil<CustomerLabel>(CustomerLabel.class);
-        return util.exportExcel(list, "label");
-    }
-
-    /**
-     * 获取用户标签详细信息
-     */
-    @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Integer id)
-    {
-        return AjaxResult.success(customerLabelService.selectCustomerLabelById(id));
-    }
-
-    /**
-     * 获取用户标签详细信息
-     */
-    @GetMapping(value = "/selectCustomerLabelInfo")
-    public AjaxResult selectCustomerLabelInfo(CustomerLabel customerLabel)
-    {
-        LoginUser currentUser = SecurityUtils.getLoginUser();
-        customerLabel.setStationId(currentUser.getUser().getDeptId());
-        customerLabel.setDelFlag("0");
-        ResponeCustomerLabel responeCustomerLabel =new ResponeCustomerLabel();
-        List<CustomerLabel> notlist = customerLabelService.selectNotCustomerLabelInfo(customerLabel);
-        List<String> list = customerLabelService.selectPhoneList(customerLabel);
-        responeCustomerLabel.setNotCustomerLabelList(notlist);
-        responeCustomerLabel.setPhoneList(list);
-        return AjaxResult.success(responeCustomerLabel);
-    }
-
-    /**
-     * 查询没有绑定标签的客户
-     * @param customerLabel
-     * @return
-     */
-    @GetMapping(value = "/selectNotCustomerLabelInfo")
-    public TableDataInfo selectNotCustomerLabelInfo(CustomerLabel customerLabel)
-    {
-        LoginUser currentUser = SecurityUtils.getLoginUser();
-        customerLabel.setStationId(currentUser.getUser().getDeptId());
-        customerLabel.setDelFlag("0");
-        List<CustomerLabel> notlist = customerLabelService.selectNotCustomerLabelInfo(customerLabel);
-        return getDataTable(notlist);
-    }
-
-    /**
-     * 查询以绑定标签的客户信息
-     * @param customerLabel
-     * @return
-     */
-    @GetMapping(value = "/selectPhoneList")
-    public TableDataInfo selectPhoneList(CustomerLabel customerLabel)
-    {
-        LoginUser currentUser = SecurityUtils.getLoginUser();
-        customerLabel.setDelFlag("0");
-        customerLabel.setStationId(currentUser.getUser().getDeptId());
-        List<String> list = customerLabelService.selectPhoneList(customerLabel);
-        return getDataTable(list);
-    }
-
-    /**
-     * 查询标签是否绑定了人
-     * @param customerLabel
-     * @return
-     */
-    @GetMapping(value = "/selectLabel")
-    public AjaxResult selectLabel(CustomerLabel customerLabel)
-    {
-        LoginUser currentUser = SecurityUtils.getLoginUser();
-        customerLabel.setStationId(currentUser.getUser().getDeptId());
-        List<String> list = customerLabelService.selectPhoneList(customerLabel);
-        boolean flag =true;
-        if(list!=null && list.size()>0){
-            flag=false;
-        }
-        return AjaxResult.success(flag);
-    }
-
-    /**
-     * 新增用户标签
-     */
-    @Log(title = "用户标签", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody CustomerLabel customerLabel)
-    {
-        LoginUser currentUser = SecurityUtils.getLoginUser();
-        customerLabel.setCreateBy(currentUser.getUser().getUserId()+"");
-        customerLabel.setDelFlag("0");
-        return toAjax(customerLabelService.insertCustomerLabel(customerLabel));
-    }
-
-    /**
-     * 修改用户标签
-     */
-    @Log(title = "用户标签", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody CustomerLabel customerLabel)
-    {
-        LoginUser currentUser = SecurityUtils.getLoginUser();
-        customerLabel.setUpdateBy(currentUser.getUser().getUserId()+"");
-        return toAjax(customerLabelService.updateCustomerLabel(customerLabel));
-    }
-
-    /**
-     * 修改用户标签
-     */
-    @Log(title = "用户标签", businessType = BusinessType.UPDATE)
-    @PostMapping("/addAndDelCustomerLabel")
-    @Transactional
-    public AjaxResult addCustomerLabel(@RequestBody RequstCustomerLabel requstCustomerLabel)
-    {
-        int i =0;
-        LoginUser currentUser = SecurityUtils.getLoginUser();
-        if(requstCustomerLabel!=null && requstCustomerLabel.getFlag()!=null && requstCustomerLabel.getFlag().equals("0")){
-            if(requstCustomerLabel.getPhoneList()!=null && requstCustomerLabel.getPhoneList().size()>0){
-                for(String phone:requstCustomerLabel.getPhoneList()){
-                    CustomerLabel customerLabel =new CustomerLabel();
-                    customerLabel.setStationId(currentUser.getUser().getDeptId());
-                    customerLabel.setDelFlag("0");
-                    customerLabel.setPhone(phone);
-                    customerLabel.setLabelId(requstCustomerLabel.getLabelId());
-                    customerLabel.setCreateBy(currentUser.getUser().getUserId()+"");
-                  i=  customerLabelService.insertCustomerLabel(customerLabel);
-                }
-            }
-        }else if(requstCustomerLabel!=null && requstCustomerLabel.getFlag()!=null && requstCustomerLabel.getFlag().equals("1")){
-            if(requstCustomerLabel.getPhoneList()!=null && requstCustomerLabel.getPhoneList().size()>0){
-                for(String phone:requstCustomerLabel.getPhoneList()){
-                    CustomerLabel customerLabel =new CustomerLabel();
-                    customerLabel.setStationId(currentUser.getUser().getDeptId());
-                    customerLabel.setDelFlag("1");
-                    customerLabel.setPhone(phone);
-                    customerLabel.setLabelId(requstCustomerLabel.getLabelId());
-                    customerLabel.setUpdateBy(currentUser.getUser().getUserId()+"");
-                    i=  customerLabelService.editCustomerLabel(customerLabel);
-                }
-            }
-        }
-        return toAjax(i);
-    }
-
-    /**
-     * 删除用户标签
-     */
-    @Log(title = "用户标签", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Integer[] ids)
-    {
-        return toAjax(customerLabelService.deleteCustomerLabelByIds(ids));
-    }
-}

yijia-label/src/main/java/com/yijia/label/controller/LabelRuleController.java

@@ -1,183 +0,0 @@
-package com.yijia.label.controller;
-import java.util.List;
-import com.yijia.common.core.domain.entity.SysDept;
-import com.yijia.common.core.domain.model.LoginUser;
-import com.yijia.common.utils.DateUtils;
-import com.yijia.common.utils.SecurityUtils;
-import com.yijia.label.domain.LabelRuleDetail;
-import com.yijia.label.domain.RequsetSysDept;
-import com.yijia.label.service.ILabelRuleDetailService;
-import com.yijia.system.service.ISysDeptService;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.*;
-import com.yijia.common.annotation.Log;
-import com.yijia.common.core.controller.BaseController;
-import com.yijia.common.core.domain.AjaxResult;
-import com.yijia.common.enums.BusinessType;
-import com.yijia.label.domain.LabelRule;
-import com.yijia.label.service.ILabelRuleService;
-import com.yijia.common.utils.poi.ExcelUtil;
-import com.yijia.common.core.page.TableDataInfo;
-
-/**
- * 标签规则
-Controller
- * 
- * @author yijia
- * @date 2021-06-15
- */
-@RestController
-@RequestMapping("/label/rule")
-public class LabelRuleController extends BaseController
-{
-    @Autowired
-    private ILabelRuleService labelRuleService;
-
-    @Autowired
-    private ISysDeptService deptService;
-
-    @Autowired
-    private ILabelRuleDetailService labelRuleDetailService;
-    /**
-     * 查询标签规则列表
-     */
-    @GetMapping("/list")
-    public TableDataInfo list(LabelRule labelRule)
-    {
-        LoginUser currentUser = SecurityUtils.getLoginUser();
-        labelRule.setStationId(currentUser.getUser().getDeptId());
-        labelRule.setDelFlag("0");
-        startPage();
-        List<LabelRule> list = labelRuleService.selectLabelRuleList(labelRule);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出标签规则列表
-     */
-    @Log(title = "标签规则", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult export(LabelRule labelRule)
-    {
-        List<LabelRule> list = labelRuleService.selectLabelRuleList(labelRule);
-        ExcelUtil<LabelRule> util = new ExcelUtil<LabelRule>(LabelRule.class);
-        return util.exportExcel(list, "rule");
-    }
-
-    /**
-     * 获取标签规则详细信息
-     */
-    @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Integer id)
-    {
-        return AjaxResult.success(labelRuleService.selectLabelRuleById(id));
-    }
-
-    /**
-     *标签功能是否开启,标签名
-     */
-
-    @GetMapping("/sysDeptDemoList")
-    public AjaxResult sysDeptDemoList()
-    {
-        LoginUser currentUser = SecurityUtils.getLoginUser();
-        SysDept dept = deptService.selectDeptById(currentUser.getUser().getDeptId());
-        RequsetSysDept requsetSysDept = new RequsetSysDept();
-        BeanUtils.copyProperties(dept,requsetSysDept);
-        LabelRule labelRule =new LabelRule();
-        labelRule.setStationId(currentUser.getUser().getDeptId());
-        labelRule.setDelFlag("0");
-        List<LabelRule> list = labelRuleService.selectLabelRuleList(labelRule);
-        requsetSysDept.setLabelArr(list);
-        return AjaxResult.success(requsetSysDept);
-    }
-
-    @GetMapping("/selectLabelList")
-    public AjaxResult selectLabelList()
-    {
-        LoginUser currentUser = SecurityUtils.getLoginUser();
-        SysDept dept = deptService.selectDeptById(currentUser.getUser().getDeptId());
-        RequsetSysDept requsetSysDept = new RequsetSysDept();
-        BeanUtils.copyProperties(dept,requsetSysDept);
-        if(requsetSysDept!=null && requsetSysDept.getLabelFlag()!=null && requsetSysDept.getLabelFlag().equals("1")){
-            LabelRule labelRule =new LabelRule();
-            labelRule.setStationId(currentUser.getUser().getDeptId());
-            labelRule.setDelFlag("0");
-            startPage();
-            List<LabelRule> list = labelRuleService.selectLabelRuleList(labelRule);
-            if(list!=null && list.size()>0){
-                for(LabelRule rule:list){
-                    LabelRuleDetail detail =new LabelRuleDetail();
-                    detail.setParentId(rule.getId());
-                    detail.setDelFlag("0");
-                    List<LabelRuleDetail> labelRuleDetailList = labelRuleDetailService.selectLabelRuleDetailList(detail);
-                    if(labelRuleDetailList!=null && labelRuleDetailList.size()>0){
-                        rule.setLabelRuleDetailList(labelRuleDetailList);
-                    }
-                }
-            }
-            requsetSysDept.setLabelArr(list);
-        }
-        return AjaxResult.success(requsetSysDept);
-    }
-    @Log(title = "标签规则", businessType = BusinessType.INSERT)
-    @PostMapping("/addlabel")
-    @Transactional
-    public AjaxResult addlabel(@RequestBody RequsetSysDept requsetSysDept)
-    {
-        int i =0;
-        LoginUser currentUser = SecurityUtils.getLoginUser();
-        //根据demo获取添加数据
-        if(requsetSysDept!=null){
-            SysDept dept =new SysDept();
-            dept.setDeptId(currentUser.getUser().getDeptId());
-            dept.setLabelFlag(requsetSysDept.getLabelFlag());
-            dept.setUpdateBy(currentUser.getUser().getUserId()+"");
-            dept.setUpdateTime(DateUtils.getNowDate());
-            i =  deptService.updateDeptInfo(dept);
-            if(requsetSysDept.getLabelArr()!=null && requsetSysDept.getLabelArr().size()>0){
-                for(LabelRule labelRule : requsetSysDept.getLabelArr()) {
-                    if(labelRule.getId()!=null){
-                        labelRule.setUpdateBy(currentUser.getUser().getUserId()+"");
-                        i=labelRuleService.updateLabelRule(labelRule);
-                    }else{
-                        labelRule.setStationId(currentUser.getUser().getDeptId());
-                        labelRule.setCreateBy(currentUser.getUser().getUserId()+"");
-                        labelRule.setDelFlag("0");
-                        i=labelRuleService.insertLabelRule(labelRule);
-                    }
-                }
-            }
-            if(requsetSysDept.getDelArr()!=null &&requsetSysDept.getDelArr().size()>0){
-                List<Integer> idlist =requsetSysDept.getDelArr();
-                Integer[] ints = idlist.toArray(new Integer[0]);
-                labelRuleService.deleteLabelRuleByIds(ints);
-            }
-        }
-        return toAjax(i);
-    }
-
-    /**
-     * 修改标签规则
-     */
-    @Log(title = "标签规则", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody LabelRule labelRule)
-    {
-        LoginUser currentUser = SecurityUtils.getLoginUser();
-        labelRule.setUpdateBy(currentUser.getUser().getUserId()+"");
-        return toAjax(labelRuleService.updateLabelRule(labelRule));
-    }
-
-    /**
-     * 删除标签规则
-     */
-    @Log(title = "标签规则", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Integer[] ids)
-    {
-        return toAjax(labelRuleService.deleteLabelRuleByIds(ids));
-    }
-}

yijia-label/src/main/java/com/yijia/label/controller/LabelRuleDetailController.java

@@ -1,136 +0,0 @@
-package com.yijia.label.controller;
-
-import java.util.List;
-
-import com.yijia.common.core.domain.model.LoginUser;
-import com.yijia.common.utils.DateUtils;
-import com.yijia.common.utils.SecurityUtils;
-import com.yijia.label.domain.LabelRule;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-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.RestController;
-import com.yijia.common.annotation.Log;
-import com.yijia.common.core.controller.BaseController;
-import com.yijia.common.core.domain.AjaxResult;
-import com.yijia.common.enums.BusinessType;
-import com.yijia.label.domain.LabelRuleDetail;
-import com.yijia.label.service.ILabelRuleDetailService;
-import com.yijia.common.utils.poi.ExcelUtil;
-import com.yijia.common.core.page.TableDataInfo;
-
-/**
- * 标签规则明细Controller
- * 
- * @author yijia
- * @date 2021-06-15
- */
-@RestController
-@RequestMapping("/label/detail")
-public class LabelRuleDetailController extends BaseController
-{
-    @Autowired
-    private ILabelRuleDetailService labelRuleDetailService;
-
-    /**
-     * 查询标签规则明细列表
-     */
-    @GetMapping("/list")
-    public TableDataInfo list(LabelRuleDetail labelRuleDetail)
-    {
-        startPage();
-        List<LabelRuleDetail> list = labelRuleDetailService.selectLabelRuleDetailList(labelRuleDetail);
-        return getDataTable(list);
-    }
-
-    @GetMapping("/detailList")
-    public TableDataInfo detailList(LabelRuleDetail labelRuleDetail)
-    {
-        labelRuleDetail.setDelFlag("0");
-        List<LabelRuleDetail> list = labelRuleDetailService.selectLabelRuleDetailList(labelRuleDetail);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出标签规则明细列表
-     */
-    @Log(title = "标签规则明细", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult export(LabelRuleDetail labelRuleDetail)
-    {
-        List<LabelRuleDetail> list = labelRuleDetailService.selectLabelRuleDetailList(labelRuleDetail);
-        ExcelUtil<LabelRuleDetail> util = new ExcelUtil<LabelRuleDetail>(LabelRuleDetail.class);
-        return util.exportExcel(list, "detail");
-    }
-
-    /**
-     * 获取标签规则明细详细信息
-     */
-    @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Integer id)
-    {
-        return AjaxResult.success(labelRuleDetailService.selectLabelRuleDetailById(id));
-    }
-
-    /**
-     * 新增标签规则明细
-     */
-    @Log(title = "标签规则明细", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody LabelRuleDetail labelRuleDetail)
-    {
-        LoginUser currentUser = SecurityUtils.getLoginUser();
-        labelRuleDetail.setCreateBy(currentUser.getUser().getUserId()+"");
-        labelRuleDetail.setDelFlag("0");
-        return toAjax(labelRuleDetailService.insertLabelRuleDetail(labelRuleDetail));
-    }
-
-    /**
-     * 修改标签规则明细
-     */
-    @Log(title = "标签规则明细", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody LabelRuleDetail labelRuleDetail)
-    {
-        LoginUser currentUser = SecurityUtils.getLoginUser();
-        labelRuleDetail.setUpdateBy(currentUser.getUser().getUserId()+"");
-        labelRuleDetail.setDelFlag("1");
-        return toAjax(labelRuleDetailService.updateLabelRuleDetail(labelRuleDetail));
-    }
-
-    @Log(title = "积分商品管理", businessType = BusinessType.UPDATE)
-    @PostMapping(value ="/deleteLabelRuleDetail")
-    @Transactional
-    public AjaxResult deleteLabelRuleDetail(@RequestBody LabelRuleDetail labelRuleDetail)
-    {
-        int i=0;
-        try {
-            LoginUser currentUser = SecurityUtils.getLoginUser();
-            labelRuleDetail.setDelFlag("1");
-            labelRuleDetail.setUpdateBy(currentUser.getUser().getUserId()+"");
-           i= labelRuleDetailService.updateLabelRuleDetail(labelRuleDetail);
-        }catch (Exception e){
-            System.out.println("------------------------------------"+e.getLocalizedMessage()+"");
-            e.printStackTrace();
-        }
-        return toAjax(i);
-
-    }
-    /**
-     * 删除标签规则明细
-     */
-    @Log(title = "标签规则明细", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Integer[] ids)
-    {
-        return toAjax(labelRuleDetailService.deleteLabelRuleDetailByIds(ids));
-    }
-
-}

yijia-label/src/main/java/com/yijia/label/domain/CustomerLabel.java

@@ -1,106 +0,0 @@
-package com.yijia.label.domain;
-
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.yijia.common.annotation.Excel;
-import com.yijia.common.core.domain.BaseEntity;
-
-/**
- * 用户标签对象 customer_label
- * 
- * @author yijia
- * @date 2021-06-15
- */
-public class CustomerLabel extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** $column.columnComment */
-    private Integer id;
-
-    /** 手机号 */
-    @Excel(name = "手机号")
-    private String phone;
-
-    /** 标签规则主表 */
-    @Excel(name = "标签规则主表")
-    private Integer labelId;
-
-    /** 油站id */
-    @Excel(name = "油站id")
-    private Long stationId;
-
-    private String customerName;
-
-    /** 删除 1是 0否 */
-    private String delFlag;
-
-    public String getCustomerName() {
-        return customerName;
-    }
-
-    public void setCustomerName(String customerName) {
-        this.customerName = customerName;
-    }
-
-    public void setId(Integer id)
-    {
-        this.id = id;
-    }
-
-    public Integer getId() 
-    {
-        return id;
-    }
-    public void setPhone(String phone) 
-    {
-        this.phone = phone;
-    }
-
-    public String getPhone() 
-    {
-        return phone;
-    }
-    public void setLabelId(Integer labelId) 
-    {
-        this.labelId = labelId;
-    }
-
-    public Integer getLabelId() 
-    {
-        return labelId;
-    }
-
-    public Long getStationId() {
-        return stationId;
-    }
-
-    public void setStationId(Long stationId) {
-        this.stationId = stationId;
-    }
-
-    public void setDelFlag(String delFlag)
-    {
-        this.delFlag = delFlag;
-    }
-
-    public String getDelFlag() 
-    {
-        return delFlag;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("phone", getPhone())
-            .append("labelId", getLabelId())
-            .append("stationId", getStationId())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("delFlag", getDelFlag())
-            .toString();
-    }
-}

yijia-label/src/main/java/com/yijia/label/domain/LabelRule.java

@@ -1,93 +0,0 @@
-package com.yijia.label.domain;
-
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.yijia.common.annotation.Excel;
-import com.yijia.common.core.domain.BaseEntity;
-
-import java.util.List;
-
-/**
- * 标签规则
-对象 label_rule
- * 
- * @author yijia
- * @date 2021-06-15
- */
-public class LabelRule extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** 标签主表id */
-    private Integer id;
-
-    /** 标签名 */
-    private String labelName;
-
-    /** 油站id */
-    private Long stationId;
-
-    /** 删除标识1 是 0 否 */
-    private String delFlag;
-
-    private List<LabelRuleDetail> labelRuleDetailList;
-
-    public List<LabelRuleDetail> getLabelRuleDetailList() {
-        return labelRuleDetailList;
-    }
-
-    public void setLabelRuleDetailList(List<LabelRuleDetail> labelRuleDetailList) {
-        this.labelRuleDetailList = labelRuleDetailList;
-    }
-
-    public void setId(Integer id)
-    {
-        this.id = id;
-    }
-
-    public Integer getId() 
-    {
-        return id;
-    }
-    public void setLabelName(String labelName) 
-    {
-        this.labelName = labelName;
-    }
-
-    public String getLabelName() 
-    {
-        return labelName;
-    }
-
-    public Long getStationId() {
-        return stationId;
-    }
-
-    public void setStationId(Long stationId) {
-        this.stationId = stationId;
-    }
-
-    public void setDelFlag(String delFlag)
-    {
-        this.delFlag = delFlag;
-    }
-
-    public String getDelFlag() 
-    {
-        return delFlag;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("labelName", getLabelName())
-            .append("stationId", getStationId())
-            .append("delFlag", getDelFlag())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .toString();
-    }
-}

yijia-label/src/main/java/com/yijia/label/domain/LabelRuleDetail.java

@@ -1,123 +0,0 @@
-package com.yijia.label.domain;
-
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.yijia.common.annotation.Excel;
-import com.yijia.common.core.domain.BaseEntity;
-
-/**
- * 标签规则明细对象 label_rule_detail
- * 
- * @author yijia
- * @date 2021-06-15
- */
-public class LabelRuleDetail extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** 标签规则明细id */
-    private Long id;
-
-    /** 标签主表id */
-    @Excel(name = "标签主表id")
-    private Integer parentId;
-
-    /** 油品名称 */
-    @Excel(name = "油品名称")
-    private String oilName;
-
-    /** 优惠条件当为1按金额优惠；2按升数优惠 */
-    @Excel(name = "优惠条件当为1按金额优惠；2按升数优惠")
-    private String discountTerm;
-
-    /** 优惠条件（满多少升、满多少元） */
-    @Excel(name = "优惠条件", readConverterExp = "满=多少升、满多少元")
-    private String discountLitersAmt;
-
-    /** 优惠金额 */
-    @Excel(name = "优惠金额")
-    private String discountAmt;
-
-    /** 删除标识 1是 0 否 */
-    private String delFlag;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public void setParentId(Integer parentId)
-    {
-        this.parentId = parentId;
-    }
-
-    public Integer getParentId() 
-    {
-        return parentId;
-    }
-    public void setOilName(String oilName) 
-    {
-        this.oilName = oilName;
-    }
-
-    public String getOilName() 
-    {
-        return oilName;
-    }
-    public void setDiscountTerm(String discountTerm) 
-    {
-        this.discountTerm = discountTerm;
-    }
-
-    public String getDiscountTerm() 
-    {
-        return discountTerm;
-    }
-    public void setDiscountLitersAmt(String discountLitersAmt) 
-    {
-        this.discountLitersAmt = discountLitersAmt;
-    }
-
-    public String getDiscountLitersAmt() 
-    {
-        return discountLitersAmt;
-    }
-    public void setDiscountAmt(String discountAmt) 
-    {
-        this.discountAmt = discountAmt;
-    }
-
-    public String getDiscountAmt() 
-    {
-        return discountAmt;
-    }
-    public void setDelFlag(String delFlag) 
-    {
-        this.delFlag = delFlag;
-    }
-
-    public String getDelFlag() 
-    {
-        return delFlag;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("parentId", getParentId())
-            .append("oilName", getOilName())
-            .append("discountTerm", getDiscountTerm())
-            .append("discountLitersAmt", getDiscountLitersAmt())
-            .append("discountAmt", getDiscountAmt())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("delFlag", getDelFlag())
-            .toString();
-    }
-}

yijia-label/src/main/java/com/yijia/label/domain/RequsetSysDept.java

@@ -1,65 +0,0 @@
-package com.yijia.label.domain;
-
-import com.yijia.common.core.domain.BaseEntity;
-import com.yijia.common.core.domain.entity.SysDept;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class RequsetSysDept extends BaseEntity {
-
-    private static final long serialVersionUID = 1L;
-
-    /** 部门ID */
-    private Long deptId;
-    /** 部门名称 */
-    private String deptName;
-    /**
-     * 标签是否启用
-     */
-    private String labelFlag;
-
-    public String getLabelFlag() {
-        return labelFlag;
-    }
-
-    public void setLabelFlag(String labelFlag) {
-        this.labelFlag = labelFlag;
-    }
-
-    private List<LabelRule> labelArr;
-    private List<Integer> delArr;
-
-    public List<Integer> getDelArr() {
-        return delArr;
-    }
-
-    public void setDelArr(List<Integer> delArr) {
-        this.delArr = delArr;
-    }
-
-    public List<LabelRule> getLabelArr() {
-        return labelArr;
-    }
-
-    public void setLabelArr(List<LabelRule> labelArr) {
-        this.labelArr = labelArr;
-    }
-
-    public Long getDeptId() {
-        return deptId;
-    }
-
-    public void setDeptId(Long deptId) {
-        this.deptId = deptId;
-    }
-
-    public String getDeptName() {
-        return deptName;
-    }
-
-    public void setDeptName(String deptName) {
-        this.deptName = deptName;
-    }
-
-}

yijia-label/src/main/java/com/yijia/label/domain/RequstCustomerLabel.java

@@ -1,33 +0,0 @@
-package com.yijia.label.domain;
-
-import java.util.List;
-
-public class RequstCustomerLabel {
-    private Integer labelId;
-    private List<String> phoneList;
-    private String flag;
-
-    public Integer getLabelId() {
-        return labelId;
-    }
-
-    public void setLabelId(Integer labelId) {
-        this.labelId = labelId;
-    }
-
-    public String getFlag() {
-        return flag;
-    }
-
-    public void setFlag(String flag) {
-        this.flag = flag;
-    }
-
-    public List<String> getPhoneList() {
-        return phoneList;
-    }
-
-    public void setPhoneList(List<String> phoneList) {
-        this.phoneList = phoneList;
-    }
-}

yijia-label/src/main/java/com/yijia/label/domain/ResponeCustomerLabel.java

@@ -1,33 +0,0 @@
-package com.yijia.label.domain;
-
-import java.util.List;
-
-public class ResponeCustomerLabel {
-    private List<CustomerLabel> notCustomerLabelList;
-    private List<CustomerLabel> customerLabelList;
-    private List<String> phoneList;
-
-    public List<String> getPhoneList() {
-        return phoneList;
-    }
-
-    public void setPhoneList(List<String> phoneList) {
-        this.phoneList = phoneList;
-    }
-
-    public List<CustomerLabel> getNotCustomerLabelList() {
-        return notCustomerLabelList;
-    }
-
-    public void setNotCustomerLabelList(List<CustomerLabel> notCustomerLabelList) {
-        this.notCustomerLabelList = notCustomerLabelList;
-    }
-
-    public List<CustomerLabel> getCustomerLabelList() {
-        return customerLabelList;
-    }
-
-    public void setCustomerLabelList(List<CustomerLabel> customerLabelList) {
-        this.customerLabelList = customerLabelList;
-    }
-}

yijia-label/src/main/java/com/yijia/label/mapper/CustomerLabelMapper.java

@@ -1,70 +0,0 @@
-package com.yijia.label.mapper;
-
-import java.util.List;
-import com.yijia.label.domain.CustomerLabel;
-
-/**
- * 用户标签Mapper接口
- * 
- * @author yijia
- * @date 2021-06-15
- */
-public interface CustomerLabelMapper 
-{
-    /**
-     * 查询用户标签
-     * 
-     * @param id 用户标签ID
-     * @return 用户标签
-     */
-    public CustomerLabel selectCustomerLabelById(Integer id);
-
-    /**
-     * 查询用户标签列表
-     * 
-     * @param customerLabel 用户标签
-     * @return 用户标签集合
-     */
-    public List<CustomerLabel> selectCustomerLabelList(CustomerLabel customerLabel);
-
-    /**
-     * 新增用户标签
-     * 
-     * @param customerLabel 用户标签
-     * @return 结果
-     */
-    public int insertCustomerLabel(CustomerLabel customerLabel);
-
-    /**
-     * 修改用户标签
-     * 
-     * @param customerLabel 用户标签
-     * @return 结果
-     */
-    public int updateCustomerLabel(CustomerLabel customerLabel);
-
-    /**
-     * 删除用户标签
-     * 
-     * @param id 用户标签ID
-     * @return 结果
-     */
-    public int deleteCustomerLabelById(Integer id);
-
-    /**
-     * 批量删除用户标签
-     * 
-     * @param ids 需要删除的数据ID
-     * @return 结果
-     */
-    public int deleteCustomerLabelByIds(Integer[] ids);
-
-    public List<CustomerLabel> selectNotCustomerLabelInfo(CustomerLabel customerLabel);
-
-    /**
-     * 根据手机号和labelId查询唯一的数据
-     * @param labelInfo
-     * @return
-     */
-    public CustomerLabel selectCustomerLabelInfo(CustomerLabel labelInfo);
-}

yijia-label/src/main/java/com/yijia/label/mapper/LabelRuleDetailMapper.java

@@ -1,70 +0,0 @@
-package com.yijia.label.mapper;
-
-import java.util.List;
-
-import com.yijia.label.domain.LabelRule;
-import com.yijia.label.domain.LabelRuleDetail;
-
-/**
- * 标签规则明细Mapper接口
- * 
- * @author yijia
- * @date 2021-06-15
- */
-public interface LabelRuleDetailMapper 
-{
-    /**
-     * 查询标签规则明细
-     * 
-     * @param id 标签规则明细ID
-     * @return 标签规则明细
-     */
-    public LabelRuleDetail selectLabelRuleDetailById(Integer id);
-
-    /**
-     * 查询标签规则明细列表
-     * 
-     * @param labelRuleDetail 标签规则明细
-     * @return 标签规则明细集合
-     */
-    public List<LabelRuleDetail> selectLabelRuleDetailList(LabelRuleDetail labelRuleDetail);
-
-    /**
-     * 新增标签规则明细
-     * 
-     * @param labelRuleDetail 标签规则明细
-     * @return 结果
-     */
-    public int insertLabelRuleDetail(LabelRuleDetail labelRuleDetail);
-
-    /**
-     * 修改标签规则明细
-     * 
-     * @param labelRuleDetail 标签规则明细
-     * @return 结果
-     */
-    public int updateLabelRuleDetail(LabelRuleDetail labelRuleDetail);
-
-    /**
-     * 删除标签规则明细
-     * 
-     * @param id 标签规则明细ID
-     * @return 结果
-     */
-    public int deleteLabelRuleDetailById(Integer id);
-
-    /**
-     * 批量删除标签规则明细
-     * 
-     * @param ids 需要删除的数据ID
-     * @return 结果
-     */
-    public int deleteLabelRuleDetailByIds(Integer[] ids);
-
-    /**
-     * 查询规则明细
-     * @param labelRule
-     * @return
-     */
-    public List<LabelRuleDetail> labelRuleDetailList(LabelRule labelRule);
-}

yijia-label/src/main/java/com/yijia/label/mapper/LabelRuleMapper.java

@@ -1,75 +0,0 @@
-package com.yijia.label.mapper;
-
-import java.util.List;
-import com.yijia.label.domain.LabelRule;
-
-/**
- * 标签规则
-Mapper接口
- * 
- * @author yijia
- * @date 2021-06-15
- */
-public interface LabelRuleMapper 
-{
-    /**
-     * 查询标签规则
-
-     * 
-     * @param id 标签规则
-ID
-     * @return 标签规则
-
-     */
-    public LabelRule selectLabelRuleById(Integer id);
-
-    /**
-     * 查询标签规则
-列表
-     * 
-     * @param labelRule 标签规则
-
-     * @return 标签规则
-集合
-     */
-    public List<LabelRule> selectLabelRuleList(LabelRule labelRule);
-
-    /**
-     * 新增标签规则
-
-     * 
-     * @param labelRule 标签规则
-
-     * @return 结果
-     */
-    public int insertLabelRule(LabelRule labelRule);
-
-    /**
-     * 修改标签规则
-
-     * 
-     * @param labelRule 标签规则
-
-     * @return 结果
-     */
-    public int updateLabelRule(LabelRule labelRule);
-
-    /**
-     * 删除标签规则
-
-     * 
-     * @param id 标签规则
-ID
-     * @return 结果
-     */
-    public int deleteLabelRuleById(Integer id);
-
-    /**
-     * 批量删除标签规则
-
-     * 
-     * @param ids 需要删除的数据ID
-     * @return 结果
-     */
-    public int deleteLabelRuleByIds(Integer[] ids);
-}

yijia-label/src/main/java/com/yijia/label/service/ICustomerLabelService.java

@@ -1,82 +0,0 @@
-package com.yijia.label.service;
-
-import java.util.List;
-import com.yijia.label.domain.CustomerLabel;
-import com.yijia.label.domain.RequstCustomerLabel;
-
-/**
- * 用户标签Service接口
- * 
- * @author yijia
- * @date 2021-06-15
- */
-public interface ICustomerLabelService 
-{
-    /**
-     * 查询用户标签
-     * 
-     * @param id 用户标签ID
-     * @return 用户标签
-     */
-    public CustomerLabel selectCustomerLabelById(Integer id);
-
-    /**
-     * 查询用户标签列表
-     * 
-     * @param customerLabel 用户标签
-     * @return 用户标签集合
-     */
-    public List<CustomerLabel> selectCustomerLabelList(CustomerLabel customerLabel);
-
-    /**
-     * 新增用户标签
-     * 
-     * @param customerLabel 用户标签
-     * @return 结果
-     */
-    public int insertCustomerLabel(CustomerLabel customerLabel);
-
-    /**
-     * 修改用户标签
-     * 
-     * @param customerLabel 用户标签
-     * @return 结果
-     */
-    public int updateCustomerLabel(CustomerLabel customerLabel);
-
-    /**
-     * 批量删除用户标签
-     * 
-     * @param ids 需要删除的用户标签ID
-     * @return 结果
-     */
-    public int deleteCustomerLabelByIds(Integer[] ids);
-
-    /**
-     * 删除用户标签信息
-     * 
-     * @param id 用户标签ID
-     * @return 结果
-     */
-    public int deleteCustomerLabelById(Integer id);
-
-    /**
-     * 查询没有标签的客户信息
-     * @param customerLabel
-     * @return
-     */
-    public List<CustomerLabel> selectNotCustomerLabelInfo(CustomerLabel customerLabel);
-
-    /**
-     *
-     * @param customerLabel
-     * @return
-     */
-    public int editCustomerLabel(CustomerLabel customerLabel);
-    /**
-     * 查询本标签的客户手机号
-     * @param customerLabel
-     * @return
-     */
-    public List<String> selectPhoneList(CustomerLabel customerLabel);
-}

yijia-label/src/main/java/com/yijia/label/service/ILabelRuleDetailService.java

@@ -1,70 +0,0 @@
-package com.yijia.label.service;
-
-import java.util.List;
-
-import com.yijia.label.domain.LabelRule;
-import com.yijia.label.domain.LabelRuleDetail;
-
-/**
- * 标签规则明细Service接口
- * 
- * @author yijia
- * @date 2021-06-15
- */
-public interface ILabelRuleDetailService 
-{
-    /**
-     * 查询标签规则明细
-     * 
-     * @param id 标签规则明细ID
-     * @return 标签规则明细
-     */
-    public LabelRuleDetail selectLabelRuleDetailById(Integer id);
-
-    /**
-     * 查询标签规则明细列表
-     * 
-     * @param labelRuleDetail 标签规则明细
-     * @return 标签规则明细集合
-     */
-    public List<LabelRuleDetail> selectLabelRuleDetailList(LabelRuleDetail labelRuleDetail);
-
-    /**
-     * 新增标签规则明细
-     * 
-     * @param labelRuleDetail 标签规则明细
-     * @return 结果
-     */
-    public int insertLabelRuleDetail(LabelRuleDetail labelRuleDetail);
-
-    /**
-     * 修改标签规则明细
-     * 
-     * @param labelRuleDetail 标签规则明细
-     * @return 结果
-     */
-    public int updateLabelRuleDetail(LabelRuleDetail labelRuleDetail);
-
-    /**
-     * 批量删除标签规则明细
-     * 
-     * @param ids 需要删除的标签规则明细ID
-     * @return 结果
-     */
-    public int deleteLabelRuleDetailByIds(Integer[] ids);
-
-    /**
-     * 删除标签规则明细信息
-     * 
-     * @param id 标签规则明细ID
-     * @return 结果
-     */
-    public int deleteLabelRuleDetailById(Integer id);
-
-    /**
-     * 查询规则明细
-     * @param labelRule
-     * @return
-     */
-    public List<LabelRuleDetail> labelRuleDetailList(LabelRule labelRule);
-}

yijia-label/src/main/java/com/yijia/label/service/ILabelRuleService.java

@@ -1,76 +0,0 @@
-package com.yijia.label.service;
-
-import java.util.List;
-import com.yijia.label.domain.LabelRule;
-
-/**
- * 标签规则
-Service接口
- * 
- * @author yijia
- * @date 2021-06-15
- */
-public interface ILabelRuleService 
-{
-    /**
-     * 查询标签规则
-
-     * 
-     * @param id 标签规则
-ID
-     * @return 标签规则
-
-     */
-    public LabelRule selectLabelRuleById(Integer id);
-
-    /**
-     * 查询标签规则
-列表
-     * 
-     * @param labelRule 标签规则
-
-     * @return 标签规则
-集合
-     */
-    public List<LabelRule> selectLabelRuleList(LabelRule labelRule);
-
-    /**
-     * 新增标签规则
-
-     * 
-     * @param labelRule 标签规则
-
-     * @return 结果
-     */
-    public int insertLabelRule(LabelRule labelRule);
-
-    /**
-     * 修改标签规则
-
-     * 
-     * @param labelRule 标签规则
-
-     * @return 结果
-     */
-    public int updateLabelRule(LabelRule labelRule);
-
-    /**
-     * 批量删除标签规则
-
-     * 
-     * @param ids 需要删除的标签规则
-ID
-     * @return 结果
-     */
-    public int deleteLabelRuleByIds(Integer[] ids);
-
-    /**
-     * 删除标签规则
-信息
-     * 
-     * @param id 标签规则
-ID
-     * @return 结果
-     */
-    public int deleteLabelRuleById(Integer id);
-}

yijia-label/src/main/java/com/yijia/label/service/impl/CustomerLabelServiceImpl.java

@@ -1,141 +0,0 @@
-package com.yijia.label.service.impl;
-
-import java.util.ArrayList;
-import java.util.List;
-import com.yijia.common.utils.DateUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.yijia.label.mapper.CustomerLabelMapper;
-import com.yijia.label.domain.CustomerLabel;
-import com.yijia.label.service.ICustomerLabelService;
-
-/**
- * 用户标签Service业务层处理
- * 
- * @author yijia
- * @date 2021-06-15
- */
-@Service
-public class CustomerLabelServiceImpl implements ICustomerLabelService 
-{
-    @Autowired
-    private CustomerLabelMapper customerLabelMapper;
-
-    /**
-     * 查询用户标签
-     * 
-     * @param id 用户标签ID
-     * @return 用户标签
-     */
-    @Override
-    public CustomerLabel selectCustomerLabelById(Integer id)
-    {
-        return customerLabelMapper.selectCustomerLabelById(id);
-    }
-
-    /**
-     * 查询用户标签列表
-     * 
-     * @param customerLabel 用户标签
-     * @return 用户标签
-     */
-    @Override
-    public List<CustomerLabel> selectCustomerLabelList(CustomerLabel customerLabel)
-    {
-        return customerLabelMapper.selectCustomerLabelList(customerLabel);
-    }
-
-    /**
-     * 新增用户标签
-     * 
-     * @param customerLabel 用户标签
-     * @return 结果
-     */
-    @Override
-    public int insertCustomerLabel(CustomerLabel customerLabel)
-    {
-        customerLabel.setCreateTime(DateUtils.getNowDate());
-        return customerLabelMapper.insertCustomerLabel(customerLabel);
-    }
-
-    /**
-     * 修改用户标签
-     * 
-     * @param customerLabel 用户标签
-     * @return 结果
-     */
-    @Override
-    public int updateCustomerLabel(CustomerLabel customerLabel)
-    {
-        customerLabel.setUpdateTime(DateUtils.getNowDate());
-        return customerLabelMapper.updateCustomerLabel(customerLabel);
-    }
-
-    /**
-     * 批量删除用户标签
-     * 
-     * @param ids 需要删除的用户标签ID
-     * @return 结果
-     */
-    @Override
-    public int deleteCustomerLabelByIds(Integer[] ids)
-    {
-        return customerLabelMapper.deleteCustomerLabelByIds(ids);
-    }
-
-    /**
-     * 删除用户标签信息
-     * 
-     * @param id 用户标签ID
-     * @return 结果
-     */
-    @Override
-    public int deleteCustomerLabelById(Integer id)
-    {
-        return customerLabelMapper.deleteCustomerLabelById(id);
-    }
-
-    /**
-     * 查询 标签客户信息
-     * @param customerLabel
-     * @return
-     */
-    @Override
-    public List<CustomerLabel> selectNotCustomerLabelInfo(CustomerLabel customerLabel) {
-        return customerLabelMapper.selectNotCustomerLabelInfo(customerLabel);
-    }
-
-    @Override
-    public int editCustomerLabel(CustomerLabel customerLabel) {
-        //先查询再做修改
-        int i =0 ;
-        CustomerLabel labelInfo =new CustomerLabel();
-        labelInfo.setLabelId(customerLabel.getLabelId());
-        labelInfo.setPhone(customerLabel.getPhone());
-        labelInfo.setDelFlag("0");
-        CustomerLabel label =customerLabelMapper.selectCustomerLabelInfo(labelInfo);
-        if(label!=null&& label.getId()!=null){
-            label.setDelFlag("1");
-            label.setUpdateTime(DateUtils.getNowDate());
-            i=customerLabelMapper.updateCustomerLabel(label);
-        }
-        return i;
-    }
-
-    /**
-     * 查询本标签的客户手机号
-     * @param customerLabel
-     * @return
-     */
-    @Override
-    public List<String> selectPhoneList(CustomerLabel customerLabel) {
-        List<CustomerLabel> list= customerLabelMapper.selectCustomerLabelList(customerLabel);
-        List<String> stringList =new ArrayList<>();
-        if(list!=null && list.size()>0){
-            for(CustomerLabel label:list){
-                stringList.add(label.getPhone());
-            }
-        }
-        return stringList;
-    }
-}

yijia-label/src/main/java/com/yijia/label/service/impl/LabelRuleDetailServiceImpl.java

@@ -1,107 +0,0 @@
-package com.yijia.label.service.impl;
-
-import java.util.List;
-import com.yijia.common.utils.DateUtils;
-import com.yijia.label.domain.LabelRule;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.yijia.label.mapper.LabelRuleDetailMapper;
-import com.yijia.label.domain.LabelRuleDetail;
-import com.yijia.label.service.ILabelRuleDetailService;
-
-/**
- * 标签规则明细Service业务层处理
- * 
- * @author yijia
- * @date 2021-06-15
- */
-@Service
-public class LabelRuleDetailServiceImpl implements ILabelRuleDetailService 
-{
-    @Autowired
-    private LabelRuleDetailMapper labelRuleDetailMapper;
-
-    /**
-     * 查询标签规则明细
-     * 
-     * @param id 标签规则明细ID
-     * @return 标签规则明细
-     */
-    @Override
-    public LabelRuleDetail selectLabelRuleDetailById(Integer id)
-    {
-        return labelRuleDetailMapper.selectLabelRuleDetailById(id);
-    }
-
-    /**
-     * 查询标签规则明细列表
-     * 
-     * @param labelRuleDetail 标签规则明细
-     * @return 标签规则明细
-     */
-    @Override
-    public List<LabelRuleDetail> selectLabelRuleDetailList(LabelRuleDetail labelRuleDetail)
-    {
-        return labelRuleDetailMapper.selectLabelRuleDetailList(labelRuleDetail);
-    }
-
-    /**
-     * 新增标签规则明细
-     * 
-     * @param labelRuleDetail 标签规则明细
-     * @return 结果
-     */
-    @Override
-    public int insertLabelRuleDetail(LabelRuleDetail labelRuleDetail)
-    {
-        labelRuleDetail.setCreateTime(DateUtils.getNowDate());
-        return labelRuleDetailMapper.insertLabelRuleDetail(labelRuleDetail);
-    }
-
-    /**
-     * 修改标签规则明细
-     * 
-     * @param labelRuleDetail 标签规则明细
-     * @return 结果
-     */
-    @Override
-    public int updateLabelRuleDetail(LabelRuleDetail labelRuleDetail)
-    {
-        labelRuleDetail.setUpdateTime(DateUtils.getNowDate());
-        return labelRuleDetailMapper.updateLabelRuleDetail(labelRuleDetail);
-    }
-
-    /**
-     * 批量删除标签规则明细
-     * 
-     * @param ids 需要删除的标签规则明细ID
-     * @return 结果
-     */
-    @Override
-    public int deleteLabelRuleDetailByIds(Integer[] ids)
-    {
-        return labelRuleDetailMapper.deleteLabelRuleDetailByIds(ids);
-    }
-
-    /**
-     * 删除标签规则明细信息
-     * 
-     * @param id 标签规则明细ID
-     * @return 结果
-     */
-    @Override
-    public int deleteLabelRuleDetailById(Integer id)
-    {
-        return labelRuleDetailMapper.deleteLabelRuleDetailById(id);
-    }
-
-    /**
-     * 查询规则明细
-     * @param labelRule
-     * @return
-     */
-    @Override
-    public List<LabelRuleDetail> labelRuleDetailList(LabelRule labelRule) {
-        return labelRuleDetailMapper.labelRuleDetailList(labelRule);
-    }
-}

yijia-label/src/main/java/com/yijia/label/service/impl/LabelRuleServiceImpl.java

@@ -1,111 +0,0 @@
-package com.yijia.label.service.impl;
-
-import java.util.List;
-import com.yijia.common.utils.DateUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.yijia.label.mapper.LabelRuleMapper;
-import com.yijia.label.domain.LabelRule;
-import com.yijia.label.service.ILabelRuleService;
-
-/**
- * 标签规则
-Service业务层处理
- * 
- * @author yijia
- * @date 2021-06-15
- */
-@Service
-public class LabelRuleServiceImpl implements ILabelRuleService 
-{
-    @Autowired
-    private LabelRuleMapper labelRuleMapper;
-
-    /**
-     * 查询标签规则
-
-     * 
-     * @param id 标签规则
-ID
-     * @return 标签规则
-
-     */
-    @Override
-    public LabelRule selectLabelRuleById(Integer id)
-    {
-        return labelRuleMapper.selectLabelRuleById(id);
-    }
-
-    /**
-     * 查询标签规则
-列表
-     * 
-     * @param labelRule 标签规则
-
-     * @return 标签规则
-
-     */
-    @Override
-    public List<LabelRule> selectLabelRuleList(LabelRule labelRule)
-    {
-        return labelRuleMapper.selectLabelRuleList(labelRule);
-    }
-
-    /**
-     * 新增标签规则
-
-     * 
-     * @param labelRule 标签规则
-
-     * @return 结果
-     */
-    @Override
-    public int insertLabelRule(LabelRule labelRule)
-    {
-        labelRule.setCreateTime(DateUtils.getNowDate());
-        return labelRuleMapper.insertLabelRule(labelRule);
-    }
-
-    /**
-     * 修改标签规则
-
-     * 
-     * @param labelRule 标签规则
-
-     * @return 结果
-     */
-    @Override
-    public int updateLabelRule(LabelRule labelRule)
-    {
-        labelRule.setUpdateTime(DateUtils.getNowDate());
-        return labelRuleMapper.updateLabelRule(labelRule);
-    }
-
-    /**
-     * 批量删除标签规则
-
-     * 
-     * @param ids 需要删除的标签规则
-ID
-     * @return 结果
-     */
-    @Override
-    public int deleteLabelRuleByIds(Integer[] ids)
-    {
-        return labelRuleMapper.deleteLabelRuleByIds(ids);
-    }
-
-    /**
-     * 删除标签规则
-信息
-     * 
-     * @param id 标签规则
-ID
-     * @return 结果
-     */
-    @Override
-    public int deleteLabelRuleById(Integer id)
-    {
-        return labelRuleMapper.deleteLabelRuleById(id);
-    }
-}

yijia-label/src/main/resources/mapper/label/CustomerLabelMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yijia.label.mapper.CustomerLabelMapper">
+<mapper namespace="com.yijia.markert.mapper.CustomerLabelMapper">
     
     <resultMap type="CustomerLabel" id="CustomerLabelResult">
         <result property="id"    column="id"    />

yijia-label/src/main/resources/mapper/label/LabelRuleDetailMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yijia.label.mapper.LabelRuleDetailMapper">
+<mapper namespace="com.yijia.markert.mapper.LabelRuleDetailMapper">
     
     <resultMap type="LabelRuleDetail" id="LabelRuleDetailResult">
         <result property="id"    column="id"    />

yijia-label/src/main/resources/mapper/label/LabelRuleMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yijia.label.mapper.LabelRuleMapper">
+<mapper namespace="com.yijia.markert.mapper.LabelRuleMapper">
     
     <resultMap type="LabelRule" id="LabelRuleResult">
         <result property="id"    column="id"    />