Merge branch 'dev' of http://192.168.1.220:10080/jiwei/jw2.0 into dev

Conflicts:
	svr/svr-iot/src/main/resources/application.yml

app/app-iot-server/pom.xml

@@ -143,6 +143,15 @@
            </exclusions>
        </dependency>
        <dependency>
            <groupId>com.sun.jna</groupId>
            <artifactId>jna</artifactId>
            <version>3.0.9</version>
        </dependency>
        <!--<dependency>-->
            <!--<groupId>org.springframework.session</groupId>-->
            <!--<artifactId>spring-session-data-redis</artifactId>-->
        <!--</dependency>-->
        <dependency>
            <groupId>net.lingala.zip4j</groupId>
            <artifactId>zip4j</artifactId>

app/app-iot-server/src/main/java/com/yihu/ehr/iot/AppIotServer.java

@@ -20,9 +20,9 @@ import org.springframework.context.annotation.ComponentScan;
        HibernateJpaAutoConfiguration.class,
        DataSourceTransactionManagerAutoConfiguration.class})
@ComponentScan(basePackages={"com.yihu.base","com.yihu.ehr.iot"})
//@EnableRedisHttpSession
public class AppIotServer extends SpringBootServletInitializer {
    @Override
    protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
        return application.sources(AppIotServer.class);
    }

app/app-iot-server/src/main/java/com/yihu/ehr/iot/security/config/EhrWebHttpSessionConfiguration.java

@@ -9,6 +9,7 @@ import org.springframework.security.core.session.SessionRegistryImpl;
 * Created by progr1mmer on 2018/1/27.
 */
@Configuration
//@EnableRedisHttpSession
public class EhrWebHttpSessionConfiguration {
    @Bean

common/common-entity/src/main/java/com/yihu/jw/iot/product/IotProductAttachmentDO.java

@@ -25,6 +25,8 @@ public class IotProductAttachmentDO extends IdEntityWithOperation implements Ser
    private String type;//附件类型（1产品说明书，2其他附件）
    @Column(name = "attachment")
    private String attachment;//附件
    @Column(name = "name")
    private String name;//附件名称
    @Column(name = "del")
    private Integer del;//删除标志
@@ -75,4 +77,12 @@ public class IotProductAttachmentDO extends IdEntityWithOperation implements Ser
    public void setDel(Integer del) {
        this.del = del;
    }
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
}

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/iot/product/IotProductAttachmentVO.java

@@ -19,6 +19,8 @@ public class IotProductAttachmentVO extends BaseVO implements Serializable {
    private String type;
    @ApiModelProperty("附件链接")
    private String attachment;
    @ApiModelProperty("附件名称")
    private String name;
    public String getType() {
        return type;
@@ -35,4 +37,12 @@ public class IotProductAttachmentVO extends BaseVO implements Serializable {
    public void setAttachment(String attachment) {
        this.attachment = attachment;
    }
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
}

svr/svr-iot/src/main/java/com/yihu/iot/service/device/IotDeviceQualityInspectionPlanService.java

@@ -16,6 +16,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.List;
@@ -25,6 +26,7 @@ import java.util.Map;
 * @author yeshijie on 2017/12/8.
 */
@Service
@Transactional
public class IotDeviceQualityInspectionPlanService extends BaseJpaService<IotDeviceQualityInspectionPlanDO,IotDeviceQualityInspectionPlanDao> {
    @Autowired
@@ -88,6 +90,7 @@ public class IotDeviceQualityInspectionPlanService extends BaseJpaService<IotDev
        IotDeviceQualityInspectionPlanDO planDO = iotDeviceQualityInspectionPlanDao.findById(id);
        planDO.setDel(0);
        iotDeviceQualityInspectionPlanDao.save(planDO);
        updatePurchase(planDO.getPurchaseId());
    }
    /**