Merge branch 'dev' of suhaiwen/wlyy2.0 into dev

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

@@ -85,6 +85,7 @@ public class IotRequestMapping {
        public static final String conditionQueryPage = "conditionQueryPage";
        public static final String findUserCompanyStatus = "findUserCompanyStatus";
        public static final String findCompanyByAccount = "findCompanyByAccount";
        public static final String findCompanyApp ="findCompanyApp";
        public static final String findCompanyCertPage = "findCompanyCertPage";
        public static final String findCompanyCertById = "findCompanyCertById";
@@ -410,6 +411,7 @@ public class IotRequestMapping {
        public static final String auditPass ="auditPass";
        public static final String auditNoPass ="auditNoPass";
        public static final String conditionQueryPage ="conditionQueryPage";
        public static final String QueryCompanyApp ="QueryCompanyApp";
        public static final String message_success_apply_for = "apply for success";
        public static final String message_success_find = "find  success";

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

@@ -5,6 +5,7 @@ import com.yihu.iot.service.company.IotCompanyService;
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.restmodel.iot.company.IotCompanyAppVO;
import com.yihu.jw.restmodel.web.MixEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.restmodel.iot.company.IotCompanyCertificateVO;
@@ -348,4 +349,11 @@ public class IotCompanyController extends EnvelopRestEndpoint {
        }
    }
    @GetMapping(value = IotRequestMapping.Company.findCompanyApp)
    @ApiOperation(value = "查询企业下应用信息",notes = "查询企业下应用信息")
    public MixEnvelop<IotCompanyAppVO,IotCompanyAppVO> findCompanyApp(){
           return iotCompanyService.findCompanyApp();
    }
}

svr/svr-iot/src/main/java/com/yihu/iot/controller/platform/IotInterfaceAuditController.java

