Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

# Conflicts:
#	svr/svr-iot/src/main/java/com/yihu/iot/controller/platform/IotInterfaceController.java

common/common-entity/src/main/java/com/yihu/jw/entity/iot/company/IotCompanyUserDO.java

@@ -1,74 +0,0 @@
package com.yihu.jw.entity.iot.company;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
/**
 * @author HZY
 * @vsrsion 1.0
 * Created at 2020/5/12
 */
@Entity
@Table(name = "iot_company_user")
public class IotCompanyUserDO extends UuidIdentityEntityWithOperator implements Serializable {
    @Column(name = "account")
    private String account;//账户
    @Column(name = "company_name")
    private String companyName;//公司名称
    @Column(name = "company_id")
    private String companyId;//企业id
    @Column(name = "del")
    private String del;//是否删除：1：删除 0：不删除',
    @Column(name = "company_status")
    private String companyStatus;//企业状态：0:待审核 1：通过 2：拒绝 3：未入驻',
    public String getAccount() {
        return account;
    }
    public void setAccount(String account) {
        this.account = account;
    }
    public String getCompanyName() {
        return companyName;
    }
    public void setCompanyName(String companyName) {
        this.companyName = companyName;
    }
    public String getCompanyId() {
        return companyId;
    }
    public void setCompanyId(String companyId) {
        this.companyId = companyId;
    }
    public String getDel() {
        return del;
    }
    public void setDel(String del) {
        this.del = del;
    }
    public String getCompanyStatus() {
        return companyStatus;
    }
    public void setCompanyStatus(String companyStatus) {
        this.companyStatus = companyStatus;
    }
}

common/common-request-mapping/src/main/java/com/yihu/jw/rm/iot/IotRequestMapping.java

@@ -81,8 +81,8 @@ public class IotRequestMapping {
        public static final String findAll = "findAll";
        public static final String enterType = "enterType";
        public static final String conditionQueryPage = "conditionQueryPage";
        public static final String saveUser = "saveUser";
        public static final String findUserCompanyStatus = "findUserCompanyStatus";
        public static final String findCompanyByAccount = "findCompanyByAccount";
        public static final String findCompanyCertPage = "findCompanyCertPage";
        public static final String findCompanyCertById = "findCompanyCertById";

svr/svr-iot/src/main/java/com/yihu/iot/controller/company/IotCompanyController.java

@@ -2,11 +2,9 @@ package com.yihu.iot.controller.company;
import com.yihu.iot.service.company.IotCompanyCertificateService;
import com.yihu.iot.service.company.IotCompanyService;
import com.yihu.iot.service.company.IotCompanyUserService;
import com.yihu.iot.service.useragent.UserAgent;
import com.yihu.jw.entity.iot.company.IotCompanyCertificateDO;
import com.yihu.jw.entity.iot.company.IotCompanyDO;
import com.yihu.jw.entity.iot.company.IotCompanyUserDO;
import com.yihu.jw.restmodel.web.MixEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.restmodel.iot.company.IotCompanyCertificateVO;
@@ -14,15 +12,10 @@ import com.yihu.jw.restmodel.iot.company.IotCompanyVO;
import com.yihu.jw.rm.iot.IotRequestMapping;
import com.yihu.jw.util.date.DateUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.apache.commons.lang.StringUtils;
import org.elasticsearch.action.ValidateActions;
import org.elasticsearch.common.recycler.Recycler;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
@@ -41,8 +34,7 @@ public class IotCompanyController extends EnvelopRestEndpoint {
    @Autowired
    private IotCompanyCertificateService iotCompanyCertificateService;
    @Autowired
    private IotCompanyUserService iotCompanyUserService;
    @Autowired
    private UserAgent userAgent;
@@ -343,25 +335,14 @@ public class IotCompanyController extends EnvelopRestEndpoint {
    }
    @GetMapping(value = IotRequestMapping.Company.saveUser)
    @ApiOperation(value = "保存用户信息", notes = "保存用户信息")
    public MixEnvelop<IotCompanyUserDO,IotCompanyUserDO>saveUser(){
        try{
            return  iotCompanyUserService.saveUser();
        }catch (Exception e){
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
        }
    }
    @GetMapping(value = IotRequestMapping.Company.findUserCompanyStatus)
    @ApiOperation(value = "获取用户企业状态", notes = "获取用户企业状态")
    public MixEnvelop<IotCompanyUserDO,IotCompanyUserDO>findUserCompanyStatus(){
    @GetMapping(value = IotRequestMapping.Company.findCompanyByAccount)
    @ApiOperation(value = "根据账号查询企业状态", notes = "根据账号查询企业状态")
    public MixEnvelop<IotCompanyVO,IotCompanyVO>findCompanyByAccount(){
        try{
            return  iotCompanyUserService.findUserCompanyStatus();
            return  iotCompanyService.findCompanyByAccount();
        }catch (Exception e){
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
@@ -369,5 +350,4 @@ public class IotCompanyController extends EnvelopRestEndpoint {
    }
}

svr/svr-iot/src/main/java/com/yihu/iot/dao/company/IotCompanyAppDao.java

@@ -22,4 +22,6 @@ public interface IotCompanyAppDao extends PagingAndSortingRepository<IotCompanyA
        @Query("from IotCompanyAppDO w where w.id =?1 and w.del=1")
        IotCompanyAppDO findById(String appId);
        }

svr/svr-iot/src/main/java/com/yihu/iot/dao/company/IotCompanyDao.java

@@ -25,4 +25,7 @@ public interface IotCompanyDao extends PagingAndSortingRepository<IotCompanyDO,
    @Query("from IotCompanyDO w where w.enterType =?1 and w.status=1 and w.del=1")
    List<IotCompanyDO> findByEnterType(String entryType);
    IotCompanyDO findByAccount(String account);
}

svr/svr-iot/src/main/java/com/yihu/iot/dao/company/IotCompanyUserDao.java

@@ -1,23 +0,0 @@
package com.yihu.iot.dao.company;
import com.yihu.jw.entity.iot.company.IotCompanyTypeDO;
import com.yihu.jw.entity.iot.company.IotCompanyUserDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * @author HZY
 * @vsrsion 1.0
 * Created at 2020/5/12
 */
public interface IotCompanyUserDao extends PagingAndSortingRepository<IotCompanyUserDO, String>,
        JpaSpecificationExecutor<IotCompanyUserDO> {
    @Query("FROM IotCompanyUserDO w WHERE w.account=?1 and w.del=0")
    IotCompanyUserDO findByAccount(String s);
    @Query("FROM IotCompanyUserDO w WHERE w.companyId=?1 and w.del=0")
    IotCompanyUserDO findByCompanyId(String id);
}

svr/svr-iot/src/main/java/com/yihu/iot/service/company/IotCompanyService.java

@@ -40,8 +40,7 @@ public class IotCompanyService extends BaseJpaService<IotCompanyDO,IotCompanyDao
    private IotCompanyAppDao iotCompanyAppDao;
    @Autowired
    private UserAgent userAgent;
    @Autowired
    private IotCompanyUserDao iotCompanyUserDao;
    /**
@@ -368,11 +367,8 @@ public class IotCompanyService extends BaseJpaService<IotCompanyDO,IotCompanyDao
            iotCompanyAppDao.save(iotCompanyAppDO);
        }
        IotCompanyUserDO userDO = iotCompanyUserDao.findByAccount(userAgent.getUNAME());
        userDO.setCompanyName(iotCompany.getName());
        userDO.setCompanyId(iotCompany.getId());
        userDO.setCompanyStatus(iotCompany.getStatus());
        iotCompanyUserDao.save(userDO);
        iotCompany.setAccount(userAgent.getUNAME());
        iotCompany.setEhrUserId(userAgent.getUID());
        return MixEnvelop.getSuccess(IotRequestMapping.Company.message_success_create,iotCompany);
    }
@@ -606,10 +602,6 @@ public class IotCompanyService extends BaseJpaService<IotCompanyDO,IotCompanyDao
        companyDO.setAuditName(uname);
        iotCompanyDao.save(companyDO);
        IotCompanyUserDO userDO = iotCompanyUserDao.findByCompanyId(id);
        userDO.setCompanyStatus(companyDO.getStatus());
        iotCompanyUserDao.save(userDO);
        return MixEnvelop.getSuccess("审核操作成功");
    }
@@ -634,9 +626,6 @@ public class IotCompanyService extends BaseJpaService<IotCompanyDO,IotCompanyDao
        companyDO.setAuditName(uname);
        iotCompanyDao.save(companyDO);
        IotCompanyUserDO userDO = iotCompanyUserDao.findByCompanyId(id);
        userDO.setCompanyStatus(companyDO.getStatus());
        iotCompanyUserDao.save(userDO);
        return MixEnvelop.getSuccess("审核操作成功");
    }
@@ -679,4 +668,18 @@ public class IotCompanyService extends BaseJpaService<IotCompanyDO,IotCompanyDao
        return iotCompanyDOS;
    }
    /**
     * 根据账号查询企业状态
     * @return
     */
    public MixEnvelop<IotCompanyVO, IotCompanyVO> findCompanyByAccount() {
        IotCompanyDO companyDO = iotCompanyDao.findByAccount(userAgent.getUNAME());
        if (companyDO==null){
            return MixEnvelop.getError("未入驻企业",-1);
        }
        return MixEnvelop.getSuccess(IotRequestMapping.Common.message_success_find,companyDO.getStatus());
    }
}

svr/svr-iot/src/main/java/com/yihu/iot/service/company/IotCompanyUserService.java

@@ -1,66 +0,0 @@
package com.yihu.iot.service.company;
import com.alibaba.fastjson.JSONObject;
import com.yihu.iot.dao.company.IotCompanyDao;
import com.yihu.iot.dao.company.IotCompanyUserDao;
import com.yihu.iot.service.useragent.UserAgent;
import com.yihu.jw.entity.iot.company.IotCompanyDO;
import com.yihu.jw.entity.iot.company.IotCompanyUserDO;
import com.yihu.jw.restmodel.web.MixEnvelop;
import com.yihu.jw.rm.iot.IotRequestMapping;
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 HZY
 * @vsrsion 1.0
 * Created at 2020/5/13
 */
@Service
@Transactional(rollbackFor = Exception.class)
public class IotCompanyUserService extends BaseJpaService<IotCompanyUserDO, IotCompanyUserDao> {
    @Autowired
    private IotCompanyUserDao iotCompanyUserDao;
    @Autowired
    private UserAgent userAgent;
    /**
     * 保存用户信息
     */
    public MixEnvelop<IotCompanyUserDO,IotCompanyUserDO> saveUser() {
        //查找用户是否存在
        IotCompanyUserDO userDO = iotCompanyUserDao.findByAccount(userAgent.getUNAME());
        if (userDO!=null){
            return MixEnvelop.getError("用户已注册",-1);
        }
        IotCompanyUserDO companyUserDO = new IotCompanyUserDO();
        companyUserDO.setAccount(userAgent.getUNAME());
        companyUserDO.setCompanyStatus("3");
        companyUserDO.setDel("0");
        iotCompanyUserDao.save(companyUserDO);
        return MixEnvelop.getSuccess(IotRequestMapping.Common.message_success_create);
    }
    /**
     * 查找公司用户的企业状态
     * @return
     */
    public MixEnvelop<IotCompanyUserDO, IotCompanyUserDO> findUserCompanyStatus() {
        IotCompanyUserDO userDO = iotCompanyUserDao.findByAccount(userAgent.getUNAME());
        return MixEnvelop.getSuccess(IotRequestMapping.Common.message_success_find,userDO.getCompanyStatus());
    }
    public static void main(String[] args) {
        String jsonString = JSONObject.toJSONString("15578008051");
        System.out.println(jsonString);
    }
}