@@ -1,8 +1,10 @@
package com.yihu.iot.controller.platform;
import com.yihu.iot.service.platform.IotInterfaceAuditService;
import com.yihu.jw.entity.iot.company.IotCompanyAppDO;
import com.yihu.jw.entity.iot.platform.IotInterfaceAuditDO;
import com.yihu.jw.entity.iot.platform.IotShareInterfaceDO;
import com.yihu.jw.restmodel.iot.company.IotCompanyAppVO;
import com.yihu.jw.restmodel.iot.platform.IotInterfaceAuditVO;
import com.yihu.jw.restmodel.web.MixEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
@@ -46,6 +48,7 @@ public class IotInterfaceAuditController extends EnvelopRestEndpoint {
    }
    @GetMapping(value = IotRequestMapping.InterfaceAudit.findInterfaceApplyFor)
    @ApiOperation(value = "查看应用接口申请信息",notes = "查看应用接口申请信息")
    public MixEnvelop<IotInterfaceAuditVO,IotInterfaceAuditVO> findInterfaceApplyFor(@ApiParam(name = "id",value = "ID") @RequestParam(value = "id",required = true)String id){
@@ -87,7 +90,7 @@ public class IotInterfaceAuditController extends EnvelopRestEndpoint {
    @GetMapping(value = IotRequestMapping.InterfaceAudit.conditionQueryPage)
    @ApiOperation(value = "条件分页查询应用接口申请信息",notes = "条件分页查询应用接口申请信息")
    public MixEnvelop<IotInterfaceAuditDO,IotInterfaceAuditDO> conditionQueryPage(@ApiParam(name = "name", value = "厂商名称或联系人名称", defaultValue = "")
    public MixEnvelop<IotInterfaceAuditDO,IotInterfaceAuditDO> conditionQueryPage(@ApiParam(name = "name", value = "平台名称", defaultValue = "")
                                                                                      @RequestParam(value = "name", required = false) String companyName,
                                                                                  @ApiParam(name = "page", value = "第几页", defaultValue = "")
                                                                                      @RequestParam(value = "page", required = false) Integer page,
@@ -142,6 +145,20 @@ public class IotInterfaceAuditController extends EnvelopRestEndpoint {
    @GetMapping(value = IotRequestMapping.InterfaceAudit.QueryCompanyApp)
    @ApiOperation(value = "分页查询企业下应用接口申请",notes = "分页查询企业下应用接口申请")
    public MixEnvelop<IotInterfaceAuditDO,IotInterfaceAuditDO> QueryCompanyApp(){
        try {
            return iotInterfaceAuditService.QueryCompanyApp();
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
        }
    }
}

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

@@ -119,8 +119,8 @@ public class IotCompanyService extends BaseJpaService<IotCompanyDO,IotCompanyDao
            args.add(accountType);
        }
        if(StringUtils.isNotBlank(companyName)){
            sql.append(" and (c.name like '%").append(companyName).append("%')");
            sqlCount.append(" and (c.name like '%").append(companyName).append("%')");
            sql.append(" and (c.name like '%").append(companyName).append("%' or c.contacts_name like '%").append(companyName).append("%')");
            sqlCount.append(" and (c.name like '%").append(companyName).append("%' or c.contacts_name like '%").append(companyName).append("%')");
        }
        if(StringUtils.isNotBlank(enterType)){
            sql.append(" and c.enter_type=? ");
@@ -751,4 +751,15 @@ public class IotCompanyService extends BaseJpaService<IotCompanyDO,IotCompanyDao
    }
    /**
     * 根据账号查询查询企业下应用信息
     * @return
     */
    public MixEnvelop<IotCompanyAppVO, IotCompanyAppVO> findCompanyApp() {
        IotCompanyDO account = iotCompanyDao.findByAccount(userAgent.getUNAME());
        List<IotCompanyAppDO> appDOS = iotCompanyAppDao.findByCompanyId(account.getId());
        return MixEnvelop.getSuccess(IotRequestMapping.Common.message_success_find,appDOS);
    }
}

svr/svr-iot/src/main/java/com/yihu/iot/service/platform/IotInterfaceAuditService.java

@@ -3,6 +3,7 @@ package com.yihu.iot.service.platform;
import com.alibaba.fastjson.JSONObject;
import com.yihu.iot.dao.company.IotCompanyDao;
import com.yihu.iot.dao.platform.*;
import com.yihu.iot.service.useragent.UserAgent;
import com.yihu.jw.entity.iot.company.IotCompanyDO;
import com.yihu.jw.entity.iot.platform.*;
import com.yihu.jw.restmodel.iot.platform.IotInterfaceAuditVO;
@@ -55,6 +56,9 @@ public class IotInterfaceAuditService  extends BaseJpaService<IotInterfaceAuditD
    @Autowired
    private JdbcTemplate jdbcTemplate;
    @Autowired
    private UserAgent userAgent;
    /**
     * 应用接口申请
     * @param json
@@ -216,4 +220,20 @@ public class IotInterfaceAuditService  extends BaseJpaService<IotInterfaceAuditD
        return MixEnvelop.getSuccessListWithPage(IotRequestMapping.Platform.message_success_find,list,page, size,count);
    }
    /**
     * 分页查询企业下应用接口申请列表
     * @return
     */
    public MixEnvelop<IotInterfaceAuditDO, IotInterfaceAuditDO> QueryCompanyApp() {
        IotCompanyDO account = iotCompanyDao.findByAccount(userAgent.getUNAME());
        StringBuffer sql = new StringBuffer("SELECT DISTINCT * from iot_interface_audit ");
        sql.append("WHERE company_name = '").append(account.getName()).append("'");
        List<IotInterfaceAuditDO> list = jdbcTemplate.query(sql.toString(),new BeanPropertyRowMapper(IotInterfaceAuditDO.class));
        return MixEnvelop.getSuccess(IotRequestMapping.Common.message_success_find,list);
    }
}